aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorFunda Wang <fwang@src.gnome.org>2007-06-21 14:49:09 +0800
committerFunda Wang <fwang@src.gnome.org>2007-06-21 14:49:09 +0800
commitbf7a798c543543cfd80a2ab4226df19fc7d9f7cf (patch)
tree5c4a4d8cf142a5d95c7bf09263be28308d4737b2 /po
parentae5cff2f39affb690ebe0e41f675e0632cdd9207 (diff)
downloadgsoc2013-evolution-bf7a798c543543cfd80a2ab4226df19fc7d9f7cf.tar
gsoc2013-evolution-bf7a798c543543cfd80a2ab4226df19fc7d9f7cf.tar.gz
gsoc2013-evolution-bf7a798c543543cfd80a2ab4226df19fc7d9f7cf.tar.bz2
gsoc2013-evolution-bf7a798c543543cfd80a2ab4226df19fc7d9f7cf.tar.lz
gsoc2013-evolution-bf7a798c543543cfd80a2ab4226df19fc7d9f7cf.tar.xz
gsoc2013-evolution-bf7a798c543543cfd80a2ab4226df19fc7d9f7cf.tar.zst
gsoc2013-evolution-bf7a798c543543cfd80a2ab4226df19fc7d9f7cf.zip
Updated evo zh_CN translation
svn path=/trunk/; revision=33715
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po5620
2 files changed, 2876 insertions, 2748 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index cc7d8e5fa4..a0f0dbf1bc 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-21 Funda Wang <fundawang@gmail.com>
+
+ * zh_CN.po: Updated Simplified Chinese translation
+
2007-06-20 Daniel Nylander <po@danielnylander.se>
* sv.po: Updated Swedish translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d3d7da2b39..dccb689966 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Evolution 2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-27 03:18+0000\n"
-"PO-Revision-Date: 2007-03-10 13:22+0800\n"
+"POT-Creation-Date: 2007-06-19 03:18+0100\n"
+"PO-Revision-Date: 2007-06-21 14:47+0800\n"
"Last-Translator: Funda Wang <fundawang@gmail.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
#: ../a11y/addressbook/ea-addressbook-view.c:94
#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:179
msgid "evolution addressbook"
msgstr "evolution 地址簿"
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
msgid "New Contact"
msgstr "新建联系人"
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../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:163
+#: ../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"
@@ -150,7 +150,7 @@ msgid "calendar view for one or more days"
msgstr "一天或多天的日历视图"
#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../calendar/gui/calendar-component.c:713
msgid "%A %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -161,7 +161,7 @@ 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:191
-#: ../calendar/gui/calendar-component.c:710
+#: ../calendar/gui/calendar-component.c:716
#: ../calendar/gui/e-day-view-top-item.c:1315
#: ../calendar/gui/e-day-view.c:2106
#: ../calendar/gui/e-week-view-main-item.c:319
@@ -172,9 +172,9 @@ msgstr "%-m月%-d日%A"
#: ../a11y/calendar/ea-gnome-calendar.c:193
#: ../a11y/calendar/ea-gnome-calendar.c:198
#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../calendar/gui/calendar-component.c:718
+#: ../calendar/gui/calendar-component.c:723
+#: ../calendar/gui/calendar-component.c:725
msgid "%a %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -182,10 +182,10 @@ msgstr "%Y年%-m月%-d日%A"
#: ../a11y/calendar/ea-gnome-calendar.c:223
#: ../a11y/calendar/ea-gnome-calendar.c:229
#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:738
+#: ../calendar/gui/calendar-component.c:737
#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:752
msgid "%d %b %Y"
msgstr "%Y年%-m月%-d日"
@@ -195,7 +195,7 @@ 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:221
-#: ../calendar/gui/calendar-component.c:736
+#: ../calendar/gui/calendar-component.c:742
#: ../calendar/gui/e-day-view-top-item.c:1319
#: ../calendar/gui/e-day-view.c:2122
#: ../calendar/gui/e-week-view-main-item.c:333
@@ -252,11 +252,11 @@ msgstr "弹出"
msgid "popup a child"
msgstr "弹出子对象"
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
msgid "edit"
msgstr "编辑"
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
msgid "begin editing this cell"
msgstr "开始编辑此单元格"
@@ -269,19 +269,19 @@ msgstr "切换"
msgid "toggle the cell"
msgstr "切换单元格"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
msgid "expand"
msgstr "展开"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
msgid "expands the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中展开行"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
msgid "collapse"
msgstr "折叠"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
msgid "collapses the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中折叠行"
@@ -303,17 +303,17 @@ msgstr "单击"
msgid "sort"
msgstr "排序"
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
msgid "%d %B %Y"
msgstr "%Y年%-m月%-d日"
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:306
#, c-format
msgid "Calendar: from %s to %s"
msgstr "日历:从 %s 到 %s"
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:341
msgid "evolution calendar item"
msgstr "Evolution 日历项目"
@@ -399,7 +399,7 @@ msgstr "认证到 IMAP 服务器失败。"
#. Unknown error
#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1957
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1828
msgid "Failed to delete contact"
msgstr "删除联系人失败"
@@ -507,7 +507,7 @@ msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:510
#: ../plugins/groupwise-features/junk-settings.glade.h:4
#: ../plugins/groupwise-features/properties.glade.h:9
#: ../widgets/table/e-table-config.glade.h:15
@@ -541,17 +541,17 @@ msgstr "{0}"
msgid "{1}"
msgstr "{1}"
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:298
msgid "Default Sync Address:"
msgstr "默认同步地址:"
-#: ../addressbook/conduit/address-conduit.c:1317
-#: ../addressbook/conduit/address-conduit.c:1318
+#: ../addressbook/conduit/address-conduit.c:1315
+#: ../addressbook/conduit/address-conduit.c:1316
msgid "Could not load addressbook"
msgstr "无法装入地址簿"
-#: ../addressbook/conduit/address-conduit.c:1395
-#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1393
+#: ../addressbook/conduit/address-conduit.c:1396
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
@@ -573,9 +573,9 @@ msgstr "在此配置自动补全"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:277 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-folder.c:581
msgid "Contacts"
msgstr "联系人"
@@ -613,12 +613,12 @@ 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:139
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
-#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-folder-tree-model.c:199
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:488
+#: ../calendar/gui/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
+#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:199
#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
#: ../mail/mail-vfolder.c:223
msgid "On This Computer"
@@ -629,54 +629,54 @@ msgstr "在此计算机中"
#. Create the default Person task list
#. Create the default Person addressbook
#. orange
-#: ../addressbook/gui/component/addressbook-component.c:147
-#: ../addressbook/gui/component/addressbook-migrate.c:491
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:496
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:199 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:106
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../calendar/gui/calendar-component.c:246
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:491
+#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
+#: ../calendar/gui/tasks-component.c:204 ../filter/filter-label.c:122
+#: ../mail/em-migrate.c:1056 ../mail/mail-config.glade.h:106
msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:506
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:229
msgid "_Contact"
msgstr "联系人(_C)"
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:230
msgid "Create a new contact"
msgstr "创建一个新联系人"
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:237
msgid "Contact _List"
msgstr "联系人列表(_L)"
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:238
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
-#: ../addressbook/gui/component/addressbook-component.c:240
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1208
msgid "New Address Book"
msgstr "新地址簿"
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:245
msgid "Address _Book"
msgstr "地址簿(_B)"
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:246
msgid "Create a new address book"
msgstr "创建新地址簿"
-#: ../addressbook/gui/component/addressbook-component.c:405
+#: ../addressbook/gui/component/addressbook-component.c:409
msgid "Failed upgrading Address Book settings or folders."
msgstr "升级地址簿设置或文件夹失败。"
@@ -685,8 +685,7 @@ msgid "Base"
msgstr "基础"
#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../calendar/gui/dialogs/calendar-setup.c:172
msgid "_Type:"
msgstr "类型(_T):"
@@ -697,9 +696,9 @@ msgstr "将地址簿内容复制到本地以进行脱机操作"
#: ../addressbook/gui/component/addressbook-config.c:984
#: ../addressbook/gui/component/ldap-config.glade.h:22
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:365
+#: ../calendar/gui/dialogs/calendar-setup.c:376
+#: ../calendar/gui/dialogs/calendar-setup.c:387
#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
#: ../plugins/itip-formatter/itip-formatter.c:2087
#: ../smime/gui/smime-ui.glade.h:28
@@ -707,7 +706,7 @@ msgid "General"
msgstr "常规"
#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:572
+#: ../addressbook/gui/widgets/e-addressbook-view.c:565
#: ../mail/importers/pine-importer.c:392
msgid "Address Book"
msgstr "地址簿"
@@ -727,7 +726,7 @@ msgid "Details"
msgstr "细节"
#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../mail/em-folder-browser.c:849
msgid "Searching"
msgstr "搜索"
@@ -735,31 +734,31 @@ msgstr "搜索"
msgid "Downloading"
msgstr "下载"
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1206
#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Address Book Properties"
msgstr "地址簿属性"
#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
msgid "Migrating..."
msgstr "正在升迁..."
#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
#, c-format
msgid "Migrating `%s':"
msgstr "升迁“%s”:"
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:634
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:749
msgid "Autocompletion Settings"
msgstr "自动补全设置"
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1124
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -770,7 +769,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1138
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -780,7 +779,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1147
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -790,7 +789,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -826,14 +825,14 @@ msgstr "新建地址簿(_N)"
#. FIXME: need to disable for undeletable folders
#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:990
-#: ../calendar/gui/calendar-component.c:584
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:590
+#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-view.c:1701 ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/memos-component.c:458 ../calendar/gui/tasks-component.c:449
+#: ../mail/em-folder-tree.c:2122 ../mail/em-folder-view.c:1155
#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
#: ../ui/evolution-tasks.xml.h:24
msgid "_Delete"
msgstr "删除(_D)"
@@ -843,12 +842,12 @@ msgid "Save As Vcard..."
msgstr "另存为 Vcard..."
#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:445
+#: ../calendar/gui/calendar-component.c:591
+#: ../calendar/gui/memos-component.c:459 ../calendar/gui/tasks-component.c:450
msgid "_Properties..."
msgstr "属性(_P)..."
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1349
msgid "Contact Source Selector"
msgstr "联系人源选择器"
@@ -857,58 +856,58 @@ msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:513
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:507
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:493
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:487
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "输入 %s 的密码(用户 %s)"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
msgid "Autocomplete length"
msgstr "自动补全长度"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
msgid "EFolderList XML for the list of completion URIs"
msgstr "补全 URI 列表的 EFolderList xml"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
msgid "EFolderList XML for the list of completion URIs."
msgstr "补全 URI 列表的 EFolderList xml。"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
msgid ""
"Position of the vertical pane, between the card and list views and the "
"preview pane, in pixels."
msgstr "卡片和列表视图及预览面板之间垂直面板的位置,以像素计。"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
msgid "Show preview pane"
msgstr "显示预览面板"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
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.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
msgid "URI for the folder last used in the select names dialog"
msgstr "选择名称对话框中上次使用的文件夹 URI"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../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.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
msgid "Vertical pane position"
msgstr "垂直面板的位置"
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
msgid "Whether to show the preview pane."
msgstr "是否显示预览面板。"
@@ -933,7 +932,6 @@ msgid "636"
msgstr "636"
#: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
msgid "<b>Authentication</b>"
msgstr "<b>身份验证</b>"
@@ -1170,9 +1168,8 @@ msgid "_Login method:"
msgstr "登录方式(_L):"
#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:245
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:225
+#: ../mail/mail-config.glade.h:169
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
msgstr "名称(_N):"
@@ -1186,7 +1183,7 @@ msgid "_Search scope:"
msgstr "搜索范围(_S):"
#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:176
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "服务器(_S):"
@@ -1205,12 +1202,11 @@ msgstr "名片"
#: ../addressbook/gui/component/ldap-config.glade.h:60
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
#: ../mail/em-account-editor.c:2054
#: ../plugins/calendar-http/calendar-http.c:286
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/calendar-weather/calendar-weather.c:561
msgid "minutes"
msgstr "分钟"
@@ -1251,13 +1247,13 @@ msgid "<b>Work</b>"
msgstr "<b>工作</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: ../addressbook/gui/widgets/e-minicard.c:194
@@ -1265,9 +1261,9 @@ msgid "Contact"
msgstr "联系人"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -1308,11 +1304,11 @@ msgstr "电话"
#. red
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:155
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../filter/filter-label.c:121 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:158
msgid "Work"
msgstr "工作"
@@ -1333,9 +1329,9 @@ msgid "_Birthday:"
msgstr "生日(_B):"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:879
#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1709
+#: ../plugins/itip-formatter/itip-view.c:1716
msgid "_Calendar:"
msgstr "日历(_C):"
@@ -1428,26 +1424,26 @@ msgid "_Zip/Postal Code:"
msgstr "邮政编码(_Z):"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
msgid "Address"
msgstr "地址"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
#: ../addressbook/gui/widgets/e-minicard-label.c:164
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
#: ../addressbook/gui/widgets/e-minicard-view.c:522
#: ../addressbook/gui/widgets/e-minicard.c:187
#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1823 ../widgets/text/e-entry.c:1265
-#: ../widgets/text/e-entry.c:1266 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/table/e-cell-text.c:1830 ../widgets/text/e-entry.c:1263
+#: ../widgets/text/e-entry.c:1264 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3610
msgid "Editable"
msgstr "可编辑"
@@ -2422,8 +2418,9 @@ msgstr "津巴布韦"
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
#: ../plugins/exchange-operations/exchange-delegates.c:934
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
+#: ../plugins/plugin-manager/plugin-manager.c:52
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:354
#: ../widgets/menus/gal-view-new-dialog.c:73
msgid "Name"
msgstr "姓名"
@@ -2433,8 +2430,8 @@ msgid "AOL Instant Messenger"
msgstr "AOL 即时通讯程序"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
msgid "Jabber"
msgstr "Jabber"
@@ -2447,8 +2444,8 @@ msgid "Gadu-Gadu Messenger"
msgstr "Gadu-Gadu 即时通讯"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:553
msgid "ICQ"
msgstr "ICQ"
@@ -2468,72 +2465,72 @@ msgid "Username"
msgstr "用户名"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "家庭"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
#: ../addressbook/gui/widgets/eab-contact-display.c:59
msgid "Other"
msgstr "其它"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
msgid "Yahoo"
msgstr "雅虎"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:552
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
msgid "Source Book"
msgstr "来源地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
msgid "Target Book"
msgstr "目标地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
msgid "Is New Contact"
msgstr "为新联系人"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
msgid "Writable Fields"
msgstr "可写域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
msgid "Required Fields"
msgstr "必需域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
msgid "Changed"
msgstr "已更改"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2798
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2801
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2799
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2802
msgid "_No image"
msgstr "无图像(_N)"
@@ -2565,23 +2562,23 @@ msgstr "%s“%s”为空"
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:297
msgid "_Edit Full"
msgstr "编辑全名(_E)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
msgid "_Full name"
msgstr "全名(_F)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:349
msgid "E_mail"
msgstr "电子邮件(_M)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:360
msgid "_Select Address Book"
msgstr "选择地址簿(_S)"
@@ -2644,7 +2641,7 @@ msgid "Esq."
msgstr "先生"
#: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
msgid "Full Name"
msgstr "全名"
@@ -2716,7 +2713,7 @@ msgstr "即时通讯服务(_I):"
#: ../calendar/gui/dialogs/event-page.glade.h:16
#: ../plugins/calendar-weather/calendar-weather.c:409
#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-contacts.c:234
msgid "_Location:"
msgstr "位置(_L):"
@@ -2762,9 +2759,9 @@ msgid "_Type an email address or drag a contact into the list below:"
msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T):"
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
#: ../addressbook/gui/widgets/e-minicard-view.c:508
msgid "Book"
@@ -2819,64 +2816,81 @@ msgstr ""
"此联系人的姓名或地址已经在本文件夹中存在了。\n"
"您一定要添加吗?"
+#: ../addressbook/gui/merging/eab-contact-merging.c:190
+msgid "Merge Contact"
+msgstr "合并联系人"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:205
+msgid "Merge"
+msgstr "合并"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:780
+#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "电子邮件"
+
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:180
-#: ../calendar/gui/cal-search-bar.c:60
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
msgid "Any field contains"
msgstr "任何域含有"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
msgid "Email begins with"
msgstr "邮件以此开头"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
msgid "Name begins with"
msgstr "姓名以此开头"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
msgid "No contacts"
msgstr "无联系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
#, c-format
msgid "%d contact"
msgid_plural "%d contacts"
msgstr[0] "%d 个联系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:246
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:239
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
#: ../addressbook/gui/widgets/e-minicard-view.c:515
msgid "Query"
msgstr "查询"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
msgid "Error getting book view"
msgstr "获取名簿视图出错"
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
#: ../widgets/table/e-table-click-to-add.c:502
#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3340
#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
+#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
+#: ../widgets/text/e-text.c:3473 ../widgets/text/e-text.c:3474
msgid "Model"
msgstr "模型"
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
msgid "Error modifying card"
msgstr "修改名片错误"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
msgid "Source"
msgstr "来源"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:253
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:246
#: ../calendar/gui/e-calendar-table.etspec.h:13
#: ../calendar/gui/e-meeting-list-view.c:500
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2884,77 +2898,77 @@ msgstr "来源"
msgid "Type"
msgstr "类型"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:843
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2174
+#: ../addressbook/gui/widgets/e-addressbook-view.c:836
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2047
#: ../ui/evolution-addressbook.xml.h:31
msgid "Save as VCard..."
msgstr "另存为 VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
-#: ../calendar/gui/dialogs/comp-editor.c:1119
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/e-calendar-table.c:1281
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:902
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "打开(_O)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
msgid "_New Contact..."
msgstr "新建联系人(_N)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
msgid "New Contact _List..."
msgstr "新建联系人列表(_L)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
msgid "_Save as VCard..."
msgstr "另存为 VCard(_S)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
msgid "_Forward Contact"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
msgid "_Forward Contacts"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
msgid "Send _Message to Contact"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
msgid "Send _Message to List"
msgstr "给列表发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
msgid "Send _Message to Contacts"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
msgid "_Print"
msgstr "打印(_P)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
msgid "Cop_y to Address Book..."
msgstr "复制到地址簿(_Y)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
msgid "Mo_ve to Address Book..."
msgstr "移至地址簿(_V)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:987
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
msgid "Cu_t"
msgstr "剪切(_T)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:988
-#: ../calendar/gui/calendar-component.c:583
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:589
#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../composer/e-msg-composer.c:3185 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1134 ../mail/message-list.c:1922
+#: ../calendar/gui/e-calendar-table.c:1289
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:910
+#: ../calendar/gui/memos-component.c:457 ../calendar/gui/tasks-component.c:448
+#: ../composer/e-msg-composer.c:3180 ../mail/em-folder-tree.c:1006
+#: ../mail/em-folder-view.c:1140 ../mail/message-list.c:1962
#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -2962,30 +2976,25 @@ msgstr "剪切(_T)"
msgid "_Copy"
msgstr "复制(_C)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:989
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
msgid "P_aste"
msgstr "粘贴(_A)"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1671
-#: ../calendar/gui/cal-search-bar.c:428
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1634
+#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
+#: ../calendar/gui/cal-search-bar.c:681
msgid "Any Category"
msgstr "任何类别"
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1867
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1923
-msgid "Print cards"
-msgstr "打印名片"
-
#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1957
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1828
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
msgid "Other error"
msgstr "其它错误"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
msgid "Assistant"
msgstr "助手"
@@ -3022,84 +3031,78 @@ msgid "Categories"
msgstr "类别"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "公司电话"
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+msgid "Company"
+msgstr "公司"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "电子邮件"
+msgid "Company Phone"
+msgstr "公司电话"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
msgid "Email 2"
msgstr "电子邮件 2"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Email 3"
msgstr "电子邮件 3"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "Family Name"
msgstr "姓"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
msgid "File As"
msgstr "存档为"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
msgid "Given Name"
msgstr "名"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
msgid "Home Fax"
msgstr "家庭传真"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
msgid "Home Phone"
msgstr "家庭电话"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
msgid "Home Phone 2"
msgstr "家庭电话 2"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
msgid "ISDN Phone"
msgstr "ISDN 电话"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
msgid "Journal"
msgstr "日记"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
msgid "Manager"
msgstr "经理"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
msgid "Mobile Phone"
msgstr "移动电话"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
msgid "Nickname"
msgstr "昵称"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
msgid "Note"
msgstr "注释"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Office"
msgstr "办公室"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "组织"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Other Fax"
msgstr "其它传真"
@@ -3121,7 +3124,6 @@ msgid "Radio"
msgstr "收音机"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
#: ../calendar/gui/e-meeting-list-view.c:511
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
@@ -3129,7 +3131,7 @@ msgid "Role"
msgstr "角色"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
msgid "Spouse"
msgstr "配偶"
@@ -3171,7 +3173,7 @@ msgstr "网站"
#: ../widgets/table/e-table-group-leaf.c:629
#: ../widgets/table/e-table-group-leaf.c:630
#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3652
msgid "Width"
msgstr "宽度"
@@ -3186,7 +3188,7 @@ msgstr "宽度"
#: ../widgets/table/e-table-group-leaf.c:622
#: ../widgets/table/e-table-group-leaf.c:623
#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
+#: ../widgets/text/e-text.c:3659 ../widgets/text/e-text.c:3660
msgid "Height"
msgstr "高度"
@@ -3287,216 +3289,211 @@ msgstr "已选择"
msgid "Has Cursor"
msgstr "有光标"
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:630
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2546
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2600
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:631
msgid "_Send New Message To..."
msgstr "把新信发送到(_S)..."
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
msgid "Copy _Email Address"
msgstr "复制电子邮件地址(_E)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
msgid "(map)"
msgstr "(地图)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
msgid "map"
msgstr "地图"
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:456
+#: ../addressbook/gui/widgets/eab-contact-display.c:758
msgid "List Members"
msgstr "列出成员"
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "电子邮件"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
msgid "Department"
msgstr "部门"
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
msgid "Profession"
msgstr "职业"
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
msgid "Position"
msgstr "位置"
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
msgid "Video Chat"
msgstr "视频聊天"
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2305
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/gnome-cal.c:2354
+#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:396
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:540
+#: ../plugins/hula-account-setup/camel-hula-listener.c:378
+#: ../plugins/hula-account-setup/camel-hula-listener.c:407
#: ../plugins/publish-calendar/publish-calendar.glade.h:5
msgid "Calendar"
msgstr "日历"
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:370
#: ../ui/evolution-event-editor.xml.h:8
msgid "Free/Busy"
msgstr "忙/闲"
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:590
msgid "Phone"
msgstr "电话"
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
msgid "Fax"
msgstr "传真"
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
msgid "Home Page"
msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
msgid "Web Log"
msgstr "Web 日志"
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
msgid "Birthday"
msgstr "生日"
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
msgid "Anniversary"
msgstr "纪念日"
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:776
msgid "Job Title"
msgstr "职称"
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:807
msgid "Home page"
msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:815
msgid "Blog"
msgstr "Blog"
#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
msgid "Success"
msgstr "成功"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
msgid "Backend busy"
msgstr "后台忙"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
msgid "Repository offline"
msgstr "仓库脱机"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
msgid "Address Book does not exist"
msgstr "地址簿不存在"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
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:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
msgid "Permission denied"
msgstr "没有权限"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
msgid "Contact not found"
msgstr "找不到联系人"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
msgid "Protocol not supported"
msgstr "不支持的协议"
#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-component-preview.c:236
#: ../calendar/gui/e-cal-model-tasks.c:349
#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2516
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2351
msgid "Canceled"
msgstr "已取消"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
msgid "Could not cancel"
msgstr "无法取消"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
#: ../calendar/gui/comp-editor-factory.c:433
msgid "Authentication Failed"
msgstr "认证失败"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
msgid "Authentication Required"
msgstr "必须认证"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
msgid "TLS not Available"
msgstr "TLS 不可用"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
msgid "No such source"
msgstr "没有来源"
#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
msgid "Not available in offline mode"
msgstr "脱机模式下不可用"
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
msgid "Invalid server version"
msgstr "无效的服务器版本"
-#: ../addressbook/gui/widgets/eab-gui-util.c:94
+#: ../addressbook/gui/widgets/eab-gui-util.c:95
msgid ""
"We were unable to open this addressbook. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3505,7 +3502,7 @@ msgstr ""
"我们无法打开此地址簿。这可能意味着这本地址簿没有标为脱机使用,或者尚未下载完"
"成以供脱机使用。请在联机模式中装入此地址簿以便下载其内容"
-#: ../addressbook/gui/widgets/eab-gui-util.c:103
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
#, c-format
msgid ""
"We were unable to open this addressbook. Please check that the path %s "
@@ -3513,7 +3510,7 @@ msgid ""
msgstr ""
"我们无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:112
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
@@ -3521,7 +3518,7 @@ msgstr ""
"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为LDAP 服务器"
"已经关闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
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 "
@@ -3530,7 +3527,7 @@ msgstr ""
"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
"LDAP,就必须安装启用了 LDAP 的 Evolution 包。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
@@ -3538,7 +3535,7 @@ msgstr ""
"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经"
"关闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:147
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -3549,7 +3546,7 @@ msgstr ""
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -3560,45 +3557,45 @@ msgstr ""
"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
"中将时间限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
msgid "The backend for this addressbook was unable to parse this query."
msgstr "此地址簿的后端无法解析此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../addressbook/gui/widgets/eab-gui-util.c:163
msgid "The backend for this addressbook refused to perform this query."
msgstr "此地址簿的后端拒绝执行此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
msgid "Error adding list"
msgstr "添加列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:707
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:710
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
msgid "Error modifying list"
msgstr "修改列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
msgid "Error removing list"
msgstr "删除列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:659
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:660
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#: ../addressbook/gui/widgets/eab-gui-util.c:293
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3611,7 +3608,7 @@ msgstr[0] ""
"您真的想要显示所有联系人吗?"
#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
#, c-format
msgid ""
"%s already exists\n"
@@ -3620,63 +3617,63 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:329
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:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
msgid "contact"
msgid_plural "contacts"
msgstr[0] "联系人"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:463
+#: ../addressbook/gui/widgets/eab-gui-util.c:464
msgid "Select Address Book"
msgstr "选择地址簿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:605
msgid "list"
msgstr "列表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:771
msgid "Move contact to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:773
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:776
msgid "Move contacts to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:775
+#: ../addressbook/gui/widgets/eab-gui-util.c:778
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
msgid "Multiple VCards"
msgstr "多个 VCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+#: ../addressbook/gui/widgets/eab-gui-util.c:1007
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1045
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#: ../addressbook/gui/widgets/eab-gui-util.c:1048
+#: ../addressbook/gui/widgets/eab-gui-util.c:1066
msgid "Contact information"
msgstr "联系人信息"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1065
+#: ../addressbook/gui/widgets/eab-gui-util.c:1068
#, c-format
msgid "Contact information for %s"
msgstr "%s 的联系人信息"
@@ -3685,22 +3682,22 @@ msgstr "%s 的联系人信息"
msgid "Querying Address Book..."
msgstr "正在查询地址簿..."
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
#, 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:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:281
msgid "Show Full VCard"
msgstr "显示完整 VCard"
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
msgid "Show Compact VCard"
msgstr "显示紧凑 VCard"
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:286
msgid "Save in addressbook"
msgstr "保存在地址簿中"
@@ -3708,17 +3705,11 @@ msgstr "保存在地址簿中"
msgid "Card View"
msgstr "名片视图"
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "GTK 树视图"
-
#: ../addressbook/importers/evolution-csv-importer.c:624
#: ../addressbook/importers/evolution-ldif-importer.c:583
#: ../addressbook/importers/evolution-vcard-importer.c:250
#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
msgid "Importing..."
msgstr "正在导入..."
@@ -3762,20 +3753,6 @@ msgstr "VCard (.vfg, .gcrd)"
msgid "Evolution VCard Importer"
msgstr "Evolution VCard 导入器"
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "打印信封"
-
-#: ../addressbook/printing/e-contact-print.c:852
-msgid "Print contacts"
-msgstr "打印联系人"
-
-#: ../addressbook/printing/e-contact-print.c:878
-#: ../addressbook/printing/e-contact-print.c:905
-msgid "Print contact"
-msgstr "打印联系人"
-
#: ../addressbook/printing/e-contact-print.glade.h:1
msgid "10 pt. Tahoma"
msgstr "10 pt. Tahoma"
@@ -3821,7 +3798,7 @@ msgstr "格式"
#: ../widgets/table/e-table-field-chooser-dialog.c:91
#: ../widgets/table/e-table-field-chooser-item.c:651
#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1895
+#: ../widgets/table/e-table-header-item.c:1898
#: ../widgets/table/e-table-selection-model.c:318
msgid "Header"
msgstr "页眉"
@@ -3875,7 +3852,6 @@ msgid "Options"
msgstr "选项"
#: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
msgid "Orientation"
msgstr "方向"
@@ -3927,7 +3903,7 @@ msgstr "阴影"
#: ../addressbook/printing/e-contact-print.glade.h:36
#: ../plugins/exchange-operations/exchange-account-setup.c:956
#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-contacts.c:217
msgid "Size:"
msgstr "大小:"
@@ -3944,7 +3920,7 @@ msgid "Top:"
msgstr "顶部:"
#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:156
msgid "Type:"
msgstr "类型:"
@@ -3961,7 +3937,7 @@ msgid "Contact Print Style Editor Test"
msgstr "联系人打印样式编辑器测试"
#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:47
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "版权 (C) 2000, Ximian, Inc."
@@ -3969,16 +3945,16 @@ msgstr "版权 (C) 2000, Ximian, Inc."
msgid "This should test the contact print style editor widget"
msgstr "这应该测试联系人打印样式编辑器部件"
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:46
msgid "Contact Print Test"
msgstr "联系人打印测试"
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:49
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:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
msgid "Can not open file"
msgstr "无法打开文件"
@@ -3991,72 +3967,61 @@ msgstr "无法获得地址簿列表"
msgid "failed to open book"
msgstr "打开地址簿失败"
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
msgid "Specify the output file instead of standard output"
msgstr "指定用来取代标准输出的输出文件"
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
msgid "OUTPUTFILE"
msgstr "输出文件"
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
msgid "List local addressbook folders"
msgstr "列出本地地址簿文件夹"
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
msgid "Show cards as vcard or csv file"
msgstr "将名片显示为 vcard 还是 csv 文件"
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
msgid "[vcard|csv]"
msgstr "[vcard|csv]"
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
msgid "Export in asynchronous mode"
msgstr "以异步模式导出"
#: ../addressbook/tools/evolution-addressbook-export.c:63
msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+"The number of cards in out output file in asynchronous mode, default size "
+"100."
msgstr "异步模式中一个输出文件中的名片数,默认大小为 100。"
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
msgid "NUMBER"
msgstr "数字"
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
msgid ""
"Command line arguments error, please use --help option to see the usage."
msgstr "命令行参数错误,请使用 --help 选项查看用法。"
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
msgid "Only support csv or vcard format."
msgstr "仅支持 csv 或 vcard 格式。"
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
msgid "In async mode, output must be file."
msgstr "在异步模式中,输出必须是文件。"
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
msgid "In normal mode, there is no need for the size option."
msgstr "在普通模式中,不应该有大小选项。"
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
msgid "Unhandled error"
msgstr "未处理的错误"
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "装入默认地址簿错误。"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "输入文件"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "没有提供文件名。"
-
#: ../calendar/calendar.error.xml.h:1
msgid ""
"Adding a meaningful summary to your appointment will give your recipients an "
@@ -4154,187 +4119,191 @@ msgid "Are you sure you want to delete this task?"
msgstr "您确定要删除此任务吗?"
#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "您确定想要保存没有摘要的备忘吗?"
+
+#: ../calendar/calendar.error.xml.h:22
msgid "Are you sure you want to send the appointment without a summary?"
msgstr "您确定想要发送没有摘要的约会吗?"
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:23
msgid "Are you sure you want to send the task without a summary?"
msgstr "您确定想要发送没有摘要的任务吗?"
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:24
msgid "Cannot create a new event"
msgstr "无法创建新事件"
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:25
msgid "Delete calendar '{0}'?"
msgstr "删除日历“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
msgid "Delete memo list '{0}'?"
msgstr "删除备忘列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
msgid "Delete task list '{0}'?"
msgstr "删除任务列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
msgid "Do _not Send"
msgstr "不发送(_N)"
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
msgid "Download in progress. Do you want to save the appointment?"
msgstr "下载进行中。您想要保存约会吗?"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
msgid "Download in progress. Do you want to save the task?"
msgstr "下载进行中。您想要保存任务吗?"
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
msgid "Editor could not be loaded."
msgstr "无法装入编辑器。"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们接受此任务。"
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
msgid ""
"Email invitations will be sent to all participants and allow them to reply."
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们答复。"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
msgid "Error loading calendar"
msgstr "装入日历时出错"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
msgid "Error loading memo list"
msgstr "装入备忘列表出错"
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
msgid "Error loading task list"
msgstr "装入任务列表出错"
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the journal has been deleted."
msgstr "如果您不发送取消通知,其他出席者人可能不知道日记已经删除。"
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
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:38
+#: ../calendar/calendar.error.xml.h:39
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:39
+#: ../calendar/calendar.error.xml.h:40
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
msgid "Some features may not work properly with your current server."
msgstr "某些特性可能无法在您目前的服务器下工作。"
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Evolution 日历异常退出。"
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
msgid "The Evolution memo has quit unexpectedly."
msgstr "Evolution 备忘异常退出。"
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
msgid "The Evolution tasks have quit unexpectedly."
msgstr "Evolution 任务异常退出。"
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
msgid "The calendar is not marked for offline usage."
msgstr "日历未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
msgid "The memo list is not marked for offline usage"
msgstr "备忘列表未标为脱机使用"
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
msgid "The task list is not marked for offline usage."
msgstr "任务列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
msgid "This calendar will be removed permanently."
msgstr "此日历将被永久删除。"
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
msgid "This memo list will be removed permanently."
msgstr "此备忘列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
msgid "This task list will be removed permanently."
msgstr "此任务列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
msgid "Would you like to save your changes to this appointment?"
msgstr "您想要保存对约会的更改吗?"
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
msgid "Would you like to save your changes to this memo?"
msgstr "您想要保存对此备忘的更改吗?"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
msgid "Would you like to save your changes to this task?"
msgstr "您想要保存对此任务的更改吗?"
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:57
msgid "Would you like to send a cancelation notice for this journal entry?"
msgstr "您是否想要为此日记项发送取消通知?"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:58
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "您是否想要给全部出席者发送取消通知?"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
msgid "Would you like to send meeting invitations to participants?"
msgstr "您是否想要给出席者发送会议邀请?"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
msgid "Would you like to send this task to participants?"
msgstr "您是否想要将此任务发送给出席者?"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
msgid "Would you like to send updated meeting information to participants?"
msgstr "您是否想要给出席者发送更新的会议信息?"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to send updated task information to participants?"
msgstr "您是否想要给出席者发送更新的任务信息?"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -4343,107 +4312,106 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到支持的版本。"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
msgid ""
"You have a read-only calendar source selected. Change to Calendar View and "
"highlight a calendar that can accept appointments."
msgstr "您选择了只读日历源。请更改为日历视图,然后选择可接受约会的日历。"
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
msgid "You have changed this appointment, but not yet saved it."
msgstr "您已经更改了此约会,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:66
msgid "You have changed this task, but not yet saved it."
msgstr "您已经对此任务做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
msgid "You have made changes to this memo, but not yet saved them."
msgstr "您已经对此备忘做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
msgid "Your memos will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的备忘将无法使用。"
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的任务将无法使用。"
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
#: ../composer/mail-composer.error.xml.h:29
msgid "_Discard Changes"
msgstr "丢弃更改(_D)"
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:54
+#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:59
msgid "_Save"
msgstr "保存(_S)"
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:73
msgid "_Save Changes"
msgstr "保存更改(_S)"
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:135
+#: ../calendar/calendar.error.xml.h:74
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:140
msgid "_Send"
msgstr "发送(_S)"
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:75
msgid "_Send Notice"
msgstr "发送通知(_S)"
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
msgid "{0}."
msgstr "{0}。"
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:50
+#: ../calendar/common/authentication.c:49 ../smime/gui/component.c:50
msgid "Enter password"
msgstr "输入密码"
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:253
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1506
-#: ../calendar/conduits/calendar/calendar-conduit.c:1507
-#: ../calendar/conduits/memo/memo-conduit.c:932
-#: ../calendar/conduits/memo/memo-conduit.c:933
-#: ../calendar/conduits/todo/todo-conduit.c:1108
-#: ../calendar/conduits/todo/todo-conduit.c:1109
+#: ../calendar/conduits/calendar/calendar-conduit.c:1504
+#: ../calendar/conduits/calendar/calendar-conduit.c:1505
+#: ../calendar/conduits/memo/memo-conduit.c:930
+#: ../calendar/conduits/memo/memo-conduit.c:931
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1107
msgid "Could not start evolution-data-server"
msgstr "无法启动 evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1614
-#: ../calendar/conduits/calendar/calendar-conduit.c:1617
+#: ../calendar/conduits/calendar/calendar-conduit.c:1612
+#: ../calendar/conduits/calendar/calendar-conduit.c:1615
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
-#: ../calendar/conduits/memo/memo-conduit.c:1026
-#: ../calendar/conduits/memo/memo-conduit.c:1029
+#: ../calendar/conduits/memo/memo-conduit.c:1024
+#: ../calendar/conduits/memo/memo-conduit.c:1027
msgid "Could not read pilot's Memo application block"
msgstr "无法读入 Pilot 的备忘应用程序块"
-#: ../calendar/conduits/memo/memo-conduit.c:1073
-#: ../calendar/conduits/memo/memo-conduit.c:1076
+#: ../calendar/conduits/memo/memo-conduit.c:1071
+#: ../calendar/conduits/memo/memo-conduit.c:1074
msgid "Could not write pilot's Memo application block"
msgstr "无法写入 Pilot 备忘应用程序块"
-#: ../calendar/conduits/todo/todo-conduit.c:239
+#: ../calendar/conduits/todo/todo-conduit.c:237
msgid "Default Priority:"
msgstr "默认优先级:"
-#: ../calendar/conduits/todo/todo-conduit.c:1192
-#: ../calendar/conduits/todo/todo-conduit.c:1195
+#: ../calendar/conduits/todo/todo-conduit.c:1190
+#: ../calendar/conduits/todo/todo-conduit.c:1193
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
-#: ../calendar/conduits/todo/todo-conduit.c:1237
-#: ../calendar/conduits/todo/todo-conduit.c:1240
+#: ../calendar/conduits/todo/todo-conduit.c:1235
+#: ../calendar/conduits/todo/todo-conduit.c:1238
msgid "Could not write pilot's ToDo application block"
msgstr "无法写入 Pilot ToDo 应用程序块"
@@ -4453,7 +4421,7 @@ msgid "Calendar and Tasks"
msgstr "日历和任务"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:1367
msgid "Calendars"
msgstr "日历"
@@ -4494,22 +4462,24 @@ msgid "Memo_s"
msgstr "备忘(_S)"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:324 ../calendar/gui/e-memos.c:1093
+#: ../calendar/gui/gnome-cal.c:1669 ../calendar/gui/memos-component.c:536
+#: ../calendar/gui/memos-component.c:1013 ../calendar/gui/memos-control.c:336
+#: ../calendar/gui/memos-control.c:352
msgid "Memos"
msgstr "备忘"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1949
-#: ../calendar/gui/tasks-component.c:522
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:527 ../calendar/gui/e-tasks.c:1357
+#: ../calendar/gui/gnome-cal.c:1541 ../calendar/gui/print.c:1809
+#: ../calendar/gui/tasks-component.c:527
+#: ../calendar/gui/tasks-component.c:1018 ../calendar/gui/tasks-control.c:478
+#: ../calendar/gui/tasks-control.c:494
#: ../calendar/importers/icalendar-importer.c:80
#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:403
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:547
+#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:397
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:541
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
msgid "Tasks"
msgstr "任务"
@@ -4534,11 +4504,10 @@ msgstr[0] "分钟"
#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
#: ../plugins/calendar-http/calendar-http.c:287
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/calendar-weather/calendar-weather.c:562
msgid "hours"
msgid_plural "hours"
msgstr[0] "小时"
@@ -4554,10 +4523,10 @@ msgstr "约会"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1570
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
#: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:936
+#: ../plugins/itip-formatter/itip-view.c:943
msgid "Location:"
msgstr "位置:"
@@ -4567,16 +4536,16 @@ msgstr "午睡时间(_T):"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:160
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:164
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
#: ../plugins/publish-calendar/publish-calendar.glade.h:21
#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:52
#: ../ui/evolution-signature-editor.xml.h:24
#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
msgid "_Edit"
msgstr "编辑(_E)"
@@ -4588,31 +4557,31 @@ msgstr "午睡(_S)"
msgid "location of appointment"
msgstr "约会位置"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1429
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1552
msgid "No summary available."
msgstr "没有可用的摘要。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1438
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1440
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
#, c-format
msgid "You have %d alarms"
msgstr "您有 %d 个提醒"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1654
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
msgid "Warning"
msgstr "警告"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1658
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4624,7 +4593,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4640,7 +4609,7 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1751
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
@@ -4682,258 +4651,258 @@ msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d 秒"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
msgid "Alarm programs"
msgstr "提醒程序"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
msgid "Ask for confirmation when deleting items"
msgstr "删除项时要求确认"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
msgstr "今天到期任务的背景颜色,以“#rrggbb”格式。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
msgstr "延期任务的背景颜色,以“#rrggbb”格式。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
msgid "Calendars to run alarms for"
msgstr "运行提醒的日历"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
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.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
msgid "Color to draw the Marcus Bains line in the Day View."
msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
msgid "Compress weekends in month view"
msgstr "在月视图中压缩周末"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
msgid "Confirm expunge"
msgstr "确认销毁"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
msgid "Days on which the start and end of work hours should be indicated."
msgstr "标为工作日的日子。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
msgid "Default appointment reminder"
msgstr "默认约会提醒"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
msgid "Default reminder units"
msgstr "默认提醒单位"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
msgid "Default reminder value"
msgstr "默认提醒值"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
msgid "Directory for saving alarm audio files"
msgstr "保存提醒音频文件的目录"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
msgid "Event Gradient"
msgstr "事件渐变"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
msgid "Event Transparency"
msgstr "事件透明度"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
msgid "Free/busy server URLs"
msgstr "忙/闲服务器 URL"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
msgid "Free/busy template URL"
msgstr "忙/闲模板 URL"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
msgid "Gradient of the events in calendar views."
msgstr "日历视图中事件的渐变。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
msgid "Hide completed tasks"
msgstr "隐藏已完成的任务"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
msgid "Hide task units"
msgstr "隐藏任务单位"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
msgid "Hide task value"
msgstr "隐藏任务值"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
msgid "Horizontal pane position"
msgstr "水平面板位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
msgstr "工作日结束的小时,以 24 小时格式表示,0 到 23。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
msgstr "工作日开始的小时,以 24 小时格式表示,0 到 23。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
msgid "Intervals shown in Day and Work Week views, in minutes."
msgstr "日视图和工作日视图中显示的间隔,以分钟计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
msgid "Last alarm time"
msgstr "上次提醒时间"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
msgid "List of server URLs for free/busy publishing."
msgstr "列出发表忙/闲的服务器 URL。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
msgid "Marcus Bains Line"
msgstr "Marcus Bains 线"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
msgid "Marcus Bains Line Color - Day View"
msgstr "Marcus Bains 线颜色 - 日视图"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
msgid "Marcus Bains Line Color - Time bar"
msgstr "Marcus Bains 线颜色 - 日期栏"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
msgid "Minute the workday ends on, 0 to 59."
msgstr "工作日结束的分钟,0 到 59。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
msgid "Minute the workday starts on, 0 to 59."
msgstr "工作日开始的分钟,0 到 59。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
msgid "Month view horizontal pane position"
msgstr "月视图水平面板的位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
msgid "Month view vertical pane position"
msgstr "月视图中垂直面板的位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
msgid "Number of units for determining a default reminder."
msgstr "确定默认提醒的单位数量。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
msgid "Number of units for determining when to hide tasks."
msgstr "决定何时隐藏任务的数字单位。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
msgid "Overdue tasks color"
msgstr "延期任务的颜色"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
msgid ""
"Position of the horizontal pane, between the date navigator calendar and the "
"task list when not in the month view, in pixels."
msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
msgid ""
"Position of the horizontal pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
msgstr "月视图中视图和日期导航器日历之间水平面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
msgid ""
"Position of the vertical pane, between the calendar lists and the date "
"navigator calendar."
msgstr "日历列表和日期导航器日历之间垂直面板的位置。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
msgid ""
"Position of the vertical pane, between the task list and the task preview "
"pane, in pixels."
msgstr "任务列表和任务预览面板间垂直面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels."
msgstr "月视图中视图和日期导航器日历及任务列表之间垂直面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
msgid ""
"Position of the vertical pane, between the view and the date navigator "
"calendar and task list when not in the month view, in pixels."
msgstr "非月视图中视图和日期导航器日历及任务列表之间垂直面板的位置,以像素计。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
msgid "Programs that are allowed to be run by alarms."
msgstr "允许提醒运行的程序。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
msgid "Save directory for alarm audio"
msgstr "保存提醒音频的目录"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
msgid "Show RSVP field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示请回复域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
msgid "Show Role field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示角色域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
msgid "Show appointment end times in week and month views"
msgstr "在周视图和月视图中显示约会结束时间"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
msgid "Show categories field in the event/meeting/task editor"
msgstr "在事件/会议/任务编辑器中显示分类域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
msgid "Show display alarms in notification tray"
msgstr "在通知托盘中显示提醒"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
msgid "Show status field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示状态域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Show the \"Preview\" pane"
msgstr "显示“预览”面板"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "Show the \"Preview\" pane."
msgstr "显示“预览”面板。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
msgid "Show timezone field in the event/meeting editor"
msgstr "在事件/会议编辑器中显示时区域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
msgid "Show type field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示类型域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
msgid "Show week numbers in date navigator"
msgstr "在日期导航器中显示周数"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
msgid "Tasks due today color"
msgstr "今天到期的任务颜色"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
msgid "Tasks vertical pane position"
msgstr "任务垂直面板位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4942,7 +4911,7 @@ msgstr ""
"用作忙/闲数据发布的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
"名。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
@@ -4950,174 +4919,202 @@ msgstr ""
"日历中日期和时间所使用的默认时区,以未翻译的时区数据库位置表示,如“Asia/"
"Shanghai”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
msgid "Time divisions"
msgstr "时间分割"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
msgid "Time the last alarm ran, in time_t."
msgstr "提醒上次运行的时间,以 time_t 格式。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
msgid "Timezone"
msgstr "时区"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
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.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
msgid "Twenty four hour time format"
msgstr "二十四小时时间格式"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr "默认提醒的单位,可为“minutes”,“hours”或“days”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
msgid ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr "决定是否隐藏任务的单位,可为“minutes”,“hours”或“days”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
msgid "Week start"
msgstr "一周开始"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
msgstr "一周开始的日子,从星期日(0)到星期六(6)。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
msgid "Whether or not to use the notification tray for display alarms."
msgstr "是否使用通知托盘来显示提醒。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr "删除约会或任务时是否要求确认。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr "销毁约会和任务时是否要求确认。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
msgid ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
msgstr "在月视图中是否压缩周末;压缩时将把周六和周日用一个单元格显示。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
msgid "Whether to display the end time of events in the week and month views."
msgstr "是否在周视图和月视图中显示事件的结束时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
msgid "Whether to hide completed tasks in the tasks view."
msgstr "是否在任务视图中隐藏已完成的任务。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
msgid "Whether to set a default reminder for appointments."
msgstr "是否为约会设置默认提醒。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示请回复域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
msgid "Whether to show categories field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示分类域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议中显示角色域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示状态域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
msgid ""
"Whether to show times in twenty four hour format instead of using am/pm."
msgstr "是以 24 小时格式还是以 12 小时格式显示时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示时区域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示类型域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
msgid "Whether to show week numbers in the date navigator."
msgstr "是否在日期导航器中显示周数。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
msgid "Whether to use daylight savings time while displaying events."
msgstr "在显示事件时使用是否夏时制时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
msgid "Work days"
msgstr "工作日"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
msgid "Workday end hour"
msgstr "工作日结束小时"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
msgid "Workday end minute"
msgstr "工作日结束分钟"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
msgid "Workday start hour"
msgstr "工作日开始小时"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
msgid "Workday start minute"
msgstr "工作日开始分钟"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
msgid "daylight savings time"
msgstr "夏时制时间"
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:73
msgid "Summary contains"
msgstr "概要含有"
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:74
msgid "Description contains"
msgstr "描述含有"
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:75
msgid "Category is"
msgstr "类别为"
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:76
msgid "Comment contains"
msgstr "注释含有"
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:77
msgid "Location contains"
msgstr "位置含有"
-#: ../calendar/gui/cal-search-bar.c:432
+#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
msgid "Unmatched"
msgstr "无匹配"
-#: ../calendar/gui/calendar-commands.c:119
-#: ../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
+#: ../calendar/gui/cal-search-bar.c:631
+msgid "Next 7 days Tasks"
+msgstr "下一周的任务"
+
+#: ../calendar/gui/cal-search-bar.c:635
+msgid "Active Tasks"
+msgstr "活动任务"
+
+#: ../calendar/gui/cal-search-bar.c:639
+msgid "Over Due Tasks"
+msgstr "延期任务"
+
+#: ../calendar/gui/cal-search-bar.c:643
+msgid "Completed Tasks"
+msgstr "已完成任务"
+
+#: ../calendar/gui/cal-search-bar.c:647
+msgid "Tasks With Attachments"
+msgstr "有附件的任务"
+
+#: ../calendar/gui/cal-search-bar.c:693
+msgid "Active Appointments"
+msgstr "活动约会"
+
+#: ../calendar/gui/cal-search-bar.c:697
+msgid "Next 7 Day Appointments"
+msgstr "下一周的约会"
+
+#: ../calendar/gui/calendar-commands.c:99 ../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:348
+#: ../calendar/gui/calendar-commands.c:324
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 "
@@ -5125,15 +5122,14 @@ msgid ""
msgstr ""
"该操作将永久删除所有比选中时间量早的事件。如果您继续,您将无法恢复这些事件。"
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:330
msgid "Purge events older than"
msgstr "销毁较早的事件"
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-weather/calendar-weather.c:563
#: ../widgets/misc/e-send-options.glade.h:38
msgid "days"
msgstr "天"
@@ -5142,89 +5138,89 @@ msgstr "天"
#. Create the LDAP source group
#. Create the Webcal source group
#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
-#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
-#: ../calendar/gui/tasks-component.c:218
+#: ../calendar/gui/calendar-component.c:265
+#: ../calendar/gui/memos-component.c:227 ../calendar/gui/migration.c:511
+#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/tasks-component.c:223
msgid "On The Web"
msgstr "网上"
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:283 ../calendar/gui/migration.c:405
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:290
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "天气"
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:588
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:905
msgid "Failed upgrading calendars."
msgstr "升级日历失败。"
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1204
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "无法打开日历“%s”来创建事件和会议"
-#: ../calendar/gui/calendar-component.c:1214
+#: ../calendar/gui/calendar-component.c:1220
msgid "There is no calendar available for creating events and meetings"
msgstr "没有可创建事件和会议的日历"
-#: ../calendar/gui/calendar-component.c:1336
+#: ../calendar/gui/calendar-component.c:1342
msgid "Calendar Source Selector"
msgstr "日历源选择器"
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1550
msgid "New appointment"
msgstr "新建约会"
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1551
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1552
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1558
msgid "New meeting"
msgstr "新建会议"
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1559
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1560
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1566
msgid "New all day appointment"
msgstr "新建全天约会"
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1567
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1568
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1574
msgid "New calendar"
msgstr "新建日历"
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1575
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1576
msgid "Create a new calendar"
msgstr "创建新日历"
@@ -5244,6 +5240,16 @@ msgstr "周视图"
msgid "Month View"
msgstr "月视图"
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2
+msgid "Description Contain"
+msgstr "描述含有"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Summary Contain"
+msgstr "概要含有"
+
#: ../calendar/gui/comp-editor-factory.c:415
msgid "Error while opening the calendar"
msgstr "打开日历时出错"
@@ -5256,11 +5262,11 @@ msgstr "打开日历的方法不支持"
msgid "Permission denied to open the calendar"
msgstr "没有权限打开日历"
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1273
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1274
msgid "Unknown error"
msgstr "未知的错误"
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:616
msgid "Edit Alarm"
msgstr "编辑提醒"
@@ -5308,62 +5314,66 @@ msgid "Run a program"
msgstr "运行程序"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "选择一个文件"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
msgid "Send To:"
msgstr "发送给:"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
#: ../calendar/gui/e-alarm-list.c:454
msgid "Send an email"
msgstr "发送电子邮件"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
msgid "_Arguments:"
msgstr "参数(_A):"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
msgid "_Program:"
msgstr "程序(_P):"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
msgid "_Repeat the alarm"
msgstr "重复提醒(_R)"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
msgid "_Sound:"
msgstr "声音(_S):"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
msgid "after"
msgstr "之后"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
msgid "before"
msgstr "之前"
#. TRANSLATORS: Entire string is for example:
#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "day(s)"
msgstr "天"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
msgid "end of appointment"
msgstr "约会结束"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
msgid "extra times every"
msgstr "每个额外时间"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
msgid "hour(s)"
msgstr "小时"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
msgid "minute(s)"
msgstr "分钟"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
msgid "start of appointment"
msgstr "约会开始"
@@ -5384,7 +5394,6 @@ msgstr "提醒"
#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
#: ../composer/e-msg-composer-select-file.c:98
#: ../composer/e-msg-composer-select-file.c:118
msgid "_Suggest automatic display of attachment"
@@ -5394,7 +5403,7 @@ msgstr "建议自动显示附件(_S)"
msgid "Attach file(s)"
msgstr "添加附件"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
msgid "Selected Calendars for Alarms"
msgstr "已选择用于提醒的日历"
@@ -5428,7 +5437,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
msgstr "<span weight=\"bold\">默认忙/闲服务器</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:16
#: ../plugins/publish-calendar/publish-calendar.glade.h:1
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">常规</span>"
@@ -5498,7 +5507,6 @@ msgstr ""
"星期日"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
#: ../mail/mail-config.glade.h:107
msgid "Pick a color"
msgstr "选取一种颜色"
@@ -5646,81 +5654,46 @@ msgstr "周三(_W)"
msgid "before every appointment"
msgstr "在每次约会前"
-#: ../calendar/gui/dialogs/calendar-setup.c:288
+#: ../calendar/gui/dialogs/calendar-setup.c:268
msgid "Cop_y calendar contents locally for offline operation"
msgstr "将日历内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:270
msgid "Cop_y task list contents locally for offline operation"
msgstr "将任务列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:272
msgid "Cop_y memo list contents locally for offline operation"
msgstr "将备忘列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:342
msgid "C_olor:"
msgstr "颜色(_O):"
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:377
msgid "Task List"
msgstr "任务列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:388
msgid "Memo List"
msgstr "备忘列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:477
msgid "Calendar Properties"
msgstr "日历属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:479
msgid "New Calendar"
msgstr "新建日历"
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:564
msgid "Task List Properties"
msgstr "任务列表属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:630
msgid "New Memo List"
msgstr "新建备忘列表"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "添加日历"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "添加任务列表"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "添加日历(_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "添加任务列表(_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "刷新(_R):"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "周"
-
#: ../calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "该事件已经被删除。"
@@ -5765,161 +5738,156 @@ msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器吗?"
-#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
#, c-format
msgid "Validation error: %s"
msgstr "校验错误:%s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2392
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2179
msgid " to "
msgstr " 到 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2396
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2183
msgid " (Completed "
msgstr " (完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2398
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2185
msgid "Completed "
msgstr "已完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2403
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2190
msgid " (Due "
msgstr " (预定 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2405
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2192
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2921
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2917
#, c-format
msgid "Attached message - %s"
msgstr "附加的信件 - %s"
#. translators, this count will always be >1
#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2926
-#: ../composer/e-msg-composer.c:3122
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2922
+#: ../composer/e-msg-composer.c:3117
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 封附加的信件"
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3186
-#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1030 ../mail/message-list.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3181
+#: ../mail/em-folder-tree.c:1007 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:1036 ../mail/message-list.c:1963
msgid "_Move"
msgstr "移动(_M)"
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3188
-#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3183
+#: ../mail/em-folder-tree.c:1009 ../mail/message-list.c:1965
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:820
+#: ../calendar/gui/dialogs/comp-editor.c:824
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:966 ../composer/e-msg-composer.c:2534
+#: ../calendar/gui/dialogs/comp-editor.c:968 ../composer/e-msg-composer.c:2534
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> 个附件"
-#: ../calendar/gui/dialogs/comp-editor.c:998
+#: ../calendar/gui/dialogs/comp-editor.c:1000
msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1001
-#: ../calendar/gui/dialogs/comp-editor.c:1530
+#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1532
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1120
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3693
+#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/event-page.c:1904
+#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:3698
#: ../plugins/groupwise-features/junk-settings.glade.h:8
#: ../plugins/groupwise-features/properties.glade.h:13
#: ../widgets/table/e-table-config.glade.h:18
msgid "_Remove"
msgstr "删除(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1121
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3694 ../mail/em-folder-tree.c:2081
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../composer/e-msg-composer.c:3699 ../mail/em-folder-tree.c:2129
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
msgid "_Properties"
msgstr "属性(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1123
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3696
+#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../composer/e-msg-composer.c:3701
msgid "_Add attachment..."
msgstr "添加附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1554
-#: ../mail/em-format-html-display.c:2300
+#: ../calendar/gui/dialogs/comp-editor.c:1556
+#: ../mail/em-format-html-display.c:2315
msgid "Show Attachments"
msgstr "显示附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1555
+#: ../calendar/gui/dialogs/comp-editor.c:1557
msgid "Press space key to toggle attachment bar"
msgstr "按空格键可切换附件栏"
-#: ../calendar/gui/dialogs/comp-editor.c:2162
-#: ../calendar/gui/dialogs/comp-editor.c:2205
+#: ../calendar/gui/dialogs/comp-editor.c:2163
+#: ../calendar/gui/dialogs/comp-editor.c:2206
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:2168
-#: ../calendar/gui/dialogs/comp-editor.c:2211
+#: ../calendar/gui/dialogs/comp-editor.c:2169
+#: ../calendar/gui/dialogs/comp-editor.c:2212
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:2171
+#: ../calendar/gui/dialogs/comp-editor.c:2214
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2174
-#: ../calendar/gui/dialogs/comp-editor.c:2217
+#: ../calendar/gui/dialogs/comp-editor.c:2175
+#: ../calendar/gui/dialogs/comp-editor.c:2218
#, c-format
msgid "Assigned Task - %s"
msgstr "分配的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:2177
+#: ../calendar/gui/dialogs/comp-editor.c:2220
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2179
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:2180
+#: ../calendar/gui/dialogs/comp-editor.c:2223
#, c-format
msgid "Journal entry - %s"
msgstr "日记条目 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2190
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../calendar/gui/dialogs/comp-editor.c:2191
+#: ../calendar/gui/dialogs/comp-editor.c:2233
msgid "No summary"
msgstr "没有概要"
-#: ../calendar/gui/dialogs/comp-editor.c:2777
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:406
-#: ../mail/em-utils.c:438 ../widgets/misc/e-attachment-bar.c:350
+#: ../calendar/gui/dialogs/comp-editor.c:2779 ../mail/em-utils.c:370
+#: ../widgets/misc/e-attachment-bar.c:350
msgid "attachment"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:2866
-#: ../calendar/gui/dialogs/comp-editor.c:2920
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2868
+#: ../calendar/gui/dialogs/comp-editor.c:2922
+#: ../calendar/gui/dialogs/comp-editor.c:2946
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:2968
+#: ../calendar/gui/dialogs/comp-editor.c:2975
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
@@ -6000,21 +5968,21 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:602
msgid "Appoint_ment"
msgstr "约会(_M)"
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:606
#: ../ui/evolution-event-editor.xml.h:14
msgid "Recurrence"
msgstr "再现"
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:814
+#: ../calendar/gui/dialogs/event-page.c:2723
msgid "This event has alarms"
msgstr "此事件有提醒"
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:886
#: ../calendar/gui/dialogs/event-page.glade.h:11
#: ../calendar/gui/dialogs/meeting-page.glade.h:5
#: ../calendar/gui/dialogs/memo-page.glade.h:2
@@ -6022,103 +5990,103 @@ msgstr "此事件有提醒"
msgid "Or_ganizer:"
msgstr "组织者(_G):"
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:924
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:926
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1091
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1094
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1259
+#: ../calendar/gui/dialogs/event-page.c:1263
#: ../calendar/gui/dialogs/memo-page.c:685
#: ../calendar/gui/dialogs/task-page.c:849
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1273
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1292
+#: ../calendar/gui/dialogs/event-page.c:1296
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1303
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1454
+#: ../calendar/gui/dialogs/event-page.c:1460
#: ../calendar/gui/dialogs/memo-page.c:720
#: ../calendar/gui/dialogs/task-page.c:906
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: ../calendar/gui/dialogs/event-page.c:1460
+#: ../calendar/gui/dialogs/event-page.c:1466
#: ../calendar/gui/dialogs/memo-page.c:726
#: ../calendar/gui/dialogs/task-page.c:912
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../calendar/gui/dialogs/event-page.c:1475
+#: ../calendar/gui/dialogs/event-page.c:1481
#: ../calendar/gui/dialogs/task-page.c:927
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:1897
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1905
+#: ../calendar/gui/dialogs/task-page.c:1202
msgid "_Add "
msgstr "添加(_A)"
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2630
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2936
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2942
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2948
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约会的 %d 分钟前"
-#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../calendar/gui/dialogs/event-page.c:2961
msgid "Customize"
msgstr "自定义"
#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2960
+#: ../calendar/gui/dialogs/event-page.c:2966
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
#: ../calendar/gui/e-cal-model-tasks.c:656
#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2318
-#: ../filter/filter-rule.c:890 ../mail/em-account-editor.c:701
+#: ../filter/filter-rule.c:891 ../mail/em-account-editor.c:701
#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
#: ../mail/em-junk-hook.c:78
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
#: ../plugins/itip-formatter/itip-formatter.c:1775
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
+#: ../widgets/misc/e-dateedit.c:1718
msgid "None"
msgstr "无"
@@ -6148,7 +6116,6 @@ msgid "Custom Alarm:"
msgstr "自定义提醒:"
#: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
msgid "D_escription:"
msgstr "描述(_E):"
@@ -6184,56 +6151,6 @@ msgstr "持续时间"
msgid "until"
msgstr "直到"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "出席者"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "单击此处添加出席者"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "通用名"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "来自...的代表"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "授权于"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "语言"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "成员"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:523
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "请回复"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "状态"
-
#: ../calendar/gui/dialogs/meeting-page.glade.h:1
msgid "<b>Att_endees</b>"
msgstr "<b>与会者(_E)</b>"
@@ -6255,18 +6172,18 @@ msgstr "组织者"
msgid "Organizer:"
msgstr "组织者:"
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2452
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2287
msgid "Memo"
msgstr "备忘"
-#: ../calendar/gui/dialogs/memo-page.c:870
+#: ../calendar/gui/dialogs/memo-page.c:868
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "无法打开“%s”中的备忘。"
-#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1490
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:18
msgid "To"
msgstr "收件人"
@@ -6289,42 +6206,6 @@ msgstr "描述(_D):"
msgid "_Group:"
msgstr "组(_G):"
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>日历选项</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "添加新日历"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "日历组"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "日历位置"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "日历名称"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>日历列表选项</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "添加新任务列表"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "任务列表组"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "任务列表名称"
-
#: ../calendar/gui/dialogs/recur-comp.c:52
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr "您即将修改再现事件。您想要修改何内容?"
@@ -6342,19 +6223,19 @@ msgid ""
"You are modifying a recurring journal entry. What would you like to modify?"
msgstr "您即将修改再现日记项。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
msgid "This Instance Only"
msgstr "只是本次"
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
msgid "This and Prior Instances"
msgstr "本次和以前各次"
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
msgid "This and Future Instances"
msgstr "本次和以后各次"
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
msgid "All Instances"
msgstr "所有各次"
@@ -6461,23 +6342,23 @@ msgstr "在"
msgid "occurrences"
msgstr "循环"
-#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#: ../calendar/gui/dialogs/recurrence-page.c:2157
msgid "Add exception"
msgstr "添加例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2202
+#: ../calendar/gui/dialogs/recurrence-page.c:2200
msgid "Could not get a selection to modify."
msgstr "无法获得要修改的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2206
msgid "Modify exception"
msgstr "修改例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2254
+#: ../calendar/gui/dialogs/recurrence-page.c:2252
msgid "Could not get a selection to delete."
msgstr "无法获得要删除的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2385
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
msgid "Date/Time"
msgstr "日期/时间"
@@ -6533,7 +6414,7 @@ msgstr "年"
msgid "Completed date is wrong"
msgstr "完成日期有错"
-#: ../calendar/gui/dialogs/task-details-page.c:517
+#: ../calendar/gui/dialogs/task-details-page.c:515
msgid "Web Page"
msgstr "网页"
@@ -6548,48 +6429,48 @@ msgstr "<span weight=\"bold\">状态</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:233
#: ../calendar/gui/e-cal-model-tasks.c:347
#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:923
#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2513 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2348 ../plugins/save-calendar/csv-format.c:390
msgid "Completed"
msgstr "已完成"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1034
msgid "High"
msgstr "高"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-component-preview.c:230
#: ../calendar/gui/e-cal-model-tasks.c:345
#: ../calendar/gui/e-cal-model-tasks.c:660
#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2345
msgid "In Progress"
msgstr "进行中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1032
msgid "Low"
msgstr "低"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:389
#: ../mail/message-list.c:1033
msgid "Normal"
msgstr "中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:240
#: ../calendar/gui/e-cal-model-tasks.c:343
#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2507
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2342
msgid "Not Started"
msgstr "尚未开始"
@@ -6602,7 +6483,7 @@ msgid "Stat_us:"
msgstr "状态(_U):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:391
msgid "Undefined"
msgstr "未定义"
@@ -6619,12 +6500,12 @@ msgstr "优先级(_P):"
msgid "_Web Page:"
msgstr "网页(_W):"
-#: ../calendar/gui/dialogs/task-editor.c:425
-#: ../calendar/gui/tasks-component.c:1245
+#: ../calendar/gui/dialogs/task-editor.c:424
+#: ../calendar/gui/tasks-component.c:1250
msgid "_Task"
msgstr "任务(_T)"
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:428
msgid "Task Details"
msgstr "任务细节"
@@ -6645,6 +6526,11 @@ msgstr "出席者(_N)..."
msgid "Categor_ies..."
msgstr "类别(_I)..."
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "De_scription:"
+msgstr "描述:"
+
#: ../calendar/gui/dialogs/task-page.glade.h:4
msgid "Or_ganiser:"
msgstr "组织者(_G):"
@@ -6657,49 +6543,6 @@ msgstr "时区:"
msgid "_Due date:"
msgstr "到期日期(_D):"
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>忙/闲日历(_A)</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>发布频率</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>发布位置(_L)</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "忙闲发布设置"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "每日(_D)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "手动(_M)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "密码(_P):"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "记住密码(_R)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "用户名(_U):"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "每周(_W)"
-
#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
#: ../calendar/gui/e-alarm-list.c:396
#, c-format
@@ -6774,72 +6617,72 @@ msgstr "在 %2$s 时 %1$s"
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2914
+#: ../calendar/gui/e-cal-component-memo-preview.c:74
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:2998
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:157
+#: ../calendar/gui/e-cal-component-preview.c:157 ../filter/filter-rule.c:805
+#: ../shell/e-shell-folder-title-bar.c:593
msgid "Untitled"
msgstr "无标题"
-#: ../calendar/gui/e-cal-component-memo-preview.c:206
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
+#: ../calendar/gui/e-cal-component-memo-preview.c:208
+#: ../calendar/gui/e-cal-component-preview.c:197
+#: ../calendar/gui/e-cal-component-preview.c:208
msgid "Start Date:"
msgstr "开始日期:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:219
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-memo-preview.c:221
+#: ../calendar/gui/e-cal-component-preview.c:271
#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
+#: ../widgets/misc/e-attachment.glade.h:2
msgid "Description:"
msgstr "描述:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:252
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-memo-preview.c:254
+#: ../calendar/gui/e-cal-component-preview.c:304
msgid "Web Page:"
msgstr "网页:"
-#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-cal-component-preview.c:190
#: ../calendar/gui/e-itip-control.c:1135
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "概要:"
-#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:219
msgid "Due Date:"
msgstr "到期日期:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:226
#: ../calendar/gui/e-itip-control.c:1159
#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:961
+#: ../plugins/itip-formatter/itip-view.c:968
msgid "Status:"
msgstr "状态:"
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:250
msgid "Priority:"
msgstr "优先级:"
#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
msgid "Public"
msgstr "公开"
#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-table.c:367
msgid "Private"
msgstr "保密"
#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:368
msgid "Confidential"
msgstr "机密"
@@ -6860,12 +6703,12 @@ msgid "Summary"
msgstr "概要"
#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:440
msgid "Free"
msgstr "空闲"
#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:441
#: ../calendar/gui/e-meeting-time-sel.c:411
msgid "Busy"
msgstr "繁忙"
@@ -6902,12 +6745,12 @@ msgstr "否"
#: ../calendar/gui/e-meeting-list-view.c:169
#: ../calendar/gui/e-meeting-list-view.c:183
#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1213
+#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1204
#: ../plugins/itip-formatter/itip-formatter.c:240
#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:710
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../plugins/plugin-manager/plugin-manager.c:77
+#: ../widgets/misc/e-attachment-bar.c:712
+#: ../widgets/misc/e-charset-picker.c:64
msgid "Unknown"
msgstr "未知"
@@ -6919,27 +6762,27 @@ msgstr "重复"
msgid "Assigned"
msgstr "已分配"
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:422
msgid "Save As..."
msgstr "另存为..."
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2146
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2160
msgid "Select folder to save selected attachments..."
msgstr "选择保存选中附件的文件夹..."
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:447
#, c-format
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1144 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1283
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:904
+#: ../mail/em-folder-view.c:1151 ../mail/em-popup.c:564 ../mail/em-popup.c:575
msgid "_Save As..."
msgstr "另存为(_S)..."
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:565
+#: ../mail/em-popup.c:576
msgid "Set as _Background"
msgstr "设为背景(_B)"
@@ -6947,84 +6790,84 @@ msgstr "设为背景(_B)"
msgid "_Save Selected"
msgstr "保存选中(_S)"
-#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:786
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:410
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:411
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:412
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:413
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:414
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:415
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:416
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:417
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:418
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:419
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:420
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
+#: ../calendar/gui/e-calendar-table.c:705
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:483
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:958
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:660
msgid "Updating objects"
msgstr "更新对象"
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1351
+#: ../calendar/gui/e-calendar-table.c:1107
+#: ../calendar/gui/e-calendar-view.c:1229 ../calendar/gui/e-memo-table.c:799
+#: ../composer/e-msg-composer.c:1355
msgid "Save as..."
msgstr "另存为..."
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1278
+#: ../calendar/gui/e-calendar-view.c:1662
msgid "New _Task"
msgstr "新建任务(_T)"
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1282 ../calendar/gui/e-memo-table.c:903
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1145
+#: ../calendar/gui/e-calendar-table.c:1284
+#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:905
+#: ../mail/em-folder-view.c:1152
#: ../plugins/print-message/org-gnome-print-message.xml.h:3
#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7032,52 +6875,52 @@ msgstr "打开网页(_W)"
msgid "_Print..."
msgstr "打印(_P)..."
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1288
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:909
#: ../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:1289
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../calendar/gui/e-calendar-table.c:1290
+#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:911
#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "粘贴(_P)"
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1294 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "分配任务(_A)"
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1295 ../calendar/gui/e-memo-table.c:915
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1296
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1297
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1298
msgid "_Mark as Incomplete"
msgstr "标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1299
msgid "_Mark Selected Tasks as Incomplete"
msgstr "把任务标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1304
msgid "_Delete Selected Tasks"
msgstr "删除选中任务(_D)"
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1537
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "单击以添加任务"
@@ -7087,7 +6930,7 @@ msgstr "单击以添加任务"
msgid "% Complete"
msgstr "% 完成"
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:656
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:692
msgid "Complete"
msgstr "完成"
@@ -7108,105 +6951,112 @@ msgstr "优先级"
msgid "Start date"
msgstr "开始日期"
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:16
+msgid "Status"
+msgstr "状态"
+
#: ../calendar/gui/e-calendar-table.etspec.h:12
msgid "Task sort"
msgstr "任务排序"
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1348
msgid "Moving items"
msgstr "移动项目"
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1350
msgid "Copying items"
msgstr "复制项目"
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1659
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1660
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1661
msgid "New _Meeting"
msgstr "新建会议(_M)"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1672
msgid "_Current View"
msgstr "当前视图(_C)"
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1674
msgid "Select T_oday"
msgstr "选择今天(_O)"
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1675
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1691
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1692
msgid "Mo_ve to Calendar..."
msgstr "移至日历(_V)..."
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1693
msgid "_Delegate Meeting..."
msgstr "代理会议(_D)..."
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1694
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1695
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1696
msgid "_Reply"
msgstr "回复(_R)"
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1139
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1145
+#: ../mail/em-popup.c:569 ../mail/em-popup.c:580
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1702
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1703 ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1704
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2158
#, c-format
msgid "Organizer: %s <%s>"
msgstr "组织者:%s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2162
#, c-format
msgid "Organizer: %s"
msgstr "组织者:%s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2481
+#: ../calendar/gui/e-calendar-view.c:2178 ../calendar/gui/print.c:2316
#, c-format
msgid "Location: %s"
msgstr "位置:%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2209
#, c-format
msgid "Time: %s %s"
msgstr "时间:%s %s"
@@ -7221,15 +7071,13 @@ msgstr "%Y年%m月%d日%A%H:%M:%S"
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:124
+#: ../calendar/gui/e-cell-date-edit-text.c:127
#, c-format
msgid ""
"The date must be entered in the format: \n"
-"\n"
"%s"
msgstr ""
"日期必须按照以下格式输入:\n"
-"\n"
"%s"
#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
@@ -7250,19 +7098,19 @@ msgstr "%02i 分钟分割"
#: ../calendar/gui/e-day-view-top-item.c:1311
#: ../calendar/gui/e-day-view.c:2089
#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1643
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1503
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:746 ../calendar/gui/e-day-view.c:1089
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:952
+#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:811
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:954
+#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
msgid "pm"
msgstr "下午"
@@ -7380,12 +7228,12 @@ msgstr "iCalendar 错误"
#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
+#: ../plugins/itip-formatter/itip-view.c:341
#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:343
+#: ../plugins/itip-formatter/itip-view.c:409
#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:477
#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:479
msgid "An unknown person"
msgstr "未知的人"
@@ -7609,75 +7457,74 @@ msgstr "附件中没有有效的日历信件"
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1944
msgid "Update complete\n"
msgstr "更新完成\n"
-#: ../calendar/gui/e-itip-control.c:1964
+#: ../calendar/gui/e-itip-control.c:1977
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: ../calendar/gui/e-itip-control.c:1974
+#: ../calendar/gui/e-itip-control.c:1994
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
-#: ../calendar/gui/e-itip-control.c:1986
+#: ../calendar/gui/e-itip-control.c:2012
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新出席者状态!\n"
-#: ../calendar/gui/e-itip-control.c:2003
+#: ../calendar/gui/e-itip-control.c:2036
msgid "Attendee status updated\n"
msgstr "更新出席者状态\n"
-#: ../calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2043
#: ../plugins/itip-formatter/itip-formatter.c:1108
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
-#: ../calendar/gui/e-itip-control.c:2030 ../calendar/gui/e-itip-control.c:2078
+#: ../calendar/gui/e-itip-control.c:2074 ../calendar/gui/e-itip-control.c:2131
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: ../calendar/gui/e-itip-control.c:2032 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2080 ../calendar/gui/e-itip-control.c:2139
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
-#: ../calendar/gui/e-itip-control.c:2162
+#: ../calendar/gui/e-itip-control.c:2223
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2296
msgid "Update"
msgstr "更新"
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2324
#: ../plugins/groupwise-features/process-meeting.c:48
msgid "Accept"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2325
msgid "Tentatively accept"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2326
#: ../plugins/groupwise-features/process-meeting.c:50
msgid "Decline"
msgstr "拒绝"
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2355
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2383
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2411
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
-#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
+#: ../calendar/gui/e-itip-control.c:2439 ../calendar/gui/itip-utils.c:710
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -7794,6 +7641,12 @@ msgstr "被委任的"
msgid "Attendee "
msgstr "出席者 "
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "请回复"
+
#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
msgid "In Process"
msgstr "处理中"
@@ -7801,7 +7654,7 @@ msgstr "处理中"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2111
+#: ../calendar/gui/e-meeting-time-sel.c:2116
msgid "%A, %B %d, %Y"
msgstr "%Y年%m月%d日%A"
@@ -7810,7 +7663,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:468
-#: ../calendar/gui/e-meeting-time-sel.c:2144
+#: ../calendar/gui/e-meeting-time-sel.c:2149
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日%A"
@@ -7820,7 +7673,7 @@ msgstr "%Y年%m月%d日%A"
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
-#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412
msgid "Out of Office"
msgstr "办公室以外"
@@ -7828,67 +7681,95 @@ msgstr "办公室以外"
msgid "No Information"
msgstr "没有信息"
-#: ../calendar/gui/e-meeting-time-sel.c:427
+#: ../calendar/gui/e-meeting-time-sel.c:428
msgid "A_ttendees..."
msgstr "出席者(_T)..."
-#: ../calendar/gui/e-meeting-time-sel.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:449
msgid "O_ptions"
msgstr "选项(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:466
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:476
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:491
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: ../calendar/gui/e-meeting-time-sel.c:501
+#: ../calendar/gui/e-meeting-time-sel.c:506
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:524
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:534
+#: ../calendar/gui/e-meeting-time-sel.c:539
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:556
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:565
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:574
msgid "_Required people"
msgstr "必需的人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:583
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:619
msgid "_Start time:"
msgstr "开始时间(_S):"
-#: ../calendar/gui/e-meeting-time-sel.c:641
+#: ../calendar/gui/e-meeting-time-sel.c:646
msgid "_End time:"
msgstr "结束时间(_E):"
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "出席者"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "单击此处添加出席者"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "通用名"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "来自...的代表"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "授权于"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "语言"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "成员"
+
+#: ../calendar/gui/e-memo-table.c:920
msgid "_Delete Selected Memos"
msgstr "删除选中备忘(_D)"
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
msgid "Click to add a memo"
msgstr "单击以添加备忘"
@@ -7896,8 +7777,8 @@ msgstr "单击以添加备忘"
msgid "Memo sort"
msgstr "备忘排序"
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2771
+#: ../calendar/gui/e-memos.c:732 ../calendar/gui/e-tasks.c:844
+#: ../calendar/gui/gnome-cal.c:2826
#, c-format
msgid ""
"Error on %s:\n"
@@ -7906,38 +7787,33 @@ msgstr ""
"%s 错误:\n"
" %s"
-#: ../calendar/gui/e-memos.c:772
+#: ../calendar/gui/e-memos.c:781
msgid "Loading memos"
msgstr "装入备忘"
-#: ../calendar/gui/e-memos.c:853
+#: ../calendar/gui/e-memos.c:862
#, c-format
msgid "Opening memos at %s"
msgstr "在 %s 打开备忘"
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1035 ../calendar/gui/e-tasks.c:1249
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "为 %s 输入密码"
-
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:894
msgid "Loading tasks"
msgstr "装入任务"
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:981
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1226
msgid "Completing tasks..."
msgstr "正在完成任务..."
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1276
msgid "Expunging"
msgstr "销毁"
@@ -7949,47 +7825,47 @@ msgstr "选择时区"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1624
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1484
msgid "%d %B"
msgstr "%-m月%-d日"
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:824
msgid "Updating query"
msgstr "更新查询"
-#: ../calendar/gui/gnome-cal.c:2428
+#: ../calendar/gui/gnome-cal.c:2477
msgid "_Custom View"
msgstr "自定义视图(_C)"
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2478
msgid "_Save Custom View"
msgstr "保存自定义视图(_S)"
-#: ../calendar/gui/gnome-cal.c:2434
+#: ../calendar/gui/gnome-cal.c:2483
msgid "_Define Views..."
msgstr "定义视图(_D)..."
-#: ../calendar/gui/gnome-cal.c:2600
+#: ../calendar/gui/gnome-cal.c:2649
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: ../calendar/gui/gnome-cal.c:2619
+#: ../calendar/gui/gnome-cal.c:2668
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: ../calendar/gui/gnome-cal.c:2628
+#: ../calendar/gui/gnome-cal.c:2677
#, c-format
msgid "Loading memos at %s"
msgstr "装入位于 %s 的备忘"
-#: ../calendar/gui/gnome-cal.c:2736
+#: ../calendar/gui/gnome-cal.c:2785
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: ../calendar/gui/gnome-cal.c:3664
+#: ../calendar/gui/gnome-cal.c:3724
msgid "Purging"
msgstr "销毁"
@@ -8103,77 +7979,76 @@ msgstr "iCalendar 信息"
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:456
msgid "_New Memo List"
msgstr "新建备忘列表(_N)"
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:532
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d 个备忘"
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:520
-#: ../mail/mail-component.c:562
+#: ../calendar/gui/memos-component.c:534 ../calendar/gui/tasks-component.c:525
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ",已选中 %d 个"
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:581
msgid "Failed upgrading memos."
msgstr "升级备忘失败。"
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:879
#, c-format
msgid "Unable to open the memo list '%s' for creating events and meetings"
msgstr "无法打开备忘列表“%s”来创建事件和会议"
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:892
msgid "There is no calendar available for creating memos"
msgstr "没有可创建备忘的日历"
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:988
msgid "Memo Source Selector"
msgstr "备忘来源选择器"
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1171
msgid "New memo"
msgstr "新建备忘"
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1172
msgid "Mem_o"
msgstr "备忘(_O)"
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1173
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1179
msgid "New shared memo"
msgstr "新建共享备忘"
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1180
msgid "_Shared memo"
msgstr "共享备忘(_S)"
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1181
msgid "Create a shared new memo"
msgstr "创建新的共享备忘"
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1187
msgid "New memo list"
msgstr "新建备忘列表"
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1188
msgid "Memo li_st"
msgstr "备忘列表(_S)"
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1189
msgid "Create a new memo list"
msgstr "创建新备忘列表"
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:336 ../calendar/gui/memos-control.c:352
msgid "Print Memos"
msgstr "打印备忘"
@@ -8200,321 +8075,289 @@ msgstr ""
"请稍候,Evolution 正在升迁您的文件夹..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
+#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:799
+#: ../calendar/gui/migration.c:809
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "无法升迁日历“%s”"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:967
+#: ../calendar/gui/migration.c:977
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
-#: ../calendar/gui/migration.c:1211
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:404
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:435
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:548
+#: ../calendar/gui/migration.c:1226
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:398
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:429
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:542
msgid "Notes"
msgstr "笔记"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "1st"
msgstr "1日"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "2nd"
msgstr "2日"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "3rd"
msgstr "3日"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "4th"
msgstr "4日"
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:513
msgid "5th"
msgstr "5日"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "6th"
msgstr "6日"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "7th"
msgstr "7日"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "8th"
msgstr "8日"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "9th"
msgstr "9日"
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:514
msgid "10th"
msgstr "10日"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "11th"
msgstr "11日"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "12th"
msgstr "12日"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "13th"
msgstr "13日"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "14th"
msgstr "14日"
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:515
msgid "15th"
msgstr "15日"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "16th"
msgstr "16日"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "17th"
msgstr "17日"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "18th"
msgstr "18日"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "19th"
msgstr "19日"
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:516
msgid "20th"
msgstr "20日"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "21st"
msgstr "21日"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "22nd"
msgstr "22日"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "23rd"
msgstr "23日"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "24th"
msgstr "24日"
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:517
msgid "25th"
msgstr "25日"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "26th"
msgstr "26日"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "27th"
msgstr "27日"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "28th"
msgstr "28日"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "29th"
msgstr "29日"
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:518
msgid "30th"
msgstr "30日"
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:519
msgid "31st"
msgstr "31日"
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:735
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:594
msgid "Su"
msgstr "日"
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
msgid "Mo"
msgstr "一"
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
msgid "Tu"
msgstr "二"
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:594
msgid "We"
msgstr "三"
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
msgid "Th"
msgstr "四"
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
msgid "Fr"
msgstr "五"
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:595
msgid "Sa"
msgstr "六"
-#. Day
-#: ../calendar/gui/print.c:2047
-msgid "Selected day (%a %b %d %Y)"
-msgstr "选中的日期(%Y年%m月%d日%A)"
-
-#: ../calendar/gui/print.c:2072 ../calendar/gui/print.c:2076
-msgid "%a %b %d"
-msgstr "%m月%d日%A"
-
-#: ../calendar/gui/print.c:2073
-msgid "%a %d %Y"
-msgstr "%Y年%d日%A"
-
-#: ../calendar/gui/print.c:2077 ../calendar/gui/print.c:2079
-#: ../calendar/gui/print.c:2080
-msgid "%a %b %d %Y"
-msgstr "%Y年%m月%d日%A"
-
-#: ../calendar/gui/print.c:2084
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "选中的周(%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:2092
-msgid "Selected month (%b %Y)"
-msgstr "选中的月(%Y年%m月)"
-
-#. Year
-#: ../calendar/gui/print.c:2099
-msgid "Selected year (%Y)"
-msgstr "选中的年(%Y年)"
-
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2283
msgid "Appointment"
msgstr "约会"
-#: ../calendar/gui/print.c:2450
+#: ../calendar/gui/print.c:2285
msgid "Task"
msgstr "任务"
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2307
#, c-format
msgid "Summary: %s"
msgstr "概要:%s"
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/print.c:2358
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
-#: ../calendar/gui/print.c:2540
+#: ../calendar/gui/print.c:2375
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2387
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2399
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: ../calendar/gui/print.c:2577
+#: ../calendar/gui/print.c:2412
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2423
msgid "Contacts: "
msgstr "联系人:"
-#: ../calendar/gui/print.c:2654 ../calendar/gui/print.c:2723
-msgid "Print Item"
-msgstr "打印项"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2524
+msgid "Upcoming Appointments"
+msgstr "即将到来的约会"
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:447
msgid "_New Task List"
msgstr "新建任务列表(_N)"
-#: ../calendar/gui/tasks-component.c:518
+#: ../calendar/gui/tasks-component.c:523
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: ../calendar/gui/tasks-component.c:567
+#: ../calendar/gui/tasks-component.c:572
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: ../calendar/gui/tasks-component.c:878
+#: ../calendar/gui/tasks-component.c:883
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "无法打开任务列表“%s”来创建事件和会议"
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:896
msgid "There is no calendar available for creating tasks"
msgstr "没有可创建任务的日历"
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:993
msgid "Task Source Selector"
msgstr "任务来源选择器"
-#: ../calendar/gui/tasks-component.c:1244
+#: ../calendar/gui/tasks-component.c:1249
msgid "New task"
msgstr "新建任务"
-#: ../calendar/gui/tasks-component.c:1246
+#: ../calendar/gui/tasks-component.c:1251
msgid "Create a new task"
msgstr "创建新任务"
-#: ../calendar/gui/tasks-component.c:1252
+#: ../calendar/gui/tasks-component.c:1257
msgid "New assigned task"
msgstr "新建分配的任务"
-#: ../calendar/gui/tasks-component.c:1253
+#: ../calendar/gui/tasks-component.c:1258
msgid "Assigne_d Task"
msgstr "分配的任务(_D)"
-#: ../calendar/gui/tasks-component.c:1254
+#: ../calendar/gui/tasks-component.c:1259
msgid "Create a new assigned task"
msgstr "创建新分配的任务"
-#: ../calendar/gui/tasks-component.c:1260
+#: ../calendar/gui/tasks-component.c:1265
msgid "New task list"
msgstr "新建任务列表"
-#: ../calendar/gui/tasks-component.c:1261
+#: ../calendar/gui/tasks-component.c:1266
msgid "Tas_k list"
msgstr "任务列表(_K)"
-#: ../calendar/gui/tasks-component.c:1262
+#: ../calendar/gui/tasks-component.c:1267
msgid "Create a new task list"
msgstr "创建新任务列表"
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -8525,11 +8368,11 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
msgid "Do not ask me again."
msgstr "不要再次询问。"
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:478 ../calendar/gui/tasks-control.c:494
msgid "Print Tasks"
msgstr "打印任务"
@@ -10105,58 +9948,6 @@ msgstr "太平洋/沃利斯"
msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1017
-msgid "Attachment Bar"
-msgstr "附件栏"
-
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "无法附加文件 %s:%s"
-
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "无法附加文件 %s:不是普通文件"
-
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "附件属性"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "文件名:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME 类型:"
-
#: ../composer/e-msg-composer-hdrs.c:570
msgid "Posting destination"
msgstr "投递目的"
@@ -10165,7 +9956,7 @@ msgstr "投递目的"
msgid "Choose folders to post the message to."
msgstr "选择要将信件投递到哪个文件夹。"
-#: ../composer/e-msg-composer-hdrs.c:603
+#: ../composer/e-msg-composer-hdrs.c:602
msgid "Click here for the address book"
msgstr "单击此处以使用地址簿"
@@ -10176,45 +9967,45 @@ msgstr "单击此处以使用地址簿"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:634
msgid "_Reply-To:"
msgstr "回复到(_R):"
#.
#. * From
#.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:641
msgid "Fr_om:"
msgstr "发件人(_O):"
#.
#. * Subject
#.
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:648
msgid "S_ubject:"
msgstr "主题(_U):"
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:657
msgid "_To:"
msgstr "收信人(_T):"
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:658
msgid "Enter the recipients of the message"
msgstr "输入信件的收件人"
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:661
msgid "_Cc:"
msgstr "抄送(_C):"
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:662
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该信件副本的收件人地址"
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:665
msgid "_Bcc:"
msgstr "暗送(_B):"
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:666
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -10223,15 +10014,15 @@ msgstr "输入将接收该信件副本,但不出现在收件人列表中的收
#.
#. * Post-To
#.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:673
msgid "_Post To:"
msgstr "投递到(_P):"
-#: ../composer/e-msg-composer-hdrs.c:679
+#: ../composer/e-msg-composer-hdrs.c:678
msgid "Click here to select folders to post to"
msgstr "单击此处以选择要投递到的文件夹"
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-msg-composer-hdrs.c:683
msgid "Post To:"
msgstr "投递到:"
@@ -10243,45 +10034,45 @@ msgstr "附件(_T)"
msgid "Insert Attachment"
msgstr "插入附件"
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:834
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信件签名:未对此账户设置签名证书"
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:841
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信件加密:未对此账户设置加密证书"
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2563
+#: ../composer/e-msg-composer.c:1301 ../composer/e-msg-composer.c:2563
msgid "Hide _Attachment Bar"
msgstr "隐藏附件栏(_A)"
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2566
-#: ../composer/e-msg-composer.c:3939
+#: ../composer/e-msg-composer.c:1304 ../composer/e-msg-composer.c:2566
+#: ../composer/e-msg-composer.c:3944
msgid "Show _Attachment Bar"
msgstr "显示附件栏(_A)"
-#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
+#: ../composer/e-msg-composer.c:1336 ../composer/e-msg-composer.c:1370
#: ../plugins/mail-remote/e-corba-utils.c:135
msgid "Unknown reason"
msgstr "未知原因"
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1408
msgid "Could not open file"
msgstr "无法打开文件"
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1416
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器获取信件"
-#: ../composer/e-msg-composer.c:1697
+#: ../composer/e-msg-composer.c:1701
msgid "Untitled Message"
msgstr "无标题信件"
#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
+#: ../composer/e-msg-composer.c:1736
msgid "Open File"
msgstr "打开文件"
@@ -10294,12 +10085,12 @@ msgstr "自动生成的"
msgid "Si_gnature:"
msgstr "签名(_G):"
-#: ../composer/e-msg-composer.c:2577 ../composer/e-msg-composer.c:3821
-#: ../composer/e-msg-composer.c:3824
+#: ../composer/e-msg-composer.c:2577 ../composer/e-msg-composer.c:3826
+#: ../composer/e-msg-composer.c:3829
msgid "Compose Message"
msgstr "撰写新邮件"
-#: ../composer/e-msg-composer.c:5048
+#: ../composer/e-msg-composer.c:5054
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)</"
"b>"
@@ -10447,11 +10238,11 @@ msgstr "保存信件(_S)"
#: ../data/evolution.desktop.in.in.h:1
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:523
+#: ../shell/main.c:510
msgid "Evolution"
msgstr "Evolution"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:574
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:584
msgid "Groupware Suite"
msgstr "Groupwise 套件"
@@ -10467,109 +10258,6 @@ msgstr "地址卡"
msgid "calendar information"
msgstr "日历信息"
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>您目前的状态是“办公室以外”。</b>\n"
-"\n"
-"您想要将您的状态更改为“办公室内”吗?"
-
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>办公室以外信件:</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>状态:</b>"
-
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>在您位于办公室外,如果有人给您发送邮件,则会自动将下面指定的信件\n"
-"送回。</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "我正在办公室内"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "我正在办公室外"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "不,请不要更改状态"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "离开办公室助手"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "是,更改状态"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>接收电子邮件</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>发送电子邮件:</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>此页面允许您选择是否要对您发出的信件使用阅读收条进行通知,\n"
-"以及指定在别人请求您的阅读收条时 Evolution 应该怎么做。</small>"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "总是发回阅读收条"
-
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "询问我是否想要发回阅读收条"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "从不发回阅读收条"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "阅读收条"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "我发出的所有信件都要求阅读收条"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "除非信件发送给邮件列表,或者是给我自己发的"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr "当您收到请求阅读收条的邮件,Evolution 应该做什么?"
-
#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
msgid "Evolution Error"
msgstr "Evolution 错误"
@@ -10592,6 +10280,19 @@ msgstr "Evolution 查询"
msgid "Internal error, unknown error '%s' requested"
msgstr "内部错误,请求了未知的错误“%s”"
+#: ../e-util/e-print.c:115
+msgid "An error occurred while printing"
+msgstr ""
+
+#: ../e-util/e-print.c:122
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:128
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+
#: ../e-util/e-system.error.xml.h:2
msgid "Cannot open file &quot;{0}&quot;."
msgstr "无法打开文件“{0}”。"
@@ -10612,70 +10313,109 @@ msgstr "文件已存在“{0}”。"
msgid "Overwrite file?"
msgstr "覆盖文件吗?"
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:134
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:139
msgid "_Overwrite"
msgstr "覆盖(_O)"
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "托盘方向。"
-
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:80
#, c-format
msgid "1 second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d 秒前"
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+
+#: ../filter/filter-datespec.c:81
#, c-format
msgid "1 minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d 分钟前"
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] ""
+
+#: ../filter/filter-datespec.c:82
#, c-format
msgid "1 hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d 小时前"
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] ""
+
+#: ../filter/filter-datespec.c:83
#, c-format
msgid "1 day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天前"
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "未来的 %d 天"
+
+#: ../filter/filter-datespec.c:84
#, c-format
msgid "1 week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d 周前"
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+
+#: ../filter/filter-datespec.c:85
#, c-format
msgid "1 month ago"
msgid_plural "%d months ago"
msgstr[0] "%d 个月前"
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "未来的 %d 个月"
+
+#: ../filter/filter-datespec.c:86
#, c-format
msgid "1 year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年前"
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "未来 %d 年"
+
+#: ../filter/filter-datespec.c:287
msgid "<click here to select a date>"
msgstr "<单击此处以选择日期>"
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
msgid "now"
msgstr "现在"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:449
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
@@ -10683,19 +10423,19 @@ msgstr "选择用于比较的时间"
msgid "Choose a file"
msgstr "选择文件"
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../filter/filter-label.c:120 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:91
msgid "Important"
msgstr "重要"
#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:147
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1057
+#: ../mail/mail-config.glade.h:150
msgid "To Do"
msgstr "待办"
#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1058
#: ../mail/mail-config.glade.h:97
msgid "Later"
msgstr "稍候"
@@ -10704,52 +10444,52 @@ msgstr "稍候"
msgid "Test"
msgstr "测试"
-#: ../filter/filter-rule.c:799
+#: ../filter/filter-rule.c:800
msgid "_Search name:"
msgstr "搜索名称(_B):"
-#: ../filter/filter-rule.c:827
+#: ../filter/filter-rule.c:828
msgid "Find items that meet the following criteria"
msgstr "查找符合下列条件的项目"
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:867
msgid "If all criteria are met"
msgstr "如果满足所有条件"
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:867
msgid "If any criteria are met"
msgstr "如果满足任一条件"
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:869
msgid "_Find items:"
msgstr "查找项目(_F):"
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
msgid "All related"
msgstr "相关的全部"
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
msgid "Replies"
msgstr "回复"
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
msgid "Replies and parents"
msgstr "回复及原始邮件"
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:891
msgid "No reply or parent"
msgstr "无回复或原始邮件"
-#: ../filter/filter-rule.c:892
-msgid "Include threads"
-msgstr "包含线索"
+#: ../filter/filter-rule.c:893
+msgid "I_nclude threads"
+msgstr "包含线索(_N)"
-#: ../filter/filter-rule.c:987 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:989 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:307
msgid "Incoming"
msgstr "接收"
-#: ../filter/filter-rule.c:987 ../mail/em-utils.c:312
+#: ../filter/filter-rule.c:989 ../mail/em-utils.c:308
msgid "Outgoing"
msgstr "寄出"
@@ -10773,7 +10513,7 @@ msgstr "缺少日期。"
msgid "Missing file name."
msgstr "缺少文件名。"
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
msgid "Missing name."
msgstr "缺少名称。"
@@ -10835,35 +10575,44 @@ msgstr "相对于当前时间的时间"
msgid "ago"
msgstr "过去"
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr ""
+
+#: ../filter/filter.glade.h:18
msgid "months"
msgstr "月"
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:181
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:186
msgid "seconds"
msgstr "秒"
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
msgid "the current time"
msgstr "当前时间"
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
msgid "the time you specify"
msgstr "您指定的时间"
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "weeks"
+msgstr "周"
+
+#: ../filter/filter.glade.h:23
msgid "years"
msgstr "年"
-#: ../filter/rule-editor.c:378
+#: ../filter/rule-editor.c:380
msgid "Add Rule"
msgstr "添加规则"
-#: ../filter/rule-editor.c:454
+#: ../filter/rule-editor.c:459
msgid "Edit Rule"
msgstr "编辑规则"
-#: ../filter/rule-editor.c:732
+#: ../filter/rule-editor.c:747
msgid "Rule name"
msgstr "规则名"
@@ -10908,11 +10657,10 @@ msgstr "Evolution 邮件撰写控件"
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件首选项控件"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:580
-#: ../mail/mail-component.c:581 ../mail/mail-component.c:722
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:529
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:387
+#: ../mail/mail-component.c:582 ../mail/mail-component.c:583
+#: ../mail/mail-component.c:738
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
msgid "Mail"
msgstr "邮件"
@@ -10949,7 +10697,7 @@ msgstr ""
"并选中复选框表明您接受该协议\n"
#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:510
msgid "Select Folder"
msgstr "选择文件夹"
@@ -10957,7 +10705,7 @@ msgstr "选择文件夹"
msgid "Ask for each message"
msgstr "每封信都询问"
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:90
msgid "Identity"
msgstr "标识"
@@ -10969,16 +10717,16 @@ msgstr "接收电子邮件"
msgid "Automatically check for _new mail every"
msgstr "自动检查新邮件的间隔(_N)"
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:134
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:66
msgid "Defaults"
msgstr "默认"
#. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:126
#: ../plugins/exchange-operations/exchange-account-setup.c:317
msgid "Security"
msgstr "安全"
@@ -10992,7 +10740,7 @@ msgstr "接收选项"
msgid "Checking for New Mail"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:32
msgid "Account Editor"
msgstr "账户编辑器"
@@ -11002,22 +10750,22 @@ msgstr "Evolution 账户助手"
#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
#: ../mail/em-account-prefs.c:409
-msgid "Disable"
-msgstr "禁用"
+msgid "Di_sable"
+msgstr "禁用(_S)"
#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "启用"
+#: ../mail/em-account-prefs.c:411 ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "启用(_N)"
#. translators: default account indicator
#: ../mail/em-account-prefs.c:466
msgid "[Default]"
msgstr "[默认]"
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:945
+#: ../plugins/plugin-manager/plugin-manager.c:261
#: ../plugins/publish-calendar/publish-calendar.c:493
msgid "Enabled"
msgstr "已启用"
@@ -11030,20 +10778,20 @@ msgstr "账户名"
msgid "Protocol"
msgstr "协议"
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:1033
+#: ../mail/em-composer-prefs.c:310 ../mail/em-composer-prefs.c:436
+#: ../mail/mail-config.c:1029
msgid "Unnamed"
msgstr "未命名"
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:951
msgid "Language(s)"
msgstr "语言"
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:994
msgid "Add signature script"
msgstr "添加签名脚本"
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:1014
msgid "Signature(s)"
msgstr "签名"
@@ -11066,6 +10814,10 @@ msgstr ""
"在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
"${TimeZone},${Sender}写道:"
+#: ../mail/em-composer-utils.c:1853
+msgid "-----Original Message-----"
+msgstr "-------- 原始信件 --------"
+
#: ../mail/em-filter-editor.c:155
msgid "_Filter Rules"
msgstr "过滤规则(_F)"
@@ -11320,9 +11072,9 @@ msgstr "开始于"
msgid "Stop Processing"
msgstr "停止处理"
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1661
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:853
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1660
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:854
+#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
#: ../mail/message-tag-followup.c:336
#: ../plugins/groupwise-features/properties.glade.h:6
#: ../smime/lib/e-cert.c:1132
@@ -11338,68 +11090,68 @@ msgstr "取消状态"
msgid "<b>Then</b>"
msgstr "<b>则</b>"
-#: ../mail/em-folder-browser.c:168
+#: ../mail/em-folder-browser.c:170
msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
msgid "All Messages"
msgstr "全部信件"
-#: ../mail/em-folder-browser.c:191
+#: ../mail/em-folder-browser.c:193
msgid "Unread Messages"
msgstr "未读信件"
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:195
msgid "No Label"
msgstr "无标签"
-#: ../mail/em-folder-browser.c:200
+#: ../mail/em-folder-browser.c:202
msgid "Read Messages"
msgstr "已读信件"
-#: ../mail/em-folder-browser.c:201
+#: ../mail/em-folder-browser.c:203
msgid "Recent Messages"
msgstr "最近信件"
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:204
msgid "Last 5 Days' Messages"
msgstr "前五天的信件"
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:205
msgid "Messages with Attachments"
msgstr "有附件的信件"
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:206
msgid "Important Messages"
msgstr "重要信件"
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:207
msgid "Messages Not Junk"
msgstr "不是垃圾邮件"
-#: ../mail/em-folder-browser.c:1028
+#: ../mail/em-folder-browser.c:1025
msgid "Account Search"
msgstr "账户搜索"
-#: ../mail/em-folder-browser.c:1072
+#: ../mail/em-folder-browser.c:1069
msgid "All Account Search"
msgstr "全部账户搜索"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:149
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "未读信件数:"
+
#. TODO: can this be done in a loop?
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:163
msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "总信件数:"
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
-msgid "Unread messages:"
-msgid_plural "Unread messages:"
-msgstr[0] "未读信件数:"
-
-#: ../mail/em-folder-properties.c:316
+#: ../mail/em-folder-properties.c:323
#: ../plugins/groupwise-features/properties.glade.h:2
msgid "Folder Properties"
msgstr "文件夹属性"
@@ -11431,8 +11183,9 @@ msgid "Drafts"
msgstr "草稿"
#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2462
+#: ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-folder.c:593
msgid "Inbox"
msgstr "收件箱"
@@ -11463,82 +11216,91 @@ msgstr "正在装入..."
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../mail/em-folder-tree.c:366
+#: ../mail/em-folder-tree.c:369
#, c-format
msgid "folder-display|%s (%u)"
msgstr "%s (%u)"
-#: ../mail/em-folder-tree.c:717
+#: ../mail/em-folder-tree.c:721
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../mail/em-folder-tree.c:877
+#: ../mail/em-folder-tree.c:881
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:883
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1827
+#: ../mail/em-folder-tree.c:890 ../mail/message-list.c:1867
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信件移至文件夹 %s"
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1829
+#: ../mail/em-folder-tree.c:892 ../mail/message-list.c:1869
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信件复制到文件夹 %s"
-#: ../mail/em-folder-tree.c:904
+#: ../mail/em-folder-tree.c:908
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信件放到顶级文件夹存储"
-#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:105
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: ../mail/em-folder-tree.c:1001 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1005 ../ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "移至文件夹(_M)"
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1710 ../mail/mail-ops.c:1060
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
-#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2110 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:58 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
#: ../ui/evolution.xml.h:53
msgid "_View"
msgstr "查看(_V)"
-#: ../mail/em-folder-tree.c:2066
+#: ../mail/em-folder-tree.c:2111
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
-#: ../mail/em-folder-tree.c:2070
+#: ../mail/em-folder-tree.c:2115
msgid "_Copy..."
msgstr "复制(_C)..."
-#: ../mail/em-folder-tree.c:2071
+#: ../mail/em-folder-tree.c:2116
msgid "_Move..."
msgstr "移动(_M)..."
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2075
+#: ../mail/em-folder-tree.c:2120
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:36
msgid "_Rename..."
msgstr "重命名(_R)..."
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:131
+#: ../mail/em-folder-tree.c:2124
+msgid "Re_fresh"
+msgstr "刷新(_F)"
+
+#: ../mail/em-folder-tree.c:2125
+#, fuzzy
+msgid "Fl_ush Outbox"
+msgstr "发件箱"
+
+#: ../mail/em-folder-tree.c:2131 ../mail/mail.error.xml.h:136
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
@@ -11547,14 +11309,13 @@ msgstr "清空回收站(_E)"
msgid "Copying `%s' to `%s'"
msgstr "把“%s”复制到 %s"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1030
-#: ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1036
+#: ../mail/em-folder-view.c:1051
#: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
msgid "Select folder"
msgstr "选择文件夹"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1051
msgid "C_opy"
msgstr "复制(_O)"
@@ -11576,154 +11337,162 @@ msgstr "创建文件夹"
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: ../mail/em-folder-view.c:966 ../mail/mail.error.xml.h:66
+#: ../mail/em-folder-view.c:972 ../mail/mail.error.xml.h:68
msgid "Mail Deletion Failed"
msgstr "邮件删除失败"
-#: ../mail/em-folder-view.c:967 ../mail/mail.error.xml.h:119
+#: ../mail/em-folder-view.c:973 ../mail/mail.error.xml.h:123
msgid "You do not have sufficient permissions to delete this mail."
msgstr "您没有足够的权限删除此邮件。"
-#: ../mail/em-folder-view.c:1138 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1144 ../ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-folder-view.c:1140 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1146 ../mail/em-popup.c:571 ../mail/em-popup.c:582
#: ../ui/evolution-mail-message.xml.h:110
msgid "_Forward"
msgstr "转发(_F)"
-#: ../mail/em-folder-view.c:1143 ../ui/evolution-mail-message.xml.h:107
+#. 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:1150 ../ui/evolution-mail-message.xml.h:107
msgid "_Edit as New Message..."
msgstr "作为新信件进行编辑(_E)..."
-#: ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-view.c:1156
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1157
msgid "_Move to Folder..."
msgstr "移至文件夹(_M)..."
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1158
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1161
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1162
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1163
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1164
msgid "Mark as Un_important"
msgstr "标记为不重要(_I)"
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1165
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1166
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1167
msgid "Mark for Follo_w Up..."
msgstr "标记为跟随(_W)..."
-#: ../mail/em-folder-view.c:1162
+#: ../mail/em-folder-view.c:1169
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:1163 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1170 ../widgets/misc/e-dateedit.c:473
msgid "_None"
msgstr "无(_N)"
-#: ../mail/em-folder-view.c:1168
+#: ../mail/em-folder-view.c:1175
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1176
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: ../mail/em-folder-view.c:1172
+#: ../mail/em-folder-view.c:1179
msgid "Crea_te Rule From Message"
msgstr "根据信件创建规则(_T)"
-#: ../mail/em-folder-view.c:1173
+#: ../mail/em-folder-view.c:1180
msgid "Search Folder from _Subject"
msgstr "基于主题的搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:1174
+#: ../mail/em-folder-view.c:1181
msgid "Search Folder from Se_nder"
msgstr "基于发件人的搜索文件夹(_N)"
-#: ../mail/em-folder-view.c:1175
+#: ../mail/em-folder-view.c:1182
msgid "Search Folder from _Recipients"
msgstr "基于收件人的搜索文件夹(_R)"
-#: ../mail/em-folder-view.c:1176
+#: ../mail/em-folder-view.c:1183
msgid "Search Folder from Mailing _List"
msgstr "基于邮件列表的搜索文件夹(_L)"
-#: ../mail/em-folder-view.c:1180
+#: ../mail/em-folder-view.c:1187
msgid "Filter on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: ../mail/em-folder-view.c:1181
+#: ../mail/em-folder-view.c:1188
msgid "Filter on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: ../mail/em-folder-view.c:1182
+#: ../mail/em-folder-view.c:1189
msgid "Filter on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1190
msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:2036 ../mail/em-folder-view.c:2080
+#: ../mail/em-folder-view.c:2097 ../mail/em-folder-view.c:2141
msgid "Default"
msgstr "默认"
-#: ../mail/em-folder-view.c:2185 ../mail/em-folder-view.c:2191
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "打印信件"
-
-#: ../mail/em-folder-view.c:2350
+#: ../mail/em-folder-view.c:2354
msgid "Unable to retrieve message"
msgstr "无法获取信件"
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2375
+msgid "<b>Retrieving Message...</b>"
+msgstr "<b>正在恢复信件...</b>"
+
+#: ../mail/em-folder-view.c:2599
+msgid "C_all To..."
+msgstr "呼叫到(_A)..."
+
+#: ../mail/em-folder-view.c:2602
msgid "Create _Search Folder"
msgstr "创建搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2603
msgid "_From this Address"
msgstr "自此地址(_F)"
-#: ../mail/em-folder-view.c:2550
+#: ../mail/em-folder-view.c:2604
msgid "_To this Address"
msgstr "到此地址(_T)"
-#: ../mail/em-folder-view.c:2907
+#: ../mail/em-folder-view.c:2979
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
-#: ../mail/em-folder-view.c:2912
+#: ../mail/em-folder-view.c:2991
+#, c-format
+msgid "Click to call %s"
+msgstr "单击以呼叫 %s"
+
+#: ../mail/em-folder-view.c:2996
msgid "Click to hide/unhide addresses"
msgstr "单击可隐藏/显示地址"
@@ -11750,7 +11519,7 @@ msgstr "下一项(_N)"
msgid "M_atch case"
msgstr "匹配大小写(_A)"
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:618
msgid "Unsigned"
msgstr "未签名"
@@ -11760,7 +11529,7 @@ msgid ""
"authentic."
msgstr "此信件未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:619
msgid "Valid signature"
msgstr "有效签名"
@@ -11770,7 +11539,7 @@ msgid ""
"message is authentic."
msgstr "此信件已签名,而且签名是有效的。这意味着这封信应该是可信的。"
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:621
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:620
msgid "Invalid signature"
msgstr "无效签名"
@@ -11790,7 +11559,7 @@ msgid ""
"cannot be verified."
msgstr "这封信的签名有效,但是无法校验邮件的发送者。"
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:627
msgid "Unencrypted"
msgstr "未加密"
@@ -11800,7 +11569,7 @@ msgid ""
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:628
msgid "Encrypted, weak"
msgstr "弱加密"
@@ -11813,7 +11582,7 @@ msgstr ""
"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一"
"定时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:629
msgid "Encrypted"
msgstr "加密"
@@ -11823,7 +11592,7 @@ msgid ""
"the content of this message."
msgstr "这封信已加密。外人要想查看这封信的内容十分困难。"
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:631
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:630
msgid "Encrypted, strong"
msgstr "强加密"
@@ -11872,51 +11641,55 @@ msgstr "适合宽度(_F)"
msgid "Show _Original Size"
msgstr "显示原始大小(_O)"
-#: ../mail/em-format-html-display.c:1900 ../mail/em-format-html-display.c:2505
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1900 ../mail/em-format-html-display.c:2511
+#: ../mail/mail-config.glade.h:43 ../mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "附件"
-#: ../mail/em-format-html-display.c:2107
-msgid "Select folder to save all attachments..."
+#: ../mail/em-format-html-display.c:2114
+msgid "Save attachment as"
+msgstr "附件另存为"
+
+#: ../mail/em-format-html-display.c:2118
+msgid "Select folder to save all attachments"
msgstr "选择保存全部附件的文件夹..."
-#: ../mail/em-format-html-display.c:2154
+#: ../mail/em-format-html-display.c:2169
msgid "_Save Selected..."
msgstr "保存所选(_S)..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2221
+#: ../mail/em-format-html-display.c:2236
#, c-format
msgid "%d at_tachment"
msgid_plural "%d at_tachments"
msgstr[0] "%d 个附件(_T)"
-#: ../mail/em-format-html-display.c:2228 ../mail/em-format-html-display.c:2306
+#: ../mail/em-format-html-display.c:2243 ../mail/em-format-html-display.c:2321
msgid "S_ave"
msgstr "保存(_A)"
-#: ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:2254
msgid "S_ave All"
msgstr "全部保存(_A)"
-#: ../mail/em-format-html-display.c:2302
+#: ../mail/em-format-html-display.c:2317
msgid "No Attachment"
msgstr "无附件"
-#: ../mail/em-format-html-display.c:2433 ../mail/em-format-html-display.c:2478
+#: ../mail/em-format-html-display.c:2448 ../mail/em-format-html-display.c:2484
msgid "View _Unformatted"
msgstr "无格式查看(_U)"
-#: ../mail/em-format-html-display.c:2435
+#: ../mail/em-format-html-display.c:2450
msgid "Hide _Unformatted"
msgstr "无格式隐藏(_U)"
-#: ../mail/em-format-html-display.c:2497
+#: ../mail/em-format-html-display.c:2503
msgid "O_pen With"
msgstr "打开方式(_P)"
-#: ../mail/em-format-html-display.c:2566
+#: ../mail/em-format-html-display.c:2574
msgid ""
"Evolution cannot render this email as it is too large to handle. You can "
"view it unformatted or with an external text editor."
@@ -11924,148 +11697,163 @@ msgstr ""
"Evolution 无法渲染此电子邮件,原因是该邮件太大。您可以以无格式方式查看该邮"
"件,或者使用外部文本编辑器查看。"
-#: ../mail/em-format-html-print.c:141
+#: ../mail/em-format-html-print.c:128
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: ../mail/em-format-html.c:484 ../mail/em-format-html.c:486
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
#, c-format
msgid "Retrieving `%s'"
msgstr "收取“%s”"
-#: ../mail/em-format-html.c:622
+#: ../mail/em-format-html.c:621
msgid "Valid signature but cannot verify sender"
msgstr "签名有效但是无法校验发送者"
-#: ../mail/em-format-html.c:893
+#: ../mail/em-format-html.c:892
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: ../mail/em-format-html.c:923
+#: ../mail/em-format-html.c:922
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:933
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: ../mail/em-format-html.c:936
+#: ../mail/em-format-html.c:935
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: ../mail/em-format-html.c:957
+#: ../mail/em-format-html.c:956
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:967
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: ../mail/em-format-html.c:1195
+#: ../mail/em-format-html.c:1194
msgid "Formatting message"
msgstr "格式化信件"
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:87
#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
msgid "From"
msgstr "发件人"
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:88
msgid "Reply-To"
msgstr "回复至"
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:90
msgid "Cc"
msgstr "抄送"
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:91
msgid "Bcc"
msgstr "密件抄送"
#. pseudo-header
-#: ../mail/em-format-html.c:1665 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1045
+#: ../mail/em-format-html.c:1664 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1182
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1692
+#: ../mail/em-format-html.c:1691
msgid "<I> (%a, %R %Z)</I>"
msgstr "<I> (%A,%R %Z)</I>"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1695
+#: ../mail/em-format-html.c:1694
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: ../mail/em-format-html.c:1705 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1704 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:855 ../mail/em-mailer-prefs.c:93
#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
#: ../widgets/misc/e-dateedit.c:363
msgid "Date"
msgstr "日期"
-#: ../mail/em-format-html.c:1728 ../mail/em-format.c:855
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1727 ../mail/em-format.c:856
+#: ../mail/em-mailer-prefs.c:94
msgid "Newsgroups"
msgstr "新闻组"
-#: ../mail/em-format.c:1119
+#: ../mail/em-format.c:1120
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: ../mail/em-format.c:1158 ../mail/em-format.c:1306 ../mail/em-format.c:1608
+#: ../mail/em-format.c:1159 ../mail/em-format.c:1310 ../mail/em-format.c:1612
msgid "Could not parse S/MIME message: Unknown error"
msgstr "无法解析 S/MIME 信件:未知错误"
-#: ../mail/em-format.c:1288 ../mail/em-format.c:1444
+#: ../mail/em-format.c:1292 ../mail/em-format.c:1448
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 信件。显示源文本。"
-#: ../mail/em-format.c:1296
+#: ../mail/em-format.c:1300
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "不支持 multipart/encrypted 的加密类型"
-#: ../mail/em-format.c:1463
+#: ../mail/em-format.c:1467
msgid "Unsupported signature format"
msgstr "不支持的签名格式"
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
msgid "Error verifying signature"
msgstr "校验签名错误"
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
msgid "Unknown error verifying signature"
msgstr "校验签名发生了未知错误"
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
msgid "Every time"
msgstr "每次"
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
msgid "Once per day"
msgstr "每天一次"
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:107
msgid "Once per week"
msgstr "每周一次"
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:108
msgid "Once per month"
msgstr "每月一次"
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-mailer-prefs.c:777
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:785
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:806
+msgid "No Junk plugin available"
+msgstr "没有可用的垃圾邮件插件"
+
+#: ../mail/em-migrate.c:1211
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -12076,47 +11864,47 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "无法创建新文件夹“%s”:%s"
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "无法将文件夹“%s”复制为“%s”:%s"
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "无法扫描位于“%s”的已有邮箱:%s"
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”:%s"
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”:%s"
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2710
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2729
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -12124,16 +11912,16 @@ msgstr ""
"无法从先前的 Evolution 安装中读取设置,“evolution/config.xmldb”不存在或者已损"
"坏。"
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
msgid "_Reply to sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:568 ../mail/em-popup.c:579
#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: ../mail/em-popup.c:622
+#: ../mail/em-popup.c:632
msgid "_Add to Address Book"
msgstr "添加到地址簿(_A)"
@@ -12158,28 +11946,28 @@ msgstr "请选择服务器。"
msgid "No server has been selected"
msgstr "没有选中服务器"
-#: ../mail/em-utils.c:124
+#: ../mail/em-utils.c:120
msgid "Do not show this message again."
msgstr "不再显示此信息。"
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:315
msgid "Message Filters"
msgstr "邮件过滤器"
-#: ../mail/em-utils.c:404 ../mail/em-utils.c:436
+#: ../mail/em-utils.c:368
msgid "message"
msgstr "信件"
-#: ../mail/em-utils.c:571
+#: ../mail/em-utils.c:557
msgid "Save Message..."
msgstr "保存信件..."
-#: ../mail/em-utils.c:620
+#: ../mail/em-utils.c:606
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1104
+#: ../mail/em-utils.c:1090
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信件"
@@ -12188,125 +11976,140 @@ msgstr "来自 %s 的信件"
msgid "Search _Folders"
msgstr "搜索文件夹(_F)"
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:590
msgid "Search Folder source"
msgstr "搜索文件夹来源"
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:1
msgid "Allows evolution to display text part of limited size"
msgstr "允许 Evolution 显示被限制大小的文本部分"
-#: ../mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:2
msgid "Automatic link recognition"
msgstr "自动识别链接"
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:3
msgid "Automatic smiley recognition"
msgstr "自动识别表情"
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:4
msgid "Check incoming mail being junk"
msgstr "检查收到的邮件是否是垃圾邮件"
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:5
msgid "Citation highlight color"
msgstr "引用突出颜色"
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:6
msgid "Citation highlight color."
msgstr "引用突出颜色。"
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:7
msgid "Composer Window default height"
msgstr "编写窗口的默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:8
msgid "Composer Window default width"
msgstr "编写窗口的默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:9
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "压缩 TO/CC/BCC 中地址的显示"
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:10
msgid ""
"Compress display of addresses in TO/CC/BCC to the number specified in "
"address_count."
msgstr "将 TO/CC/BCC 的显示地址数压缩到 address_count 所指定的数量。"
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:11
msgid "Default charset in which to compose messages"
msgstr "编写信件的默认字符集"
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:12
msgid "Default charset in which to compose messages."
msgstr "编写信件的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:13
msgid "Default charset in which to display messages"
msgstr "显示信件的默认字符集"
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:14
msgid "Default charset in which to display messages."
msgstr "显示信件的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:15
msgid "Default forward style"
msgstr "默认转发方式"
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:16
msgid "Default height of the Composer Window"
msgstr "撰写窗口的默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:17
msgid "Default height of the Message Window"
msgstr "信件窗口的默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:18
msgid "Default height of the Subscribe dialog"
msgstr "订阅对话框的默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:19
msgid "Default reply style"
msgstr "默认回复样式"
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:20
+#, fuzzy
+msgid "Default value for thread expand state"
+msgstr "信件的默认主题。"
+
+#: ../mail/evolution-mail.schemas.in.h:21
msgid "Default width of the Composer Window"
msgstr "撰写窗口的默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
msgid "Default width of the Message Window"
msgstr "信件窗口的默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
msgid "Default width of the Subscribe dialog"
msgstr "订阅对话框的默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
msgid "Directory for saving mail component files"
msgstr "保存邮件组件文件的目录"
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
msgid "Draw spelling error indicators on words as you type."
msgstr "在您打字的时候就显示拼写错误标识。"
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
+#, fuzzy
+msgid "Empty Junk folders on exit"
+msgstr "退出时清空回收站"
+
+#: ../mail/evolution-mail.schemas.in.h:27
msgid "Empty Trash folders on exit"
msgstr "退出时清空回收站"
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:28
+#, fuzzy
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "退出 Evolution 时清空回收站"
+
+#: ../mail/evolution-mail.schemas.in.h:29
msgid "Empty all Trash folders when exiting Evolution."
msgstr "退出 Evolution 时清空回收站"
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:30
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "启用光标模式,这样您在读取邮件时就能看到光标了。"
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:31
msgid "Enable or disable type ahead search feature"
msgstr "启用或禁用自动前进功能"
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:32
msgid ""
"Enable side bar search feature so that you can start interactive searching "
"by typing in the text. Use is that you can easily find a folder in that side "
@@ -12317,35 +12120,35 @@ msgstr ""
"您可以更加轻松地在侧边栏中找到文件夹,只需输入文件夹名称,然后选中范围就会自"
"动跳转到该文件夹。"
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:33
msgid "Enable to render message text part of limited size."
msgstr "允许渲染被限制大小的信件文本部分。"
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:34
msgid "Enable/disable caret mode"
msgstr "启用/禁用光标模式"
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:35
msgid "Height of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:36
msgid "Height of the message-list pane."
msgstr "信件列表面板的高度。"
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:37
msgid ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
msgstr "如果用户试图一次打开的信件大于等于十封,将会询问用户是否真的要这么做。"
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:38
msgid ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
msgstr "如果开启了“预览”面板,则以并列方式显示,而不是垂直方式显示。"
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:39
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 "
@@ -12355,27 +12158,38 @@ msgstr ""
"MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
"内容。"
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid ""
+"It disables the feature where repeated prompts to ask if offline sync is "
+"required."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
msgid "It disables/enables the prompt while marking multiple messages."
msgstr "禁用/启用对多封邮件的标记。"
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:42
+#, fuzzy
+msgid "Last time empty junk was run"
+msgstr "上次清空回收站的时间"
+
+#: ../mail/evolution-mail.schemas.in.h:43
msgid "Last time empty trash was run"
msgstr "上次清空回收站的时间"
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:44
msgid "List of Labels and their associated colors"
msgstr "标签及其对应颜色的列表"
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:45
msgid "List of accepted licenses"
msgstr "列出接受的许可"
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:46
msgid "List of accounts"
msgstr "账户列表"
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:47
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12383,11 +12197,11 @@ msgstr ""
"列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /apps/evolution/mail/"
"accounts 的子目录命名字符串。"
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:48
msgid "List of custom headers and whether they are enabled."
msgstr "自定义头及该头是否启用。"
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:49
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."
@@ -12395,19 +12209,19 @@ msgstr ""
"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
"颜色使用了 HTML 十六进制编码方式。"
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:50
msgid "List of mime types to check for bonobo component viewers"
msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:51
msgid "List of protocol names whose license has been accepted."
msgstr "列出接受协议的协议名称。"
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:52
msgid "Load images for HTML messages over http"
msgstr "在 HTML 信件中装入 HTTP 图像"
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:53
msgid ""
"Load images for HTML messages over http(s). Possible values are: 0 - Never "
"load images off the net 1 - Load images in mail from contacts 2 - Always "
@@ -12416,204 +12230,240 @@ msgstr ""
"在 HTML 信件中装入 http(s) 图像。可供选择的值有:0 - 决不从网上装入图像,1 - "
"如果发送者在地址簿中则装入图像,2 - 总是从网上装入图像"
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:54
msgid "Log filter actions"
msgstr "记录过滤动作"
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:55
msgid "Log filter actions to the specified log file."
msgstr "将过滤动作记录到指定日志文件。"
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:56
msgid "Logfile to log filter actions"
msgstr "记录过滤动作的日志文件"
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:57
msgid "Logfile to log filter actions."
msgstr "记录过滤动作的日志文件。"
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:58
msgid "Mark as Seen after specified timeout"
msgstr "在指定超时过后标为已看"
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:59
msgid "Mark as Seen after specified timeout."
msgstr "在指定超时过后标为已看。"
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:60
msgid "Mark citations in the message \"Preview\""
msgstr "在信件“预览”中标出引用"
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:61
msgid "Mark citations in the message \"Preview\"."
msgstr "在信件“预览”中标出引用。"
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:62
msgid "Message Window default height"
msgstr "信件窗口默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:63
msgid "Message Window default width"
msgstr "信件窗口默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:64
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "信件显示风格(普通、全部邮件头、源代码)"
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:65
+#, fuzzy
+msgid "Minimum days between emptying the junk on exit"
+msgstr "退出时清空回收站的最少天数"
+
+#: ../mail/evolution-mail.schemas.in.h:66
msgid "Minimum days between emptying the trash on exit"
msgstr "退出时清空回收站的最少天数"
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:67
+#, fuzzy
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "退出时清空回收站的最少天数。"
+
+#: ../mail/evolution-mail.schemas.in.h:68
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "退出时清空回收站的最少天数。"
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:69
msgid "New Mail Notify sound file"
msgstr "新建邮件通知声音文件"
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:70
msgid "New Mail Notify type"
msgstr "新建邮件通知类型"
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "要在 TO/CC/BCC 中显示的地址数"
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "Prompt on empty subject"
msgstr "空主题时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "用户视图销毁文件夹时提示。"
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:74
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "用户视图发送没有主题的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
msgid "Prompt when user expunges"
msgstr "用户销毁时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:77
msgid "Prompt when user only fills Bcc"
msgstr "用户只填入 Bcc 时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:78
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "当用户试图一次打开超过十封信时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:79
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
msgstr "当用户试图给不想接收 HTML 的联系人发送 HTML 邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:80
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "当用户试图发送没有 To 或 Cc 收件人的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:81
msgid "Prompt when user tries to send unwanted HTML"
msgstr "当用户是否发送意外的 HTML 时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:82
msgid "Prompt while marking multiple messages"
msgstr "标记多封信件时提示"
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:83
msgid "Recognize links in text and replace them."
msgstr "识别文本中的链接并进行替换。"
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:84
msgid "Recognize smileys in text and replace them with images."
msgstr "识别文本中的表情,并将其替换为图像。"
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:85
msgid "Run junk test on incoming mail"
msgstr "对收到的邮件运行垃圾邮件测试"
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:86
msgid "Save directory"
msgstr "保存目录"
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Search for the sender photo in local addressbooks"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Send HTML mail by default"
msgstr "默认以 HTML 发送邮件"
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Send HTML mail by default."
msgstr "默认以 HTML 发送邮件。"
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:90
msgid "Show Animations"
msgstr "显示动画"
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "Show animated images as animations."
msgstr "将动画图像显示为动画。"
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "在信件列表中显示删除了的信件(带有删除线)。"
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Show deleted messages in the message-list"
msgstr "在信件列表中显示删除了的信件"
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Show photo of the sender"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:97
msgid ""
"Show the email of the sender in the messages composite column in the message "
"list"
msgstr "在信件列表的信件组合列中显示电子邮件的发送者"
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:98
+#, fuzzy
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "在信件列表的信件组合列中显示电子邮件的发送者"
+
+#: ../mail/evolution-mail.schemas.in.h:99
msgid "Show the sender email in the messages column in the message list"
msgstr "在信件列表中显示发送者的电子邮件"
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
msgid "Sound file to play when new mail arrives."
msgstr "新邮件到达时要播放的声音文件。"
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Specifies the type of New Mail Notification the user wishes to use."
msgstr "指定用户想要使用的新邮件通知类型。"
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
msgid "Spell check inline"
msgstr "内嵌拼写检查"
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Subscribe dialog default height"
msgstr "订阅对话框默认高度"
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Subscribe dialog default width"
msgstr "订阅对话框默认宽度"
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
msgid "Terminal font"
msgstr "终端字体"
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
msgid "Text message part limit"
msgstr "文本信件部分限制"
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:108
+#, fuzzy
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr "上次清空回收站的时间,以 epoch 天数显示。"
+
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "The last time empty trash was run, in days since the epoch."
msgstr "上次清空回收站的时间,以 epoch 天数显示。"
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "The terminal font for mail display"
msgstr "邮件显示用的终端字体"
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "The variable width font for mail display"
msgstr "用于显示邮件的变宽字体"
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:112
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."
@@ -12621,7 +12471,14 @@ msgstr ""
"此选项决定了 Evolution 中可格式化的最大文本部分大小。默认为 4MB/4096 KB,单位"
"为 KB。"
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it wont fall back to "
+"the other available plugins."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
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;"
@@ -12631,119 +12488,129 @@ msgstr ""
"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:116
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
msgstr "设定默认信件视图中要显示的地址数,超过的部分显示为“...”。"
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:118
msgid "Thread the message list."
msgstr "按线索编排信件列表。"
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Thread the message-list"
msgstr "按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Thread the message-list based on Subject"
msgstr "基于主题按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:121
msgid "Timeout for marking message as Seen"
msgstr "将信件标为已看的超时"
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Timeout for marking message as Seen."
msgstr "将信件标为已看的超时。"
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "UID string of the default account."
msgstr "默认账户的 UID 字符串。"
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use Spamassassin daemon and client"
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Use SpamAssassin daemon and client"
msgstr "使用垃圾克星守护程序和客户"
-#: ../mail/evolution-mail.schemas.in.in.h:109
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Use SpamAssassin daemon and client (spamc/spamd)"
msgstr "使用垃圾克星守护程序和客户(spamc/spamd)"
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:126
msgid "Use custom fonts"
msgstr "使用自定义字体"
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:127
msgid "Use custom fonts for displaying mail"
msgstr "使用自定义字体显示邮件"
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:128
msgid "Use only local spam tests."
msgstr "只使用本地垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:129
msgid "Use only the local spam tests (no DNS)."
msgstr "之使用本地垃圾邮件测试(无 DNS)。"
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:130
msgid "Use side-by-side or wide layout"
msgstr "使用并排还是宽屏布局"
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:131
msgid "Variable width font"
msgstr "变宽字体"
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "View/Bcc menu item is checked"
msgstr "选中了查看/Bcc 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "View/Bcc menu item is checked."
msgstr "选中了查看/Bcc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "View/Cc menu item is checked"
msgstr "选中了查看/Cc 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:135
msgid "View/Cc menu item is checked."
msgstr "选中了查看/Cc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "View/From menu item is checked"
msgstr "选中了查看/From 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "View/From menu item is checked."
msgstr "选中了查看/From 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "View/PostTo menu item is checked"
msgstr "选中了查看/PostTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:139
msgid "View/PostTo menu item is checked."
msgstr "选中了查看/PostTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:140
msgid "View/ReplyTo menu item is checked"
msgstr "选中了查看/ReplyTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:141
msgid "View/ReplyTo menu item is checked."
msgstr "选中了查看/ReplyTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:142
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
msgstr "是否在信件不包含 In-Reply-To 或 References 头时强制按主题编排线索。"
-#: ../mail/evolution-mail.schemas.in.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:143
msgid "Width of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:144
msgid "Width of the message-list pane."
msgstr "信件列表面板的高度。"
@@ -12760,12 +12627,10 @@ msgid "Import mail from Elm."
msgstr "从 Elm 导入邮件。"
#: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
msgid "Destination folder:"
msgstr "目的文件夹:"
#: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
msgid "Select folder to import into"
msgstr "选择要导入到哪个文件夹"
@@ -12777,104 +12642,20 @@ msgstr "Berkeley 邮箱(mbox)"
msgid "Importer Berkeley Mailbox format folders"
msgstr "导入器 Berkeley 邮箱格式文件夹"
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
-#, c-format
-msgid "Importing `%s'"
-msgstr "导入“%s”"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:536
-msgid "Please wait"
-msgstr "请稍候"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
#: ../mail/importers/mail-importer.c:148
msgid "Importing mailbox"
msgstr "导入邮箱"
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:515
+#, c-format
+msgid "Importing `%s'"
+msgstr "导入“%s”"
+
#: ../mail/importers/mail-importer.c:376
#, c-format
msgid "Scanning %s"
msgstr "扫描 %s"
-#: ../mail/importers/netscape-importer.c:74
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "优先级过滤器“%s”"
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"您的某些 Netscape 邮件过滤规则基于邮件优先级,而 Evolution 并\n"
-"不支持这种类型的过滤规则。作为替代,Evolution 提供了从 -3 到\n"
-"3 的评分,邮件可根据评分进行过滤。\n"
-"\n"
-"我们现在所能为您做的是,添加了一组“优先级过滤器”。这组过滤\n"
-"器可以将 Netscape 的邮件优先级转换为 Evolution 的评分,而对应\n"
-"的过滤器也会用评分来替代优先级。请仔细检查导入的优先级,以确\n"
-"保过滤能够正常进行。"
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"您的某些 Netscape 邮件过滤器使用“忽略线索”\n"
-"或“监视线索”特性,而 Evolution 并不支持该\n"
-"特性。这些过滤器将被丢弃。"
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"您的某些 Netscape 邮件过滤器将会测试邮件体是否等于\n"
-"给定字符串,而 Evolution 并不支持该特性。这些过滤器\n"
-"将被修改为给定字符串是否包含于信体中。"
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution 正在导入您原来的 Netscape 数据"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "导入 Netscape 数据"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "设置"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "邮件过滤规则"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution 找到了 Netscape 邮件文件。\n"
-"您是否希望把它们导入 Evolution?"
-
#: ../mail/importers/pine-importer.c:229
msgid "Importing Pine data"
msgstr "导入 Pine 数据"
@@ -12911,97 +12692,103 @@ msgstr "%s 邮件列表"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: ../mail/mail-component.c:523
+#: ../mail/mail-component.c:524
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../mail/mail-component.c:525
+#: ../mail/mail-component.c:526
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:549
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] ",已选中 %d 个,"
+
+#: ../mail/mail-component.c:552
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:554
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 封已发"
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:556
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:561
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] ",%d 封未读,"
+
+#: ../mail/mail-component.c:562
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "总共 %d 封"
-#: ../mail/mail-component.c:558
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ",%d 封未读"
-
-#: ../mail/mail-component.c:840
+#: ../mail/mail-component.c:889
msgid "New Mail Message"
msgstr "新建信件"
-#: ../mail/mail-component.c:841
+#: ../mail/mail-component.c:890
msgid "_Mail Message"
msgstr "信件(_M)"
-#: ../mail/mail-component.c:842
+#: ../mail/mail-component.c:891
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../mail/mail-component.c:848
+#: ../mail/mail-component.c:897
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: ../mail/mail-component.c:849
+#: ../mail/mail-component.c:898
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../mail/mail-component.c:850
+#: ../mail/mail-component.c:899
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../mail/mail-component.c:996
+#: ../mail/mail-component.c:1045
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
-#: ../mail/mail-config.c:85
+#: ../mail/mail-config.c:81
msgid "I_mportant"
msgstr "重要(_M)"
#. red
-#: ../mail/mail-config.c:86
+#: ../mail/mail-config.c:82
msgid "_Work"
msgstr "工作(_W)"
#. orange
-#: ../mail/mail-config.c:87
+#: ../mail/mail-config.c:83
msgid "_Personal"
msgstr "个人(_P)"
#. forest green
-#: ../mail/mail-config.c:88
+#: ../mail/mail-config.c:84
msgid "_To Do"
msgstr "待办(_T)"
#. blue
-#: ../mail/mail-config.c:89
+#: ../mail/mail-config.c:85
msgid "_Later"
msgstr "稍候(_L)"
@@ -13014,17 +12801,17 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
msgstr "<b>(在此版本的 Evolution 中不支持 SSL)</b>"
#: ../mail/mail-config.glade.h:4
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>发送者照片</b>"
+
+#: ../mail/mail-config.glade.h:5
msgid "<b>Sig_natures</b>"
msgstr "<b>签名(_N)</b>"
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
msgid "<b>_Languages</b>"
msgstr "<b>语言(_L)</b>"
-#: ../mail/mail-config.glade.h:6
-msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>这将让过滤器更可靠,但稍慢</small>"
-
#: ../mail/mail-config.glade.h:7
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">账户信息</span>"
@@ -13057,168 +12844,164 @@ msgstr "<span weight=\"bold\">删除邮件</span>"
msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>"
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">过滤器选项</span>"
-
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:17
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr "<span weight=\"bold\">标签和颜色</span>"
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:18
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr "<span weight=\"bold\">装入图像</span>"
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Message Display</span>"
msgstr "<span weight=\"bold\">信件显示</span>"
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr "<span weight=\"bold\">信件字体</span>"
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">Message Receipts</span>"
msgstr "<span weight=\"bold\">信件收条</span>"
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:22
msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "<span weight=\"bold\">新邮件提醒</span>"
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:23
#: ../plugins/publish-calendar/publish-calendar.glade.h:3
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr "<span weight=\"bold\">可选信息</span>"
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
msgid "<span weight=\"bold\">Options</span>"
msgstr "<span weight=\"bold\">选项</span>"
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr "<span weight=\"bold\">打印字体</span>"
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Required Information</span>"
msgstr "<span weight=\"bold\">请求的信息</span>"
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>"
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Security</span>"
msgstr "<span weight=\"bold\">安全</span>"
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "<span weight=\"bold\">已发送和草稿信件</span>"
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr "<span weight=\"bold\">服务器配置</span>"
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:33
msgid "Account Management"
msgstr "账户管理"
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:34
msgid "Add Ne_w Signature..."
msgstr "添加新签名(_W)..."
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:35
msgid "Add _Script"
msgstr "添加脚本(_S)"
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:36
msgid "Al_ways sign outgoing messages when using this account"
msgstr "当使用该账户时总是发送签名信件(_W)"
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:37
msgid "Also encrypt to sel_f when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_F)"
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:38
msgid "Alway_s carbon-copy (cc) to:"
msgstr "总是抄送到(_S):"
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:39
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "总是暗送到(_B):"
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:40
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:41
msgid "Always encrypt to _myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_M)"
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:42
msgid "Attach original message"
msgstr "附加原始信件"
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:44
msgid "Automatically insert _smiley images"
msgstr "自动插入表情图像(_S)"
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
msgid "Baltic (ISO-8859-13)"
msgstr "波罗的语(ISO-8859-13)"
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:46
msgid "Baltic (ISO-8859-4)"
msgstr "波罗的语(ISO-8859-4)"
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:47
msgid "Beep w_hen new mail arrives"
msgstr "新邮件到达时响铃(_H)"
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:48
msgid "C_haracter set:"
msgstr "字符集(_H):"
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:49
msgid "Ch_eck for Supported Types "
msgstr "检查支持的类型(_E)"
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:50
msgid "Check in_coming mail for junk"
msgstr "检查收到的邮件是否是垃圾邮件(_C)"
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:51
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:52
msgid "Checks incoming mail messages to be Junk"
msgstr "检查收到的信件是否是垃圾邮件"
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:53
msgid "Cle_ar"
msgstr "清除(_A)"
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:54
msgid "Clea_r"
msgstr "清除(_R)"
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:55
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词着色(_M):"
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:56
msgid "Colors"
msgstr "颜色"
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:57
msgid "Confirm _when expunging a folder"
msgstr "销毁文件夹时确认(_W)"
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:58
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -13233,14 +13016,18 @@ msgstr ""
"\n"
"单击“应用”可保存您的设置。"
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:64
msgid "De_fault"
msgstr "默认(_F)"
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:65
msgid "Default character e_ncoding:"
msgstr "默认字符编码(_N):"
+#: ../mail/mail-config.glade.h:67
+msgid "Delete junk mails on e_xit"
+msgstr ""
+
#: ../mail/mail-config.glade.h:69
msgid "Digitally _sign outgoing messages (by default)"
msgstr "对寄出的信件进行数字签名(默认)(_S)"
@@ -13261,11 +13048,6 @@ msgstr "完成"
msgid "Drafts _Folder:"
msgstr "草稿文件夹(_F):"
-#: ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "启用(_N)"
-
#: ../mail/mail-config.glade.h:75
msgid "Email Accounts"
msgstr "电子邮件"
@@ -13318,14 +13100,14 @@ msgstr "信头"
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../mail/mail-config.glade.h:90
-msgid "I_nclude remote tests"
-msgstr "包含远程测试(_N)"
-
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:92
msgid "Inline"
msgstr "嵌入"
+#: ../mail/mail-config.glade.h:93
+msgid "Inline original message (Outlook style)"
+msgstr ""
+
#: ../mail/mail-config.glade.h:95
msgid "KB"
msgstr "KB"
@@ -13422,92 +13204,104 @@ msgid "Remember _password"
msgstr "记住密码(_P)"
#: ../mail/mail-config.glade.h:121
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr "仅在本地地址簿中搜索发件人照片(_E)"
+
+#: ../mail/mail-config.glade.h:122
msgid "S_elect..."
msgstr "选择(_E)..."
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
msgid "S_end message receipts:"
msgstr "发送信件收条(_E):"
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
msgid "S_tandard Font:"
msgstr "标准字体(_T):"
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
msgid "Se_lect..."
msgstr "选择(_L)..."
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
+msgid "Select Drafts Folder"
+msgstr "选择草稿文件夹"
+
+#: ../mail/mail-config.glade.h:128
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:129
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:130
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:131
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
+msgid "Select Sent Folder"
+msgstr "选择已发文件夹"
+
+#: ../mail/mail-config.glade.h:133
msgid "Select sound file"
msgstr "选择声音文件"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:135
msgid "Sending Mail"
msgstr "发送邮件"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:136
msgid "Sent _Messages Folder:"
msgstr "已发送信件文件夹(_M):"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:137
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:138
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:139
msgid "Sig_ning certificate:"
msgstr "签名证书(_N):"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:140
msgid "Signat_ure:"
msgstr "签名(_U):"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:141
msgid "Signatures"
msgstr "签名"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:142
msgid "Signatures Table"
msgstr "签名表"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:143
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:145
msgid "T_ype: "
msgstr "类型(_Y):"
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "在此列出的语言反映了您所安装的字典。"
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -13516,7 +13310,7 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:151
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -13524,15 +13318,15 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: ../mail/mail-config.glade.h:150 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:153 ../plugins/caldav/caldav-source.c:282
msgid "User_name:"
msgstr "用户名(_N):"
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:154
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:155
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -13542,88 +13336,96 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:159
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
msgid "_Always load images from the Internet"
msgstr "总是从 Internet 上装入图像(_A)"
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
+msgid "_Default junk plugin:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:162
msgid "_Do not notify me when new mail arrives"
msgstr "新邮件到达时不要提醒我(_D)"
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:163
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:165
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:166
msgid "_Load images in mail from contacts"
msgstr "装入联系人发来的邮件中的图像(_L)"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:167
msgid "_Make this my default account"
msgstr "使它成为我的默认账户(_M)"
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:168
msgid "_Mark messages as read after"
msgstr "把信件标记为已读前等(_M)"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:170
msgid "_Never load images from the Internet"
msgstr "绝不从 Internet 装入图像(_N)"
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:171
msgid "_Path:"
msgstr "路径(_P):"
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:172
msgid "_Prompt when sending HTML messages to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:173
msgid "_Prompt when sending messages with an empty subject line"
msgstr "发送空主题行的信件时提示(_P)"
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:174
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:175
msgid "_Script:"
msgstr "脚本(_S):"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:178
msgid "_Show image animations"
msgstr "显示图像动画(_S)"
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:179
+msgid "_Show the photograph of sender in the email preview"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:180
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:181
msgid "_Use Secure Connection:"
msgstr "使用安全连接(_U):"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:182
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:183
msgid "addresses"
msgstr "个地址"
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:184
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:185
msgid "description"
msgstr "描述"
@@ -13659,7 +13461,7 @@ msgstr "全部本地文件夹"
msgid "Case _sensitive"
msgstr "区分大小写(_S)"
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:9
msgid "Co_mpleted"
msgstr "已完成(_M)"
@@ -13672,7 +13474,6 @@ msgid "Find in Message"
msgstr "在信件中查找"
#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
msgid "Flag to Follow Up"
msgstr "跟随的标志"
@@ -13700,7 +13501,7 @@ msgstr "安全信息"
msgid "Specific folders"
msgstr "指定文件夹"
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:21
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -13712,11 +13513,11 @@ msgstr ""
msgid "_Accept License"
msgstr "接受协议(_A)"
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:24
msgid "_Due By:"
msgstr "延期人(_D):"
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25
msgid "_Flag:"
msgstr "标志(_F):"
@@ -13724,7 +13525,7 @@ msgstr "标志(_F):"
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../mail/mail-folder-cache.c:858
+#: ../mail/mail-folder-cache.c:875
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
@@ -13767,7 +13568,7 @@ msgstr "发送第%d封信,共%d封"
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:690
msgid "Canceled."
msgstr "已取消。"
@@ -13894,54 +13695,59 @@ msgstr "断开与 %s 的连接"
msgid "Reconnecting to %s"
msgstr "重新连接到 %s"
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2361
+#, fuzzy, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Exchange 账户脱机。"
+
+#: ../mail/mail-ops.c:2444
msgid "Checking Service"
msgstr "检查服务"
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:160
msgid "Canceling..."
msgstr "正在取消..."
-#: ../mail/mail-send-recv.c:349
+#: ../mail/mail-send-recv.c:385
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: ../mail/mail-send-recv.c:356
+#: ../mail/mail-send-recv.c:392
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:453
+#: ../mail/mail-send-recv.c:500
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:500 ../mail/mail-send-recv.c:569
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:777
msgid "Checking for new mail"
msgstr "检查新邮件"
-#: ../mail/mail-session.c:198
+#: ../mail/mail-session.c:200
#, c-format
msgid "Enter Passphrase for %s"
msgstr "输入 %s 的密码"
-#: ../mail/mail-session.c:200
+#: ../mail/mail-session.c:202
msgid "Enter Passphrase"
msgstr "输入密码"
-#: ../mail/mail-session.c:203
+#: ../mail/mail-session.c:205
#: ../plugins/exchange-operations/exchange-config-listener.c:711
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
msgid "Enter Password"
msgstr "输入密码"
-#: ../mail/mail-session.c:243
+#: ../mail/mail-session.c:245
msgid "User canceled operation."
msgstr "用户己取消操作。"
@@ -14203,92 +14009,102 @@ msgid "Discard changes?"
msgstr "丢弃更改吗?"
#: ../mail/mail.error.xml.h:46
+msgid "Do not d_elete"
+msgstr "不删除(_E)"
+
+#: ../mail/mail.error.xml.h:47
msgid "Do not delete"
msgstr "不删除"
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
msgid "Do not disable"
msgstr "不禁用"
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
msgid "Do you want the operation to be performed in the subfolders?"
msgstr "您是否想要在子文件夹中执行操作?"
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:51
msgid "Do you want to mark all messages as read?"
msgstr "您是否想要把所有信件标记为已读?"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
msgid "Do you wish to save your changes?"
msgstr "您希望保存更改吗?"
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
msgid "Enter password."
msgstr "输入密码。"
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
msgid "Error loading filter definitions."
msgstr "装入过滤器定义错误。"
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
msgid "Error while performing operation."
msgstr "执行操作时出错。"
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
msgid "Error while {0}."
msgstr "{0} 时出错。"
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
msgid "File exists but cannot overwrite it."
msgstr "文件存在但无法覆盖。"
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
msgid "File exists but is not a regular file."
msgstr "文件存在但不是普通文件。"
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
msgid "If you continue, you will not be able to recover these messages."
msgstr "如果您继续的话,您将无法恢复这些信件。"
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
msgid ""
"If you delete the folder, all of its contents and its subfolders contents "
"will be deleted permanently."
msgstr "如果您删除文件夹,其中的全部内容及其子文件夹内容将被永久删除。"
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
msgid "If you proceed, all proxy accounts will be deleted permanently."
msgstr "如果您继续的话,全部代理服务器账户都将被永久删除。"
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
msgstr "如果您继续的话,账户信息及其全部代理服务器信息将被永久删除。"
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
msgid "If you proceed, the account information will be deleted permanently."
msgstr "如果您继续的话,账户信息将被永久删除。"
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
msgstr "如果您退出,这些信件将会等到 Evolution 下次启动才会发出。"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
msgid "Ignore"
msgstr "忽略"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
msgid "Invalid authentication"
msgstr "无效的身份验证"
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
msgid "Mail filters automatically updated."
msgstr "邮件过滤器已自动更新。"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
msgid ""
"Many email systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients to "
@@ -14299,39 +14115,39 @@ msgstr ""
"个邮件头,将在您的信件中列出您的全部收件人。为了避免这种情况,您应该至少填入"
"一个 To: 或 CC: 收件人。"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
msgid "Mark all messages as read"
msgstr "把所有信件标记为已读"
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
msgid "Mark all messages in subfolders as read?"
msgstr "将子文件夹中的信件也全部标记为已读吗?"
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
msgid "Mark as _Read"
msgstr "标记为已读(_R)"
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
msgid "Missing folder."
msgstr "缺少文件夹。"
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
msgid "No sources selected."
msgstr "没有选中源。"
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
msgid "Opening too many messages at once may take a long time."
msgstr "一次打开太多封信可能要花一点时间。"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
msgid "Please check your account settings and try again."
msgstr "请检查您的账户设置,然后再试一次。"
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
msgid "Please enable the account or send using another account."
msgstr "请启用账户或者使用其它账户发送。"
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
@@ -14339,7 +14155,7 @@ msgstr ""
"请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
"邮件地址。"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
@@ -14350,53 +14166,62 @@ msgstr ""
"{0}\n"
"仍然发送吗?"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
msgid "Please provide an unique name to identify this signature."
msgstr "请提供此签名的唯一标识名称。"
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
msgid "Please wait."
msgstr "请稍候。"
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
msgid "Problem migrating old mail folder &quot;{0}&quot;."
msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
msgid "Querying server"
msgstr "查询服务器"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "查询服务器所支持的身份验证算法列表。"
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
msgid "Read receipt requested."
msgstr "阅读收条已请求。"
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:91
msgid "Search Folders automatically updated."
msgstr "搜索文件夹已自动更新。"
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:92
msgid "Send Receipt"
msgstr "发送收条"
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:93
msgid "Signature Already Exists"
msgstr "签名已经存在"
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:94
+msgid "Synchronize"
+msgstr "同步"
+
+#: ../mail/mail.error.xml.h:95
+#, fuzzy
+msgid "Synchronize folders locally for offline usage?"
+msgstr "日历未标为脱机使用。"
+
+#: ../mail/mail.error.xml.h:96
msgid ""
"System folders are required for Evolution to function correctly and cannot "
"be renamed, moved, or deleted."
msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:97
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -14411,7 +14236,7 @@ msgstr ""
"个邮件头,将在您的信件中列出您的全部收件人。为了避免这种情况,您应该至少填入"
"一个 To: 或 CC: 收件人。"
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:100
msgid ""
"The following Search Folder(s):\n"
"{0}\n"
@@ -14425,7 +14250,7 @@ msgstr ""
"“{1}”\n"
"已经更新。"
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:105
msgid ""
"The following filter rule(s):\n"
"{0}\n"
@@ -14439,87 +14264,87 @@ msgstr ""
"“{1}”\n"
"已经更新。"
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:110
msgid "The script file must exist and be executable."
msgstr "脚本文件必须存在且可执行。"
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:111
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
msgstr ""
"此文件夹可能已经隐式添加了。如果需要的话,请转到搜索文件夹编辑器显式添加。"
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:113
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
msgstr "无法发送此信件,因为您所选择用来发送的账户未启用"
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:114
msgid ""
"This message cannot be sent because you have not specified any recipients"
msgstr "无法发送此信件,因为您没有指定任何收件人"
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:115
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
msgstr "此服务器不支持此类型的身份验证,也可能根本不支持身份验证。"
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:116
msgid "This signature has been changed, but has not been saved."
msgstr "签名已经更改,但尚未保存。"
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:117
msgid ""
"This will mark all messages as read in the selected folder and its "
"subfolders."
msgstr "这将把选中文件夹及其子文件夹中的全部信件标记为已读。"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:118
msgid "Unable to connect to the GroupWise server."
msgstr "无法连接到 GroupWise 服务器。"
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:119
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
msgstr "无法打开此账户的草稿文件夹。使用系统的草稿文件夹吗?"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:120
msgid "Unable to read license file."
msgstr "无法读取许可文件。"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:121
msgid "Use _Default"
msgstr "使用默认值(_D)"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:122
msgid "Use default drafts folder?"
msgstr "使用默认的草稿文件夹吗?"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:124
msgid "You have not filled in all of the required information."
msgstr "您没有填入所需的全部信息。"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:125
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "您有未发信件,您仍然想要退出吗?"
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:126
msgid "You may not create two accounts with the same name."
msgstr "您不能创建两个同名账户。"
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:127
msgid "You must name this Search Folder."
msgstr "您必须为此搜索文件夹命名。"
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:128
msgid "You must specify a folder."
msgstr "您必须指定文件夹。"
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -14528,27 +14353,31 @@ msgstr ""
"您必须一次至少指定一个文件夹作为源。\n"
"或者逐一选择文件夹,或者选中全部本地文件夹和/或全部远程文件夹。"
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
msgstr "您以“{1}”的身份登录到服务器“{0}”失败。"
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
msgid "_Append"
msgstr "追加(_A)"
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:133
msgid "_Discard changes"
msgstr "丢弃更改(_D)"
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:134
msgid "_Do not Mark as Read"
msgstr "不标为已读(_D)"
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
+msgid "_Do not Synchronize"
+msgstr "不同步(_D)"
+
+#: ../mail/mail.error.xml.h:137
msgid "_Expunge"
msgstr "销毁(_E)"
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:138
msgid "_Open Messages"
msgstr "打开信件(_O)"
@@ -14588,38 +14417,38 @@ msgstr "较高"
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:1469 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:57
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1476 ../plugins/itip-formatter/itip-view.c:202
+#: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:201
#: ../widgets/table/e-cell-date.c:72
msgid "Today %l:%M %p"
msgstr "今天%p%l:%M"
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:82
msgid "Yesterday %l:%M %p"
msgstr "昨天%p%l:%M"
-#: ../mail/message-list.c:1497 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:94
msgid "%a %l:%M %p"
msgstr "%A%p%l:%M"
-#: ../mail/message-list.c:1505 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:102
msgid "%b %d %l:%M %p"
msgstr "%m月%d日%p%l:%M"
-#: ../mail/message-list.c:1507 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:104
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: ../mail/message-list.c:2263 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2306 ../mail/message-list.etspec.h:9
msgid "Messages"
msgstr "信件"
-#: ../mail/message-list.c:3654
+#: ../mail/message-list.c:3752
msgid "Generating message list"
msgstr "生成信件列表"
@@ -14731,38 +14560,124 @@ msgstr ""
msgid "Audio inline plugin"
msgstr "内嵌音频插件"
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
+#: ../plugins/backup-restore/backup-restore.c:96
+msgid "Select name of the Evolution archive"
msgstr "选择 Evolution 存档名称"
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:120
msgid "_Restart Evolution after backup"
msgstr "备份后重新启动 Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
-msgstr "选择要恢复的 Evolution 存档"
+#: ../plugins/backup-restore/backup-restore.c:139
+msgid "Select name of the Evolution archive to restore"
+msgstr "选择要恢复的 Evolution 存档名称"
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:163
msgid "_Restart Evolution after restore"
msgstr "恢复后重新启动 Evolution(_R)"
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup-restore.c:236
+msgid "Restore from backup"
+msgstr "从备份中恢复"
+
+#: ../plugins/backup-restore/backup-restore.c:238
+msgid ""
+"You can restore Evolution from your archive. It can restore all the Mails/"
+"Calendars/Tasks/Memos/Addressbook. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:244
+msgid "_Restore Evolution from the backup archive"
+msgstr "从备份存档中恢复 Evolution(_R)"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+msgid "Please select an Evolution Archive to restore:"
+msgstr "选择要恢复的 Evolution 存档:"
+
+#: ../plugins/backup-restore/backup-restore.c:254
+msgid "Choose a file to restore"
+msgstr "选择要恢复的文件"
+
+#: ../plugins/backup-restore/backup.c:40
msgid "Backup Evolution directory"
msgstr "备份 Evolution 目录"
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:42
msgid "Restore Evolution directory"
msgstr "恢复 Evolution 目录"
-#: ../plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:44
msgid "Check Evolution archive"
msgstr "检查 Evolution 存档"
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:46
msgid "Restart Evolution"
msgstr "重新启动 Evolution"
+#: ../plugins/backup-restore/backup.c:48
+msgid "With GUI"
+msgstr "带 GUI"
+
+#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:107
+msgid "Shutting down Evolution"
+msgstr "关闭 Evolution"
+
+#: ../plugins/backup-restore/backup.c:72
+msgid "Backing Evolution accounts and settings"
+msgstr "备份 Evolution 的账户及设置"
+
+#: ../plugins/backup-restore/backup.c:77
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:87
+msgid "Backup complete"
+msgstr "备份完成"
+
+#: ../plugins/backup-restore/backup.c:92
+#: ../plugins/backup-restore/backup.c:133
+msgid "Restarting Evolution"
+msgstr "重新启动 Evolution"
+
+#: ../plugins/backup-restore/backup.c:111
+msgid "Backup current Evolution data"
+msgstr "备份当前 Evolution 数据"
+
+#: ../plugins/backup-restore/backup.c:116
+msgid "Extracting files from the archive"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:122
+#, fuzzy
+msgid "Loading Evolution settings"
+msgstr "更改 Evolution 的设置"
+
+#: ../plugins/backup-restore/backup.c:126
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:244
+#, fuzzy, c-format
+msgid "Backing up to %s"
+msgstr "邮寄给 %s"
+
+#: ../plugins/backup-restore/backup.c:249
+#, fuzzy, c-format
+msgid "Restoring from %s"
+msgstr "删除文件夹 %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:264
+#, fuzzy
+msgid "Evolution Backup"
+msgstr "Evolution 邮件"
+
+#: ../plugins/backup-restore/backup.c:264
+msgid "Evolution Restore"
+msgstr "Evolution 恢复"
+
#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
msgid "A plugin for backing up and restore Evolution data and settings."
msgstr "备份及恢复 Evolution 数据和设置的插件。"
@@ -14772,17 +14687,50 @@ msgstr "备份及恢复 Evolution 数据和设置的插件。"
msgid "Backup and restore plugin"
msgstr "备份及恢复插件"
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "备份设置..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "您确定要关闭 Evolution 吗?"
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Are you sure you want to restore Evolution from the selected archive?"
+msgstr "您确定想要从选中的存档中恢复 Evolution 吗?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding. If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Invalid Evolution archive"
+msgstr "无效的 Evolution 存档"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Please select a valid archive file to restore."
+msgstr "请选择要恢复的有效存档文件。"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
msgid "Backup and restore Evolution data and settings"
msgstr "备份及恢复 Evolution 的数据和设置"
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr "恢复设置(_E)..."
+
#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
-msgstr "恢复设置..."
+msgid "_Backup Settings..."
+msgstr "备份设置(_B)..."
#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -14831,10 +14779,29 @@ msgstr ""
msgid "BBDB"
msgstr "BBDB"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
+msgid "Convert mail text to _Unicode"
+msgstr "将邮件文本转换为 _Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail text to Unicode"
+msgstr "将邮件文本转换为 Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
msgid "CalDAV"
msgstr "CalDAV"
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
+msgid "_URL:"
+msgstr "_URL:"
+
#: ../plugins/caldav/caldav-source.c:269
msgid "Use _SSL"
msgstr "使用 _SSL"
@@ -14855,6 +14822,11 @@ msgstr "装入日历"
msgid "Provides core functionality for local calendars."
msgstr "提供本地日历的核心功能。"
+#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-weather/calendar-weather.c:546
+msgid "_Refresh:"
+msgstr "刷新(_R):"
+
#: ../plugins/calendar-http/calendar-http.c:339
msgid "_Secure connection"
msgstr "安全连接(_S)"
@@ -14900,15 +14872,15 @@ msgstr "天气:暴风雨"
msgid "Select a location"
msgstr "选择一个位置"
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
msgid "_Units:"
msgstr "单位(_U):"
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
msgid "Metric (Celsius, cm, etc)"
msgstr "公制(摄氏、厘米等等)"
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
msgid "Imperial (Fahrenheit, inches, etc)"
msgstr "英制(华氏、英寸等等)"
@@ -14930,11 +14902,11 @@ msgstr "一个测试插件,它将显示允许您将文字复制到剪贴板的
msgid "Copy tool"
msgstr "复制工具"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
msgid "Check whether Evolution is the default mailer"
msgstr "检查 Evolution 是否是默认邮件程序"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
msgid ""
"Every time Evolution starts, check whether or not it is the default mailer."
msgstr "每次启动 Evolution 的时候,检查它是否是默认邮件程序。"
@@ -15042,7 +15014,7 @@ msgid "Manage the delegate settings for Exchange account"
msgstr "管理 Exchange 账户的代理设置"
#: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
+msgid "Delegation Assistant"
msgstr "代理助手"
#. Miscelleneous settings
@@ -15081,18 +15053,18 @@ msgid "Ch_eck for Supported Types"
msgstr "检查支持的类型(_E)"
#: ../plugins/exchange-operations/exchange-account-setup.c:949
-#: ../plugins/exchange-operations/exchange-contacts.c:213
+#: ../plugins/exchange-operations/exchange-contacts.c:212
#, c-format
msgid "%s KB"
msgstr "%s KB"
#: ../plugins/exchange-operations/exchange-account-setup.c:951
-#: ../plugins/exchange-operations/exchange-contacts.c:215
+#: ../plugins/exchange-operations/exchange-contacts.c:214
msgid "0 KB"
msgstr "0 KB"
#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-contacts.c:165
msgid ""
"Evolution is in offline mode. You cannot create or modify folders now.\n"
"Please switch to online mode for such operations."
@@ -15135,18 +15107,18 @@ msgid "Your password will expire in the next %d days"
msgstr "您的密码即将于 %d 后过期"
#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-delegates-user.c:143
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1559
msgid "Custom"
msgstr "自定义"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
msgid "Delegate Permissions"
msgstr "代理权限"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:201
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
#, c-format
msgid "Permissions for %s"
@@ -15265,23 +15237,70 @@ msgid "Exchange Folder Tree"
msgstr "Exchange 文件夹树"
#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
msgid "Unsubscribe Folder..."
msgstr "退订文件夹..."
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
#, c-format
msgid "Really unsubscribe from folder \"%s\"?"
msgstr "真的要退订文件夹“%s”吗?"
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:477
+#: ../plugins/exchange-operations/exchange-folder.c:532
#, c-format
msgid "Unsubscribe from \"%s\""
msgstr "退订“%s”"
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>您目前的状态是“办公室以外”。</b>\n"
+"\n"
+"您想要将您的状态更改为“办公室内”吗?"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>办公室以外信件:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>状态:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>在您位于办公室外,如果有人给您发送邮件,则会自动将下面指定的信件\n"
+"送回。</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "我正在办公室内"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "我正在办公室外"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "不,请不要更改状态"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "离开办公室助手"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "是,更改状态"
+
#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
msgid "Password Expiry Warning..."
msgstr "密码过期警告..."
@@ -15362,10 +15381,6 @@ msgstr "读取项目"
msgid "Role: "
msgstr "角色:"
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "不,请不要更改状态"
-
#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
msgid "<b>Message Settings</b>"
msgstr "<b>信件设置</b>"
@@ -15416,11 +15431,11 @@ msgstr "这封信需要阅读收条(_R)"
msgid "_Sensitivity: "
msgstr "敏感度(_S):"
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-user-dialog.c:143
msgid "Select User"
msgstr "选择用户"
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:181
msgid "Address Book..."
msgstr "地址簿..."
@@ -15566,7 +15581,7 @@ msgid "Folder offline"
msgstr "文件夹脱机"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1272
msgid "Generic error"
msgstr "常规错误"
@@ -15764,7 +15779,7 @@ msgstr "退订文件夹"
msgid "_Unsubscribe"
msgstr "退订(_U)"
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:434
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:428
msgid "Checklist"
msgstr "待办清单"
@@ -16018,36 +16033,56 @@ msgstr "添加"
msgid "Modify"
msgstr "修改"
-#: ../plugins/groupwise-features/status-track.c:118
+#: ../plugins/groupwise-features/status-track.c:103
msgid "Message Status"
msgstr "信件状态"
#. Subject
-#: ../plugins/groupwise-features/status-track.c:132
+#: ../plugins/groupwise-features/status-track.c:117
msgid "<b>Subject</b> :"
msgstr "<b>主题</b>:"
-#: ../plugins/groupwise-features/status-track.c:144
+#: ../plugins/groupwise-features/status-track.c:129
msgid "<b>From</b> :"
msgstr "<b>来自</b>:"
-#: ../plugins/groupwise-features/status-track.c:157
+#: ../plugins/groupwise-features/status-track.c:142
msgid "<b>Creation date</b> :"
msgstr "<b>创建日期</b>:"
-#: ../plugins/groupwise-features/status-track.c:177
-msgid "<b>Recipients </b>"
-msgstr "<b>收件人</b>"
-
-#: ../plugins/groupwise-features/status-track.c:181
-msgid "<b>Action</b>"
-msgstr "<b>动作</b>"
+#: ../plugins/groupwise-features/status-track.c:178
+msgid "Recipient: "
+msgstr "收件人:"
#: ../plugins/groupwise-features/status-track.c:185
-msgid "<b>Date and Time</b>"
-msgstr "<b>日期和时间</b>"
+msgid "Delivered: "
+msgstr "已投递:"
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:191
+msgid "Opened: "
+msgstr "已打开:"
+
+#: ../plugins/groupwise-features/status-track.c:196
+msgid "Accepted: "
+msgstr "已接受:"
+
+#: ../plugins/groupwise-features/status-track.c:201
+msgid "Deleted: "
+msgstr "已删除:"
+
+#: ../plugins/groupwise-features/status-track.c:206
+msgid "Declined: "
+msgstr "已拒绝:"
+
+#: ../plugins/groupwise-features/status-track.c:211
+msgid "Completed: "
+msgstr "已完成:"
+
+#: ../plugins/groupwise-features/status-track.c:216
+msgid "Un-delivered: "
+msgstr "未投递:"
+
+#: ../plugins/groupwise-features/status-track.c:241
msgid "Track Message Status..."
msgstr "跟踪信件状态..."
@@ -16128,20 +16163,20 @@ msgstr "导入到日历(_I)"
msgid "_Import to Tasks"
msgstr "导入到任务(_I)"
-#: ../plugins/import-ics-attachments/icsimporter.c:203
+#: ../plugins/import-ics-attachments/icsimporter.c:206
msgid "Import ICS"
msgstr "导入 ICS"
-#: ../plugins/import-ics-attachments/icsimporter.c:231
+#: ../plugins/import-ics-attachments/icsimporter.c:233
msgid "Select Task List"
msgstr "选择任务列表"
-#: ../plugins/import-ics-attachments/icsimporter.c:235
+#: ../plugins/import-ics-attachments/icsimporter.c:237
msgid "Select Calendar"
msgstr "选择日历"
-#: ../plugins/import-ics-attachments/icsimporter.c:266
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:267
+#: ../shell/e-shell-importer.c:700
msgid "_Import"
msgstr "导入(_I)"
@@ -16154,11 +16189,12 @@ msgstr "导入到日历"
msgid "Imports ICS attachments to calendar."
msgstr "将 ICS 附件导入到日历。"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:62
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:64
+#, fuzzy
msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for a iPod failed</span>\n"
+"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
"\n"
-"Evolution could not find a iPod to synchronize with.Either it is not "
+"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 ""
"<span weight=\"bold\" size=\"larger\">搜索 iPod 失败</span>\n"
@@ -16182,40 +16218,6 @@ msgstr "同步到 iPod"
msgid "iPod Synchronization"
msgstr "iPod 同步"
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "无输出目录!"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr "未在 iPod 中找到输出目录!请确定 iPod 已正确设置,然后再试一次。"
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "无法导出数据!"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "导出数据失败。"
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "无法打开地址簿!"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "无法打开 Evolution 地址簿导出数据。"
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "无法打开日历/待办!"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "无法打开 Evolution 日历/待办列表导出数据。"
-
#: ../plugins/itip-formatter/itip-formatter.c:274
#: ../plugins/itip-formatter/itip-formatter.c:395
#, c-format
@@ -16358,404 +16360,408 @@ msgid "Select the calendars to search for meeting conflicts"
msgstr "选择要搜索冲突会议的日历"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:187 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:239
msgid "Today"
msgstr "今天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:192
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:196
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:206
+#: ../plugins/itip-formatter/itip-view.c:205
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:216
+#: ../plugins/itip-formatter/itip-view.c:215
msgid "Tomorrow"
msgstr "明天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:220
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:224
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:230
+#: ../plugins/itip-formatter/itip-view.c:229
msgid "Tomorrow %l:%M %p"
msgstr "明天%p%l:%M"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:233
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:252
#, 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:258
+#: ../plugins/itip-formatter/itip-view.c:257
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:262
+#: ../plugins/itip-formatter/itip-view.c:261
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:267
+#: ../plugins/itip-formatter/itip-view.c:266
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:271
+#: ../plugins/itip-formatter/itip-view.c:270
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:280
+#: ../plugins/itip-formatter/itip-view.c:279
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:286
+#: ../plugins/itip-formatter/itip-view.c:285
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:290
+#: ../plugins/itip-formatter/itip-view.c:289
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:295
+#: ../plugins/itip-formatter/itip-view.c:294
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:299
+#: ../plugins/itip-formatter/itip-view.c:298
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:305
+#: ../plugins/itip-formatter/itip-view.c:304
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:310
+#: ../plugins/itip-formatter/itip-view.c:309
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:314
+#: ../plugins/itip-formatter/itip-view.c:313
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:319
+#: ../plugins/itip-formatter/itip-view.c:318
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:323
+#: ../plugins/itip-formatter/itip-view.c:322
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:347
#, 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:350
+#: ../plugins/itip-formatter/itip-view.c:349
#, c-format
msgid "<b>%s</b> has published the following meeting information:"
msgstr "<b>%s</b> 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:354
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr "<b>%s</b> 为您代理了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:357
#, 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:360
+#: ../plugins/itip-formatter/itip-view.c:359
#, c-format
msgid "<b>%s</b> requests your presence at the following meeting:"
msgstr "<b>%s</b> 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:365
#, 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:368
+#: ../plugins/itip-formatter/itip-view.c:367
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting:"
msgstr "<b>%s</b> 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:370
#, 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:374
+#: ../plugins/itip-formatter/itip-view.c:373
#, c-format
msgid "<b>%s</b> has sent back the following meeting response:"
msgstr "<b>%s</b> 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:377
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> 通过 %s 取消了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:379
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> 取消了下列会议。"
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
#, c-format
msgid "<b>%s</b> has proposed the following meeting changes."
msgstr "<b>%s</b> 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:386
#, 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:389
+#: ../plugins/itip-formatter/itip-view.c:388
#, c-format
msgid "<b>%s</b> has declined the following meeting changes."
msgstr "<b>%s</b> 拒绝了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:415
#, c-format
msgid "<b>%s</b> through %s has published the following task:"
msgstr "<b>%s</b> 通过 %s 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:417
#, c-format
msgid "<b>%s</b> has published the following task:"
msgstr "<b>%s</b> 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:422
#, 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:426
+#: ../plugins/itip-formatter/itip-view.c:425
#, c-format
msgid "<b>%s</b> through %s has assigned you a task:"
msgstr "<b>%s</b> 通过 %s 为您分配了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:428
+#: ../plugins/itip-formatter/itip-view.c:427
#, c-format
msgid "<b>%s</b> has assigned you a task:"
msgstr "<b>%s</b> 为您分配了一个任务:"
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:433
#, 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:436
+#: ../plugins/itip-formatter/itip-view.c:435
#, c-format
msgid "<b>%s</b> wishes to add to an existing task:"
msgstr "<b>%s<b> 希望加入到已存在的任务:"
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:438
#, 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:442
+#: ../plugins/itip-formatter/itip-view.c:441
#, c-format
msgid "<b>%s</b> has sent back the following assigned task response:"
msgstr "<b>%s</b> 发回了下列分配任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:445
#, 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:448
+#: ../plugins/itip-formatter/itip-view.c:447
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> 取消分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:450
#, c-format
msgid "<b>%s</b> has proposed the following task assignment changes:"
msgstr "<b>%s</b> 提议了下列任务分配变更:"
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
#, 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:457
+#: ../plugins/itip-formatter/itip-view.c:456
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> 拒绝了分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:483
#, c-format
msgid "<b>%s</b> through %s has published the following memo:"
msgstr "<b>%s</b> 通过 %s 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:485
#, c-format
msgid "<b>%s</b> has published the following memo:"
msgstr "<b>%s</b> 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:490
#, 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:493
+#: ../plugins/itip-formatter/itip-view.c:492
#, c-format
msgid "<b>%s</b> wishes to add to an existing memo:"
msgstr "<b>%s</b> 希望加入到已有的备忘中:"
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:496
#, 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:499
+#: ../plugins/itip-formatter/itip-view.c:498
#, 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:755
+#: ../plugins/itip-formatter/itip-view.c:762
msgid "_Open Calendar"
msgstr "打开日历(_O)"
-#: ../plugins/itip-formatter/itip-view.c:761
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:771
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#: ../plugins/itip-formatter/itip-view.c:768
+#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:800
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:762
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:769
#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:790
-#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:781
+#: ../plugins/itip-formatter/itip-view.c:797
+#: ../plugins/itip-formatter/itip-view.c:802
msgid "_Accept"
msgstr "接受(_A)"
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:772
msgid "_Decline all"
msgstr "全部拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:773
msgid "_Tentative all"
msgstr "全部待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:766
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:789
-#: ../plugins/itip-formatter/itip-view.c:794
+#: ../plugins/itip-formatter/itip-view.c:773
+#: ../plugins/itip-formatter/itip-view.c:779
+#: ../plugins/itip-formatter/itip-view.c:796
+#: ../plugins/itip-formatter/itip-view.c:801
msgid "_Tentative"
msgstr "待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:774
msgid "_Accept all"
msgstr "全部接受(_A)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:785
msgid "_Send Information"
msgstr "发送信息(_S)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:782
+#: ../plugins/itip-formatter/itip-view.c:789
msgid "_Update Attendee Status"
msgstr "更新与会者状态(_U)"
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:792
msgid "_Update"
msgstr "更新(_U)"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:944
+#: ../plugins/itip-formatter/itip-view.c:951
msgid "Start time:"
msgstr "开始时间:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:953
+#: ../plugins/itip-formatter/itip-view.c:960
msgid "End time:"
msgstr "结束时间:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:969
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:976
+#: ../plugins/itip-formatter/itip-view.c:1026
msgid "Comment:"
msgstr "注释:"
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Send u_pdates to attendees"
-msgstr "给出席者发送更新(_P)"
+#: ../plugins/itip-formatter/itip-view.c:1012
+msgid "Send _reply to sender"
+msgstr "回复发件人(_R)"
+
+#: ../plugins/itip-formatter/itip-view.c:1040
+msgid "Send _updates to attendees"
+msgstr "给出席者发送更新(_U)"
-#: ../plugins/itip-formatter/itip-view.c:1042
-msgid "A_pply to all instances"
-msgstr "应用到全部实例(_P)"
+#: ../plugins/itip-formatter/itip-view.c:1049
+msgid "_Apply to all instances"
+msgstr "应用到全部实例(_A)"
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1718
msgid "_Tasks :"
msgstr "任务(_T):"
-#: ../plugins/itip-formatter/itip-view.c:1713
+#: ../plugins/itip-formatter/itip-view.c:1720
msgid "Memos :"
msgstr "备忘:"
@@ -16794,6 +16800,46 @@ msgstr "允许禁用账户。"
msgid "Disable Account"
msgstr "禁用账户"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Enable libnotify notifications of new mail"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Every time a new mail arrives, pop up a libnotify notification."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Make the status icon blink"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "When the new-mail status icon is visible, make it blink."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:108
+#, c-format
+msgid "You have received %d new message in %s."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:108
+#, c-format
+msgid "You have received %d new messages in %s."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:130
+msgid "New email"
+msgstr "新电子邮件"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "邮件通知"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid ""
+"Notifies the user with tray icon and a notify message whenever a new message "
+"is arrived."
+msgstr ""
+
#: ../plugins/mail-remote/client.c:30
#, c-format
msgid "System error: %s"
@@ -17058,17 +17104,13 @@ msgstr "新邮件到达时生成 D-BUS 信息。"
msgid "New Mail Notification"
msgstr "新邮件通知"
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "新邮件通知"
-
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
msgid "A plugin for managing which plugins are enabled or disabled."
msgstr "管理插件是启用还是禁用的插件。"
#. Setup the ui
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:202
msgid "Plugin Manager"
msgstr "插件管理器"
@@ -17080,22 +17122,22 @@ msgstr "启用和禁用插件"
msgid "_Plugins"
msgstr "插件(_P)"
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:53
msgid "Author(s)"
msgstr "作者"
-#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/plugin-manager/plugin-manager.c:54
#: ../widgets/table/e-table-config-no-group.glade.h:6
#: ../widgets/table/e-table-config.glade.h:5
msgid "Description"
msgstr "描述"
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:215
msgid "Note: Some changes will not take effect until restart"
msgstr "注意:某些更改直到重新启动后才生效"
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:268
+#: ../plugins/plugin-manager/plugin-manager.c:327
msgid "Plugin"
msgstr "插件"
@@ -17139,6 +17181,10 @@ msgstr "HTML 模式"
msgid "Gives an option to print mail from composer"
msgstr "在撰写器中添加打印邮件的选项"
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+msgid "Print Message"
+msgstr "打印信件"
+
#: ../plugins/print-message/org-gnome-print-message.xml.h:1
#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
@@ -17234,10 +17280,22 @@ msgstr "服务类型(_T):"
msgid "_File:"
msgstr "文件(_F):"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "密码(_P):"
+
#: ../plugins/publish-calendar/publish-calendar.glade.h:24
msgid "_Publish as:"
msgstr "发布为(_P):"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "记住密码(_R)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "用户名(_U):"
+
#: ../plugins/publish-calendar/publish-calendar.glade.h:28
msgid ""
"iCal\n"
@@ -17246,18 +17304,26 @@ msgstr ""
"iCal\n"
"忙/闲"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
-msgid "Spamassassin (built-in)"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+msgid "SpamAssassin (built-in)"
msgstr "垃圾克星(内置)"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+msgid "This will make Spamassasin more reliable, but slower"
+msgstr "这将让过滤器更可靠,但稍慢"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+msgid "I_nclude remote tests"
+msgstr "包含远程测试(_N)"
+
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
msgid ""
-"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
"to be installed."
msgstr "使用垃圾克星过滤垃圾邮件。此插件需要安装 Spamassassin。"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "Spamassassin junk plugin"
+msgid "SpamAssassin junk plugin"
msgstr "垃圾克星插件"
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
@@ -17266,7 +17332,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:334
+#: ../plugins/save-attachments/save-attachments.c:330
msgid "Save attachments"
msgstr "保存附件"
@@ -17278,16 +17344,16 @@ msgstr "保存附件..."
msgid "Save all attachments"
msgstr "保存全部附件"
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:336
msgid "Select save base name"
msgstr "选择保存基础名称"
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:355
msgid "MIME Type"
msgstr "MIME 类型"
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:20
+#: ../plugins/save-attachments/save-attachments.c:363
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
msgid "Save"
msgstr "保存"
@@ -17425,15 +17491,15 @@ msgstr "处理启动向导的插件。"
msgid "Startup wizard"
msgstr "启动向导"
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
msgid "Evolution Setup Assistant"
msgstr "Evolution 设置助手"
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
msgid "Welcome"
msgstr "欢迎"
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
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"
@@ -17445,26 +17511,31 @@ msgstr ""
"\n"
"请单击“前进”按钮继续。"
-#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../plugins/startup-wizard/startup-wizard.c:134
msgid "Importing files"
msgstr "导入文件"
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:147
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:397
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:508
msgid "Importing data."
msgstr "正在导入数据。"
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
+msgid "Please wait"
+msgstr "请稍候"
+
#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
msgid "Indicates if threading of messages should fall back to subject."
msgstr "表明信件线索是否应以主题为准。"
@@ -17498,84 +17569,84 @@ msgstr "Evolution 测试"
msgid "Evolution Test component"
msgstr "Evolution 测试组件"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.h:1
msgid "A string description of the current printer settings"
msgstr "当前打印机设置的字符串描述"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
msgid "Configuration version"
msgstr "配置版本"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
msgid "Default sidebar width"
msgstr "默认侧边栏宽度"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
msgid "Default window height"
msgstr "默认窗口高度"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:5
msgid "Default window state"
msgstr "默认窗口状态"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:6
msgid "Default window width"
msgstr "默认窗口宽度"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:7
msgid "ID or alias of the component to be shown by default at start-up."
msgstr "启动时默认显示的组件 ID 或别名。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:8
msgid "Last upgraded configuration version"
msgstr "上次升级的配置版本"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:9
msgid ""
"List of paths for the folders to be synchronized to disk for offline usage"
msgstr "列出脱机使用时要同步到磁盘的文件夹路径"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:10
msgid "Sidebar is visible"
msgstr "侧边栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:11
msgid "Skip development warning dialog"
msgstr "跳过开发警告对话框"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:472
+#: ../shell/apps_evolution_shell.schemas.in.h:12 ../shell/main.c:458
msgid "Start in offline mode"
msgstr "以脱机模式启动"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:13
msgid "Statusbar is visible"
msgstr "状态栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:14
msgid ""
"The configuration version of Evolution, with major/minor/configuration level "
"(for example \"2.6.0\")."
msgstr "Evolution 的配置版本,带主/次/配置级别(如“2.6.0”)。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:15
msgid "The default height for the main window, in pixels."
msgstr "主窗口的默认高度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:16
msgid "The default width for the main window, in pixels."
msgstr "主窗口的默认宽度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:17
msgid "The default width for the sidebar, in pixels."
msgstr "侧边栏的默认宽度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:18
msgid ""
"The last upgraded configuration version of Evolution, with major/minor/"
"configuration level (for example \"2.6.0\")."
msgstr "上次升级的 Evolution 配置版本,带主/次/配置级别(如“2.6.0”)。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:19
msgid ""
"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17584,44 +17655,44 @@ msgstr ""
"窗口按钮的样式。可以是文字、图标、二者、工具栏。如果设置为工具栏,则工具栏的"
"样式由 GNOME 设置决定。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:20
msgid "Toolbar is visible"
msgstr "工具栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:21
msgid "Whether Evolution will start up in offline mode instead of online mode."
msgstr "是否以脱机模式而非联机模式启动 Evolution。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:22
msgid "Whether or not the window should be maximized."
msgstr "窗口是否应为最大化。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:23
msgid "Whether the sidebar should be visible."
msgstr "侧边栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:24
msgid "Whether the status bar should be visible."
msgstr "状态栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:25
msgid "Whether the toolbar should be visible."
msgstr "工具栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:26
msgid ""
"Whether the warning dialog in development versions of Evolution is skipped."
msgstr "是否跳过 Evoltuion 开发版本的警告。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:27
msgid "Whether the window buttons should be visible."
msgstr "窗口按钮是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:28
msgid "Window button style"
msgstr "窗口按钮样式"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:29
msgid "Window buttons are visible"
msgstr "窗口按钮可见"
@@ -17637,16 +17708,11 @@ msgstr "当前连接"
msgid "Click OK to close these connections and go offline"
msgstr "单击确定关闭这些连接,并转入脱机操作"
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(无标题)"
-
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型:"
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -17658,11 +17724,11 @@ msgstr ""
"\n"
"如果您不清楚,可以选择“自动”,Evolution 将尝试为您确定类型。"
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
msgid "Choose the destination for this import"
msgstr "选择此导入的目的位置"
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17673,27 +17739,27 @@ msgstr ""
"iCalendar。并未发现可导入的设置。如果您想要再试一次,请单击\n"
"“上一步”按钮。\n"
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
msgid "F_ilename:"
msgstr "文件名(_I):"
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
msgid "Select a file"
msgstr "选择一个文件"
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:299
msgid "File _type:"
msgstr "文件类型(_T):"
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:335
msgid "Import data and settings from _older programs"
msgstr "从旧版程序中导入数据和设置(_O)"
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:338
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: ../shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:319
msgid "Evolution Preferences"
msgstr "Evolution 首选项"
@@ -17737,25 +17803,25 @@ 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:565
+#: ../shell/e-shell-window-commands.c:575
msgid "translator-credits"
msgstr ""
"开源软件国际化之简体中文组\n"
"http://i18n.linux.net.cn"
-#: ../shell/e-shell-window-commands.c:576
+#: ../shell/e-shell-window-commands.c:586
msgid "Evolution Website"
msgstr "Evolution 网站"
-#: ../shell/e-shell-window-commands.c:782
+#: ../shell/e-shell-window-commands.c:793
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: ../shell/e-shell-window-commands.c:795 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:806 ../ui/evolution.xml.h:55
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: ../shell/e-shell-window-commands.c:808
+#: ../shell/e-shell-window-commands.c:819
msgid "Work Offline"
msgstr "脱机工作"
@@ -17771,33 +17837,33 @@ msgstr "Evolution 正在脱机过程中。"
msgid "Evolution is currently offline. Click on this button to work online."
msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
-#: ../shell/e-shell-window.c:796
+#: ../shell/e-shell-window.c:820
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell.c:635
+#: ../shell/e-shell.c:636
msgid "Uknown system error."
msgstr "未知的系统错误。"
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1263 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1264 ../widgets/misc/e-cell-date-edit.c:255
msgid "OK"
msgstr "确定"
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1266
msgid "Invalid arguments"
msgstr "无效参数"
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1268
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1270
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
@@ -17807,15 +17873,15 @@ msgstr "找不到配置数据库"
msgid "New"
msgstr "新建"
-#: ../shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:107
msgid "New Test"
msgstr "新建测试"
-#: ../shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:108
msgid "_Test"
msgstr "测试(_T)"
-#: ../shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:109
msgid "Create a new test item"
msgstr "创建新测试项"
@@ -17857,7 +17923,7 @@ msgstr ""
"本助手将全程指导您将外部文件导入 Evolution。"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:219
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -17889,7 +17955,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: ../shell/main.c:258
+#: ../shell/main.c:243
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -17897,39 +17963,39 @@ msgstr ""
"感谢\n"
"Evolution 团队\n"
-#: ../shell/main.c:265
+#: ../shell/main.c:250
msgid "Do not tell me again"
msgstr "不要再通知我"
-#: ../shell/main.c:470
+#: ../shell/main.c:456
msgid "Start Evolution activating the specified component"
msgstr "启动 Evolution 并激活指定组件"
-#: ../shell/main.c:474
+#: ../shell/main.c:460
msgid "Start in online mode"
msgstr "以联机模式启动"
-#: ../shell/main.c:477
+#: ../shell/main.c:463
msgid "Forcibly shut down all Evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: ../shell/main.c:481
+#: ../shell/main.c:467
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "强制从 Evolution 1.4 重新升迁"
-#: ../shell/main.c:484
+#: ../shell/main.c:470
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: ../shell/main.c:486
+#: ../shell/main.c:472
msgid "Disable loading of any plugins."
msgstr "禁止装入任何插件。"
-#: ../shell/main.c:516
+#: ../shell/main.c:501
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution 个人信息管理和邮件客户"
-#: ../shell/main.c:527
+#: ../shell/main.c:514
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -18089,39 +18155,57 @@ msgid ""
"unless otherwise indicated here"
msgstr "由于您不信任颁发此证书的机构,您就将不信任此证书的权威性,除非在此声明"
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:138
+#: ../smime/gui/certificate-manager.c:156
+#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:407
+#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:639
msgid "Select a certificate to import..."
msgstr "选择要导入的证书..."
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:147
+msgid "All PKCS12 files"
+msgstr "全部 PKCS12 文件"
+
+#: ../smime/gui/certificate-manager.c:152
+#: ../smime/gui/certificate-manager.c:403
+#: ../smime/gui/certificate-manager.c:635
+msgid "All files"
+msgstr "全部文件"
+
+#: ../smime/gui/certificate-manager.c:279
+#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:726
msgid "Certificate Name"
msgstr "证书名称"
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:288
+#: ../smime/gui/certificate-manager.c:514
msgid "Purposes"
msgstr "用途"
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:297 ../smime/gui/smime-ui.glade.h:37
#: ../smime/lib/e-cert.c:570
msgid "Serial Number"
msgstr "序列号"
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:305
msgid "Expires"
msgstr "到期"
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:398
+msgid "All email certificate files"
+msgstr "所有电子邮件证书文件"
+
+#: ../smime/gui/certificate-manager.c:505
msgid "E-Mail Address"
msgstr "电子邮件地址"
+#: ../smime/gui/certificate-manager.c:630
+msgid "All CA certificate files"
+msgstr "全部颁证机构文件"
+
#: ../smime/gui/certificate-viewer.c:341
#, c-format
msgid "Certificate Viewer: %s"
@@ -18523,30 +18607,6 @@ msgstr "输入 PKCS12 文件的密码:"
msgid "Imported Certificate"
msgstr "导入的证书"
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "要添加的附件。"
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "附件的内容类型。"
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "要在邮件中显示的文件名。"
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "附件描述。"
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "默认让附件只能嵌入显示。"
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "信件的默认主题。"
-
#. This most likely means that KILL_PROCESS_CMD wasn't
#. * found, so just bail completely.
#.
@@ -18678,7 +18738,7 @@ msgstr "把选中的联系人保存为 VCard。"
msgid "Save the contacts of the selected folder as VCard"
msgstr "把选中文件夹中的的联系人保存为 VCard"
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2715
msgid "Select All"
msgstr "全选"
@@ -18955,17 +19015,17 @@ msgstr "关闭"
msgid "I_nsert"
msgstr "插入(_N)"
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
msgid "_Attachment..."
msgstr "附件(_A)..."
#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:45 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
msgid "_Close"
msgstr "关闭(_C)"
#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:53
#: ../ui/evolution-signature-editor.xml.h:25
#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
msgid "_File"
@@ -19028,87 +19088,91 @@ msgid "R_ole Field"
msgstr "角色域(_O)"
#: ../ui/evolution-event-editor.xml.h:16
+msgid "Send _Options"
+msgstr "发送选项(_O)"
+
+#: ../ui/evolution-event-editor.xml.h:17
msgid "Show time as _busy"
msgstr "将时间显示为忙(_B)"
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
msgid "Time _Zone"
msgstr "时区(_Z)"
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
msgid "Toggles whether the Attendee Type field is displayed"
msgstr "切换是否显示出席者类型域"
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
msgid "Toggles whether the RSVP field is displayed"
msgstr "切换是否显示请回复域"
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
msgid "Toggles whether the Role field is displayed"
msgstr "切换是否显示角色域"
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
msgid "Toggles whether the Status field is displayed"
msgstr "切换是否显示状态域"
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
msgid "Toggles whether the time zone is displayed"
msgstr "切换是否显示时区"
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
#: ../ui/evolution-task-editor.xml.h:17
msgid "Toggles whether to display categories"
msgstr "切换是否显示类别"
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
msgid "Toggles whether to have All Day Event"
msgstr "切换是否有全天事件"
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
msgid "Toggles whether to show time as busy"
msgstr "切换是否将时间显示为忙"
-#: ../ui/evolution-event-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:27
msgid "_Alarms"
msgstr "提醒(_A)"
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
#: ../ui/evolution-task-editor.xml.h:18
msgid "_Categories"
msgstr "类别(_C)"
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
#: ../ui/evolution-task-editor.xml.h:19
msgid "_Classification"
msgstr "分类(_C)"
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
#: ../ui/evolution-task-editor.xml.h:20
msgid "_Confidential"
msgstr "机密(_C)"
-#: ../ui/evolution-event-editor.xml.h:30
+#: ../ui/evolution-event-editor.xml.h:31
msgid "_Free/Busy"
msgstr "忙/闲(_F)"
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
#: ../ui/evolution-task-editor.xml.h:21
msgid "_Private"
msgstr "私人(_P)"
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
msgid "_RSVP"
msgstr "请回复(_R)"
-#: ../ui/evolution-event-editor.xml.h:33
+#: ../ui/evolution-event-editor.xml.h:34
msgid "_Recurrence"
msgstr "再现(_R)"
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
msgid "_Status Field"
msgstr "状态域(_S)"
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
msgid "_Type Field"
msgstr "类型域(_T)"
@@ -19133,79 +19197,91 @@ msgid "Create or edit rules for filtering new mail"
msgstr "创建或编辑过滤新邮件的规则"
#: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages for Offline"
+msgstr "下载信件进行脱机处理"
+
+#: ../ui/evolution-mail-global.xml.h:8
+msgid "Download messages for offline"
+msgstr "下载信件进行脱机处理"
+
+#: ../ui/evolution-mail-global.xml.h:9
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:10
msgid "Empty _Trash"
msgstr "清空回收站(_T)"
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
#: ../ui/evolution-subscribe.xml.h:2
msgid "F_older"
msgstr "文件夹(_O)"
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:12
msgid "Move the selected folder into another folder"
msgstr "把选中的文件夹移至其它文件夹"
#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:14
msgid "Permanently remove all deleted messages from all folders"
msgstr "永久删除所有文件夹中的所有已删除的信件"
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:15
msgid "Search F_olders"
msgstr "搜索文件夹(_O)"
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:16
msgid "Show Message _Preview"
msgstr "显示信件预览(_P)"
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:17
msgid "Show message preview below the message list"
msgstr "在信件列表下方显示信件预览"
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:18
msgid "Show message preview side-by-side with the message list"
msgstr "在信件列表旁显示信件预览"
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:19
msgid "Show message preview window"
msgstr "显示信件预览窗口"
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:20
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅或退订远程服务器上的文件夹"
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:21
msgid "_Classic View"
msgstr "分类视图(_C)"
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:22
msgid "_Copy Folder To..."
msgstr "文件夹复制到(_C)..."
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:23
msgid "_Message Filters"
msgstr "邮件过滤(_M)"
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:24
msgid "_Move Folder To..."
msgstr "文件夹移至(_M)..."
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:25
msgid "_New..."
msgstr "新建(_N)..."
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:26
msgid "_Preview"
msgstr "预览(_P)"
#.
#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
#.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:30
msgid "_Subscriptions"
msgstr "订阅(_S)"
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:31
msgid "_Vertical View"
msgstr "垂直视图(_V)"
@@ -19280,50 +19356,58 @@ msgid "Permanently remove this folder"
msgstr "永久删除此文件夹"
#: ../ui/evolution-mail-list.xml.h:20
+msgid "Re_fresh..."
+msgstr "刷新(_F)..."
+
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Refresh the folder"
+msgstr "刷新文件夹"
+
+#: ../ui/evolution-mail-list.xml.h:22
msgid "Select Message _Thread"
msgstr "选择信件线索(_T)"
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:23
msgid "Select _All Messages"
msgstr "选中全部信件(_A)"
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:24
msgid "Select all and only the messages that are not currently selected"
msgstr "选中所有当前没有选中的信件"
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
msgid "Select all messages in the same thread as the selected message"
msgstr "把同一线索中的所有信件选择为选中信件"
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
msgid "Select all visible messages"
msgstr "选中所有可见的信件"
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:27
msgid "Show Hidde_n Messages"
msgstr "显示隐藏的信件(_N)"
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
msgid "Show messages that have been temporarily hidden"
msgstr "显示暂时被隐藏的信件"
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:29
msgid "Temporarily hide all messages that have already been read"
msgstr "暂时隐藏所有已读信件"
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:30
msgid "Temporarily hide the selected messages"
msgstr "暂时隐藏选中信件"
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:31
msgid "Threaded Message list"
msgstr "按线索编排的信件列表"
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:33
msgid "_Group By Threads"
msgstr "按线索分组(_G)"
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
#: ../ui/evolution-mail-messagedisplay.xml.h:7
msgid "_Message"
msgstr "信件(_M)"
@@ -19626,8 +19710,8 @@ msgid "Search Folder from Mailing _List..."
msgstr "基于邮件列表的搜索文件夹(_L)..."
#: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
-msgstr "基于收件人的搜索文件夹..."
+msgid "Search Folder from Recipien_ts..."
+msgstr "基于收件人的搜索文件夹(_T)..."
#: ../ui/evolution-mail-message.xml.h:88
msgid "Search Folder from S_ubject..."
@@ -19869,144 +19953,164 @@ msgid "PGP Sign"
msgstr "PGP 签名"
#: ../ui/evolution-message-composer.xml.h:17
+msgid "PGP _Encrypt"
+msgstr "PGP 加密(_E)"
+
+#: ../ui/evolution-message-composer.xml.h:18
+msgid "PGP _Sign"
+msgstr "PGP 签名(_S)"
+
+#: ../ui/evolution-message-composer.xml.h:19
msgid "R_equest Read Receipt"
msgstr "请求阅读收条(_E)"
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
+msgid "S/MIME En_crypt"
+msgstr "S/MIME 加密(_C)"
+
+#: ../ui/evolution-message-composer.xml.h:21
msgid "S/MIME Encrypt"
msgstr "S/MIME 加密"
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:22
+msgid "S/MIME Sig_n"
+msgstr "S/MIME 签名(_N)"
+
+#: ../ui/evolution-message-composer.xml.h:23
msgid "S/MIME Sign"
msgstr "S/MIME 签名"
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:24
+msgid "S_end"
+msgstr "发送(_E)"
+
+#: ../ui/evolution-message-composer.xml.h:26
msgid "Save As"
msgstr "另存为"
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:27
msgid "Save Draft"
msgstr "保存草稿"
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:28
msgid "Save _As..."
msgstr "另存为(_A)..."
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:29
msgid "Save _Draft"
msgstr "保存草稿(_D)"
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:30
msgid "Save as draft"
msgstr "另存为草稿"
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:31
msgid "Save in folder..."
msgstr "保存到文件夹..."
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:32
msgid "Save the current file"
msgstr "保存当前文件"
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:33
msgid "Save the current file with a different name"
msgstr "用不同的文件名保存当前文件"
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:34
msgid "Save the message in a specified folder"
msgstr "在指定的文件夹中保存信件"
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:35
msgid "Send"
msgstr "发送"
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:36
#: ../ui/evolution-signature-editor.xml.h:23
msgid "Send the mail in HTML format"
msgstr "以 HTML 格式发送邮件"
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:37
msgid "Send this message"
msgstr "发送这封信"
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:38
msgid "Set the message priority to high"
msgstr "将信件设定为高优先级"
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:39
msgid "Sign this message with your PGP key"
msgstr "用您的 PGP 密钥签名该信件"
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:40
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "用您的 S/MIME 签名认证签名该信件"
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:41
msgid "Toggles whether the BCC field is displayed"
msgstr "是否显示暗中转发域"
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:42
msgid "Toggles whether the CC field is displayed"
msgstr "是否显示转发域"
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:43
msgid "Toggles whether the From chooser is displayed"
msgstr "是否显示发件人选择器"
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:44
msgid "Toggles whether the Post-To field is displayed"
msgstr "是否显示投递到域"
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:45
msgid "Toggles whether the Reply-To field is displayed"
msgstr "是否显示回复域"
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:46
msgid "Toggles whether the To field is displayed"
msgstr "是否显示寄给域"
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:48
msgid "_Bcc Field"
msgstr "暗送域(_B)"
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:49
msgid "_Cc Field"
msgstr "抄送域(_C)"
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:51
msgid "_Delete all"
msgstr "全部删除(_D)"
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54
msgid "_From Field"
msgstr "发件人域(_F)"
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:55
msgid "_Open..."
msgstr "打开(_O)..."
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:56
msgid "_Post-To Field"
msgstr "投递到域(_P)"
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:57
msgid "_Prioritize Message"
msgstr "标为优先(_P)"
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:58
msgid "_Reply-To Field"
msgstr "回复域(_R)"
-#: ../ui/evolution-message-composer.xml.h:55
+#: ../ui/evolution-message-composer.xml.h:60
msgid "_Security"
msgstr "安全(_S)"
-#: ../ui/evolution-message-composer.xml.h:56
+#: ../ui/evolution-message-composer.xml.h:61
#: ../ui/evolution-task-editor.xml.h:23
msgid "_Send Options"
msgstr "发送选项(_S)"
-#: ../ui/evolution-message-composer.xml.h:57
+#: ../ui/evolution-message-composer.xml.h:62
msgid "_To Field"
msgstr "收件人域(_T)"
@@ -20382,11 +20486,11 @@ msgid "With _Status"
msgstr "状态(_S)"
#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:761
msgid "UTC"
msgstr "UTC"
@@ -20415,19 +20519,19 @@ msgstr ""
"用鼠标左键放大地图的某个区域并选择时区。\n"
"用鼠标右键缩小。"
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:84
#: ../widgets/menus/gal-define-views-model.c:188
msgid "Collection"
msgstr "收藏"
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:366
#: ../widgets/menus/gal-define-views.glade.h:4
#, no-c-format
msgid "Define Views for %s"
msgstr "定义 %s 的视图"
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:374
+#: ../widgets/menus/gal-define-views-dialog.c:376
msgid "Define Views"
msgstr "定义视图"
@@ -20436,12 +20540,8 @@ msgstr "定义视图"
msgid "Define Views for \"%s\""
msgstr "定义“%s”的视图"
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "编辑(_E)..."
-
#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1909
+#: ../widgets/table/e-table-header-item.c:1912
#: ../widgets/table/e-table-scrolled.c:222
#: ../widgets/table/e-table-scrolled.c:223
msgid "Table"
@@ -20465,7 +20565,7 @@ msgstr "替换现有视图(_R)"
#. bonobo displays this string so it must be in locale
#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:350
+#: ../widgets/menus/gal-view-menus.c:354
msgid "Custom View"
msgstr "当前视图"
@@ -20474,7 +20574,7 @@ msgid "Save Custom View"
msgstr "保存自定义视图"
#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:378
msgid "Define Views..."
msgstr "定义视图..."
@@ -20482,10 +20582,27 @@ msgstr "定义视图..."
msgid "C_urrent View"
msgstr "当前视图(_U)"
+#: ../widgets/menus/gal-view-menus.c:315
+#, c-format
+msgid "Select View: %s"
+msgstr "选择视图:%s"
+
#: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr "当前视图为自定义视图"
+
+#: ../widgets/menus/gal-view-menus.c:364
msgid "Save Custom View..."
msgstr "保存当前视图..."
+#: ../widgets/menus/gal-view-menus.c:369
+msgid "Save current custom view"
+msgstr "保存当前自定义视图"
+
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Create or edit views"
+msgstr "创建或编辑视图"
+
#: ../widgets/menus/gal-view-new-dialog.c:80
msgid "Factory"
msgstr "工厂"
@@ -20506,6 +20623,33 @@ msgstr "视图类型"
msgid "Type of view:"
msgstr "视图类型:"
+#: ../widgets/misc/e-attachment-bar.c:1019
+msgid "Attachment Bar"
+msgstr "附件栏"
+
+#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
+#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "无法附加文件 %s:%s"
+
+#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "无法附加文件 %s:不是普通文件"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "附件属性"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "文件名:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME 类型:"
+
#: ../widgets/misc/e-attachment.glade.h:5
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
@@ -20517,8 +20661,8 @@ msgid "MTWTFSS"
msgstr "一二三四五六日"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1089
-#: ../widgets/misc/e-calendar-item.c:1743
+#: ../widgets/misc/e-calendar-item.c:1088
+#: ../widgets/misc/e-calendar-item.c:1742
msgid "%B %Y"
msgstr "%Y年%B"
@@ -20527,27 +20671,27 @@ msgid "Month Calendar"
msgstr "月历"
#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1237
-#: ../widgets/text/e-entry.c:1238 ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1235
+#: ../widgets/text/e-entry.c:1236 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
msgid "Fill color"
msgstr "填充颜色"
#: ../widgets/misc/e-canvas-background.c:464
#: ../widgets/misc/e-canvas-background.c:465
#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1244
-#: ../widgets/text/e-entry.c:1245 ../widgets/text/e-entry.c:1251
-#: ../widgets/text/e-entry.c:1252 ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1242
+#: ../widgets/text/e-entry.c:1243 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3581
msgid "GDK fill color"
msgstr "GDK 填充颜色"
#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1258
-#: ../widgets/text/e-entry.c:1259 ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1256
+#: ../widgets/text/e-entry.c:1257 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3588
msgid "Fill stipple"
msgstr "点绘填充"
@@ -20590,115 +20734,116 @@ msgstr "最小宽度"
msgid "Spacing"
msgstr "间距"
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:231
msgid "Now"
msgstr "现在"
-#: ../widgets/misc/e-cell-date-edit.c:793
+#: ../widgets/misc/e-cell-date-edit.c:795
#, c-format
msgid "The time must be in the format: %s"
msgstr "时间必须采用格式:%s"
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr "阿拉伯语"
+
+#: ../widgets/misc/e-charset-picker.c:66
msgid "Baltic"
msgstr "波罗的语"
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
msgid "Central European"
msgstr "中欧"
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
msgid "Chinese"
msgstr "中文"
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
msgid "Cyrillic"
msgstr "西里尔语"
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
msgid "Greek"
msgstr "希腊语"
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
msgid "Hebrew"
msgstr "希伯来语"
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
msgid "Japanese"
msgstr "日文"
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:73
msgid "Korean"
msgstr "韩语"
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
msgid "Thai"
msgstr "泰语"
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
msgid "Turkish"
msgstr "土耳其语"
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
msgid "Unicode"
msgstr "Unicode"
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:77
msgid "Western European"
msgstr "西欧"
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:78
msgid "Western European, New"
msgstr "西欧,新"
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
msgid "Traditional"
msgstr "繁体"
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
+#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
msgid "Simplified"
msgstr "简体"
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
msgid "Ukrainian"
msgstr "乌克兰语"
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:109
msgid "Visual"
msgstr "可视"
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:178
#, c-format
msgid "Unknown character set: %s"
msgstr "未知的字符集:%s"
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:223
msgid "Character Encoding"
msgstr "字符编码"
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:238
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:345
msgid "Other..."
msgstr "其它..."
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:486
msgid "Ch_aracter Encoding"
msgstr "字符编码(_A)"
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
#: ../widgets/misc/e-dateedit.c:321
msgid "Date and Time"
msgstr "日期和时间"
@@ -20719,29 +20864,19 @@ msgstr "选择时间的组合框"
msgid "Time"
msgstr "时间"
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:459
msgid "No_w"
msgstr "现在(_W)"
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:465
msgid "_Today"
msgstr "今天(_T)"
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
-msgid "%I:%M %p"
-msgstr "%p%I:%M"
-
-#: ../widgets/misc/e-dateedit.c:1634
+#: ../widgets/misc/e-dateedit.c:1631
msgid "Invalid Date Value"
msgstr "无效的日期值"
-#: ../widgets/misc/e-dateedit.c:1660
+#: ../widgets/misc/e-dateedit.c:1657
msgid "Invalid Time Value"
msgstr "无效的时间值"
@@ -20779,11 +20914,11 @@ msgstr "标签部件"
msgid "A widget to display in place of the usual expander label"
msgstr "在通常扩展器标签的位置显示的部件"
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3351
msgid "Expander Size"
msgstr "扩展器大小"
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3352
msgid "Size of the expander arrow"
msgstr "扩展器箭头的大小"
@@ -20796,21 +20931,21 @@ msgid "Spacing around expander arrow"
msgstr "扩展器箭头旁边的间距"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:291 ../widgets/misc/e-filter-bar.c:727
+#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:182
+#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
msgid "Advanced Search"
msgstr "高级搜索"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:218
+#: ../widgets/misc/e-filter-bar.c:233
msgid "Save Search"
msgstr "保存搜索"
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:270
msgid "_Searches"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-filter-bar.c:253
+#: ../widgets/misc/e-filter-bar.c:272
msgid "Searches"
msgstr "搜索"
@@ -20846,11 +20981,11 @@ msgstr "当前信件"
msgid "Choose Image"
msgstr "选择图像"
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:627
msgid "World Map"
msgstr "世界地图"
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:629
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should select the timezone from the below combo box instead."
@@ -20882,43 +21017,43 @@ msgstr "回流模型"
msgid "Column width"
msgstr "列宽"
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:596
msgid "_Search"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:602
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:603
msgid "_Clear"
msgstr "清除(_C)"
-#: ../widgets/misc/e-search-bar.c:855
+#: ../widgets/misc/e-search-bar.c:858
msgid "Item ID"
msgstr "项目 ID"
-#: ../widgets/misc/e-search-bar.c:862 ../widgets/text/e-entry.c:1223
-#: ../widgets/text/e-entry.c:1224 ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1221
+#: ../widgets/text/e-entry.c:1222 ../widgets/text/e-text.c:3487
+#: ../widgets/text/e-text.c:3488
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:996
+#: ../widgets/misc/e-search-bar.c:999
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:1013
+#: ../widgets/misc/e-search-bar.c:1016
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:1025
+#: ../widgets/misc/e-search-bar.c:1028
msgid " i_n "
msgstr " 于(_N) "
@@ -21077,14 +21212,14 @@ 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:209
+#: ../widgets/misc/e-task-widget.c:213
#, 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:215
+#: ../widgets/misc/e-task-widget.c:219
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
@@ -21117,35 +21252,35 @@ msgstr "弹出列表"
msgid "%l:%M %p"
msgstr "%p%l:%M"
-#: ../widgets/table/e-cell-pixbuf.c:389
+#: ../widgets/table/e-cell-pixbuf.c:387
msgid "Selected Column"
msgstr "选中列"
-#: ../widgets/table/e-cell-pixbuf.c:396
+#: ../widgets/table/e-cell-pixbuf.c:394
msgid "Focused Column"
msgstr "聚焦列"
-#: ../widgets/table/e-cell-pixbuf.c:403
+#: ../widgets/table/e-cell-pixbuf.c:401
msgid "Unselected Column"
msgstr "未选列"
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1802
msgid "Strikeout Column"
msgstr "给列加删除线"
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1809
msgid "Underline Column"
msgstr "给列加下划线"
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1816
msgid "Bold Column"
msgstr "给列加粗"
-#: ../widgets/table/e-cell-text.c:1816
+#: ../widgets/table/e-cell-text.c:1823
msgid "Color Column"
msgstr "给列着色"
-#: ../widgets/table/e-cell-text.c:1830
+#: ../widgets/table/e-cell-text.c:1837
msgid "BG Color Column"
msgstr "给列着背景色"
@@ -21160,7 +21295,7 @@ msgstr "可用域(_V):"
#: ../widgets/table/e-table-config-no-group.glade.h:3
#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1575
+#: ../widgets/table/e-table-header-item.c:1580
msgid "Ascending"
msgstr "升序"
@@ -21171,7 +21306,7 @@ msgstr "全部清除"
#: ../widgets/table/e-table-config-no-group.glade.h:5
#: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1575
+#: ../widgets/table/e-table-header-item.c:1580
msgid "Descending"
msgstr "降序"
@@ -21195,7 +21330,7 @@ msgid "Sh_ow these fields in order:"
msgstr "按顺序显示这些域(_O):"
#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
+#: ../widgets/table/e-table-config.c:643
#: ../widgets/table/e-table-config.glade.h:10
msgid "Show Fields"
msgstr "显示域"
@@ -21234,27 +21369,27 @@ msgstr "显示的域(_F)..."
msgid "_Sort..."
msgstr "排序(_S)..."
-#: ../widgets/table/e-table-config.c:150
+#: ../widgets/table/e-table-config.c:154
msgid "State"
msgstr "状态"
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
msgid "(Ascending)"
msgstr "(升序)"
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
msgid "(Descending)"
msgstr "(降序)"
-#: ../widgets/table/e-table-config.c:314
+#: ../widgets/table/e-table-config.c:394
msgid "Not sorted"
msgstr "未排序"
-#: ../widgets/table/e-table-config.c:355
+#: ../widgets/table/e-table-config.c:435
msgid "No grouping"
msgstr "未分组"
-#: ../widgets/table/e-table-config.c:584
+#: ../widgets/table/e-table-config.c:664
msgid "Available Fields"
msgstr "可用域"
@@ -21269,14 +21404,14 @@ msgstr "按顺序显示这些域(_S):"
#: ../widgets/table/e-table-field-chooser-dialog.c:77
#: ../widgets/table/e-table-field-chooser-item.c:637
#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1874
+#: ../widgets/table/e-table-header-item.c:1877
msgid "DnD code"
msgstr "拖放代码"
#: ../widgets/table/e-table-field-chooser-dialog.c:84
#: ../widgets/table/e-table-field-chooser-item.c:644
#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1888
+#: ../widgets/table/e-table-header-item.c:1891
msgid "Full Header"
msgstr "完整标题"
@@ -21319,7 +21454,7 @@ msgstr "交替行色"
#: ../widgets/table/e-table-group-leaf.c:580
#: ../widgets/table/e-table-group-leaf.c:581
#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
msgid "Horizontal Draw Grid"
msgstr "水平绘制网格"
@@ -21328,7 +21463,7 @@ msgstr "水平绘制网格"
#: ../widgets/table/e-table-group-leaf.c:587
#: ../widgets/table/e-table-group-leaf.c:588
#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-tree.c:3310 ../widgets/table/e-tree.c:3311
msgid "Vertical Draw Grid"
msgstr "垂直绘制网格"
@@ -21337,7 +21472,7 @@ msgstr "垂直绘制网格"
#: ../widgets/table/e-table-group-leaf.c:594
#: ../widgets/table/e-table-group-leaf.c:595
#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-tree.c:3316 ../widgets/table/e-tree.c:3317
msgid "Draw focus"
msgstr "绘制焦点"
@@ -21362,8 +21497,8 @@ msgstr "选择模型"
#: ../widgets/table/e-table-group-leaf.c:608
#: ../widgets/table/e-table-group-leaf.c:609
#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3309 ../widgets/table/e-tree.c:3259
-#: ../widgets/table/e-tree.c:3260
+#: ../widgets/table/e-table.c:3312 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
msgid "Length Threshold"
msgstr "长度阀值"
@@ -21372,8 +21507,8 @@ msgstr "长度阀值"
#: ../widgets/table/e-table-group-leaf.c:650
#: ../widgets/table/e-table-group-leaf.c:651
#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3291
-#: ../widgets/table/e-tree.c:3292
+#: ../widgets/table/e-table.c:3319 ../widgets/table/e-tree.c:3330
+#: ../widgets/table/e-tree.c:3331
msgid "Uniform row height"
msgstr "统一行高"
@@ -21384,68 +21519,68 @@ msgstr "统一行高"
msgid "Frozen"
msgstr "冻结"
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1457
msgid "Customize Current View"
msgstr "自定义当前视图"
-#: ../widgets/table/e-table-header-item.c:1473
-msgid "Sort Ascending"
-msgstr "升序排序"
-
-#: ../widgets/table/e-table-header-item.c:1474
-msgid "Sort Descending"
-msgstr "降序排序"
-
-#: ../widgets/table/e-table-header-item.c:1475
-msgid "Unsort"
-msgstr "未排序"
-
#: ../widgets/table/e-table-header-item.c:1477
-msgid "Group By This Field"
-msgstr "按该域分组"
+msgid "Sort _Ascending"
+msgstr "升序排序(_A)"
#: ../widgets/table/e-table-header-item.c:1478
-msgid "Group By Box"
-msgstr "按方框分组"
+msgid "Sort _Descending"
+msgstr "降序排序(_D)"
-#: ../widgets/table/e-table-header-item.c:1480
-msgid "Remove This Column"
-msgstr "删除该列"
+#: ../widgets/table/e-table-header-item.c:1479
+msgid "_Unsort"
+msgstr "未排序(_U)"
#: ../widgets/table/e-table-header-item.c:1481
-msgid "Add a Column..."
-msgstr "添加一列..."
+msgid "Group By This _Field"
+msgstr "按该域分组(_F)"
-#: ../widgets/table/e-table-header-item.c:1483
-msgid "Alignment"
-msgstr "对齐"
+#: ../widgets/table/e-table-header-item.c:1482
+msgid "Group By _Box"
+msgstr "按方框分组(_B)"
#: ../widgets/table/e-table-header-item.c:1484
-msgid "Best Fit"
-msgstr "最佳匹配"
+msgid "Remove This _Column"
+msgstr "删除该列(_C)"
#: ../widgets/table/e-table-header-item.c:1485
-msgid "Format Columns..."
-msgstr "格式化列..."
+msgid "Add a C_olumn..."
+msgstr "添加一列(_O)..."
#: ../widgets/table/e-table-header-item.c:1487
-msgid "Customize Current View..."
-msgstr "自定义当前视图..."
+msgid "A_lignment"
+msgstr "对齐(_L)"
+
+#: ../widgets/table/e-table-header-item.c:1488
+msgid "B_est Fit"
+msgstr "最佳匹配(_E)"
+
+#: ../widgets/table/e-table-header-item.c:1489
+msgid "Format Column_s..."
+msgstr "格式化列(_S)..."
-#: ../widgets/table/e-table-header-item.c:1536
+#: ../widgets/table/e-table-header-item.c:1491
+msgid "Custo_mize Current View..."
+msgstr "自定义当前视图(_M)..."
+
+#: ../widgets/table/e-table-header-item.c:1541
msgid "Sort By"
msgstr "排序方式"
-#: ../widgets/table/e-table-header-item.c:1881
+#: ../widgets/table/e-table-header-item.c:1884
msgid "Font Description"
msgstr "字体描述"
-#: ../widgets/table/e-table-header-item.c:1902
+#: ../widgets/table/e-table-header-item.c:1905
#: ../widgets/table/e-table-sorter.c:175
msgid "Sort Info"
msgstr "排序信息"
-#: ../widgets/table/e-table-header-item.c:1916
+#: ../widgets/table/e-table-header-item.c:1919
#: ../widgets/table/e-tree-scrolled.c:221
#: ../widgets/table/e-tree-scrolled.c:222
msgid "Tree"
@@ -21463,155 +21598,144 @@ msgstr "表格模型"
msgid "Cursor row"
msgstr "光标行"
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
msgid "Always search"
msgstr "总是搜索"
-#: ../widgets/table/e-table.c:3330
+#: ../widgets/table/e-table.c:3333
msgid "Use click to add"
msgstr "单击可添加"
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3323 ../widgets/table/e-tree.c:3324
msgid "ETree table adapter"
msgstr "ETree 表格适配器"
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3344
msgid "Retro Look"
msgstr "火箭外观"
-#: ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3345
msgid "Draw lines and +/- expanders."
msgstr "绘制行和 +/- 扩展柄。"
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "迷你卡测试"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "版权 (C) 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "这应该测试迷你卡画布项"
-
-#: ../widgets/text/e-entry.c:1216 ../widgets/text/e-entry.c:1217
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-entry.c:1214 ../widgets/text/e-entry.c:1215
+#: ../widgets/text/e-text.c:3480 ../widgets/text/e-text.c:3481
msgid "Event Processor"
msgstr "事件处理器"
-#: ../widgets/text/e-entry.c:1230 ../widgets/text/e-entry.c:1231
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-entry.c:1228 ../widgets/text/e-entry.c:1229
+#: ../widgets/text/e-text.c:3516 ../widgets/text/e-text.c:3517
msgid "Justification"
msgstr "两端对齐"
-#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
msgid "Use ellipsis"
msgstr "使用椭圆"
-#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
msgid "Ellipsis"
msgstr "椭圆"
-#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-entry.c:1284 ../widgets/text/e-entry.c:1285
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
msgid "Line wrap"
msgstr "换行"
-#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-entry.c:1291 ../widgets/text/e-entry.c:1292
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
msgid "Break characters"
msgstr "换行字符"
-#: ../widgets/text/e-entry.c:1300 ../widgets/text/e-entry.c:1301
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-entry.c:1298 ../widgets/text/e-entry.c:1299
+#: ../widgets/text/e-text.c:3644 ../widgets/text/e-text.c:3645
msgid "Max lines"
msgstr "最多行数"
-#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
+#: ../widgets/text/e-entry.c:1305 ../widgets/text/e-entry.c:1306
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
msgid "Allow newlines"
msgstr "允许新行"
-#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-entry.c:1312 ../widgets/text/e-entry.c:1313
+#: ../widgets/text/e-text.c:3666 ../widgets/text/e-text.c:3667
msgid "Draw borders"
msgstr "绘制边框"
-#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
msgid "Draw background"
msgstr "绘制背景"
-#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3687 ../widgets/text/e-text.c:3688
msgid "Draw button"
msgstr "绘制按钮"
-#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
msgid "Cursor position"
msgstr "光标位置"
-#: ../widgets/text/e-entry.c:1342 ../widgets/text/e-entry.c:1343
+#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
msgid "Emulate label resize"
msgstr "模拟标签缩放"
-#: ../widgets/text/e-text.c:2739
+#: ../widgets/text/e-text.c:2727
msgid "Input Methods"
msgstr "输入法"
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
+#: ../widgets/text/e-text.c:3494 ../widgets/text/e-text.c:3495
msgid "Bold"
msgstr "粗体"
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
+#: ../widgets/text/e-text.c:3501 ../widgets/text/e-text.c:3502
msgid "Strikeout"
msgstr "删除线"
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
+#: ../widgets/text/e-text.c:3508 ../widgets/text/e-text.c:3509
msgid "Anchor"
msgstr "锚点"
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
+#: ../widgets/text/e-text.c:3523 ../widgets/text/e-text.c:3524
msgid "Clip Width"
msgstr "裁剪宽度"
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3530 ../widgets/text/e-text.c:3531
msgid "Clip Height"
msgstr "裁剪高度"
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
+#: ../widgets/text/e-text.c:3537 ../widgets/text/e-text.c:3538
msgid "Clip"
msgstr "裁剪"
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3544 ../widgets/text/e-text.c:3545
msgid "Fill clip rectangle"
msgstr "填充裁剪矩形"
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
+#: ../widgets/text/e-text.c:3551 ../widgets/text/e-text.c:3552
msgid "X Offset"
msgstr "水平偏移"
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
msgid "Y Offset"
msgstr "垂直偏移"
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
msgid "Text width"
msgstr "文字宽度"
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
msgid "Text height"
msgstr "文字高度"
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
msgid "IM Context"
msgstr "输入法环境"
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
msgid "Handle Popup"
msgstr "处理弹出"
+