[evolution] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 6428b4cce0b28fa4de51133aca2ca4f86880ff8e
Author: Yinghua Wang <wantinghard gmail com>
Date:   Sat Jan 1 15:58:36 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 8165 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 4106 insertions(+), 4059 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cf599e6..c6b96b1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,15 +13,15 @@
 # du baodao <centerpoint 139 com>, 2010.
 # Tao Wang <dancefire gmail com>, 2010.
 #
-#: ../shell/main.c:571
+#: ../shell/main.c:615
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2010-10-15 07:40+0000\n"
-"PO-Revision-Date: 2010-10-18 21:05+0800\n"
-"Last-Translator: �� <bill_zt sina com>\n"
+"POT-Creation-Date: 2011-01-01 12:06+0000\n"
+"PO-Revision-Date: 2011-01-01 20:04+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,7 +89,7 @@ msgid "Delete address book '{0}'?"
 msgstr "å? é?¤å?°å??ç°¿â??{0}â??å??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
 msgid "Do _Not Delete"
 msgstr "ä¸?å? é?¤(_N)"
 
@@ -103,7 +103,7 @@ msgstr "认è¯?å?° IMAP æ??å?¡å?¨å¤±è´¥ã??"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "å? é?¤è??系人失败"
 
@@ -202,37 +202,38 @@ msgid ""
 "changes?"
 msgstr "æ?¨å·²å¯¹æ­¤è??系人ä½?å?ºäº?ä¿®æ?¹ã??æ?¨æ?³è¦?ä¿?å­?è¿?äº?æ?´æ?¹å??ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#. Translators: {0} is replaced with an address book name which will not be available
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å?? {0} ç??è??系人æ? æ³?使ç?¨ã??"
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:599
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "æ·»å? (_A)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "丢�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "���(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "缩�(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr "å??æ ·ä½¿ç?¨(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2027
+#: ../calendar/gui/e-calendar-view.c:2084
 msgid "Anniversary"
 msgstr "纪念�"
 
@@ -243,8 +244,8 @@ msgstr "纪念�"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2026 ../capplet/anjal-settings-main.c:123
-#: ../shell/main.c:129
+#: ../calendar/gui/e-calendar-view.c:2083 ../capplet/anjal-settings-main.c:124
+#: ../shell/main.c:133
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -264,19 +265,19 @@ msgid "Calendar:"
 msgstr "æ?¥å??ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:934
+#: ../addressbook/importers/evolution-vcard-importer.c:957
 msgid "Contact"
 msgstr "è??系人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2607
 msgid "Contact Editor"
 msgstr "è??系人ç¼?è¾?å?¨"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:298
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
@@ -294,7 +295,7 @@ msgid "Full _Name..."
 msgstr "å?¨å??(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "家庭"
@@ -329,7 +330,7 @@ msgid "Nic_kname:"
 msgstr "�称(_K)�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../modules/calendar/e-memo-shell-migrate.c:260
 #: ../plugins/groupwise-features/camel-gw-listener.c:423
 #: ../plugins/groupwise-features/camel-gw-listener.c:448
 #: ../plugins/groupwise-features/camel-gw-listener.c:563
@@ -337,10 +338,10 @@ msgid "Notes"
 msgstr "�记"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1732
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "Other"
 msgstr "��"
 
@@ -365,7 +366,7 @@ msgid "Web addresses"
 msgstr "ç½?ç»?å?°å??"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
@@ -392,7 +393,7 @@ msgid "_Blog:"
 msgstr "å??客(_N)ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:885
+#: ../calendar/gui/dialogs/event-page.c:887
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
@@ -472,74 +473,74 @@ msgstr "��(_W)�"
 msgid "_Zip/Postal Code:"
 msgstr "é?®æ?¿ç¼?ç ?(_Z)ï¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "é??è??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:381
 msgid "Error adding contact"
 msgstr "æ·»å? è??系人å?ºé??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
 msgid "Error modifying contact"
 msgstr "ä¿®æ?¹è??系人å?ºé??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
 msgid "Error removing contact"
 msgstr "å? é?¤è??系人å?ºé??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2602
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "è??系人ç¼?è¾?å?¨ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3025
 msgid "Please select an image for this contact"
 msgstr "请é??æ?©æ­¤è??系人ç??å?¾å??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3026
 msgid "_No image"
 msgstr "æ? å?¾å??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -547,23 +548,23 @@ msgstr ""
 "è??系人æ?°æ?®æ? æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "â??%sâ??ç??æ ¼å¼?æ? æ??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3310
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sâ??%sâ??ç??æ ¼å¼?æ? æ??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3325
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3336
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ??%sâ??为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3350
 msgid "Invalid contact."
 msgstr "æ? æ??ç??è??系人ã??"
 
@@ -670,7 +671,7 @@ msgid "_List name:"
 msgstr "å??表å??称(_L)ï¼?"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:157
 msgid "_Select..."
 msgstr "é??æ?©(_S)..."
 
@@ -735,17 +736,17 @@ msgstr ""
 "æ?¨ä¸?å®?è¦?æ·»å? å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:244
 msgid "_Merge"
 msgstr "å??并(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/gui/merging/eab-contact-merging.c:169
 #: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
 #, c-format
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:227
 msgid "Merge Contact"
 msgstr "å??并è??系人"
 
@@ -753,9 +754,9 @@ msgstr "å??并è??系人"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
 msgstr "ä»»ä½?å??å?«æ??"
 
@@ -769,21 +770,21 @@ msgstr "�件以此�头"
 msgid "Name contains"
 msgstr "å§?å??å?«æ??"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "No contacts"
 msgstr "æ? è??系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../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:317
+#: ../addressbook/gui/widgets/e-addressbook-model.c:327
 msgid "Error getting book view"
 msgstr "è?·å??å??ç°¿è§?å?¾å?ºé??"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:716
+#: ../addressbook/gui/widgets/e-addressbook-model.c:740
 msgid "Search Interrupted"
 msgstr "æ??索中æ?­äº?"
 
@@ -791,67 +792,71 @@ msgstr "æ??索中æ?­äº?"
 msgid "Error modifying card"
 msgstr "ä¿®æ?¹å??ç??é??误"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:625
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
 msgid "Cut selected contacts to the clipboard"
 msgstr "å°?é??è??系人å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:631
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
 msgid "Copy selected contacts to the clipboard"
 msgstr "å°?é??中è??系人å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:637
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
 msgid "Paste contacts from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸­ç²?è´´è??系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:643
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "å? é?¤é??中ç??è??系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:652
 msgid "Select all visible contacts"
 msgstr "é??中å?¨é?¨å?¯è§?è??系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??表å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact list?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??表å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??系人å??表(%s)å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contacts?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??系人(%s)å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#. Translators: This is shown for more than 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
-msgstr ""
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
 "æ??å¼? %d 个è??系人å°?å??æ?¶æ??å¼? %d 个æ?°çª?å?£ã??\n"
 "æ?¨ç??ç??æ?³è¦?æ?¾ç¤ºæ??æ??è??系人å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "��示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "æ?¾ç¤ºå?¨é?¨è??系人(_A)"
 
@@ -986,7 +991,7 @@ msgid "Radio"
 msgstr "���"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:569
+#: ../calendar/gui/e-meeting-list-view.c:571
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "��"
@@ -1080,16 +1085,16 @@ msgstr ""
 "\n"
 "æ?¬è§?å?¾ä¸­æ²¡æ??å?¯æ?¾ç¤ºç??项ã??"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
 msgstr "工����件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Home Email"
 msgstr "家庭���件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:810
+#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:808
 msgid "Other Email"
 msgstr "�����件"
 
@@ -1141,7 +1146,7 @@ msgstr "å¤?å?¶ç?µå­?é?®ä»¶å?°å??å?°å?ªè´´æ?¿"
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
 #: ../widgets/misc/e-web-view.c:400
 msgid "_Send New Message To..."
-msgstr "æ??æ?°ä¿¡å??é??å?°(_S)..."
+msgstr "æ??æ?°ä¿¡æ?¯å??é??å?°(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
 #: ../widgets/misc/e-web-view.c:402
@@ -1193,9 +1198,9 @@ msgid "Calendar"
 msgstr "æ?¥å??"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
 #: ../calendar/gui/dialogs/event-editor.c:127
 #: ../calendar/gui/dialogs/event-editor.c:354
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "å¿?/é?²"
@@ -1227,16 +1232,15 @@ msgstr "Web ��"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:359
+#: ../capplet/settings/mail-capplet-shell.c:366
 #: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:138
-#: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:156
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:121
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../modules/addressbook/e-book-shell-migrate.c:143
+#: ../modules/calendar/e-cal-shell-backend.c:132
+#: ../modules/calendar/e-cal-shell-migrate.c:159
+#: ../modules/calendar/e-memo-shell-backend.c:116
+#: ../modules/calendar/e-memo-shell-migrate.c:117
+#: ../modules/calendar/e-task-shell-backend.c:116
+#: ../modules/calendar/e-task-shell-migrate.c:126
 msgid "Personal"
 msgstr "个人"
 
@@ -1258,23 +1262,23 @@ msgstr "Blog"
 msgid "Click to mail %s"
 msgstr "å??å?»ä»¥ç»? %s å??é??é?®ä»¶"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the address book once in online mode to download its contents."
 msgstr ""
-"æ? æ³?æ??å¼?æ­¤å?°å??ç°¿ã??è¿?å?¯è?½æ??å?³ç??æ­¤å?°å??簿没æ??æ ?为å?¯è?±æ?ºä½¿ç?¨ï¼?æ??è??å°?æ?ªä¸?è½½å®?æ??以"
-"ä¾?è?±æ?ºä½¿ç?¨ã??请å?¨è??æ?ºæ¨¡å¼?中载å?¥æ­¤å?°å??簿以便ä¸?è½½å?¶å??容ã??"
+"æ? æ³?æ??å¼?æ­¤å?°å??ç°¿ã??è¿?å?¯è?½æ??å?³ç??æ­¤å?°å??簿没æ??æ ?为å?¯ç¦»çº¿ä½¿ç?¨ï¼?æ??è??å°?æ?ªä¸?è½½å®?æ??以"
+"ä¾?离线使ç?¨ã??请å?¨å?¨çº¿æ¨¡å¼?中载å?¥æ­¤å?°å??簿以便ä¸?è½½å?¶å??容ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr "æ? æ³?æ??å¼?æ­¤å?°å??ç°¿ã??请æ£?æ?¥è·¯å¾? %s æ?¯å?¦å­?å?¨ä»¥å??æ?¨æ?¯å?¦æ??足å¤?ç??æ??é??访é?®å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1282,7 +1286,7 @@ msgstr ""
 "æ?¬ç??æ?¬ç?? Evolution 并没æ??æ?? LDAP æ?¯æ??ç¼?è¯?è¿?å?»ã??å¦?æ??æ?¨å¸?æ??å?¨ Evolution 中使ç?¨ "
 "LDAPï¼?å°±å¿?é¡»å®?è£?å?¯ç?¨äº? LDAP ç?? Evolution å??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:126
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1290,11 +1294,11 @@ msgstr ""
 "æ? æ³?æ??å¼?æ­¤å?°å??ç°¿ã??è¿?å?¯è?½æ?¯ç?±äº?æ?¨è¾?å?¥äº?é??误ç?? URIï¼?ä¹?å?¯è?½æ?¯å? 为æ??å?¡å?¨å·²ç»?å?³"
 "é?­ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid "Detailed error message:"
 msgstr "详ç»?é??误信æ?¯ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1305,7 +1309,7 @@ msgstr ""
 "Evolution é??ç½®è¦?æ?¾ç¤ºç??æ?°ç?®ã??请å?¨æ??ç´¢ç??æ?¶å??æ??å®?æ?´å? ä¸¥æ ¼ç??\n"
 "æ??ç´¢æ?¡ä»¶ï¼?æ??è??å?¨æ­¤å?°å??ç°¿ç??ç?®å½?æ??å?¡å?¨å??æ?°ä¸­å°?ç»?æ??é??å?¶è°?é«?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1317,49 +1321,49 @@ msgstr ""
 "中å°?æ?¶é?´é??å?¶è°?é«?ã??"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "æ­¤å?°å??ç°¿ç??å??端æ? æ³?解æ??æ­¤æ?¥è¯¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "æ­¤å?°å??ç°¿ç??å??端æ??ç»?æ?§è¡?æ­¤æ?¥è¯¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "æ­¤æ?¥è¯¢æ?ªæ??å??å®?æ??ã??%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:202
+#: ../addressbook/gui/widgets/eab-gui-util.c:214
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "Select Address Book"
 msgstr "é??æ?©å?°å??ç°¿"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 msgid "list"
 msgstr "å??表"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:455
 msgid "Move contact to"
 msgstr "å°?è??系人移è?³"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Copy contact to"
 msgstr "å°?è??系人å¤?å?¶å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:449
+#: ../addressbook/gui/widgets/eab-gui-util.c:460
 msgid "Move contacts to"
 msgstr "å°?è??系人移è?³"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:451
+#: ../addressbook/gui/widgets/eab-gui-util.c:462
 msgid "Copy contacts to"
 msgstr "å°?è??系人å¤?å?¶å?°"
 
@@ -1367,51 +1371,51 @@ msgstr "å°?è??系人å¤?å?¶å?°"
 msgid "Card View"
 msgstr "å??ç??è§?å?¾"
 
-#: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:518
-#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../addressbook/importers/evolution-csv-importer.c:721
+#: ../addressbook/importers/evolution-ldif-importer.c:519
+#: ../addressbook/importers/evolution-vcard-importer.c:278
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "正�导�..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1008
+#: ../addressbook/importers/evolution-csv-importer.c:1021
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1009
+#: ../addressbook/importers/evolution-csv-importer.c:1022
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV å?? Tab 导å?¥å?¨"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1030
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1018
+#: ../addressbook/importers/evolution-csv-importer.c:1031
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV å?? Tab 导å?¥å?¨"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1039
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1027
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV å?? Tab 导å?¥å?¨"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:744
+#: ../addressbook/importers/evolution-ldif-importer.c:757
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP æ?°æ?®äº¤æ?¢æ ¼å¼?(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:745
+#: ../addressbook/importers/evolution-ldif-importer.c:758
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 导��"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:623
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vfg, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:624
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard 导��"
 
@@ -1508,9 +1512,10 @@ msgstr "è¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
 
 #: ../addressbook/util/addressbook.c:230
 #: ../calendar/common/authentication.c:53
-#: ../plugins/caldav/caldav-browse-server.c:813
-#: ../plugins/google-account-setup/google-source.c:438
-#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../calendar/gui/e-meeting-store.c:1770
+#: ../plugins/caldav/caldav-browse-server.c:922
+#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/publish-calendar/publish-calendar.c:332
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "è¾?å?¥å¯?ç ?"
@@ -1611,19 +1616,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤è¯¥çº¦ä¼?å??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/gui/dialogs/delete-comp.c:187
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤è¯¥ä¼?è®®å??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤è¯¥å¤?å¿?å??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤æ­¤ä»»å?¡å??ï¼?"
@@ -1699,133 +1704,139 @@ msgstr "è½½å?¥å¤?å¿?å??表å?ºé??"
 msgid "Error loading task list"
 msgstr "è½½å?¥ä»»å?¡å??表å?ºé??"
 
-#: ../calendar/calendar.error.xml.h:44
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:46
+msgid "Error on {0}: {1}"
+msgstr "{0} å?ºé??ï¼?{1}"
+
+#: ../calendar/calendar.error.xml.h:47
 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:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr "å¦?æ??æ?¨ä¸?å??é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å?ºå¸­è??å?¯è?½ä¸?ç?¥é??å¤?å¿?å·²ç»?å? é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 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:47
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "å??é??æ?´æ?°ç??ä¿¡æ?¯å°?å??许å?¶ä»?å?ºå¸­è??使ä»?们ç??æ?¥å??ä¿?æ??æ??æ?°ã??"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "å??é??æ?´æ?°ç??ä¿¡æ?¯å??许å?¶ä»?å?ºå¸­è??使ä»?们ç??ä»»å?¡å??表ä¿?æ??æ??æ?°ã??"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "é??件正å?¨ä¸?载中ã??ä¿?å­?约ä¼?å°?使å¾?约ä¼?ä¿?å­?æ?¶æ? æ³?å??å?«å??ç»­ç??é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "é??件正å?¨ä¸?载中ã??ä¿?å­?ä»»å?¡å°?使å¾?ä»»å?¡ä¿?å­?æ?¶æ? æ³?å??å?«å??ç»­ç??é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?å?¨æ?¨ç?®å??ç??æ??å?¡å?¨ä¸?å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution æ?¥å??å¼?常é??å?ºã??"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution æ?¥å??å¼?常é??å?ºã??"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution å¤?å¿?å¼?常é??å?ºã??"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution ä»»å?¡å¼?常é??å?ºã??"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
-msgstr "æ?¥å??æ?ªæ ?为è?±æ?ºä½¿ç?¨ã??"
+msgstr "æ?¥å??æ?ªæ ?为离线使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
-msgstr "å¤?å¿?å??表æ?ªæ ?为è?±æ?ºä½¿ç?¨ã??"
+msgstr "å¤?å¿?å??表æ?ªæ ?为离线使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
-msgstr "ä»»å?¡å??表æ?ªæ ?为è?±æ?ºä½¿ç?¨ã??"
+msgstr "ä»»å?¡å??表æ?ªæ ?为离线使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "æ­¤æ?¥å??å°?被永ä¹?å? é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "æ­¤å¤?å¿?å??表å°?被永ä¹?å? é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "此任å?¡å??表å°?被永ä¹?å? é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this appointment?"
 msgstr "æ?¨æ?³è¦?ä¿?å­?对约ä¼?ç??æ?´æ?¹å??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this meeting?"
 msgstr "æ?¨æ?³è¦?ä¿?å­?对此ä¼?è®®ç??æ?´æ?¹å??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to save your changes to this memo?"
 msgstr "æ?¨æ?³è¦?ä¿?å­?对此å¤?å¿?ç??æ?´æ?¹å??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this task?"
 msgstr "æ?¨æ?³è¦?ä¿?å­?对此任å?¡ç??æ?´æ?¹å??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?为此å¤?å¿?å??é??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?¨é?¨å?ºå¸­è??å??é??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸­è??å??é??ä¼?è®®é??请ï¼?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send this task to participants?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?å°?此任å?¡å??é??ç»?å?ºå¸­è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸­è??å??é??æ?´æ?°ç??ä¼?议信æ?¯ï¼?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated task information to participants?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸­è??å??é??æ?´æ?°ç??ä»»å?¡ä¿¡æ?¯ï¼?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -1834,54 +1845,54 @@ msgstr ""
 "æ?¨æ­£å?¨è¿?æ?¥å?°ä¸?æ?¯æ??ç?? GroupWise æ??å?¡å?¨ï¼?æ­¤æ?¶ä½¿ç?¨ Evolution å?¯è?½é??å?°é?®é¢?ã??为äº?"
 "å¾?å?°æ??ä½³æ??æ??ï¼?æ??å?¡å?¨åº?该å??级å?°æ?¯æ??ç??ç??æ?¬ã??"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "æ?¨å·²ç»?æ?´æ?¹äº?此约ä¼?ï¼?ä½?å°?æ?ªä¿?å­?ã??"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "æ?¨å·²ç»?对此ä¼?è®®å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å­?ã??"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this task, but not yet saved it."
 msgstr "æ?¨å·²ç»?对此任å?¡å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å­?ã??"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "æ?¨å·²ç»?对此å¤?å¿?å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å­?ã??"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??æ?¥å??æ? æ³?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??å¤?å¿?å°?æ? æ³?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??ä»»å?¡å°?æ? æ³?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:80
-#: ../composer/mail-composer.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "丢���(_D)"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:257
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "ä¿?å­?(_S)"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:85
 msgid "_Save Changes"
 msgstr "ä¿?å­?æ?´æ?¹(_S)"
 
-#: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:150
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å??é??(_S)"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Send Notice"
 msgstr "å??é??é??ç?¥(_S)"
 
@@ -1910,9 +1921,8 @@ msgstr "å?¨é?¨é??è¿?(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
-#: ../calendar/gui/e-itip-control.c:1176
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
 #: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "�置�"
@@ -1921,8 +1931,8 @@ msgstr "�置�"
 msgid "Snooze _time:"
 msgstr "å??ç?¡æ?¶é?´(_T)ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
-#: ../widgets/misc/e-alert-bar.c:75
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:887
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "é??è¿?(_D)"
 
@@ -1932,9 +1942,9 @@ msgstr "å??ç?¡(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:335
+#: ../plugins/google-account-setup/google-contacts-source.c:375
 msgid "hours"
 msgstr "å°?æ?¶"
 
@@ -1945,50 +1955,50 @@ msgstr "约��置"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/google-account-setup/google-contacts-source.c:374
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1585
 msgid "No summary available."
 msgstr "没æ??å?¯ç?¨ç??æ??è¦?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "没æ??æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "没æ??å?¯ç?¨ç??ä½?置信æ?¯ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
 #, c-format
-msgid "You have %d alarms"
-msgstr "æ?¨æ?? %d 个æ??é??"
+msgid "You have %d alarm"
+msgid_plural "You have %d alarms"
+msgstr[0] "æ?¨æ?? %d 个æ??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1706
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 msgstr ""
-"Evolution å°?ä¸?æ?¯æ??å??é??æ??示ç?µå­?é?®ä»¶\n"
-"ç??æ?¥å??æ??示å?¨ï¼?ä½?æ­¤æ??示å?¨è¢«é??置为\n"
+"Evolution å°?ä¸?æ?¯æ??带ç?µå­?é?®ä»¶é??ç?¥\n"
+"ç??æ?¥å??æ??é??ï¼?ä½?æ­¤æ??é??被é??置为\n"
 "å??é??ç?µå­?é?®ä»¶ã??Evolution å°?以\n"
-"æ?¾ç¤ºæ?®é??æ??示ä¼?è¯?æ¡?代æ?¿ã??"
+"æ?¾ç¤ºæ?®é??æ??é??对è¯?æ¡?代æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1998,13 +2008,13 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Evolution æ?¥å??æ??示å?¨å°?è¦?触å??ã??该æ??示å?¨è¢«é??置为è¿?è¡?以ä¸?ç¨?åº?ï¼?\n"
+"Evolution æ?¥å??æ??é??å°?è¦?触å??ã??该æ??é??被é??置为è¿?è¡?以ä¸?ç¨?åº?ï¼?\n"
 "\n"
 "        %s\n"
 "\n"
 "æ?¨ç¡®ä¿¡æ?¨è¦?è¿?è¡?该ç¨?åº?å??ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1756
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??次询é?®æ­¤é?®é¢?ã??"
 
@@ -2038,547 +2048,6 @@ msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d �"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "æ??é??ç¨?åº?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:14
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "å?¨ç?¶æ??æ ?中æ?¾ç¤ºé??误ç??æ?¶é?´ç§?æ?°ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
-msgid "Ask for confirmation when deleting items"
-msgstr "å? é?¤é¡¹æ?¶è¦?æ±?确认"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "ä»?天å?°æ??ä»»å?¡ç??è??æ?¯é¢?è?²ï¼?以â??#rrggbbâ??æ ¼å¼?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "延æ??ä»»å?¡ç??è??æ?¯é¢?è?²ï¼?以â??#rrggbbâ??æ ¼å¼?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Calendars to run alarms for"
-msgstr "è¿?è¡?æ??é??ç??æ?¥å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "å?¨æ?¶é?´æ ?中ç»?å?¶ Marcus Bains 线ç??é¢?è?²(é»?认为空)ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "å?¨æ?¥è§?å?¾ä¸­ç»?å?¶ Marcus Bains 线ç??é¢?è?²ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
-msgid "Compress weekends in month view"
-msgstr "å?¨æ??è§?å?¾ä¸­å??缩å?¨æ?«"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
-msgid "Confirm expunge"
-msgstr "确认é??æ¯?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
-msgid "Count of default recurrence for a new event. -1 means forever."
-msgstr "ä¸?个æ?°äº?件ç??é»?认é??ç?°æ¬¡æ?°ã??-1 代表永è¿?é??ç?°ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "æ ?为工ä½?æ?¥ç??æ?¥å­?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
-msgid "Default appointment reminder"
-msgstr "é»?认约ä¼?æ??é??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
-msgid "Default recurrence count"
-msgstr "é»?认å??å¤?计æ?°"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "é»?认æ??é??å??ä½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "é»?认æ??é??å?¼"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving alarm audio files"
-msgstr "ä¿?å­?æ??é??é?³é¢?æ??件ç??ç?®å½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
-msgid "Event Gradient"
-msgstr "äº?件æ¸?å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
-msgid "Event Transparency"
-msgstr "äº?件é??æ??度"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
-msgid "Free/busy server URLs"
-msgstr "å¿?/é?²æ??å?¡å?¨ URL"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
-msgid "Free/busy template URL"
-msgstr "�/�模� URL"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
-msgid "Gradient of the events in calendar views."
-msgstr "æ?¥å??è§?å?¾ä¸­äº?件ç??æ¸?å??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
-msgid "Hide completed tasks"
-msgstr "é??è??å·²å®?æ??ç??ä»»å?¡"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
-msgid "Hide task units"
-msgstr "é??è??ä»»å?¡å??ä½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
-msgid "Hide task value"
-msgstr "é??è??ä»»å?¡å?¼"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
-msgid "Horizontal pane position"
-msgstr "水平���置"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "å·¥ä½?æ?¥ç»?æ??ç??å°?æ?¶ï¼?以 24 å°?æ?¶æ ¼å¼?表示ï¼?0 å?° 23ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "å·¥ä½?æ?¥å¼?å§?ç??å°?æ?¶ï¼?以 24 å°?æ?¶æ ¼å¼?表示ï¼?0 å?° 23ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "å¦?æ?? â??trueâ??ï¼?å?¨ä¸»çª?å?£ä¸­æ?¾ç¤ºå¤?å¿?é¢?è§?é?¢æ?¿ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "å¦?æ?? â??trueâ??ï¼?å?¨ä¸»çª?å?£ä¸­æ?¾ç¤ºä»»å?¡é¢?è§?é?¢æ?¿ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "æ?¥è§?å?¾å??å·¥ä½?æ?¥è§?å?¾ä¸­æ?¾ç¤ºç??é?´é??ï¼?以å??é??计ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-msgid "Last alarm time"
-msgstr "ä¸?次æ??é??æ?¶é?´"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:99
-msgid "Level beyond which the message should be logged."
-msgstr "大äº?此级å?«ç??ä¿¡æ?¯ä¼?被记å½?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-msgid "List of recently used second time zones in a Day View."
-msgstr "å??å?ºå?¨æ?¥è§?å?¾ä¸­æ??è¿?使ç?¨è¿?ç??第äº?æ?¶å?ºã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-msgid "List of server URLs for free/busy publishing."
-msgstr "å??å?ºå??表å¿?/é?²ç??æ??å?¡å?¨ URLã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains 线"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains 线�� - ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains 线é¢?è?² - æ?¥æ??æ ?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr "å?¨ 'day_second_zones' å??表中ï¼?æ??è¿?使ç?¨è¿?ç??æ?¶å?ºæ??大记å¿?æ?°ç?®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid "Maximum number of recently used timezones to remember."
-msgstr "æ??è¿?使ç?¨è¿?ç??æ?¶å?ºæ??大记å¿?æ?°ç?®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid "Memo layout style"
-msgstr "å¤?å¿?å¤?è§?é£?æ ¼"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Memo preview pane position (horizontal)"
-msgstr "å¤?å¿?é¢?è§?é?¢æ?¿ç??æ°´å¹³ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-msgid "Memo preview pane position (vertical)"
-msgstr "å¤?å¿?é¢?è§?é?¢æ?¿ç??ç«?ç?´ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "å·¥ä½?æ?¥ç»?æ??ç??å??é??ï¼?0 å?° 59ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "å·¥ä½?æ?¥å¼?å§?ç??å??é??ï¼?0 å?° 59ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
-msgid "Month view horizontal pane position"
-msgstr "æ??è§?å?¾æ°´å¹³é?¢æ?¿ç??ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Month view vertical pane position"
-msgstr "æ??è§?å?¾ä¸­ç«?ç?´é?¢æ?¿ç??ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
-msgid "Number of units for determining a default reminder."
-msgstr "ç¡®å®?é»?认æ??é??ç??å??ä½?æ?°é??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
-msgid "Number of units for determining when to hide tasks."
-msgstr "å?³å®?ä½?æ?¶é??è??ä»»å?¡ç??æ?°å­?å??ä½?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Overdue tasks color"
-msgstr "延æ??ä»»å?¡ç??é¢?è?²"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr "é??æ??è§?å?¾ä¸­æ?¥æ??导è?ªå?¨æ?¥å??å??ä»»å?¡å??表ä¹?é?´æ°´å¹³é?¢æ?¿ç??ä½?ç½®ï¼?以å??ç´ è®¡ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr "æ??è§?å?¾ä¸­è§?å?¾å??æ?¥æ??导è?ªå?¨æ?¥å??ä¹?é?´æ°´å¹³é?¢æ?¿ç??ä½?ç½®ï¼?以å??ç´ è®¡ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "å½?ç«?ç?´å®?å??æ?¶ï¼?å¤?å¿?é¢?è§?é?¢æ?¿ç??ä½?ç½®ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr "å½?æ°´å¹³å®?å??æ?¶ï¼?ä»»å?¡é¢?è§?é?¢æ?¿ç??ä½?ç½®ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "å½?ç«?ç?´å®?å??æ?¶ï¼?ä»»å?¡é¢?è§?é?¢æ?¿ç??ä½?ç½®ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr "æ?¥å??å??表å??æ?¥æ??导è?ªå?¨æ?¥å??ä¹?é?´ç«?ç?´é?¢æ?¿ç??ä½?ç½®ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr "æ??è§?å?¾ä¸­è§?å?¾å??æ?¥æ??导è?ªå?¨æ?¥å??å??ä»»å?¡å??表ä¹?é?´ç«?ç?´é?¢æ?¿ç??ä½?ç½®ï¼?以å??ç´ è®¡ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr "é??æ??è§?å?¾ä¸­è§?å?¾å??æ?¥æ??导è?ªå?¨æ?¥å??å??ä»»å?¡å??表ä¹?é?´ç«?ç?´é?¢æ?¿ç??ä½?ç½®ï¼?以å??ç´ è®¡ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary calendar"
-msgstr "é¦?é??æ?¥å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-msgid "Primary memo list"
-msgstr "é¦?é??å¤?å¿?å??表"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
-msgid "Primary task list"
-msgstr "é¦?é??ä»»å?¡å??表"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
-msgid "Programs that are allowed to be run by alarms."
-msgstr "å??许æ??é??è¿?è¡?ç??ç¨?åº?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
-msgid "Recently used second time zones in a Day View"
-msgstr "æ?¥è§?å?¾ä¸­æ??è¿?æ?¯ç?¨è¿?ç??第äº?æ?¶å?º"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "ä¿?å­?æ??é??é?³é¢?ç??ç?®å½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "é??è¿?ä¸?个å?¨æ?¥æ»?å?¨æ??è§?å?¾"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºè¯·å??å¤?å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºè§?è?²å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr "å?¨å?¨è§?å?¾å??æ??è§?å?¾ä¸­æ?¾ç¤ºçº¦ä¼?ç»?æ??æ?¶é?´"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "å?¨äº?件/ä¼?è®®/ä»»å?¡ç¼?è¾?å?¨ä¸­æ?¾ç¤ºå??ç±»å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-msgid "Show display alarms in notification tray"
-msgstr "å?¨é??ç?¥æ??ç??中æ?¾ç¤ºæ??é??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
-msgid "Show status field in the event/task/meeting editor"
-msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºç?¶æ??å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-msgid "Show the memo preview pane"
-msgstr "æ?¾ç¤ºâ??å¤?å¿?é¢?è§?â??é?¢æ?¿"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the task preview pane"
-msgstr "æ?¾ç¤ºâ??ä»»å?¡é¢?è§?â??é?¢æ?¿"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Show timezone field in the event/meeting editor"
-msgstr "å?¨äº?件/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºæ?¶å?ºå??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-msgid "Show type field in the event/task/meeting editor"
-msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºç±»å??å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "å?¨æ?¥è§?å?¾ã??å·¥ä½?æ?¥è§?å?¾å??æ?¥æ??导è?ªä¸­æ?¾ç¤ºå?¨æ?°"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr "å¦?æ??被设å®?ï¼?å?¨æ?¥è§?å?¾ä¸­æ?¾ç¤ºç¬¬äº?æ?¶å?ºã??å?¼å??å?¨ 'timezone' 中使ç?¨è¿?ç??é?®ç?¸å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Task layout style"
-msgstr "ä»»å?¡å¤?è§?é£?æ ¼"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "Task preview pane position (horizontal)"
-msgstr "ä»»å?¡é¢?è§?é?¢æ?¿ç??æ°´å¹³ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (vertical)"
-msgstr "ä»»å?¡é¢?è§?é?¢æ?¿ç??ç«?ç?´ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-msgid "Tasks due today color"
-msgstr "ä»?天å?°æ??ç??ä»»å?¡é¢?è?²"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"ç?¨ä½?å¿?/é?²æ?°æ?®å??å¸?ç?? URL 模æ?¿ï¼?%u å°?æ?¿æ?¢ä¸ºç?µå­?é?®ä»¶ç??ç?¨æ?·é?¨å??ï¼?è?? %d å°?æ?¿æ?¢ä¸ºå??"
-"å??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"æ?¥å??中æ?¥æ??å??æ?¶é?´æ??使ç?¨ç??é»?认æ?¶å?ºï¼?以æ?ªç¿»è¯?ç??æ?¶å?ºæ?°æ?®åº?ä½?置表示ï¼?å¦?â??Asia/"
-"Shanghaiâ??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"å¸?å±?æ ·å¼?å?³å®?äº?å?¨å?ªé??æ?¾ç½®å¤?å¿?å??表ç??é¢?è§?é?¢æ?¿ã??â??0â??(ç»?å?¸è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨å¤?"
-"å¿?å??表ä¸?é?¢ã??â??1â??(ç«?ç?´è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨å¤?å¿?å??表æ??è¾¹ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"å¸?å±?æ ·å¼?å?³å®?äº?å?¨å?ªé??æ?¾ç½®ä»»å?¡å??表ç??é¢?è§?é?¢æ?¿ã??â??0â??(ç»?å?¸è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨ä»»"
-"å?¡å??表ä¸?é?¢ã??â??1â??(ç«?ç?´è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨ä»»å?¡å??表æ??è¾¹ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
-msgid "The second timezone for a Day View"
-msgstr "æ?¥è§?å?¾ç??第äº?æ?¶å?º"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr "æ­¤é??项æ??ä¸?ç§?å?¯è?½å?¼ï¼?0ï¼?é??误ï¼?1ï¼?è­¦å??ï¼?2ï¼?è°?è¯?ä¿¡æ?¯ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
-msgid "Time divisions"
-msgstr "æ?¶é?´å??å?²"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-msgid "Time the last alarm ran, in time_t."
-msgstr "æ??é??ä¸?次è¿?è¡?ç??æ?¶é?´ï¼?以 time_t æ ¼å¼?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
-msgid "Timezone"
-msgstr "��"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr "æ?¥å??è§?å?¾ä¸­äº?件ç??é??æ??度ï¼?åº?该ä»?äº? 0(é??æ??)å?? 1(ä¸?é??æ??)ä¹?é?´ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
-msgid "Twenty four hour time format"
-msgstr "äº?å??å??å°?æ?¶æ?¶é?´æ ¼å¼?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
-msgid "URI of the highlighted (\"primary\") calendar"
-msgstr "é«?亮æ?¾ç¤ºç??â??主è¦?â??æ?¥å??ç?? URL"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
-msgid "URI of the highlighted (\"primary\") memo list"
-msgstr "é«?亮æ?¾ç¤ºç??â??主è¦?â??å¤?å¿?å??表ç?? URL"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
-msgid "URI of the highlighted (\"primary\") task list"
-msgstr "é«?亮æ?¾ç¤ºç??â??主è¦?â??ä»»å?¡å??表ç?? URL"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "é»?认æ??é??ç??å??ä½?ï¼?å?¯ä¸ºâ??minutesâ??ï¼?â??hoursâ??æ??â??daysâ??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "å?³å®?æ?¯å?¦é??è??ä»»å?¡ç??å??ä½?ï¼?å?¯ä¸ºâ??minutesâ??ï¼?â??hoursâ??æ??â??daysâ??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
-msgid "Use system timezone"
-msgstr "使�系���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "使ç?¨ç³»ç»?æ?¶å?ºè??ä¸?æ?¯å?¨ Evolution 中é??æ?©ç??æ?¶å?ºã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
-msgid "Vertical pane position"
-msgstr "ç«?ç?´é?¢æ?¿ç??ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
-msgid "Week start"
-msgstr "����"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "ä¸?å?¨å¼?å§?ç??æ?¥å­?ï¼?ä»?æ??æ??æ?¥(0)å?°æ??æ??å?­(6)ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥æ??ç??æ?¥æ?¾ç¤ºæ??é??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "å? é?¤çº¦ä¼?æ??ä»»å?¡æ?¶æ?¯å?¦è¦?æ±?确认ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "é??æ¯?约ä¼?å??ä»»å?¡æ?¶æ?¯å?¦è¦?æ±?确认ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr "å?¨æ??è§?å?¾ä¸­æ?¯å?¦å??缩å?¨æ?«ï¼?å??缩æ?¶å°?æ??å?¨å?­å??å?¨æ?¥ç?¨ä¸?个å??å??æ ¼æ?¾ç¤ºã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to display the end time of events in the week and month views."
-msgstr "æ?¯å?¦å?¨å?¨è§?å?¾å??æ??è§?å?¾ä¸­æ?¾ç¤ºäº?件ç??ç»?æ??æ?¶é?´ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "æ?¯å?¦å?¨æ?¥å??中ç»?å?¶ Marcus Bains 线(å½?å??æ?¶é?´çº¿)ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "æ?¯å?¦å?¨ä»»å?¡è§?å?¾ä¸­é??è??å·²å®?æ??ç??ä»»å?¡ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr "æ?¯å?¦æ??æ??æ??æ»?å?¨ä¸?个æ??ï¼?è??ä¸?æ?¯æ??ç?§æ??份æ»?å?¨ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
-msgid "Whether to set a default reminder for appointments."
-msgstr "æ?¯å?¦ä¸ºçº¦ä¼?设置é»?认æ??é??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºè¯·å??å¤?å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºå??ç±»å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?议中æ?¾ç¤ºè§?è?²å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºç?¶æ??å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "æ?¯ä»¥ 24 å°?æ?¶æ ¼å¼?è¿?æ?¯ä»¥ 12 å°?æ?¶æ ¼å¼?æ?¾ç¤ºæ?¶é?´ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºæ?¶å?ºå??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºç±»å??å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "æ?¯å?¦å?¨æ?¥å??中æ?¾ç¤ºå?¨æ?°ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Work days"
-msgstr "工��"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Workday end hour"
-msgstr "å·¥ä½?æ?¥ç»?æ??å°?æ?¶"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Workday end minute"
-msgstr "å·¥ä½?æ?¥ç»?æ??å??é??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday start hour"
-msgstr "工������"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday start minute"
-msgstr "å·¥ä½?æ?¥å¼?å§?å??é??"
-
 #: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "æ? æ??ç??对象"
@@ -2625,10 +2094,8 @@ msgid "Classification"
 msgstr "å??ç±»"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:535 ../calendar/gui/e-task-table.c:495
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:323
-#: ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "��"
 
@@ -2657,7 +2124,7 @@ msgstr "å­?å?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
@@ -2669,13 +2136,13 @@ msgid "Organizer"
 msgstr "ç»?ç»?è??"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:533 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "��"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-cal-model.c:531
+#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
 #: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "��"
@@ -2766,7 +2233,7 @@ msgstr "è?ªå®?ä¹?æ??é??声é?³"
 msgid "Mes_sage:"
 msgstr "ä¿¡æ?¯(_S)ï¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:70
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
 msgid "Options"
 msgstr "é??项"
 
@@ -2812,9 +2279,9 @@ msgstr "天"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:376
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
 msgstr "天"
@@ -2849,327 +2316,21 @@ msgid "A_dd"
 msgstr "æ·»å? (_D)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
 #: ../calendar/gui/dialogs/event-page.ui.h:1
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alarms"
 msgstr "æ??é??"
 
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
-#: ../calendar/gui/e-day-view-time-item.c:797
-msgctxt "cal-second-zone"
-msgid "None"
-msgstr "æ? "
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
-#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:319
-msgid "Select..."
-msgstr "é??æ?©..."
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:503
-msgid "Selected Calendars for Alarms"
-msgstr "å·²é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:832
-msgid "Ti_me and date:"
-msgstr "æ?¶é?´å??æ?¥æ??(_M)ï¼?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:833
-msgid "_Date only:"
-msgstr "ä»?æ?¥æ??(_D)ï¼?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
-#, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u å?? %d å°?被æ?¿æ?¢ä¸ºç?µå­?é?®ä»¶å?°å??中ç??ç?¨æ?·å??å??å??ã??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(����中�示)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
-msgid "05 minutes"
-msgstr "05 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
-msgid "10 minutes"
-msgstr "10 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
-msgid "15 minutes"
-msgstr "15 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
-msgid "30 minutes"
-msgstr "30 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
-msgid "60 minutes"
-msgstr "60 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
-msgid "Alerts"
-msgstr "æ??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
-#: ../modules/addressbook/autocompletion-config.c:155
-msgid "Date/Time Format"
-msgstr "æ?¥æ??/æ?¶é?´æ ¼å¼?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
-msgid "Day _ends:"
-msgstr "ä¸?天ç»?æ??(_E)ï¼?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
-msgid "Days"
-msgstr "天"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
-msgid "Default Free/Busy Server"
-msgstr "é»?认é?²/å¿?æ??å?¡å?¨"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
-msgid "Display"
-msgstr "�示"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "å?ªå?¨é??ç?¥å?ºå??æ?¾ç¤ºæ??é??(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:739
-msgid "Friday"
-msgstr "æ??æ??äº?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:201 ../mail/mail-config.ui.h:49
-#: ../modules/addressbook/addressbook-config.c:1012
-#: ../plugins/itip-formatter/itip-formatter.c:2785
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "常�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
-msgid "Hours"
-msgstr "å°?æ?¶"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
-msgid "Minutes"
-msgstr "å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
-#: ../calendar/gui/e-itip-control.c:735
-msgid "Monday"
-msgstr "æ??æ??ä¸?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../mail/mail-config.ui.h:74
-msgid "Pick a color"
-msgstr "é??å??ä¸?ç§?é¢?è?²"
-
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
-msgid "S_un"
-msgstr "��(_U)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:740
-msgid "Saturday"
-msgstr "æ??æ??å?­"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
-msgid "Sc_roll Month View by a week"
-msgstr "é??è¿?ä¸?个å?¨æ?¥æ»?å?¨æ??è§?å?¾(_R)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
-msgid "Se_cond zone:"
-msgstr "第���(_C)�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
-msgid "Sh_ow a reminder"
-msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_O)"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show a _reminder"
-msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_R)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-msgid "Show week _numbers"
-msgstr "�示��(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:734
-msgid "Sunday"
-msgstr "æ??æ??æ?¥"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-msgid "T_asks due today:"
-msgstr "ä»?天å?°æ??ç??ä»»å?¡(_A)ï¼?"
-
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
-msgid "T_hu"
-msgstr "å?¨å??(_H)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/calendar-setup.c:387
-msgid "Task List"
-msgstr "ä»»å?¡å??表"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-msgid "Template:"
-msgstr "模��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:738
-msgid "Thursday"
-msgstr "æ??æ??å??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
-#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:597
-msgid "Time"
-msgstr "��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-msgid "Time _zone:"
-msgstr "��(_Z)�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
-msgid "Time format:"
-msgstr "æ?¶é?´æ ¼å¼?ï¼?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:736
-msgid "Tuesday"
-msgstr "æ??æ??äº?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
-msgid "Use s_ystem time zone"
-msgstr "�示系���(_Y)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:737
-msgid "Wednesday"
-msgstr "æ??æ??ä¸?"
-
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
-msgid "Wee_k starts on:"
-msgstr "�����(_K)�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
-msgid "Work Week"
-msgstr "工��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
-msgid "Work days:"
-msgstr "工���"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
-msgid "_12 hour (AM/PM)"
-msgstr "_12 å°?æ?¶(ä¸?/ä¸?å??)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
-msgid "_24 hour"
-msgstr "_24 å°?æ?¶"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
-msgid "_Ask for confirmation when deleting items"
-msgstr "å? é?¤é¡¹æ?¶è¦?æ±?确认(_A)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
-msgid "_Compress weekends in month view"
-msgstr "ä¸?å?¨æ??è§?å?¾ä¸­æ?¾ç¤ºå?¨æ?«(_C)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
-msgid "_Day begins:"
-msgstr "�天��(_D)�"
-
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
-msgid "_Fri"
-msgstr "��(_F)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
-msgid "_Hide completed tasks after"
-msgstr "é??å??é??è??å·²å®?æ??ç??ä»»å?¡(_H)"
-
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
-msgid "_Mon"
-msgstr "��(_M)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
-msgid "_Overdue tasks:"
-msgstr "延æ??ä»»å?¡(_O)ï¼?"
-
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
-msgid "_Sat"
-msgstr "��(_S)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
-msgid "_Show appointment end times in week and month view"
-msgstr "å?¨å?¨è§?å?¾å??æ??è§?å?¾ä¸­æ?¾ç¤ºçº¦ä¼?ç»?æ??æ?¶é?´(_S)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
-msgid "_Time divisions:"
-msgstr "æ?¶é?´å??å?²(_T)ï¼?"
-
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
-msgid "_Tue"
-msgstr "��(_T)"
-
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
-msgid "_Wed"
-msgstr "��(_W)"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
-msgid "before every anniversary/birthday"
-msgstr "å?¨æ¯?个å?¨å¹´/ç??æ?¥å??"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
-msgid "before every appointment"
-msgstr "å?¨æ¯?次约ä¼?å??"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:159
 msgid "Type:"
 msgstr "ç±»å??ï¼?"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:510
+#: ../modules/addressbook/addressbook-config.c:513
 msgid "_Type:"
 msgstr "ç±»å??(_T)ï¼?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:147
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
@@ -3179,20 +2340,37 @@ msgstr "å??称(_N)ï¼?"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y calendar contents locally for offline operation"
-msgstr "å°?æ?¥å??å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
+msgstr "å°?æ?¥å??å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?离线æ??ä½?(_Y)"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:278
 msgid "Cop_y task list contents locally for offline operation"
-msgstr "å°?ä»»å?¡å??表å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
+msgstr "å°?ä»»å?¡å??表å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?离线æ??ä½?(_Y)"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:280
 msgid "Cop_y memo list contents locally for offline operation"
-msgstr "å°?å¤?å¿?å??表å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
+msgstr "å°?å¤?å¿?å??表å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?离线æ??ä½?(_Y)"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:352
 msgid "Colo_r:"
 msgstr "��(_R)�"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:375
+#: ../calendar/gui/dialogs/calendar-setup.c:386
+#: ../calendar/gui/dialogs/calendar-setup.c:397
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
+#: ../modules/addressbook/addressbook-config.c:1015
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "常�"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "ä»»å?¡å??表"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:398
 msgid "Memo List"
 msgstr "å¤?å¿?å??表"
@@ -3270,237 +2448,237 @@ msgstr "%s  æ?¨è¿?没æ??è¿?è¡?ä¿®æ?¹ï¼?æ?´æ?°ç¼?è¾?å?¨å??ï¼?"
 msgid "Validation error: %s"
 msgstr "æ ¡éª?é??误ï¼?%s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:251
+#: ../calendar/gui/dialogs/comp-editor.c:267
 msgid "Could not save attachments"
 msgstr "ä¸?è?½ä¿?å­?é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:527
+#: ../calendar/gui/dialogs/comp-editor.c:543
 msgid "Could not update object"
 msgstr "æ? æ³?æ?´æ?°å¯¹è±¡"
 
-#: ../calendar/gui/dialogs/comp-editor.c:642
+#: ../calendar/gui/dialogs/comp-editor.c:658
 msgid "Edit Appointment"
 msgstr "��约�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:649
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Meeting - %s"
 msgstr "ä¼?è®® - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:651
+#: ../calendar/gui/dialogs/comp-editor.c:667
 #, c-format
 msgid "Appointment - %s"
 msgstr "约� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:657
+#: ../calendar/gui/dialogs/comp-editor.c:673
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "å??é??ç??ä»»å?¡ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:675
 #, c-format
 msgid "Task - %s"
 msgstr "任� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:664
+#: ../calendar/gui/dialogs/comp-editor.c:680
 #, c-format
 msgid "Memo - %s"
 msgstr "�� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:680
+#: ../calendar/gui/dialogs/comp-editor.c:696
 msgid "No Summary"
 msgstr "没æ??æ¦?è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:791
+#: ../calendar/gui/dialogs/comp-editor.c:817
 msgid "Keep original item?"
 msgstr "ä¿?ç??å??å§?æ?¡ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:987
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Click here to close the current window"
 msgstr "å??å?»æ­¤å¤?å?¯å?³é?­å½?å??çª?å?£"
 
-#: ../calendar/gui/dialogs/comp-editor.c:994 ../mail/e-mail-browser.c:120
-#: ../shell/e-shell-window-actions.c:1454
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
+#: ../calendar/gui/dialogs/comp-editor.c:1020 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1434
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
 msgid "Copy the selection"
 msgstr "å¤?å?¶é??中å??容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:127
-#: ../shell/e-shell-window-actions.c:1461
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
+#: ../calendar/gui/dialogs/comp-editor.c:1027 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1441
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1059
 msgid "Cut the selection"
 msgstr "å?ªå??é??中å??容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-#: ../shell/e-shell-window-actions.c:1468
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1034
+#: ../shell/e-shell-window-actions.c:1448
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "å? é?¤é??中å??容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/comp-editor.c:1041
 msgid "Click here to view help available"
 msgstr "å??å?»æ­¤å¤?å?¯æ?¥ç??å?¯ç?¨ç??帮å?©"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1503
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
+#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/e-mail-browser.c:153
+#: ../shell/e-shell-window-actions.c:1483
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1071
 msgid "Paste the clipboard"
 msgstr "�贴�贴�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:1069
 msgid "Click here to save the current window"
 msgstr "å??å?»æ­¤å¤?å?¯ä¿?å­?å½?å??çª?å?£"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1573
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1076 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1553
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "é??中æ??æ??æ??å­?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1057
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Classification"
 msgstr "å??ç±»(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1064
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:155
+#: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1581
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:222
+#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:167
+#: ../shell/e-shell-window-actions.c:1588
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "æ??件(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078
-#: ../shell/e-shell-window-actions.c:1622
+#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../shell/e-shell-window-actions.c:1595
 msgid "_Help"
 msgstr "帮�(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
-#: ../composer/e-composer-actions.c:287
+#: ../calendar/gui/dialogs/comp-editor.c:1118
+#: ../composer/e-composer-actions.c:301
 msgid "_Options"
 msgstr "é??项(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1125 ../mail/e-mail-browser.c:181
+#: ../shell/e-shell-window-actions.c:1630 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
-#: ../composer/e-composer-actions.c:243
+#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../composer/e-composer-actions.c:257
 msgid "_Attachment..."
 msgstr "é??件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1111
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Click here to attach a file"
 msgstr "å??å?»æ­¤å¤?å?¯ä¾¿é??å? æ??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "_Categories"
 msgstr "类�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Toggles whether to display categories"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç±»å?«"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Time _Zone"
 msgstr "��(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºæ?¶å?º"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1164
 msgid "Pu_blic"
 msgstr "��(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "Classify as public"
 msgstr "å??类为å?¬å¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Private"
 msgstr "�人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Classify as private"
 msgstr "å??类为ç§?人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 msgid "_Confidential"
 msgstr "��(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
+#: ../calendar/gui/dialogs/comp-editor.c:1180
 msgid "Classify as confidential"
 msgstr "å??类为æ?ºå¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1188
 msgid "R_ole Field"
 msgstr "è§?è?²å??(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè§?è?²å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1196
 msgid "_RSVP"
 msgstr "请å??å¤?(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè¯·å??å¤?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 msgid "_Status Field"
 msgstr "ç?¶æ??å??(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1206
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç?¶æ??å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../calendar/gui/dialogs/comp-editor.c:1212
 msgid "_Type Field"
 msgstr "ç±»å??å??(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1214
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºå?ºå¸­è??ç±»å??å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
-#: ../composer/e-composer-private.c:70
+#: ../calendar/gui/dialogs/comp-editor.c:1238
+#: ../composer/e-composer-private.c:73
 msgid "Recent _Documents"
 msgstr "æ??è¿?æ??æ¡£(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1747
-#: ../composer/e-composer-actions.c:447
+#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../composer/e-composer-actions.c:469
 msgid "Attach"
 msgstr "é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2076
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:3092
+#: ../calendar/gui/dialogs/comp-editor.c:2252
+#: ../calendar/gui/dialogs/comp-editor.c:2415
+#: ../calendar/gui/dialogs/comp-editor.c:3382
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ?´æ?°å?°è¾¾ç??è¯?ï¼?对此项ç?®ç??æ?´æ?¹å°?被丢å¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3056
+#: ../calendar/gui/dialogs/comp-editor.c:3346
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3124
+#: ../calendar/gui/dialogs/comp-editor.c:3414
 msgid "Unable to use current version!"
 msgstr "æ? æ³?使ç?¨å½?å??ç??æ?¬ï¼?"
 
@@ -3516,11 +2694,11 @@ msgstr "æ? æ³?æ??å¼?ç?®ç??"
 msgid "Destination is read only"
 msgstr "ç?®ç??å?ªè¯»"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ä»?å?¨é?¨å?¶å®?æ?¶ä»¶äººç??é?®ç®±ä¸­å? é?¤æ­¤é¡¹å??ï¼?(_D)"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Retract comment"
 msgstr "æ?¤é??è¯?论(_R)ï¼?"
 
@@ -3652,7 +2830,7 @@ msgstr "å¿?/é?²(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è¯¢å?ºå¸­è??ç??å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3094
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
 msgid "Appointment"
 msgstr "约�"
 
@@ -3662,85 +2840,85 @@ msgstr "约�"
 msgid "Attendees"
 msgstr "å?ºå¸­è??"
 
-#: ../calendar/gui/dialogs/event-editor.c:582
+#: ../calendar/gui/dialogs/event-editor.c:585
 msgid "Print this event"
 msgstr "æ??å?°æ­¤äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:769
+#: ../calendar/gui/dialogs/event-page.c:771
 msgid "Event's start time is in the past"
 msgstr "�件�������"
 
-#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:812
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "å? æ??é??ç??æ?¥ç¨?为å?ªè¯»ï¼?æ?¨æ? æ³?ç¼?è¾?该äº?件ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:814
+#: ../calendar/gui/dialogs/event-page.c:816
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ­¤æ? æ³?ç¼?è¾?å?¨é?¨äº?件ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2778
+#: ../calendar/gui/dialogs/event-page.c:828
+#: ../calendar/gui/dialogs/event-page.c:2784
 msgid "This event has alarms"
 msgstr "æ­¤äº?件æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:895
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ç»?ç»?è??(_G)ï¼?"
 
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "_Delegatees"
 msgstr "代ç??人(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:942
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "Atte_ndees"
 msgstr "å?ºå¸­è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1159
 msgid "Event with no start date"
 msgstr "没æ??å¼?å§?æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1160
+#: ../calendar/gui/dialogs/event-page.c:1162
 msgid "Event with no end date"
 msgstr "没æ??ç»?æ??æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1331
-#: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/memo-page.c:689
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "Start date is wrong"
 msgstr "å¼?å§?æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1341
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End date is wrong"
 msgstr "ç»?æ??æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1364
+#: ../calendar/gui/dialogs/event-page.c:1366
 msgid "Start time is wrong"
 msgstr "å¼?å§?æ?¶é?´æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1371
+#: ../calendar/gui/dialogs/event-page.c:1373
 msgid "End time is wrong"
 msgstr "ç»?æ??æ?¶é?´æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:970
+#: ../calendar/gui/dialogs/event-page.c:1537
+#: ../calendar/gui/dialogs/memo-page.c:730
+#: ../calendar/gui/dialogs/task-page.c:971
 msgid "The organizer selected no longer has an account."
 msgstr "é??中ç??ç»?ç»?è??没æ??å¸?å?·äº?ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1539
-#: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:976
+#: ../calendar/gui/dialogs/event-page.c:1543
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:977
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??ç»?ç»?è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1564
-#: ../calendar/gui/dialogs/task-page.c:1000
+#: ../calendar/gui/dialogs/event-page.c:1568
+#: ../calendar/gui/dialogs/task-page.c:1001
 msgid "At least one attendee is required."
 msgstr "é??è¦?è?³å°?ä¸?个å?ºå¸­è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2652
+#: ../calendar/gui/dialogs/event-page.c:2658
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??ã??"
@@ -3751,44 +2929,44 @@ msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??ã??"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2696
-#: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1790
+#: ../calendar/gui/dialogs/event-page.c:2702
+#: ../calendar/gui/dialogs/memo-page.c:949
+#: ../calendar/gui/dialogs/task-page.c:1791
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æ?¨æ­£å?¨ä»¥ %s ç??身份è¡?å?¨"
 
-#: ../calendar/gui/dialogs/event-page.c:2997
+#: ../calendar/gui/dialogs/event-page.c:3013
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约ä¼?ç?? %d 天å??"
 
-#: ../calendar/gui/dialogs/event-page.c:3003
+#: ../calendar/gui/dialogs/event-page.c:3019
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约ä¼?ç?? %d å°?æ?¶å??"
 
-#: ../calendar/gui/dialogs/event-page.c:3009
+#: ../calendar/gui/dialogs/event-page.c:3025
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约ä¼?ç?? %d å??é??å??"
 
-#: ../calendar/gui/dialogs/event-page.c:3022
+#: ../calendar/gui/dialogs/event-page.c:3044
 msgid "Customize"
 msgstr "���"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3024
+#: ../calendar/gui/dialogs/event-page.c:3050
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "æ? "
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "Atte_ndees..."
 msgstr "å?ºå¸­è??(_N)..."
 
@@ -3800,6 +2978,11 @@ msgstr "è?ªå®?ä¹?æ??é??ï¼?"
 msgid "Event Description"
 msgstr "äº?件æ??è¿°"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Time _zone:"
+msgstr "��(_Z)�"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "æ??é??(_A)"
@@ -3812,7 +2995,7 @@ msgid "_Description:"
 msgstr "æ??è¿°(_D)ï¼?"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:358
+#: ../plugins/calendar-weather/calendar-weather.c:361
 msgid "_Location:"
 msgstr "ä½?ç½®(_L)ï¼?"
 
@@ -3826,68 +3009,63 @@ msgstr "��(_T)�"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#| msgid "1 day before appointment"
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "约ä¼?å?? 1 天"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#| msgid "1 hour before appointment"
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "约ä¼?å?? 1 å°?æ?¶"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-#| msgid "15 minutes before appointment"
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "约ä¼?å?? 15 å??é??"
 
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#| msgid "for"
 msgctxt "eventpage"
 msgid "for"
 msgstr "æ??ç»­æ?¶é?´"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#| msgid "until"
 msgctxt "eventpage"
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3098
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
 msgid "Memo"
 msgstr "��"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:159
 msgid "Print this memo"
 msgstr "æ??å?°æ­¤å¤?å¿?å½?"
 
-#: ../calendar/gui/dialogs/memo-page.c:338
+#: ../calendar/gui/dialogs/memo-page.c:341
 msgid "Memo's start date is in the past"
 msgstr "����������"
 
-#: ../calendar/gui/dialogs/memo-page.c:376
+#: ../calendar/gui/dialogs/memo-page.c:379
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "å? æ??é??ç??å¤?å¿?å??表为å?ªè¯»ï¼?æ?¨æ? æ³?ç¼?è¾?该å¤?å¿?ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:380
+#: ../calendar/gui/dialogs/memo-page.c:383
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ­¤æ? æ³?ç¼?è¾?å?¨é?¨å¤?å¿?ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:907
+#: ../calendar/gui/dialogs/memo-page.c:910
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "æ? æ³?æ??å¼?â??%sâ??中ç??å¤?å¿?ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:282
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2400
-#: ../mail/em-format-html.c:2459 ../mail/em-format-html.c:2483
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:73
+#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
+#: ../mail/em-format-html.c:2466 ../mail/em-format-html.c:2490
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
 msgid "To"
 msgstr "�件人"
 
@@ -3906,7 +3084,7 @@ msgid "T_o:"
 msgstr "å?°(_O)ï¼?"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:429
+#: ../calendar/gui/dialogs/task-page.c:428
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ç»?(_G)ï¼?"
@@ -3914,22 +3092,22 @@ msgstr "ç»?(_G)ï¼?"
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "æ?¨å?³å°?ä¿®æ?¹å??ç?°äº?件ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??容ï¼?"
+msgstr "æ?¨å?³å°?ä¿®æ?¹é??å¤?äº?件ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??容ï¼?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "æ?¨å?³å°?代ç??å??ç?°äº?件ã??æ?¨æ?³è¦?代ç??ä½?å??容ï¼?"
+msgstr "æ?¨å?³å°?代ç??é??å¤?äº?件ã??æ?¨æ?³è¦?代ç??ä½?å??容ï¼?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "æ?¨å?³å°?ä¿®æ?¹å??ç?°ä»»å?¡ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??容ï¼?"
+msgstr "æ?¨å?³å°?ä¿®æ?¹é??å¤?ä»»å?¡ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??容ï¼?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "æ?¨å?³å°?ä¿®æ?¹å??ç?°å¤?å¿?ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??容ï¼?"
+msgstr "æ?¨å?³å°?ä¿®æ?¹é??å¤?å¤?å¿?ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??容ï¼?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -3947,21 +3125,21 @@ msgstr "æ?¬æ¬¡å??以å??å??次"
 msgid "All Instances"
 msgstr "æ??æ??å??次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:559
+#: ../calendar/gui/dialogs/recurrence-page.c:569
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "此约ä¼?å?«æ?? Evolution æ? æ³?ç¼?è¾?ç??å??ç?°ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:891
+#: ../calendar/gui/dialogs/recurrence-page.c:901
 msgid "Recurrence date is invalid"
 msgstr "å??ç?°æ?¥æ??æ? æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:931
+#: ../calendar/gui/dialogs/recurrence-page.c:941
 msgid "End time of the recurrence was before event's start"
 msgstr "é??å¤?äº?件æ?¡ç?®ç??ç»?æ??æ?¶é?´å°?äº?å¼?å§?æ?¶é?´"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:960
+#: ../calendar/gui/dialogs/recurrence-page.c:971
 msgid "on"
 msgstr "å?¨"
 
@@ -3969,7 +3147,7 @@ msgstr "å?¨"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "first"
 msgstr "第�个"
 
@@ -3978,7 +3156,7 @@ msgstr "第�个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1023
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "second"
 msgstr "第�"
 
@@ -3986,7 +3164,7 @@ msgstr "第�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 msgid "third"
 msgstr "第�个"
 
@@ -3994,7 +3172,7 @@ msgstr "第�个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "fourth"
 msgstr "第å??个"
 
@@ -4002,7 +3180,7 @@ msgstr "第å??个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "fifth"
 msgstr "第�个"
 
@@ -4010,13 +3188,13 @@ msgstr "第�个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "last"
 msgstr "æ??å??ä¸?个"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1067
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "Other Date"
 msgstr "å?¶å®?æ?¥æ??"
 
@@ -4024,7 +3202,7 @@ msgstr "å?¶å®?æ?¥æ??"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "1st to 10th"
 msgstr "��"
 
@@ -4032,7 +3210,7 @@ msgstr "��"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "11th to 20th"
 msgstr "中�"
 
@@ -4040,45 +3218,80 @@ msgstr "中�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 msgid "21st to 31st"
 msgstr "��"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "day"
 msgstr "天"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Monday"
+msgstr "æ??æ??ä¸?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Tuesday"
+msgstr "æ??æ??äº?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Wednesday"
+msgstr "æ??æ??ä¸?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Thursday"
+msgstr "æ??æ??å??"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Friday"
+msgstr "æ??æ??äº?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "æ??æ??å?­"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+msgstr "æ??æ??æ?¥"
+
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1239
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 msgid "on the"
 msgstr "å?¨"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1411
+#: ../calendar/gui/dialogs/recurrence-page.c:1425
 msgid "occurrences"
 msgstr "循�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2118
+#: ../calendar/gui/dialogs/recurrence-page.c:2132
 msgid "Add exception"
 msgstr "æ·»å? ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#: ../calendar/gui/dialogs/recurrence-page.c:2173
 msgid "Could not get a selection to modify."
 msgstr "æ? æ³?è?·å¾?è¦?ä¿®æ?¹ç??é??中项ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2165
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Modify exception"
 msgstr "修���"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2209
+#: ../calendar/gui/dialogs/recurrence-page.c:2223
 msgid "Could not get a selection to delete."
 msgstr "æ? æ³?è?·å¾?è¦?å? é?¤ç??é??中项ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2336
+#: ../calendar/gui/dialogs/recurrence-page.c:2357
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ?¶é?´"
 
@@ -4090,7 +3303,7 @@ msgstr "�"
 msgid "Exceptions"
 msgstr "��"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:77
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
 msgid "Preview"
 msgstr "��"
 
@@ -4100,78 +3313,71 @@ msgstr "此约ä¼?é??ç?°(_U)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-#| msgid "day(s)"
 msgctxt "recurrpage"
 msgid "day(s)"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-#| msgid "for"
 msgctxt "recurrpage"
 msgid "for"
 msgstr "æ??ç»­æ?¶é?´"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-#| msgid "forever"
 msgctxt "recurrpage"
 msgid "forever"
 msgstr "永�"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-#| msgid "month(s)"
 msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "æ??"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-#| msgid "until"
 msgctxt "recurrpage"
 msgid "until"
 msgstr "ç?´å?°"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-#| msgid "week(s)"
 msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "å?¨"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#| msgid "year(s)"
 msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "å¹´"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:193
 msgid "Send my alarms with this event"
 msgstr "å?¨è¿?个äº?件é??å??é??æ??ç??æ??é??"
 
 # #####
-#: ../calendar/gui/dialogs/send-comp.c:164
+#: ../calendar/gui/dialogs/send-comp.c:195
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?ºå¸­è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:350
-#: ../calendar/gui/dialogs/task-details-page.c:372
+#: ../calendar/gui/dialogs/task-details-page.c:356
+#: ../calendar/gui/dialogs/task-details-page.c:378
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/task-details-page.c:483
+#: ../calendar/gui/dialogs/task-details-page.c:489
 msgid "Web Page"
 msgstr "�页"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../calendar/gui/e-cal-model-tasks.c:442
 #: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
 #: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3181 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/print.c:3230 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -4179,60 +3385,59 @@ msgstr "å·²å??æ¶?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:440
 #: ../calendar/gui/e-cal-model-tasks.c:714
-#: ../calendar/gui/e-itip-control.c:932 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:212
-#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3178 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-component-preview.c:317
 #: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1188 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "é«?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
+#: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:438
 #: ../calendar/gui/e-cal-model-tasks.c:712
 #: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
 #: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3175
+#: ../calendar/gui/print.c:3224
 msgid "In Progress"
 msgstr "��中"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-cal-component-preview.c:321
 #: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1186 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "ä½?"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1279 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1187
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "中"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-preview.c:302
 #: ../calendar/gui/e-cal-model-tasks.c:436
 #: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
 #: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
-#: ../calendar/gui/print.c:3172 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "����"
 
@@ -4248,8 +3453,8 @@ msgstr "ç?¶æ??(_U)ï¼?"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:594
+#: ../calendar/gui/e-calendar-view.c:1837
+#: ../calendar/gui/e-meeting-list-view.c:596
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4289,45 +3494,45 @@ msgstr "å??å?»å?¯æ?´æ?¹æ??æ?¥ç??ä»»å?¡ç??ç?¶æ??ç»?è??"
 msgid "_Send Options"
 msgstr "å??é??é??项(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3096
+#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3142
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "任�"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "Task Details"
 msgstr "ä»»å?¡ç»?è??"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:376
 msgid "Print this task"
 msgstr "æ??å?°æ­¤ä»»å?¡"
 
-#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.c:345
 msgid "Task's start date is in the past"
 msgstr "ä»»å?¡ç??å¼?å§?æ?¥æ??æ?¯å?¨è¿?å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:347
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's due date is in the past"
 msgstr "ä»»å?¡ç??å?°æ??æ?¶é?´æ?¯å?¨è¿?å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:382
+#: ../calendar/gui/dialogs/task-page.c:381
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ä»»å?¡ä¸?è?½è¢«ç¼?è¾?ï¼?å? 为é??æ?©ç??ä»»å?¡å??表æ?¯å?ªè¯»ç??"
 
-#: ../calendar/gui/dialogs/task-page.c:386
+#: ../calendar/gui/dialogs/task-page.c:385
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "æ? æ³?å®?å?¨ç¼?è¾?ä»»å?¡ï¼?å? 为æ?¨ä¸?æ?¯ç»?ç»?è??"
 
-#: ../calendar/gui/dialogs/task-page.c:437
+#: ../calendar/gui/dialogs/task-page.c:436
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ç»?ç»?è??(_Z)ï¼?"
 
-#: ../calendar/gui/dialogs/task-page.c:883
+#: ../calendar/gui/dialogs/task-page.c:882
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥æ??é??误"
 
-#: ../calendar/gui/dialogs/task-page.c:1747
+#: ../calendar/gui/dialogs/task-page.c:1748
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "æ? æ³?æ??å¼?â??%sâ??中ç??ä»»å?¡ã??"
@@ -4418,7 +3623,7 @@ msgstr "å?¨ %2$s æ?¶ %1$s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 为æ?ªç?¥è§¦å??ç±»å??"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
 msgid "Untitled"
 msgstr "æ? æ ?é¢?"
 
@@ -4427,37 +3632,33 @@ msgid "Categories:"
 msgstr "类��"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1165 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "���"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:261
 msgid "Start Date:"
 msgstr "å¼?å§?æ?¥æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "å?°æ??æ?¥æ??ï¼?"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1190
+#: ../calendar/gui/e-cal-component-preview.c:288
 #: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "ç?¶æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Priority:"
 msgstr "ä¼?å??级ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1228 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:371
 msgid "Web Page:"
 msgstr "�页�"
 
@@ -4489,7 +3690,7 @@ msgid "Free"
 msgstr "空�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:557 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "ç¹?å¿?"
 
@@ -4509,41 +3710,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ? "
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1285
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:1029
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1285
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "å?¦"
 
-#: ../calendar/gui/e-cal-model.c:537 ../calendar/gui/e-itip-control.c:1211
-#: ../calendar/gui/e-itip-control.c:1350
-#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:1013
-#: ../calendar/gui/print.c:1030 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1073
+#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:458
-#: ../plugins/itip-formatter/itip-formatter.c:2452
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "��"
 
-#: ../calendar/gui/e-cal-model.c:1281
+#: ../calendar/gui/e-cal-model.c:1526
 msgid "Recurring"
 msgstr "é??å¤?"
 
-#: ../calendar/gui/e-cal-model.c:1283
+#: ../calendar/gui/e-cal-model.c:1528
 msgid "Assigned"
 msgstr "å·²å??é??"
 
-#: ../calendar/gui/e-cal-model.c:2185
+#: ../calendar/gui/e-cal-model.c:2608
 #, c-format
 msgid "Opening %s"
 msgstr "æ??å¼? %s"
@@ -4580,97 +3779,95 @@ msgid "Start date"
 msgstr "å¼?å§?æ?¥æ??"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:557
+#: ../calendar/gui/e-meeting-list-view.c:559
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "ç±»å??"
 
-#: ../calendar/gui/e-calendar-view.c:414
+#: ../calendar/gui/e-calendar-view.c:430
 msgid "Cut selected events to the clipboard"
 msgstr "å°?é??中äº?件å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-calendar-view.c:420
+#: ../calendar/gui/e-calendar-view.c:436
 msgid "Copy selected events to the clipboard"
 msgstr "å°?é??中äº?件å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:442
 msgid "Paste events from the clipboard"
 msgstr "��贴�中�贴�件"
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Delete selected events"
 msgstr "å? é?¤é??中ç??äº?件"
 
-#: ../calendar/gui/e-calendar-view.c:451 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "å? é?¤é??中ç??对象"
 
-#: ../calendar/gui/e-calendar-view.c:645 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/e-task-table.c:1075
+#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1078
 msgid "Updating objects"
 msgstr "��对象"
 
-#: ../calendar/gui/e-calendar-view.c:1727
-#: ../calendar/gui/e-itip-control.c:1196
+#: ../calendar/gui/e-calendar-view.c:1784
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2440
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1728
-#: ../calendar/gui/e-itip-control.c:1206
+#: ../calendar/gui/e-calendar-view.c:1785
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2446
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "æ??ç»?"
 
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1786
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:556
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Tentative"
 msgstr "æ??æ?¶ç??"
 
-#: ../calendar/gui/e-calendar-view.c:1730
+#: ../calendar/gui/e-calendar-view.c:1787
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2449
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "被å§?ä»»ç??"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Needs action"
 msgstr "é??è¦?å?¨ä½?"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1875 ../calendar/gui/e-memo-table.c:535
-#: ../calendar/gui/e-task-table.c:750
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ç»?ç»?è??ï¼?%s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1879 ../calendar/gui/e-memo-table.c:540
-#: ../calendar/gui/e-task-table.c:753
+#: ../calendar/gui/e-calendar-view.c:1936 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-task-table.c:756
 #, c-format
 msgid "Organizer: %s"
 msgstr "ç»?ç»?è??ï¼?%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1895 ../calendar/gui/print.c:3130
+#: ../calendar/gui/e-calendar-view.c:1952 ../calendar/gui/print.c:3176
 #, c-format
 msgid "Location: %s"
 msgstr "�置�%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1926
+#: ../calendar/gui/e-calendar-view.c:1983
 #, c-format
 msgid "Time: %s %s"
 msgstr "���%s %s"
@@ -4698,23 +3895,38 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:759
+#: ../calendar/gui/e-day-view-time-item.c:761
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i å??é??å??å?²"
 
-#: ../calendar/gui/e-day-view-time-item.c:780
+#: ../calendar/gui/e-day-view-time-item.c:782
 msgid "Show the second time zone"
 msgstr "�示第���"
 
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/e-day-view-time-item.c:799
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.c:175
+#: ../modules/calendar/e-calendar-preferences.c:224
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "æ? "
+
+#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:251
+msgid "Select..."
+msgstr "é??æ?©..."
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1892
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1785
+#: ../calendar/gui/e-day-view-top-item.c:877 ../calendar/gui/e-day-view.c:1802
+#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
 msgid "%A %d %B"
 msgstr "%B%dæ?¥%A"
 
@@ -4724,10 +3936,10 @@ msgstr "%B%dæ?¥%A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1909
-#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/e-day-view-top-item.c:881 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:223
 #: ../calendar/gui/ea-gnome-calendar.c:203
-#: ../modules/calendar/e-cal-shell-view-private.c:1018
+#: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
 msgstr "%-mæ??%-dæ?¥%A"
 
@@ -4736,447 +3948,33 @@ msgstr "%-mæ??%-dæ?¥%A"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1925
-#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/e-day-view-top-item.c:885 ../calendar/gui/e-day-view.c:1835
+#: ../calendar/gui/e-week-view-main-item.c:237
 #: ../calendar/gui/ea-gnome-calendar.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1041
 msgid "%d %b"
 msgstr "%B%-dæ?¥"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1088 ../calendar/gui/e-week-view.c:766
-#: ../calendar/gui/print.c:860 ../calendar/gui/print.c:2321
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
+#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1091 ../calendar/gui/e-week-view.c:769
-#: ../calendar/gui/print.c:862 ../calendar/gui/print.c:2323
+#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
+#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
+#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
 msgid "pm"
 msgstr "ä¸?å??"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2676
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "第%d�"
 
-#: ../calendar/gui/e-itip-control.c:762
-msgid "Recurring:"
-msgstr "é??å¤?ï¼?"
-
-#: ../calendar/gui/e-itip-control.c:766
-msgid "Yes. (Complex Recurrence)"
-msgstr "æ?¯(å¤?æ??é??ç?°)"
-
-#: ../calendar/gui/e-itip-control.c:783
-#, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "� %d 天"
-
-#: ../calendar/gui/e-itip-control.c:796
-#, c-format
-msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] "� %d �"
-
-#: ../calendar/gui/e-itip-control.c:803
-#, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] "æ¯? %d å?¨ç??"
-
-#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:814
-msgid " and "
-msgstr " å?? "
-
-#: ../calendar/gui/e-itip-control.c:823
-#, c-format
-msgid "The %s day of "
-msgstr "第 %s 天��"
-
-#: ../calendar/gui/e-itip-control.c:839
-#, c-format
-msgid "The %s %s of "
-msgstr "%s %s ��"
-
-#: ../calendar/gui/e-itip-control.c:850
-#, c-format
-msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] "æ¯? %d æ??"
-
-#: ../calendar/gui/e-itip-control.c:862
-#, c-format
-msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] "� %d 年"
-
-#: ../calendar/gui/e-itip-control.c:875
-#, c-format
-msgid "a total of %d time"
-msgid_plural "a total of %d times"
-msgstr[0] "�计 %d 次"
-
-#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:886
-msgid ", ending on "
-msgstr "ï¼?ç»?æ??äº? "
-
-#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:907
-msgid "Starts"
-msgstr "��"
-
-#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:917
-msgid "Ends"
-msgstr "ç»?æ??"
-
-#: ../calendar/gui/e-itip-control.c:944
-#: ../plugins/save-calendar/csv-format.c:372
-msgid "Due"
-msgstr "å?°æ??"
-
-#: ../calendar/gui/e-itip-control.c:987 ../calendar/gui/e-itip-control.c:1060
-msgid "iCalendar Information"
-msgstr "iCalendar ä¿¡æ?¯"
-
-#. Title
-#: ../calendar/gui/e-itip-control.c:1009
-msgid "iCalendar Error"
-msgstr "iCalendar é??误"
-
-#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
-#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
-#: ../plugins/itip-formatter/itip-view.c:362
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
-msgid "An unknown person"
-msgstr "æ?ªç?¥ç??人"
-
-#: ../calendar/gui/e-itip-control.c:1146
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr "请æ?¥ç??ä¸?å??ä¿¡æ?¯ï¼?并ä»?ä¸?é?¢ç??è??å??中é??æ?©ä¸?个å?¨ä½?ã??"
-
-#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1161
-#: ../plugins/itip-formatter/itip-formatter.c:2427
-msgctxt "cal-itip"
-msgid "None"
-msgstr "æ? "
-
-#: ../calendar/gui/e-itip-control.c:1201
-#: ../plugins/itip-formatter/itip-formatter.c:2443
-msgid "Tentatively Accepted"
-msgstr "æ??æ?¶æ?¥å??"
-
-#: ../calendar/gui/e-itip-control.c:1291
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
-msgstr "ä¼?议已ç»?被å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??æ?¥å??中æ?¾å?°è¯¥ä¼?è®®"
-
-#: ../calendar/gui/e-itip-control.c:1293
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr "ä»»å?¡å·²ç»?被å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??ä»»å?¡å??表中æ?¾å?°è¯¥ä»»å?¡"
-
-#: ../calendar/gui/e-itip-control.c:1370
-#, c-format
-msgid "%s has published meeting information."
-msgstr "%s å??å¸?äº?ä¼?议信æ?¯ã??"
-
-#: ../calendar/gui/e-itip-control.c:1371
-msgid "Meeting Information"
-msgstr "�议信�"
-
-#: ../calendar/gui/e-itip-control.c:1377
-#, c-format
-msgid "%s requests the presence of %s at a meeting."
-msgstr "%s 请æ±? %s å??å? ä¸?个ä¼?è®®ã??"
-
-#: ../calendar/gui/e-itip-control.c:1379
-#, c-format
-msgid "%s requests your presence at a meeting."
-msgstr "%s é??请æ?¨å??å? ä¸?个ä¼?è®®ã??"
-
-#: ../calendar/gui/e-itip-control.c:1380
-msgid "Meeting Proposal"
-msgstr "�议建议"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1386
-#, c-format
-msgid "%s wishes to be added to an existing meeting."
-msgstr "%s å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ã??"
-
-#: ../calendar/gui/e-itip-control.c:1387
-msgid "Meeting Update"
-msgstr "�议��"
-
-#: ../calendar/gui/e-itip-control.c:1391
-#, c-format
-msgid "%s wishes to receive the latest meeting information."
-msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??ä¼?议信æ?¯ã??"
-
-#: ../calendar/gui/e-itip-control.c:1392
-msgid "Meeting Update Request"
-msgstr "�议��请�"
-
-#: ../calendar/gui/e-itip-control.c:1399
-#, c-format
-msgid "%s has replied to a meeting request."
-msgstr "%s å·²å??å¤?ä¸?个ä¼?议请æ±?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1400
-msgid "Meeting Reply"
-msgstr "�议��"
-
-#: ../calendar/gui/e-itip-control.c:1407
-#, c-format
-msgid "%s has canceled a meeting."
-msgstr "%s å??æ¶?äº?ä¸?个ä¼?è®®ã??"
-
-#: ../calendar/gui/e-itip-control.c:1408
-msgid "Meeting Cancelation"
-msgstr "ä¼?è®®å??æ¶?"
-
-#: ../calendar/gui/e-itip-control.c:1418 ../calendar/gui/e-itip-control.c:1495
-#: ../calendar/gui/e-itip-control.c:1535
-#, c-format
-msgid "%s has sent an unintelligible message."
-msgstr "%s å??é??äº?ä¸?个æ? æ³?ç??解ç??ä¿¡æ?¯ã??"
-
-#: ../calendar/gui/e-itip-control.c:1419
-msgid "Bad Meeting Message"
-msgstr "é??误ç??ä¼?议信æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1446
-#, c-format
-msgid "%s has published task information."
-msgstr "%s å??å¸?äº?ä»»å?¡ä¿¡æ?¯ã??"
-
-#: ../calendar/gui/e-itip-control.c:1447
-msgid "Task Information"
-msgstr "任�信�"
-
-#: ../calendar/gui/e-itip-control.c:1454
-#, c-format
-msgid "%s requests %s to perform a task."
-msgstr "%s 请æ±? %s å®?æ??ä¸?个任å?¡ã??"
-
-#: ../calendar/gui/e-itip-control.c:1456
-#, c-format
-msgid "%s requests you perform a task."
-msgstr "%s 请æ±?æ?¨å®?æ??ä¸?个任å?¡ã??"
-
-#: ../calendar/gui/e-itip-control.c:1457
-msgid "Task Proposal"
-msgstr "任�建议"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1463
-#, c-format
-msgid "%s wishes to be added to an existing task."
-msgstr "%s å¸?æ??å? å?¥å?°å·²æ??ç??ä»»å?¡ã??"
-
-#: ../calendar/gui/e-itip-control.c:1464
-msgid "Task Update"
-msgstr "任���"
-
-#: ../calendar/gui/e-itip-control.c:1468
-#, c-format
-msgid "%s wishes to receive the latest task information."
-msgstr "%s å¸?æ??è?·å??æ??æ?°ç??ä»»å?¡ä¿¡æ?¯ã??"
-
-#: ../calendar/gui/e-itip-control.c:1469
-msgid "Task Update Request"
-msgstr "任���请�"
-
-#: ../calendar/gui/e-itip-control.c:1476
-#, c-format
-msgid "%s has replied to a task assignment."
-msgstr "%s å·²ç»?å??å¤?äº?ä»»å?¡å??é??ã??"
-
-#: ../calendar/gui/e-itip-control.c:1477
-msgid "Task Reply"
-msgstr "ä»»å?¡å??å¤?"
-
-#: ../calendar/gui/e-itip-control.c:1484
-#, c-format
-msgid "%s has canceled a task."
-msgstr "%s å??æ¶?äº?ä»»å?¡ã??"
-
-#: ../calendar/gui/e-itip-control.c:1485
-msgid "Task Cancelation"
-msgstr "ä»»å?¡å??æ¶?"
-
-#: ../calendar/gui/e-itip-control.c:1496
-msgid "Bad Task Message"
-msgstr "é??误ç??ä»»å?¡ä¿¡æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1520
-#, c-format
-msgid "%s has published free/busy information."
-msgstr "%s å??å¸?äº?å¿?é?²ä¿¡æ?¯ã??"
-
-#: ../calendar/gui/e-itip-control.c:1521
-msgid "Free/Busy Information"
-msgstr "��信�"
-
-#: ../calendar/gui/e-itip-control.c:1525
-#, c-format
-msgid "%s requests your free/busy information."
-msgstr "%s 请æ±?æ?¨ç??å¿?é?²ä¿¡æ?¯ã??"
-
-#: ../calendar/gui/e-itip-control.c:1526
-msgid "Free/Busy Request"
-msgstr "�/�请�"
-
-#: ../calendar/gui/e-itip-control.c:1530
-#, c-format
-msgid "%s has replied to a free/busy request."
-msgstr "%s åº?ç­?äº?å¿?é?²è¯·æ±?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1531
-msgid "Free/Busy Reply"
-msgstr "����"
-
-#: ../calendar/gui/e-itip-control.c:1536
-msgid "Bad Free/Busy Message"
-msgstr "é??误ç??å¿?é?²ä¿¡æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1612
-msgid "The message does not appear to be properly formed"
-msgstr "ä¿¡æ?¯ç??æ ¼å¼?å?¯è?½ä¸?正确"
-
-#: ../calendar/gui/e-itip-control.c:1671
-msgid "The message contains only unsupported requests."
-msgstr "ä¿¡æ?¯å?ªå?«æ??ä¸?æ?¯æ??ç??请æ±?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1704
-msgid "The attachment does not contain a valid calendar message"
-msgstr "é??件中没æ??æ??æ??ç??æ?¥å??ä¿¡æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1742
-msgid "The attachment has no viewable calendar items"
-msgstr "é??件中没æ??å?¯æ?¥ç??ç??æ?¥å??项ç?®"
-
-#: ../calendar/gui/e-itip-control.c:1984
-msgid "Update complete\n"
-msgstr "æ?´æ?°å®?æ??\n"
-
-#: ../calendar/gui/e-itip-control.c:2018
-msgid "Object is invalid and cannot be updated\n"
-msgstr "对象æ? æ??ï¼?æ? æ³?æ?´æ?°\n"
-
-#: ../calendar/gui/e-itip-control.c:2036
-msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "æ­¤å??åº?并é??æ?¥è?ªå½?å??å?ºå¸­è??ã??å°?å??åº?è??å? 为å?ºå¸­è??å??ï¼?"
-
-#: ../calendar/gui/e-itip-control.c:2054
-msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "å? 为æ? æ??ç?¶æ??è??æ? æ³?æ?´æ?°å?ºå¸­è??ç?¶æ??ï¼?\n"
-
-#: ../calendar/gui/e-itip-control.c:2078
-msgid "Attendee status updated\n"
-msgstr "æ?´æ?°å?ºå¸­è??ç?¶æ??\n"
-
-#: ../calendar/gui/e-itip-control.c:2085
-#: ../plugins/itip-formatter/itip-formatter.c:1528
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "ç?±äº?æ?¡ç?®ä¸?å??å­?å?¨è??æ? æ³?æ?´æ?°å?ºå¸­è??ç?¶æ??"
-
-#: ../calendar/gui/e-itip-control.c:2116 ../calendar/gui/e-itip-control.c:2173
-msgid "Item sent!\n"
-msgstr "项ç?®å·²å??é??ï¼?\n"
-
-#: ../calendar/gui/e-itip-control.c:2122 ../calendar/gui/e-itip-control.c:2181
-msgid "The item could not be sent!\n"
-msgstr "æ? æ³?å??é??项ç?®ï¼?\n"
-
-#: ../calendar/gui/e-itip-control.c:2274
-msgid "Choose an action:"
-msgstr "é??æ?©ä¸?项活å?¨ï¼?"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2303
-#: ../calendar/gui/e-meeting-list-view.c:582
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "请å??å¤?"
-
-#: ../calendar/gui/e-itip-control.c:2343
-msgid "Update"
-msgstr "æ?´æ?°"
-
-#: ../calendar/gui/e-itip-control.c:2367
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "æ?¥å??"
-
-#: ../calendar/gui/e-itip-control.c:2368
-msgid "Tentatively accept"
-msgstr "æ??æ?¶æ?¥å??"
-
-#: ../calendar/gui/e-itip-control.c:2369
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "æ??ç»?"
-
-#: ../calendar/gui/e-itip-control.c:2394
-msgid "Send Free/Busy Information"
-msgstr "å??é??å¿?é?²ä¿¡æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:2418
-msgid "Update respondent status"
-msgstr "æ?´æ?°åº?ç­?è??ç?¶æ??"
-
-#: ../calendar/gui/e-itip-control.c:2442
-msgid "Send Latest Information"
-msgstr "å??é??æ??æ?°ç??ä¿¡æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:2466
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
-#: ../widgets/misc/e-activity-proxy.c:314
-msgid "Cancel"
-msgstr "å??æ¶?"
-
-#: ../calendar/gui/e-itip-control.ui.h:1
-msgid "--to--"
-msgstr "--å?°--"
-
-#: ../calendar/gui/e-itip-control.ui.h:2
-msgid "Calendar Message"
-msgstr "æ?¥å??ä¿¡æ?¯"
-
-#: ../calendar/gui/e-itip-control.ui.h:3
-msgid "Date:"
-msgstr "æ?¥æ??ï¼?"
-
-#: ../calendar/gui/e-itip-control.ui.h:5
-msgid "Loading Calendar"
-msgstr "è½½å?¥æ?¥å??"
-
-#: ../calendar/gui/e-itip-control.ui.h:6
-msgid "Loading calendar..."
-msgstr "æ­£å?¨è½½å?¥æ?¥å??..."
-
-#: ../calendar/gui/e-itip-control.ui.h:7
-msgid "Organizer:"
-msgstr "ç»?ç»?è??ï¼?"
-
-#: ../calendar/gui/e-itip-control.ui.h:8
-msgid "Server Message:"
-msgstr "æ??å?¡å?¨ä¿¡æ?¯ï¼?"
-
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "主席人å??"
@@ -5194,72 +3992,88 @@ msgid "Resources"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:1009
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1069
 msgid "Individual"
 msgstr "个人"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:1010 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1070 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ç»?"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:1011
+#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/print.c:1071
 msgid "Resource"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:1012
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:1072
 msgid "Room"
 msgstr "æ?¿é?´"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:1026
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1086
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:1027
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1026 ../calendar/gui/print.c:1087
 msgid "Required Participant"
 msgstr "å¿?é??ç??å?ºå¸­è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:1028
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/print.c:1088
 msgid "Optional Participant"
 msgstr "å?¯é??ç??å?ºå¸­è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:1029
+#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/print.c:1089
 msgid "Non-Participant"
 msgstr "ä¸?å??å? "
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:1036
 msgid "Needs Action"
 msgstr "é??è¦?å?¨ä½?"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:537
+#: ../calendar/gui/e-meeting-list-view.c:539
 msgid "Attendee                          "
 msgstr "å?ºå¸­è??                            "
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "请å??å¤?"
+
+#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "å¤?ç??中"
 
+#: ../calendar/gui/e-meeting-store.c:1760
+#, c-format
+msgid "Enter password to access free/busy information on server %s as user %s"
+msgstr "è¾?å?¥å¯?ç ?æ?¥ä½?为ç?¨æ?· %2$s 访é?®æ??å?¡å?¨ %1$s ä¸?ç??å¿?/é?²ä¿¡æ?¯"
+
+#: ../calendar/gui/e-meeting-store.c:1767
+#, c-format
+msgid "Failure reason: %s"
+msgstr "失败å??å? ï¼?%s"
+
 #. 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2378
+#: ../calendar/gui/e-meeting-time-sel-item.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%A, %B %d, %Y"
 msgstr "%Yå¹´%mæ??%dæ?¥%A"
 
@@ -5267,74 +4081,74 @@ msgstr "%Yå¹´%mæ??%dæ?¥%A"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2409
+#: ../calendar/gui/e-meeting-time-sel-item.c:438
+#: ../calendar/gui/e-meeting-time-sel.c:2428
 msgid "%a %m/%d/%Y"
 msgstr "%Yå¹´%mæ??%dæ?¥%A"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:466
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "Out of Office"
 msgstr "å??å?¬å®¤ä»¥å¤?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "No Information"
 msgstr "没æ??ä¿¡æ?¯"
 
-#: ../calendar/gui/e-meeting-time-sel.c:595
+#: ../calendar/gui/e-meeting-time-sel.c:587
 msgid "O_ptions"
 msgstr "é??项(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:613
+#: ../calendar/gui/e-meeting-time-sel.c:605
 msgid "Show _only working hours"
 msgstr "��示工���(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:624
+#: ../calendar/gui/e-meeting-time-sel.c:616
 msgid "Show _zoomed out"
 msgstr "æ?¾ç¤ºç¼©æ?¾ç??è¾?å?º(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:640
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "_Update free/busy"
 msgstr "æ?´æ?°å¿?é?²(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:655
+#: ../calendar/gui/e-meeting-time-sel.c:647
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../calendar/gui/e-meeting-time-sel.c:665
 msgid "_Autopick"
 msgstr "è?ªå?¨è?·å??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:698
 msgid "_All people and resources"
 msgstr "å?¨é?¨äººå??èµ?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:708
 msgid "All _people and one resource"
 msgstr "å?¨é?¨äººå??ä¸?个èµ?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:726
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "å¿?é??ç??人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:735
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid "Required people and _one resource"
 msgstr "å¿?é??ç??人å??ä¸?个èµ?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:784
+#: ../calendar/gui/e-meeting-time-sel.c:776
 msgid "_Start time:"
 msgstr "����(_S)�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:824
+#: ../calendar/gui/e-meeting-time-sel.c:816
 msgid "_End time:"
 msgstr "ç»?æ??æ?¶é?´(_E)ï¼?"
 
@@ -5367,42 +4181,42 @@ msgstr "æ??å??"
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:431
+#: ../plugins/caldav/caldav-browse-server.c:439
 msgid "Memos"
 msgstr "��"
 
-#: ../calendar/gui/e-memo-table.c:497 ../calendar/gui/e-task-table.c:714
+#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:717
 msgid "* No Summary *"
 msgstr "* 没æ??æ¦?è¦? *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:582 ../calendar/gui/e-task-table.c:794
+#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:797
 msgid "Start: "
 msgstr "���"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:812
+#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:815
 msgid "Due: "
 msgstr "å?°æ??ï¼?"
 
-#: ../calendar/gui/e-memo-table.c:717
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "å°?é??中å¤?å¿?å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-memo-table.c:723
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "å°?é??中å¤?å¿?å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-memo-table.c:729
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "��贴�中�贴��"
 
-#: ../calendar/gui/e-memo-table.c:735
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../calendar/gui/e-memo-table.c:738
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "å? é?¤é??中ç??å¤?å¿?"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "é??中æ??æ??å?¯è§?ç??å¤?å¿?"
 
@@ -5419,38 +4233,38 @@ msgstr "å??å?»ä»¥æ·»å? å¤?å¿?"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2113
+#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:444
-#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/caldav/caldav-browse-server.c:437
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "任�"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:943
 msgid "Cut selected tasks to the clipboard"
 msgstr "å°?é??中任å?¡å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-task-table.c:946
+#: ../calendar/gui/e-task-table.c:949
 msgid "Copy selected tasks to the clipboard"
 msgstr "å°?é??中任å?¡å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:955
 msgid "Paste tasks from the clipboard"
 msgstr "��贴�中�贴任�"
 
-#: ../calendar/gui/e-task-table.c:958
-#: ../modules/calendar/e-task-shell-view-actions.c:690
+#: ../calendar/gui/e-task-table.c:961
+#: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "å? é?¤é??中ç??ä»»å?¡"
 
-#: ../calendar/gui/e-task-table.c:964
+#: ../calendar/gui/e-task-table.c:967
 msgid "Select all visible tasks"
 msgstr "é??中æ??æ??å?¯è§?ç??ä»»å?¡"
 
@@ -5461,7 +4275,7 @@ msgstr "é??æ?©æ?¶å?º"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1766
+#: ../calendar/gui/e-week-view-main-item.c:231 ../calendar/gui/print.c:1828
 msgid "%d %B"
 msgstr "%-mæ??%-dæ?¥"
 
@@ -5562,16 +4376,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome æ?¥å??"
 
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
 
 #: ../calendar/gui/ea-gnome-calendar.c:205
 #: ../calendar/gui/ea-gnome-calendar.c:210
 #: ../calendar/gui/ea-gnome-calendar.c:212
-#: ../modules/calendar/e-cal-shell-view-private.c:1021
-#: ../modules/calendar/e-cal-shell-view-private.c:1027
-#: ../modules/calendar/e-cal-shell-view-private.c:1030
+#: ../modules/calendar/e-cal-shell-view-private.c:1008
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
 msgid "%a %d %b %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
 
@@ -5579,10 +4393,10 @@ msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
 #: ../calendar/gui/ea-gnome-calendar.c:235
 #: ../calendar/gui/ea-gnome-calendar.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:243
-#: ../modules/calendar/e-cal-shell-view-private.c:1047
-#: ../modules/calendar/e-cal-shell-view-private.c:1058
-#: ../modules/calendar/e-cal-shell-view-private.c:1065
-#: ../modules/calendar/e-cal-shell-view-private.c:1068
+#: ../modules/calendar/e-cal-shell-view-private.c:1034
+#: ../modules/calendar/e-cal-shell-view-private.c:1045
+#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥"
 
@@ -5612,7 +4426,7 @@ msgstr "æ??æ?¥å??è§?å?¾"
 msgid "calendar view for one or more weeks"
 msgstr "ä¸?å?¨æ??å¤?å?¨ç??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/gnome-cal.c:2312
+#: ../calendar/gui/gnome-cal.c:2201
 msgid "Purging"
 msgstr "é??æ¯?"
 
@@ -5665,7 +4479,7 @@ msgid "Select Date"
 msgstr "é??æ?©æ?¥æ??"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1316
 msgid "Select _Today"
 msgstr "é??æ?©ä»?天(_T)"
 
@@ -5673,32 +4487,32 @@ msgstr "é??æ?©ä»?天(_T)"
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
-#: ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "å¿?须设å®?ç»?ç»?è??ã??"
 
-#: ../calendar/gui/itip-utils.c:451
+#: ../calendar/gui/itip-utils.c:450
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?个å??å? è??"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "�件信�"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "任�信�"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "��信�"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "��信�"
 
-#: ../calendar/gui/itip-utils.c:644
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "æ?¥å??ä¿¡æ?¯"
 
@@ -5706,7 +4520,7 @@ msgstr "æ?¥å??ä¿¡æ?¯"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:678
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "æ?¥å??"
@@ -5715,7 +4529,7 @@ msgstr "æ?¥å??"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:685
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ??æ?¶æ?¥å??"
@@ -5727,7 +4541,7 @@ msgstr "æ??æ?¶æ?¥å??"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "æ??ç»?"
@@ -5736,7 +4550,7 @@ msgstr "æ??ç»?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "被å§?ä»»ç??"
@@ -5744,7 +4558,7 @@ msgstr "被å§?ä»»ç??"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "æ?´æ?°"
@@ -5752,7 +4566,7 @@ msgstr "æ?´æ?°"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:719
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -5760,7 +4574,7 @@ msgstr "å??æ¶?"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "å?·æ?°"
@@ -5768,7 +4582,7 @@ msgstr "å?·æ?°"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:733
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??票表å?³"
@@ -5794,225 +4608,213 @@ msgstr "æ? æ³?é¢?约èµ?æº?ï¼?é??误ï¼?"
 msgid "You must be an attendee of the event."
 msgstr "æ?¨å¿?é¡»æ?¯äº?件ç??å?ºå¸­è??ã??"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:542
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:542
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:542
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:542
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:542
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:543
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:543
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:543
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:543
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:543
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:544
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:544
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:544
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:544
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:544
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:545
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:545
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:545
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:545
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:545
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:546
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:546
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:546
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:546
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:546
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:547
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:547
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:547
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:547
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:547
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:522
+#: ../calendar/gui/print.c:548
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:602
+#: ../calendar/gui/print.c:605
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:602
+#: ../calendar/gui/print.c:605
 msgid "Mo"
 msgstr "�"
 
-#: ../calendar/gui/print.c:602
+#: ../calendar/gui/print.c:605
 msgid "Tu"
 msgstr "�"
 
-#: ../calendar/gui/print.c:602
+#: ../calendar/gui/print.c:605
 msgid "We"
 msgstr "�"
 
-#: ../calendar/gui/print.c:603
+#: ../calendar/gui/print.c:606
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:603
+#: ../calendar/gui/print.c:606
 msgid "Fr"
 msgstr "�"
 
-#: ../calendar/gui/print.c:603
+#: ../calendar/gui/print.c:606
 msgid "Sa"
 msgstr "å?­"
 
-#. Translators: This is part of "START to END" text,
-#. * where START and END are date/times.
-#: ../calendar/gui/print.c:2931
+#: ../calendar/gui/print.c:2969
 msgid " to "
 msgstr " å?° "
 
-#. Translators: This is part of "START to END
-#. * (Completed COMPLETED)", where COMPLETED is a
-#. * completed date/time.
-#: ../calendar/gui/print.c:2939
+#: ../calendar/gui/print.c:2979
 msgid " (Completed "
 msgstr " (å®?æ?? "
 
-#. Translators: This is part of "Completed COMPLETED",
-#. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2943
+#: ../calendar/gui/print.c:2985
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#. Translators: This is part of "START (Due DUE)",
-#. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2951
+#: ../calendar/gui/print.c:2995
 msgid " (Due "
 msgstr " (�� "
 
-#. Translators: This is part of "Due DUE",
-#. * where DUE is a date/time due the event
-#. * should be finished.
-#: ../calendar/gui/print.c:2956
+#: ../calendar/gui/print.c:3002
 msgid "Due "
 msgstr "�� "
 
-#: ../calendar/gui/print.c:3121
+#: ../calendar/gui/print.c:3167
 #, c-format
 msgid "Summary: %s"
 msgstr "���%s"
 
-#: ../calendar/gui/print.c:3145
+#: ../calendar/gui/print.c:3194
 msgid "Attendees: "
 msgstr "å?ºå¸­è??ï¼?"
 
-#: ../calendar/gui/print.c:3188
+#: ../calendar/gui/print.c:3237
 #, c-format
 msgid "Status: %s"
 msgstr "ç?¶æ??ï¼?%s"
 
-#: ../calendar/gui/print.c:3203
+#: ../calendar/gui/print.c:3252
 #, c-format
 msgid "Priority: %s"
 msgstr "ä¼?å??级ï¼?%s"
 
-#: ../calendar/gui/print.c:3221
+#: ../calendar/gui/print.c:3270
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç??ï¼?%i"
 
-#: ../calendar/gui/print.c:3232
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "URL: %s"
 msgstr "URLï¼?%s"
 
-#: ../calendar/gui/print.c:3245
+#: ../calendar/gui/print.c:3294
 #, c-format
 msgid "Categories: %s"
 msgstr "类��%s"
 
-#: ../calendar/gui/print.c:3256
+#: ../calendar/gui/print.c:3305
 msgid "Contacts: "
 msgstr "è??系人ï¼?"
 
@@ -6039,7 +4841,7 @@ msgstr "约ä¼?å??ä¼?è®®"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1942
+#: ../plugins/itip-formatter/itip-formatter.c:1958
 msgid "Opening calendar"
 msgstr "æ??å¼?æ?¥å??"
 
@@ -7769,141 +6571,149 @@ msgstr "太平æ´?/é??浦"
 msgid "Save as..."
 msgstr "��为..."
 
-#: ../composer/e-composer-actions.c:245
+#: ../composer/e-composer-actions.c:259
 #: ../widgets/misc/e-attachment-view.c:380
 msgid "Attach a file"
 msgstr "æ·»å? é??件"
 
-#: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:208
+#: ../composer/e-composer-actions.c:264
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "��(_C)"
 
-#: ../composer/e-composer-actions.c:252
+#: ../composer/e-composer-actions.c:266
 msgid "Close the current file"
 msgstr "å?³é?­å½?å??æ??件"
 
-#: ../composer/e-composer-actions.c:259
+#: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "ä¿?å­?å½?å??æ??件"
 
-#: ../composer/e-composer-actions.c:264
+#: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
 msgstr "��为(_A)..."
 
-#: ../composer/e-composer-actions.c:266
+#: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
 msgstr "ç?¨ä¸?å??ç??æ??件å??ä¿?å­?å½?å??æ??件"
 
-#: ../composer/e-composer-actions.c:271
+#: ../composer/e-composer-actions.c:285
 msgid "New _Message"
 msgstr "�建信�(_M)"
 
-#: ../composer/e-composer-actions.c:273
+#: ../composer/e-composer-actions.c:287
 msgid "Open New Message window"
 msgstr "æ??å¼?æ?°å»ºä¿¡æ?¯çª?å?£"
 
-#: ../composer/e-composer-actions.c:280
+#: ../composer/e-composer-actions.c:294
 msgid "Character _Encoding"
 msgstr "å­?符ç¼?ç ?(_E)"
 
-#: ../composer/e-composer-actions.c:297
+#: ../composer/e-composer-actions.c:311
 msgid "_Print..."
 msgstr "æ??å?°(_P)..."
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:318
 msgid "Print Pre_view"
 msgstr "æ??å?°é¢?è§?(_V)"
 
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:325
 msgid "Save as _Draft"
 msgstr "å?¦å­?为è??稿(_D)"
 
-#: ../composer/e-composer-actions.c:313
+#: ../composer/e-composer-actions.c:327
 msgid "Save as draft"
 msgstr "å?¦å­?为è??稿"
 
-#: ../composer/e-composer-actions.c:318 ../composer/e-composer-private.c:318
+#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:347
 msgid "S_end"
 msgstr "å??é??(_E)"
 
-#: ../composer/e-composer-actions.c:320
+#: ../composer/e-composer-actions.c:334
 msgid "Send this message"
 msgstr "å??é??è¿?æ?¡ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:328
+#: ../composer/e-composer-actions.c:342
 msgid "PGP _Encrypt"
 msgstr "PGP å? å¯?(_E)"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:344
 msgid "Encrypt this message with PGP"
 msgstr "ç?¨ PGP å? å¯?该信æ?¯"
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:350
 msgid "PGP _Sign"
 msgstr "PGP ç­¾å??(_S)"
 
-#: ../composer/e-composer-actions.c:338
+#: ../composer/e-composer-actions.c:352
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨æ?¨ç?? PGP å¯?é?¥ç­¾å??该信æ?¯"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:358
+msgid "_Picture Gallery"
+msgstr "å?¾ç??ç?»å»?(_P)"
+
+#: ../composer/e-composer-actions.c:360
+msgid "Show a collection of pictures that you can drag to your message"
+msgstr "æ?¾ç¤ºä¸?ç»?å?¾ç??ï¼?æ?¨å?¯ä»¥å°?å®?们æ??æ?¾å?°æ?¨ç??ä¿¡æ?¯ä¸­"
+
+#: ../composer/e-composer-actions.c:366
 msgid "_Prioritize Message"
 msgstr "æ ?为ä¼?å??(_P)"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:368
 msgid "Set the message priority to high"
 msgstr "å°?ä¿¡æ?¯è®¾å®?为é«?ä¼?å??级"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:374
 msgid "Re_quest Read Receipt"
 msgstr "请æ±?已读å??æ?§(_Q)"
 
-#: ../composer/e-composer-actions.c:354
+#: ../composer/e-composer-actions.c:376
 msgid "Get delivery notification when your message is read"
 msgstr "å½?æ?¨ç??ä¿¡æ?¯è¢«é??读æ?¶å¾?å?°æ??é??é??ç?¥"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:382
 msgid "S/MIME En_crypt"
 msgstr "S/MIME å? å¯?(_C)"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:384
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME å? å¯?è¯?书å? å¯?该信æ?¯"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:390
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ç­¾å??(_N)"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:392
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME ç­¾å??认è¯?ç­¾å??该信æ?¯"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:398
 msgid "_Bcc Field"
 msgstr "å¯?件æ??é??å??(_B)"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:400
 msgid "Toggles whether the BCC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå¯?件æ??é??å??"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:406
 msgid "_Cc Field"
 msgstr "æ??é??å??(_C)"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:408
 msgid "Toggles whether the CC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºæ??é??å??"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:414
 msgid "_Reply-To Field"
 msgstr "å??å¤?è?³å??(_R)"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:416
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå??å¤?å??"
 
-#: ../composer/e-composer-actions.c:450
+#: ../composer/e-composer-actions.c:475
 msgid "Save Draft"
 msgstr "ä¿?å­?è??稿"
 
@@ -7961,48 +6771,48 @@ msgstr "å??å?»æ­¤å¤?以使ç?¨å?°å??ç°¿"
 msgid "Click here to select folders to post to"
 msgstr "å??å?»æ­¤å¤?以é??æ?©è¦?æ??é??å?°ç??æ??件夹"
 
-#: ../composer/e-composer-private.c:217
+#: ../composer/e-composer-private.c:245
 msgid "Undo the last action"
 msgstr "æ?¤æ¶?ä¸?次æ??ä½?"
 
-#: ../composer/e-composer-private.c:221
+#: ../composer/e-composer-private.c:249
 msgid "Redo the last undone action"
 msgstr "é??å??ä¸?次æ??ä½?"
 
-#: ../composer/e-composer-private.c:225
+#: ../composer/e-composer-private.c:253
 msgid "Search for text"
 msgstr "æ??ç´¢æ??æ?¬"
 
-#: ../composer/e-composer-private.c:229
+#: ../composer/e-composer-private.c:257
 msgid "Search for and replace text"
 msgstr "æ??ç´¢å??æ?¿æ?¢æ??æ?¬"
 
-#: ../composer/e-composer-private.c:338
+#: ../composer/e-composer-private.c:367
 msgid "Save draft"
 msgstr "ä¿?å­?è??稿"
 
-#: ../composer/e-msg-composer.c:780
+#: ../composer/e-msg-composer.c:784
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "æ? æ³?对å¯?å?ºç??ä¿¡æ?¯ç­¾å??ï¼?æ?ªå¯¹æ­¤å¸?å?·è®¾ç½®ç­¾å??è¯?书"
 
-#: ../composer/e-msg-composer.c:789
+#: ../composer/e-msg-composer.c:793
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "æ? æ³?对å¯?å?ºç??ä¿¡æ?¯å? å¯?ï¼?æ?ªå¯¹æ­¤å¸?å?·è®¾ç½®å? å¯?è¯?书"
 
-#: ../composer/e-msg-composer.c:1671 ../composer/e-msg-composer.c:2010
+#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2042
 msgid "Compose Message"
 msgstr "�建��"
 
-#: ../composer/e-msg-composer.c:3974
+#: ../composer/e-msg-composer.c:4117
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ç¼?å??å?¨å?«æ??ä¸?å?¯ç¼?è¾?ç??é??æ??æ?¬ä¿¡ä½?ã??"
 
-#: ../composer/e-msg-composer.c:4679
+#: ../composer/e-msg-composer.c:4822
 msgid "Untitled Message"
 msgstr "æ? æ ?é¢?ä¿¡æ?¯"
 
@@ -8017,19 +6827,16 @@ msgid "All accounts have been removed."
 msgstr "å·²ç»?å? é?¤äº?å?¨é?¨å¸?å?·ã??"
 
 #: ../composer/mail-composer.error.xml.h:3
-#| msgid "Error occurred while spawning %s: %s."
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "å?¨ä¿?å­?å?°æ?¨ç??è??稿æ??件夹æ?¶å?ºç?°äº?ä¸?个é??误ã??"
 
 #: ../composer/mail-composer.error.xml.h:4
-#| msgid "An error occurred while printing"
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "å?¨ä¿?å­?å?°æ?¨ç??å??件箱æ??件夹æ?¶å?ºç?°äº?ä¸?个é??误ã??"
 
 #: ../composer/mail-composer.error.xml.h:5
-#| msgid "An error occurred while printing"
-msgid "An error occurred while sending."
-msgstr "å??é??æ?¶å?ºç?°äº?ä¸?个é??误ã??"
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "å?¨å??é??æ?¶å?ºé??äº?é??误ã??æ?¨æ?³ç»§ç»­å??ï¼?"
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -8047,11 +6854,12 @@ msgstr "å??å? æ?¯â??{1}â??ã??"
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid ""
-"Because you are working offline, the message has been saved to your local "
+"Because you are working offline, the message will be saved to your local "
 "Outbox folder. When you are back online you can send the message by clicking "
 "the Send/Receive button in Evolution's toolbar."
-msgstr "ç?±äº?æ?¨ç?°å?¨æ?¯ç¦»çº¿å·¥ä½?ï¼?ä¿¡æ?¯ä¿?å­?å?°äº?æ?¨ç??æ?¬å?°å??件箱æ??件夹ã??å?¨ä¸?线å??ï¼?æ?¨"
-"å?¯ä»¥é??è¿?ç?¹å?» Evolution å·¥å?·æ ?ä¸?ç?? å??é??/æ?¥æ?¶ æ??é?®å??é??è¿?æ?¡ä¿¡æ?¯ã??"
+msgstr ""
+"ç?±äº?æ?¨ç?°å?¨æ?¯ç¦»çº¿å·¥ä½?ï¼?ä¿¡æ?¯å°?ä¿?å­?å?°æ?¨ç??æ?¬å?°å??件箱æ??件夹ã??å?¨ä¸?线å??ï¼?æ?¨å?¯ä»¥é??è¿?"
+"ç?¹å?» Evolution å·¥å?·æ ?ä¸?ç?? å??é??/æ?¥æ?¶ æ??é?®å??é??è¿?æ?¡ä¿¡æ?¯ã??"
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid ""
@@ -8059,8 +6867,8 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"å?³é?­æ­¤ç¼?å??çª?å?£å°?ä¼?æ°¸ä¹?丢å¼?ä¿¡æ?¯ï¼?é?¤é??æ?¨é??æ?©å?¨è??稿æ??件夹中ä¿?å­?è¿?æ?¡ä¿¡æ?¯ã??è¿?å??许æ?¨"
-"å?¨ç¨?å??继续ç¼?å??ä¿¡æ?¯ã??"
+"å?³é?­æ­¤ç¼?å??çª?å?£å°?ä¼?æ°¸ä¹?丢å¼?ä¿¡æ?¯ï¼?é?¤é??æ?¨é??æ?©å?¨è??稿æ??件夹中ä¿?å­?è¿?æ?¡ä¿¡æ?¯ã??è¿?å??许"
+"æ?¨å?¨ç¨?å??继续ç¼?å??ä¿¡æ?¯ã??"
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
@@ -8097,16 +6905,14 @@ msgid ""
 msgstr "å?¨æ?¨ä¸?次ç¼?å??æ?°ä¿¡æ?¯æ?¶ Evolution æ??å¤?é??å?ºã??æ?¢å¤?é?®ä»¶å°?å??许æ?¨ç»§ç»­å®?æ??ã??"
 
 #: ../composer/mail-composer.error.xml.h:19
-#| msgid "Message is not Junk"
-msgid "Message saved to Outbox."
-msgstr "é?®ä»¶å·²ä¿?å­?å?°å??件箱ã??"
+msgid "Saving message to Outbox."
+msgstr "æ??ä¿¡æ?¯ä¿?å­?å?°å??件箱中ã??"
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "æ??件â??{0}â??ä¸?æ?¯æ?®é??æ??件ï¼?æ? æ³?å?¨ä¿¡æ?¯ä¸­å??é??ã??"
 
-#: ../composer/mail-composer.error.xml.h:21
-#| msgid "Bad regular expression &quot;{0}&quot;."
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "æ?¥å??ç??é??误为â??{0}â??ã??"
 
@@ -8121,7 +6927,6 @@ msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "æ?¥å??ç??é??误为â??{0}â??ã??ä¿¡æ?¯å¾?å?¯è?½æ²¡æ??å??é??ã??"
 
 #: ../composer/mail-composer.error.xml.h:24
-#| msgid "You cannot attach the file n{0}' to this message."
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "æ?¨æ? æ³?å°?æ??件â??{0}â??ä½?为è¿?æ?¡ä¿¡æ?¯ç??é??件ã??"
 
@@ -8129,119 +6934,125 @@ msgstr "æ?¨æ? æ³?å°?æ??件â??{0}â??ä½?为è¿?æ?¡ä¿¡æ?¯ç??é??件ã??"
 msgid "You need to configure an account before you can compose mail."
 msgstr "å?¨æ?¨å?¯ä»¥æ?°å??é?®ä»¶ä¹?å??æ?¨é??è¦?é??ç½®ä¸?个å¸?å?·ã??"
 
-#: ../composer/mail-composer.error.xml.h:26
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Continue Editing"
 msgstr "继续��(_C)"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "���(_D)"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "��(_R)"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "ä¿?å­?è??稿(_S)"
 
-#: ../capplet/anjal-settings-main.c:223
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save to Outbox"
+msgstr "ä¿?å­?å?°å??件箱(_S)"
+
+#: ../composer/mail-composer.error.xml.h:34
+msgid "_Try Again"
+msgstr "é??è¯?(_T)"
+
+#: ../capplet/anjal-settings-main.c:224
 msgid "Run Anjal in a window"
 msgstr "����中�� Anjal"
 
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:225
 msgid "Make Anjal the default email client"
 msgstr "� Anjal 设为�认���件客�端"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:231
+#: ../capplet/anjal-settings-main.c:232
 msgid "ID of the socket to embed in"
 msgstr "è¦?å??åµ?ç??端å?£ ID"
 
-#: ../capplet/anjal-settings-main.c:232
+#: ../capplet/anjal-settings-main.c:233
 msgid "socket"
 msgstr "���"
 
-#: ../capplet/anjal-settings-main.c:245
+#: ../capplet/anjal-settings-main.c:246
 msgid "Anjal email client"
 msgstr "Anjal �件客�端"
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:73
 msgid "Please enter your full name."
 msgstr "请è¾?å?¥æ?¨ç??å?¨å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your email address."
 msgstr "请è¾?å?¥æ?¨ç??ç?µå­?é?®ä»¶å?°å??"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:75
 msgid "The email address you have entered is invalid."
 msgstr "æ?¨è¾?å?¥ç??ç?µå­?é?®ä»¶å?°å??æ? æ??ã??"
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:76
 msgid "Please enter your password."
 msgstr "请è¾?å?¥æ?¨ç??å¯?ç ?ã??"
 
-#: ../capplet/settings/mail-account-view.c:256
+#: ../capplet/settings/mail-account-view.c:255
 #: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:360
-#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../capplet/settings/mail-account-view.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:56
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:464
+#: ../capplet/settings/mail-account-view.c:463
 msgid "Personal details:"
 msgstr "个人详�信��"
 
-#: ../capplet/settings/mail-account-view.c:471
+#: ../capplet/settings/mail-account-view.c:470
 msgid "Name:"
 msgstr "å??称ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
 msgid "Email address:"
 msgstr "ç?µå­?é?®ä»¶å?°å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:490
-#| msgid "Details"
+#: ../capplet/settings/mail-account-view.c:489
 msgid "Details:"
 msgstr "ç»?è??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:498
-#| msgid "Receiving mail"
+#: ../capplet/settings/mail-account-view.c:497
 msgid "Receiving"
 msgstr "��"
 
-#: ../capplet/settings/mail-account-view.c:505
+#: ../capplet/settings/mail-account-view.c:504
 msgid "Server type:"
 msgstr "æ??å?¡å?¨ç±»å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:514
+#: ../capplet/settings/mail-account-view.c:513
 msgid "Server address:"
 msgstr "æ??å?¡å?¨å?°å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:523
+#: ../capplet/settings/mail-account-view.c:522
 msgid "Username:"
 msgstr "ç?¨æ?·å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:532
+#: ../capplet/settings/mail-account-view.c:531
 msgid "Use encryption:"
 msgstr "使ç?¨å? å¯?ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:537
-#: ../capplet/settings/mail-account-view.c:572
+#: ../capplet/settings/mail-account-view.c:536
+#: ../capplet/settings/mail-account-view.c:571
 msgid "never"
 msgstr "��"
 
-#: ../capplet/settings/mail-account-view.c:549
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Sending"
 msgstr "å??é??"
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:590
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8251,7 +7062,7 @@ msgstr ""
 "ç ?ï¼?æ??ä¼?å°?è¯?并ä¸?å®?æ??æ??æ??设å®?ã??å¦?æ??æ??ä¸?è?½è?ªå?¨è®¾å®?æ??æ??ç»?è??ï¼?æ?¨è¿?é??è¦?æ??ä¾?æ?¨ç??ç?µ"
 "å­?é?®ä»¶æ??å?¡å?¨ç??详ç»?ä¿¡æ?¯ã??"
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:592
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8260,11 +7071,11 @@ msgstr ""
 "对ä¸?èµ·ï¼?æ??们ä¸?è?½è?ªå?¨å®?æ??设置æ?¥è?·å??æ?¨ç??ç?µå­?é?®ä»¶ã??请å®?æ??ä¸?é?¢ç??设置ã??æ??们å°?è¯?æ ¹"
 "æ?®æ?¨å??æ??è¾?å?¥ç??ä¿¡æ?¯å·¥ä½?ä½?æ?¯æ??许æ?¨é??è¦?æ?´æ?¹å®?们ã??"
 
-#: ../capplet/settings/mail-account-view.c:595
+#: ../capplet/settings/mail-account-view.c:594
 msgid "You can specify more options to configure the account."
 msgstr "æ?¨å?¯ä»¥æ??å®?æ?´å¤?é??项以é??置此å¸?å?·ã??"
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:596
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8272,111 +7083,110 @@ msgstr ""
 "ç?°å?¨æ??们é??è¦?æ?¨è®¾ç½®å??é??é?®ä»¶ï¼?æ??们ä¼?å°½é??è?ªå?¨å®?æ??ï¼?ä½?æ?¯æ?¨é??è¦?æ£?æ?¥è®¾ç½®æ?¥ç¡®ä¿?æ­£"
 "ç¡®ã??"
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:597
 msgid "You can specify your default settings for your account."
 msgstr "æ?¨å?¯ä»¥ä¸ºæ?¨ç??å¸?å?·æ??å®?é»?认设置ã??"
 
-#: ../capplet/settings/mail-account-view.c:599
+#: ../capplet/settings/mail-account-view.c:598
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 msgstr "å?¨æ??们å°?è¯?è¿?æ?¥æ??å?¡å?¨å¹¶è?·å??æ?¨ç??ç?µå­?é?®ä»¶ä¹?å??ï¼?请æ£?æ?¥ä¸?é??æ?¨ç??é??置信æ?¯ã??"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../mail/em-account-editor.c:2208 ../mail/em-account-editor.c:2329
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2095 ../mail/em-account-editor.c:2216
 msgid "Identity"
 msgstr "æ ?è¯?"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Receiving mail"
 msgstr "å??è¿? - æ?¥æ?¶ç?µå­?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Receiving mail"
 msgstr "�����件"
 
+#: ../capplet/settings/mail-account-view.c:614
 #: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
 msgstr "å??è¿? - å??é??ç?µå­?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Back - Identity"
 msgstr "å??é?? - æ ?è¯?"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving options"
 msgstr "å??è¿? - æ?¥æ?¶é??项"
 
-#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving options"
 msgstr "æ?¥æ?¶é??项"
 
-#: ../capplet/settings/mail-account-view.c:616
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving mail"
 msgstr "å??é?? - æ?¥æ?¶ç?µå­?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Sending mail"
 msgstr "å??é??ç?µå­?é?®ä»¶"
 
+#: ../capplet/settings/mail-account-view.c:617
 #: ../capplet/settings/mail-account-view.c:618
-#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
 msgstr "å??è¿? - æ£?æ?¥å¸?å?·"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Next - Defaults"
 msgstr "å??è¿? - é»?认å?¼"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving options"
 msgstr "å??é?? - æ?¥æ?¶é??项"
 
-#: ../capplet/settings/mail-account-view.c:619
-#: ../mail/em-account-editor.c:3146
+#: ../capplet/settings/mail-account-view.c:618
+#: ../mail/em-account-editor.c:3044
 msgid "Defaults"
 msgstr "�认�"
 
-#: ../capplet/settings/mail-account-view.c:619
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Sending mail"
 msgstr "å??é?? - å??é??ç?µå­?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Review account"
 msgstr "����"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Finish"
 msgstr "å®?æ??"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Back - Sending"
 msgstr "å??é?? - å??é??"
 
-#: ../capplet/settings/mail-account-view.c:726
+#: ../capplet/settings/mail-account-view.c:725
 msgid "Setup Google contacts with Evolution"
 msgstr "设置 Google è??系人å?° Evolution"
 
-#: ../capplet/settings/mail-account-view.c:727
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google calendar with Evolution"
 msgstr "æ·»å?  Google æ?¥å??å?° Evolution"
 
-#: ../capplet/settings/mail-account-view.c:732
+#: ../capplet/settings/mail-account-view.c:731
 msgid "You may need to enable IMAP access."
 msgstr "æ?¨å?¯è?½é??è¦?å?¯ç?¨ IMAP 访é?®ã??"
 
-#: ../capplet/settings/mail-account-view.c:740
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:739
 msgid "Google account settings:"
 msgstr "Google 账�设置�"
 
-#: ../capplet/settings/mail-account-view.c:767
+#: ../capplet/settings/mail-account-view.c:766
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "æ·»å?  Yahoo æ?¥å??å?° Evolution"
 
-#: ../capplet/settings/mail-account-view.c:771
+#: ../capplet/settings/mail-account-view.c:770
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -8385,65 +7195,63 @@ msgstr ""
 "Yahoo æ?¥å??å?½å??为 å??å­?_å§?æ°?ã??æ??们å°?è¯?ç??ç??æ??è¿?ç§?æ?¥å??å??称ã??请确认å??å­?æ?¯å?¦æ­£ç¡®ï¼?"
 "å¦?æ??ä¸?正确ï¼?请é??æ?°è¾?å?¥æ?¥å??å??称ã??"
 
-#: ../capplet/settings/mail-account-view.c:778
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:777
 msgid "Yahoo account settings:"
 msgstr "Yahoo 账�设置�"
 
-#: ../capplet/settings/mail-account-view.c:792
+#: ../capplet/settings/mail-account-view.c:791
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo æ?¥å??å??称ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:1064
+#: ../capplet/settings/mail-account-view.c:1063
 msgid "Password:"
 msgstr "å¯?ç ?ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:1133
-#: ../capplet/settings/mail-settings-view.c:267
+#: ../capplet/settings/mail-account-view.c:1132
+#: ../capplet/settings/mail-settings-view.c:266
 msgid "Close Tab"
 msgstr "å?³é?­æ ?ç­¾"
 
-#: ../capplet/settings/mail-account-view.c:1143
+#: ../capplet/settings/mail-account-view.c:1142
 msgid "Account Wizard"
 msgstr "å¸?å?·å??导"
 
-#: ../capplet/settings/mail-capplet-shell.c:211
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Evolution å¸?å?·å?©æ??"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:351 ../mail/e-mail-migrate.c:678
-#: ../mail/e-mail-store.c:219 ../mail/em-folder-tree-model.c:149
-#: ../mail/em-folder-tree-model.c:152 ../mail/em-folder-tree-model.c:155
-#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:164
-#: ../mail/em-folder-tree-model.c:166 ../mail/mail-vfolder.c:217
-#: ../mail/message-list.c:1671
+#: ../capplet/settings/mail-capplet-shell.c:358 ../mail/e-mail-migrate.c:677
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
+#: ../mail/message-list.c:1709
 #: ../modules/addressbook/e-book-shell-backend.c:96
-#: ../modules/addressbook/e-book-shell-migrate.c:130
-#: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:146
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../modules/addressbook/e-book-shell-migrate.c:135
+#: ../modules/calendar/e-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-migrate.c:148
+#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../modules/calendar/e-memo-shell-migrate.c:106
+#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-migrate.c:115
 msgid "On This Computer"
 msgstr "�此计��中"
 
-#: ../capplet/settings/mail-settings-view.c:146
+#: ../capplet/settings/mail-settings-view.c:145
 #, c-format
-#| msgid "Modify"
 msgid "Modify %s..."
 msgstr "修� %s..."
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:147
 msgid "Add a new account"
 msgstr "æ·»å? æ?°å¸?å?·"
 
-#: ../capplet/settings/mail-settings-view.c:184
+#: ../capplet/settings/mail-settings-view.c:183
 msgid "Account management"
 msgstr "å¸?å?·ç®¡ç??"
 
-#: ../capplet/settings/mail-settings-view.c:277
+#: ../capplet/settings/mail-settings-view.c:276
 msgid "Settings"
 msgstr "设置"
 
@@ -8455,7 +7263,8 @@ msgstr "æ?¥å??äº?件信æ?¯"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution æ??é??é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:851
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8464,7 +7273,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution é?®ä»¶å??æ?¥å??"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Groupwise �件"
 
@@ -8481,23 +7290,36 @@ msgid "Email Settings"
 msgstr "���件设置"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s(å??æ¶?ç??)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:268
+#: ../e-util/e-activity.c:229
 #, c-format
 msgid "%s (completed)"
 msgstr "%s(å®?æ??ç??)"
 
-#: ../e-util/e-activity.c:270
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:232
+#, c-format
+msgid "%s (waiting)"
+msgstr "%s (��中)"
+
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (cancelling)"
+msgstr "%s (æ­£å?¨å??æ¶?)"
+
+#: ../e-util/e-activity.c:238
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:275
+#: ../e-util/e-activity.c:243
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% å®?æ??)"
@@ -8580,131 +7402,72 @@ msgid "Visual"
 msgstr "��"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1794
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "�天"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??天"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "�天"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:211
-#, c-format
-msgid "%d day from now"
-msgid_plural "%d days from now"
-msgstr[0] "è·?ç?°å?¨æ?? %d 天"
-
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:214
+#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue".
+#. ngettext is used to be able to define different translations for different days of week, where
+#. necessary. Index is between 1 and 7 inclusive, meaning 1 .. Monday, 2 .. Tuesday, ..., 7 .. Sunday
+#: ../e-util/e-datetime-format.c:218
 #, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天å??"
+msgid "Next %a"
+msgid_plural "Next %a"
+msgstr[0] "�个 %a"
 
-#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:295 ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:314
 msgid "Use locale default"
 msgstr "使����认�"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:510
 msgid "Format:"
 msgstr "æ ¼å¼?ï¼?"
 
-#: ../e-util/e-file-utils.c:136
+#: ../e-util/e-file-utils.c:152
 msgid "(Unknown Filename)"
 msgstr "(æ?ªç?¥æ??件å??)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:140
+#: ../e-util/e-file-utils.c:156
 #, c-format
 msgid "Writing \"%s\""
-msgstr "æ­£å?¨å??å?¥ %s"
+msgstr "æ­£å?¨å??å?¥â??%sâ??"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:145
+#: ../e-util/e-file-utils.c:161
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "æ??â??%sâ??å??å?¥å?° %s"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:194
-msgid "Debug Logs"
-msgstr "����"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:208
-msgid "Show _errors in the status bar for"
-msgstr "å?¨ç?¶æ??æ ?æ?¾ç¤ºé??误(_E)"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:226
-msgid "second(s)."
-msgstr "ç§?ã??"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:232
-msgid "Log Messages:"
-msgstr "��信��"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:279
-msgid "Log Level"
-msgstr "��级�"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2758
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "ä¿¡æ?¯"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:113
-#: ../shell/e-shell-window-actions.c:1426
-#: ../shell/e-shell-window-actions.c:1433
-#: ../shell/e-shell-window-actions.c:1440
-msgid "Close this window"
-msgstr "��此��"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Error"
-msgstr "é??误"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Errors"
-msgstr "é??误"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:39
-msgid "Warnings and Errors"
-msgstr "è­¦å??å??é??误"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Debug"
-msgstr "��"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Error, Warnings and Debug messages"
-msgstr "é??误ï¼?è­¦å??å??è°?è¯?ä¿¡æ?¯"
-
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "å?¨"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:157
 msgid "An error occurred while printing"
 msgstr "æ??å?°æ?¶å??ç??äº?é??误"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:164
 msgid "The printing system reported the following details about the error:"
 msgstr "æ??å?°ç³»ç»?æ?¥å??äº?ä¸?å??é??误ç»?è??ï¼?"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:170
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "æ??å?°ç³»ç»?æ?ªæ?¥å??å?³äº?é??误ç??ä»»ä½?é¢?å¤?ç»?è??ã??"
@@ -8733,15 +7496,15 @@ msgstr "æ?¨æ??ç®?è¦?ç??å®?å??ï¼?"
 msgid "File exists \"{0}\"."
 msgstr "æ??件已å­?å?¨â??{0}â??ã??"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:149
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
 msgid "_Overwrite"
 msgstr "è¦?ç??(_O)"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:154
 msgid "Could not open the link."
 msgstr "æ? æ³?æ??å¼?é?¾æ?¥ã??"
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:201
 msgid "Could not display help for Evolution."
 msgstr "æ? æ³?æ?¾ç¤º Evolution ç??帮å?©ã??"
 
@@ -8754,148 +7517,150 @@ msgstr "GConf é??误ï¼?%s"
 msgid "All further errors shown only on terminal."
 msgstr "å??ç»­æ??æ??ç??é??误é?½å?ªæ?¾ç¤ºå?¨ç»?端ã??"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
+#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "From"
 msgstr "å??件人"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:72
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Reply-To"
 msgstr "å??å¤?è?³"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2401 ../mail/em-format-html.c:2463
-#: ../mail/em-format-html.c:2486 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2470
+#: ../mail/em-format-html.c:2493 ../modules/mail/em-mailer-prefs.c:76
 msgid "Cc"
 msgstr "æ??é??"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2467
-#: ../mail/em-format-html.c:2489 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2474
+#: ../mail/em-format-html.c:2496 ../modules/mail/em-mailer-prefs.c:77
 msgid "Bcc"
 msgstr "å¯?件æ??é??"
 
-#: ../em-format/em-format-quote.c:422 ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1055
+#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/groupwise-features/notification.ui.h:2
 #: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "主�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:433 ../mail/em-format-html.c:2583
-#: ../modules/mail/em-mailer-prefs.c:1082
+#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2590
+#: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "�件��"
 
-#: ../em-format/em-format-quote.c:514 ../mail/em-composer-utils.c:1367
+#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1141
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转å??ç??ä¿¡æ?¯ --------"
 
 #: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:77 ../widgets/misc/e-dateedit.c:529
+#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
 #: ../widgets/misc/e-dateedit.c:551
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
 msgid "Newsgroups"
 msgstr "���"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "头å??"
 
-#: ../em-format/em-format.c:1453
+#: ../em-format/em-format.c:1455
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??件"
 
-#: ../em-format/em-format.c:1545
+#: ../em-format/em-format.c:1547
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "æ? æ³?解æ?? S/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??误"
 
-#: ../em-format/em-format.c:1727 ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "æ? æ³?解æ?? MIME ä¿¡æ?¯ã??æ?¾ç¤ºæº?æ??æ?¬ã??"
 
-#: ../em-format/em-format.c:1737
+#: ../em-format/em-format.c:1739
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ä¸?æ?¯æ?? multipart/encrypted ç??å? å¯?ç±»å??"
 
-#: ../em-format/em-format.c:1757
+#: ../em-format/em-format.c:1759
 msgid "Could not parse PGP/MIME message"
 msgstr "æ? æ³?解æ?? PGP/MIME ä¿¡æ?¯"
 
-#: ../em-format/em-format.c:1758
+#: ../em-format/em-format.c:1760
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "æ? æ³?解æ?? PGP/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??误"
 
-#: ../em-format/em-format.c:1949
+#: ../em-format/em-format.c:1951
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ??ç??ç­¾å??æ ¼å¼?"
 
-#: ../em-format/em-format.c:1962 ../em-format/em-format.c:2135
+#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
 msgid "Error verifying signature"
 msgstr "æ ¡éª?ç­¾å??é??误"
 
-#: ../em-format/em-format.c:1963 ../em-format/em-format.c:2122
-#: ../em-format/em-format.c:2136
+#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
+#: ../em-format/em-format.c:2138
 msgid "Unknown error verifying signature"
 msgstr "æ ¡éª?ç­¾å??å??ç??äº?æ?ªç?¥é??误"
 
-#: ../em-format/em-format.c:2227
+#: ../em-format/em-format.c:2229
 msgid "Could not parse PGP message: "
 msgstr "æ? æ³?解æ?? PGP ä¿¡æ?¯ï¼?"
 
-#: ../em-format/em-format.c:2233 ../mail/mail-ops.c:621
-#: ../plugins/caldav/caldav-browse-server.c:203
-#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
+#: ../plugins/caldav/caldav-browse-server.c:211
+#: ../plugins/caldav/caldav-browse-server.c:1408 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "æ?ªç?¥é??误"
 
-#: ../filter/e-filter-datespec.c:74
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d å°?æ?¶å??"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d å°?æ?¶å??"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -8913,51 +7678,51 @@ msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d å?¨å??"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d å?¨å??"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 个æ??å??"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d 个æ??å??"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:83
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:122
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<å??å?»æ­¤å¤?以é??æ?©æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:125 ../filter/e-filter-datespec.c:136
-#: ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "ç?°å?¨"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:132
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/e-filter-datespec.c:275
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "é??æ?©ç?¨äº?æ¯?è¾?ç??æ?¶é?´"
 
@@ -8965,62 +7730,62 @@ msgstr "é??æ?©ç?¨äº?æ¯?è¾?ç??æ?¶é?´"
 msgid "Choose a File"
 msgstr "é??æ?©æ??件"
 
-#: ../filter/e-filter-rule.c:663
+#: ../filter/e-filter-rule.c:669
 msgid "R_ule name:"
 msgstr "è§?å??å??(_U)ï¼?"
 
-#: ../filter/e-filter-rule.c:693
+#: ../filter/e-filter-rule.c:699
 msgid "Find items that meet the following conditions"
 msgstr "æ?¥æ?¾ç¬¦å??ä¸?å??æ?¡ä»¶ç??项ç?®"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:724
 msgid "If all conditions are met"
 msgstr "å¦?æ??满足æ??æ??æ?¡ä»¶"
 
-#: ../filter/e-filter-rule.c:719
+#: ../filter/e-filter-rule.c:725
 msgid "If any conditions are met"
 msgstr "å¦?æ??满足任ä¸?æ?¡ä»¶"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:728
 msgid "_Find items:"
 msgstr "��项�(_F)�"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:749
+#: ../filter/e-filter-rule.c:757
 msgid "None"
 msgstr "æ? "
 
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:758
 msgid "All related"
 msgstr "ç?¸å?³ç??å?¨é?¨"
 
-#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "å??å¤?"
 
-#: ../filter/e-filter-rule.c:752
+#: ../filter/e-filter-rule.c:760
 msgid "Replies and parents"
 msgstr "å??å¤?å??å??å§?é?®ä»¶"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:761
 msgid "No reply or parent"
 msgstr "æ? å??å¤?æ??å??å§?é?®ä»¶"
 
-#: ../filter/e-filter-rule.c:756
+#: ../filter/e-filter-rule.c:764
 msgid "I_nclude threads"
 msgstr "å??å?«çº¿ç´¢(_N)"
 
-#: ../filter/e-filter-rule.c:779
+#: ../filter/e-filter-rule.c:789
 msgid "A_dd Condition"
 msgstr "æ·»å? å?¨ä½?(_D)"
 
-#: ../filter/e-filter-rule.c:1126 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:317
 msgid "Incoming"
 msgstr "��"
 
-#: ../filter/e-filter-rule.c:1126 ../mail/em-utils.c:306
+#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
 msgid "Outgoing"
 msgstr "��"
 
@@ -9052,7 +7817,7 @@ msgstr "缺å°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "缺å°?æ??件å??ã??"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:78
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
 msgid "Missing name."
 msgstr "缺å°?å??称ã??"
 
@@ -9102,7 +7867,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr "ä¿¡æ?¯ç??æ?¥æ??å°?ä¼?å?¨è¿?滤æ?§è¡?æ?¶ä¸?å½?å??æ?¶é?´è¿?è¡?æ¯?è¾?ã??"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "è¿?滤è§?å??(_F)"
 
@@ -9139,25 +7904,31 @@ msgstr "æ?¨æ??å®?ç??æ?¶é?´"
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1055 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
+#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
+#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
+#: ../widgets/misc/e-attachment-paned.c:136
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??件"
 
-#: ../mail/e-mail-attachment-bar.c:626
-#: ../widgets/misc/e-attachment-paned.c:617
+#: ../mail/e-mail-attachment-bar.c:633
+#: ../widgets/misc/e-attachment-paned.c:624
 msgid "Icon View"
 msgstr "å?¾æ ?è§?å?¾"
 
-#: ../mail/e-mail-attachment-bar.c:627
-#: ../widgets/misc/e-attachment-paned.c:618
+#: ../mail/e-mail-attachment-bar.c:635
+#: ../widgets/misc/e-attachment-paned.c:626
 msgid "List View"
 msgstr "å??表è§?å?¾"
 
-#: ../mail/e-mail-browser.c:268
+#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1406
+#: ../shell/e-shell-window-actions.c:1413
+#: ../shell/e-shell-window-actions.c:1420
+msgid "Close this window"
+msgstr "��此��"
+
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(æ? 主é¢?)"
 
@@ -9177,12 +7948,12 @@ msgstr "è?ªæ­¤å?°å??(_F)"
 msgid "Create Search _Folder"
 msgstr "å??建æ??ç´¢æ??件夹(_F)"
 
-#: ../mail/e-mail-folder-utils.c:102 ../mail/mail-ops.c:941
+#: ../mail/e-mail-folder-utils.c:88
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "æ??ä¿¡æ?¯ä¿?å­?å?°æ??件夹 %s 中"
 
-#: ../mail/e-mail-label-dialog.c:222
+#: ../mail/e-mail-label-dialog.c:225
 msgid "_Label name:"
 msgstr "æ ?ç­¾å??称(_L)ï¼?"
 
@@ -9211,7 +7982,7 @@ msgid "_Later"
 msgstr "ç¨?å??(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:692
+#: ../modules/mail/e-mail-shell-view-actions.c:616
 msgid "Add Label"
 msgstr "æ·»å? æ ?ç­¾"
 
@@ -9231,55 +8002,62 @@ msgstr "��"
 
 #: ../mail/e-mail-label-tree-view.c:96
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/caldav/caldav-browse-server.c:1297
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "å§?å??"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:284
-#: ../mail/em-folder-tree-model.c:753 ../mail/em-folder-tree.c:2934
-#: ../modules/mail/e-mail-shell-view-private.c:1096
+#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
+#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../modules/mail/e-mail-shell-view-private.c:1110
 msgid "Inbox"
 msgstr "�件箱"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:745
+#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1007
+#: ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1097
 msgid "Drafts"
 msgstr "è??稿"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:757
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
+#: ../modules/mail/e-mail-shell-view-private.c:1101
 msgid "Outbox"
 msgstr "å??件箱"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:759
+#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:1000
+#: ../mail/em-folder-tree-model.c:772
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 msgid "Sent"
 msgstr "å·²å??ç®±"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:748
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1105
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:580
+#: ../plugins/templates/templates.c:581
 msgid "Templates"
 msgstr "模�"
 
-#: ../mail/e-mail-migrate.c:132
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "æ­£å?¨å??è¿?..."
 
-#: ../mail/e-mail-migrate.c:165
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "�移"
 
-#: ../mail/e-mail-migrate.c:205
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "å??è¿?â??%sâ??ï¼?"
 
-#: ../mail/e-mail-migrate.c:658
+#: ../mail/e-mail-migrate.c:657
 msgid "Migrating Folders"
 msgstr "è¿?移æ??件夹"
 
-#: ../mail/e-mail-migrate.c:659
+#: ../mail/e-mail-migrate.c:658
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9290,50 +8068,62 @@ msgstr ""
 "\n"
 "请ç¨?å??ï¼?Evolution æ­£å?¨å??è¿?æ?¨ç??æ??件夹..."
 
-#: ../mail/e-mail-migrate.c:816
+#: ../mail/e-mail-migrate.c:1147
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "æ? æ³?å?¨â??%sâ??å??建æ?¬å?°é?®ä»¶æ??件夹ï¼?%s"
 
-#: ../mail/e-mail-notebook-view.c:563
+#: ../mail/e-mail-notebook-view.c:565
 msgid "Please select a folder"
 msgstr "请é??æ?©ä¸?个æ??件夹"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:112
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../mail/e-mail-reader-utils.c:111
+#: ../modules/calendar/e-task-shell-view-actions.c:576
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??次询é?®"
 
-#: ../mail/e-mail-reader.c:289 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "å¤?å?¶å?°æ??件夹"
 
-#: ../mail/e-mail-reader.c:289 ../mail/em-folder-utils.c:415
+#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "��(_O)"
 
-#: ../mail/e-mail-reader.c:791 ../mail/em-filter-i18n.h:51
+#. Translators: %s is replaced with a folder name
+#. %d with count of duplicate messages.
+#: ../mail/e-mail-reader.c:510
+#, c-format
+msgid ""
+"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] "â??%sâ??æ??件夹中å??å?« %d æ?¡é??å¤?ä¿¡æ?¯ã??æ?¨ç¡®å®?æ?³å? é?¤å??ï¼?"
+
+#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "移è?³æ??件夹"
 
-#: ../mail/e-mail-reader.c:791 ../mail/em-folder-utils.c:415
+#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "移�(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:1060 ../mail/e-mail-reader.c:1180
-#: ../mail/e-mail-reader.c:1221
+#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1446
 msgid "_Do not ask me again."
 msgstr "ä¸?å??询é?®(_D)ã??"
 
-#: ../mail/e-mail-reader.c:1226
+#: ../mail/e-mail-reader.c:1451
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ?»æ?¯å¿½ç?¥å¯¹äº?é?®ä»¶å??表ç??â??å??å¤?è?³â??å??(_A)ã??"
 
-#: ../mail/e-mail-reader.c:1319
+#: ../mail/e-mail-reader.c:1558
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ä¿?å­?ä¿¡æ?¯"
@@ -9344,642 +8134,665 @@ msgstr[0] "ä¿?å­?ä¿¡æ?¯"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1340
+#: ../mail/e-mail-reader.c:1579
 #: ../plugins/groupwise-features/notification.ui.h:1
 #: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1853
 msgid "A_dd Sender to Address Book"
 msgstr "å°?å??件人添å? å?°å?°å??ç°¿(_D)"
 
-#: ../mail/e-mail-reader.c:1622
+#: ../mail/e-mail-reader.c:1855
 msgid "Add sender to address book"
 msgstr "å°?å??件人添å? å?°å?°å??ç°¿"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1860
 msgid "Check for _Junk"
 msgstr "æ£?æ?¥å??å?¾ä¿¡æ?¯(_J)"
 
-#: ../mail/e-mail-reader.c:1629
+#: ../mail/e-mail-reader.c:1862
 msgid "Filter the selected messages for junk status"
 msgstr "æ??é??中ç??ä¿¡æ?¯æ ?记为å??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1867
 msgid "_Copy to Folder..."
 msgstr "å¤?å?¶å?°æ??件夹(_C)..."
 
-#: ../mail/e-mail-reader.c:1636
+#: ../mail/e-mail-reader.c:1869
 msgid "Copy selected messages to another folder"
 msgstr "æ??é??中ç??ä¿¡æ?¯å¤?å?¶å?°å?¶å®?æ??件夹"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:1874
 msgid "_Delete Message"
 msgstr "å? é?¤ä¿¡æ?¯(_D)"
 
-#: ../mail/e-mail-reader.c:1643
+#: ../mail/e-mail-reader.c:1876
 msgid "Mark the selected messages for deletion"
 msgstr "为é??中信æ?¯å??å? é?¤æ ?è®°"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:1881
 msgid "Filter on Mailing _List..."
 msgstr "æ ¹æ?®é?®ä»¶å??表è¿?滤(_L)..."
 
-#: ../mail/e-mail-reader.c:1650
+#: ../mail/e-mail-reader.c:1883
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "å??建å?¯è¿?滤å¯?å¾?æ­¤é?®ä»¶å??表ç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:1888
 msgid "Filter on _Recipients..."
 msgstr "æ ¹æ?®æ?¶ä»¶äººè¿?滤(_R)..."
 
-#: ../mail/e-mail-reader.c:1657
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a rule to filter messages to these recipients"
 msgstr "å??建å?¯è¿?滤å¯?å¾?è¿?äº?æ?¶ä»¶äººç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1895
 msgid "Filter on Se_nder..."
 msgstr "æ ¹æ?®å??件人è¿?滤(_N)..."
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a rule to filter messages from this sender"
 msgstr "å??建å?¯è¿?滤此人å¯?æ?¥ç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:1902
 msgid "Filter on _Subject..."
 msgstr "æ ¹æ?®ä¸»é¢?è¿?滤(_S)..."
 
-#: ../mail/e-mail-reader.c:1671
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a rule to filter messages with this subject"
 msgstr "å??建å?¯è¿?滤此主é¢?ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:1909
 msgid "A_pply Filters"
 msgstr "åº?ç?¨è¿?滤è§?å??(_P)"
 
-#: ../mail/e-mail-reader.c:1678
+#: ../mail/e-mail-reader.c:1911
 msgid "Apply filter rules to the selected messages"
 msgstr "åº?ç?¨è¿?滤è§?å??å?°é??中ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:1916
 msgid "_Find in Message..."
 msgstr "�信�中��(_F)..."
 
-#: ../mail/e-mail-reader.c:1685
+#: ../mail/e-mail-reader.c:1918
 msgid "Search for text in the body of the displayed message"
 msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??主ä½?中æ??ç´¢æ??æ?¬"
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:1923
 msgid "_Clear Flag"
 msgstr "æ¸?é?¤æ ?å¿?(_C)"
 
-#: ../mail/e-mail-reader.c:1692
+#: ../mail/e-mail-reader.c:1925
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "å? é?¤é??中信æ?¯ç??è·?é??æ ?å¿?"
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:1930
 msgid "_Flag Completed"
 msgstr "æ ?å¿?为已å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1699
+#: ../mail/e-mail-reader.c:1932
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "设置é??中信æ?¯ç??è·?é??æ ?å¿?为已å®?æ??"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:1937
 msgid "Follow _Up..."
 msgstr "è·?é??(_U)..."
 
-#: ../mail/e-mail-reader.c:1706
+#: ../mail/e-mail-reader.c:1939
 msgid "Flag the selected messages for follow-up"
 msgstr "为é??中信æ?¯æ·»å? è·?é??æ ?å¿?"
 
-#: ../mail/e-mail-reader.c:1711
+#: ../mail/e-mail-reader.c:1944
 msgid "_Attached"
 msgstr "é??件(_A)"
 
-#: ../mail/e-mail-reader.c:1713 ../mail/e-mail-reader.c:1720
+#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
 msgid "Forward the selected message to someone as an attachment"
 msgstr "æ??é??中信æ?¯ä½?为é??件转å??ç»?æ??人"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:1951
 msgid "Forward As _Attached"
 msgstr "ä½?为é??件转å??(_A)"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:1958
 msgid "_Inline"
 msgstr "åµ?å?¥(_I)"
 
-#: ../mail/e-mail-reader.c:1727 ../mail/e-mail-reader.c:1734
+#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
 msgid "Forward the selected message in the body of a new message"
 msgstr "å?¨æ?°ä¿¡ä½?中转å??é??中信æ?¯"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1965
 msgid "Forward As _Inline"
 msgstr "åµ?å?¥æ­£æ??转å??(_I)"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:1972
 msgid "_Quoted"
 msgstr "å¼?ç?¨(_Q)"
 
-#: ../mail/e-mail-reader.c:1741 ../mail/e-mail-reader.c:1748
+#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似äº?å??å¤?ç??å¼?ç?¨æ?¹å¼?转å??é??中ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:1979
 msgid "Forward As _Quoted"
 msgstr "ä½?æ??å¼?ç?¨è½¬å??(_Q)"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:1986
 msgid "_Load Images"
 msgstr "è½½å?¥å?¾å??(_L)"
 
-#: ../mail/e-mail-reader.c:1755
+#: ../mail/e-mail-reader.c:1988
 msgid "Force images in HTML mail to be loaded"
 msgstr "强å?¶è½½å?¥ HTML é?®ä»¶ä¸­ç??å?¾å??"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:1993
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1762
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages as important"
 msgstr "æ??é??中信æ?¯æ ?记为é??è¦?é?®ä»¶"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:2000
 msgid "_Junk"
 msgstr "å??å?¾(_J)"
 
-#: ../mail/e-mail-reader.c:1769
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark the selected messages as junk"
 msgstr "æ??é??中信æ?¯æ ?记为å??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:2007
 msgid "_Not Junk"
 msgstr "é??å??å?¾(_N)"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:2009
 msgid "Mark the selected messages as not being junk"
 msgstr "æ??é??中信æ?¯æ ?记为é??å??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:2014
 msgid "_Read"
 msgstr "读å??(_R)"
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:2016
 msgid "Mark the selected messages as having been read"
 msgstr "æ??é??中信æ?¯æ ?记为已读"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:2021
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:2023
 msgid "Mark the selected messages as unimportant"
 msgstr "æ??é??中信æ?¯æ ?记为ä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:2028
 msgid "_Unread"
 msgstr "�读(_U)"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:2030
 msgid "Mark the selected messages as not having been read"
 msgstr "æ??é??中信æ?¯æ ?记为æ?ªè¯»"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:2035
 msgid "_Edit as New Message..."
 msgstr "�为�信�����(_E)..."
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:2037
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨ç¼?è¾?å?¨ä¸­æ??å¼?é??中ç??ä¿¡æ?¯ä»¥ä¾¿ç¼?è¾?"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:2042
 msgid "Compose _New Message"
 msgstr "æ?°å??æ?°ä¿¡æ?¯(_N)"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:2044
 msgid "Open a window for composing a mail message"
 msgstr "æ??å¼?çª?å?£ä»¥æ?°å??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:2049
 msgid "_Open in New Window"
 msgstr "å?¨æ?°çª?å?£ä¸­æ??å¼?(_O)"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:2051
 msgid "Open the selected messages in a new window"
 msgstr "å?¨æ?°çª?å?£ä¸­æ??å¼?é??中ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:2056
 msgid "_Move to Folder..."
 msgstr "移è?³æ??件夹(_M)..."
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:2058
 msgid "Move selected messages to another folder"
 msgstr "æ??é??中ç??ä¿¡æ?¯ç§»è?³å?¶å®?æ??件夹"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:2063
 msgid "_Switch to Folder"
 msgstr "å??æ?¢å?°æ??件夹(_S)"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:2065
 msgid "Display the parent folder"
 msgstr "æ?¾ç¤ºä¸?å±?æ??件夹"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:2070
 msgid "Switch to _next tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?个æ ?ç­¾(_N)"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:2072
 msgid "Switch to the next tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?个æ ?ç­¾"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:2077
 msgid "Switch to _previous tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?个æ ?ç­¾(_P)"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:2079
 msgid "Switch to the previous tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?个æ ?ç­¾"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:2084
 msgid "Cl_ose current tab"
 msgstr "å?³é?­å½?å??æ ?ç­¾(_O)"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:2086
 msgid "Close current tab"
 msgstr "å?³é?­å½?å??æ ?ç­¾"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2091
 msgid "_Next Message"
 msgstr "���信(_N)"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:2093
 msgid "Display the next message"
 msgstr "�示���信�"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:2098
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_I)"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:2100
 msgid "Display the next important message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2105
 msgid "Next _Thread"
 msgstr "���线索(_T)"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:2107
 msgid "Display the next thread"
 msgstr "�示���线索"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:2112
 msgid "Next _Unread Message"
 msgstr "����读信�(_U)"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the next unread message"
 msgstr "�示����读信�"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2119
 msgid "_Previous Message"
 msgstr "���信(_P)"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:2121
 msgid "Display the previous message"
 msgstr "�示���信�"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2126
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_E)"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:2128
 msgid "Display the previous important message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2133
+msgid "Previous T_hread"
+msgstr "���线索(_H)"
+
+#: ../mail/e-mail-reader.c:2135
+msgid "Display the previous thread"
+msgstr "�示���线索"
+
+#: ../mail/e-mail-reader.c:2140
 msgid "P_revious Unread Message"
 msgstr "����读信�(_R)"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:2142
 msgid "Display the previous unread message"
 msgstr "�示����读信�"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2149
 msgid "Print this message"
 msgstr "æ??å?°è¯¥ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:2156
 msgid "Preview the message to be printed"
 msgstr "é¢?è§?è¦?æ??å?°ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2161
 msgid "Re_direct"
 msgstr "é??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2163
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é??中信æ?¯é??å??(é??å??)ç»?æ??人"
 
-#: ../mail/e-mail-reader.c:1928 ../mail/mail.error.xml.h:97
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:156
+#: ../mail/e-mail-reader.c:2168
+msgid "Remo_ve Attachments"
+msgstr "移é?¤é??件(_V)"
+
+#: ../mail/e-mail-reader.c:2170
+msgid "Remove attachments"
+msgstr "移é?¤é??件"
+
+#: ../mail/e-mail-reader.c:2175
+msgid "Remove Du_plicate Messages"
+msgstr "移é?¤é??å¤?ç??ä¿¡æ?¯(_P)"
+
+#: ../mail/e-mail-reader.c:2177
+msgid "Checks selected messages for duplicates"
+msgstr "æ£?æ?¥æ??é??ä¿¡æ?¯ä¸­ç??é??å¤?ä¿¡æ?¯ï¼?"
+
+#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:102
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "å??å¤?æ??æ??人(_A)"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2184
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "为é??中信æ?¯ç??æ??æ??æ?¶ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:1935 ../mail/mail.error.xml.h:98
+#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "å??å¤?é?®ä»¶å??表(_L)"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2191
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为é??中信æ?¯ç??é?®ä»¶å??表æ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:1942
-#: ../modules/mail/e-mail-attachment-handler.c:163
+#: ../mail/e-mail-reader.c:2196
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "å??å¤?å??件人(_R)"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2198
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为é??中信æ?¯ç??å??件人æ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2203
 msgid "_Save as mbox..."
 msgstr "å?¦å­?为 mbox æ ¼å¼?(_S)..."
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2205
 msgid "Save selected messages as an mbox file"
 msgstr "æ??é??中信æ?¯å?¦å­?为 mbox æ ¼å¼?æ??件"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2210
 msgid "Search Folder from Mailing _List..."
 msgstr "å?ºäº?é?®ä»¶å??表ç??æ??ç´¢æ??件夹(_L)..."
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2212
 msgid "Create a search folder for this mailing list"
 msgstr "为此é?®ä»¶å??表å??建æ??ç´¢æ??件夹"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2217
 msgid "Search Folder from Recipien_ts..."
 msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??件夹(_T)..."
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2219
 msgid "Create a search folder for these recipients"
 msgstr "为è¿?äº?æ?¶ä»¶äººå??建æ??ç´¢æ??件夹"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2224
 msgid "Search Folder from Sen_der..."
 msgstr "å?ºäº?å??件人ç??æ??ç´¢æ??件夹(_D)..."
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2226
 msgid "Create a search folder for this sender"
 msgstr "为该å??件人å??建æ??ç´¢æ??件夹"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2231
 msgid "Search Folder from S_ubject..."
 msgstr "å?ºäº?主é¢?ç??æ??ç´¢æ??件夹(_U)..."
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2233
 msgid "Create a search folder for this subject"
 msgstr "为该主é¢?å??建æ??ç´¢æ??件夹"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2238
 msgid "_Message Source"
 msgstr "ä¿¡æ?¯æº?代ç ?(_M)"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2240
 msgid "Show the raw email source of the message"
 msgstr "æ?¾ç¤ºä¿¡æ?¯ç??å??å§?é?®ä»¶æº?代ç ?"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2252
 msgid "_Undelete Message"
 msgstr "å??æ¶?å? é?¤ä¿¡æ?¯(_U)"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2254
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?é??中信æ?¯ç??å? é?¤"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2259
 msgid "_Normal Size"
 msgstr "æ?®é??大å°?(_N)"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2261
 msgid "Reset the text to its original size"
 msgstr "æ??æ??æ?¬é??æ?°è®¾ç½®ä¸ºå??æ?¥ç??大å°?"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2266
 msgid "_Zoom In"
 msgstr "�大(_Z)"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2268
 msgid "Increase the text size"
 msgstr "å¢?å? æ??æ?¬å¤§å°?"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2273
 msgid "Zoom _Out"
 msgstr "缩�(_O)"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2275
 msgid "Decrease the text size"
 msgstr "å??å°?æ??æ?¬å¤§å°?"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2282
 msgid "Create R_ule"
 msgstr "å??建è§?å??(_U)"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2289
 msgid "Ch_aracter Encoding"
 msgstr "å­?符ç¼?ç ?(_A)"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2296
 msgid "F_orward As"
 msgstr "转å??为(_O)"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2303
 msgid "_Group Reply"
 msgstr "å??å¤?å?¨é?¨(_G)"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2310
 msgid "_Go To"
 msgstr "转�(_G)"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2317
 msgid "Mar_k As"
 msgstr "æ ?记为(_K)"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2324
 msgid "_Message"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2331
 msgid "_Zoom"
 msgstr "缩�(_Z)"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark for Follo_w Up..."
 msgstr "æ ?记为è·?é??(_W)..."
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as _Important"
 msgstr "æ ?记为é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Junk"
 msgstr "æ ?记为å??å?¾(_J)"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2372
 msgid "Mark as _Not Junk"
 msgstr "æ ?记为é??å??å?¾(_N)"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2376
 msgid "Mar_k as Read"
 msgstr "æ ?记为已读(_K)"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2380
 msgid "Mark as Uni_mportant"
 msgstr "æ ?记为ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2384
 msgid "Mark as _Unread"
 msgstr "æ ?记为æ?ªè¯»(_U)"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2428
 msgid "_Caret Mode"
 msgstr "å??æ ?模å¼?(_C)"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2430
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??ä¿¡ä½?中æ?¾ç¤ºé?ªç??å??æ ?"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2436
 msgid "All Message _Headers"
 msgstr "��信头(_H)"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2438
 msgid "Show messages with all email headers"
 msgstr "æ?¾ç¤ºä¿¡æ?¯æ?¶æ?¾ç¤ºæ??æ??信头"
 
-#: ../mail/e-mail-reader.c:2401
+#: ../mail/e-mail-reader.c:2670
 msgid "Unable to retrieve message"
 msgstr "æ? æ³?è?·å??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2461 ../mail/mail-ops.c:1955
+#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æ?¶å??ä¿¡æ?¯ %s"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3031 ../mail/mail-config.ui.h:29
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:537
-#: ../plugins/google-account-setup/google-source.c:659
-#: ../widgets/misc/e-account-tree-view.c:240
+#: ../mail/e-mail-reader.c:3344 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:538
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "�认"
 
-#: ../mail/e-mail-reader.c:3181
-#: ../modules/mail/e-mail-attachment-handler.c:149
+#: ../mail/e-mail-reader.c:3524
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "转å??(_F)"
 
-#: ../mail/e-mail-reader.c:3182
+#: ../mail/e-mail-reader.c:3525
 msgid "Forward the selected message to someone"
 msgstr "æ??é??中信æ?¯è½¬å??ç»?æ??人"
 
-#: ../mail/e-mail-reader.c:3201
+#: ../mail/e-mail-reader.c:3544
 msgid "Group Reply"
 msgstr "å??å¤?å?¨é?¨"
 
-#: ../mail/e-mail-reader.c:3202
+#: ../mail/e-mail-reader.c:3545
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "为é??中信æ?¯ç??é?®ä»¶å??表æ??å?¨é?¨æ?¶ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:3247 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "å? é?¤"
 
-#: ../mail/e-mail-reader.c:3280
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../mail/e-mail-reader.c:3623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "��项"
 
-#: ../mail/e-mail-reader.c:3284
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../mail/e-mail-reader.c:3627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "��项"
 
-#: ../mail/e-mail-reader.c:3294 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "å??å¤?"
 
-#: ../mail/e-mail-reader.c:3866
+#: ../mail/e-mail-reader.c:4274
 #, c-format
 msgid "Folder '%s'"
 msgstr "æ??件夹 %s"
 
-#: ../mail/e-mail-session.c:594
+#: ../mail/e-mail-session.c:647
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è¾?å?¥ %s ç??å¯?ç ?"
 
-#: ../mail/e-mail-session.c:596
+#: ../mail/e-mail-session.c:649
 msgid "Enter Passphrase"
 msgstr "è¾?å?¥å¯?ç ?"
 
-#: ../mail/e-mail-session.c:599
+#: ../mail/e-mail-session.c:652
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s è¾?å?¥å¯?ç ?"
 
-#: ../mail/e-mail-session.c:601
+#: ../mail/e-mail-session.c:654
 msgid "Enter Password"
 msgstr "è¾?å?¥å¯?ç ?"
 
-#: ../mail/e-mail-session.c:646
+#: ../mail/e-mail-session.c:702
 #, c-format
 msgid "User canceled operation."
 msgstr "ç?¨æ?·å·±å??æ¶?æ??ä½?ã??"
 
-#: ../mail/e-mail-session.c:809
+#: ../mail/e-mail-session.c:870
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "缺å°?å??é??ç?®æ ?å?°å??ï¼?ä¿¡æ?¯è½¬å??被å??æ¶?ã??"
 
-#: ../mail/e-mail-session.c:818
+#: ../mail/e-mail-session.c:879
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ? å?¯ç?¨å¸?å?·ï¼?ä¿¡æ?¯è½¬å??被å??æ¶?ã??"
 
-#: ../mail/e-mail-session.c:1181 ../mail/mail-ops.c:1300
+#: ../mail/e-mail-session.c:1268 ../mail/mail-ops.c:1220
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "æ??å¼?æ??件夹 %s"
 
-#: ../mail/e-mail-session.c:1197
+#: ../mail/e-mail-session.c:1284
 #, c-format
-#| msgid "Invalid folder: '%s'"
 msgid "Invalid folder: %s"
 msgstr "æ? æ??ç??æ??件夹ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:479 ../mail/mail-ops.c:602
+#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "�����滤�失败�%s"
 
-#: ../mail/e-mail-session-utils.c:503 ../mail/e-mail-session-utils.c:537
-#: ../mail/mail-ops.c:619 ../mail/mail-ops.c:650
+#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
+#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9988,23 +8801,38 @@ msgstr ""
 "追å? å?° %sï¼?%s 失败\n"
 "转è??追å? å?°æ?¬å?°â??å·²å??â??æ??件夹ã??"
 
-#: ../mail/e-mail-session-utils.c:557 ../mail/mail-ops.c:670
+#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "追å? å?°æ?¬å?°â??å·²å??â??æ??件夹失败ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:822 ../mail/mail-ops.c:769
-#: ../mail/mail-ops.c:862
+#: ../mail/e-mail-session-utils.c:765 ../mail/mail-ops.c:774
+#: ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "å??é??ä¿¡æ?¯"
 
-#: ../mail/e-mail-tag-editor.c:291
+#: ../mail/e-mail-session-utils.c:836
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "æ­£å?¨é??订æ??件夹â??%sâ??"
+
+#: ../mail/e-mail-store-utils.c:39
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "æ?­å¼?ä¸? %s ç??è¿?æ?¥"
+
+#: ../mail/e-mail-store-utils.c:130
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "é??æ?°è¿?æ?¥å?° %s"
+
+#: ../mail/e-mail-tag-editor.c:295
 msgid "Flag to Follow Up"
 msgstr "è·?é??ç??æ ?å¿?"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:566 ../mail/mail-config.ui.h:67
+#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "ä¸?å? å¯?"
@@ -10012,7 +8840,7 @@ msgstr "ä¸?å? å¯?"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:570 ../mail/mail-config.ui.h:121
+#: ../mail/em-account-editor.c:571 ../mail/mail-config.ui.h:124
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS å? å¯?"
@@ -10020,57 +8848,40 @@ msgstr "TLS å? å¯?"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:574 ../mail/mail-config.ui.h:89
+#: ../mail/em-account-editor.c:575 ../mail/mail-config.ui.h:91
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL å? å¯?"
 
-#: ../mail/em-account-editor.c:661
-#, c-format
-msgid "%s License Agreement"
-msgstr "%s 许å?¯å??è®®"
-
-#: ../mail/em-account-editor.c:668
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"请ä»?ç»?é??读ä¸?æ?¹æ?¾ç¤ºç?? %s 许å?¯å??è®®\n"
-"并é??中å¤?é??æ¡?表æ??æ?¨æ?¥å??该å??è®®\n"
-
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:955 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:843 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ? "
 
-#: ../mail/em-account-editor.c:1039
+#: ../mail/em-account-editor.c:924
 msgid "Never"
 msgstr "��"
 
-#: ../mail/em-account-editor.c:1040
+#: ../mail/em-account-editor.c:925
 msgid "Always"
 msgstr "��"
 
-#: ../mail/em-account-editor.c:1041
+#: ../mail/em-account-editor.c:926
 msgid "Ask for each message"
 msgstr "��信��询�"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1824 ../widgets/misc/e-account-tree-view.c:128
+#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ? "
 
-#: ../mail/em-account-editor.c:2205
+#: ../mail/em-account-editor.c:2092
 msgid "Mail Configuration"
 msgstr "é?®ä»¶é??ç½®"
 
-#: ../mail/em-account-editor.c:2206
+#: ../mail/em-account-editor.c:2093
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10080,7 +8891,7 @@ msgstr ""
 "\n"
 "å??å?»â??å??è¿?â??å¼?å§?ã??"
 
-#: ../mail/em-account-editor.c:2209
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -10089,19 +8900,19 @@ msgstr ""
 "请å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å§?å??å??ç?µå­?é?®ä»¶å?°å??ã??ä¸?é?¢ç??â??å?¯é??â??å??ä¸?å¿?å¡«å?¥ï¼?é?¤é??æ?¨æ?³è¦?å?¨æ?¨å??"
 "å?ºç??é?®ä»¶ä¸­å??å?«æ­¤ä¿¡æ?¯ã??"
 
-#: ../mail/em-account-editor.c:2211 ../mail/em-account-editor.c:2373
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2260
 msgid "Receiving Email"
 msgstr "�����件"
 
-#: ../mail/em-account-editor.c:2212
+#: ../mail/em-account-editor.c:2099
 msgid "Please configure the following account settings."
 msgstr "请é??ç½®ä¸?å??å¸?å?·è®¾ç½®ã??"
 
-#: ../mail/em-account-editor.c:2214 ../mail/em-account-editor.c:2861
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2759
 msgid "Sending Email"
 msgstr "å??é??ç?µå­?é?®ä»¶"
 
-#: ../mail/em-account-editor.c:2215
+#: ../mail/em-account-editor.c:2102
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10109,11 +8920,11 @@ msgstr ""
 "请å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å??件æ??å?¡å?¨ä¿¡æ?¯ã??å¦?æ??æ?¨ä¸?太确å®?ç??è¯?ï¼?请询é?®æ?¨ç??ç³»ç»?管ç??å??æ??è??"
 "äº?è??ç½?æ??å?¡æ??ä¾?å??ISPã??"
 
-#: ../mail/em-account-editor.c:2217
+#: ../mail/em-account-editor.c:2104
 msgid "Account Management"
 msgstr "å¸?å?·ç®¡ç??"
 
-#: ../mail/em-account-editor.c:2218
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10121,11 +8932,11 @@ msgstr ""
 "请å?¨ä¸?é?¢ç??空ç?½å¤?è¾?å?¥æ­¤å¸?å?·ç??æ??è¿°æ?§å??称ã??\n"
 "æ­¤å??称å°?å?ªå?¨æ?¾ç¤ºæ?¶ä½¿ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2222
+#: ../mail/em-account-editor.c:2109
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2223
+#: ../mail/em-account-editor.c:2110
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10139,72 +8950,72 @@ msgstr ""
 "\n"
 "å??å?»â??åº?ç?¨â??å?¯ä¿?å­?æ?¨ç??设置ã??"
 
-#: ../mail/em-account-editor.c:2675
+#: ../mail/em-account-editor.c:2573
 msgid "Check for _new messages every"
 msgstr "è?ªå?¨æ£?æ?¥æ?°ä¿¡æ?¯ç??é?´é??(_N)"
 
-#: ../mail/em-account-editor.c:2683
+#: ../mail/em-account-editor.c:2581
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2965
+#: ../mail/em-account-editor.c:2863
 msgid "Please select a folder from the current account."
 msgstr "请ä»?å½?å??å¸?å?·é??æ?©ä¸?个æ??件夹ã??"
 
-#: ../mail/em-account-editor.c:3274 ../mail/mail-config.ui.h:96
+#: ../mail/em-account-editor.c:3172 ../mail/mail-config.ui.h:98
 msgid "Security"
 msgstr "å®?å?¨"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3319 ../mail/em-account-editor.c:3387
+#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é??项"
 
-#: ../mail/em-account-editor.c:3320 ../mail/em-account-editor.c:3388
+#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
 msgid "Checking for New Messages"
 msgstr "���信�"
 
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see mail/em-composer-utils.c:attribvars array
+#: ../mail/em-composer-utils.c:1136
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"å?¨ ${Year}-${Month}-${Day}${AbbrevWeekdayName}ç?? ${24Hour}:${Minute} "
+"${TimeZone}ï¼?${Sender}å??é??ï¼?"
+
+#: ../mail/em-composer-utils.c:1146
+msgid "-----Original Message-----"
+msgstr "-------- å??å§?ä¿¡æ?¯ --------"
+
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1818
+#: ../mail/em-composer-utils.c:1804
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "æ?¨å?¨ %3$s ä¸?ç»? %1$s å??é??ç??å?³äº?â??%2$sâ??ç??ä¿¡æ?¯å·²è¢«é??读ã??"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1868
+#: ../mail/em-composer-utils.c:1854
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é?®ä»¶é??ç?¥ï¼?%s"
 
-#: ../mail/em-composer-utils.c:2279
+#: ../mail/em-composer-utils.c:2272
 msgid "an unknown sender"
 msgstr "æ?ªç?¥å??件人"
 
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2326
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"å?¨ ${Year}-${Month}-${Day}${AbbrevWeekdayName}ç?? ${24Hour}:${Minute} "
-"${TimeZone}ï¼?${Sender}å??é??ï¼?"
-
-#: ../mail/em-composer-utils.c:2470
-msgid "-----Original Message-----"
-msgstr "-------- å??å§?ä¿¡æ?¯ --------"
-
-#: ../mail/em-composer-utils.c:2691
+#: ../mail/em-composer-utils.c:2696
 msgid "Posting destination"
 msgstr "æ??é??ç?®ç??"
 
-#: ../mail/em-composer-utils.c:2692
+#: ../mail/em-composer-utils.c:2697
 msgid "Choose folders to post the message to."
 msgstr "é??æ?©è¦?å°?ä¿¡æ?¯æ??é??å?°å?ªä¸ªæ??件夹ã??"
 
-#: ../mail/em-filter-folder-element.c:333
+#: ../mail/em-filter-folder-element.c:337
 msgid "Select Folder"
 msgstr "é??æ?©æ??件夹"
 
@@ -10321,7 +9132,7 @@ msgstr "�设置"
 msgid "is set"
 msgstr "已设置"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:58
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
 msgid "Junk"
 msgstr "å??å?¾"
 
@@ -10451,38 +9262,38 @@ msgid "Unset Status"
 msgstr "å??æ¶?ç?¶æ??"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:533
+#: ../mail/em-filter-rule.c:539
 msgid "Then"
 msgstr "ç?¶å??"
 
-#: ../mail/em-filter-rule.c:564
+#: ../mail/em-filter-rule.c:570
 msgid "Add Ac_tion"
 msgstr "æ·»å? å?¨ä½?(_T)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:125
+#: ../mail/em-folder-properties.c:124
 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:129
+#: ../mail/em-folder-properties.c:128
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "�信���"
 
-#: ../mail/em-folder-properties.c:147
+#: ../mail/em-folder-properties.c:146
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "é??é¢?使ç?¨(%s)ï¼?"
 
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage"
 msgstr "é??é¢?使ç?¨"
 
-#: ../mail/em-folder-properties.c:289
+#: ../mail/em-folder-properties.c:290
 msgid "Folder Properties"
 msgstr "æ??件夹å±?æ?§"
 
@@ -10499,160 +9310,155 @@ msgid "Folder _name:"
 msgstr "æ??件夹å??称(_N)ï¼?"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:150 ../mail/em-folder-tree-model.c:153
-#: ../mail/em-folder-tree-model.c:159 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:168 ../mail/em-folder-tree-model.c:170
-#: ../mail/mail-vfolder.c:1113 ../mail/mail-vfolder.c:1185
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
 msgid "Search Folders"
 msgstr "æ??ç´¢æ??件夹"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:175 ../mail/em-folder-tree-model.c:177
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "ä¸?å?¹é??"
 
-#: ../mail/em-folder-tree-model.c:823 ../mail/em-folder-tree-model.c:1100
+#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "正�载�..."
 
-#: ../mail/em-folder-tree.c:200
+#: ../mail/em-folder-tree.c:201
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "å?¨â??%sâ??中æ?«æ??æ??件夹"
 
-#: ../mail/em-folder-tree.c:624
+#: ../mail/em-folder-tree.c:629
 msgid "Folder names cannot contain '/'"
 msgstr "æ??件夹å??ä¸?è?½å?«æ??å­?符â??/â??"
 
-#: ../mail/em-folder-tree.c:1162
+#: ../mail/em-folder-tree.c:1191
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1401
+#: ../mail/em-folder-tree.c:1427
 msgid "Mail Folder Tree"
 msgstr "é?®ä»¶æ??件夹æ ?"
 
-#: ../mail/em-folder-tree.c:1737 ../mail/em-folder-utils.c:91
+#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "移å?¨æ??件夹â??%sâ??"
 
-#: ../mail/em-folder-tree.c:1741 ../mail/em-folder-utils.c:93
+#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "å¤?å?¶æ??件夹 %s"
 
-#: ../mail/em-folder-tree.c:1750 ../mail/message-list.c:2176
+#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ??ä¿¡æ?¯ç§»è?³æ??件夹 %s"
 
-#: ../mail/em-folder-tree.c:1754 ../mail/message-list.c:2178
+#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ??ä¿¡æ?¯å¤?å?¶å?°æ??件夹 %s"
 
-#: ../mail/em-folder-tree.c:1771
+#: ../mail/em-folder-tree.c:1824
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "æ? æ³?å°?ä¿¡æ?¯æ?¾å?°é¡¶çº§æ??件夹å­?å?¨"
 
-#: ../mail/em-folder-utils.c:416
+#: ../mail/em-folder-utils.c:422
 msgid "Move Folder To"
 msgstr "移å?¨æ??件夹å?°"
 
-#: ../mail/em-folder-utils.c:416
+#: ../mail/em-folder-utils.c:422
 msgid "Copy Folder To"
 msgstr "å¤?å?¶æ??件夹å?°"
 
-#: ../mail/em-folder-utils.c:546
+#: ../mail/em-folder-utils.c:571
 #: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "å??建æ??件夹â??%sâ??"
 
-#: ../mail/em-folder-utils.c:724
+#: ../mail/em-folder-utils.c:745
 msgid "Create Folder"
 msgstr "å??建æ??件夹"
 
-#: ../mail/em-folder-utils.c:725
+#: ../mail/em-folder-utils.c:746
 #: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:355
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?å?¨å?ªé??å??建æ??件夹ï¼?"
 
-#: ../mail/em-folder-utils.c:746
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "æ? æ³?é??订æ??件夹â??%sâ??"
-
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1603
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
 msgid "Unsigned"
 msgstr "æ?ªç­¾å??"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信æ?¯æ?ªç­¾å??ã??æ? æ³?ä¿?è¯?è¿?å°?ä¿¡æ?¯å?¯ä¿¡ç??ã??"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
 msgid "Valid signature"
 msgstr "æ??æ??ç­¾å??"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此信æ?¯å·²ç­¾å??ï¼?è??ä¸?ç­¾å??æ?¯æ??æ??ç??ã??è¿?æ??å?³ç??è¿?å°?ä¿¡åº?该æ?¯å?¯ä¿¡ç??ã??"
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
 msgid "Invalid signature"
 msgstr "æ? æ??ç­¾å??"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "æ? æ³?æ ¡éª?è¿?å°?ä¿¡ç??ç­¾å??ï¼?å?¯è?½å?¨ä¼ é??ç??è¿?ç¨?中é?®ä»¶è¢«ç¯¡æ?¹äº?ã??"
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1606
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç­¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?å??é??è??"
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "è¿?å°?ä¿¡ç??ç­¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?é?®ä»¶ç??å??é??è??ã??"
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1607
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
 msgid "Signature exists, but need public key"
 msgstr "ç­¾å??å·²å­?å?¨ï¼?ä½?é??è¦?å?¬é?¥"
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "è¿?å°?ä¿¡ç??ç­¾å??æ??æ??ï¼?ä½?æ?¯æ²¡æ??ç?¸åº?ç??å?¬é?¥ã??"
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1613
+#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "è¿?å°?ä¿¡æ?ªå? å¯?ã??å?¨ Internet ä¸?ä¼ é??æ?¶æ??æ??人é?½å?¯ä»¥ç??å?°å?¶å??容ã??"
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1614
+#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
 msgid "Encrypted, weak"
 msgstr "å¼±å? å¯?"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -10661,21 +9467,21 @@ msgstr ""
 "è¿?å°?ä¿¡å·²å? å¯?ï¼?ä½?使ç?¨ç??æ?¯å¼±å? å¯?ç®?æ³?ã??å¦?æ??å¤?人æ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??容ï¼?å?¯è?½è¦?è?±ä¸?"
 "å®?æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å¾?å?°é?¾ä½?并ä¸?æ?¯ä¸?å?¯è?½ã??"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1615
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
 msgid "Encrypted"
 msgstr "å? å¯?"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "è¿?å°?ä¿¡å·²å? å¯?ã??å¤?人è¦?æ?³æ?¥ç??è¿?å°?ä¿¡ç??å??容å??å??å?°é?¾ã??"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
 msgid "Encrypted, strong"
 msgstr "强å? å¯?"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -10684,15 +9490,15 @@ msgstr ""
 "è¿?å°?ä¿¡å·²å? å¯?ï¼?ä¸?使ç?¨ç??æ?¯å¼ºå? å¯?ç®?æ³?ã??å¦?æ??å¤?人æ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??容ï¼?å?¯è?½è¦?è?±å¤§"
 "é??æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å??å??å?°é?¾ã??"
 
-#: ../mail/em-format-html-display.c:240 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æ?¥ç??è¯?书(_V)"
 
-#: ../mail/em-format-html-display.c:253
+#: ../mail/em-format-html-display.c:251
 msgid "This certificate is not viewable"
 msgstr "æ­¤è¯?书ä¸?å?¯æ?¥ç??"
 
-#: ../mail/em-format-html-display.c:508
+#: ../mail/em-format-html-display.c:506
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10700,28 +9506,28 @@ msgstr ""
 "Evolution æ? æ³?渲æ??æ­¤ç?µå­?é?®ä»¶ï¼?å??å? æ?¯è¯¥é?®ä»¶å¤ªå¤§ã??æ?¨å?¯ä»¥ä»¥æ? æ ¼å¼?æ?¹å¼?æ?¥ç??该é?®"
 "件ï¼?æ??è??使ç?¨å¤?é?¨æ??æ?¬ç¼?è¾?å?¨æ?¥ç??ã??"
 
-#: ../mail/em-format-html-display.c:751
+#: ../mail/em-format-html-display.c:749
 msgid "Completed on"
 msgstr "å®?æ??äº?"
 
-#: ../mail/em-format-html-display.c:759
+#: ../mail/em-format-html-display.c:757
 msgid "Overdue:"
 msgstr "延æ??ï¼?"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:763
+#: ../mail/em-format-html-display.c:761
 msgid "by"
 msgstr "å??建è??ï¼?"
 
-#: ../mail/em-format-html-display.c:980 ../mail/em-format-html-display.c:1027
+#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
 msgid "View _Unformatted"
 msgstr "æ? æ ¼å¼?æ?¥ç??(_U)"
 
-#: ../mail/em-format-html-display.c:982
+#: ../mail/em-format-html-display.c:980
 msgid "Hide _Unformatted"
 msgstr "æ? æ ¼å¼?é??è??(_U)"
 
-#: ../mail/em-format-html-display.c:1047
+#: ../mail/em-format-html-display.c:1045
 msgid "O_pen With"
 msgstr "æ??å¼?æ?¹å¼?(_P)"
 
@@ -10734,51 +9540,51 @@ msgstr "第 %d 页�� %d 页"
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??ä¿¡æ?¯"
 
-#: ../mail/em-format-html.c:362
+#: ../mail/em-format-html.c:364
 msgid "Formatting Message..."
 msgstr "æ­£å?¨æ ¼å¼?å??ä¿¡æ?¯..."
 
-#: ../mail/em-format-html.c:1447 ../mail/em-format-html.c:1457
+#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æ?¶å??â??%sâ??"
 
-#: ../mail/em-format-html.c:1978
+#: ../mail/em-format-html.c:1979
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1986
+#: ../mail/em-format-html.c:1987
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?正确ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:2016
+#: ../mail/em-format-html.c:2017
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "æ??å?? FTP ç«?ç?¹ (%s)"
 
-#: ../mail/em-format-html.c:2027
+#: ../mail/em-format-html.c:2028
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "å?¨ç«?ç?¹â??%2$sâ??æ??å??æ?¬å?°æ??件 (%1$s) å??æ³?"
 
-#: ../mail/em-format-html.c:2029
+#: ../mail/em-format-html.c:2030
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ??å??æ?¬å?°æ??件 (%s)"
 
-#: ../mail/em-format-html.c:2050
+#: ../mail/em-format-html.c:2051
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "æ??å??è¿?ç¨?æ?°æ?® (%s)"
 
-#: ../mail/em-format-html.c:2061
+#: ../mail/em-format-html.c:2062
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "æ??å??æ?ªç?¥ç??å¤?é?¨æ?°æ?® (â??%sâ??ç±»å??)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2761
+#: ../mail/em-format-html.c:2768
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "此信æ?¯ç?± %s 代表 %s ç??身份å??é??"
@@ -10789,72 +9595,61 @@ msgstr "此信æ?¯ç?± %s 代表 %s ç??身份å??é??"
 msgid "No HTML stream available"
 msgstr "没æ??å?¯ç?¨ç?? HTML æµ?ã??"
 
-#: ../mail/em-subscription-editor.c:1128
+#: ../mail/em-subscription-editor.c:1107
 msgid "Folder Subscriptions"
 msgstr "æ??件夹订é??"
 
-#: ../mail/em-subscription-editor.c:1167
-#| msgid "_Country:"
+#: ../mail/em-subscription-editor.c:1146
 msgid "_Account:"
 msgstr "账�(_A)�"
 
-#: ../mail/em-subscription-editor.c:1182
-#| msgid "Clear the search"
+#: ../mail/em-subscription-editor.c:1161
 msgid "Clear Search"
 msgstr "æ¸?é?¤æ??ç´¢"
 
-#: ../mail/em-subscription-editor.c:1200
-#| msgid "S_how only items containing:"
+#: ../mail/em-subscription-editor.c:1179
 msgid "Sho_w items that contain:"
 msgstr "æ?¾ç¤ºå??å?«ä»¥ä¸?å??容ç??项ç?®(_W)ï¼?"
 
-#: ../mail/em-subscription-editor.c:1239
-#| msgid "Unsubscribe from the selected folder"
+#: ../mail/em-subscription-editor.c:1218
 msgid "Subscribe to the selected folder"
 msgstr "订é??é??å®?ç??æ??件夹"
 
-#: ../mail/em-subscription-editor.c:1240
-#| msgid "Subscribed"
+#: ../mail/em-subscription-editor.c:1219
 msgid "Su_bscribe"
 msgstr "订é??(_B)"
 
-#: ../mail/em-subscription-editor.c:1251
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../mail/em-subscription-editor.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "Unsubscribe from the selected folder"
 msgstr "å??æ¶?对é??å®?æ??件夹ç??订é??"
 
-#: ../mail/em-subscription-editor.c:1252
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../mail/em-subscription-editor.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "_Unsubscribe"
 msgstr "é??订(_U)"
 
-#: ../mail/em-subscription-editor.c:1263
-#| msgid "Collapse _all"
+#: ../mail/em-subscription-editor.c:1242
 msgid "Collapse all folders"
 msgstr "æ??å? æ??æ??æ??件夹"
 
-#: ../mail/em-subscription-editor.c:1264
-#| msgid "Collapse _all"
+#: ../mail/em-subscription-editor.c:1243
 msgid "C_ollapse All"
 msgstr "å?¨é?¨æ??å? (_O)"
 
-#: ../mail/em-subscription-editor.c:1274
-#| msgid "E_xpand all"
+#: ../mail/em-subscription-editor.c:1253
 msgid "Expand all folders"
 msgstr "å±?å¼?æ??æ??æ??件夹"
 
-#: ../mail/em-subscription-editor.c:1275
-#| msgid "E_xpand all"
+#: ../mail/em-subscription-editor.c:1254
 msgid "E_xpand All"
 msgstr "����(_X)"
 
-#: ../mail/em-subscription-editor.c:1285
-#| msgid "Refresh the folder"
+#: ../mail/em-subscription-editor.c:1264
 msgid "Refresh the folder list"
 msgstr "å?·æ?°æ??件夹å??表"
 
-#: ../mail/em-subscription-editor.c:1297
-#| msgid "Cancel the current mail operation"
+#: ../mail/em-subscription-editor.c:1276
 msgid "Stop the current operation"
 msgstr "å??æ­¢å½?å??æ??ä½?"
 
@@ -10862,24 +9657,22 @@ msgstr "å??æ­¢å½?å??æ??ä½?"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:103
+#: ../mail/em-utils.c:101
 #, c-format
-#| msgid "Are you sure you want to open %d messages at once?"
-#| msgid_plural "Are you sure you want to open %d messages at once?"
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "æ?¨ç¡®å®?è¦?ä¸?次æ??å¼? %d å°?ä¿¡å??ï¼?"
 
-#: ../mail/em-utils.c:149
-#: ../modules/mailto-handler/evolution-mailto-handler.c:147
+#: ../mail/em-utils.c:153
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "ä¸?å??æ?¾ç¤ºæ­¤ä¿¡æ?¯(_D)"
 
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:327
 msgid "Message Filters"
 msgstr "�件�滤�"
 
-#: ../mail/em-utils.c:871
+#: ../mail/em-utils.c:883
 #, c-format
 msgid "Messages from %s"
 msgstr "æ?¥è?ª %s ç??ä¿¡æ?¯"
@@ -10888,7 +9681,7 @@ msgstr "æ?¥è?ª %s ç??ä¿¡æ?¯"
 msgid "Search _Folders"
 msgstr "æ??ç´¢æ??件夹(_F)"
 
-#: ../mail/em-vfolder-rule.c:599
+#: ../mail/em-vfolder-rule.c:603
 msgid "Add Folder"
 msgstr "æ·»å? æ??件夹"
 
@@ -10905,17 +9698,14 @@ msgid "\"Filter Editor\" window width"
 msgstr "â??è¿?滤å?¨ç¼?è¾?å?¨â??çª?å?£å®½åº¦"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-#| msgid "\"Filter Editor\" window height"
 msgid "\"Folder Subscriptions\" window height"
 msgstr "â??æ??件夹订é??â??çª?å?£é«?度"
 
 #: ../mail/evolution-mail.schemas.in.h:5
-#| msgid "\"Filter Editor\" window maximize state"
 msgid "\"Folder Subscriptions\" window maximize state"
 msgstr "â??æ??件夹订é??â??çª?å?£æ??大å??ç?¶æ??"
 
 #: ../mail/evolution-mail.schemas.in.h:6
-#| msgid "\"Filter Editor\" window width"
 msgid "\"Folder Subscriptions\" window width"
 msgstr "â??æ??件夹订é??â??çª?å?£å®½åº¦"
 
@@ -10947,123 +9737,146 @@ msgstr "â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£å®½åº¦"
 msgid "Always request read receipt"
 msgstr "æ?»æ?¯è¯·æ±?é??读æ?¶æ?¡"
 
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "å?¨ç?¶æ??æ ?中æ?¾ç¤ºé??误ç??æ?¶é?´ç§?æ?°ã??"
+
 #: ../mail/evolution-mail.schemas.in.h:15
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr "å?¨ç?¨æ?·è½¬å??æ??å??å¤?æ?¾ç¤ºå?¨çª?å?£ä¸­ç??ä¿¡æ?¯æ?¶ï¼?询é?®æ?¯å?¦å?³é?­ä¿¡æ?¯çª?å?£"
+
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid "Attribute message."
+msgstr "é??å±?ç??ä¿¡æ?¯ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
 msgstr "è?ªå?¨è¯?å?«è¡¨æ??å?¾æ ?"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Automatic link recognition"
 msgstr "������"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Check for new messages in all active accounts"
+msgstr "æ£?æ?¥æ??æ??æ´»å?¨è´¦æ?·ç??æ?°ä¿¡æ?¯"
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Check for new messages on start"
+msgstr "������信�"
+
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Check incoming mail being junk"
 msgstr "æ£?æ?¥æ?¶å?°ç??é?®ä»¶æ?¯å?¦æ?¯å??å?¾ä¿¡æ?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Citation highlight color"
 msgstr "������"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Citation highlight color."
 msgstr "å¼?ç?¨çª?å?ºé¢?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Composer Window default height"
 msgstr "ç¼?å??çª?å?£ç??é»?认é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Composer Window default width"
 msgstr "ç¼?å??çª?å?£ç??é»?认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
 msgstr "ç¼?è¾?å?¨å? è½½/é??件ç?®å½?"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å??缩 TO/CC/BCC 中å?°å??ç??æ?¾ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "å°? TO/CC/BCC ç??æ?¾ç¤ºå?°å??æ?°å??缩å?° address_count æ??æ??å®?ç??æ?°é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr "æ?§å?¶ä¸?è¿?ç¨?é?®ä»¶æ??å?¡å?¨å??æ­¥æ?¬å?°æ?´æ?¹ç??é¢?ç??ã??é?´é??å¿?é¡»è?³å°?为 30 ç§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Custom headers to use while checking for junk."
 msgstr "è?ªå®?ä¹?ç?¨ä»¥æ£?æ?¥å??å?¾ä¿¡æ?¯ç??信头ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr "è?ªå®?ä¹?ç?¨ä»¥æ£?æ?¥å??å?¾ä¿¡æ?¯ç??信头ã??å??表å??ç´ ç??å­?ç¬¦ä¸²æ ¼å¼?为â??信头å??=å?¼â??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
 msgstr "ç¼?å??ä¿¡æ?¯ç??é»?认å­?符é??"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to compose messages."
 msgstr "ç¼?å??ä¿¡æ?¯ç??é»?认å­?符é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages"
 msgstr "æ?¾ç¤ºä¿¡æ?¯ç??é»?认å­?符é??"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default charset in which to display messages."
 msgstr "æ?¾ç¤ºä¿¡æ?¯ç??é»?认å­?符é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default forward style"
 msgstr "é»?认转å??æ?¹å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the Composer Window."
 msgstr "æ?°å??çª?å?£ç??é»?认é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default height of the mail browser window."
 msgstr "é?®ä»¶æµ?è§?å?¨çª?å?£ç??é»?认é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default maximized state of the mail browser window."
 msgstr "é?®ä»¶æµ?è§?å?¨çª?å?£ç??é»?认æ??大å??ç?¶æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default reply style"
 msgstr "é»?认å??å¤?æ ·å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default value for thread expand state"
 msgstr "è¯?é¢?ç??é»?认å±?å¼?ç?¶æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the Composer Window."
 msgstr "æ?°å??çª?å?£ç??é»?认宽度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Default width of the mail browser window."
 msgstr "é?®ä»¶æµ?è§?å?¨çª?å?£ç??é»?认宽度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "å?³å®?æ?¯å?¦ä»?å?¨æ?¬å?°å?°å??簿中æ?¥æ?¾å?°å??è¿?è¡?å??å?¾ä¿¡æ?¯è¿?滤"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "å?³å®?æ?¯å?¦å?¨å?°å??簿中æ?¥æ?¾å??件人ç?µå­?é?®ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11074,11 +9887,11 @@ msgstr ""
 "为è?ªå?¨è¡¥å?¨ç??å?°å??簿中æ?¥æ?¾ï¼?å¦?æ??è¿?ç¨?å?°å??ç°¿(å¦? LDAP)被æ ?记为è?ªå?¨è¡¥å?¨ç??è¯?ï¼?å?¯è?½ä¼?"
 "æ¯?è¾?æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "å?³å®?æ?¯å?¦ä½¿ç?¨è?ªå®?ä¹?信头æ£?æµ?å??å?¾ä¿¡æ?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11087,53 +9900,53 @@ msgstr ""
 "å?³å®?æ?¯å?¦ä½¿ç?¨è?ªå®?ä¹?信头æ£?æµ?å??å?¾ä¿¡æ?¯ã??å¦?æ??æ­¤é??项被å?¯ç?¨ä¸?信头被设置ç??è¯?ï¼?å°?æ??é«?"
 "å??å?¾ä¿¡æ?¯æ£?æµ?é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr "å?³å®?æ?¯å?¦å?¨ç«?ç?´è§?å?¾ä¸­å¯¹â??ä¿¡æ?¯â??å??ç??â??å??件人â??å??â??主é¢?â??è¡?使ç?¨ç?¸å??ç??å­?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for loading/attaching files to composer."
 msgstr "é?®ä»¶å??ä½?å?¨ç?¨æ?¥å? è½½/é??å? æ??件ç??ç?®å½?"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for saving mail component files."
 msgstr "ä¿?å­?é?®ä»¶ç»?件æ??件ç??ç?®å½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ç¦?ç?¨æ??å?¯ç?¨ä¾§è¾¹æ ?中æ??件夹å??ç??ç??ç?¥æ?¾ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Display only message texts not exceeding certain size"
 msgstr "ä»?æ?¾ç¤ºä¸?è¶?è¿?æ??ä¸?大å°?ç??æ??æ?¬ä¿¡æ?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Do not add signature delimiter"
 msgstr "ä¸?æ·»å? ç­¾å??å??é??符"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Draw spelling error indicators on words as you type."
 msgstr "å?¨æ?¨æ??å­?ç??æ?¶å??å°±æ?¾ç¤ºæ?¼å??é??误æ ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty Junk folders on exit"
 msgstr "é??å?ºæ?¶æ¸?空å??å?¾ä¿¡æ?¯æ??件夹"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Trash folders on exit"
 msgstr "é??å?ºæ?¶æ¸?空åº?件箱"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "é??å?º Evolution æ?¶æ¸?空å??å?¾ä¿¡æ?¯ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "é??å?º Evolution æ?¶æ¸?空åº?件箱ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -11141,65 +9954,65 @@ msgstr ""
 "å?¨ HTML é?®ä»¶ä¸­å?¯ç?¨å?¨ç?»å?¾å??ã??å¾?å¤?ç?¨æ?·æ??è§?å?¨ç?»å?¾å??å¾?ç?¦äººå¹¶ä¸?å??欢ç??é??æ??å?¾å??è??ä¸?"
 "æ?¯å?¨æ??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "å?¯ç?¨å??æ ?模å¼?ï¼?è¿?æ ·æ?¨å?¨è¯»å??é?®ä»¶æ?¶å°±è?½ç??å?°å??æ ?äº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable or disable magic space bar"
 msgstr "å?¯ç?¨æ??ç¦?ç?¨é­?æ?¯ç©ºæ ¼é?®"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "ç¦?ç?¨/å?¯ç?¨å¯¹å¤?æ?¡ä¿¡æ?¯æ ?è®°æ?¶ç??æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable type ahead search feature"
 msgstr "å?¯ç?¨æ??ç¦?ç?¨è?ªå?¨å??è¿?å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable search folders"
 msgstr "å?¯ç?¨æ??ç´¢æ??件夹"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders on startup."
 msgstr "å?¯å?¨æ?¶å?¯ç?¨æ??ç´¢æ??件夹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "å?¯ç?¨ä¾§è¾¹æ ?æ??ç´¢å??è?½æ?¥å®?ç?°æ??件夹å??称ç??äº?å?¨æ??ç´¢"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "å?¯ç?¨ä»¥å?¨ä¿¡æ?¯é¢?è§?ã??ä¿¡æ?¯å??表å??æ??件夹中使ç?¨ç©ºæ ¼é?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr "å?¯ç?¨ä»?æ?¾ç¤ºä¸?è¶?è¿?â??message_text_part_limitâ??é?®å?¼ä¸­å®?ä¹?ç??大å°?ç??é?®ä»¶æ??æ?¬ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "å?¯ç?¨ä»¥å?¨æ??æ??æ??件夹中使ç?¨ç?¸ä¼¼ç??ä¿¡æ?¯å??表è§?å?¾è®¾ç½®"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "å?¯ç?¨ä»¥å?¨æ??æ??æ??件夹中使ç?¨ç?¸ä¼¼ç??ä¿¡æ?¯å??表è§?å?¾è®¾ç½®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable/disable caret mode"
 msgstr "å?¯ç?¨/ç¦?ç?¨å??æ ?模å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:69 ../mail/mail-config.ui.h:42
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "使ç?¨ Outlook/Gmail ç??æ?¹å¼?ç¼?ç ?æ??件å??"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11210,33 +10023,37 @@ msgstr ""
 "å??é??ç??é?®ä»¶å¸¦æ??ç?? UTF-8 ç??æ??件å??称ï¼?å? 为å®?们ä¸?符å?? RFC 2231ï¼?è??æ?¯ä½¿ç?¨äº?ä¸?正确"
 "ç?? RFC 2047 æ ?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
 msgstr "å?¨è¿?滤ä¹?å??æ¸?空è¾?å?ºçª?å?£"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Forward message."
+msgstr "转å??ä¿¡æ?¯ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Group Reply replies to list"
 msgstr "â??ç»?å??å¤?â??æ?¯å??å¤?å?°é?®ä»¶å??表"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Height of the message-list pane"
 msgstr "ä¿¡æ?¯å??表é?¢æ?¿ç??é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane."
 msgstr "ä¿¡æ?¯å??表é?¢æ?¿ç??é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é??è??å??æ??件夹é¢?è§?并移é?¤é??æ?©"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "å¦?æ??ç?¨æ?·è¯?å?¾ä¸?次æ??å¼?ç??ä¿¡æ?¯å¤§äº?ç­?äº?å??å°?ï¼?å°?ä¼?询é?®ç?¨æ?·æ?¯å?¦ç??ç??è¦?è¿?ä¹?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
 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 "
@@ -11246,38 +10063,35 @@ msgstr ""
 "MIME ç±»å??å?¨ GNOME ç?? MIME ç±»å??æ?°æ?®åº?中æ? å°?ç?? Bonobo ç»?件æ?¥ç??å?¨å°?被ç?¨æ?¥æ?¾ç¤ºå?¶"
 "å??容ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "忽ç?¥é?®ä»¶å??表â??å??å¤?è?³â??å??ï¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr "â??è¿?滤ç¼?è¾?å?¨â??çª?å?£ç??å??å§?é«?度ã??è¿?个å?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£ç«?ç?´å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:80
-#| msgid ""
-#| "Initial height of the \"Filter Editor\" window. The value updates as the "
-#| "user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "â??æ??件夹订é??â??çª?å?£ç??å??å§?é«?度ã??è¿?个å?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£ç«?ç?´å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "â??æ??ç´¢æ??件夹â??çª?å?£ç??å??å§?é«?度ã??è¿?个å?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£ç«?ç?´å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£ç??å??å§?é«?度ã??è¿?个å?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£ç«?ç?´å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11288,23 +10102,18 @@ msgstr ""
 "å?¼ï¼?è¿?个å?¼æ?¯ä¸?ä¼?被 Evolution 使ç?¨ç??ï¼?å? 为â??è¿?滤å?¨ç¼?è¾?å?¨â??çª?å?£æ? æ³?æ??大å??ã??è¿?个å?¼"
 "å?ªæ?¯ä½?为å®?ç?°ç»?è??è??å­?å?¨ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-#| msgid ""
-#| "Initial maximize state of the \"Filter Editor\" window. The value updates "
-#| "when the user maximizes or unmaximizes the window. Note, this particular "
-#| "value is not used by Evolution since the \"Filter Editor\" window cannot "
-#| "be maximized. This key exists only as an implementation detail."
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
 "particular value is not used by Evolution since the \"Folder Subscriptions\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"â??æ??件夹订é??â??çª?å?£ç??æ??大å??å??å§?ç?¶æ??ã??å½?ç?¨æ?·æ??大å??æ??å??æ¶?æ??大å??çª?å?£æ?¶ä¼?æ?´æ?°è¯¥"
-"å?¼ï¼?è¿?个å?¼æ?¯ä¸?ä¼?被 Evolution 使ç?¨ç??ï¼?å? 为â??è¿?滤å?¨ç¼?è¾?å?¨â??çª?å?£æ? æ³?æ??大å??ã??è¿?个å?¼"
-"å?ªæ?¯ä½?为å®?ç?°ç»?è??è??å­?å?¨ç??ã??"
+"â??æ??件夹订é??â??çª?å?£ç??æ??大å??å??å§?ç?¶æ??ã??å½?ç?¨æ?·æ??大å??æ??å??æ¶?æ??大å??çª?å?£æ?¶ä¼?æ?´æ?°è¯¥å?¼ï¼?"
+"è¿?个å?¼æ?¯ä¸?ä¼?被 Evolution 使ç?¨ç??ï¼?å? 为â??è¿?滤å?¨ç¼?è¾?å?¨â??çª?å?£æ? æ³?æ??大å??ã??è¿?个å?¼å?ªæ?¯"
+"ä½?为å®?ç?°ç»?è??è??å­?å?¨ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11315,7 +10124,7 @@ msgstr ""
 "该å?¼ï¼?è¿?个å?¼æ?¯ä¸?ä¼?被 Evolution 使ç?¨ç??ï¼?å? 为â??æ??ç´¢æ??件夹ç¼?è¾?å?¨â??çª?å?£æ? æ³?æ??大å??ã??"
 "è¿?个å?¼å?ªæ?¯ä½?为å®?ç?°ç»?è??è??å­?å?¨ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11327,34 +10136,31 @@ msgstr ""
 "å?¼ï¼?è¿?个å?¼æ?¯ä¸?ä¼?被 Evolution 使ç?¨ç??ï¼?å? 为â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£æ? æ³?æ??大å??ã??è¿?个"
 "å?¼å?ªæ?¯ä½?为å®?ç?°ç»?è??è??å­?å?¨ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr "â??è¿?滤ç¼?è¾?å?¨â??çª?å?£ç??å??å§?宽度ã??è¿?个å?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£æ°´å¹³å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:88
-#| msgid ""
-#| "Initial width of the \"Filter Editor\" window. The value updates as the "
-#| "user resizes the window horizontally."
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "â??æ??件夹订é??â??çª?å?£ç??å??å§?宽度ã??è¿?个å?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£æ°´å¹³å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "â??æ??ç´¢æ??件夹â??çª?å?£ç??å??å§?宽度ã??è¿?个å?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£æ°´å¹³å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£ç??å??å§?宽度ã??è¿?个å?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£æ°´å¹³å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -11364,7 +10170,7 @@ msgstr ""
 "ä¸?æ?®é??ç??â??å??å¤?å?¨é?¨â??è¡?为ä¸?å??ï¼?è¿?个é??项使â??ç»?å??å¤?â??å·¥å?·æ??é?®é??è¿?æ?¨æ­£å?¨å??å¤?ç??å??æ?¶å?°"
 "ç??ä¿¡æ?¯å?ªå??å¤?ç»?é?®ä»¶å??表ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11372,19 +10178,19 @@ msgid ""
 msgstr ""
 "ç¦?ç?¨/å?¯ç?¨æ°¸ä¹?å? é?¤(è??é??ç®?å??å?°ä»?ç»?æ??中移é?¤)æ??ç´¢æ??件夹中ç??ä¿¡æ?¯æ?¶ä¸?æ?­å¼¹å?ºç??æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr "ç¦?ç?¨/å?¯ç?¨ä»¥å?¨æ?¨å°?ä¿¡æ?¯ç??ç§?人å??å¤?å??é??è?³é?®ä»¶å??表æ?¶å??å?ºè­¦å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "ç¦?ç?¨æ??å?¯ç?¨å½?æ?¨å??é??å??å¤?ç»?许å¤?人ç??æ?¶å??ç??å??å¤?ç??è­¦å??æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -11393,35 +10199,40 @@ msgstr ""
 "å½?æ?¨æ­£è¦?å??é??ä¸?个é??è¿?é?®ä»¶å??表æ?¶å?°ç??ä¿¡æ?¯ç??ç§?人å??å¤?ï¼?è??é?®ä»¶å¤´ç?? Reply-To: é??å®?å??"
 "å?°äº?å??表æ?¶ï¼?ç¦?ç?¨æ??å?¯ç?¨å??å¤?ç??è­¦å??æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Last time Empty Junk was run"
 msgstr "ä¸?次æ¸?空å??å?¾ä¿¡æ?¯ç??æ?¶é?´ä¸ºï¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Trash was run"
 msgstr "ä¸?次æ¸?空åº?件箱ç??æ?¶é?´ä¸ºï¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Layout style"
 msgstr "å¸?å±?æ ·å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:104
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Level beyond which the message should be logged."
+msgstr "大äº?此级å?«ç??ä¿¡æ?¯ä¼?被记å½?ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "List of Labels and their associated colors"
 msgstr "æ ?ç­¾å??å?¶å¯¹åº?é¢?è?²ç??å??表"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "å??å?ºè¦?使ç?¨ bonobo ç»?件æ?¥ç??å?¨æ?¥ç??ç?? MIME ç±»å??"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of accepted licenses"
 msgstr "å??å?ºæ?¥å??ç??许å?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accounts"
 msgstr "å¸?å?·å??表"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11429,15 +10240,15 @@ msgstr ""
 "å??å?ºäº? Evolution é?®ä»¶ç»?件已ç?¥ç??å¸?å?·ã??æ­¤å??表å??å?«äº?ç?¸å¯¹äº? /apps/evolution/mail/"
 "accounts ç??å­?ç?®å½?å?½å??å­?符串ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªå®?ä¹?头å??该头æ?¯å?¦å?¯ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of dictionary language codes used for spell checking."
 msgstr "å??å?ºç?¨æ?¥æ?¼å??æ£?æ?¥ç??å­?å?¸è¯­è¨?ç¼?ç ?"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:112
 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."
@@ -11445,15 +10256,15 @@ msgstr ""
 "å??å?ºäº? Evolution é?®ä»¶ç»?件已ç?¥ç??æ ?ç­¾ã??å??表中ç??å­?ç¬¦ä¸²æ ¼å¼?å½¢å¦?â??å??称:é¢?è?²â??ï¼?å?¶ä¸­"
 "é¢?è?²ä½¿ç?¨äº? HTML å??å?­è¿?å?¶ç¼?ç ?æ?¹å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of protocol names whose license has been accepted."
 msgstr "å??å?ºæ?¥å??å??è®®ç??å??è®®å??称ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Load images for HTML messages over HTTP"
 msgstr "å?¨ HTML ä¿¡æ?¯ä¸­è½½å?¥ HTTP å?¾å??"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -11462,255 +10273,260 @@ msgstr ""
 "å?¨ HTML ä¿¡æ?¯ä¸­è½½å?¥ HTTP(S) å?¾å??ã??å?¯ä¾?é??æ?©ç??å?¼æ??ï¼?0 - ç»?ä¸?ä»?ç½?ä¸?è½½å?¥å?¾å??ï¼?1 - "
 "å¦?æ??å??é??è??å?¨å?°å??簿中å??è½½å?¥å?¾å??ï¼?2 - æ?»æ?¯ä»?ç½?ä¸?è½½å?¥å?¾å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Log filter actions"
 msgstr "记��滤��"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions to the specified log file."
 msgstr "å°?è¿?滤å?¨ä½?è®°å½?å?°æ??å®?æ?¥å¿?æ??件ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Logfile to log filter actions"
 msgstr "è®°å½?è¿?滤å?¨ä½?ç??æ?¥å¿?æ??件"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions."
 msgstr "è®°å½?è¿?滤å?¨ä½?ç??æ?¥å¿?æ??件ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mail browser height"
 msgstr "�件����度"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser maximized"
 msgstr "é?®ä»¶æµ?è§?å?¨æ??大å??"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser width"
 msgstr "�件���宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mark as Seen after specified timeout"
 msgstr "å?¨æ??å®?è¶?æ?¶è¿?å??æ ?为已ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?è¶?æ?¶è¿?å??æ ?为已ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨ä¿¡æ?¯â??é¢?è§?â??中æ ?å?ºå¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨ä¿¡æ?¯â??é¢?è§?â??中æ ?å?ºå¼?ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Message text limit for display"
 msgstr "ä¿¡æ?¯æ??æ?¬æ?¾ç¤ºé??å?¶"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ä¿¡æ?¯æ?¾ç¤ºé£?æ ¼(â??normalâ??æ?®é??ã??â??full headersâ??å?¨é?¨é?®ä»¶å¤´ã??â??sourceâ??æº?代ç ?)"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Minimum days between emptying the junk on exit"
 msgstr "é??å?ºæ?¶æ¸?空å??å?¾ä¿¡æ?¯ç??æ??å°?天æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the trash on exit"
 msgstr "é??å?ºæ?¶æ¸?空åº?件箱ç??æ??å°?天æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "é??å?ºæ?¶æ¸?空å??å?¾ä¿¡æ?¯ç??æ??å°?æ?¶é?´ï¼?以天计ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "é??å?ºæ?¶æ¸?空åº?件箱ç??æ??å°?天æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "è¦?å?¨ TO/CC/BCC 中æ?¾ç¤ºç??å?°å??æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Original message."
+msgstr "å??å§?ä¿¡æ?¯ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Path where image gallery should search for its content"
+msgstr "å?¾å??ç?»å»?æ??ç´¢å??容ç??è·¯å¾?"
+
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
-msgstr "å?¯è?½ç??å??å?¼æ??ï¼?never - ä¸?å?³é?­æµ?è§?å?¨çª?å?£ always - é?®é¢?å?³é?­æµ?è§?å?¨çª?å?£"
-" ask - (æ??ä»»ä½?å?¶ä»?å?¼)å°?询é?®ç?¨æ?·"
+msgstr ""
+"å?¯è?½ç??å??å?¼æ??ï¼?never - ä¸?å?³é?­æµ?è§?å?¨çª?å?£ always - é?®é¢?å?³é?­æµ?è§?å?¨çª?å?£ ask - (æ??"
+"任����)�询���"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt on empty subject"
 msgstr "空主é¢?æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "ç?¨æ?·è§?å?¾é??æ¯?æ??件夹æ?¶æ??示ã??"
+msgstr "ç?¨æ?·è¯?å?¾é??æ¯?æ??件夹æ?¶æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¨æ?·è§?å?¾å??é??没æ??主é¢?ç??ä¿¡æ?¯æ?¶æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt when deleting messages in search folder"
 msgstr "å? é?¤æ??ç´¢æ??件夹中ç??ä¿¡æ?¯æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "å½?é?®ä»¶å??表å?«æ??ç§?人å??å¤?æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Prompt when replying or forwarding from a mail browser whether close it"
-msgstr "å?¨ä»?é?®ä»¶æµ?è§?å?¨ä¸­å??å¤?æ??转å??æ?¶ï¼?æ??示æ?¯å?¦å?³é?­å®?"
-
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when replying privately to list messages"
 msgstr "å½?对é?®ä»¶å??表ä½?ç§?人å??å¤?æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when replying to many recipients"
 msgstr "å½?å??å¤?个æ?¶ä»¶äººå??å¤?æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when user expunges"
 msgstr "ç?¨æ?·é??æ¯?æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¨æ?·å?ªå¡«å?¥å¯?件æ??é??æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "å½?ç?¨æ?·è¯?å?¾ä¸?次æ??å¼?è¶?è¿?å??å°?ä¿¡æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "å½?ç?¨æ?·è¯?å?¾ç»?ä¸?æ?³æ?¥æ?¶ HTML ç??è??系人å??é?? HTML é?®ä»¶æ?¶æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "å½?ç?¨æ?·è¯?å?¾å??é??没æ??æ?¶ä»¶äººæ??æ??é??ç??ä¿¡æ?¯æ?¶æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "å½?ç?¨æ?·æ?¯å?¦å??é??æ??å¤?ç?? HTML æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Prompt while marking multiple messages"
 msgstr "æ ?è®°å¤?å°?ä¿¡æ?¯æ?¶æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Put personalized signatures at the top of replies"
 msgstr "å?¨å??å¤?ç??顶é?¨æ·»å? 个æ?§ç­¾å??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Put the cursor at the bottom of replies"
 msgstr "å°?å??æ ?ç½®äº?å??å¤?åº?é?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "è¯?å?«æ??æ?¬ä¸­ç??表æ??ï¼?并å°?å?¶æ?¿æ?¢ä¸ºå?¾å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Recognize links in text and replace them."
 msgstr "è¯?å?«æ??æ?¬ä¸­ç??é?¾æ?¥å¹¶è¿?è¡?æ?¿æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Run junk test on incoming mail."
 msgstr "对æ?¶å?°ç??é?®ä»¶è¿?è¡?å??å?¾ä¿¡æ?¯æµ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Save directory"
 msgstr "����"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°å?°å??è??中æ??ç´¢å??件人ç?§ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Send HTML mail by default"
 msgstr "é»?认以 HTML å??é??é?®ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Send HTML mail by default."
 msgstr "é»?认以 HTML å??é??é?®ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Sender email-address column in the message list"
 msgstr "å?¨ä¿¡æ?¯å??表中æ?¾ç¤º email å?°å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Server synchronization interval"
 msgstr "æ??å?¡å?¨å??æ­¥é?´é??"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr "å¦?æ??æ?¨ä¸?æ?³å?¨æ?¨å??é?®ä»¶æ?¶ç­¾å??以å??æ·»å? ç­¾å??å??é??符ï¼?é?£ä¹?设置为ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºå¯?件æ??é??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºæ??é??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "å?¨å??é??å??容å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºå??件人å??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "å?¨å??é??å??容å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºâ??Reply Toâ??(å??å¤?è?³)å??"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "å??é??é?®ä»¶æ?¶æ?¾ç¤ºâ??Reply Toâ??(å??å¤?è?³)å??"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show Animations"
 msgstr "�示��"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show all message headers"
 msgstr "�示��信头"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show all the headers when viewing a messages."
 msgstr "æ?¥ç??ä¿¡æ?¯æ?¶æ?¾ç¤ºå?¨é?¨ä¿¡å¤´ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show animated images as animations."
 msgstr "å°?å?¨ç?»å?¾å??æ?¾ç¤ºä¸ºå?¨ç?»ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "å?¨ä¿¡æ?¯å??表中æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯(带æ??å? é?¤çº¿)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨ä¿¡æ?¯å??表中æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show image animations"
 msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show original \"Date\" header value."
 msgstr "æ?¾ç¤ºå??å§?ç??é?®ä»¶å¤´æ?¥æ??å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show photo of the sender"
 msgstr "æ?¾ç¤ºå??件人ç?§ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11718,7 +10534,7 @@ msgstr ""
 "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºå¯?件æ??é??å??ã??å?¨é??å®?äº?ä¸?个é?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??中æ?§å?¶æ­¤"
 "å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11726,7 +10542,7 @@ msgstr ""
 "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºæ??é??å??ã??å?¨é??å®?äº?ä¸?个é?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??中æ?§å?¶æ­¤å??"
 "è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11734,7 +10550,7 @@ msgstr ""
 "å?¨å??é??å??容å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºå??件人å??ã??å?¨é??å®?äº?ä¸?个æ?°é?»ç»?å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??中æ?§"
 "å?¶æ­¤å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11742,7 +10558,7 @@ msgstr ""
 "å?¨å??é??å??容å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºâ??Reply Toâ??å??ã??å?¨é??å®?äº?ä¸?个æ?°é?»ç»?å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??"
 "中æ?§å?¶æ­¤å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11750,13 +10566,13 @@ msgstr ""
 "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºâ??Reply Toâ??å??ã??å?¨é??å®?äº?ä¸?个é?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??中æ?§å?¶"
 "æ­¤å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "å?¨ä¿¡æ?¯å??表ç??以å?¦å¤?ç??å??æ?¾ç¤ºç?µå­?é?®ä»¶ç??å??é??è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11765,11 +10581,11 @@ msgstr ""
 "æ?¾ç¤ºå??å§?ç??é?®ä»¶å¤´â??Dateâ?? å?¼(å¦?æ??æ?¶å?ºä¸?å??é??ä¸?æ?¬å?°æ?¶é?´)ã??å?¦å??æ?»æ?¯æ??ç?§ç?¨æ?·å??好ç??æ ¼"
 "å¼?å??æ?¬å?°æ?¶å?ºæ?¾ç¤ºé?®ä»¶å¤´â??Dateâ?? å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨ä¿¡æ?¯é??读é?¢æ?¿ä¸­æ?¾ç¤ºå??件人ç?§ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11785,37 +10601,37 @@ msgstr ""
 "ä½?ï¼?å®?ä¼?è¿?è¡?ç§?人ç??å??å¤?ï¼?è??å¦?æ??æ?¨ä½¿ç?¨â??å??å¤?å?°å??表â??è¡?为ï¼?å®?å°±ä¼?å??å¤?å?°å??表ã??å¦?æ??"
 "å­?å?¨ç??è¯?ï¼?å®?ä¼?æ¯?è¾? Reply-To: å?? List-Post: æ?¥å®?æ??该ç?®ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Spell check inline"
 msgstr "å??åµ?æ?¼å??æ£?æ?¥"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Spell checking color"
 msgstr "æ?¼å??æ£?æ?¥é¢?è?²"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Spell checking languages"
 msgstr "æ?¼å??æ£?æ?¥è¯­è¨?"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Terminal font"
 msgstr "�端��"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "The default plugin for Junk hook"
 msgstr "é»?认ç??å??å?¾ä¿¡æ?¯é?©å­?æ??件"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?次æ¸?空å??å?¾ä¿¡æ?¯ç??æ?¶é?´ï¼?以è?ªæ?°çºªå??å??ç??天æ?°æ?¾ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?次æ¸?空åº?件箱ç??æ?¶é?´ï¼?以æ?°çºªå??å??ç??天æ?°æ?¾ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11825,21 +10641,40 @@ msgstr ""
 "å¸?å±?æ ·å¼?å?³å®?äº?å?¨å?ªé??æ?¾ç½®ä¿¡æ?¯å??表ç??é¢?è§?é?¢æ?¿ã??â??0â??(ç»?å?¸è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨æ¶?"
 "æ?¯å??表ä¸?é?¢ã??â??1â??(ç«?ç?´è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨ä¿¡æ?¯å??表æ??è¾¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The terminal font for mail display."
 msgstr "é?®ä»¶æ?¾ç¤ºç?¨ç??ç»?端å­?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr "å?¨è½¬å??ä¿¡æ?¯æ?¶æ??å?¥ç??æ??æ?¬ï¼?å??ç??ä¸?é?¢æ?¯è½¬å??ç??ä¿¡æ?¯ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:196
+#, fuzzy
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr "å?¨å??å¤?ä¸?å°?ä¿¡æ?¶æ??å?¥ç??æ??æ?¬(ä¿¡æ?¯é¡¶é?¨)ï¼?å??ç??ä¸?é?¢æ?¯å??å§?ä¿¡æ?¯ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The variable width font for mail display."
 msgstr "ç?¨äº?æ?¾ç¤ºé?®ä»¶ç??å??宽å­?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "æ­¤é??项æ??ä¸?ç§?å?¯è?½å?¼ï¼?0ï¼?é??误ï¼?1ï¼?è­¦å??ï¼?2ï¼?è°?è¯?ä¿¡æ?¯ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -11848,7 +10683,7 @@ msgstr ""
 "æ­¤é??项å?³å®?äº? Evolution 中æ?¾ç¤ºç??æ??大æ??æ?¬é?¨å??大å°?ï¼?é»?认为 4096KB (4MB)ã??æ­¤å?¼ä»?"
 "å?¨ force_message_limit é?®æ¿?æ´»æ?¶æ??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11857,7 +10692,7 @@ msgstr ""
 "è¿?æ?¯é»?认ç??å??å?¾ä¿¡æ?¯æ??件ï¼?å?³ä½¿å?¯ç?¨äº?å¤?个æ??件ã??å¦?æ??é»?认å??å?ºç??æ??件被ç¦?ç?¨ï¼?å®?ä¸?ä¼?"
 "缺ç??å?°å?¶å®?å?¯ç?¨ç??æ??件ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11865,7 +10700,7 @@ msgstr ""
 "æ­¤é?®å?ªè¢«è¯»å??ä¸?次并å?¨è¯»å??å??被é??设为 falseã??å®?å??æ¶?é??中å??表中ç??é?®ä»¶å¹¶ç§»é?¤ç?¸åº?æ??"
 "件夹ç??é¢?è§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:203
 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;"
@@ -11875,7 +10710,7 @@ msgstr ""
 "æ­¤é?®åº?å??å?«æ??å®?è?ªå®?ä¹?é?®ä»¶å¤´ç?? XML ç»?æ??å??表ï¼?以å??æ?¯å?¦æ?¾ç¤ºè¿?äº?é?®ä»¶å¤´ã??XML ç»?æ??ç??"
 "æ ¼å¼?为ï¼?&lt;å?¯ç?¨ç??é?®ä»¶å¤´&gt; - 设为 enabled å??å?¨é?®ä»¶è§?å?¾ä¸­æ?¾ç¤ºè¯¥é?®ä»¶å¤´ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11884,23 +10719,23 @@ msgstr ""
 "æ­¤é??项ä¸? lookup_addressbook é?®å?¼ç?¸å?³ï¼?ç?¨äº?å?³å®?æ?¯å?¦æ?¥è¯¢æ?¬å?°å?°å??簿以é?¿å??æ?¨è®¤è¯?"
 "ç??人ç»?æ?¨å??é?®ä»¶è??被å??å?¾é?®ä»¶è¿?滤å?¨ç»?è¿?滤æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "This option would help in improving the speed of fetching."
 msgstr "æ­¤é??项è?½å¸®å?©æ??é«?è?·å??ä¿¡æ?¯ç??é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "设å®?é»?认信æ?¯è§?å?¾ä¸­è¦?æ?¾ç¤ºç??å?°å??æ?°ï¼?è¶?è¿?ç??é?¨å??æ?¾ç¤ºä¸ºâ??...â??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr "此设置æ??å®?äº?é»?认æ??å?µä¸?线索æ?¯è¢«å±?å¼?è¿?æ?¯è¢«æ??å? ã??é??è¦?é??å?¯ Evolutionã??"
+"collapsed state by default. Requires a restart to apply."
+msgstr "此设置æ??å®?äº?é»?认æ??å?µä¸?线索æ?¯è¢«å±?å¼?è¿?æ?¯è¢«æ??å? ã??è¦?åº?ç?¨é??è¦?é??å?¯ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11909,91 +10744,117 @@ msgstr ""
 "此设置æ??å®?äº?é»?认æ??å?µä¸?æ?¯å?¦å°?线索æ??线索中ç??æ??æ?°ä¿¡æ?¯è??ä¸?æ?¯ä¿¡æ?¯æ?¥æ??æ??åº?ã??é??è¦?é??"
 "å?¯ Evolutionã??"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:209
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
+msgstr ""
+"è¿?个å?¼å?¯ä»¥æ?¯ç©ºå­?符串ï¼?表示å°?使ç?¨ç³»ç»?å?¾ç??æ??件夹ï¼?é??常设为 ~/å?¾ç??ã??å?¨è®¾ç½®ç??è·¯å¾?"
+"æ??å??ç??æ??件夹ä¸?å­?å?¨æ?¶ä¹?å°?使ç?¨è¯¥æ??件夹ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Thread the message-list based on Subject"
 msgstr "å?ºäº?主é¢?æ??线索ç¼?æ??ä¿¡æ?¯å??表"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Timeout for marking message as seen"
 msgstr "å°?ä¿¡æ?¯æ ?为已ç??ç??è¶?æ?¶æ?¶é?¿"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "Timeout for marking message as seen."
 msgstr "å°?ä¿¡æ?¯æ ?为已ç??ç??è¶?æ?¶æ?¶é?¿ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "UID string of the default account."
 msgstr "é»?认å¸?å?·ç?? UID å­?符串ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "å½?使ç?¨è¡?å??æ?¼å??æ£?æ?¥æ?¶ï¼?é??误æ?¼å??å??è¯?ç??ä¸?å??线ç??é¢?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Use SpamAssassin daemon and client"
 msgstr "使ç?¨å??å?¾å??æ??å®?æ?¤ç¨?åº?å??客æ?·"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使ç?¨ SpamAssassin å®?æ?¤ç¨?åº?å??客æ?·ç«¯(spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Use custom fonts"
 msgstr "使������"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Use custom fonts for displaying mail."
 msgstr "使ç?¨è?ªå®?ä¹?å­?ä½?æ?¾ç¤ºé?®ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾ä¿¡æ?¯æµ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ä¹?使ç?¨æ?¬å?°å??å?¾ä¿¡æ?¯æµ?è¯?(æ?  DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:221
 #, fuzzy
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
-msgstr "ç?¨æ?·å¸¸ä¸ºå??å¤?ä¿¡æ?¯æ?¶å??æ ?ä½?ç½®ä¸?å®?è??æ?¼ç?«ã??è¿?个é??项å?³å®?äº?å??å¤?æ?¶å??æ ?"
-"ä½?äº?é?®ç®±é¡¶é?¨è¿?æ?¯åº?é?¨ã??"
+msgstr ""
+"ç?¨æ?·å¸¸ä¸ºå??å¤?ä¿¡æ?¯æ?¶å??æ ?ä½?ç½®ä¸?å®?è??æ?¼ç?«ã??è¿?个é??项å?³å®?äº?å??å¤?æ?¶å??æ ?ä½?äº?é?®ç®±é¡¶é?¨è¿?"
+"æ?¯åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:222
 #, fuzzy
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
-msgstr "ç?¨æ?·å¸¸ä¸ºå??å¤?ä¿¡æ?¯æ?¶ç­¾å??ä½?ç½®ä¸?å®?è??æ?¼ç?«ã??è¿?个é??项å?³å®?äº?å??å¤?æ?¶ç­¾å??"
-"ä½?äº?é?®ç®±é¡¶é?¨è¿?æ?¯åº?é?¨ã??"
+msgstr ""
+"ç?¨æ?·å¸¸ä¸ºå??å¤?ä¿¡æ?¯æ?¶ç­¾å??ä½?ç½®ä¸?å®?è??æ?¼ç?«ã??è¿?个é??项å?³å®?äº?å??å¤?æ?¶ç­¾å??ä½?äº?é?®ç®±é¡¶é?¨è¿?"
+"æ?¯åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "å??宽å­?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é»?认对æ??æ??ä¿¡æ?¯æ·»å? é??读æ?¶æ?¡è¯·æ±?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:225
+msgid ""
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+"å?¨ Evolution å?¯å?¨æ?¶ï¼?æ?¯ä¸?æ?¯æ£?æ?¥æ??æ??æ´»å?¨è´¦æ?·ç??æ?°ä¿¡æ?¯è??ä¸?管账æ?·ç??â??æ¯?é?? X å??é??è?ª"
+"å?¨æ£?æ?¥æ?°ä¿¡æ?¯â??é??项å¦?ä½?设置ã??该é??项ä¸?â??send_recv_on_startâ??é??项ä¸?起使ç?¨ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:226
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr "æ?¯å?¦å?¨ Evolution å?¯å?¨æ?¶æ£?æ?¥æ?°ä¿¡æ?¯ã??ä¹?å??æ?¬å??é??å??件箱中ç??ä¿¡æ?¯ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ç¦?ç?¨æ??å?¯ç?¨ä¾§è¾¹æ ?中æ??件夹å??ç??ç??ç?¥æ?¾ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "æ?¯å?¦å?¨ä¿¡æ?¯ä¸?å??å?« In-Reply-To æ?? References 头æ?¶å¼ºå?¶æ??主é¢?ç¼?æ??线索ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦ä»¥çº¿ç´¢ä¸­ç??æ??æ?°ä¿¡æ?¯æ?¥æ??åº?线索"
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -12002,11 +10863,11 @@ msgstr ""
 "å?¨è¿?滤ç»?æ??å??æ?¯å?¦å?·æ?°å??件箱ã??ä»?å?¨ä½¿ç?¨è¿?ä»»ä½?â??转å??ç»?â??è¿?滤å?¨è¡?为并ä¸?å?¨ä¸?次è°?ç?¨å¤§"
 "约ä¸?å??é??å??è¿?è¡?å??件箱å?·æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "ä¿¡æ?¯å??表é?¢æ?¿ç??é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "ä¿¡æ?¯å??表é?¢æ?¿ç??é«?度ã??"
 
@@ -12014,18 +10875,18 @@ msgstr "ä¿¡æ?¯å??表é?¢æ?¿ç??é«?度ã??"
 msgid "Importing Elm data"
 msgstr "导� Elm ��"
 
-#: ../mail/importers/elm-importer.c:337 ../mail/importers/pine-importer.c:413
-#: ../modules/mail/e-mail-shell-view.c:1030
+#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../modules/mail/e-mail-shell-view.c:1045
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "�件"
 
-#: ../mail/importers/elm-importer.c:378
+#: ../mail/importers/elm-importer.c:380
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 导��"
 
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:381
 msgid "Import mail from Elm."
 msgstr "ä»? Elm 导å?¥é?®ä»¶ã??"
 
@@ -12036,12 +10897,12 @@ msgstr "ç?®ç??æ??件夹(_D)ï¼?"
 
 #: ../mail/importers/evolution-mbox-importer.c:133
 #: ../plugins/dbx-import/dbx-importer.c:233
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder"
 msgstr "é??æ?©æ??件夹"
 
 #: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder to import into"
 msgstr "é??æ?©è¦?导å?¥å?°å?ªä¸ªæ??件夹"
 
@@ -12069,15 +10930,15 @@ msgid "Importing mailbox"
 msgstr "导��箱"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:147
-#: ../plugins/dbx-import/dbx-importer.c:565
-#: ../plugins/pst-import/pst-importer.c:474
-#: ../plugins/pst-import/pst-importer.c:583
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:568
+#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:587
 #, c-format
 msgid "Importing '%s'"
 msgstr "æ­£å?¨å¯¼å?¥â??%sâ??"
 
-#: ../mail/importers/mail-importer.c:304
+#: ../mail/importers/mail-importer.c:308
 #, c-format
 msgid "Scanning %s"
 msgstr "æ­£å?¨æ?«æ?? %s"
@@ -12086,16 +10947,16 @@ msgstr "æ­£å?¨æ?«æ?? %s"
 msgid "Importing Pine data"
 msgstr "导� Pine ��"
 
-#: ../mail/importers/pine-importer.c:418
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/addressbook/addressbook-config.c:1016
 msgid "Address Book"
 msgstr "å?°å??ç°¿"
 
-#: ../mail/importers/pine-importer.c:460
+#: ../mail/importers/pine-importer.c:462
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine 导��"
 
-#: ../mail/importers/pine-importer.c:461
+#: ../mail/importers/pine-importer.c:463
 msgid "Import mail from Pine."
 msgstr "ä»? Pine 导å?¥é?®ä»¶ã??"
 
@@ -12128,7 +10989,7 @@ msgstr "æ·»å? è¿?滤è§?å??"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:475
+#: ../mail/mail-autofilter.c:480
 #, fuzzy, c-format
 #| msgid ""
 #| "The filter rule \"%s\" has been updated, because it used just removed "
@@ -12148,7 +11009,7 @@ msgid_plural ""
 msgstr[0] ""
 "以ä¸?è¿?滤è§?å??\n"
 "%s å·²ç»?ä¿®æ?¹ï¼?以ç?¨äº?å? é?¤æ??件夹\n"
-"\"%s\"ã??"
+"â??%sâ??ã??"
 
 #: ../mail/mail-config.ui.h:1
 msgid "Account Information"
@@ -12164,7 +11025,6 @@ msgstr "å½?使ç?¨è¯¥å¸?å?·æ?¶æ?»æ?¯å??é??ç­¾å??ä¿¡æ?¯(_W)"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:5
-#| msgid "Prompt when mailing list redirects private reply back to list"
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "å??许é?®ä»¶å??表å°?ç§?人å??å¤?é??å®?å??å?°å??表(_M)"
 
@@ -12197,7 +11057,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "åº?ç?¨å??æ ·ç??æ?¥ç??设置å?°æ??æ??æ??件夹(_v)"
 
 #: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1020
+#: ../modules/addressbook/addressbook-config.c:1023
 msgid "Authentication"
 msgstr "身份��"
 
@@ -12218,374 +11078,389 @@ msgid "Check cu_stom headers for junk"
 msgstr "æ£?æ?¥è?ªå®?ä¹?信头以å?¤å?«å??å?¾ä¿¡æ?¯(_S)"
 
 #: ../mail/mail-config.ui.h:19
+msgid "Check for new _messages on start"
+msgstr "��������信�(_M)"
+
+#: ../mail/mail-config.ui.h:20
+msgid "Check for new messa_ges in all active accounts"
+msgstr "æ£?æ?¥æ??æ??æ´»å?¨è´¦æ?·ç??æ?°ä¿¡æ?¯(_G)"
+
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "æ£?æ?¥æ?¶å?°ç??é?®ä»¶æ?¯å?¦æ?¯å??å?¾ä¿¡æ?¯(_M)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "å?¨æ??è¾?å?¥æ?¶è¿?è¡?æ?¼å??æ£?æ?¥(_T)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "��(_A)"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "��(_R)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "ç»?é??误æ?¼å??ç??å??è¯?ç??è?²(_M)ï¼?"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "æ?°å??ä¿¡æ?¯"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 #: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "é??ç½®"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "é??æ¯?æ??件夹æ?¶ç¡®è®¤(_W)"
 
-#: ../mail/mail-config.ui.h:27
-#| msgid "Configuration"
+#: ../mail/mail-config.ui.h:29
 msgid "Confirmations"
 msgstr "é??ç½®"
 
 #: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:155
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Date/Time Format"
+msgstr "æ?¥æ??/æ?¶é?´æ ¼å¼?"
+
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "�认�为"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "é»?认å­?符ç¼?ç ?(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "å? é?¤é?®ä»¶"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "é??å?ºæ?¶å? é?¤å??å?¾ä¿¡æ?¯(_X)"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "对å¯?å?ºç??ä¿¡æ?¯è¿?è¡?æ?°å­?ç­¾å??(é»?认)(_U)"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:38
 msgid "Displayed Message Headers"
 msgstr "�示信头"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "å¦?æ??ä¿¡æ?¯å??é??è??å?¨å?°å??簿中å??ä¸?æ ?记为å??å?¾ä¿¡æ?¯(_K)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "���"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "è??稿æ??件夹(_F)ï¼?"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "ç?µå­?é?®ä»¶å?°å??(_A)ï¼?"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "é??å?ºæ?¶æ¸?空已å? é?¤é?®ä»¶(_X)"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Encry_ption certificate:"
 msgstr "å? å¯?è¯?书(_P)ï¼?"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¯?å?ºç??ä¿¡æ?¯(é»?认)(_G)"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
 msgid "F_all back to threading messages by subject"
 msgstr "é»?认æ??ç?§ä¸»é¢?对线索中ç??ä¿¡æ?¯æ??åº?(_A)"
 
-#: ../mail/mail-config.ui.h:46
-#| msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:48
 msgid "Fix_ed Width Font:"
 msgstr "�宽��(_E)�"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Format messages in _HTML"
 msgstr "ç?¨ HTML æ ¼å¼?å??ä¿¡æ?¯(_H)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E)ï¼?"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:52
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "å¦?æ??å?¯è?½ï¼?ç»?å??å¤?å?ªå??å¤?ç»?é?®ä»¶å??表ã??"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:53
 msgid "HTML Messages"
 msgstr "HTML ä¿¡æ?¯"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:54
 msgid "H_TTP Proxy:"
 msgstr "HTTP 代ç??æ??å?¡å?¨(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:55
 msgid "Headers"
 msgstr "信头"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:56
 msgid "Highlight _quotations with"
 msgstr "���示��(_Q)"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "忽ç?¥é?®ä»¶å??表ç??â??å??å¤?è?³â??å??æ?°"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:58
 msgid "Inline"
 msgstr "åµ?å?¥"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:59
 msgid "Inline (Outlook style)"
 msgstr "åµ?å?¥(Outlook é£?æ ¼)"
 
-#: ../mail/mail-config.ui.h:59 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æ ?ç­¾"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:62
 msgid "Languages Table"
 msgstr "语�表"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:63
 msgid "Loading Images"
 msgstr "è½½å?¥å?¾å??"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:64
 msgid "Mail Headers Table"
 msgstr "�件头表"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:65
 msgid "Mailbox location"
 msgstr "�件箱�置"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:66
 msgid "Message Display"
 msgstr "信��示"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:67
 msgid "Message Receipts"
 msgstr "已读å??æ?§"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:68
 msgid "No _Proxy for:"
 msgstr "ä¸?使ç?¨ä»£ç??ç??æ??å?µ(_P)ï¼?"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:70
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°å?¹é??ç??è?ªå®?ä¹?å??å?¾ä¿¡å¤´ï¼?æ­¤é??项å°?被è¦?ç??ã??"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:71
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "å?¯é??ä¿¡æ?¯"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:73
 msgid "Or_ganization:"
 msgstr "ç»?ç»?(_G)ï¼?"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:74
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG é?®æ ?è¯?(_K)ï¼?"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:75
 msgid "Pass_word:"
 msgstr "å¯?ç ?(_W)ï¼?"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Pick a color"
+msgstr "é??å??ä¸?ç§?é¢?è?²"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Port:"
 msgstr "端��"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:78
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "GNU ���士(PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "Proxy Settings"
 msgstr "代ç??设置"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Quoted"
 msgstr "å¼?ç?¨"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Re_member password"
 msgstr "è®°ä½?å¯?ç ?(_M)"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "Re_ply-To:"
 msgstr "å??å¤?å?°(_P)ï¼?"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "Remember _password"
 msgstr "è®°ä½?å¯?ç ?(_P)"
 
-#: ../mail/mail-config.ui.h:83
-#| msgid "Replies and parents"
+#: ../mail/mail-config.ui.h:85
 msgid "Replies and Forwards"
 msgstr "å??å¤?å??转å??"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
 msgid "Required Information"
 msgstr "é??è¦?ç??ä¿¡æ?¯"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:87
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:92
 msgid "SSL is not supported in this build of Evolution"
 msgstr "此次ç¼?è¯?ç?? Evolution ä¸?æ?¯æ?? SSL"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ä»?å?¨æ?¬å?°å?°å??簿中æ??ç´¢å??件人ç?§ç??(_E)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
 msgid "S_elect..."
 msgstr "é??æ?©(_E)..."
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:95
 msgid "S_end message receipts:"
 msgstr "å??é??ä¿¡æ?¯æ?¶æ?¡(_E)ï¼?"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:96
 msgid "S_tandard Font:"
 msgstr "æ ?å??å­?ä½?(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:97
 msgid "Secure MIME (S/MIME)"
 msgstr "å®?å?¨ MIME(S/MIME)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:99
 msgid "Select HTML fixed width font"
 msgstr "é??æ?© HTML å?ºå®?宽度å­?ä½?"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:100
 msgid "Select HTML variable width font"
 msgstr "é??æ?© HTML å??宽度å­?ä½?"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:101
 msgid "Sender Photograph"
 msgstr "å??é??è??ç?§ç??"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:101
-#| msgid "Prompt when sending private replies to mailing _list messages"
+#: ../mail/mail-config.ui.h:103
 msgid "Sending a _private reply to a mailing list message"
 msgstr "å??é?®ä»¶å??表é?®ç®±å??é??ç§?人å??å¤?æ?¶(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
-#| msgid "_Prompt when sending messages with an empty subject line"
+#: ../mail/mail-config.ui.h:105
 msgid "Sending a message with an _empty subject line"
 msgstr "å??é??带空主é¢?è¡?ç??ä¿¡æ?¯æ?¶(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: ../mail/mail-config.ui.h:107
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "å??é??å?ªå¡«å??äº?å¯?件æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯æ?¶(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
-#| msgid "Send reply to all recipients?"
+#: ../mail/mail-config.ui.h:109
 msgid "Sending a reply to a large _number of recipients"
 msgstr "å??å¾?å¤?æ?¶ä»¶äººå??é??å??å¤?æ?¶(_N)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "å·²å??é??ä¿¡æ?¯æ??件夹(_M)ï¼?"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "æ??å?¡å?¨é??è¦?认è¯?(_V)"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:112
 msgid "Server Configuration"
 msgstr "æ??å?¡å?¨é??ç½®"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "æ??å?¡å?¨ç±»å??(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:114
 msgid "Si_gning algorithm:"
 msgstr "ç­¾å??å?½æ?°(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "ç­¾å??(_N)"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "ç­¾å??è¯?书(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "ç­¾å??(_U)ï¼?"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "ç­¾å??"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Signing _algorithm:"
 msgstr "ç­¾å??å?½æ?°(_A)ï¼?"
 
-#: ../mail/mail-config.ui.h:118
-#| msgid "Local Folders"
+#: ../mail/mail-config.ui.h:120
 msgid "Special Folders"
 msgstr "ç?¹æ®?æ??件夹"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Spell Checking"
 msgstr "æ?¼å??æ£?æ?¥"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 msgid "Start _typing at the bottom on replying"
 msgstr "å??å¤?æ?¶å?¨åº?é?¨å¼?å§?æ??å­?(_T)"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
+msgid "Start up"
+msgstr "��"
+
+#: ../mail/mail-config.ui.h:125
 msgid "T_ype:"
 msgstr "ç±»å??(_Y)ï¼?"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "å?¨æ­¤å??å?ºç??语è¨?å??æ? äº?æ?¨æ??å®?è£?ç??å­?å?¸ã??"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12594,13 +11469,13 @@ msgstr ""
 "æ­¤è??æ?¬ç??è¾?å?ºå°?ç?¨äº?æ?¨ç??ç­¾å??ã??æ?¨æ??å®?ç??å??称å°?å?ªä¼?\n"
 "ç?¨äº?æ?¾ç¤ºã??"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:130
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr "为äº?帮å?©é?¿å??ç?µå­?é?®ä»¶æ??å¤?å??é?®é¢?ï¼?å?¨é??å??以ä¸?å?¾é??ç??æ??ä½?å??请æ±?确认ï¼?"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12608,145 +11483,141 @@ msgstr ""
 "è¾?å?¥æ?¨æ?³è¦?ç»?æ­¤å¸?å?·èµ·ç??å??å­?ã??\n"
 "å¦?ï¼?â??å·¥ä½?â??æ??â??ç§?人â??"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:133
 msgid "Us_ername:"
 msgstr "ç?¨æ?·å??(_E)ï¼?"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:134
 msgid "Use Authe_ntication"
 msgstr "使�身份��(_N)"
 
-#: ../mail/mail-config.ui.h:132
-#| msgid "User_name:"
+#: ../mail/mail-config.ui.h:135
 msgid "User _Name:"
 msgstr "ç?¨æ?·å??(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:136
 msgid "_Add Signature"
 msgstr "æ·»å? ç­¾å??(_A)"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:137
 msgid "_Always load images from the Internet"
 msgstr "æ?»æ?¯ä»? Internet ä¸?è½½å?¥å?¾å??(_A)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:138
 msgid "_Authentication Type"
 msgstr "身份éª?è¯?ç±»å??(_A)"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:139
 msgid "_Default junk plugin:"
 msgstr "é»?认ç??å??å?¾ä¿¡æ?¯æ??件(_D)ï¼?"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:140
 msgid "_Direct connection to the Internet"
 msgstr "����� Internet(_D)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:141
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?è¦?ç­¾å??ä¼?议请æ±?(å?? Outlook å?¼å®¹)(_D)"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:142
 msgid "_Forward style:"
 msgstr "转å??æ?¹å¼?(_F)ï¼?"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:143
 msgid "_Junk Folder:"
 msgstr "å??å?¾ä¿¡æ?¯æ??件夹(_J)ï¼?"
 
-#: ../mail/mail-config.ui.h:141
-#| msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:144
 msgid "_Keep signature above the original message on replying"
 msgstr "å??å¤?æ?¶ä¿?ç??å??å§?ä¿¡æ?¯ç??ç­¾å??(_K)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Languages"
 msgstr "语�(_L)"
 
-#: ../mail/mail-config.ui.h:143
-#| msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:146
 msgid "_Load images only in messages from contacts"
 msgstr "è½½å?¥æ?¥è?ªè??系人ç??é?®ä»¶ä¸­ç??å?¾å??(_L)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Lookup in local address book only"
 msgstr "ä»?å?¨æ?¬å?°å?°å??簿中æ?¥é??(_L)"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Make this my default account"
 msgstr "使å®?æ??为æ??ç??é»?认å¸?å?·(_M)"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:149
 msgid "_Manual proxy configuration:"
 msgstr "æ??å?¨ä»£ç??æ??å?¡å?¨é??ç½®(_M)ï¼?"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 msgid "_Never load images from the Internet"
 msgstr "ç»?ä¸?ä»? Internet è½½å?¥å?¾å??(_N)"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Path:"
 msgstr "路�(_P)�"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "å??é??ç»?ä¸?æ?³æ?¥æ?¶ HTML ç??è??系人æ?¶æ??示(_P)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Reply style:"
 msgstr "å??å¤?é£?æ ¼(_R)ï¼?"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:155
 msgid "_Script:"
 msgstr "è??æ?¬(_S)ï¼?"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP 代ç??(_S)ï¼?"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "æ??å?¡å?¨(_S)ï¼?"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
-#| msgid "Show animated images as animations."
+#: ../mail/mail-config.ui.h:160
 msgid "_Show animated images"
 msgstr "æ?¾ç¤ºå?¨æ??å?¾å??(_S)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨ä¿¡æ?¯é¢?è§?中æ?¾ç¤ºå??é??è??ç??ç?§ç??(_S)"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:162
 msgid "_Trash Folder:"
 msgstr "åº?件箱æ??件夹(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:163
 msgid "_Use Secure Connection:"
 msgstr "使�����(_U)�"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:164
 msgid "_Use system defaults"
 msgstr "使��认�(_U)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:165
 msgid "_Use the same fonts as other applications"
 msgstr "使ç?¨ä¸?å?¶å®?åº?ç?¨ç¨?åº?ç?¸å??ç??å­?ä½?(_U)"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:168
 msgid "color"
 msgstr "��"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:169
 msgid "description"
 msgstr "æ??è¿°"
 
@@ -12846,7 +11717,7 @@ msgstr "æ ?å¿?(_F)ï¼?"
 msgid "_Tick this to accept the license agreement"
 msgstr "é??中此å¤?以表æ??æ?¨æ?¥å??许å?¯å??è®®(_T)"
 
-#: ../mail/mail-folder-cache.c:791
+#: ../mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "�� %s"
@@ -12855,133 +11726,138 @@ msgstr "�� %s"
 msgid "Filtering Selected Messages"
 msgstr "è¿?滤é??中ç??ä¿¡æ?¯"
 
-#: ../mail/mail-ops.c:224
+#: ../mail/mail-ops.c:226
 msgid "Fetching Mail"
 msgstr "æ?¶å??é?®ä»¶"
 
-#: ../mail/mail-ops.c:780
+#: ../mail/mail-ops.c:785
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ­£å?¨å??é??第 %d å°?ä¿¡ï¼?å?± %d å°?"
 
-#: ../mail/mail-ops.c:827
+#: ../mail/mail-ops.c:831
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "�第%d�信失败��%d�"
 
-#: ../mail/mail-ops.c:829 ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:831 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:1027
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "正�移�信�� %s"
 
-#: ../mail/mail-ops.c:1027
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "æ??ä¿¡æ?¯å¤?å?¶å?° %s"
 
-#: ../mail/mail-ops.c:1146
+#: ../mail/mail-ops.c:1062
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "å?¨â??%sâ??中æ?«æ??æ??件夹"
 
-#: ../mail/mail-ops.c:1258
+#: ../mail/mail-ops.c:1178
 msgid "Forwarded messages"
 msgstr "转å??ç??ä¿¡æ?¯"
 
-#: ../mail/mail-ops.c:1373
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "æ­£å?¨è?·å??æ??件å?  %s ç??é??é¢?ä¿¡æ?¯"
 
-#: ../mail/mail-ops.c:1446
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "æ??å¼?å­?å?¨ %s"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1446
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "å? é?¤æ??件夹 %s"
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1585
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "å­?å?¨æ??件夹â??%sâ??"
 
-#: ../mail/mail-ops.c:1723
+#: ../mail/mail-ops.c:1654
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "é??æ¯?并å­?å?¨å¸?å?·â??%sâ??"
 
-#: ../mail/mail-ops.c:1724
+#: ../mail/mail-ops.c:1655
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å­?å?¨å¸?å?·â??%sâ??"
 
-#: ../mail/mail-ops.c:1780
+#: ../mail/mail-ops.c:1713
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "å?·æ?°æ??件夹 %s"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1877
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "é??æ¯?æ??件夹 %s"
 
-#: ../mail/mail-ops.c:1865
+#: ../mail/mail-ops.c:1949
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?空â??%sâ??中ç??åº?件箱"
 
-#: ../mail/mail-ops.c:1866
+#: ../mail/mail-ops.c:1950
 msgid "Local Folders"
 msgstr "æ?¬å?°æ??件夹"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2123
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "æ?¶å?? %d å°?ä¿¡"
 
-#: ../mail/mail-ops.c:2180
+#: ../mail/mail-ops.c:2216
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ä¿?å­? %d å°?ä¿¡"
 
-#: ../mail/mail-ops.c:2276
+#: ../mail/mail-ops.c:2312
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "å?¨å°?ä¿¡æ?¯ä¿?å­?å?° %s æ?¶å??ç??é??误ï¼?\n"
 
-#: ../mail/mail-ops.c:2433
+#: ../mail/mail-ops.c:2387
 #, c-format
-msgid "Disconnecting from '%s'"
-msgstr "æ?­å¼?ä¸? %s ç??è¿?æ?¥"
+msgid "Preparing account '%s' for offline"
+msgstr "æ­£å?¨å??å¤?离线使ç?¨å¸?å?·â??%sâ??"
+
+#: ../mail/mail-ops.c:2478
+msgid "Checking Service"
+msgstr "æ£?æ?¥æ??å?¡"
 
-#: ../mail/mail-ops.c:2433
+#: ../mail/mail-ops.c:2558
 #, c-format
-msgid "Reconnecting to '%s'"
-msgstr "é??æ?°è¿?æ?¥å?° %s"
+msgid "Disconnecting %s"
+msgstr "正��� %s"
 
-#: ../mail/mail-ops.c:2527
+#: ../mail/mail-ops.c:2615
 #, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "æ­£å?¨å??å¤?è?±æ?ºä½¿ç?¨å¸?å?·â??%sâ??"
+msgid "Removing attachments"
+msgstr "æ­£å?¨ç§»é?¤é??件"
 
-#: ../mail/mail-ops.c:2616
-msgid "Checking Service"
-msgstr "æ£?æ?¥æ??å?¡"
+#: ../mail/mail-ops.c:2662
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "å·²ç»?å? é?¤äº?â??%sâ??æ??件ã??"
 
-#: ../mail/mail-send-recv.c:191
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "æ­£å?¨å??æ¶?..."
 
@@ -13009,7 +11885,7 @@ msgstr "����件"
 #: ../mail/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory '%s': %s"
-msgstr "æ? æ³?å??建è?±æ?ºç?®å½?â??%sâ??ï¼?%s"
+msgstr "æ? æ³?å??建离线ç?®å½?â??%sâ??ï¼?%s"
 
 #: ../mail/mail-tools.c:102
 #, c-format
@@ -13025,17 +11901,17 @@ msgstr "转å??ç??ä¿¡æ?¯ - %s"
 msgid "Forwarded message"
 msgstr "转å??ç??ä¿¡æ?¯"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:86
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "设置æ??ç´¢æ??件夹ï¼?%s"
 
-#: ../mail/mail-vfolder.c:234
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?°â??%s:%sâ??ç??æ??ç´¢æ??件夹"
 
-#: ../mail/mail-vfolder.c:241
+#: ../mail/mail-vfolder.c:242
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?°â??%sâ??ç??æ??ç´¢æ??件夹"
@@ -13045,7 +11921,7 @@ msgstr "æ?´æ?°â??%sâ??ç??æ??ç´¢æ??件夹"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:702
+#: ../mail/mail-vfolder.c:709
 #, fuzzy, c-format
 #| msgid ""
 #| "The Search Folder \"%s\" has been updated, because it used just removed "
@@ -13066,13 +11942,13 @@ msgid_plural ""
 msgstr[0] ""
 "以ä¸?æ??ç´¢æ??件夹\n"
 "%s å·²ç»?ä¿®æ?¹ï¼?以ç?¨äº?å? é?¤æ??件夹\n"
-"\"%s\"ã??"
+"â??%sâ??ã??"
 
-#: ../mail/mail-vfolder.c:1238
+#: ../mail/mail-vfolder.c:1273
 msgid "Edit Search Folder"
 msgstr "ç¼?è¾?æ??ç´¢æ??件夹"
 
-#: ../mail/mail-vfolder.c:1350
+#: ../mail/mail-vfolder.c:1380
 msgid "New Search Folder"
 msgstr "æ?°å»ºæ??ç´¢æ??件夹"
 
@@ -13263,7 +12139,6 @@ msgstr ""
 "Lock ç?¯å?¯è?½ä¸ºå¼?ã??"
 
 #: ../mail/mail.error.xml.h:43
-#| msgid "Close this window"
 msgid "Close message window."
 msgstr "å?³é?­ä¿¡æ?¯çª?å?£ã??"
 
@@ -13272,120 +12147,137 @@ msgid "Could not save signature file."
 msgstr "æ? æ³?ä¿?å­?ç­¾å??æ??件ã??"
 
 #: ../mail/mail.error.xml.h:45
+msgid ""
+"Default local store has been changed from mbox to maildir format. Do you "
+"want to migrate now ?\n"
+"\n"
+"A mbox account will be created to preserve the old mbox folders. You can "
+"delete it after ensuring the data is safely migrated. Please make sure there "
+"is enough space if you choose to migrate."
+msgstr ""
+"é»?认ç??æ?¬å?°å­?å?¨å·²ç»?ä»? mbox æ ¼å¼?æ?¹ä¸º maildir æ ¼å¼?ã??æ?¨æ?³ç?°å?¨è¿?è¡?è¿?移å??ï¼?\n"
+"\n"
+"å°?ä¼?å??建ä¸?个 mbox è´¦æ?·æ?¥ä¿?ç??æ?§ç?? mbox æ??件夹ã??å?¨ç¡®ä¿¡æ?°æ?®å·²ç»?å®?å?¨è¿?移å??ï¼?æ?¨å?¯"
+"以å? é?¤å®?ã??è¦?è¿?移ï¼?请å??ç¡®ä¿?æ??足å¤?ç??ç£?ç??空é?´ã??"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "å? é?¤æ??ç´¢æ??件夹â??{0}â??中ç??ä¿¡æ?¯å??ï¼?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:50
 msgid "Do _Not Disable"
 msgstr "���(_N)"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:51
 msgid "Do _Not Send"
 msgstr "ä¸?å??é??(_N)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
 msgid "Do _Not Synchronize"
 msgstr "ä¸?å??æ­¥(_D)"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "æ?¨æ?³è¦?å??æ­¥é?£äº?æ ?记为离线使ç?¨ç??æ??件夹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:54
 msgid "Do you want to mark all messages as read?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?æ??æ??æ??ä¿¡æ?¯æ ?记为已读ï¼?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
 msgid "Do you wish to save your changes?"
 msgstr "æ?¨å¸?æ??ä¿?å­?æ?´æ?¹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
 msgid "Enter password."
 msgstr "è¾?å?¥å¯?ç ?ã??"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid "Error loading filter definitions."
 msgstr "è½½å?¥è¿?滤å?¨å®?ä¹?é??误ã??"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid "Error while performing operation."
 msgstr "æ?§è¡?æ??ä½?æ?¶å?ºé??ã??"
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 msgid "Error while {0}."
 msgstr "{0} æ?¶å?ºé??ã??"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to unsubscribe from folder."
+msgstr "æ? æ³?é??订æ??件夹ã??"
+
+#: ../mail/mail.error.xml.h:64
 msgid "File exists but cannot overwrite it."
 msgstr "æ??件å­?å?¨ä½?æ? æ³?è¦?ç??ã??"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but is not a regular file."
 msgstr "æ??件å­?å?¨ä½?ä¸?æ?¯æ?®é??æ??件ã??"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:63
-#| msgid "The attachment does not contain a valid calendar message"
+#: ../mail/mail.error.xml.h:67
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "â??{0}â??æ??件夹中没æ??é??å¤?ä¿¡æ?¯ã??"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:68
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??æ?¨ç»§ç»­ç??è¯?ï¼?æ?¨å°?æ? æ³?æ?¢å¤?è¿?äº?ä¿¡æ?¯ã??"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "å¦?æ??æ?¨å? é?¤æ??件夹ï¼?å?¶ä¸­ç??å?¨é?¨å??容å??å?¶å­?æ??件夹å??容å°?被永ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "å¦?æ??æ?¨å? é?¤æ??件夹ï¼?å?¶ä¸­ç??å?¨é?¨å??容å°?被永ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:71
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "å¦?æ??æ?¨ç»§ç»­ç??è¯?ï¼?å?¨é?¨ä»£ç??æ??å?¡å?¨å¸?å?·é?½å°?被永ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr "å¦?æ??æ?¨ç»§ç»­ç??è¯?ï¼?å¸?å?·ä¿¡æ?¯å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨ä¿¡æ?¯å°?被永ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:74
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??æ?¨ç»§ç»­ç??è¯?ï¼?å¸?å?·ä¿¡æ?¯å°?被永ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "å¦?æ??æ?¨é??å?ºï¼?è¿?äº?ä¿¡æ?¯å°?ä¼?ç­?å?° Evolution ä¸?次å?¯å?¨æ??ä¼?å??å?ºã??"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:76
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:77
 msgid "Invalid authentication"
 msgstr "æ? æ??ç??身份éª?è¯?"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:78
 msgid "Mail Deletion Failed"
 msgstr "é?®ä»¶å? é?¤å¤±è´¥"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:79
 msgid "Mail filters automatically updated."
 msgstr "é?®ä»¶è¿?滤å?¨å·²è?ªå?¨æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:80
 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 "
@@ -13396,37 +12288,39 @@ msgstr ""
 "个é?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??ä¿¡æ?¯ä¸­å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??为äº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?该è?³å°?å¡«å?¥"
 "ä¸?个 To: æ?? CC: æ?¶ä»¶äººã??"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:81
+msgid "Migrate local mbox folders to maildir"
+msgstr "å°?æ?¬å?° mbox æ??件夹è¿?移å?° maildir"
+
+#: ../mail/mail.error.xml.h:82
 msgid "Missing folder."
 msgstr "缺å°?æ??件夹ã??"
 
-#: ../mail/mail.error.xml.h:79
-#| msgid "Never"
+#: ../mail/mail.error.xml.h:84
 msgid "N_ever"
 msgstr "��(_E)"
 
-#: ../mail/mail.error.xml.h:80
-#| msgid "Could not create message."
+#: ../mail/mail.error.xml.h:85
 msgid "No duplicate messages found."
 msgstr "没æ??æ?¾å?°é??å¤?ä¿¡æ?¯ã??"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:86
 msgid "No sources selected."
 msgstr "没æ??é??中æº?ã??"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:87
 msgid "Opening too many messages at once may take a long time."
 msgstr "ä¸?次æ??å¼?太å¤?å°?ä¿¡å?¯è?½è¦?è?±ä¸?ç?¹æ?¶é?´ã??"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:88
 msgid "Please check your account settings and try again."
 msgstr "请æ£?æ?¥æ?¨ç??å¸?å?·è®¾ç½®ï¼?ç?¶å??å??è¯?ä¸?次ã??"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:89
 msgid "Please enable the account or send using another account."
 msgstr "请å?¯ç?¨å¸?å?·æ??è??使ç?¨å?¶å®?å¸?å?·å??é??ã??"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:90
 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."
@@ -13434,7 +12328,7 @@ msgstr ""
 "请å?¨ To: 中è¾?å?¥æ??æ??ç??ç?µå­?é?®ä»¶å?°å??ã??æ?¨å?¯ä»¥å??å?»è¾?å?¥æ¡?æ??è¾¹ç?? To: æ??é?®æ?¥æ??ç´¢ç?µå­?"
 "é?®ä»¶å?°å??ã??"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13443,69 +12337,69 @@ msgstr ""
 "请确å®?ä¸?å??æ?¶ä»¶äººæ?¿æ??并ä¸?è?½å¤?æ?¥æ?¶ HTML é?®ä»¶ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:93
 msgid "Please provide an unique name to identify this signature."
 msgstr "请æ??ä¾?此签å??ç??å?¯ä¸?æ ?è¯?å??称ã??"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:94
 msgid "Please wait."
 msgstr "请ç¨?å??ã??"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:95
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "å??è¿?æ?§ç??é?®ä»¶æ??件夹â??{0}â??å?ºç?°é?®é¢?ã??"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:96
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "æ?¥è¯¢æ??å?¡å?¨æ??æ?¯æ??ç??身份éª?è¯?ç®?æ³?å??表ã??"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:97
 msgid "Read receipt requested."
 msgstr "é??读æ?¶æ?¡å·²è¯·æ±?ã??"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:98
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ç??ç??è¦?å? é?¤æ??件夹â??{0}â??å??å?¶å?¨é?¨å­?æ??件夹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:99
 msgid "Really delete folder \"{0}\"?"
 msgstr "ç??è¦?å? é?¤æ??件夹â??{0}â??ï¼?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:100
 msgid "Remove duplicate messages?"
 msgstr "移é?¤é??å¤?ç??ä¿¡æ?¯ï¼?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:101
 msgid "Reply _Privately"
 msgstr "ç§?人å??å¤?(_P)"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:104
 msgid "Search Folders automatically updated."
 msgstr "æ??ç´¢æ??件夹已è?ªå?¨æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:105
 msgid "Send private reply?"
 msgstr "å??é??ç§?人å??å¤?ï¼?"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:106
 msgid "Send reply to all recipients?"
 msgstr "å??é??å??å¤?ç»?æ??æ??æ?¶ä»¶äººï¼?"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:107
 msgid "Signature Already Exists"
 msgstr "ç­¾å??å·²ç»?å­?å?¨"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:108
 msgid "Synchronize folders locally for offline usage?"
-msgstr "å??æ­¥æ??件夹å?°æ?¬å?°ä»¥è?±æ?ºä½¿ç?¨å??ï¼?"
+msgstr "å??æ­¥æ??件夹å?°æ?¬å?°ä»¥ç¦»çº¿ä½¿ç?¨å??ï¼?"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr "æ?¨æ? æ³?é??å?½å??ã??移å?¨æ??å? é?¤è¦?让 Evolution 正常è¿?ä½?æ??é??ç??ç³»ç»?æ??件夹ã??"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13520,7 +12414,7 @@ msgstr ""
 "个é?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??ä¿¡æ?¯ä¸­å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??为äº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?该è?³å°?å¡«å?¥"
 "ä¸?个 To: æ?? CC: æ?¶ä»¶äººã??"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13528,7 +12422,7 @@ msgstr ""
 "ä¸?å??æ?¥æ?¶è??ä¸?è?½è¢«è¯?å?«ä¸ºæ??æ??ç??ç?µå­?é?®ä»¶å?°å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13536,71 +12430,71 @@ msgstr ""
 "ä¸?å??æ?¥æ?¶è??ä¸?è?½è¢«è¯?å?«ä¸ºæ??æ??ç??ç?µå­?é?®ä»¶å?°å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:118
 msgid "The script file must exist and be executable."
 msgstr "è??æ?¬æ??件å¿?é¡»å­?å?¨ä¸?å?¯æ?§è¡?ã??"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:119
 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:115
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "æ? æ³?å??é??此信æ?¯ï¼?å? 为æ?¨æ??é??æ?©ç?¨æ?¥å??é??ç??å¸?å?·æ?ªå?¯ç?¨"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "æ? æ³?å??é??此信æ?¯ï¼?å? 为æ?¨æ²¡æ??æ??å®?ä»»ä½?æ?¶ä»¶äºº"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "æ­¤æ??å?¡å?¨ä¸?æ?¯æ??此类å??ç??身份éª?è¯?ï¼?ä¹?å?¯è?½æ ¹æ?¬ä¸?æ?¯æ??身份éª?è¯?ã??"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 msgid "This signature has been changed, but has not been saved."
 msgstr "ç­¾å??å·²ç»?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å­?ã??"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "è¿?å°?æ??é??中æ??件夹å??å?¶å­?æ??件夹中ç??å?¨é?¨ä¿¡æ?¯æ ?记为已读ã??"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:126
 msgid "This will mark all messages as read in the selected folder."
 msgstr "è¿?å°?æ??é??中æ??件夹中ç??å?¨é?¨ä¿¡æ?¯æ ?记为已读ã??"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:127
 msgid "Unable to connect to the GroupWise server."
 msgstr "æ? æ³?è¿?æ?¥å?° GroupWise æ??å?¡å?¨ã??"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:128
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "æ? æ³?æ??å¼?æ­¤å¸?å?·ç??è??稿æ??件夹ã??使ç?¨ç³»ç»?ç??è??稿æ??件夹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:129
 msgid "Unable to read license file."
 msgstr "æ? æ³?读å??许å?¯æ??件ã??"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:130
 msgid "Use _Default"
 msgstr "使��认�(_D)"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:131
 msgid "Use default drafts folder?"
 msgstr "使ç?¨é»?认ç??è??稿æ??件夹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13610,12 +12504,11 @@ msgstr ""
 "件ã??\n"
 "æ?¨ç??ç??æ?³è¦?è¿?ä¹?å??å??ï¼?"
 
-#: ../mail/mail.error.xml.h:128
-#| msgid "Would you like to accept it?"
+#: ../mail/mail.error.xml.h:134
 msgid "Would you like to close the message window?"
 msgstr "æ?¨æ?³å?³é?­ä¿¡æ?¯çª?å?£å??ï¼?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:135
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13624,7 +12517,7 @@ msgstr ""
 "æ?¨æ­£å?¨ç»?ä¸?å°?é??è¿?é?®ä»¶å??表æ?¶å?°ç??é?®ä»¶å??é??ä¸?个ç§?ä¸?ç??å??å¤?ï¼?è??é?®ä»¶å??表正è¯?å?¾é??å®?å??"
 "æ?¨ç??å??å¤?å??é?®ä»¶å??表ã??æ?¨ç¡®å®?è¦?继续ä¹?ï¼?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13633,37 +12526,37 @@ msgstr ""
 "æ?¨æ­£å?¨å??å¤?ä¸?å°?é??è¿?é?®ä»¶å??表æ?¶å?°ç??é?®ä»¶ï¼?ä½?æ?¯æ?¨æ­£ç§?ä¸?ç??å??å¤?ç»?å??件人ï¼?è??ä¸?æ?¯é?®ä»¶"
 "å??表ã??æ?¨ç¡®å®?è¦?è¿?ä¹?å??ä¹?ï¼?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:137
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr "æ?¨æ­£è¦?å??å¤?个æ?¶ä»¶äººå??å¤?ä¿¡æ?¯ï¼?æ?¨ç¡®å®?è¦?å??å¤?å?¶ä¸­ç??æ??æ??人å??ï¼?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:138
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "æ?¨æ²¡æ??足å¤?ç??æ??é??å? é?¤æ­¤é?®ä»¶ã??"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:139
 msgid "You have not filled in all of the required information."
 msgstr "æ?¨æ²¡æ??å¡«å?¥æ??é??ç??å?¨é?¨ä¿¡æ?¯ã??"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:140
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "æ?¨æ??æ?ªå??é??ä¿¡æ?¯ï¼?æ?¨ä»?ç?¶æ?³è¦?é??å?ºå??ï¼?"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:141
 msgid "You may not create two accounts with the same name."
 msgstr "æ?¨ä¸?è?½å??建两个å??å??å¸?å?·ã??"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:142
 msgid "You must name this Search Folder."
 msgstr "æ?¨å¿?须为此æ??ç´¢æ??件夹å?½å??ã??"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:143
 msgid "You must specify a folder."
 msgstr "æ?¨å¿?é¡»æ??å®?æ??件夹ã??"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13672,142 +12565,143 @@ msgstr ""
 "æ?¨å¿?é¡»ä¸?次è?³å°?æ??å®?ä¸?个æ??件夹ä½?为æº?ã??\n"
 "æ??è??é??ä¸?é??æ?©æ??件夹ï¼?æ??è??é??中å?¨é?¨æ?¬å?°æ??件夹å??/æ??å?¨é?¨è¿?ç¨?æ??件夹ã??"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:146
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "æ?¨ä»¥â??{0}â??ç??身份ç?»å½?å?°æ??å?¡å?¨â??{0}â??失败ã??"
 
-#: ../mail/mail.error.xml.h:141
-#| msgid "Always"
+#: ../mail/mail.error.xml.h:147
 msgid "_Always"
 msgstr "��(_A)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:148
 msgid "_Append"
 msgstr "追å? (_A)"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:149
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "��(_D)"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:150
 msgid "_Discard changes"
 msgstr "丢���(_D)"
 
-#: ../mail/mail.error.xml.h:145
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../mail/mail.error.xml.h:151
+#: ../modules/mail/e-mail-shell-view-actions.c:1054
 msgid "_Empty Trash"
 msgstr "�空�件箱(_E)"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:152
 msgid "_Expunge"
 msgstr "é??æ¯?(_E)"
 
-#: ../mail/mail.error.xml.h:147
-#| msgid "No"
+#: ../mail/mail.error.xml.h:153
 msgid "_No"
 msgstr "å?¦(_N)"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:154
 msgid "_Open Messages"
 msgstr "æ??å¼?ä¿¡æ?¯(_O)"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:157
 msgid "_Send Receipt"
 msgstr "å??é??已读å??æ?§(_S)"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:158
 msgid "_Synchronize"
 msgstr "å??æ­¥(_S)"
 
-#: ../mail/mail.error.xml.h:153
-#| msgid "Yes"
+#: ../mail/mail.error.xml.h:159
 msgid "_Yes"
 msgstr "æ?¯(_Y)"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1213
 msgid "Unseen"
 msgstr "æ?ªç??"
 
-#: ../mail/message-list.c:1176
+#: ../mail/message-list.c:1214
 msgid "Seen"
 msgstr "å·²ç??"
 
-#: ../mail/message-list.c:1177
+#: ../mail/message-list.c:1215
 msgid "Answered"
 msgstr "已��"
 
-#: ../mail/message-list.c:1178
+#: ../mail/message-list.c:1216
 msgid "Forwarded"
 msgstr "已转å??"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1217
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å°?æ?ªç??ä¿¡æ?¯"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1218
 msgid "Multiple Messages"
 msgstr "��信"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1222
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1223
 msgid "Lower"
 msgstr "è¾?ä½?"
 
-#: ../mail/message-list.c:1189
+#: ../mail/message-list.c:1227
 msgid "Higher"
 msgstr "è¾?é«?"
 
-#: ../mail/message-list.c:1190
+#: ../mail/message-list.c:1228
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1799 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1806 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "�天%p%l:%M"
 
-#: ../mail/message-list.c:1815
+#: ../mail/message-list.c:1853
 msgid "Yesterday %l:%M %p"
 msgstr "�天%p%l:%M"
 
-#: ../mail/message-list.c:1827
+#: ../mail/message-list.c:1865
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1835
+#: ../mail/message-list.c:1873
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p%l:%M"
 
-#: ../mail/message-list.c:1837
+#: ../mail/message-list.c:1875
 msgid "%b %d %Y"
 msgstr "%Yå¹´%mæ??%dæ?¥"
 
-#: ../mail/message-list.c:2603
+#: ../mail/message-list.c:2642
 msgid "Select all visible messages"
 msgstr "é??中æ??æ??å?¯è§?ç??ä¿¡æ?¯"
 
+#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "ä¿¡æ?¯"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4410 ../mail/message-list.c:4819
+#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
 msgid "Generating message list"
 msgstr "ç??æ??ä¿¡æ?¯å??表"
 
-#: ../mail/message-list.c:4641
+#: ../mail/message-list.c:4707
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "没æ??ä¿¡æ?¯æ»¡è¶³æ?¨ç??æ??ç´¢æ?¡ä»¶ã??ç?¨â??æ??ç´¢â??è??å??ç??â??æ¸?é?¤â??è??å??项æ¸?é?¤"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4709
 msgid "There are no messages in this folder."
 msgstr "æ­¤æ??件夹中没æ??ä¿¡æ?¯ã??"
 
@@ -13845,27 +12739,27 @@ msgid "Subject - Trimmed"
 msgstr "主� - 被��"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "Body contains"
 msgstr "é?®ä»¶ä½?å?«æ??"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1538
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "Message contains"
 msgstr "ä¿¡æ?¯å?«æ??"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶äººå?«æ??"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Sender contains"
 msgstr "å??件人å?«æ??"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1559
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Subject contains"
 msgstr "主é¢?å?«æ??"
 
@@ -13873,7 +12767,7 @@ msgstr "主é¢?å?«æ??"
 msgid "Subject or Addresses contains"
 msgstr "主é¢?æ??å?°å??å??å?«"
 
-#: ../modules/addressbook/addressbook-config.c:206
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13881,7 +12775,7 @@ msgstr ""
 "é??中此é??项æ??å?³ç?? Evolution å?ªå?¨æ?¨ç?? LDAP æ??å?¡å?¨æ?¯æ?? SSL æ?¶æ??è¿?æ?¥å?°æ?¨ç?? LDAP "
 "æ??å?¡å?¨ã??"
 
-#: ../modules/addressbook/addressbook-config.c:208
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13889,7 +12783,7 @@ msgstr ""
 "é??中此é??项æ??å?³ç?? Evolution å?ªå?¨æ?¨ç?? LDAP æ??å?¡å?¨æ?¯æ?? TLS æ?¶æ??è¿?æ?¥å?°æ?¨ç?? LDAP "
 "æ??å?¡å?¨ã??"
 
-#: ../modules/addressbook/addressbook-config.c:210
+#: ../modules/addressbook/addressbook-config.c:213
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13898,15 +12792,15 @@ msgstr ""
 "é??æ?©æ­¤é??项æ??å?³ç??æ?¨ç??æ??å?¡å?¨æ?¢ä¸?æ?¯æ?? SSL ä¹?ä¸?æ?¯æ?? TLSã??å?¯è?½å¯¼è?´ç??ç»?æ??å°?æ?¯æ?¨ç??è¿?"
 "æ?¥ä¸?太å®?å?¨ï¼?æ?¨ä¹?æ??äº?å??å?°å®?å?¨æ¼?æ´?ç??æ?»å?»ã??"
 
-#: ../modules/addressbook/addressbook-config.c:609
+#: ../modules/addressbook/addressbook-config.c:612
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "å?¨ç??æ?¥å??纪念æ?¥æ?¥å??中使ç?¨(_U)"
 
-#: ../modules/addressbook/addressbook-config.c:645
+#: ../modules/addressbook/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
-msgstr "å°?å?°å??ç°¿å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_B)"
+msgstr "å°?å?°å??ç°¿å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?离线æ??ä½?(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:753
+#: ../modules/addressbook/addressbook-config.c:756
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13915,7 +12809,7 @@ msgstr ""
 "è¿?æ?¯ LDAP æ??å?¡å?¨ä¸?ç??端å?£ï¼?Evolution å°?è¯?å?¾è¿?æ?¥å?°æ?¨æ??ç»?å?ºç??æ ?å??端å?£å??表ã??å¦?æ??"
 "æ?¨ä¸?æ¸?æ¥?è¦?æ??å®?ç??端å?£ï¼?请询é?®æ?¨ç??ç³»ç»?管ç??å??ã??"
 
-#: ../modules/addressbook/addressbook-config.c:827
+#: ../modules/addressbook/addressbook-config.c:830
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13924,7 +12818,7 @@ msgstr ""
 "è¿?æ?¯ Evolution ç?¨æ?¥è®¤è¯?æ?¨ç??æ?¹æ³?ã??请注æ??è?¥å?¨æ­¤è®¾å®?为â??ç?µå­?é?®ä»¶å?°å??â??å??é??è¦?æ?¨å?·æ??"
 "对 LDAP æ??å?¡å?¨ç??å?¿å??访é?®æ??é??ã??"
 
-#: ../modules/addressbook/addressbook-config.c:902
+#: ../modules/addressbook/addressbook-config.c:905
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13935,29 +12829,29 @@ msgstr ""
 "æ??ç´¢å?ºç¡?ä¸?æ??å±?ç??å?¨é?¨é¡¹ã??æ??ç´¢è??å?´è?¥ä¸ºâ??ä¸?级â??ï¼?å??å?ªä¼?å??å?«æ?¨æ??å®?ç??æ??ç´¢å?ºç¡?ä¹?ä¸?ä¸?"
 "级ç??项ç?®ã??"
 
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../modules/addressbook/addressbook-config.c:1021
 msgid "Server Information"
 msgstr "æ??å?¡å?¨ä¿¡æ?¯"
 
-#: ../modules/addressbook/addressbook-config.c:1023
+#: ../modules/addressbook/addressbook-config.c:1026
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ç»?è??"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1027
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ??ç´¢"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:1029
 msgid "Downloading"
 msgstr "�载"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1235
 msgid "Address Book Properties"
 msgstr "å?°å??ç°¿å±?æ?§"
 
-#: ../modules/addressbook/addressbook-config.c:1234
+#: ../modules/addressbook/addressbook-config.c:1237
 msgid "New Address Book"
 msgstr "æ?°å?°å??ç°¿"
 
@@ -13994,14 +12888,24 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr "设为ç«?ç?´æ?¶è??系人é¢?è§?çª?å?£ç??ä½?ç½®"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Primary address book"
+msgstr "主å?°å??è??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show autocompleted name with an address"
 msgstr "æ?¾ç¤ºè?ªå?¨å®?æ??ç??å??称å??å?°å??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show preview pane"
 msgstr "�示����"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr "â??è??系人â??è§?å?¾ä¸­ä¾§è¾¹æ ?中é??æ?©ç??(æ??â??主â??)å?°å??è??ç?? UIDã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -14011,33 +12915,33 @@ msgstr ""
 "å¸?å±?æ ·å¼?å?³å®?äº?å?¨å?ªé??æ?¾ç½®è??系人å??表ç??é¢?è§?é?¢æ?¿ã??â??0â??(ç»?å?¸è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨"
 "è??系人å??表ä¸?é?¢ã??â??1â??(ç«?ç?´è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨è??系人å??表æ??è¾¹ã??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "å?¨ Evolution è¯?å?¾è¿?è¡?è?ªå?¨è¡¥å?¨ä¹?å??åº?该è¾?å?¥å¤?å°?个å­?符ã??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "URI for the folder last used in the select names dialog"
 msgstr "é??æ?©å??称对è¯?æ¡?中ä¸?次使ç?¨ç??æ??件夹 URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog."
 msgstr "é??æ?©å??称对è¯?æ¡?中ä¸?次使ç?¨ç??æ??件夹 URIã??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr "å?¨æ?¡ç?®é??æ?¯å?¦å¼ºå?¶æ?¾ç¤ºè?ªå?¨å®?æ??ç??è??系人ç??é?®ä»¶å?°å??å??è?ªå?¨å®?æ??ç??å??称"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1103
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "_Table column:"
 msgstr "表å??(T)ï¼?"
 
@@ -14051,7 +12955,7 @@ msgstr "æ?»æ?¯æ?¾ç¤ºè?ªå?¨è¡¥å?¨ç??è??系人ç??å?°å??(_S)"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:98
-#: ../modules/addressbook/e-book-shell-migrate.c:148
+#: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP æ??å?¡å?¨ä¸?"
 
@@ -14088,8 +12992,8 @@ msgstr "å??建æ?°å?°å??ç°¿"
 #. Create the contacts group
 #: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-migrate.c:59
 msgid "Contacts"
 msgstr "è??系人"
 
@@ -14140,10 +13044,10 @@ msgid "Show properties of the selected address book"
 msgstr "æ?´æ?¹é??中å?°å??è??ç??å±?æ?§"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
 msgid "_Rename..."
 msgstr "é??å?½å??(_R)..."
 
@@ -14224,22 +13128,22 @@ msgid "Send a message to the selected contacts"
 msgstr "ç»?é??中ç??è??系人å??é??ä¿¡æ?¯"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-actions.c:1500
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "æ??ä½?(_A)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "_Preview"
 msgstr "��(_P)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-memo-shell-view-actions.c:676
+#: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
 msgstr "å? é?¤(_D)"
 
@@ -14262,9 +13166,9 @@ msgid "Show contact preview window"
 msgstr "æ?¾ç¤ºè??系人é¢?è§?çª?å?£"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:727
-#: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1441
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:897
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "_Classic View"
 msgstr "å??ç±»è§?å?¾(_C)"
 
@@ -14273,9 +13177,9 @@ msgid "Show contact preview below the contact list"
 msgstr "å?¨è??系人å??表ä¸?æ?¹æ?¾ç¤ºè??系人é¢?è§?"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1448
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "_Vertical View"
 msgstr "����(_V)"
 
@@ -14284,25 +13188,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "å?¨è??系人å??表æ??æ?¾ç¤ºè??系人é¢?è§?"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
-#: ../modules/calendar/e-memo-shell-view-actions.c:744
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Any Category"
 msgstr "任�类�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Unmatched"
 msgstr "æ? å?¹é??"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1680
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
-#: ../shell/e-shell-content.c:466
+#: ../modules/calendar/e-cal-shell-view-actions.c:1684
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../shell/e-shell-content.c:613
 msgid "Advanced Search"
 msgstr "é«?级æ??ç´¢"
 
@@ -14459,6 +13363,758 @@ msgstr "使�����(_U)�"
 msgid "cards"
 msgstr "å??ç??"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u å?? %d å°?被æ?¿æ?¢ä¸ºç?µå­?é?®ä»¶å?°å??中ç??ç?¨æ?·å??å??å??ã??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(����中�示)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "05 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "10 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "15 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "30 minutes"
+msgstr "30 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "60 minutes"
+msgstr "60 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Alerts"
+msgstr "æ??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Day _ends:"
+msgstr "ä¸?天ç»?æ??(_E)ï¼?"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Days"
+msgstr "天"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "é»?认é?²/å¿?æ??å?¡å?¨"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display"
+msgstr "�示"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Display alarms in _notification area only"
+msgstr "å?ªå?¨é??ç?¥å?ºå??æ?¾ç¤ºæ??é??(_N)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Hours"
+msgstr "å°?æ?¶"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Minutes"
+msgstr "å??é??"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "��(_U)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "é??è¿?ä¸?个å?¨æ?¥æ»?å?¨æ??è§?å?¾(_R)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "第���(_C)�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Select the calendars for alarm notification"
+msgstr "é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_O)"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_R)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr "å?¨åº?é?¨å·¦ä¾§ç??æ?¥å??中以æ??ä½?æ?¾ç¤ºé??å¤?å??ç??ç??äº?件(_E)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "Show week _numbers"
+msgstr "�示��(_N)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr "ä»?天å?°æ??ç??ä»»å?¡(_A)ï¼?"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "å?¨å??(_H)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "Template:"
+msgstr "模��"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../widgets/misc/e-dateedit.c:606
+msgid "Time"
+msgstr "��"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time format:"
+msgstr "æ?¶é?´æ ¼å¼?ï¼?"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Use s_ystem time zone"
+msgstr "�示系���(_Y)"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "Wee_k starts on:"
+msgstr "�����(_K)�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1643
+msgid "Work Week"
+msgstr "工��"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Work days:"
+msgstr "工���"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "_12 hour (AM/PM)"
+msgstr "_12 å°?æ?¶(ä¸?/ä¸?å??)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_24 hour"
+msgstr "_24 å°?æ?¶"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "å? é?¤é¡¹æ?¶è¦?æ±?确认(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Compress weekends in month view"
+msgstr "ä¸?å?¨æ??è§?å?¾ä¸­æ?¾ç¤ºå?¨æ?«(_C)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Day begins:"
+msgstr "�天��(_D)�"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "_Fri"
+msgstr "��(_F)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
+msgstr "é??å??é??è??å·²å®?æ??ç??ä»»å?¡(_H)"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+msgid "_Mon"
+msgstr "��(_M)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Overdue tasks:"
+msgstr "延æ??ä»»å?¡(_O)ï¼?"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "_Sat"
+msgstr "��(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Show appointment end times in week and month view"
+msgstr "å?¨å?¨è§?å?¾å??æ??è§?å?¾ä¸­æ?¾ç¤ºçº¦ä¼?ç»?æ??æ?¶é?´(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Time divisions:"
+msgstr "æ?¶é?´å??å?²(_T)ï¼?"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "_Tue"
+msgstr "��(_T)"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "_Wed"
+msgstr "��(_W)"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "before every anniversary/birthday"
+msgstr "å?¨æ¯?个å?¨å¹´/ç??æ?¥å??"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
+msgid "before every appointment"
+msgstr "å?¨æ¯?次约ä¼?å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Alarm programs"
+msgstr "æ??é??ç¨?åº?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Ask for confirmation when deleting items"
+msgstr "å? é?¤é¡¹æ?¶è¦?æ±?确认"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "ä»?天å?°æ??ä»»å?¡ç??è??æ?¯é¢?è?²ï¼?以â??#rrggbbâ??æ ¼å¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "延æ??ä»»å?¡ç??è??æ?¯é¢?è?²ï¼?以â??#rrggbbâ??æ ¼å¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Birthday and anniversary reminder"
+msgstr "ç??æ?¥å??纪念æ?¥æ??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "Birthday and anniversary reminder units"
+msgstr "ç??æ?¥å??纪念æ?¥æ??é??å??ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Birthday and anniversary reminder value"
+msgstr "ç??æ?¥å??纪念æ?¥æ??é??å?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Calendars to run alarms for"
+msgstr "è¿?è¡?æ??é??ç??æ?¥å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "å?¨æ?¶é?´æ ?中ç»?å?¶ Marcus Bains 线ç??é¢?è?²(é»?认为空)ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "å?¨æ?¥è§?å?¾ä¸­ç»?å?¶ Marcus Bains 线ç??é¢?è?²ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Compress weekends in month view"
+msgstr "å?¨æ??è§?å?¾ä¸­å??缩å?¨æ?«"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Confirm expunge"
+msgstr "确认é??æ¯?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "æ ?为工ä½?æ?¥ç??æ?¥å­?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default appointment reminder"
+msgstr "é»?认约ä¼?æ??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder units"
+msgstr "é»?认æ??é??å??ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Default reminder value"
+msgstr "é»?认æ??é??å?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Directory for saving alarm audio files"
+msgstr "ä¿?å­?æ??é??é?³é¢?æ??件ç??ç?®å½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy server URLs"
+msgstr "å¿?/é?²æ??å?¡å?¨ URL"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Free/busy template URL"
+msgstr "�/�模� URL"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide completed tasks"
+msgstr "é??è??å·²å®?æ??ç??ä»»å?¡"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task units"
+msgstr "é??è??ä»»å?¡å??ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Hide task value"
+msgstr "é??è??ä»»å?¡å?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Horizontal pane position"
+msgstr "水平���置"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "å·¥ä½?æ?¥ç»?æ??ç??å°?æ?¶ï¼?以 24 å°?æ?¶æ ¼å¼?表示ï¼?0 å?° 23ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "å·¥ä½?æ?¥å¼?å§?ç??å°?æ?¶ï¼?以 24 å°?æ?¶æ ¼å¼?表示ï¼?0 å?° 23ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "å¦?æ?? â??trueâ??ï¼?å?¨ä¸»çª?å?£ä¸­æ?¾ç¤ºå¤?å¿?é¢?è§?é?¢æ?¿ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "å¦?æ?? â??trueâ??ï¼?å?¨ä¸»çª?å?£ä¸­æ?¾ç¤ºä»»å?¡é¢?è§?é?¢æ?¿ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "æ?¥è§?å?¾å??å·¥ä½?æ?¥è§?å?¾ä¸­æ?¾ç¤ºç??é?´é??ï¼?以å??é??计ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Last alarm time"
+msgstr "ä¸?次æ??é??æ?¶é?´"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "List of recently used second time zones in a Day View."
+msgstr "å??å?ºå?¨æ?¥è§?å?¾ä¸­æ??è¿?使ç?¨è¿?ç??第äº?æ?¶å?ºã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "List of server URLs for free/busy publishing."
+msgstr "å??å?ºå??表å¿?/é?²ç??æ??å?¡å?¨ URLã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains 线"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Marcus Bains 线�� - ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Marcus Bains 线é¢?è?² - æ?¥æ??æ ?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr "å?¨ 'day_second_zones' å??表中ï¼?æ??è¿?使ç?¨è¿?ç??æ?¶å?ºæ??大记å¿?æ?°ç?®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Maximum number of recently used timezones to remember."
+msgstr "æ??è¿?使ç?¨è¿?ç??æ?¶å?ºæ??大记å¿?æ?°ç?®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo layout style"
+msgstr "å¤?å¿?å¤?è§?é£?æ ¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+msgid "Memo preview pane position (horizontal)"
+msgstr "å¤?å¿?é¢?è§?é?¢æ?¿ç??æ°´å¹³ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Memo preview pane position (vertical)"
+msgstr "å¤?å¿?é¢?è§?é?¢æ?¿ç??ç«?ç?´ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "å·¥ä½?æ?¥ç»?æ??ç??å??é??ï¼?0 å?° 59ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "å·¥ä½?æ?¥å¼?å§?ç??å??é??ï¼?0 å?° 59ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view horizontal pane position"
+msgstr "æ??è§?å?¾æ°´å¹³é?¢æ?¿ç??ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "æ??è§?å?¾ä¸­ç«?ç?´é?¢æ?¿ç??ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "å?³å®?ç??æ?¥æ??å?¨å¹´çºªå¿µæ?¥æ??é??ç??å??ä½?æ?°é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining a default reminder."
+msgstr "ç¡®å®?é»?认æ??é??ç??å??ä½?æ?°é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Number of units for determining when to hide tasks."
+msgstr "å?³å®?ä½?æ?¶é??è??ä»»å?¡ç??æ?°å­?å??ä½?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid "Overdue tasks color"
+msgstr "延æ??ä»»å?¡ç??é¢?è?²"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr "é??æ??è§?å?¾ä¸­æ?¥æ??导è?ªå?¨æ?¥å??å??ä»»å?¡å??表ä¹?é?´æ°´å¹³é?¢æ?¿ç??ä½?ç½®ï¼?以å??ç´ è®¡ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr "æ??è§?å?¾ä¸­è§?å?¾å??æ?¥æ??导è?ªå?¨æ?¥å??ä¹?é?´æ°´å¹³é?¢æ?¿ç??ä½?ç½®ï¼?以å??ç´ è®¡ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "å½?ç«?ç?´å®?å??æ?¶ï¼?å¤?å¿?é¢?è§?é?¢æ?¿ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr "å½?æ°´å¹³å®?å??æ?¶ï¼?ä»»å?¡é¢?è§?é?¢æ?¿ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "å½?ç«?ç?´å®?å??æ?¶ï¼?ä»»å?¡é¢?è§?é?¢æ?¿ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "æ?¥å??å??表å??æ?¥æ??导è?ªå?¨æ?¥å??ä¹?é?´ç«?ç?´é?¢æ?¿ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr "æ??è§?å?¾ä¸­è§?å?¾å??æ?¥æ??导è?ªå?¨æ?¥å??å??ä»»å?¡å??表ä¹?é?´ç«?ç?´é?¢æ?¿ç??ä½?ç½®ï¼?以å??ç´ è®¡ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+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 "é??æ??è§?å?¾ä¸­è§?å?¾å??æ?¥æ??导è?ªå?¨æ?¥å??å??ä»»å?¡å??表ä¹?é?´ç«?ç?´é?¢æ?¿ç??ä½?ç½®ï¼?以å??ç´ è®¡ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary calendar"
+msgstr "é¦?é??æ?¥å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary memo list"
+msgstr "é¦?é??å¤?å¿?å??表"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary task list"
+msgstr "é¦?é??ä»»å?¡å??表"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Programs that are allowed to be run by alarms."
+msgstr "å??许æ??é??è¿?è¡?ç??ç¨?åº?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recently used second time zones in a Day View"
+msgstr "æ?¥è§?å?¾ä¸­æ??è¿?æ?¯ç?¨è¿?ç??第äº?æ?¶å?º"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Recurrent Events in Italic"
+msgstr "以æ??ä½?æ?¾ç¤ºé??å¤?äº?件"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for alarm audio"
+msgstr "ä¿?å­?æ??é??é?³é¢?ç??ç?®å½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "é??è¿?ä¸?个å?¨æ?¥æ»?å?¨æ??è§?å?¾"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºè¯·å??å¤?å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºè§?è?²å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Show appointment end times in week and month views"
+msgstr "å?¨å?¨è§?å?¾å??æ??è§?å?¾ä¸­æ?¾ç¤ºçº¦ä¼?ç»?æ??æ?¶é?´"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "å?¨äº?件/ä¼?è®®/ä»»å?¡ç¼?è¾?å?¨ä¸­æ?¾ç¤ºå??ç±»å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr "å?¨åº?é?¨å·¦ä¾§æ?¥å??中以æ??ä½?æ?¾ç¤ºæ??é??å¤?äº?件ç??æ?¥æ??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Show display alarms in notification tray"
+msgstr "å?¨é??ç?¥æ??ç??中æ?¾ç¤ºæ??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºç?¶æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "æ?¾ç¤ºâ??å¤?å¿?é¢?è§?â??é?¢æ?¿"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "æ?¾ç¤ºâ??ä»»å?¡é¢?è§?â??é?¢æ?¿"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr "å?¨äº?件/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºæ?¶å?ºå??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºç±»å??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "å?¨æ?¥è§?å?¾ã??å·¥ä½?æ?¥è§?å?¾å??æ?¥æ??导è?ªä¸­æ?¾ç¤ºå?¨æ?°"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr "å¦?æ??被设å®?ï¼?å?¨æ?¥è§?å?¾ä¸­æ?¾ç¤ºç¬¬äº?æ?¶å?ºã??å?¼å??å?¨ 'timezone' 中使ç?¨è¿?ç??é?®ç?¸å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr "ä»»å?¡å¤?è§?é£?æ ¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+msgid "Task preview pane position (horizontal)"
+msgstr "ä»»å?¡é¢?è§?é?¢æ?¿ç??æ°´å¹³ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (vertical)"
+msgstr "ä»»å?¡é¢?è§?é?¢æ?¿ç??ç«?ç?´ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "ä»?天å?°æ??ç??ä»»å?¡é¢?è?²"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr "å?¨â??æ?¥å??â??è§?å?¾ä¾§è¾¹æ ?中é??æ?©ç??(æ??â??主â??)æ?¥å??ç?? UIDã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr "å?¨â??å¤?å¿?â??è§?å?¾ä¾§è¾¹æ ?中é??æ?©ç??(æ??â??主â??)å¤?å¿?å??表ç?? UIDã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr "å?¨â??ä»»å?¡â??è§?å?¾ä¾§è¾¹æ ?中é??æ?©ç??(æ??â??主â??)ä»»å?¡å??表ç?? UIDã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"ç?¨ä½?å¿?/é?²æ?°æ?®å??å¸?ç?? URL 模æ?¿ï¼?%u å°?æ?¿æ?¢ä¸ºç?µå­?é?®ä»¶ç??ç?¨æ?·é?¨å??ï¼?è?? %d å°?æ?¿æ?¢ä¸ºå??"
+"å??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"æ?¥å??中æ?¥æ??å??æ?¶é?´æ??使ç?¨ç??é»?认æ?¶å?ºï¼?以æ?ªç¿»è¯?ç??æ?¶å?ºæ?°æ?®åº?ä½?置表示ï¼?å¦?â??Asia/"
+"Shanghaiâ??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"å¸?å±?æ ·å¼?å?³å®?äº?å?¨å?ªé??æ?¾ç½®å¤?å¿?å??表ç??é¢?è§?é?¢æ?¿ã??â??0â??(ç»?å?¸è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨å¤?"
+"å¿?å??表ä¸?é?¢ã??â??1â??(ç«?ç?´è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨å¤?å¿?å??表æ??è¾¹ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"å¸?å±?æ ·å¼?å?³å®?äº?å?¨å?ªé??æ?¾ç½®ä»»å?¡å??表ç??é¢?è§?é?¢æ?¿ã??â??0â??(ç»?å?¸è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨ä»»"
+"å?¡å??表ä¸?é?¢ã??â??1â??(ç«?ç?´è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨ä»»å?¡å??表æ??è¾¹ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "æ?¥è§?å?¾ç??第äº?æ?¶å?º"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "æ­¤é??项æ??ä¸?ç§?å?¯è?½å?¼ï¼?0ï¼?é??误ï¼?1ï¼?è­¦å??ï¼?2ï¼?è°?è¯?ä¿¡æ?¯ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "æ?¶é?´å??å?²"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Time the last alarm ran, in time_t."
+msgstr "æ??é??ä¸?次è¿?è¡?ç??æ?¶é?´ï¼?以 time_t æ ¼å¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "��"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "äº?å??å??å°?æ?¶æ?¶é?´æ ¼å¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr "ç??æ?¥æ??å?¨å¹´çºªå¿µæ?¥æ??é??ç??å??ä½?ï¼?å?¯ä¸ºâ??minutesâ??ï¼?â??hoursâ??æ??â??daysâ??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr "é»?认æ??é??ç??å??ä½?ï¼?å?¯ä¸ºâ??minutesâ??ï¼?â??hoursâ??æ??â??daysâ??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "å?³å®?æ?¯å?¦é??è??ä»»å?¡ç??å??ä½?ï¼?å?¯ä¸ºâ??minutesâ??ï¼?â??hoursâ??æ??â??daysâ??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "使�系���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "使ç?¨ç³»ç»?æ?¶å?ºè??ä¸?æ?¯å?¨ Evolution 中é??æ?©ç??æ?¶å?ºã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "ç«?ç?´é?¢æ?¿ç??ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "����"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "ä¸?å?¨å¼?å§?ç??æ?¥å­?ï¼?ä»?æ??æ??æ?¥(0)å?°æ??æ??å?­(6)ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥æ??ç??æ?¥æ?¾ç¤ºæ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "å? é?¤çº¦ä¼?æ??ä»»å?¡æ?¶æ?¯å?¦è¦?æ±?确认ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "é??æ¯?约ä¼?å??ä»»å?¡æ?¶æ?¯å?¦è¦?æ±?确认ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr "å?¨æ??è§?å?¾ä¸­æ?¯å?¦å??缩å?¨æ?«ï¼?å??缩æ?¶å°?æ??å?¨å?­å??å?¨æ?¥ç?¨ä¸?个å??å??æ ¼æ?¾ç¤ºã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr "æ?¯å?¦å?¨å?¨è§?å?¾å??æ??è§?å?¾ä¸­æ?¾ç¤ºäº?件ç??ç»?æ??æ?¶é?´ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr "æ?¯å?¦å?¨æ?¥å??中ç»?å?¶ Marcus Bains 线(å½?å??æ?¶é?´çº¿)ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "æ?¯å?¦å?¨ä»»å?¡è§?å?¾ä¸­é??è??å·²å®?æ??ç??ä»»å?¡ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "æ?¯å?¦æ??æ??æ??æ»?å?¨ä¸?个æ??ï¼?è??ä¸?æ?¯æ??ç?§æ??份æ»?å?¨ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr "æ?¯å?¦ä¸ºçº¦ä¼?设置é»?认æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "æ?¯å?¦ä¸ºç??æ?¥æ??å?¨å¹´çºªå¿µæ?¥è®¾ç½®æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºè¯·å??å¤?å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºå??ç±»å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?议中æ?¾ç¤ºè§?è?²å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºç?¶æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "æ?¯ä»¥ 24 å°?æ?¶æ ¼å¼?è¿?æ?¯ä»¥ 12 å°?æ?¶æ ¼å¼?æ?¾ç¤ºæ?¶é?´ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºæ?¶å?ºå??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸­æ?¾ç¤ºç±»å??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "æ?¯å?¦å?¨æ?¥å??中æ?¾ç¤ºå?¨æ?°ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "工��"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "å·¥ä½?æ?¥ç»?æ??å°?æ?¶"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "å·¥ä½?æ?¥ç»?æ??å??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "工������"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "å·¥ä½?æ?¥å¼?å§?å??é??"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:259
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
@@ -14481,94 +14137,82 @@ msgid "I_mport to Tasks"
 msgstr "导��任�(_M)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:181
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-migrate.c:192
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-migrate.c:149
+#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-migrate.c:158
 msgid "On The Web"
 msgstr "��"
 
-#: ../modules/calendar/e-cal-shell-backend.c:108
-#: ../plugins/calendar-weather/calendar-weather.c:117
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../plugins/calendar-weather/calendar-weather.c:120
 msgid "Weather"
 msgstr "天�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-migrate.c:62
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??纪念æ?¥"
 
-#: ../modules/calendar/e-cal-shell-backend.c:406
+#: ../modules/calendar/e-cal-shell-backend.c:425
 msgctxt "New"
 msgid "_Appointment"
 msgstr "约�(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:408
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-backend.c:427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new appointment"
 msgstr "å??建æ?°çº¦ä¼?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:413
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "�天约�(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:415
+#: ../modules/calendar/e-cal-shell-backend.c:434
 msgid "Create a new all-day appointment"
 msgstr "å??建æ?°å?¨å¤©çº¦ä¼?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ä¼?è®®(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-backend.c:441
 msgid "Create a new meeting request"
 msgstr "å??建ä¸?æ?¡æ?°ä¼?议请æ±?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "æ?¥å??(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Create a new calendar"
 msgstr "å??建æ?°æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2776
+#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "æ?¥å??å??ä»»å?¡"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:171
-#, c-format
-#| msgid ""
-#| "Error on %s\n"
-#| "%s"
-msgid ""
-"Error on %s: %s\n"
-"%s"
-msgstr ""
-"%s å?ºé??ï¼?%s\n"
-"%s"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:239
+#: ../modules/calendar/e-cal-shell-sidebar.c:213
 msgid "Loading calendars"
 msgstr "è½½å?¥æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:674
+#: ../modules/calendar/e-cal-shell-sidebar.c:634
 msgid "_New Calendar..."
 msgstr "æ?°å»ºæ?¥å??(_N)..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:691
+#: ../modules/calendar/e-cal-shell-sidebar.c:651
 msgid "Calendar Selector"
 msgstr "æ?¥å??é??æ?©å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1034
+#: ../modules/calendar/e-cal-shell-sidebar.c:994
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "å?¨ %s æ??å¼?æ?¥å??"
@@ -14602,292 +14246,292 @@ msgstr "移�项�"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1131
 msgid "event"
 msgstr "�件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1128
-#: ../modules/calendar/e-cal-shell-view-memopad.c:210
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:504
-#: ../modules/calendar/e-task-shell-view-actions.c:621
+#: ../modules/calendar/e-cal-shell-view-actions.c:1133
+#: ../modules/calendar/e-cal-shell-view-memopad.c:216
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:510
+#: ../modules/calendar/e-task-shell-view-actions.c:627
 msgid "Save as iCalendar"
 msgstr "��为 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Copy..."
 msgstr "��(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "D_elete Calendar"
 msgstr "å? é?¤æ?¥å??(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Delete the selected calendar"
 msgstr "å? é?¤é??中ç??æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Go Back"
 msgstr "å??é??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Go Forward"
 msgstr "å??è¿?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Select today"
 msgstr "é??æ?©ä»?天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1323
 msgid "Select _Date"
 msgstr "é??æ?©æ?¥æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Select a specific date"
 msgstr "é??æ?©ç?¹å®?æ?¥æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
 msgid "_New Calendar"
 msgstr "æ?°å»ºæ?¥å??(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "Purg_e"
 msgstr "é??æ¯?(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Purge old appointments and meetings"
 msgstr "é??æ¯?æ?§çº¦ä¼?å??ä¼?è®®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "Re_fresh"
 msgstr "å?·æ?°(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "Refresh the selected calendar"
 msgstr "å?·æ?°é??中ç??æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Rename the selected calendar"
 msgstr "é??å?½å??é??中ç??æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Show _Only This Calendar"
 msgstr "å?ªæ?¾ç¤ºæ­¤æ?¥å??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Cop_y to Calendar..."
 msgstr "å¤?å?¶å?°æ?¥å??(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "_Delegate Meeting..."
 msgstr "代ç??ä¼?è®®(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "_Delete Appointment"
 msgstr "å? é?¤çº¦ä¼?(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Delete selected appointments"
 msgstr "å? é?¤é??中ç??约ä¼?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Delete This _Occurrence"
 msgstr "å? é?¤æ­¤æ¬¡å?ºç?°(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete this occurrence"
 msgstr "å? é?¤æ­¤æ¬¡å??ç??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Delete All Occ_urrences"
 msgstr "å? é?¤æ??æ??å?ºç?°(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete all occurrences"
 msgstr "å? é?¤å?¨é?¨å??ç??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "New All Day _Event..."
 msgstr "�建�天�件(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Create a new all day event"
 msgstr "å??建ä¸?个æ?°ç??å?¨å¤©äº?件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
-#: ../modules/calendar/e-cal-shell-view-memopad.c:244
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Forward as iCalendar..."
 msgstr "ä½?为 iCalendar 转å??(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New _Meeting..."
 msgstr "�建�议(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new meeting"
 msgstr "å??建ä¸?个æ?°ç??ä¼?è®®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Mo_ve to Calendar..."
 msgstr "移è?³æ?¥å??(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New _Appointment..."
 msgstr "�建约�(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Make this Occurrence _Movable"
 msgstr "å°?此次å??ç??å??为å?¯ç§»å?¨(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "_Open Appointment"
 msgstr "æ??å¼?约ä¼?(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "View the current appointment"
 msgstr "æ?¥ç??å½?å??约ä¼?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "_Reply"
 msgstr "å??å¤?(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-memopad.c:278
 msgid "Save as iCalendar..."
 msgstr "��为 iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "_Schedule Meeting..."
 msgstr "�度�议(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Converts an appointment to a meeting"
 msgstr "转�约�为�议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Conv_ert to Appointment..."
 msgstr "转��约�(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts a meeting to an appointment"
 msgstr "转��议为约�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Quit"
 msgstr "é??å?º"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1613
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
 msgid "Show one day"
 msgstr "�示�天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 msgid "List"
 msgstr "å??表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1624
 msgid "Show as list"
 msgstr "æ?¾ç¤ºä¸ºå??表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Month"
 msgstr "æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1631
 msgid "Show one month"
 msgstr "æ?¾ç¤ºä¸?个æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 msgid "Week"
 msgstr "å?¨"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1638
 msgid "Show one week"
 msgstr "�示��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1645
 msgid "Show one work week"
 msgstr "�示�个工��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Active Appointments"
 msgstr "活�约�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Next 7 Days' Appointments"
 msgstr "ä¸?ä¸?å?¨ç??约ä¼?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Description contains"
 msgstr "æ??è¿°å?«æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-cal-shell-view-actions.c:1705
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Summary contains"
 msgstr "æ¦?è¦?å?«æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1713
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Print this calendar"
 msgstr "æ??å?°æ­¤æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1724
 msgid "Preview the calendar to be printed"
 msgstr "é¢?è§?å°?è¦?æ??å?°ç??æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
 msgid "Go To"
 msgstr "转�"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:502
+#: ../modules/calendar/e-cal-shell-view-memopad.c:214
+#: ../modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "��"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "�建��(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-memo-shell-backend.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "å??建æ?°å¤?å¿?"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "æ??å¼?å¤?å¿?(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-memopad.c:266
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "æ?¥ç??é??中ç??å¤?å¿?"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:265
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "Open _Web Page"
 msgstr "æ??å¼?ç½?页(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:284
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:290
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the selected memo"
 msgstr "æ??å?°é??中ç??å¤?å¿?"
 
@@ -14895,111 +14539,113 @@ msgstr "æ??å?°é??中ç??å¤?å¿?"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:619
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
+#: ../modules/calendar/e-task-shell-view-actions.c:625
 msgid "task"
 msgstr "任�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:681
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:687
 msgid "_Assign Task"
 msgstr "å??é??ä»»å?¡(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:764
 msgid "_Mark as Complete"
 msgstr "æ ?记为å®?æ??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Mark selected tasks as complete"
 msgstr "æ??é??中任å?¡æ ?记为å®?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
 msgid "_Mark as Incomplete"
 msgstr "æ ?记为æ?ªå®?æ??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Mark selected tasks as incomplete"
 msgstr "æ??é??中任å?¡æ ?记为æ?ªå®?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "New _Task"
 msgstr "�建任�(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:280
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Create a new task"
 msgstr "å??建æ?°ä»»å?¡"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "_Open Task"
 msgstr "æ??å¼?ä»»å?¡(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "View the selected task"
 msgstr "æ?¥ç??é??中ç??ä»»å?¡"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "_Save as iCalendar..."
 msgstr "��为 iCalendar(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the selected task"
 msgstr "æ??å?°é??中ç??ä»»å?¡"
 
-#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-calendar-preferences.c:437
+msgid "Selected Calendars for Alarms"
+msgstr "å·²é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
+
+#: ../modules/calendar/e-calendar-preferences.c:836
+msgid "Ti_me and date:"
+msgstr "æ?¶é?´å??æ?¥æ??(_M)ï¼?"
+
+#: ../modules/calendar/e-calendar-preferences.c:837
+msgid "_Date only:"
+msgstr "ä»?æ?¥æ??(_D)ï¼?"
+
+#: ../modules/calendar/e-memo-shell-backend.c:285
 msgctxt "New"
 msgid "Mem_o"
 msgstr "��(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:292
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "å?±äº«ç??å¤?å¿?(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgid "Create a new shared memo"
 msgstr "å??建ä¸?个æ?°ç??å?±äº«å¤?å¿?"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-backend.c:302
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "å¤?å¿?å??表(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Create a new memo list"
 msgstr "å??建æ?°å¤?å¿?å??表"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:165
-#: ../modules/calendar/e-task-shell-sidebar.c:165
-#, c-format
-msgid ""
-"Error on %s\n"
-"%s"
-msgstr ""
-"%s é??误ï¼?\n"
-" %s"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:233
+#: ../modules/calendar/e-memo-shell-sidebar.c:221
 msgid "Loading memos"
 msgstr "载���"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:613
+#: ../modules/calendar/e-memo-shell-sidebar.c:587
 msgid "Memo List Selector"
 msgstr "å¤?å¿?å??表é??æ?©å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:918
+#: ../modules/calendar/e-memo-shell-sidebar.c:892
 #, c-format
 msgid "Opening memos at %s"
 msgstr "å?¨ %s æ??å¼?å¤?å¿?"
@@ -15009,74 +14655,74 @@ msgstr "å?¨ %s æ??å¼?å¤?å¿?"
 msgid "Print Memos"
 msgstr "æ??å?°å¤?å¿?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "å? é?¤å¤?å¿?(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
 msgid "_Find in Memo..."
 msgstr "���中��(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "å?¨æ?¾ç¤ºå¤?å¿?ç??主ä½?中æ??ç´¢æ??æ?¬"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "å? é?¤å¤?å¿?å??表(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "é??å?½å??é??中å¤?å¿?å??表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_New Memo List"
 msgstr "æ?°å»ºå¤?å¿?å??表(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Refresh the selected memo list"
 msgstr "é??å?½å??é??中å¤?å¿?å??表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Rename the selected memo list"
 msgstr "é??å?½å??é??中å¤?å¿?å??表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "Show _Only This Memo List"
 msgstr "å?ªæ?¾ç¤ºæ­¤å¤?å¿?å??表(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:706
+#: ../modules/calendar/e-memo-shell-view-actions.c:712
 msgid "Memo _Preview"
 msgstr "����(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:708
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
 msgid "Show memo preview pane"
 msgstr "�示������"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview below the memo list"
 msgstr "å?¨å¤?å¿?å??表ä¸?æ?¹æ?¾ç¤ºå¤?å¿?é¢?è§?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:742
 msgid "Show memo preview alongside the memo list"
 msgstr "å?¨å¤?å¿?å??表ä¸?æ?¹æ?¾ç¤ºå¤?å¿?é¢?è§?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:794
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Print the list of memos"
 msgstr "æ??å?°å¤?å¿?å??表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Preview the list of memos to be printed"
 msgstr "é¢?è§?è¦?æ??å?°ç??å¤?å¿?å??表"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:418
+#: ../modules/calendar/e-memo-shell-view-private.c:420
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 个��"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:422
-#: ../modules/calendar/e-task-shell-view-private.c:573
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-task-shell-view-private.c:575
 #, c-format
 msgid "%d selected"
 msgstr "é??中 %d 个"
@@ -15089,40 +14735,40 @@ msgstr "å? é?¤å¤?å¿?"
 msgid "Delete Memo"
 msgstr "å? é?¤å¤?å¿?"
 
-#: ../modules/calendar/e-task-shell-backend.c:278
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgctxt "New"
 msgid "_Task"
 msgstr "任�(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:285
+#: ../modules/calendar/e-task-shell-backend.c:291
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "å??é??ç??ä»»å?¡(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:293
 msgid "Create a new assigned task"
 msgstr "å??建æ?°å??é??ç??ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-backend.c:295
+#: ../modules/calendar/e-task-shell-backend.c:301
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ä»»å?¡å??表(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
 msgstr "å??建æ?°ä»»å?¡å??表"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:233
+#: ../modules/calendar/e-task-shell-sidebar.c:221
 msgid "Loading tasks"
 msgstr "载�任�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:613
+#: ../modules/calendar/e-task-shell-sidebar.c:587
 msgid "Task List Selector"
 msgstr "ä»»å?¡å??表é??æ?©å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:918
+#: ../modules/calendar/e-task-shell-sidebar.c:892
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "å?¨ %s æ??å¼?ä»»å?¡"
@@ -15132,7 +14778,7 @@ msgstr "å?¨ %s æ??å¼?ä»»å?¡"
 msgid "Print Tasks"
 msgstr "æ??å?°ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:563
+#: ../modules/calendar/e-task-shell-view-actions.c:569
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15143,103 +14789,103 @@ msgstr ""
 "\n"
 "ç¡®å®?å? é?¤è¿?äº?ä»»å?¡å??ï¼?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:694
 msgid "_Delete Task"
 msgstr "å? é?¤ä»»å?¡(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Find in Task..."
 msgstr "�任�中��(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Search for text in the displayed task"
 msgstr "å?¨æ?¾ç¤ºç??ä»»å?¡ä¸­æ??ç´¢æ??æ?¬"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Copy..."
 msgstr "��..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "D_elete Task List"
 msgstr "å? é?¤ä»»å?¡å??表(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "Delete the selected task list"
 msgstr "é??å?½å??é??中任å?¡å??表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "_New Task List"
 msgstr "æ?°å»ºä»»å?¡å??表(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Refresh the selected task list"
 msgstr "æ?´æ?°é??中任å?¡å??表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Rename the selected task list"
 msgstr "é??å?½å??é??中任å?¡å??表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Show _Only This Task List"
 msgstr "å?ªæ?¾ç¤ºæ­¤ä»»å?¡å??表(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Mar_k as Incomplete"
 msgstr "æ ?记为æ?ªå®?æ??(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "Delete completed tasks"
 msgstr "å? é?¤å·²å®?æ??ç??ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:870
+#: ../modules/calendar/e-task-shell-view-actions.c:876
 msgid "Task _Preview"
 msgstr "任���(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:872
+#: ../modules/calendar/e-task-shell-view-actions.c:878
 msgid "Show task preview pane"
 msgstr "�示任�����"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Show task preview below the task list"
 msgstr "å?¨ä»»å?¡å??表ä¸?æ?¹æ?¾ç¤ºä»»å?¡é¢?è§?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Show task preview alongside the task list"
 msgstr "å?¨ä»»å?¡å??表ä¸?æ?¹æ?¾ç¤ºä»»å?¡é¢?è§?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:908
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Active Tasks"
 msgstr "活�任�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Completed Tasks"
 msgstr "å·²å®?æ??ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Next 7 Days' Tasks"
 msgstr "ä¸?ä¸?å?¨ç??ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Overdue Tasks"
 msgstr "延æ??ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Tasks with Attachments"
 msgstr "æ??é??件ç??ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:993
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Print the list of tasks"
 msgstr "æ??å?°ä»»å?¡å??表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1006
 msgid "Preview the list of tasks to be printed"
 msgstr "é¢?è§?è¦?æ??å?°ç??ä»»å?¡å??表"
 
-#: ../modules/calendar/e-task-shell-view-private.c:466
+#: ../modules/calendar/e-task-shell-view-private.c:468
 msgid "Expunging"
 msgstr "é??æ¯?"
 
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-task-shell-view-private.c:571
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15254,14 +14900,14 @@ msgid "Delete Task"
 msgstr "å? é?¤ä»»å?¡"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:359
+#: ../modules/mail/e-mail-attachment-handler.c:380
 #, c-format
 msgid "%d attached messages"
 msgstr "%d 个é??å? ç??ä¿¡æ?¯"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:89
+#: ../modules/mail/e-mail-junk-hook.c:94
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ? "
@@ -15284,451 +14930,461 @@ msgstr "é?®ä»¶æ??件夹(_F)"
 msgid "Create a new mail folder"
 msgstr "å??建æ?°é?®ä»¶æ??件夹"
 
-#: ../modules/mail/e-mail-shell-backend.c:493
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "�件��"
 
-#: ../modules/mail/e-mail-shell-backend.c:501
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "é?®ä»¶é¦?é??项"
 
-#: ../modules/mail/e-mail-shell-backend.c:509
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "ç¼?å??å?¨é¦?é??项"
 
-#: ../modules/mail/e-mail-shell-backend.c:517
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "ç½?ç»?é¦?é??项"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../modules/mail/e-mail-shell-view-actions.c:521
-#, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgstr "â??%sâ??æ??件夹中å??å?« %d æ?¡é??å¤?ä¿¡æ?¯ã??æ?¨ç¡®å®?æ?³å? é?¤å??ï¼?"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:522
-#, c-format
-#| msgid "Are you sure you want to delete this memo?"
-msgid ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr "â??%sâ??æ??件夹å??å?« %d å°?é??å¤?ä¿¡æ?¯ã??æ?¨ç¡®å®?è¦?å? é?¤å®?们å??ï¼?"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1108
-#: ../modules/mail/e-mail-shell-view.c:943
+#: ../modules/mail/e-mail-shell-view-actions.c:1047
+#: ../modules/mail/e-mail-shell-view.c:954
 msgid "_Disable Account"
 msgstr "����(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1110
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
 msgid "Disable this account"
 msgstr "���个��"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??件夹中ç??æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "C_reate Search Folder From Search..."
 msgstr "ä»?头å??建æ??ç´¢æ??件夹(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1068
 msgid "_Download Messages for Offline Usage"
 msgstr "�载信�以离线使�(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ä¸?è½½æ ?记为离线使ç?¨ç??å¸?å?·å??æ??件夹ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1075
 msgid "Fl_ush Outbox"
 msgstr "æ¸?空å??件箱(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1082
 msgid "_Copy Folder To..."
 msgstr "æ??件夹å¤?å?¶å?°(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1084
 msgid "Copy the selected folder into another folder"
 msgstr "æ??é??中ç??æ??件夹å¤?å?¶å?°å?¶å®?æ??件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Permanently remove this folder"
 msgstr "æ°¸ä¹?å? é?¤æ­¤æ??件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1096
 msgid "E_xpunge"
 msgstr "é??æ¯?(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ä»?该æ??件夹永ä¹?å? é?¤æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Mar_k All Messages as Read"
 msgstr "æ??å?¨é?¨ä¿¡æ?¯æ ?记为已读(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 msgid "Mark all messages in the folder as read"
 msgstr "å°?æ­¤æ??件夹中ç??æ??æ??ä¿¡æ?¯æ ?记为已读"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1110
 msgid "_Move Folder To..."
 msgstr "æ??件夹移è?³(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "Move the selected folder into another folder"
 msgstr "æ??é??中ç??æ??件夹移è?³å?¶å®?æ??件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "_New..."
 msgstr "�建(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "Create a new folder for storing mail"
 msgstr "å??建å­?å?¨é?®ä»¶ç??æ?°æ??件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Change the properties of this folder"
 msgstr "æ?´æ?¹æ­¤æ??件夹ç??å±?æ?§"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "Refresh the folder"
 msgstr "å?·æ?°æ??件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Change the name of this folder"
 msgstr "æ?´æ?¹æ­¤æ??件夹ç??å??称"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
-#| msgid "_Edit message"
-msgid "Remo_ve duplicate messages"
-msgstr "移é?¤é??å¤?ä¿¡æ?¯(_V)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
-#| msgid "Select all visible messages"
-msgid "Remove all duplicate messages"
-msgstr "移é?¤æ??æ??é??å¤?æ¶?æ?¯"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Select Message _Thread"
 msgstr "é??æ?©ä¿¡æ?¯çº¿ç´¢(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "Select all messages in the same thread as the selected message"
 msgstr "æ??å??ä¸?线索中ç??æ??æ??ä¿¡æ?¯é??æ?©ä¸ºé??中信æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Select Message S_ubthread"
 msgstr "é??æ?©ä¿¡æ?¯å­?线索(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Select all replies to the currently selected message"
 msgstr "é??æ?©å½?å??é??中信æ?¯ç??æ??æ??å??å¤?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Empty _Trash"
 msgstr "�空�件箱(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æ°¸ä¹?å? é?¤æ??æ??å¸?å?·ä¸­ç??æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "_New Label"
 msgstr "æ?°å»ºæ ?ç­¾(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "N_one"
 msgstr "æ? (_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
-#| msgid "_Subscriptions..."
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "_Manage Subscriptions"
 msgstr "管ç??订é??(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订é??æ??é??订è¿?ç¨?æ??å?¡å?¨ä¸?ç??æ??件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+msgid "Send / _Receive"
+msgstr "å??é??/æ?¥æ?¶(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+msgid "Send queued items and retrieve new items"
+msgstr "å??é??é??å??中ç??ç??é?®ä»¶å¹¶æ?¶å??æ?°é?®ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
+msgid "R_eceive All"
+msgstr "����(_E)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+msgid "Receive new items from all accounts"
+msgstr "æ?¥æ?¶æ??æ??è´¦æ?·ä¸­ç??æ?°æ?¡ç?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
+msgid "_Send All"
+msgstr "å?¨é?¨å??é??(_S)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
+msgid "Send queued items in all accounts"
+msgstr "å??é??æ??æ??è´¦æ?·ç??é??å??中ç??æ?¡ç?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../widgets/misc/e-activity-proxy.c:314
+msgid "Cancel"
+msgstr "å??æ¶?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Cancel the current mail operation"
 msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Collapse All _Threads"
 msgstr "æ??å? å?¨é?¨çº¿ç´¢(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Collapse all message threads"
 msgstr "æ??å? å?¨é?¨ä¿¡æ?¯çº¿ç´¢"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "E_xpand All Threads"
 msgstr "����线索(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Expand all message threads"
 msgstr "����信�线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "_Message Filters"
 msgstr "信��滤(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Create or edit rules for filtering new mail"
 msgstr "å??建æ??ç¼?è¾?è¿?滤æ?°é?®ä»¶ç??è§?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Search F_olders"
 msgstr "æ??ç´¢æ??件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Create or edit search folder definitions"
 msgstr "å??建æ??ç¼?è¾?æ??ç´¢æ??件夹å®?ä¹?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "_Subscriptions..."
 msgstr "订é??(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "F_older"
 msgstr "æ??件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "_Label"
 msgstr "æ ?ç­¾(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_New Folder..."
 msgstr "æ?°å»ºæ??件夹(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1404
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 msgid "Show Message _Preview"
 msgstr "�示信���(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1406
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Show message preview pane"
 msgstr "�示信�����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "Show _Deleted Messages"
 msgstr "æ?¾ç¤ºå? é?¤ç??ä¿¡æ?¯(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1414
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
 msgid "Show deleted messages with a line through them"
 msgstr "å?¨ä¿¡æ?¯å??表中æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯(带æ??å? é?¤çº¿)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "_Group By Threads"
 msgstr "æ??线索å??ç»?(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "Threaded message list"
 msgstr "æ??线索æ??å??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
 msgid "Show message preview below the message list"
 msgstr "å?¨ä¿¡æ?¯å??表ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1450
+#: ../modules/mail/e-mail-shell-view-actions.c:1410
 msgid "Show message preview alongside the message list"
 msgstr "å?¨ä¿¡æ?¯å??表æ??æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "All Messages"
 msgstr "��信�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1465
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Important Messages"
 msgstr "é??è¦?ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
+#: ../modules/mail/e-mail-shell-view-actions.c:1432
 msgid "Last 5 Days' Messages"
 msgstr "å??äº?天ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Messages Not Junk"
 msgstr "ä¸?æ?¯å??å?¾ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Messages with Attachments"
 msgstr "æ??é??件ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "No Label"
 msgstr "æ? æ ?ç­¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1460
 msgid "Read Messages"
 msgstr "已读信�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1507
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "Recent Messages"
 msgstr "æ??è¿?ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Unread Messages"
 msgstr "�读信�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1566
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "Subject or Addresses contain"
 msgstr "主é¢?æ??å?°å??å?«æ??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "All Accounts"
 msgstr "����"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Current Account"
 msgstr "å½?å??å¸?å?·"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Current Folder"
 msgstr "å½?å??æ??件夹"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1024
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é??中 %d 个ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1035
+#: ../modules/mail/e-mail-shell-view-private.c:1041
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d å°?å·²å? é?¤"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
-#: ../modules/mail/e-mail-shell-view-private.c:1048
+#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å°?è??稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "�%d ��读�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1081
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "�� %d �"
 
-#: ../modules/mail/e-mail-shell-view.c:562
+#: ../modules/mail/e-mail-shell-view-private.c:1107
+msgid "Trash"
+msgstr "å??æ?¶ç«?"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1466
+msgid "Send / Receive"
+msgstr "å??é??/æ?¥æ?¶"
+
+#: ../modules/mail/e-mail-shell-view.c:564
 msgid "All Account Search"
 msgstr "å?¨é?¨å¸?å?·æ??ç´¢"
 
-#: ../modules/mail/e-mail-shell-view.c:745
+#: ../modules/mail/e-mail-shell-view.c:747
 msgid "Account Search"
 msgstr "å¸?å?·æ??ç´¢"
 
-#: ../modules/mail/e-mail-shell-view.c:941
+#: ../modules/mail/e-mail-shell-view.c:952
 msgid "Proxy _Logout"
 msgstr "代ç??æ??å?¡å?¨æ³¨é??(_L)"
 
-#: ../modules/mail/em-account-prefs.c:217
+#: ../modules/mail/em-account-prefs.c:219
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸?å?·å?©æ??"
 
-#: ../modules/mail/em-account-prefs.c:266
+#: ../modules/mail/em-account-prefs.c:268
 msgid "Account Editor"
 msgstr "�����"
 
-#: ../modules/mail/em-composer-prefs.c:497
+#: ../modules/mail/em-composer-prefs.c:495
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:211
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "已��"
 
-#: ../modules/mail/em-composer-prefs.c:501
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "语�"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Every time"
 msgstr "�次"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per day"
 msgstr "�天�次"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per week"
 msgstr "���次"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Once per month"
 msgstr "æ¯?æ??ä¸?次"
 
-#: ../modules/mail/em-mailer-prefs.c:173
+#: ../modules/mail/em-mailer-prefs.c:177
 msgid "Add Custom Junk Header"
 msgstr "æ·»å? è?ªå®?ä¹?å??å?¾ä¿¡æ?¯å¤´"
 
-#: ../modules/mail/em-mailer-prefs.c:181
+#: ../modules/mail/em-mailer-prefs.c:185
 msgid "Header Name:"
 msgstr "信头å??称ï¼?"
 
-#: ../modules/mail/em-mailer-prefs.c:182
+#: ../modules/mail/em-mailer-prefs.c:186
 msgid "Header Value Contains:"
 msgstr "信头å?¼å?«æ??ï¼?"
 
-#: ../modules/mail/em-mailer-prefs.c:282
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Header"
 msgstr "页ç??"
 
-#: ../modules/mail/em-mailer-prefs.c:286
+#: ../modules/mail/em-mailer-prefs.c:290
 msgid "Contains Value"
 msgstr "å??å?«å?¼"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:678 ../modules/mail/em-mailer-prefs.c:749
+#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s æ??件å?¯ç?¨ï¼?äº?è¿?å?¶æ??件已ç»?å®?è£?ã??"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:686 ../modules/mail/em-mailer-prefs.c:758
+#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:773
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s æ??件ä¸?å?¯ç?¨ã??请æ£?æ?¥è½¯ä»¶å??æ?¯å?¦å·²å®?è£?ã??"
 
-#: ../modules/mail/em-mailer-prefs.c:722
+#: ../modules/mail/em-mailer-prefs.c:737
 msgid "No junk plugin available"
 msgstr "没æ??å?¯ç?¨ç??å??å?¾ä¿¡æ?¯æ??件"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1105
+#: ../modules/mail/em-mailer-prefs.c:1140
 msgid "_Date header:"
 msgstr "æ?¥æ??头ï¼?(_D)"
 
-#: ../modules/mail/em-mailer-prefs.c:1106
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "Show _original header value"
 msgstr "æ?¾ç¤ºå??å§?é?®ä»¶å¤´å?¼(_o)"
 
@@ -15741,10 +15397,28 @@ msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "æ¯?次å?¯å?¨ Evolution ç??æ?¶å??ï¼?æ£?æ?¥å®?æ?¯å?¦æ?¯é»?认é?®ä»¶ç¨?åº?ã??"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:139
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?å°? Evolution 设置为æ?¨ç??é»?认ç?µå­?é?®ä»¶å®¢æ?·ç«¯ï¼?"
 
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr "ç?¹å?»â??å?¨çº¿å·¥ä½?â??è¿?å??å?¨çº¿æ¨¡å¼?ã??"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Evolution is currently offline due to a network outage."
+msgstr "ç?±äº?ç½?ç»?æ?­å¼?ï¼?Evolution ç?®å??离线ã??"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+msgid "Evolution is currently offline."
+msgstr "Evolution ç?®å??离线ã??"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr "ä¸?æ?¦å»ºç«?äº?ç½?ç»?è¿?æ?¥ï¼?Evolution å°?è¿?å??å?¨çº¿æ¨¡å¼?ã??"
+
 #: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
 msgstr "ä½?è??"
@@ -15854,7 +15528,7 @@ msgid "_Do not show this message again."
 msgstr "ä¸?å??æ?¾ç¤ºæ­¤ä¿¡æ?¯(_D)ã??"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:410
+#: ../plugins/templates/templates.c:411
 msgid "Keywords"
 msgstr "���"
 
@@ -15892,30 +15566,23 @@ msgstr "����"
 msgid "Play audio attachments directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?®ä»¶ä¿¡æ?¯é??æ?­æ?¾é?³é¢?é??件"
 
-#: ../plugins/backup-restore/backup-restore.c:160
-#| msgid "Select name of the Evolution backup file"
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "Select name of the Evolution back up file"
 msgstr "é??æ?© Evolution å¤?份æ??件å??称"
 
-#: ../plugins/backup-restore/backup-restore.c:191
-#| msgid "_Restart Evolution after backup"
+#: ../plugins/backup-restore/backup-restore.c:216
 msgid "_Restart Evolution after back up"
 msgstr "å¤?份å??é??æ?°å?¯å?¨ Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:217
-#| msgid "Select name of the Evolution backup file to restore"
+#: ../plugins/backup-restore/backup-restore.c:242
 msgid "Select name of the Evolution back up file to restore"
 msgstr "é??æ?©è¦?æ?¢å¤?ç?? Evolution å¤?份æ??件å??称"
 
-#: ../plugins/backup-restore/backup-restore.c:230
+#: ../plugins/backup-restore/backup-restore.c:255
 msgid "_Restart Evolution after restore"
 msgstr "æ?¢å¤?å??é??æ?°å?¯å?¨ Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:298
-#| msgid ""
-#| "You can restore Evolution from your backup. It can restore all the Mails, "
-#| "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-#| "settings, mail filters etc."
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid ""
 "You can restore Evolution from your back up. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -15924,158 +15591,145 @@ msgstr ""
 "æ?¨å?¯ä»¥ä»?å¤?份中æ?¢å¤? Evolutionã??å®?è?½å¤?æ?¢å¤?æ??æ??é?®ä»¶ã??æ?¥å??ã??ä»»å?¡ã??å¤?å¿?å??è??系人ã??"
 "å®?è¿?è?½æ?¢å¤?æ?¨ç??æ??æ??ç??个人设置å??é?®ä»¶è¿?滤å?¨ç­?ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:305
-#| msgid "_Restore Evolution from the backup file"
+#: ../plugins/backup-restore/backup-restore.c:330
 msgid "_Restore Evolution from the back up file"
 msgstr "ä»?å¤?份æ??件中æ?¢å¤? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:312
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid "Please select an Evolution Archive to restore:"
 msgstr "é??æ?©è¦?æ?¢å¤?ç?? Evolution å­?æ¡£ï¼?"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Choose a file to restore"
 msgstr "é??æ?©è¦?æ?¢å¤?ç??æ??件"
 
-#: ../plugins/backup-restore/backup-restore.c:323
-#| msgid "Restore from backup"
+#: ../plugins/backup-restore/backup-restore.c:348
 msgid "Restore from back up"
 msgstr "��份中��"
 
-#: ../plugins/backup-restore/backup-restore.c:361
-#| msgid "Backing up Evolution Data"
+#: ../plugins/backup-restore/backup-restore.c:386
 msgid "_Back up Evolution Data..."
 msgstr "�份 Evolution ��(_B)..."
 
-#: ../plugins/backup-restore/backup-restore.c:363
-#| msgid "Backup Evolution data and settings to an archive file"
+#: ../plugins/backup-restore/backup-restore.c:388
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "å¤?份 Evolution ç??æ?°æ?®å??设置å?°ä¸?个å½?æ¡£æ??件"
 
-#: ../plugins/backup-restore/backup-restore.c:368
-#| msgid "Restoring Evolution Data"
+#: ../plugins/backup-restore/backup-restore.c:393
 msgid "R_estore Evolution Data..."
 msgstr "�� Evolution ��(_E)..."
 
-#: ../plugins/backup-restore/backup-restore.c:370
+#: ../plugins/backup-restore/backup-restore.c:395
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "ä»?å½?æ¡£æ??件å¤?份å??æ?¢å¤? Evolution ç??æ?°æ?®å??设置"
 
-#: ../plugins/backup-restore/backup.c:80
-#| msgid "Backup Evolution directory"
+#: ../plugins/backup-restore/backup.c:79
 msgid "Back up Evolution directory"
 msgstr "�份 Evolution ��"
 
-#: ../plugins/backup-restore/backup.c:82
+#: ../plugins/backup-restore/backup.c:81
 msgid "Restore Evolution directory"
 msgstr "�� Evolution ��"
 
-#: ../plugins/backup-restore/backup.c:84
-#| msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:83
 msgid "Check Evolution Back up"
 msgstr "�� Evolution �份"
 
-#: ../plugins/backup-restore/backup.c:86
+#: ../plugins/backup-restore/backup.c:85
 msgid "Restart Evolution"
 msgstr "é??æ?°å?¯å?¨ Evolution"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:87
 msgid "With Graphical User Interface"
 msgstr "带å?¾å½¢ç?¨æ?·ç??é?¢"
 
-#: ../plugins/backup-restore/backup.c:290
-#: ../plugins/backup-restore/backup.c:400
+#: ../plugins/backup-restore/backup.c:289
+#: ../plugins/backup-restore/backup.c:399
 msgid "Shutting down Evolution"
 msgstr "�� Evolution"
 
-#: ../plugins/backup-restore/backup.c:297
+#: ../plugins/backup-restore/backup.c:296
 msgid "Backing Evolution accounts and settings"
 msgstr "å¤?份 Evolution ç??å¸?å?·å??设置"
 
-#: ../plugins/backup-restore/backup.c:305
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "å¤?份 Evolution æ?°æ?®(é?®ä»¶ã??è??系人ã??æ?¥å??ã??ä»»å?¡ã??å¤?å¿?)"
 
-#: ../plugins/backup-restore/backup.c:318
-#| msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:317
 msgid "Back up complete"
 msgstr "å¤?份å®?æ??"
 
-#: ../plugins/backup-restore/backup.c:323
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:322
+#: ../plugins/backup-restore/backup.c:496
 msgid "Restarting Evolution"
 msgstr "é??æ?°å?¯å?¨ Evolution"
 
-#: ../plugins/backup-restore/backup.c:404
+#: ../plugins/backup-restore/backup.c:403
 msgid "Back up current Evolution data"
 msgstr "å¤?份å½?å?? Evolution æ?°æ?®"
 
-#: ../plugins/backup-restore/backup.c:410
-#| msgid "Extracting files from backup"
+#: ../plugins/backup-restore/backup.c:409
 msgid "Extracting files from back up"
 msgstr "ä»?å¤?份中æ??å??æ??件"
 
-#: ../plugins/backup-restore/backup.c:467
+#: ../plugins/backup-restore/backup.c:466
 msgid "Loading Evolution settings"
 msgstr "è½½å?¥ Evolution ç??设置"
 
-#: ../plugins/backup-restore/backup.c:482
-#| msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:481
 msgid "Removing temporary back up files"
 msgstr "å? é?¤ä¸´æ?¶å¤?份æ??件"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:491
 msgid "Ensuring local sources"
 msgstr "确����"
 
-#: ../plugins/backup-restore/backup.c:679
+#: ../plugins/backup-restore/backup.c:678
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ­£å?¨å¤?份å?°æ??件夹 %s"
 
-#: ../plugins/backup-restore/backup.c:684
+#: ../plugins/backup-restore/backup.c:683
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "æ­£å?¨ä»?æ??件夹 %s 中æ?¢å¤?"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:706
-#| msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:705
 msgid "Evolution Back up"
 msgstr "Evolution �份"
 
-#: ../plugins/backup-restore/backup.c:706
+#: ../plugins/backup-restore/backup.c:705
 msgid "Evolution Restore"
 msgstr "Evolution ��"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:746
 msgid "Backing up Evolution Data"
 msgstr "正��份 Evolution ��"
 
-#: ../plugins/backup-restore/backup.c:748
+#: ../plugins/backup-restore/backup.c:747
 msgid "Please wait while Evolution is backing up your data."
 msgstr "请ç¨?å??ï¼?Evolution æ­£å?¨å¤?份æ?¨ç??æ?°æ?®ã??"
 
-#: ../plugins/backup-restore/backup.c:750
+#: ../plugins/backup-restore/backup.c:749
 msgid "Restoring Evolution Data"
 msgstr "正��� Evolution ��"
 
-#: ../plugins/backup-restore/backup.c:751
+#: ../plugins/backup-restore/backup.c:750
 msgid "Please wait while Evolution is restoring your data."
 msgstr "请ç¨?å??ï¼?Evolution æ­£å?¨æ?¢å¤?æ?¨ç??æ?°æ?®ã??"
 
-#: ../plugins/backup-restore/backup.c:769
+#: ../plugins/backup-restore/backup.c:768
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "è¿?å?¯è?½è¦?è?±ä¸?ç?¹æ?¶é?´ï¼?å??å?³äº?æ?¨å¸?å?·ä¸­ç??æ?°æ?®æ?»é??ã??"
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#| msgid "Backup and Restore"
 msgid "Back up and Restore"
 msgstr "å¤?份å??æ?¢å¤?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#| msgid "Backup and restore your Evolution data and settings."
 msgid "Back up and restore your Evolution data and settings."
 msgstr "å¤?份å??æ?¢å¤? Evolution ç??æ?°æ?®å??设置ã??"
 
@@ -16084,14 +15738,11 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "æ?¨ç¡®å®?è¦?å?³é?­ Evolution å??ï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#| msgid ""
-#| "Are you sure you want to restore Evolution from the selected backup file?"
 msgid ""
 "Are you sure you want to restore Evolution from the selected back up file?"
 msgstr "æ?¨ç¡®å®?æ?³è¦?ä»?é??中ç??å¤?份æ??件中æ?¢å¤? Evolution å??ï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-#| msgid "Close and Backup Evolution"
 msgid "Close and Back up Evolution"
 msgstr "��并�份 Evolution"
 
@@ -16104,12 +15755,10 @@ msgid "Insufficient Permissions"
 msgstr "æ??é??ä¸?å¤?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-#| msgid "Invalid Evolution backup file"
 msgid "Invalid Evolution back up file"
 msgstr "æ? æ??ç?? Evolution å¤?份æ??件"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#| msgid "Please select a valid backup file to restore."
 msgid "Please select a valid back up file to restore."
 msgstr "请é??æ?©ä¸?个æ??æ??ç??å¤?份æ??件è¿?è¡?æ?¢å¤?ã??"
 
@@ -16118,9 +15767,6 @@ msgid "The selected folder is not writable."
 msgstr "é??中ç??æ??件夹ä¸?å?¯å??ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-#| msgid ""
-#| "To backup your data and settings, you must first close Evolution. Please "
-#| "make sure that you save any unsaved data before proceeding."
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
@@ -16129,11 +15775,6 @@ msgstr ""
 "å­?ç??æ?°æ?®ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-#| msgid ""
-#| "To restore your data and settings, you must first close Evolution. Please "
-#| "make sure that you save any unsaved data before proceeding. This will "
-#| "delete all your current Evolution data and settings and restore them from "
-#| "your backup."
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
@@ -16245,15 +15886,15 @@ msgstr "Bogofilter é??项"
 msgid "Filter junk messages using Bogofilter."
 msgstr "使ç?¨ Bogofilter è¿?滤å??å?¾ä¿¡æ?¯ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:197
+#: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Authentication failed. Server requires correct login."
 msgstr "éª?è¯?é??误ã??æ??å?¡å?¨é??è¦?正确ç??ç?»å½?ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:199
+#: ../plugins/caldav/caldav-browse-server.c:207
 msgid "Given URL cannot be found."
 msgstr "æ? æ³?æ?¾å?°ç»?å®?ç?? URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:211
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16262,108 +15903,118 @@ msgstr ""
 "æ??å?¡å?¨è¿?å??æ?ªé¢?æ??ç??æ?°æ?®ã??\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:333
-#: ../plugins/caldav/caldav-browse-server.c:584
+#: ../plugins/caldav/caldav-browse-server.c:341
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Failed to parse server response."
 msgstr "å¤?ç??æ??å?¡å?¨å??åº?失败"
 
-#: ../plugins/caldav/caldav-browse-server.c:427
+#: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Events"
 msgstr "�件"
 
-#: ../plugins/caldav/caldav-browse-server.c:449
+#: ../plugins/caldav/caldav-browse-server.c:457
 msgid "User's calendars"
 msgstr "ç?¨æ?·ç??æ?¥å??"
 
-#: ../plugins/caldav/caldav-browse-server.c:557
-#: ../plugins/caldav/caldav-browse-server.c:628
+#: ../plugins/caldav/caldav-browse-server.c:566
+#: ../plugins/caldav/caldav-browse-server.c:734
 msgid "Failed to get server URL."
 msgstr "è?·å¾?æ??å?¡å?¨ URL 失败ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:626
-#: ../plugins/caldav/caldav-browse-server.c:667
-#: ../plugins/caldav/caldav-browse-server.c:1277
+#: ../plugins/caldav/caldav-browse-server.c:732
+#: ../plugins/caldav/caldav-browse-server.c:773
+#: ../plugins/caldav/caldav-browse-server.c:1432
 msgid "Searching for user's calendars..."
 msgstr "æ??ç´¢ç?¨æ?·ç??æ?¥å??..."
 
-#: ../plugins/caldav/caldav-browse-server.c:665
+#: ../plugins/caldav/caldav-browse-server.c:771
 msgid "Could not find any user calendar."
 msgstr "æ? æ³?æ?¾å?°ç?¨æ?·ç??æ?¥å??ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:903
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "�次��失败�%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:905
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "ä¸?次å°?è¯?失败ç ?%d"
 
-#: ../plugins/caldav/caldav-browse-server.c:801
+#: ../plugins/caldav/caldav-browse-server.c:910
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "è¾?å?¥æ??å?¡å?¨ %2$s ä¸?ç?¨æ?· %1$s ç??å¯?ç ?"
 
-#: ../plugins/caldav/caldav-browse-server.c:860
+#: ../plugins/caldav/caldav-browse-server.c:969
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "æ? æ³?为 URL â??%sâ??å??建 soup æ¶?æ?¯"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1095
+#: ../plugins/caldav/caldav-browse-server.c:1215
 msgid "Searching folder content..."
 msgstr "æ??ç´¢æ??件夹å??容..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1138
+#: ../plugins/caldav/caldav-browse-server.c:1264
+#: ../plugins/caldav/caldav-source.c:255
+msgid "Server _handles meeting invitations"
+msgstr "æ??å?¡å?¨å¤?ç??ä¼?è®®é??请(_H)"
+
+#: ../plugins/caldav/caldav-browse-server.c:1271
 msgid "List of available calendars:"
 msgstr "å?¯ç?¨æ?¥å??å??表ï¼?"
 
-#: ../plugins/caldav/caldav-browse-server.c:1175
+#: ../plugins/caldav/caldav-browse-server.c:1309
 msgid "Supports"
 msgstr "æ?¯æ??"
 
-#: ../plugins/caldav/caldav-browse-server.c:1254
+#: ../plugins/caldav/caldav-browse-server.c:1336
+#: ../plugins/caldav/caldav-source.c:254
+msgid "User e-_mail:"
+msgstr "�����箱(_M)�"
+
+#: ../plugins/caldav/caldav-browse-server.c:1408
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "å??建æ?¬å?°é?®ä»¶çº¿ç´¢å¤±è´¥ï¼?%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1362
+#: ../plugins/caldav/caldav-browse-server.c:1517
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "æ??å?¡å?¨ URL %s ä¸?æ?¯æ??æ??ç?? URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1368
+#: ../plugins/caldav/caldav-browse-server.c:1523
 msgid "Browse for a CalDAV calendar"
 msgstr "æµ?è§?以æ?¥æ?¾ CalDAV æ?¥å??"
 
-#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/caldav/caldav-source.c:235
 #: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URLï¼?"
 
-#: ../plugins/caldav/caldav-source.c:223
-#: ../plugins/google-account-setup/google-contacts-source.c:308
+#: ../plugins/caldav/caldav-source.c:242
+#: ../plugins/google-account-setup/google-contacts-source.c:348
 msgid "Use _SSL"
 msgstr "使� _SSL"
 
-#: ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:286
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+#: ../plugins/caldav/caldav-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:638
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
 msgid "User_name:"
 msgstr "ç?¨æ?·å??(_N)ï¼?"
 
-#: ../plugins/caldav/caldav-source.c:235
+#: ../plugins/caldav/caldav-source.c:257
 msgid "Brows_e server for a calendar"
 msgstr "æµ?è§?æ??å?¡å?¨ä»¥æ?¥æ?¾æ?¥å??(_E)"
 
-#: ../plugins/caldav/caldav-source.c:251
-#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/caldav/caldav-source.c:275
+#: ../plugins/calendar-file/calendar-file.c:194
 #: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:395
-#: ../plugins/google-account-setup/google-contacts-source.c:326
-#: ../plugins/google-account-setup/google-source.c:630
+#: ../plugins/calendar-weather/calendar-weather.c:398
+#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../plugins/google-account-setup/google-source.c:645
 msgid "Re_fresh:"
 msgstr "å?·æ?°(_F)ï¼?"
 
@@ -16375,31 +16026,31 @@ msgstr "为 Evolution æ·»å?  CalDAV æ?¯æ??ã??"
 msgid "CalDAV Support"
 msgstr "CalDAV æ?¯æ??"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:128
 msgid "_Customize options"
 msgstr "���(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:147
 msgid "File _name:"
 msgstr "æ??件å??(_N)ï¼?"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:151
 msgid "Choose calendar file"
 msgstr "é??æ?©æ?¥å??æ??件"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:199
 msgid "On open"
 msgstr "æ??å¼?æ?¶"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On file change"
 msgstr "å?¨æ??件æ?¹å??æ?¶"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "Periodically"
 msgstr "å®?æ??"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:216
 msgid "Force read _only"
 msgstr "强��读(_O)"
 
@@ -16427,62 +16078,62 @@ msgstr "æ·»å? ç½?ç»?æ?¥å??å?° Evolutionã??"
 msgid "Web Calendars"
 msgstr "ç½?ç»?æ?¥å??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Fog"
 msgstr "天���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Cloudy"
 msgstr "天����"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy Night"
 msgstr "天�� ����"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Overcast"
 msgstr "天�� �"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Showers"
 msgstr "天�� ��"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Snow"
 msgstr "天���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Sunny"
 msgstr "天���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Clear Night"
 msgstr "天�� ���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Thunderstorms"
 msgstr "天�����"
 
-#: ../plugins/calendar-weather/calendar-weather.c:222
+#: ../plugins/calendar-weather/calendar-weather.c:225
 msgid "Select a location"
 msgstr "é??æ?©ä¸?个ä½?ç½®"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:328
-#: ../plugins/calendar-weather/calendar-weather.c:373
+#: ../plugins/calendar-weather/calendar-weather.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:376
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "æ? "
 
-#: ../plugins/calendar-weather/calendar-weather.c:448
+#: ../plugins/calendar-weather/calendar-weather.c:451
 msgid "_Units:"
 msgstr "å??ä½?(_U)ï¼?"
 
-#: ../plugins/calendar-weather/calendar-weather.c:455
+#: ../plugins/calendar-weather/calendar-weather.c:460
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç­?ç­?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:456
+#: ../plugins/calendar-weather/calendar-weather.c:463
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(å??æ°?ã??è?±å¯¸ç­?ç­?)"
 
@@ -16572,40 +16223,52 @@ msgstr ""
 "æ­¤é?®å?¼æ??å®?äº?æ?¨å?¯ä»¥å??å??é??é?®ä»¶ä¸­æ·»å? ç??è?ªå®?ä¹?头ç??å??表ã??æ??å®?头å??头å?¼ç??æ ¼å¼?为ï¼?è?ª"
 "å®?ä¹?头ç??å??称ï¼?æ?¥ä¸?æ?¥æ?¯â??=â??å??å®?ç??å?¼ï¼?头ä¸?头ä¹?é?´ä»¥â??;â??å??å?²"
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:319
+msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "���"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:323
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "个人"
+
+#: ../plugins/email-custom-header/email-custom-header.c:324
+msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "æ?ªå??ç±»"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:325
+msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "å??ä¿?æ?¤ç??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../plugins/email-custom-header/email-custom-header.c:326
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "��"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:328
+msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "��"
 
-#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
-#. indicating the header will not be added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/email-custom-header/email-custom-header.c:385
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "æ? "
 
-#: ../plugins/email-custom-header/email-custom-header.c:571
+#: ../plugins/email-custom-header/email-custom-header.c:577
 msgid "_Custom Header"
 msgstr "���信头(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:830
+#: ../plugins/email-custom-header/email-custom-header.c:836
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16613,12 +16276,12 @@ msgstr ""
 "æ??å®?头å??头å?¼ç??æ ¼å¼?为ï¼?\n"
 "è?ªå®?ä¹?头ç??å??称ï¼?å?¼ï¼?头ä¸?头ä¹?é?´ä»¥â??;â??å??å?²ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:884
+#: ../plugins/email-custom-header/email-custom-header.c:890
 msgid "Key"
 msgstr "é?®"
 
-#: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:416
+#: ../plugins/email-custom-header/email-custom-header.c:906
+#: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "å?¼"
 
@@ -16640,7 +16303,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "å?¨é?®ä»¶ç¼?è¾?å?¨ä¸­æ??é?®æ?¶è?ªå?¨å?¯å?¨æ??æ?¬ç¼?è¾?å?¨"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:129
+#: ../plugins/external-editor/external-editor.c:128
 msgid "Automatically launch when a new mail is edited"
 msgstr "�����件�����"
 
@@ -16652,11 +16315,11 @@ msgstr "�认�����"
 msgid "The default command that must be used as the editor."
 msgstr "é»?认å?½ä»¤å¿?é¡»ç?¨ä½?ç¼?è¾?å?¨ã??"
 
-#: ../plugins/external-editor/external-editor.c:118
+#: ../plugins/external-editor/external-editor.c:117
 msgid "Command to be executed to launch the editor: "
 msgstr "è°?ç?¨ç¼?è¾?å?¨è¦?æ?§è¡?ç??å?½ä»¤ï¼?"
 
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:118
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16664,8 +16327,8 @@ msgstr ""
 "Emacs åº?使ç?¨â??xemacsâ??\n"
 "VI åº?使ç?¨â??gvim -fâ??"
 
-#: ../plugins/external-editor/external-editor.c:385
-#: ../plugins/external-editor/external-editor.c:387
+#: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:386
 msgid "Compose in External Editor"
 msgstr "å?¨å¤?é?¨ç¼?è¾?å?¨ä¸­å??ä½?"
 
@@ -16767,17 +16430,17 @@ msgstr "è¿?个æ??件ä¸?è?½è¢«è¯»å??"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "æ?¨é??æ?©ç??æ??件好象ä¸?æ?¯æ??æ??ç?? PNG å?¾å??ã??é??误ï¼?{0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:274
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#: ../plugins/google-account-setup/google-contacts-source.c:314
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
 msgid "Server"
 msgstr "æ??å?¡å?¨"
 
-#: ../plugins/google-account-setup/google-source.c:437
+#: ../plugins/google-account-setup/google-source.c:438
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "è¾?å?¥ç?¨æ?· %s ç??å¯?ç ?以便访é?®å·²è®¢é??æ?¥å??ç??å??表ã??"
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/google-account-setup/google-source.c:549
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16786,17 +16449,17 @@ msgstr ""
 "æ? æ³?ä»? Google æ??å?¡å?¨ä¸?读å??æ?°æ?®ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:737
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:955
 msgid "Unknown error."
 msgstr "æ?ªç?¥é??误ã??"
 
-#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-source.c:649
 msgid "Cal_endar:"
 msgstr "æ?¥å??(_E)ï¼?"
 
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:684
 msgid "Retrieve _List"
 msgstr "è?·å??å??表(_L)"
 
@@ -16832,16 +16495,24 @@ msgstr "è·?踪信æ?¯ç?¶æ??..."
 msgid "Retract Mail"
 msgstr "æ?¶å??é?®ä»¶"
 
+#: ../plugins/groupwise-features/gw-ui.c:331
+msgid "Accept"
+msgstr "æ?¥å??"
+
 #: ../plugins/groupwise-features/gw-ui.c:338
 msgid "Accept Tentatively"
 msgstr "æ??æ?¶æ?¥å??"
 
+#: ../plugins/groupwise-features/gw-ui.c:345
+msgid "Decline"
+msgstr "æ??ç»?"
+
 #: ../plugins/groupwise-features/gw-ui.c:352
 msgid "Rese_nd Meeting..."
 msgstr "é??æ?°å??é??ä¼?è®®(_N)..."
 
 #: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:355
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Create folder"
 msgstr "å??建æ??件夹"
 
@@ -17109,7 +16780,7 @@ msgid "Proxy"
 msgstr "代ç??æ??å?¡å?¨"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:230
+#: ../widgets/misc/e-account-tree-view.c:243
 msgid "Account Name"
 msgstr "å¸?å?·å??"
 
@@ -17117,8 +16788,8 @@ msgstr "å¸?å?·å??"
 msgid "Proxy Login"
 msgstr "代ç??æ??å?¡å?¨ç?»å½?"
 
-#: ../plugins/groupwise-features/proxy-login.c:209
-#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
 #: ../plugins/groupwise-features/proxy.c:494
 #: ../plugins/groupwise-features/send-options.c:84
 #, c-format
@@ -17128,7 +16799,7 @@ msgstr "%sè¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "代ç??æ??å?¡å?¨æ ?ç­¾ä»?å½?å¸?å?·è??æ?ºæ?¶æ??å?¯ç?¨ã??"
+msgstr "代ç??æ??å?¡å?¨æ ?ç­¾ä»?å½?å¸?å?·å?¨çº¿æ?¶æ??å?¯ç?¨ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy.c:704
@@ -17150,16 +16821,16 @@ msgstr "æ·»å? ç?¨æ?·"
 msgid "Advanced send options"
 msgstr "é«?级å??é??é??项"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:316
 #: ../plugins/groupwise-features/share-folder.c:727
 msgid "Users"
 msgstr "��"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Enter the users and set permissions"
 msgstr "è¾?å?¥ç?¨æ?·å??设å®?æ??é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:420
+#: ../plugins/groupwise-features/share-folder-common.c:418
 msgid "Sharing"
 msgstr "�享"
 
@@ -17232,12 +16903,12 @@ msgstr "åµ?å?¥å?¾å??"
 msgid "View image attachments directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?®ä»¶ä¿¡æ?¯é??æ?¥ç??å?¾å??é??件"
 
-#: ../plugins/imap-features/imap-headers.c:330
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "���信头"
 
-#: ../plugins/imap-features/imap-headers.c:343
+#: ../plugins/imap-features/imap-headers.c:342
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP 信头"
@@ -17285,194 +16956,207 @@ msgstr "IMAP ��"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "è½½å?¥æ?¥å??â??%sâ??失败(%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:650
+#: ../plugins/itip-formatter/itip-formatter.c:654
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "æ?¥å??â??%sâ??中ç??ä¸?个约ä¼?ä¸?æ­¤ä¼?è®®å?²çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:690
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å?¨æ?¥å??â??%sâ??中æ?¾å?°äº?约ä¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:785
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find any calendars"
 msgstr "æ? æ³?æ?¾å?°ä»»ä½?æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:792
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this meeting in any calendar"
 msgstr "æ? æ³?å?¨ä»»ä½?æ?¥å??中æ?¾å?°æ­¤ä¼?è®®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this task in any task list"
 msgstr "æ? æ³?å?¨ä»»ä½?ä»»å?¡å??表中æ?¾å?°æ­¤ä»»å?¡"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find this memo in any memo list"
 msgstr "æ? æ³?å?¨ä»»ä½?å¤?å¿?å??表中æ?¾å?°æ­¤å¤?å¿?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:880
 msgid "Opening the calendar. Please wait.."
 msgstr "æ­£å?¨æ??å¼?æ?¥å??ï¼?请ç¨?å??..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:879
+#: ../plugins/itip-formatter/itip-formatter.c:883
 msgid "Searching for an existing version of this appointment"
 msgstr "æ??索此约ä¼?ç??å·²æ??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1162
+#: ../plugins/itip-formatter/itip-formatter.c:1166
 msgid "Unable to parse item"
 msgstr "æ? æ³?å??æ??项ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1255
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "æ? æ³?å°?项ç?®å??é??å?°æ?¥å??â??%sâ??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å°?æ?¥å??â??%sâ??å??é??为已æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å°?æ?¥å??â??%sâ??å??é??为å¾?å®?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1272
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å°?æ?¥å??â??%sâ??å??é??为已æ??ç»?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å°?æ?¥å??â??%sâ??å??é??为已å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ç»?ç»?è??å·²ç»?å? é?¤äº?代ç??人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1382
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å·²ç»?代ç??人å??é??äº?å??æ¶?é??ç?¥"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1380
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "æ? æ³?ç»?代ç??人å??é??å??æ¶?é??ç?¥"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
+#: ../plugins/itip-formatter/itip-formatter.c:1495
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "å?ºå¸­è??ç?¶æ??æ? æ³?æ?´æ?°ï¼?å??å? æ?¯ç?¶æ??æ? æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "æ? æ³?æ?´æ?°å?ºå¸­è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "Attendee status updated"
 msgstr "å?ºå¸­è??ç?¶æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1550
+#: ../plugins/itip-formatter/itip-formatter.c:1532
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "ç?±äº?æ?¡ç?®ä¸?å??å­?å?¨è??æ? æ³?æ?´æ?°å?ºå¸­è??ç?¶æ??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1554
 msgid "Meeting information sent"
 msgstr "ä¼?议信æ?¯å·²å??é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1553
+#: ../plugins/itip-formatter/itip-formatter.c:1557
 msgid "Task information sent"
 msgstr "ä»»å?¡ä¿¡æ?¯å·²å??é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1556
+#: ../plugins/itip-formatter/itip-formatter.c:1560
 msgid "Memo information sent"
 msgstr "å¤?å¿?ä¿¡æ?¯å·²å??é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1565
+#: ../plugins/itip-formatter/itip-formatter.c:1569
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "æ? æ³?å??é??ä¼?议信æ?¯ï¼?ä¼?è®®ä¸?å­?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1568
+#: ../plugins/itip-formatter/itip-formatter.c:1572
 msgid "Unable to send task information, the task does not exist"
 msgstr "æ? æ³?å??é??ä»»å?¡ä¿¡æ?¯ï¼?ä»»å?¡ä¸?å­?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1571
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "æ? æ³?å??é??å¤?å¿?ä¿¡æ?¯ï¼?å¤?å¿?ä¸?å­?å?¨"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1636
+#: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1641
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Save Calendar"
 msgstr "ä¿?å­?æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1693
-#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1703
+#: ../plugins/itip-formatter/itip-formatter.c:1714
 msgid "The calendar attached is not valid"
 msgstr "é??å? ç??æ?¥å??æ? æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1694
-#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1715
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ä¿¡æ?¯å£°æ??å?¶å??å?«æ?¥å??ï¼?ä½?æ?¥å??ä¸?æ?¯æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1745
-#: ../plugins/itip-formatter/itip-formatter.c:1773
-#: ../plugins/itip-formatter/itip-formatter.c:1882
+#: ../plugins/itip-formatter/itip-formatter.c:1755
+#: ../plugins/itip-formatter/itip-formatter.c:1783
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid "The item in the calendar is not valid"
 msgstr "æ?¥å??项æ? æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1746
-#: ../plugins/itip-formatter/itip-formatter.c:1774
-#: ../plugins/itip-formatter/itip-formatter.c:1883
+#: ../plugins/itip-formatter/itip-formatter.c:1756
+#: ../plugins/itip-formatter/itip-formatter.c:1784
+#: ../plugins/itip-formatter/itip-formatter.c:1893
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "ä¿¡æ?¯ç??ç¡®å??å?«æ?¥å??ï¼?ä½?æ?¯æ?¥å??ä¸?å??å?«äº?件ã??ä»»å?¡æ??å¿?/é?²ä¿¡æ?¯"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1787
+#: ../plugins/itip-formatter/itip-formatter.c:1797
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??æ?¥å??å??å?«å¤?个项ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1788
+#: ../plugins/itip-formatter/itip-formatter.c:1798
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "è¦?å¤?ç??è¿?äº?å?¨é?¨é¡¹ç?®ï¼?åº?该ä¿?å­?æ??件并导å?¥æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2561
+#: ../plugins/itip-formatter/itip-formatter.c:2460
+msgctxt "cal-itip"
+msgid "None"
+msgstr "æ? "
+
+#: ../plugins/itip-formatter/itip-formatter.c:2476
+msgid "Tentatively Accepted"
+msgstr "æ??æ?¶æ?¥å??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2594
 msgid "This meeting recurs"
 msgstr "æ­¤ä¼?è®®é??ç?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2564
+#: ../plugins/itip-formatter/itip-formatter.c:2597
 msgid "This task recurs"
 msgstr "此任å?¡é??ç?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2567
+#: ../plugins/itip-formatter/itip-formatter.c:2600
 msgid "This memo recurs"
 msgstr "æ­¤å¤?å¿?é??ç?°"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2801
+#: ../plugins/itip-formatter/itip-formatter.c:2834
 msgid "_Delete message after acting"
 msgstr "æ??ä½?å??å? é?¤ä¿¡æ?¯(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2811
 #: ../plugins/itip-formatter/itip-formatter.c:2844
+#: ../plugins/itip-formatter/itip-formatter.c:2877
 msgid "Conflict Search"
 msgstr "å?²çª?æ??ç´¢"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2826
+#: ../plugins/itip-formatter/itip-formatter.c:2859
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é??æ?©è¦?æ??ç´¢å?²çª?ä¼?è®®ç??æ?¥å??"
 
@@ -17608,6 +17292,14 @@ msgstr "%Yå¹´%-mæ??%-dæ?¥%A%p%l:%M"
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Yå¹´%-mæ??%-dæ?¥%A%p%l:%M:%S"
 
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
+msgid "An unknown person"
+msgstr "æ?ªç?¥ç??人"
+
 #: ../plugins/itip-formatter/itip-view.c:367
 #: ../plugins/itip-formatter/itip-view.c:455
 #: ../plugins/itip-formatter/itip-view.c:542
@@ -17934,7 +17626,7 @@ msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 #. To Translators: This is a check box to inherit a reminder.
 #: ../plugins/itip-formatter/itip-view.c:1181
 msgid "_Inherit reminder"
-msgstr "继æ?¿æ??示(_I)"
+msgstr "继æ?¿æ??é??(_I)"
 
 #: ../plugins/itip-formatter/itip-view.c:1924
 msgid "_Tasks:"
@@ -18031,15 +17723,7 @@ msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?¯å?¦å?¨å?¾æ ?ä¸?æ?¾ç¤ºä¿¡æ?¯"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶ç®±æ??件夹中ç??æ?°ä¿¡æ?¯ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:351
-msgid "Evolution's Mail Notification"
-msgstr "Evolution é?®ä»¶é??ç?¥"
-
-#: ../plugins/mail-notification/mail-notification.c:373
-msgid "Mail Notification Properties"
-msgstr "é?®ä»¶é??ç?¥å±?æ?§"
-
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:390
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18051,62 +17735,63 @@ msgstr[0] "æ?¨å?¨ %2$s 中æ?¶å?°äº? %1$d å°?æ?°é?®ä»¶ã??"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:402
 #, c-format
 msgid "From: %s"
 msgstr "���%s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:531
+#: ../plugins/mail-notification/mail-notification.c:415
 #, c-format
 msgid "Subject: %s"
 msgstr "主��%s"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:425
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "æ?¨æ?¶å?°äº? %d å°?æ?°é?®ä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:558
-#: ../plugins/mail-notification/mail-notification.c:565
+#: ../plugins/mail-notification/mail-notification.c:438
+#: ../plugins/mail-notification/mail-notification.c:446
+#: ../plugins/mail-notification/mail-notification.c:449
 msgid "New email"
 msgstr "����件"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:498
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å?ºæ?¾ç¤ºå?¾æ ?(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:656
+#: ../plugins/mail-notification/mail-notification.c:528
 msgid "Popup _message together with the icon"
 msgstr "å??æ?¶å¼¹å?ºå?¾æ ?å??ä¿¡æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:843
+#: ../plugins/mail-notification/mail-notification.c:715
 msgid "_Play sound when new messages arrive"
 msgstr "��件�达���声�(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:873
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "_Beep"
 msgstr "å??é??(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:886
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Use sound _theme"
 msgstr "使�声�主�(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:905
+#: ../plugins/mail-notification/mail-notification.c:777
 msgid "Play _file:"
 msgstr "æ?­æ?¾æ??件(_F)ï¼?"
 
-#: ../plugins/mail-notification/mail-notification.c:916
+#: ../plugins/mail-notification/mail-notification.c:788
 msgid "Select sound file"
 msgstr "é??æ?©å£°é?³æ??件"
 
-#: ../plugins/mail-notification/mail-notification.c:974
+#: ../plugins/mail-notification/mail-notification.c:846
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸­ç??æ?°ä¿¡æ?¯(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:983
+#: ../plugins/mail-notification/mail-notification.c:855
 msgid "Generate a _D-Bus message"
 msgstr "ç??æ?? _D-Bus ä¿¡æ?¯"
 
@@ -18119,26 +17804,26 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "å½?æ?°ç??é?®ä»¶ä¿¡æ?¯å?°è¾¾æ?¶æ??示æ?¨ã??"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:158
+#: ../plugins/mail-to-task/mail-to-task.c:157
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "被%sä»?é?®ä»¶å??建"
 
-#: ../plugins/mail-to-task/mail-to-task.c:490
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "é??å®?ç??æ?¥å??å·²ç»?å??å?«â??%sâ??äº?件ã??æ?¨æ?³ç¼?è¾?æ?§ç??äº?件å??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:493
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr "é??å®?ç??ä»»å?¡å??表已ç»?å??å?«â??%sâ??ä»»å?¡ã??æ?¨æ?³ç¼?è¾?æ?§ç??ä»»å?¡å??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18148,7 +17833,7 @@ msgstr "é??å®?ç??å¤?å¿?å??表已ç»?å??å?«â??%sâ??å¤?å¿?ã??æ?¨æ?³ç¼?è¾?æ?§ç??å¤?
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:516
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18157,7 +17842,7 @@ msgstr "é??å®?ç??æ?¥å??å·²ç»?å??å?«ç»?å®?é?®ä»¶ç??äº?件ã??æ?¨ä»?ç?¶è¦?å??建ä¸?
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:521
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18166,7 +17851,7 @@ msgstr "é??å®?ç??ä»»å?¡å??表已ç»?å??å?«ç»?å®?é?®ä»¶ç??ä»»å?¡ã??æ?¨ä»?ç?¶è¦?å??
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:528
+#: ../plugins/mail-to-task/mail-to-task.c:527
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18175,7 +17860,7 @@ msgstr "é??å®?ç??å¤?å¿?å??表已ç»?å??å?«ç»?å®?é?®ä»¶ç??å¤?å¿?ã??æ?¨ä»?ç?¶è¦?å??
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18187,7 +17872,7 @@ msgstr[0] "é??å®?ç??æ?¥å??å·²ç»?å??å?«ç»?å®?é?®ä»¶ç??äº?件ã??æ?¨ä»?ç?¶è¦?å??建
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:558
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18199,7 +17884,7 @@ msgstr[0] "é??å®?ç??ä»»å?¡å??表已ç»?å??å?«ç»?å®?é?®ä»¶ç??ä»»å?¡ã??æ?¨ä»?ç?¶è¦?
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:567
+#: ../plugins/mail-to-task/mail-to-task.c:566
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18208,76 +17893,76 @@ msgid_plural ""
 "like to create new memos anyway?"
 msgstr[0] "é??å®?ç??å¤?å¿?å??表已ç»?å??å?«ç»?å®?é?®ä»¶ç??å¤?å¿?ã??æ?¨ä»?ç?¶è¦?å??建ä¸?个æ?°å¤?å¿?å??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[没æ??æ¦?è¦?]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "ä»?ä¸?个æ??å?¡å?¨ä¸?è¿?å??äº?æ? æ??ç??对象"
 
-#: ../plugins/mail-to-task/mail-to-task.c:708
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "å?¨å¤?ç??æ?¶å?ºç?°äº?ä¸?个é??误ï¼?%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "æ? æ³?æ??å¼?æ?¥å??ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:744
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "é??中ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ­¤ä¸?è?½å?¨æ­¤å??建äº?件ã??请é??æ?©å?¶å®?ç??æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:747
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "é??中ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ­¤ä¸?è?½å?¨æ­¤å??建任å?¡ã??请é??æ?©å?¶å®?ç??æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr "é??中ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ­¤ä¸?è?½å?¨æ­¤å??建å¤?å¿?å½?ã??请é??æ?©å?¶å®?ç??æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/mail-to-task/mail-to-task.c:955
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "è?½è?·å??æº?å??表ã?? %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1075
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create an _Event"
 msgstr "å??建ä¸?个äº?件(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new event from the selected message"
 msgstr "ä»?é??æ?©ç??ä¿¡æ?¯ä¸­å??建ä¸?个æ?°ç??äº?件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1082
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a Mem_o"
 msgstr "å??建ä¸?个å¤?å¿?(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1083
 msgid "Create a new memo from the selected message"
 msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°å¤?å¿?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1089
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a _Task"
 msgstr "å??建ä¸?个任å?¡(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1090
 msgid "Create a new task from the selected message"
 msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°ä»»å?¡"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1099
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 msgid "Create a _Meeting"
 msgstr "å??建ä¸?个ä¼?è®®(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1101
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 msgid "Create a new meeting from the selected message"
 msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°ä¼?è®®"
 
@@ -18462,39 +18147,39 @@ msgstr "é¦?é??纯æ??æ?¬"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ä½?为纯æ??æ?¬æ?¥æ?¥ç??é?®ä»¶ä¿¡æ?¯ï¼?ç??è?³å?¨å®?们å??å?« HTML å??容æ?¶ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:214
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Show HTML if present"
 msgstr "é¦?é?? HTML"
 
-#: ../plugins/prefer-plain/prefer-plain.c:214
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Let Evolution choose the best part to show."
 msgstr "让Evolutioné??æ?©æ??好ç??é?¨å??æ?¾ç¤ºã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:215
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid "Show plain text if present"
 msgstr "å¦?æ??å?¯ç?¨å??æ?¾ç¤ºçº¯æ??æ?¬"
 
-#: ../plugins/prefer-plain/prefer-plain.c:215
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "å¦?æ??æ??å?ºï¼?é?£ä¹?æ?¾ç¤ºçº¯æ??æ?¬é?¨å??ï¼?å?¦å??让Evolutioné??æ?©å¥½ç??é?¨å??æ?¾ç¤ºï¼?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:216
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid "Only ever show plain text"
 msgstr "ä»?æ?¾ç¤ºçº¯æ??æ?¬"
 
-#: ../plugins/prefer-plain/prefer-plain.c:216
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "å¦?æ??请æ±?ï¼?æ?»æ?¯æ?¾ç¤ºæ??æ?¬é?¨å??è??æ??å?¶ä»?é?¨å??ä½?为é??件"
 
-#: ../plugins/prefer-plain/prefer-plain.c:263
+#: ../plugins/prefer-plain/prefer-plain.c:274
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "æ?¾ç¤ºæ?¯æ??ç??HTMLé?¨å??ä½?为é??件(_s)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:283
+#: ../plugins/prefer-plain/prefer-plain.c:294
 msgid "HTML _Mode"
 msgstr "HT_ML 模�"
 
@@ -18518,41 +18203,42 @@ msgstr "Outlook PST 导�"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook 个人æ??件夹(.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "_Mail"
 msgstr "�件(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "Destination folder:"
 msgstr "ç?®ç??æ??件夹ï¼?"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:330
+#: ../plugins/pst-import/pst-importer.c:329
 msgid "_Address Book"
 msgstr "å?°å??ç°¿(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "A_ppointments"
 msgstr "约�(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:343 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "任�(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:349
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "_Journal entries"
 msgstr "�记项(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:364
+#: ../plugins/pst-import/pst-importer.c:363
 msgid "Importing Outlook data"
 msgstr "导� Outlook ��"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:153
+#: ../plugins/publish-calendar/publish-calendar.c:154
+#: ../plugins/publish-calendar/publish-calendar.c:156
 msgid "Calendar Publishing"
 msgstr "æ?¥å??å??å¸?"
 
@@ -18564,49 +18250,49 @@ msgstr "ä½?ç½®"
 msgid "Publish calendars to the web."
 msgstr "å°?æ?¥å??å??å¸?å?° Webã??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:208
-#: ../plugins/publish-calendar/publish-calendar.c:449
+#: ../plugins/publish-calendar/publish-calendar.c:212
+#: ../plugins/publish-calendar/publish-calendar.c:453
 #, c-format
 msgid "Could not open %s:"
 msgstr "æ? æ³?æ??å¼? %sï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:210
+#: ../plugins/publish-calendar/publish-calendar.c:214
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "æ? æ³?æ??å¼? %sï¼?æ?ªç?¥é??误"
 
-#: ../plugins/publish-calendar/publish-calendar.c:230
+#: ../plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "å??å¸?å?°%sæ?¶å?ºç?°é??误"
 
-#: ../plugins/publish-calendar/publish-calendar.c:232
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "å??å¸?å?°%sæ??å??å®?æ??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:276
+#: ../plugins/publish-calendar/publish-calendar.c:280
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "å? è½½ %s 失败ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "��(_N)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:739
+#: ../plugins/publish-calendar/publish-calendar.c:743
 msgid "Are you sure you want to remove this location?"
 msgstr "æ?¨ç¡®å®?æ?¨æ?³è¦?å? é?¤æ­¤ä½?ç½®å??ï¼?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
 #. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1051
+#: ../plugins/publish-calendar/publish-calendar.c:1055
 msgid "Could not create publish thread."
 msgstr "æ? æ³?å??建å??å¸?ç´¢å¼?ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1059
+#: ../plugins/publish-calendar/publish-calendar.c:1063
 msgid "_Publish Calendar Information"
 msgstr "å??å¸?æ?¥å??ä¿¡æ?¯(_P)"
 
@@ -18704,11 +18390,11 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ä¸?è?½å??å¸?æ?¥å??ï¼?æ?¥å??å??端已ç»?ä¸?å­?å?¨äº?"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "�建�置"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "ç¼?è¾?ä½?ç½®"
 
@@ -18804,6 +18490,10 @@ msgstr "��"
 msgid "End"
 msgstr "ç»?æ??"
 
+#: ../plugins/save-calendar/csv-format.c:372
+msgid "Due"
+msgstr "å?°æ??"
+
 #: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "å®?æ??ç?¾å??æ¯?"
@@ -18899,15 +18589,15 @@ msgstr "ç?¨äº?模æ?¿æ??件以æ?¿æ?¢é?®ä»¶å??容ç??é?®/å?¼å¯¹å??表ã??"
 msgid "Drafts based template plugin"
 msgstr "å?ºäº?è??稿ç??模æ?¿å??æ??件"
 
-#: ../plugins/templates/templates.c:625
+#: ../plugins/templates/templates.c:631
 msgid "No Title"
 msgstr "æ? æ ?é¢?"
 
-#: ../plugins/templates/templates.c:732
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
 msgstr "��为模�(_T)"
 
-#: ../plugins/templates/templates.c:734
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
 msgstr "��为模�"
 
@@ -18927,26 +18617,26 @@ msgstr "åµ?å?¥ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "å?¨é?®ä»¶ä¿¡æ?¯é??ç?´æ?¥æ?¥ç?? vCardsã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:182
-#: ../plugins/vcard-inline/vcard-inline.c:267
+#: ../plugins/vcard-inline/vcard-inline.c:195
+#: ../plugins/vcard-inline/vcard-inline.c:280
 msgid "Show Full vCard"
 msgstr "�示�� vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:185
+#: ../plugins/vcard-inline/vcard-inline.c:198
 msgid "Show Compact vCard"
 msgstr "æ?¾ç¤ºç´§å?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:246
+#: ../plugins/vcard-inline/vcard-inline.c:259
 msgid "There is one other contact."
 msgstr "æ??å?¦å¤? 1 个è??系人ã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:255
+#: ../plugins/vcard-inline/vcard-inline.c:268
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "æ??å?¦å¤? %d 个è??系人ã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:276
+#: ../plugins/vcard-inline/vcard-inline.c:289
 msgid "Save in Address Book"
 msgstr "ä¿?å­?è?³å?°å??ç°¿"
 
@@ -18962,11 +18652,11 @@ msgstr "WebDAV è??系人"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
 msgid "URL:"
 msgstr "URLï¼?"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfMatch (é??è¦? Apache < 2.2.8)"
 
@@ -19075,7 +18765,7 @@ msgstr "ä¸?次å??级ç??é??ç½®ç??æ?¬"
 #: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "å??å?ºè?±æ?ºä½¿ç?¨æ?¶è¦?å??æ­¥å?°ç£?ç??ç??æ??件夹路å¾?"
+msgstr "å??å?ºç¦»çº¿ä½¿ç?¨æ?¶è¦?å??æ­¥å?°ç£?ç??ç??æ??件夹路å¾?"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
@@ -19124,9 +18814,9 @@ msgstr "侧边æ ?å?¯è§?"
 msgid "Skip development warning dialog"
 msgstr "è·³è¿?å¼?å??è­¦å??对è¯?æ¡?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:338
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
 msgid "Start in offline mode"
-msgstr "以��模���"
+msgstr "以离线模���"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
@@ -19238,7 +18928,7 @@ msgstr "ç?¨äº? HTTP 代ç??认è¯?ç??ç?¨æ?·å??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "æ?¯å?¦ä»¥è?±æ?ºæ¨¡å¼?è??é??è??æ?ºæ¨¡å¼?å?¯å?¨ Evolutionã??"
+msgstr "æ?¯å?¦ä»¥ç¦»çº¿æ¨¡å¼?è??é??å?¨çº¿æ¨¡å¼?å?¯å?¨ Evolutionã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
@@ -19273,11 +18963,11 @@ msgstr "çª?å?£æ??é?®æ ·å¼?"
 msgid "Window buttons are visible"
 msgstr "çª?å?£æ??é?®å?¯è§?"
 
-#: ../shell/e-shell-content.c:527 ../shell/e-shell-content.c:528
+#: ../shell/e-shell-content.c:674 ../shell/e-shell-content.c:675
 msgid "Searches"
 msgstr "æ??ç´¢"
 
-#: ../shell/e-shell-content.c:570
+#: ../shell/e-shell-content.c:717
 msgid "Save Search"
 msgstr "ä¿?å­?æ??ç´¢"
 
@@ -19285,19 +18975,19 @@ msgstr "ä¿?å­?æ??ç´¢"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:941
 msgid "Sho_w:"
 msgstr "�示(_W)�"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:974
 msgid "Sear_ch:"
 msgstr "æ??ç´¢(_C)ï¼?"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1034
+#: ../shell/e-shell-searchbar.c:1037
 msgid "i_n"
 msgstr "å?¨(_N) "
 
@@ -19313,10 +19003,14 @@ msgstr "iCalendar (.ics)"
 msgid "All Files (*)"
 msgstr "å?¨é?¨æ??件(*)"
 
+#: ../shell/e-shell-view.c:297
+msgid "Saving user interface state"
+msgstr "ä¿?å­?ç?¨æ?·ç??é?¢ç?¶æ??"
+
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr ""
 "Wang Li <charles linux net cn>, 2002, 2003\n"
@@ -19327,305 +19021,297 @@ msgstr ""
 "Aron Xu <aronxu gnome org>, 2010\n"
 "du baodao <centerpoint 139 com>, 2010"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "Evolution ç½?ç«?"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1216
 msgid "Bug Buddy is not installed."
 msgstr "æ?ªå®?è£? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1238
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Bug Buddy could not be run."
 msgstr "æ? æ³?è¿?è¡? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1419
+#: ../shell/e-shell-window-actions.c:1399
 msgid "Show information about Evolution"
 msgstr "æ?¾ç¤ºå?³äº? Evolution ç??ä¿¡æ?¯"
 
-#: ../shell/e-shell-window-actions.c:1424
-#: ../shell/e-shell-window-actions.c:1438
+#: ../shell/e-shell-window-actions.c:1404
+#: ../shell/e-shell-window-actions.c:1418
 msgid "_Close Window"
 msgstr "����(_C)"
 
-#: ../shell/e-shell-window-actions.c:1445
+#: ../shell/e-shell-window-actions.c:1425
 msgid "_Contents"
 msgstr "��(_C)"
 
-#: ../shell/e-shell-window-actions.c:1447
+#: ../shell/e-shell-window-actions.c:1427
 msgid "Open the Evolution User Guide"
 msgstr "æ??å¼? Evolution ç?¨æ?·æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1453
 msgid "Evolution _FAQ"
 msgstr "Evolution 常���(_FAQ)"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1455
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "æ??å¼? FAQ ç½?页"
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1460
 msgid "_Forget Passwords"
 msgstr "丢å¼?å¯?ç ?(_F)"
 
-#: ../shell/e-shell-window-actions.c:1482
+#: ../shell/e-shell-window-actions.c:1462
 msgid "Forget all remembered passwords"
 msgstr "丢å¼?æ??æ??è®°ä½?ç??å¯?ç ?"
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1467
 msgid "I_mport..."
 msgstr "导�(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1489
+#: ../shell/e-shell-window-actions.c:1469
 msgid "Import data from other programs"
 msgstr "�����导���"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1474
 msgid "New _Window"
 msgstr "�建��(_W)"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Create a new window displaying this view"
 msgstr "å??建ä¸?个æ?°çª?å?£æ?¥æ?¾ç¤ºè¿?个è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Configure Evolution"
 msgstr "é??ç½® Evolution"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1495
 msgid "_Quick Reference"
 msgstr "å¿«é??é¦?é??项(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1497
 msgid "Show Evolution's shortcut keys"
 msgstr "æ?¾ç¤º Evolution ç??å¿«æ?·é?®"
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Exit the program"
 msgstr "é??å?ºç¨?åº?"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1509
 msgid "_Advanced Search..."
 msgstr "é«?级æ??ç´¢(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Construct a more advanced search"
 msgstr "æ??é? ä¸?个æ?´é«?级ç??æ??ç´¢"
 
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Clear the current search parameters"
 msgstr "æ¸?æ¥?å½?å??æ??ç´¢å??æ?°"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1523
 msgid "_Edit Saved Searches..."
 msgstr "ç¼?è¾?ä¿?å­?ç??æ??ç´¢(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Manage your saved searches"
 msgstr "管ç??æ?¨ä¿?å­?ç??æ??ç´¢"
 
-#: ../shell/e-shell-window-actions.c:1552
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Click here to change the search type"
 msgstr "å??å?»æ­¤å¤?æ?´æ?¹æ??索类å??"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1537
 msgid "_Find Now"
 msgstr "����(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Execute the current search parameters"
 msgstr "æ?§è¡?å½?å??æ??ç´¢å??æ?°"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Save Search..."
 msgstr "ä¿?å­?æ??ç´¢(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Save the current search parameters"
 msgstr "ä¿?å­?å½?å??æ??ç´¢å??æ?°"
 
-#: ../shell/e-shell-window-actions.c:1578
-msgid "Send / _Receive"
-msgstr "å??é??/æ?¥æ?¶(_R)"
-
-#: ../shell/e-shell-window-actions.c:1580
-msgid "Send queued items and retrieve new items"
-msgstr "å??é??é??å??中ç??ç??é?®ä»¶å¹¶æ?¶å??æ?°é?®ä»¶"
-
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Submit _Bug Report..."
 msgstr "æ??交é??误æ?¥å??(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1587
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ç?¨ Bug Buddy æ??交é??误æ?¥å??"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Work Offline"
-msgstr "��工�(_W)"
+msgstr "离线工�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1594
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Put Evolution into offline mode"
-msgstr "� Evolution 转���模�"
+msgstr "� Evolution 转�离线模�"
 
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1572
 msgid "_Work Online"
-msgstr "è??æ?ºå·¥ä½?(_W)"
+msgstr "�线工�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1574
 msgid "Put Evolution into online mode"
-msgstr "å°? Evolution 转å?¥è??æ?ºæ¨¡å¼?"
+msgstr "� Evolution 转��线模�"
 
-#: ../shell/e-shell-window-actions.c:1629
+#: ../shell/e-shell-window-actions.c:1602
 msgid "Lay_out"
 msgstr "��(_O)"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_New"
 msgstr "�建(_N)"
 
-#: ../shell/e-shell-window-actions.c:1643
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Search"
 msgstr "æ??ç´¢(_S)"
 
-#: ../shell/e-shell-window-actions.c:1650
+#: ../shell/e-shell-window-actions.c:1623
 msgid "_Switcher Appearance"
 msgstr "å??æ?¢å?¨å¤?è§?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1664
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Window"
 msgstr "��(_W)"
 
-#: ../shell/e-shell-window-actions.c:1693
+#: ../shell/e-shell-window-actions.c:1666
 msgid "Show Side _Bar"
 msgstr "æ?¾ç¤ºä¾§è¾¹æ ?(_B)"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1668
 msgid "Show the side bar"
 msgstr "æ?¾ç¤ºä¾§è¾¹æ ?"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1674
 msgid "Show _Buttons"
 msgstr "æ?¾ç¤ºæ??é?®(_B)"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1676
 msgid "Show the switcher buttons"
 msgstr "æ?¾ç¤ºå??æ?¢å?¨æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1682
 msgid "Show _Status Bar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1684
 msgid "Show the status bar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1690
 msgid "Show _Tool Bar"
 msgstr "æ?¾ç¤ºå·¥å?·æ ?(_T)"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show the tool bar"
 msgstr "æ?¾ç¤ºå·¥å?·æ ?"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1714
 msgid "_Icons Only"
 msgstr "å?ªæ??å?¾æ ?(_I)"
 
-#: ../shell/e-shell-window-actions.c:1743
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Display window buttons with icons only"
 msgstr "æ?¾ç¤ºå?ªæ??å?¾æ ?ç??çª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../shell/e-shell-window-actions.c:1721
 msgid "_Text Only"
 msgstr "å?ªæ??æ??å­?(_T)"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Display window buttons with text only"
 msgstr "æ?¾ç¤ºå?ªæ??æ??å­?ç??çª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Icons _and Text"
 msgstr "å?¾æ ?å??æ??å­?(_A)"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Display window buttons with icons and text"
 msgstr "æ?¾ç¤ºå¸¦å?¾æ ?å??æ??å­?ç??çª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1762
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Tool_bar Style"
 msgstr "å·¥å?·æ ?æ ·å¼?(_B)"
 
-#: ../shell/e-shell-window-actions.c:1764
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使ç?¨æ¡?é?¢å·¥å?·æ ?设置æ?¾ç¤ºçª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1745
 msgid "Define Views..."
 msgstr "����..."
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Create or edit views"
 msgstr "å??建æ??ç¼?è¾?è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Save Custom View..."
 msgstr "ä¿?å­?å½?å??è§?å?¾..."
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Save current custom view"
 msgstr "ä¿?å­?å½?å??è?ªå®?ä¹?è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1761
 msgid "C_urrent View"
 msgstr "å½?å??è§?å?¾(_U)"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Custom View"
 msgstr "å½?å??è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Current view is a customized view"
 msgstr "å½?å??è§?å?¾ä¸ºè?ªå®?ä¹?è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1783
 msgid "Change the page settings for your current printer"
 msgstr "æ?´æ?¹å½?å??æ??å?°æ?ºç??页é?¢è®¾ç½®"
 
-#: ../shell/e-shell-window-actions.c:2197
+#: ../shell/e-shell-window-actions.c:2168
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ?¢å?° %s"
 
-#: ../shell/e-shell-window-actions.c:2410
+#: ../shell/e-shell-window-actions.c:2381
 msgid "Execute these search parameters"
 msgstr "æ?§è¡?è¿?äº?æ??ç´¢å??æ?°"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:588
+#: ../shell/e-shell-window-private.c:584
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:424
+#: ../shell/e-shell-window.c:434
 msgid "New"
 msgstr "�建"
 
-#: ../shell/e-shell.c:248
+#: ../shell/e-shell.c:261
 msgid "Preparing to go offline..."
 msgstr "æ­£å?¨å??å¤?离线..."
 
-#: ../shell/e-shell.c:301
+#: ../shell/e-shell.c:314
 msgid "Preparing to go online..."
 msgstr "æ­£å?¨å??å¤?ä¸?线..."
 
-#: ../shell/e-shell.c:363
+#: ../shell/e-shell.c:376
 msgid "Preparing to quit..."
 msgstr "æ­£å?¨å??å¤?é??å?º..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:187
+#: ../shell/main.c:191
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19657,7 +19343,7 @@ msgstr ""
 "\n"
 "æ??们å¸?æ??æ?¨å°½æ??享å??æ??们å?ªå??å·¥ä½?ç??æ??æ??ï¼?æ??们ä¹?ç?­å??ç?¼æ??ç??æ?¨ç??æ??è§?ï¼?\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:215
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19665,64 +19351,65 @@ msgstr ""
 "æ??è°¢\n"
 "Evolution å?¢é??\n"
 
-#: ../shell/main.c:218
+#: ../shell/main.c:222
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é??ç?¥æ??"
 
-#: ../shell/main.c:334
-msgid "Start Evolution activating the specified component"
-msgstr "å?¯å?¨ Evolution 并æ¿?æ´»æ??å®?ç»?件"
+#. Translators: Do NOT translate the five component names, they MUST remain in English!
+#: ../shell/main.c:367
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
+"å?¯å?¨ Evolution å??æ?¾ç¤ºç?¹å®?ç»?件ã??å?¯ç?¨ç??é??项"
+"æ??â??mailâ??ã??â??calendarâ??ã??â??contactsâ??ã??â??tasksâ??å??â??memosâ??"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:369
 msgid "Apply the given geometry to the main window"
 msgstr "åº?ç?¨ç»?å®?ç??å? ä½?å??æ?°å?°ä¸»çª?å?£"
 
-#: ../shell/main.c:340
+#: ../shell/main.c:373
 msgid "Start in online mode"
-msgstr "以è??æ?ºæ¨¡å¼?å?¯å?¨"
+msgstr "以�线模���"
 
-#: ../shell/main.c:342
-#| msgid "Whether the network is available"
+#: ../shell/main.c:375
 msgid "Ignore network availability"
 msgstr "忽�������"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:377
 msgid "Start in \"express\" mode"
 msgstr "以â??å¿«é??â??模å¼?å?¯å?¨"
 
-#: ../shell/main.c:347
+#: ../shell/main.c:380
 msgid "Forcibly shut down Evolution"
 msgstr "强å?¶å?³é?­æ??æ?? Evolution"
 
-#: ../shell/main.c:350
+#: ../shell/main.c:383
 msgid "Send the debugging output of all components to a file."
 msgstr "æ??æ??æ??æ??å??ç??è°?è¯?è¾?å?ºå??é??å?°ä¸?个æ??件中ã??"
 
-#: ../shell/main.c:352
+#: ../shell/main.c:385
 msgid "Disable loading of any plugins."
 msgstr "ç¦?止载å?¥ä»»ä½?æ??件ã??"
 
-#: ../shell/main.c:354
+#: ../shell/main.c:387
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ç¦?ç?¨é?®ä»¶ã??è??系人å??ä»»å?¡ç??é¢?è§?é?¢æ?¿ã??"
 
-#: ../shell/main.c:358
+#: ../shell/main.c:391
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "导å?¥URIsæ??è??æ??件å??ä½?为å?©ä½?ç??å??æ?°"
 
-#: ../shell/main.c:360
+#: ../shell/main.c:393
 msgid "Request a running Evolution process to quit"
 msgstr "请æ±?æ­£å?¨è¿?è¡?ç?? Evolution è¿?ç¨?é??å?º"
 
-#: ../shell/main.c:513 ../shell/main.c:521
+#: ../shell/main.c:557 ../shell/main.c:565
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信æ?¯ç®¡ç??å??é?®ä»¶å®¢æ?·"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:627
 #, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
@@ -19730,11 +19417,8 @@ msgstr ""
 "%sï¼?ä¸?è?½å??æ?¶ä½¿ç?¨ --online å?? --offlineã??\n"
 "  è¿?è¡? %s --help äº?解æ?´å¤?ä¿¡æ?¯ã??\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:633
 #, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
@@ -19996,7 +19680,7 @@ msgstr ""
 "å??è¡?è??ï¼?\n"
 "  主��%s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:169
 msgid "Select certificate"
 msgstr "é??æ?©è¯?书"
 
@@ -20519,7 +20203,7 @@ msgstr "è§?å?¾ç±»å??ï¼?"
 msgid "De_fault"
 msgstr "�认(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:261
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "å??è®®"
 
@@ -20536,7 +20220,7 @@ msgid "MIME Type:"
 msgstr "MIME  ç±»å??ï¼?"
 
 #: ../widgets/misc/e-attachment-dialog.c:375
-#: ../widgets/misc/e-attachment-store.c:525
+#: ../widgets/misc/e-attachment-store.c:533
 msgid "_Suggest automatic display of attachment"
 msgstr "建议è?ªå?¨æ?¾ç¤ºé??件(_S)"
 
@@ -20571,30 +20255,30 @@ msgstr "载�"
 msgid "Saving"
 msgstr "ä¿?å­?"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:100
 msgid "Hide Attachment _Bar"
 msgstr "é??è??é??件æ ?(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:632
+#: ../widgets/misc/e-attachment-paned.c:102
+#: ../widgets/misc/e-attachment-paned.c:640
 msgid "Show Attachment _Bar"
 msgstr "æ?¾ç¤ºé??件æ ?(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:513
+#: ../widgets/misc/e-attachment-store.c:521
 msgid "Add Attachment"
 msgstr "æ·»å? é??件"
 
-#: ../widgets/misc/e-attachment-store.c:516
+#: ../widgets/misc/e-attachment-store.c:524
 msgid "A_ttach"
 msgstr "é??件(_T)"
 
-#: ../widgets/misc/e-attachment-store.c:579
+#: ../widgets/misc/e-attachment-store.c:587
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "ä¿?å­?é??件"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:608
+#: ../widgets/misc/e-attachment-store.c:616
 #: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
@@ -20689,7 +20373,7 @@ msgid "Ctrl-click to open a link"
 msgstr "Ctrl å? å??å?»æ?¥æ??å¼?ä¸?个é?¾æ?¥"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1261
+#: ../widgets/misc/e-calendar-item.c:1259
 msgid "%B %Y"
 msgstr "%Yå¹´%B"
 
@@ -20721,36 +20405,36 @@ msgstr "è¾?å?¥æ?¥æ??ç??æ??æ?¬æ¡?"
 msgid "Click this button to show a calendar"
 msgstr "å??å?»æ­¤æ??é?®å?¯æ?¾ç¤ºæ?¥å??"
 
-#: ../widgets/misc/e-dateedit.c:596
+#: ../widgets/misc/e-dateedit.c:605
 msgid "Drop-down combination box to select time"
 msgstr "é??æ?©æ?¶é?´ç??ç»?å??æ¡?"
 
-#: ../widgets/misc/e-dateedit.c:668
+#: ../widgets/misc/e-dateedit.c:677
 msgid "No_w"
 msgstr "ç?°å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:674
+#: ../widgets/misc/e-dateedit.c:683
 msgid "_Today"
 msgstr "�天(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:682
+#: ../widgets/misc/e-dateedit.c:691
 msgid "_None"
 msgstr "æ? (_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1920
+#: ../widgets/misc/e-dateedit.c:1698 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "æ? "
 
-#: ../widgets/misc/e-dateedit.c:1815
+#: ../widgets/misc/e-dateedit.c:1825
 msgid "Invalid Date Value"
 msgstr "æ? æ??ç??æ?¥æ??å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1859
+#: ../widgets/misc/e-dateedit.c:1869
 msgid "Invalid Time Value"
 msgstr "æ? æ??ç??æ?¶é?´å?¼"
 
@@ -20855,11 +20539,11 @@ msgstr "é??æ?©ä¸?个æ??件"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "å??å?»â??åº?ç?¨â??以便å¼?å§?å°?æ??件导å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-map.c:538
+#: ../widgets/misc/e-map.c:752
 msgid "World Map"
 msgstr "ä¸?ç??å?°å?¾"
 
-#: ../widgets/misc/e-map.c:540
+#: ../widgets/misc/e-map.c:754
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20869,15 +20553,15 @@ msgstr ""
 
 #: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr "Evolution ç?®å??è??æ?ºã??å??å?»è¯¥æ??é?®å?¯è?±æ?ºå·¥ä½?ã??"
+msgstr "Evolution ç?®å??å?¨çº¿ã??å??å?»è¯¥æ??é?®å?¯ç¦»çº¿å·¥ä½?ã??"
 
 #: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr "Evolution ç?®å??è?±æ?ºã??å??å?»è¯¥æ??é?®å?¯è??æ?ºå·¥ä½?ã??"
+msgstr "Evolution ç?®å??离线ã??å??å?»è¯¥æ??é?®å?¯å?¨çº¿å·¥ä½?ã??"
 
 #: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
-msgstr "å? 为ç½?ç»?ä¸?å?¯ç?¨ï¼?æ??以 Evolution ç?®å??è?±æ?ºã??"
+msgstr "å? 为ç½?ç»?ä¸?å?¯ç?¨ï¼?æ??以 Evolution ç?®å??离线ã??"
 
 #: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
@@ -20888,43 +20572,43 @@ msgstr "Evolution é¦?é??项"
 msgid "Matches: %d"
 msgstr "å?¹é??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:560
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "å?³é?­æ?¥æ?¾æ ?"
 
-#: ../widgets/misc/e-search-bar.c:568
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "��(_D)�"
 
-#: ../widgets/misc/e-search-bar.c:580
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "æ¸?é?¤æ??ç´¢"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "��项(_P)"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "寻æ?¾è¯¥è¯?å?¥å?ºç?°ç??å??ä¸?个ä½?ç½®"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "��项(_N)"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "寻æ?¾è¯¥è¯?å?¥å?ºç?°ç??ä¸?ä¸?个ä½?ç½®"
 
-#: ../widgets/misc/e-search-bar.c:642
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "大å°?å??å?¹é??(_C)"
 
-#: ../widgets/misc/e-search-bar.c:670
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr "�达页����移�顶�继续"
 
-#: ../widgets/misc/e-search-bar.c:692
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "�达页�顶��移���继续"
 
@@ -20949,31 +20633,26 @@ msgid "Delivery Options"
 msgstr "å??é??é??项"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#| msgid "_Until"
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "ç?´å?°(_U)"
 
 #: ../widgets/misc/e-send-options.ui.h:7
-#| msgid "_After"
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "ç»?è¿?(_A)"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-#| msgid "days"
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "天"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-#| msgid "Wi_thin"
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "��(_T)"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#| msgid "days"
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "天"
@@ -21002,6 +20681,10 @@ msgstr "请æ±?å??å¤?(_E)"
 msgid "Return Notification"
 msgstr "è¿?å??é??ç?¥"
 
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Secret"
+msgstr "��"
+
 #: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "ç?¶æ??è·?踪(_T)"
@@ -21060,27 +20743,26 @@ msgstr "æ??å¼?æ?¶(_W)ï¼?"
 
 #. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-#| msgid "None"
 msgctxt "send-options"
 msgid "None"
 msgstr "æ? "
 
 #: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:526
+#: ../widgets/misc/e-signature-editor.c:563
 #: ../widgets/misc/e-signature-manager.c:355
 #: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "æ?ªå?½å??"
 
-#: ../widgets/misc/e-signature-editor.c:215
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "��并��(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:393
+#: ../widgets/misc/e-signature-editor.c:430
 msgid "Edit Signature"
 msgstr "ç¼?è¾?ç­¾å??"
 
-#: ../widgets/misc/e-signature-editor.c:408
+#: ../widgets/misc/e-signature-editor.c:445
 msgid "_Signature Name:"
 msgstr "ç­¾å??(_S)ï¼?"
 
@@ -21197,7 +20879,7 @@ msgstr "æ?¶é?´å¿?é¡»é??ç?¨æ ¼å¼?ï¼?%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ç?¾å??æ¯?å?¼å¿?é??å?¨ 0 å?° 100 ä¹?é?´ï¼?å?« 0 å?? 100"
 
-#: ../widgets/table/e-table-click-to-add.c:598
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
@@ -21233,7 +20915,7 @@ msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨å??(_V)ï¼?"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1704
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Ascending"
 msgstr "å??åº?"
 
@@ -21246,7 +20928,7 @@ msgid "Clear _All"
 msgstr "����(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1704
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Descending"
 msgstr "é??åº?"
 
@@ -21341,60 +21023,60 @@ msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 项)"
 
-#: ../widgets/table/e-table-header-item.c:1548
+#: ../widgets/table/e-table-header-item.c:1512
 msgid "Customize Current View"
 msgstr "è?ªå®?ä¹?å½?å??è§?å?¾"
 
-#: ../widgets/table/e-table-header-item.c:1569
+#: ../widgets/table/e-table-header-item.c:1533
 msgid "Sort _Ascending"
 msgstr "å??åº?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1572
+#: ../widgets/table/e-table-header-item.c:1536
 msgid "Sort _Descending"
 msgstr "é??åº?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1575
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Unsort"
 msgstr "æ?ªæ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1578
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "Group By This _Field"
 msgstr "æ??该å??å??ç»?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1581
+#: ../widgets/table/e-table-header-item.c:1545
 msgid "Group By _Box"
 msgstr "æ??æ?¹æ¡?å??ç»?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1549
 msgid "Remove This _Column"
 msgstr "å? é?¤è¯¥å??(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1552
 msgid "Add a C_olumn..."
 msgstr "æ·»å? ä¸?å??(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1592
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "A_lignment"
 msgstr "对�(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1559
 msgid "B_est Fit"
 msgstr "æ??ä½³å?¹é??(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1598
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??å??(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1602
+#: ../widgets/table/e-table-header-item.c:1566
 msgid "Custo_mize Current View..."
 msgstr "è?ªå®?ä¹?å½?å??è§?å?¾(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1661
+#: ../widgets/table/e-table-header-item.c:1625
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1679
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "_Custom"
 msgstr "���(_C)"
 
@@ -21403,11 +21085,6 @@ msgstr "���(_C)"
 msgid "popup a child"
 msgstr "弹��对象"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "å¼?å§?ç¼?è¾?æ­¤å??å??æ ¼"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -21435,14 +21112,394 @@ msgstr "å??å?»"
 msgid "sort"
 msgstr "æ??åº?"
 
-#: ../widgets/text/e-text.c:2538
+#: ../widgets/text/e-text.c:2289
 msgid "Select All"
 msgstr "å?¨é??"
 
-#: ../widgets/text/e-text.c:2550
+#: ../widgets/text/e-text.c:2301
 msgid "Input Methods"
 msgstr "���"
 
+#~ msgid "Count of default recurrence for a new event. -1 means forever."
+#~ msgstr "ä¸?个æ?°äº?件ç??é»?认é??ç?°æ¬¡æ?°ã??-1 代表永è¿?é??ç?°ã??"
+
+#~ msgid "Default recurrence count"
+#~ msgstr "é»?认å??å¤?计æ?°"
+
+#~ msgid "Event Gradient"
+#~ msgstr "äº?件æ¸?å??"
+
+#~ msgid "Event Transparency"
+#~ msgstr "äº?件é??æ??度"
+
+#~ msgid "Gradient of the events in calendar views."
+#~ msgstr "æ?¥å??è§?å?¾ä¸­äº?件ç??æ¸?å??ã??"
+
+#~ msgid ""
+#~ "Transparency of the events in calendar views, a value between 0 "
+#~ "(transparent) and 1 (opaque)."
+#~ msgstr "æ?¥å??è§?å?¾ä¸­äº?件ç??é??æ??度ï¼?åº?该ä»?äº? 0(é??æ??)å?? 1(ä¸?é??æ??)ä¹?é?´ã??"
+
+#~ msgid "URI of the highlighted (\"primary\") calendar"
+#~ msgstr "é«?亮æ?¾ç¤ºç??â??主è¦?â??æ?¥å??ç?? URL"
+
+#~ msgid "URI of the highlighted (\"primary\") memo list"
+#~ msgstr "é«?亮æ?¾ç¤ºç??â??主è¦?â??å¤?å¿?å??表ç?? URL"
+
+#~ msgid "URI of the highlighted (\"primary\") task list"
+#~ msgstr "é«?亮æ?¾ç¤ºç??â??主è¦?â??ä»»å?¡å??表ç?? URL"
+
+#~ msgid "Recurring:"
+#~ msgstr "é??å¤?ï¼?"
+
+#~ msgid "Yes. (Complex Recurrence)"
+#~ msgstr "æ?¯(å¤?æ??é??ç?°)"
+
+#~ msgid "Every day"
+#~ msgid_plural "Every %d days"
+#~ msgstr[0] "� %d 天"
+
+#~ msgid "Every week"
+#~ msgid_plural "Every %d weeks"
+#~ msgstr[0] "� %d �"
+
+#~ msgid "Every week on "
+#~ msgid_plural "Every %d weeks on "
+#~ msgstr[0] "æ¯? %d å?¨ç??"
+
+#~ msgid " and "
+#~ msgstr " å?? "
+
+#~ msgid "The %s day of "
+#~ msgstr "第 %s 天��"
+
+#~ msgid "The %s %s of "
+#~ msgstr "%s %s ��"
+
+#~ msgid "every month"
+#~ msgid_plural "every %d months"
+#~ msgstr[0] "æ¯? %d æ??"
+
+#~ msgid "Every year"
+#~ msgid_plural "Every %d years"
+#~ msgstr[0] "� %d 年"
+
+#~ msgid "a total of %d time"
+#~ msgid_plural "a total of %d times"
+#~ msgstr[0] "�计 %d 次"
+
+#~ msgid ", ending on "
+#~ msgstr "ï¼?ç»?æ??äº? "
+
+#~ msgid "Starts"
+#~ msgstr "��"
+
+#~ msgid "Ends"
+#~ msgstr "ç»?æ??"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar ä¿¡æ?¯"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalendar é??误"
+
+#~ msgid ""
+#~ "Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr "请æ?¥ç??ä¸?å??ä¿¡æ?¯ï¼?并ä»?ä¸?é?¢ç??è??å??中é??æ?©ä¸?个å?¨ä½?ã??"
+
+#~ msgid ""
+#~ "The meeting has been canceled, however it could not be found in your "
+#~ "calendars"
+#~ msgstr "ä¼?议已ç»?被å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??æ?¥å??中æ?¾å?°è¯¥ä¼?è®®"
+
+#~ msgid ""
+#~ "The task has been canceled, however it could not be found in your task "
+#~ "lists"
+#~ msgstr "ä»»å?¡å·²ç»?被å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??ä»»å?¡å??表中æ?¾å?°è¯¥ä»»å?¡"
+
+#~ msgid "%s has published meeting information."
+#~ msgstr "%s å??å¸?äº?ä¼?议信æ?¯ã??"
+
+#~ msgid "Meeting Information"
+#~ msgstr "�议信�"
+
+#~ msgid "%s requests the presence of %s at a meeting."
+#~ msgstr "%s 请æ±? %s å??å? ä¸?个ä¼?è®®ã??"
+
+#~ msgid "%s requests your presence at a meeting."
+#~ msgstr "%s é??请æ?¨å??å? ä¸?个ä¼?è®®ã??"
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "�议建议"
+
+#~ msgid "%s wishes to be added to an existing meeting."
+#~ msgstr "%s å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ã??"
+
+#~ msgid "Meeting Update"
+#~ msgstr "�议��"
+
+#~ msgid "%s wishes to receive the latest meeting information."
+#~ msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??ä¼?议信æ?¯ã??"
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "�议��请�"
+
+#~ msgid "%s has replied to a meeting request."
+#~ msgstr "%s å·²å??å¤?ä¸?个ä¼?议请æ±?ã??"
+
+#~ msgid "Meeting Reply"
+#~ msgstr "�议��"
+
+#~ msgid "%s has canceled a meeting."
+#~ msgstr "%s å??æ¶?äº?ä¸?个ä¼?è®®ã??"
+
+#~ msgid "Meeting Cancelation"
+#~ msgstr "ä¼?è®®å??æ¶?"
+
+#~ msgid "%s has sent an unintelligible message."
+#~ msgstr "%s å??é??äº?ä¸?个æ? æ³?ç??解ç??ä¿¡æ?¯ã??"
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "é??误ç??ä¼?议信æ?¯"
+
+#~ msgid "%s has published task information."
+#~ msgstr "%s å??å¸?äº?ä»»å?¡ä¿¡æ?¯ã??"
+
+#~ msgid "Task Information"
+#~ msgstr "任�信�"
+
+#~ msgid "%s requests %s to perform a task."
+#~ msgstr "%s 请æ±? %s å®?æ??ä¸?个任å?¡ã??"
+
+#~ msgid "%s requests you perform a task."
+#~ msgstr "%s 请æ±?æ?¨å®?æ??ä¸?个任å?¡ã??"
+
+#~ msgid "Task Proposal"
+#~ msgstr "任�建议"
+
+#~ msgid "%s wishes to be added to an existing task."
+#~ msgstr "%s å¸?æ??å? å?¥å?°å·²æ??ç??ä»»å?¡ã??"
+
+#~ msgid "Task Update"
+#~ msgstr "任���"
+
+#~ msgid "%s wishes to receive the latest task information."
+#~ msgstr "%s å¸?æ??è?·å??æ??æ?°ç??ä»»å?¡ä¿¡æ?¯ã??"
+
+#~ msgid "Task Update Request"
+#~ msgstr "任���请�"
+
+#~ msgid "%s has replied to a task assignment."
+#~ msgstr "%s å·²ç»?å??å¤?äº?ä»»å?¡å??é??ã??"
+
+#~ msgid "Task Reply"
+#~ msgstr "ä»»å?¡å??å¤?"
+
+#~ msgid "%s has canceled a task."
+#~ msgstr "%s å??æ¶?äº?ä»»å?¡ã??"
+
+#~ msgid "Task Cancelation"
+#~ msgstr "ä»»å?¡å??æ¶?"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "é??误ç??ä»»å?¡ä¿¡æ?¯"
+
+#~ msgid "%s has published free/busy information."
+#~ msgstr "%s å??å¸?äº?å¿?é?²ä¿¡æ?¯ã??"
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "��信�"
+
+#~ msgid "%s requests your free/busy information."
+#~ msgstr "%s 请æ±?æ?¨ç??å¿?é?²ä¿¡æ?¯ã??"
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "�/�请�"
+
+#~ msgid "%s has replied to a free/busy request."
+#~ msgstr "%s åº?ç­?äº?å¿?é?²è¯·æ±?ã??"
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "����"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "é??误ç??å¿?é?²ä¿¡æ?¯"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "ä¿¡æ?¯ç??æ ¼å¼?å?¯è?½ä¸?正确"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "ä¿¡æ?¯å?ªå?«æ??ä¸?æ?¯æ??ç??请æ±?ã??"
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "é??件中没æ??æ??æ??ç??æ?¥å??ä¿¡æ?¯"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "é??件中没æ??å?¯æ?¥ç??ç??æ?¥å??项ç?®"
+
+#~ msgid "Update complete\n"
+#~ msgstr "æ?´æ?°å®?æ??\n"
+
+#~ msgid "Object is invalid and cannot be updated\n"
+#~ msgstr "对象æ? æ??ï¼?æ? æ³?æ?´æ?°\n"
+
+#~ msgid "This response is not from a current attendee.  Add as an attendee?"
+#~ msgstr "æ­¤å??åº?并é??æ?¥è?ªå½?å??å?ºå¸­è??ã??å°?å??åº?è??å? 为å?ºå¸­è??å??ï¼?"
+
+#~ msgid "Attendee status could not be updated because of an invalid status!\n"
+#~ msgstr "å? 为æ? æ??ç?¶æ??è??æ? æ³?æ?´æ?°å?ºå¸­è??ç?¶æ??ï¼?\n"
+
+#~ msgid "Attendee status updated\n"
+#~ msgstr "æ?´æ?°å?ºå¸­è??ç?¶æ??\n"
+
+#~ msgid "Item sent!\n"
+#~ msgstr "项ç?®å·²å??é??ï¼?\n"
+
+#~ msgid "The item could not be sent!\n"
+#~ msgstr "æ? æ³?å??é??项ç?®ï¼?\n"
+
+#~ msgid "Choose an action:"
+#~ msgstr "é??æ?©ä¸?项活å?¨ï¼?"
+
+#~ msgid "Update"
+#~ msgstr "æ?´æ?°"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "æ??æ?¶æ?¥å??"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "å??é??å¿?é?²ä¿¡æ?¯"
+
+#~ msgid "Update respondent status"
+#~ msgstr "æ?´æ?°åº?ç­?è??ç?¶æ??"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "å??é??æ??æ?°ç??ä¿¡æ?¯"
+
+#~ msgid "--to--"
+#~ msgstr "--å?°--"
+
+#~ msgid "Calendar Message"
+#~ msgstr "æ?¥å??ä¿¡æ?¯"
+
+#~ msgid "Date:"
+#~ msgstr "æ?¥æ??ï¼?"
+
+#~ msgid "Loading Calendar"
+#~ msgstr "è½½å?¥æ?¥å??"
+
+#~ msgid "Loading calendar..."
+#~ msgstr "æ­£å?¨è½½å?¥æ?¥å??..."
+
+#~ msgid "Organizer:"
+#~ msgstr "ç»?ç»?è??ï¼?"
+
+#~ msgid "Server Message:"
+#~ msgstr "æ??å?¡å?¨ä¿¡æ?¯ï¼?"
+
+#~| msgid "An error occurred while printing"
+#~ msgid "An error occurred while sending."
+#~ msgstr "å??é??æ?¶å?ºç?°äº?ä¸?个é??误ã??"
+
+#~ msgid "%d day from now"
+#~ msgid_plural "%d days from now"
+#~ msgstr[0] "è·?ç?°å?¨æ?? %d 天"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d 天å??"
+
+#~ msgid "Debug Logs"
+#~ msgstr "����"
+
+#~ msgid "Show _errors in the status bar for"
+#~ msgstr "å?¨ç?¶æ??æ ?æ?¾ç¤ºé??误(_E)"
+
+#~ msgid "second(s)."
+#~ msgstr "ç§?ã??"
+
+#~ msgid "Log Messages:"
+#~ msgstr "��信��"
+
+#~ msgid "Log Level"
+#~ msgstr "��级�"
+
+#~ msgid "Error"
+#~ msgstr "é??误"
+
+#~ msgid "Errors"
+#~ msgstr "é??误"
+
+#~ msgid "Warnings and Errors"
+#~ msgstr "è­¦å??å??é??误"
+
+#~ msgid "Debug"
+#~ msgstr "��"
+
+#~ msgid "Error, Warnings and Debug messages"
+#~ msgstr "é??误ï¼?è­¦å??å??è°?è¯?ä¿¡æ?¯"
+
+#~ msgid "%s License Agreement"
+#~ msgstr "%s 许å?¯å??è®®"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please read carefully the license agreement\n"
+#~ "for %s displayed below\n"
+#~ "and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "请ä»?ç»?é??读ä¸?æ?¹æ?¾ç¤ºç?? %s 许å?¯å??è®®\n"
+#~ "并é??中å¤?é??æ¡?表æ??æ?¨æ?¥å??该å??è®®\n"
+
+#~ msgid ""
+#~ "Prompt when replying or forwarding from a mail browser whether close it"
+#~ msgstr "å?¨ä»?é?®ä»¶æµ?è§?å?¨ä¸­å??å¤?æ??转å??æ?¶ï¼?æ??示æ?¯å?¦å?³é?­å®?"
+
+#~| msgid ""
+#~| "Error on %s\n"
+#~| "%s"
+#~ msgid ""
+#~ "Error on %s: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s å?ºé??ï¼?%s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error on %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s é??误ï¼?\n"
+#~ " %s"
+
+#~| msgid "Are you sure you want to delete this memo?"
+#~ msgid ""
+#~ "Folder '%s' contains %d duplicate messages. Are you sure you want to "
+#~ "delete them?"
+#~ msgstr "â??%sâ??æ??件夹å??å?« %d å°?é??å¤?ä¿¡æ?¯ã??æ?¨ç¡®å®?è¦?å? é?¤å®?们å??ï¼?"
+
+#~| msgid "_Edit message"
+#~ msgid "Remo_ve duplicate messages"
+#~ msgstr "移é?¤é??å¤?ä¿¡æ?¯(_V)"
+
+#~| msgid "Select all visible messages"
+#~ msgid "Remove all duplicate messages"
+#~ msgstr "移é?¤æ??æ??é??å¤?æ¶?æ?¯"
+
+#~ msgid "Evolution's Mail Notification"
+#~ msgstr "Evolution é?®ä»¶é??ç?¥"
+
+#~ msgid "Mail Notification Properties"
+#~ msgstr "é?®ä»¶é??ç?¥å±?æ?§"
+
+#~ msgid "Start Evolution activating the specified component"
+#~ msgstr "å?¯å?¨ Evolution 并æ¿?æ´»æ??å®?ç»?件"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "å¼?å§?ç¼?è¾?æ­¤å??å??æ ¼"
+
 #~ msgid "Unable to reconstruct message from autosave file"
 #~ msgstr "æ? æ³?ä»?è?ªå?¨ä¿?å­?ç??æ??件é??建信æ?¯"
 
@@ -21598,9 +21655,6 @@ msgstr "���"
 #~ msgid "S_erver:"
 #~ msgstr "æ??å?¡å?¨(_E)ï¼?"
 
-#~ msgid "Saving attachment"
-#~ msgstr "ä¿?å­?é??件"
-
 #~ msgid ""
 #~ "Cannot create output file: %s:\n"
 #~ " %s"
@@ -21819,9 +21873,6 @@ msgstr "���"
 #~ msgid "Calendar repository is offline."
 #~ msgstr "æ?¥å??ä»?åº?è?±æ?ºã??"
 
-#~ msgid "Error on '{0}'"
-#~ msgstr "{0} å?ºé??"
-
 #~ msgid "No response from the server."
 #~ msgstr "æ??å?¡å?¨æ? å??åº?ã??"
 
@@ -22078,10 +22129,6 @@ msgstr "���"
 #~ msgid "Source List"
 #~ msgstr "æ?¥æº?å??表"
 
-#, fuzzy
-#~ msgid "The registry of address books"
-#~ msgstr "æ? æ³?è?·å¾?å?°å??ç°¿å??表"
-
 #~ msgid "Current View"
 #~ msgstr "å½?å??è§?å?¾"