[evolution] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Update Simplified Chinese translation.
Date: Wed, 2 Mar 2011 13:26:21 +0000 (UTC)
commit a0854ec1a6591ea10ba7915f37684f78f476fcd4
Author: Wei Li <lw124124 gmail com>
Date:   Wed Mar 2 13:26:04 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 4560 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2310 insertions(+), 2250 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7e1b47f..2959a92 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19,9 +19,9 @@ msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2011-01-01 12:06+0000\n"
-"PO-Revision-Date: 2011-01-02 00:23+0800\n"
-"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2011-03-01 20:25+0000\n"
+"PO-Revision-Date: 2011-03-02 21:21+0800\n"
+"Last-Translator: æ??ç?? <lw124124 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:49
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
 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:1280
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1276
 msgid "Failed to delete contact"
 msgstr "å? é?¤è??ç³»äººå¤±è´¥"
 
@@ -208,7 +208,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å?? {0} ç??è??ç³»äººæ? æ³?ä½¿ç?¨ã??"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:609
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
@@ -232,8 +232,8 @@ 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:2084
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../calendar/gui/e-calendar-view.c:2077
 msgid "Anniversary"
 msgstr "çºªå¿µæ?¥"
 
@@ -243,8 +243,8 @@ msgstr "çºªå¿µæ?¥"
 #. * which, so long as it has an icon.  We're just interested in
 #. * 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:2083 ../capplet/anjal-settings-main.c:124
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../calendar/gui/e-calendar-view.c:2076 ../capplet/anjal-settings-main.c:116
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "ç??æ?¥"
@@ -265,23 +265,23 @@ msgid "Calendar:"
 msgstr "æ?¥å??ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:957
+#: ../addressbook/importers/evolution-vcard-importer.c:950
 msgid "Contact"
 msgstr "è??ç³»äºº"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:623
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2654
 msgid "Contact Editor"
 msgstr "è??ç³»äººç¼?è¾?å?¨"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:298
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../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
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../addressbook/gui/widgets/eab-contact-display.c:494
+#: ../addressbook/gui/widgets/eab-contact-display.c:502
+#: ../addressbook/gui/widgets/eab-contact-display.c:844
 #: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "ç?µå?é?®ä»¶"
@@ -295,8 +295,8 @@ msgid "Full _Name..."
 msgstr "å?¨å??(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:70
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:68
 msgid "Home"
 msgstr "å®¶åº"
 
@@ -331,17 +331,17 @@ msgstr "æ?µç§°(_K)ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../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
+#: ../plugins/groupwise-features/camel-gw-listener.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:454
+#: ../plugins/groupwise-features/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "ç¬?è®°"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../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:1789
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../calendar/gui/e-calendar-view.c:1782
 msgid "Other"
 msgstr "å?¶å®?"
 
@@ -366,9 +366,9 @@ msgid "Web addresses"
 msgstr "ç½?ç»?å?°å??"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:67
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Work"
 msgstr "å·¥ä½?"
 
@@ -393,7 +393,7 @@ msgid "_Blog:"
 msgstr "å??å®¢(_N)ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:887
+#: ../calendar/gui/dialogs/event-page.c:880
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
@@ -473,74 +473,74 @@ msgstr "ä½?å¤?(_W)ï¼?"
 msgid "_Zip/Postal Code:"
 msgstr "é?®æ?¿ç¼?ç ?(_Z)ï¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:521
 msgid "Yahoo"
 msgstr "é??è??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:522
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:520
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:518
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:523
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
 #: ../addressbook/gui/widgets/eab-gui-util.c:381
 msgid "Error adding contact"
 msgstr "æ·»å? è??ç³»äººå?ºé??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
 msgid "Error modifying contact"
 msgstr "ä¿®æ?¹è??ç³»äººå?ºé??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
 msgid "Error removing contact"
 msgstr "å? é?¤è??ç³»äººå?ºé??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:638
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2649
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "è??ç³»äººç¼?è¾?å?¨ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3025
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
 msgid "Please select an image for this contact"
 msgstr "è¯·é??æ?©æ¤è??ç³»äººç??å?¾å??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3026
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
 msgid "_No image"
 msgstr "æ? å?¾å??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3352
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -548,43 +548,43 @@ msgstr ""
 "è??ç³»äººæ?°æ?®æ? æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3356
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "â??%sâ??ç??æ ¼å¼?æ? æ??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3363
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sâ??%sâ??ç??æ ¼å¼?æ? æ??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3325
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3336
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3378
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3389
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ??%sâ??ä¸ºç©º"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3404
 msgid "Invalid contact."
 msgstr "æ? æ??ç??è??ç³»äººã??"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:392
 msgid "Contact Quick-Add"
 msgstr "å¿«é??æ·»å? è??ç³»äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:395
 msgid "_Edit Full"
 msgstr "ç¼?è¾?å?¨å??(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
 msgid "_Full name"
 msgstr "å?¨å??(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "E_mail"
 msgstr "ç?µå?é?®ä»¶(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:465
 msgid "_Select Address Book"
 msgstr "é??æ?©å?°å??ç°¿(_S)"
 
@@ -654,7 +654,7 @@ msgid "_Suffix:"
 msgstr "å??ç¼?(_S)ï¼?"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
 msgid "Contact List Editor"
 msgstr "è??ç³»äººå??è¡¨ç¼?è¾?å?¨"
 
@@ -671,7 +671,7 @@ msgid "_List name:"
 msgstr "å??è¡¨å??ç§°(_L)ï¼?"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:159
 msgid "_Select..."
 msgstr "é??æ?©(_S)..."
 
@@ -679,24 +679,24 @@ msgstr "é??æ?©(_S)..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "è¾?å?¥ç?µå?é?®ä»¶å?°å??æ??è??æ??è??ç³»äººæ??æ?¾å?°ä¸?é?¢ç??å??è¡¨(_T)ï¼?"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
 msgid "Contact List Members"
 msgstr "è??ç³»äººå??è¡¨æ??å??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1315
 msgid "_Members"
 msgstr "æ??å??(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
 msgid "Error adding list"
 msgstr "æ·»å? å??è¡¨å?ºé??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
 msgid "Error modifying list"
 msgstr "ä¿®æ?¹å??è¡¨å?ºé??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
 msgid "Error removing list"
 msgstr "å? é?¤å??è¡¨å?ºé??"
 
@@ -704,16 +704,17 @@ msgstr "å? é?¤å??è¡¨å?ºé??"
 msgid "Changed Contact:"
 msgstr "æ?´æ?¹äº?ç??è??ç³»äººï¼?"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
 msgid "Conflicting Contact:"
 msgstr "å?²çª?ç??è??ç³»äººï¼?"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "å¤?å?¶æ£?æµ?å?°ç??è??ç³»äºº"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -736,17 +737,17 @@ msgstr ""
 "æ?¨ä¸?å®?è¦?æ·»å? å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "å??å¹¶(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:169
-#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../calendar/gui/tasktypes.xml.h:7
 #, c-format
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:227
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "å??å¹¶è??ç³»äºº"
 
@@ -754,7 +755,7 @@ 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:1691
+#: ../modules/calendar/e-cal-shell-view-actions.c:1693
 #: ../modules/calendar/e-memo-shell-view-actions.c:774
 #: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
@@ -770,21 +771,21 @@ msgstr "é?®ä»¶ä»¥æ¤å¼?å¤´"
 msgid "Name contains"
 msgstr "å§?å??å?«æ??"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "No contacts"
 msgstr "æ? è??ç³»äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ä¸ªè??ç³»äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:327
+#: ../addressbook/gui/widgets/e-addressbook-model.c:323
 msgid "Error getting book view"
 msgstr "è?·å??å??ç°¿è§?å?¾å?ºé??"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:740
+#: ../addressbook/gui/widgets/e-addressbook-model.c:736
 msgid "Search Interrupted"
 msgstr "æ??ç´¢ä¸æ?äº?"
 
@@ -792,55 +793,55 @@ msgstr "æ??ç´¢ä¸æ?äº?"
 msgid "Error modifying card"
 msgstr "ä¿®æ?¹å??ç??é??è¯¯"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Cut selected contacts to the clipboard"
 msgstr "å°?é??è??ç³»äººå?ªå??å?°å?ªè´´æ?¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Copy selected contacts to the clipboard"
 msgstr "å°?é??ä¸è??ç³»äººå¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Paste contacts from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´è??ç³»äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "å? é?¤é??ä¸ç??è??ç³»äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "é??ä¸å?¨é?¨å?¯è§?è??ç³»äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1294
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??è¡¨å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete this contact list?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??è¡¨å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??ç³»äººå??è¡¨(%s)å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 msgid "Are you sure you want to delete these contacts?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete this contact?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??ç³»äºº(%s)å??ï¼?"
 
-#. Translators: This is shown for more than 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#. Translators: This is shown for > 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -852,16 +853,16 @@ msgstr[0] ""
 "æ??å¼? %d ä¸ªè??ç³»äººå°?å??æ?¶æ??å¼? %d ä¸ªæ?°çª?å?£ã??\n"
 "æ?¨ç??ç??æ?³è¦?æ?¾ç¤ºæ??æ??è??ç³»äººå??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1481
 msgid "_Don't Display"
 msgstr "ä¸?æ?¾ç¤º(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
 msgid "Display _All Contacts"
 msgstr "æ?¾ç¤ºå?¨é?¨è??ç³»äºº(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Assistant"
 msgstr "å?©æ??"
 
@@ -898,7 +899,7 @@ msgid "Categories"
 msgstr "ç±»å?«"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Company"
 msgstr "å?¬å?¸"
 
@@ -947,22 +948,22 @@ msgid "Journal"
 msgstr "æ?¥è®°"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Manager"
 msgstr "ç»?ç??"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Mobile Phone"
 msgstr "ç§»å?¨ç?µè¯?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:509
 msgid "Nickname"
 msgstr "æ?µç§°"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Note"
 msgstr "æ³¨é??"
 
@@ -997,7 +998,7 @@ msgid "Role"
 msgstr "è§?è?²"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Spouse"
 msgstr "é??å?¶"
 
@@ -1027,7 +1028,7 @@ msgstr "å??ä½?"
 msgid "Web Site"
 msgstr "ç½?ç«?"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1037,7 +1038,7 @@ msgstr ""
 "\n"
 "æ£å?¨æ??ç´¢è??ç³»äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1051,7 +1052,7 @@ msgstr ""
 "\n"
 "æ??å?¨æ¤å??å?»ä»¥å??å»ºæ?°è??ç³»äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1065,7 +1066,7 @@ msgstr ""
 "\n"
 "è¯·å?¨æ¤å??å?»ä»¥å??å»ºæ?°è??ç³»äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1075,7 +1076,7 @@ msgstr ""
 "\n"
 "æ??ç´¢è??ç³»äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1085,16 +1086,16 @@ msgstr ""
 "\n"
 "æ?¬è§?å?¾ä¸æ²¡æ??å?¯æ?¾ç¤ºç??é¡¹ã??"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:98
 msgid "Work Email"
 msgstr "å·¥ä½?ç?µå?é?®ä»¶"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Home Email"
 msgstr "å®¶åºç?µå?é?®ä»¶"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
-#: ../addressbook/gui/widgets/e-minicard.c:808
+#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "å?¶å®?ç?µå?é?®ä»¶"
 
@@ -1134,96 +1135,86 @@ msgstr "è??ç³»äººï¼?"
 msgid "evolution minicard"
 msgstr "evolution è¢?ç??å?¡"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 msgid "Copy _Email Address"
 msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:395
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../widgets/misc/e-web-view.c:397
 msgid "Copy the email address to the clipboard"
 msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??å?°å?ªè´´æ?¿"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:400
+#: ../addressbook/gui/widgets/eab-contact-display.c:179
+#: ../widgets/misc/e-web-view.c:402
 msgid "_Send New Message To..."
 msgstr "æ??æ?°ä¿¡æ?¯å??é??å?°(_S)..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:404
 msgid "Send a mail message to this address"
 msgstr "å??é??ä¸?ä¸ªé?®ä»¶ä¿¡æ?¯å?°è¿?ä¸ªå?°å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:258
-#: ../addressbook/gui/widgets/eab-contact-display.c:260
-msgid "(map)"
-msgstr "(å?°å?¾)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:278
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
-msgid "map"
-msgstr "å?°å?¾"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:415
-#: ../addressbook/gui/widgets/eab-contact-display.c:778
+#: ../addressbook/gui/widgets/eab-contact-display.c:424
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
 msgid "List Members"
 msgstr "å??å?ºæ??å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Department"
 msgstr "é?¨é?¨"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Profession"
 msgstr "è??ä¸?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Video Chat"
 msgstr "è§?é¢?è??å¤©"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:547
 #: ../calendar/gui/dialogs/calendar-setup.c:376
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
 #: ../modules/calendar/e-cal-shell-view.c:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/camel-gw-listener.c:427
+#: ../plugins/groupwise-features/camel-gw-listener.c:452
+#: ../plugins/groupwise-features/camel-gw-listener.c:568
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "æ?¥å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../calendar/gui/dialogs/event-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "å¿?/é?²"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Phone"
 msgstr "ç?µè¯?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Fax"
 msgstr "ä¼ ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Address"
 msgstr "å?°å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 msgid "Home Page"
 msgstr "ä¸»é¡µ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
 msgid "Web Log"
 msgstr "Web æ?¥å¿?"
 
@@ -1231,33 +1222,33 @@ msgstr "Web æ?¥å¿?"
 #. Create the default Person calendar
 #. 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:366
-#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../capplet/settings/mail-capplet-shell.c:361
+#: ../modules/addressbook/e-book-shell-backend.c:112
 #: ../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-cal-shell-backend.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:161
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:116
-#: ../modules/calendar/e-task-shell-migrate.c:126
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:128
 msgid "Personal"
 msgstr "ä¸ªäºº"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:796
+#: ../addressbook/gui/widgets/eab-contact-display.c:829
 msgid "Job Title"
 msgstr "è??ç§°"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:833
+#: ../addressbook/gui/widgets/eab-contact-display.c:866
 msgid "Home page"
 msgstr "ä¸»é¡µ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:842
+#: ../addressbook/gui/widgets/eab-contact-display.c:875
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:852
+#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../widgets/misc/e-web-view.c:854
 #, c-format
 msgid "Click to mail %s"
 msgstr "å??å?»ä»¥ç»? %s å??é??é?®ä»¶"
@@ -1379,49 +1370,49 @@ msgstr "å??ç??è§?å?¾"
 msgid "Importing..."
 msgstr "æ£å?¨å¯¼å?¥..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1021
+#: ../addressbook/importers/evolution-csv-importer.c:1016
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1022
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV å?? Tab å¯¼å?¥å?¨"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1030
+#: ../addressbook/importers/evolution-csv-importer.c:1025
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1031
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV å?? Tab å¯¼å?¥å?¨"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1039
+#: ../addressbook/importers/evolution-csv-importer.c:1034
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1040
+#: ../addressbook/importers/evolution-csv-importer.c:1035
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV å?? Tab å¯¼å?¥å?¨"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:757
+#: ../addressbook/importers/evolution-ldif-importer.c:753
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP æ?°æ?®äº¤æ?¢æ ¼å¼?(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:758
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF å¯¼å?¥å?¨"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:646
+#: ../addressbook/importers/evolution-vcard-importer.c:639
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vfg, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:647
+#: ../addressbook/importers/evolution-vcard-importer.c:640
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard å¯¼å?¥å?¨"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:746
+#: ../addressbook/printing/e-contact-print.c:741
 #, c-format
 msgid "Page %d"
 msgstr "ç¬¬ %d é¡µ"
@@ -1495,31 +1486,6 @@ msgstr "å?¨æ?®é??æ¨¡å¼?ä¸ï¼?ä¸?åº?è¯¥æ??å¤§å°?é??é¡¹ã??"
 msgid "Unhandled error"
 msgstr "æ?ªå¤?ç??ç??é??è¯¯"
 
-#: ../addressbook/util/addressbook.c:103
-msgid "Accessing LDAP Server anonymously"
-msgstr "å?¿å??è®¿é?® LDAP æ??å?¡å?¨"
-
-#: ../addressbook/util/addressbook.c:215
-#: ../plugins/groupwise-features/camel-gw-listener.c:526
-msgid "Failed to authenticate.\n"
-msgstr "è®¤è¯?å¤±è´¥ã??\n"
-
-#: ../addressbook/util/addressbook.c:222
-#: ../plugins/groupwise-features/camel-gw-listener.c:506
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "è¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
-
-#: ../addressbook/util/addressbook.c:230
-#: ../calendar/common/authentication.c:53
-#: ../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 "è¾?å?¥å¯?ç ?"
-
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -1874,11 +1840,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??ä»»å?¡å°?æ? æ³?ä½¿ç?¨ã??"
 
 #: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "ä¸¢å¼?æ?´æ?¹(_D)"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:313
 msgid "_Save"
 msgstr "ä¿?å?(_S)"
 
@@ -1887,7 +1853,7 @@ msgid "_Save Changes"
 msgstr "ä¿?å?æ?´æ?¹(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å??é??(_S)"
@@ -1896,17 +1862,38 @@ msgstr "å??é??(_S)"
 msgid "_Send Notice"
 msgstr "å??é??é??ç?¥(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/common/authentication.c:53
+#: ../calendar/gui/e-meeting-store.c:1775
+#: ../plugins/caldav/caldav-browse-server.c:921
+#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/publish-calendar/publish-calendar.c:332
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "è¾?å?¥å¯?ç ?"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:114
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ?¶"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgid_plural "days"
+msgstr[0] "å¤©"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "å¼?å§?æ?¶é?´"
 
@@ -1921,8 +1908,8 @@ msgstr "å?¨é?¨é??è¿?(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
 #: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "ä½?ç½®ï¼?"
@@ -1931,7 +1918,7 @@ msgstr "ä½?ç½®ï¼?"
 msgid "Snooze _time:"
 msgstr "å??ç?¡æ?¶é?´(_T)ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:887
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:883
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "é??è¿?(_D)"
@@ -1940,53 +1927,53 @@ msgstr "é??è¿?(_D)"
 msgid "_Snooze"
 msgstr "å??ç?¡(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../plugins/google-account-setup/google-contacts-source.c:376
 msgid "hours"
 msgstr "å°?æ?¶"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "çº¦ä¼?ä½?ç½®"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:374
+#: ../plugins/google-account-setup/google-contacts-source.c:375
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1585
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
 msgid "No summary available."
 msgstr "æ²¡æ??å?¯ç?¨ç??æ??è¦?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 msgid "No description available."
 msgstr "æ²¡æ??æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
 msgid "No location information available."
 msgstr "æ²¡æ??å?¯ç?¨ç??ä½?ç½®ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
 #, c-format
 msgid "You have %d alarm"
 msgid_plural "You have %d alarms"
 msgstr[0] "æ?¨æ?? %d ä¸ªæ??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1771
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1706
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1998,7 +1985,7 @@ msgstr ""
 "å??é??ç?µå?é?®ä»¶ã??Evolution å°?ä»¥\n"
 "æ?¾ç¤ºæ?®é??æ??é??å¯¹è¯?æ¡?ä»£æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1777
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2014,7 +2001,7 @@ msgstr ""
 "\n"
 "æ?¨ç¡®ä¿¡æ?¨è¦?è¿?è¡?è¯¥ç¨?åº?å??ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1756
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1792
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??æ¬¡è¯¢é?®æ¤é?®é¢?ã??"
 
@@ -2023,7 +2010,7 @@ msgid "invalid time"
 msgstr "æ? æ??æ?¶é?´"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2031,7 +2018,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d å°?æ?¶"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2041,7 +2028,7 @@ msgstr[0] "%d å??é??"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2093,8 +2080,8 @@ msgstr "ç±»å?«"
 msgid "Classification"
 msgstr "å??ç±»"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "æ?ºå¯?"
@@ -2102,7 +2089,7 @@ msgstr "æ?ºå¯?"
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:524
+#: ../widgets/misc/e-attachment-tree-view.c:520
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°"
@@ -2135,21 +2122,21 @@ msgstr "ä½?ç½®"
 msgid "Organizer"
 msgstr "ç»?ç»?è??"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:493
 #: ../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:769 ../calendar/gui/e-cal-model.c:776
-#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:760 ../calendar/gui/e-cal-model.c:767
+#: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬å¼?"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:317
+#: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "å??ç?°"
@@ -2193,22 +2180,22 @@ msgid "Edit Alarm"
 msgstr "ç¼?è¾?æ??é??"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:435
 msgid "Pop up an alert"
 msgstr "å¼¹å?ºè¦å??"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:431
 msgid "Play a sound"
 msgstr "æ?æ?¾å£°é?³"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Run a program"
 msgstr "è¿?è¡?ç¨?åº?"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:439
 msgid "Send an email"
 msgstr "å??é??ç?µå?é?®ä»¶"
 
@@ -2217,7 +2204,7 @@ msgid "Add Alarm"
 msgstr "æ·»å? æ??é??"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "æ??é??"
 
@@ -2277,15 +2264,6 @@ msgstr "ä¹?å??"
 msgid "day(s)"
 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:428
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:376
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "å¤©"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "end of appointment"
 msgstr "çº¦ä¼?ç»?æ??"
@@ -2326,15 +2304,15 @@ msgid "Type:"
 msgstr "ç±»å??ï¼?"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:513
+#: ../modules/addressbook/addressbook-config.c:509
 msgid "_Type:"
 msgstr "ç±»å??(_T)ï¼?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
 #: ../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
-#: ../widgets/misc/e-signature-script-dialog.c:285
+#: ../widgets/misc/e-signature-script-dialog.c:278
 msgid "_Name:"
 msgstr "å??ç§°(_N)ï¼?"
 
@@ -2358,7 +2336,7 @@ msgstr "é¢?è?²(_R)ï¼?"
 #: ../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/addressbook/addressbook-config.c:1010
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
 #: ../plugins/itip-formatter/itip-formatter.c:2818
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
@@ -2443,242 +2421,242 @@ msgstr "%s  æ?¨å·²ç»?å??å?ºäº?ä¿®æ?¹ã??æ?¾å¼?è¿?äº?ä¿®æ?¹å¹¶æ?´æ?°ç¼?è¾?å?¨å??
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  æ?¨è¿?æ²¡æ??è¿?è¡?ä¿®æ?¹ï¼?æ?´æ?°ç¼?è¾?å?¨å??ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:448
+#: ../calendar/gui/dialogs/comp-editor-page.c:444
 #, c-format
 msgid "Validation error: %s"
 msgstr "æ ¡éª?é??è¯¯ï¼?%s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:267
+#: ../calendar/gui/dialogs/comp-editor.c:260
 msgid "Could not save attachments"
 msgstr "ä¸?è?½ä¿?å?é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:543
+#: ../calendar/gui/dialogs/comp-editor.c:535
 msgid "Could not update object"
 msgstr "æ? æ³?æ?´æ?°å¯¹è±¡"
 
-#: ../calendar/gui/dialogs/comp-editor.c:658
+#: ../calendar/gui/dialogs/comp-editor.c:650
 msgid "Edit Appointment"
 msgstr "ç¼?è¾?çº¦ä¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:657
 #, c-format
 msgid "Meeting - %s"
 msgstr "ä¼?è®® - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Appointment - %s"
 msgstr "çº¦ä¼? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:673
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "å??é??ç??ä»»å?¡ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:667
 #, c-format
 msgid "Task - %s"
 msgstr "ä»»å?¡ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:680
+#: ../calendar/gui/dialogs/comp-editor.c:672
 #, c-format
 msgid "Memo - %s"
 msgstr "å¤?å¿? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:688
 msgid "No Summary"
 msgstr "æ²¡æ??æ¦?è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:817
+#: ../calendar/gui/dialogs/comp-editor.c:809
 msgid "Keep original item?"
 msgstr "ä¿?ç??å??å§?æ?¡ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1013
+#: ../calendar/gui/dialogs/comp-editor.c:1005
 msgid "Click here to close the current window"
 msgstr "å??å?»æ¤å¤?å?¯å?³é?å½?å??çª?å?£"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:132
+#: ../shell/e-shell-window-actions.c:1433
+#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:551
+#: ../widgets/misc/e-web-view.c:414 ../widgets/misc/e-web-view.c:1067
 msgid "Copy the selection"
 msgstr "å¤?å?¶é??ä¸å??å®¹"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1440
+#: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:546
+#: ../widgets/misc/e-web-view.c:1061
 msgid "Cut the selection"
 msgstr "å?ªå??é??ä¸å??å®¹"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1026
+#: ../shell/e-shell-window-actions.c:1447
+#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:561
 msgid "Delete the selection"
 msgstr "å? é?¤é??ä¸å??å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1041
+#: ../calendar/gui/dialogs/comp-editor.c:1033
 msgid "Click here to view help available"
 msgstr "å??å?»æ¤å¤?å?¯æ?¥ç??å?¯ç?¨ç??å¸®å?©"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1482
+#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:556
+#: ../widgets/misc/e-web-view.c:1073
 msgid "Paste the clipboard"
 msgstr "ç²?è´´å?ªè´´æ?¿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1069
+#: ../calendar/gui/dialogs/comp-editor.c:1061
 msgid "Click here to save the current window"
 msgstr "å??å?»æ¤å¤?å?¯ä¿?å?å½?å??çª?å?£"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:153
+#: ../shell/e-shell-window-actions.c:1552
+#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:566
 msgid "Select all text"
 msgstr "é??ä¸æ??æ??æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1075
 msgid "_Classification"
 msgstr "å??ç±»(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1082
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:174
+#: ../mail/e-mail-browser.c:167
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1580
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1587
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "æ??ä»¶(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
-#: ../shell/e-shell-window-actions.c:1595
+#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../shell/e-shell-window-actions.c:1594
 msgid "_Help"
 msgstr "å¸®å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1111
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1118
-#: ../composer/e-composer-actions.c:301
+#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../composer/e-composer-actions.c:336
 msgid "_Options"
 msgstr "é??é¡¹(_O)"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:174
+#: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
-#: ../composer/e-composer-actions.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../composer/e-composer-actions.c:285
 msgid "_Attachment..."
 msgstr "é??ä»¶(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Click here to attach a file"
 msgstr "å??å?»æ¤å¤?å?¯ä¾¿é??å? æ??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Categories"
 msgstr "ç±»å?«(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether to display categories"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç±»å?«"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Time _Zone"
 msgstr "æ?¶å?º(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºæ?¶å?º"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1156
 msgid "Pu_blic"
 msgstr "å?¬å¼?(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "Classify as public"
 msgstr "å??ç±»ä¸ºå?¬å¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "_Private"
 msgstr "ç§?äºº(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Classify as private"
 msgstr "å??ç±»ä¸ºç§?äºº"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "_Confidential"
 msgstr "æ?ºå¯?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1172
 msgid "Classify as confidential"
 msgstr "å??ç±»ä¸ºæ?ºå¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1180
 msgid "R_ole Field"
 msgstr "è§?è?²å??(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè§?è?²å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1188
 msgid "_RSVP"
 msgstr "è¯·å??å¤?(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè¯·å??å¤?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1196
 msgid "_Status Field"
 msgstr "ç?¶æ??å??(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç?¶æ??å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 msgid "_Type Field"
 msgstr "ç±»å??å??(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1206
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºå?ºå¸è??ç±»å??å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238
+#: ../calendar/gui/dialogs/comp-editor.c:1230
 #: ../composer/e-composer-private.c:73
 msgid "Recent _Documents"
 msgstr "æ??è¿?æ??æ¡£(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1923
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1935
+#: ../composer/e-composer-actions.c:504
 msgid "Attach"
 msgstr "é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2252
-#: ../calendar/gui/dialogs/comp-editor.c:2415
-#: ../calendar/gui/dialogs/comp-editor.c:3382
+#: ../calendar/gui/dialogs/comp-editor.c:2264
+#: ../calendar/gui/dialogs/comp-editor.c:2427
+#: ../calendar/gui/dialogs/comp-editor.c:3402
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ?´æ?°å?°è¾¾ç??è¯?ï¼?å¯¹æ¤é¡¹ç?®ç??æ?´æ?¹å°?è¢«ä¸¢å¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3346
+#: ../calendar/gui/dialogs/comp-editor.c:3366
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3414
+#: ../calendar/gui/dialogs/comp-editor.c:3434
 msgid "Unable to use current version!"
 msgstr "æ? æ³?ä½¿ç?¨å½?å??ç??æ?¬ï¼?"
 
@@ -2778,147 +2756,147 @@ msgstr "æ??æ??ç»?ï¼?"
 msgid "Enter Delegate"
 msgstr "è¾?å?¥ä»£è¡¨"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Alarms"
 msgstr "æ??é??(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Click here to set or unset alarms for this event"
 msgstr "å??å?»æ¤å¤?ä»¥è®¾å®?æ??å??æ¶?æ¤äº?ä»¶ç??æ??é??"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
 msgstr "å°?æ?¶é?´æ?¾ç¤ºä¸ºå¿?(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Toggles whether to show time as busy"
 msgstr "å??æ?¢æ?¯å?¦å°?æ?¶é?´æ?¾ç¤ºä¸ºå¿?"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "_Recurrence"
 msgstr "å??ç?°(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Make this a recurring event"
 msgstr "å°?æ¤äº?ä»¶æ ?ä¸ºé??å¤?å??ç??"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:240
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "å??é??é??é¡¹"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é«?çº§å??é??é??é¡¹"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "All _Day Event"
 msgstr "å?¨å¤©äº?ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:252
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ?¢æ?¯å?¦æ??å?¨å¤©äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:261
 msgid "_Free/Busy"
 msgstr "å¿?/é?²(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:263
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è¯¢å?ºå¸è??ç??å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3172
 msgid "Appointment"
 msgstr "çº¦ä¼?"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-editor.c:384
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "å?ºå¸è??"
 
-#: ../calendar/gui/dialogs/event-editor.c:585
+#: ../calendar/gui/dialogs/event-editor.c:581
 msgid "Print this event"
 msgstr "æ??å?°æ¤äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:771
+#: ../calendar/gui/dialogs/event-page.c:764
 msgid "Event's start time is in the past"
 msgstr "äº?ä»¶å¼?å§?æ?¶é?´å?¨è¿?å?»"
 
-#: ../calendar/gui/dialogs/event-page.c:812
+#: ../calendar/gui/dialogs/event-page.c:805
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "å? æ??é??ç??æ?¥ç¨?ä¸ºå?ªè¯»ï¼?æ?¨æ? æ³?ç¼?è¾?è¯¥äº?ä»¶ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:816
+#: ../calendar/gui/dialogs/event-page.c:809
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ¤æ? æ³?ç¼?è¾?å?¨é?¨äº?ä»¶ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:828
-#: ../calendar/gui/dialogs/event-page.c:2784
+#: ../calendar/gui/dialogs/event-page.c:821
+#: ../calendar/gui/dialogs/event-page.c:2779
 msgid "This event has alarms"
 msgstr "æ¤äº?ä»¶æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:895
+#: ../calendar/gui/dialogs/event-page.c:888
 #: ../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:942
+#: ../calendar/gui/dialogs/event-page.c:935
 msgid "_Delegatees"
 msgstr "ä»£ç??äºº(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "Atte_ndees"
 msgstr "å?ºå¸è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1159
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "æ²¡æ??å¼?å§?æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1162
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "æ²¡æ??ç»?æ??æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
-#: ../calendar/gui/dialogs/memo-page.c:689
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:670
+#: ../calendar/gui/dialogs/task-page.c:904
 msgid "Start date is wrong"
 msgstr "å¼?å§?æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "ç»?æ??æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1366
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "å¼?å§?æ?¶é?´æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1373
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "ç»?æ??æ?¶é?´æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1537
-#: ../calendar/gui/dialogs/memo-page.c:730
-#: ../calendar/gui/dialogs/task-page.c:971
+#: ../calendar/gui/dialogs/event-page.c:1532
+#: ../calendar/gui/dialogs/memo-page.c:711
+#: ../calendar/gui/dialogs/task-page.c:966
 msgid "The organizer selected no longer has an account."
 msgstr "é??ä¸ç??ç»?ç»?è??æ²¡æ??å¸?å?·äº?ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1543
-#: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1538
+#: ../calendar/gui/dialogs/memo-page.c:717
+#: ../calendar/gui/dialogs/task-page.c:972
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??ç»?ç»?è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1568
-#: ../calendar/gui/dialogs/task-page.c:1001
+#: ../calendar/gui/dialogs/event-page.c:1563
+#: ../calendar/gui/dialogs/task-page.c:996
 msgid "At least one attendee is required."
 msgstr "é??è¦?è?³å°?ä¸?ä¸ªå?ºå¸è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2658
+#: ../calendar/gui/dialogs/event-page.c:2653
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??ã??"
@@ -2929,44 +2907,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:2702
-#: ../calendar/gui/dialogs/memo-page.c:949
-#: ../calendar/gui/dialogs/task-page.c:1791
+#: ../calendar/gui/dialogs/event-page.c:2697
+#: ../calendar/gui/dialogs/memo-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:1786
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æ?¨æ£å?¨ä»¥ %s ç??èº«ä»½è¡?å?¨"
 
-#: ../calendar/gui/dialogs/event-page.c:3013
+#: ../calendar/gui/dialogs/event-page.c:3008
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "çº¦ä¼?ç?? %d å¤©å??"
 
-#: ../calendar/gui/dialogs/event-page.c:3019
+#: ../calendar/gui/dialogs/event-page.c:3014
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "çº¦ä¼?ç?? %d å°?æ?¶å??"
 
-#: ../calendar/gui/dialogs/event-page.c:3025
+#: ../calendar/gui/dialogs/event-page.c:3020
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "çº¦ä¼?ç?? %d å??é??å??"
 
-#: ../calendar/gui/dialogs/event-page.c:3044
+#: ../calendar/gui/dialogs/event-page.c:3039
 msgid "Customize"
 msgstr "è?ªå®?ä¹?"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:3045
 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:566
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "Atte_ndees..."
 msgstr "å?ºå¸è??(_N)..."
 
@@ -2990,12 +2968,12 @@ msgstr "æ??é??(_A)"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:349
+#: ../widgets/misc/e-attachment-dialog.c:342
 msgid "_Description:"
 msgstr "æ??è¿°(_D)ï¼?"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:361
+#: ../plugins/calendar-weather/calendar-weather.c:362
 msgid "_Location:"
 msgstr "ä½?ç½®(_L)ï¼?"
 
@@ -3037,35 +3015,35 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3176
 msgid "Memo"
 msgstr "å¤?å¿?"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:155
 msgid "Print this memo"
 msgstr "æ??å?°æ¤å¤?å¿?å½?"
 
-#: ../calendar/gui/dialogs/memo-page.c:341
+#: ../calendar/gui/dialogs/memo-page.c:336
 msgid "Memo's start date is in the past"
 msgstr "å¤?å¿?å½?å¼?å§?æ?¶é?´å?¨è¿?å?»"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
+#: ../calendar/gui/dialogs/memo-page.c:374
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "å? æ??é??ç??å¤?å¿?å??è¡¨ä¸ºå?ªè¯»ï¼?æ?¨æ? æ³?ç¼?è¾?è¯¥å¤?å¿?ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:383
+#: ../calendar/gui/dialogs/memo-page.c:378
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ¤æ? æ³?ç¼?è¾?å?¨é?¨å¤?å¿?ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/memo-page.c:891
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "æ? æ³?æ??å¼?â??%sâ??ä¸ç??å¤?å¿?ã??"
 
-#: ../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
+#: ../calendar/gui/dialogs/memo-page.c:1062 ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1048 ../mail/em-format-html.c:2395
+#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "æ?¶ä»¶äºº"
 
@@ -3084,7 +3062,7 @@ msgid "T_o:"
 msgstr "å?°(_O)ï¼?"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:428
+#: ../calendar/gui/dialogs/task-page.c:421
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ç»?(_G)ï¼?"
@@ -3125,21 +3103,21 @@ msgstr "æ?¬æ¬¡å??ä»¥å??å??æ¬¡"
 msgid "All Instances"
 msgstr "æ??æ??å??æ¬¡"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:569
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "æ¤çº¦ä¼?å?«æ?? Evolution æ? æ³?ç¼?è¾?ç??å??ç?°ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:901
+#: ../calendar/gui/dialogs/recurrence-page.c:894
 msgid "Recurrence date is invalid"
 msgstr "å??ç?°æ?¥æ??æ? æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:941
+#: ../calendar/gui/dialogs/recurrence-page.c:934
 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:971
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "on"
 msgstr "å?¨"
 
@@ -3147,7 +3125,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:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1022
 msgid "first"
 msgstr "ç¬¬ä¸?ä¸ª"
 
@@ -3156,7 +3134,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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1028
 msgid "second"
 msgstr "ç¬¬äº?"
 
@@ -3164,7 +3142,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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1033
 msgid "third"
 msgstr "ç¬¬ä¸?ä¸ª"
 
@@ -3172,7 +3150,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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "fourth"
 msgstr "ç¬¬å??ä¸ª"
 
@@ -3180,7 +3158,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:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "fifth"
 msgstr "ç¬¬äº?ä¸ª"
 
@@ -3188,13 +3166,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:1055
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 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:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "å?¶å®?æ?¥æ??"
 
@@ -3202,7 +3180,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:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1078
 msgid "1st to 10th"
 msgstr "ä¸?æ?¬"
 
@@ -3210,7 +3188,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:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "11th to 20th"
 msgstr "ä¸æ?¬"
 
@@ -3218,48 +3196,48 @@ 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:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 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:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgstr "å¤©"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "æ??æ??å?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
@@ -3267,31 +3245,31 @@ 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:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1244
 msgid "on the"
 msgstr "å?¨"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1425
+#: ../calendar/gui/dialogs/recurrence-page.c:1418
 msgid "occurrences"
 msgstr "å¾ªç?¯"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2132
+#: ../calendar/gui/dialogs/recurrence-page.c:2122
 msgid "Add exception"
 msgstr "æ·»å? ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2173
+#: ../calendar/gui/dialogs/recurrence-page.c:2163
 msgid "Could not get a selection to modify."
 msgstr "æ? æ³?è?·å¾?è¦?ä¿®æ?¹ç??é??ä¸é¡¹ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2179
+#: ../calendar/gui/dialogs/recurrence-page.c:2169
 msgid "Modify exception"
 msgstr "ä¿®æ?¹ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2223
+#: ../calendar/gui/dialogs/recurrence-page.c:2213
 msgid "Could not get a selection to delete."
 msgstr "æ? æ³?è?·å¾?è¦?å? é?¤ç??é??ä¸é¡¹ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2357
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ?¶é?´"
 
@@ -3353,31 +3331,31 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "å¹´"
 
-#: ../calendar/gui/dialogs/send-comp.c:193
+#: ../calendar/gui/dialogs/send-comp.c:192
 msgid "Send my alarms with this event"
 msgstr "å?¨è¿?ä¸ªäº?ä»¶é??å??é??æ??ç??æ??é??"
 
 # #####
-#: ../calendar/gui/dialogs/send-comp.c:195
+#: ../calendar/gui/dialogs/send-comp.c:194
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?ºå¸è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:356
-#: ../calendar/gui/dialogs/task-details-page.c:378
+#: ../calendar/gui/dialogs/task-details-page.c:352
+#: ../calendar/gui/dialogs/task-details-page.c:374
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:485
 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: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:3230 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:712 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:596
+#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3385,59 +3363,59 @@ msgstr "å·²å??æ¶?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../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-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/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:710
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
+#: ../calendar/gui/e-task-table.c:595 ../calendar/gui/print.c:3259
 #: ../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:317
+#: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1228 ../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: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:3224
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:434
+#: ../calendar/gui/e-cal-model-tasks.c:708
+#: ../calendar/gui/e-cal-model-tasks.c:785 ../calendar/gui/e-task-table.c:206
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3256
 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:321
+#: ../calendar/gui/e-cal-component-preview.c:317
 #: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1226 ../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: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
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1520 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1227
 #: ../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: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:3221 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:432
+#: ../calendar/gui/e-cal-model-tasks.c:706 ../calendar/gui/e-task-table.c:204
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "å°?æ?ªå¼?å§?"
 
@@ -3453,7 +3431,7 @@ 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:1837
+#: ../calendar/gui/e-calendar-view.c:1830
 #: ../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
@@ -3481,58 +3459,58 @@ msgstr "ä¼?å??çº§(_P)ï¼?"
 msgid "_Web Page:"
 msgstr "ç½?é¡µ(_W)ï¼?"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "ç?¶æ??ç»?è??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:118
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "å??å?»å?¯æ?´æ?¹æ??æ?¥ç??ä»»å?¡ç??ç?¶æ??ç»?è??"
 
-#: ../calendar/gui/dialogs/task-editor.c:126
+#: ../calendar/gui/dialogs/task-editor.c:122
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å??é??é??é¡¹(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3142
-#: ../widgets/misc/e-send-options.c:503
+#: ../calendar/gui/dialogs/task-editor.c:327 ../calendar/gui/print.c:3174
+#: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "ä»»å?¡"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:330
 msgid "Task Details"
 msgstr "ä»»å?¡ç»?è??"
 
-#: ../calendar/gui/dialogs/task-editor.c:376
+#: ../calendar/gui/dialogs/task-editor.c:372
 msgid "Print this task"
 msgstr "æ??å?°æ¤ä»»å?¡"
 
-#: ../calendar/gui/dialogs/task-page.c:345
+#: ../calendar/gui/dialogs/task-page.c:338
 msgid "Task's start date is in the past"
 msgstr "ä»»å?¡ç??å¼?å§?æ?¥æ??æ?¯å?¨è¿?å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.c:339
 msgid "Task's due date is in the past"
 msgstr "ä»»å?¡ç??å?°æ??æ?¶é?´æ?¯å?¨è¿?å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:381
+#: ../calendar/gui/dialogs/task-page.c:374
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ä»»å?¡ä¸?è?½è¢«ç¼?è¾?ï¼?å? ä¸ºé??æ?©ç??ä»»å?¡å??è¡¨æ?¯å?ªè¯»ç??"
 
-#: ../calendar/gui/dialogs/task-page.c:385
+#: ../calendar/gui/dialogs/task-page.c:378
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "æ? æ³?å®?å?¨ç¼?è¾?ä»»å?¡ï¼?å? ä¸ºæ?¨ä¸?æ?¯ç»?ç»?è??"
 
-#: ../calendar/gui/dialogs/task-page.c:436
+#: ../calendar/gui/dialogs/task-page.c:429
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ç»?ç»?è??(_Z)ï¼?"
 
-#: ../calendar/gui/dialogs/task-page.c:882
+#: ../calendar/gui/dialogs/task-page.c:877
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥æ??é??è¯¯"
 
-#: ../calendar/gui/dialogs/task-page.c:1748
+#: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "æ? æ³?æ??å¼?â??%sâ??ä¸ç??ä»»å?¡ã??"
@@ -3550,115 +3528,115 @@ msgid "Time zone:"
 msgstr "æ?¶å?ºï¼?"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/gui/e-alarm-list.c:381
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d å¤©"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:387
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d å?¨"
 
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:449
 msgid "Unknown action to be performed"
 msgstr "æ?§è¡?æ?ªç?¥ç??å?¨ä½?"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:463
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "å?¨çº¦ä¼?å¼?å§?ä¹?å?? %s %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:468
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "å?¨çº¦ä¼?å¼?å§?ä¹?å?? %s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "å?¨çº¦ä¼?å¼?å§?æ?¶ %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "å?¨çº¦ä¼?ç»?æ??ä¹?å?? %s %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:504
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "å?¨çº¦ä¼?ç»?æ??ä¹?å?? %s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:511
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "å?¨çº¦ä¼?ç»?æ??æ?¶ %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:535
+#: ../calendar/gui/e-alarm-list.c:522
 #, c-format
 msgid "%s at %s"
 msgstr "å?¨ %2$s æ?¶ %1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:543
+#: ../calendar/gui/e-alarm-list.c:530
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s ä¸ºæ?ªç?¥è§¦å??ç±»å??"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
+#: ../calendar/gui/e-cal-component-preview.c:188 ../filter/e-filter-rule.c:667
 msgid "Untitled"
 msgstr "æ? æ ?é¢?"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:194
 msgid "Categories:"
 msgstr "ç±»å?«ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Summary:"
 msgstr "æ¦?è¦?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:257
 msgid "Start Date:"
 msgstr "å¼?å§?æ?¥æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "å?°æ??æ?¥æ??ï¼?"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "ç?¶æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "ä¼?å??çº§ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "ç½?é¡µï¼?"
 
@@ -3685,16 +3663,16 @@ msgid "Start Date"
 msgstr "å¼?å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
+#: ../calendar/gui/e-task-table.c:570
 msgid "Free"
 msgstr "ç©ºé?²"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:544 ../calendar/gui/e-task-table.c:571
 msgid "Busy"
 msgstr "ç¹?å¿?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:654
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3705,44 +3683,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:708
+#: ../calendar/gui/e-cal-model-tasks.c:704
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ? "
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model-tasks.c:1060 ../calendar/gui/e-cal-model.c:1526
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1029
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1026
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model-tasks.c:1060 ../calendar/gui/e-cal-model.c:1526
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "å?¦"
 
-#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:773 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../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
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1092
+#: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:98
 #: ../plugins/itip-formatter/itip-formatter.c:457
 #: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
-#: ../calendar/gui/e-cal-model.c:1526
+#: ../calendar/gui/e-cal-model.c:1522
 msgid "Recurring"
 msgstr "é??å¤?"
 
-#: ../calendar/gui/e-cal-model.c:1528
+#: ../calendar/gui/e-cal-model.c:1524
 msgid "Assigned"
 msgstr "å·²å??é??"
 
-#: ../calendar/gui/e-cal-model.c:2608
+#: ../calendar/gui/e-cal-model.c:2642
 #, c-format
 msgid "Opening %s"
 msgstr "æ??å¼? %s"
@@ -3782,107 +3760,107 @@ msgstr "å¼?å§?æ?¥æ??"
 #: ../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
+#: ../widgets/misc/e-attachment-tree-view.c:578
 msgid "Type"
 msgstr "ç±»å??"
 
-#: ../calendar/gui/e-calendar-view.c:430
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Cut selected events to the clipboard"
 msgstr "å°?é??ä¸äº?ä»¶å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-calendar-view.c:436
+#: ../calendar/gui/e-calendar-view.c:428
 msgid "Copy selected events to the clipboard"
 msgstr "å°?é??ä¸äº?ä»¶å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-calendar-view.c:442
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Paste events from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:448
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Delete selected events"
 msgstr "å? é?¤é??ä¸ç??äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:459 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:261
 msgid "Deleting selected objects"
 msgstr "å? é?¤é??ä¸ç??å¯¹è±¡"
 
-#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1078
+#: ../calendar/gui/e-calendar-view.c:653 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1084
 msgid "Updating objects"
 msgstr "æ?´æ?°å¯¹è±¡"
 
-#: ../calendar/gui/e-calendar-view.c:1784
+#: ../calendar/gui/e-calendar-view.c:1777
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 #: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1785
+#: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 #: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "æ??ç»?"
 
-#: ../calendar/gui/e-calendar-view.c:1786
+#: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "Tentative"
 msgstr "æ??æ?¶ç??"
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
 #: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "è¢«å§?ä»»ç??"
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1781
 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:1932 ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:753
+#: ../calendar/gui/e-calendar-view.c:1925 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-task-table.c:759
 #, 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:1936 ../calendar/gui/e-memo-table.c:543
-#: ../calendar/gui/e-task-table.c:756
+#: ../calendar/gui/e-calendar-view.c:1929 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-task-table.c:762
 #, c-format
 msgid "Organizer: %s"
 msgstr "ç»?ç»?è??ï¼?%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1952 ../calendar/gui/print.c:3176
+#: ../calendar/gui/e-calendar-view.c:1945 ../calendar/gui/print.c:3208
 #, c-format
 msgid "Location: %s"
 msgstr "ä½?ç½®ï¼?%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1983
+#: ../calendar/gui/e-calendar-view.c:1976
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ?¶é?´ï¼?%s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:156
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Yå¹´%mæ??%dæ?¥%A%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %A %p%I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:167
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3895,17 +3873,17 @@ 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:761
+#: ../calendar/gui/e-day-view-time-item.c:744
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i å??é??å??å?²"
 
-#: ../calendar/gui/e-day-view-time-item.c:782
+#: ../calendar/gui/e-day-view-time-item.c:765
 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
+#: ../calendar/gui/e-day-view-time-item.c:782
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
 #: ../modules/calendar/e-calendar-preferences.c:175
 #: ../modules/calendar/e-calendar-preferences.c:224
@@ -3913,8 +3891,8 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "æ? "
 
-#: ../calendar/gui/e-day-view-time-item.c:826
-#: ../calendar/gui/e-timezone-entry.c:319
+#: ../calendar/gui/e-day-view-time-item.c:809
+#: ../calendar/gui/e-timezone-entry.c:315
 #: ../modules/calendar/e-calendar-preferences.c:251
 msgid "Select..."
 msgstr "é??æ?©..."
@@ -3925,8 +3903,8 @@ msgstr "é??æ?©..."
 #. 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:877 ../calendar/gui/e-day-view.c:1802
-#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:208 ../calendar/gui/print.c:1866
 msgid "%A %d %B"
 msgstr "%B%dæ?¥%A"
 
@@ -3936,9 +3914,9 @@ 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:881 ../calendar/gui/e-day-view.c:1819
-#: ../calendar/gui/e-week-view-main-item.c:223
-#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-week-view-main-item.c:217
+#: ../calendar/gui/ea-gnome-calendar.c:200
 #: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
 msgstr "%-mæ??%-dæ?¥%A"
@@ -3948,29 +3926,29 @@ 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:885 ../calendar/gui/e-day-view.c:1835
-#: ../calendar/gui/e-week-view-main-item.c:237
-#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/ea-gnome-calendar.c:230
 #: ../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: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
+#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:920 ../calendar/gui/print.c:939
+#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../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
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:925 ../calendar/gui/print.c:941
+#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
 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:2609
+#: ../calendar/gui/e-day-view.c:2606
 #, c-format
 msgid "Week %d"
 msgstr "ç¬¬%då?¨"
@@ -3992,56 +3970,56 @@ msgid "Resources"
 msgstr "èµ?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../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
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1088
 msgid "Individual"
 msgstr "ä¸ªäºº"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../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
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1089 ../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:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1071
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1090
 msgid "Resource"
 msgstr "èµ?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1072
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1091
 msgid "Room"
 msgstr "æ?¿é?´"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1086
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1105
 msgid "Chair"
 msgstr "ä¸»å¸"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../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
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1106
 msgid "Required Participant"
 msgstr "å¿?é??ç??å?ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1107
 msgid "Optional Participant"
 msgstr "å?¯é??ç??å?ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1089
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1108
 msgid "Non-Participant"
 msgstr "ä¸?å??å? "
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1036
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1033
 msgid "Needs Action"
 msgstr "é??è¦?å?¨ä½?"
 
@@ -4056,24 +4034,24 @@ msgstr "å?ºå¸è??                            "
 msgid "RSVP"
 msgstr "è¯·å??å¤?"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "å¤?ç??ä¸"
 
-#: ../calendar/gui/e-meeting-store.c:1760
+#: ../calendar/gui/e-meeting-store.c:1762
 #, 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
+#: ../calendar/gui/e-meeting-store.c:1771
 #, 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:434
-#: ../calendar/gui/e-meeting-time-sel.c:2397
+#: ../calendar/gui/e-meeting-time-sel-item.c:431
+#: ../calendar/gui/e-meeting-time-sel.c:2378
 msgid "%A, %B %d, %Y"
 msgstr "%Yå¹´%mæ??%dæ?¥%A"
 
@@ -4081,74 +4059,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:438
-#: ../calendar/gui/e-meeting-time-sel.c:2428
+#: ../calendar/gui/e-meeting-time-sel-item.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:2409
 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:442
+#: ../calendar/gui/e-meeting-time-sel-item.c:439
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Out of Office"
 msgstr "å??å?¬å®¤ä»¥å¤?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "No Information"
 msgstr "æ²¡æ??ä¿¡æ?¯"
 
-#: ../calendar/gui/e-meeting-time-sel.c:587
+#: ../calendar/gui/e-meeting-time-sel.c:582
 msgid "O_ptions"
 msgstr "é??é¡¹(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:605
+#: ../calendar/gui/e-meeting-time-sel.c:600
 msgid "Show _only working hours"
 msgstr "å?ªæ?¾ç¤ºå·¥ä½?å°?æ?¶(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:616
+#: ../calendar/gui/e-meeting-time-sel.c:611
 msgid "Show _zoomed out"
 msgstr "æ?¾ç¤ºç¼©æ?¾ç??è¾?å?º(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:627
 msgid "_Update free/busy"
 msgstr "æ?´æ?°å¿?é?²(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:647
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:660
 msgid "_Autopick"
 msgstr "è?ªå?¨è?·å??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:680
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:693
 msgid "_All people and resources"
 msgstr "å?¨é?¨äººå??èµ?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:708
+#: ../calendar/gui/e-meeting-time-sel.c:703
 msgid "All _people and one resource"
 msgstr "å?¨é?¨äººå??ä¸?ä¸ªèµ?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:713
 msgid "_Required people"
 msgstr "å¿?é??ç??äºº(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:722
 msgid "Required people and _one resource"
 msgstr "å¿?é??ç??äººå??ä¸?ä¸ªèµ?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:776
+#: ../calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr "å¼?å§?æ?¶é?´(_S)ï¼?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:816
+#: ../calendar/gui/e-meeting-time-sel.c:811
 msgid "_End time:"
 msgstr "ç»?æ??æ?¶é?´(_E)ï¼?"
 
@@ -4177,25 +4155,25 @@ msgid "Member"
 msgstr "æ??å??"
 
 #: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../modules/calendar/e-cal-shell-content.c:469
 #: ../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:439
+#: ../plugins/caldav/caldav-browse-server.c:438
 msgid "Memos"
 msgstr "å¤?å¿?"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:717
+#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:723
 msgid "* No Summary *"
 msgstr "* æ²¡æ??æ¦?è¦? *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:797
+#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:803
 msgid "Start: "
 msgstr "å¼?å§?ï¼?"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:815
+#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:821
 msgid "Due: "
 msgstr "å?°æ??ï¼?"
 
@@ -4228,54 +4206,54 @@ msgstr "å??å?»ä»¥æ·»å? å¤?å¿?"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:544
+#: ../calendar/gui/e-task-table.c:545
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
+#: ../calendar/gui/e-task-table.c:642 ../calendar/gui/print.c:2159
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../modules/calendar/e-cal-shell-content.c:430
 #: ../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:437
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/caldav/caldav-browse-server.c:436
+#: ../plugins/groupwise-features/camel-gw-listener.c:428
+#: ../plugins/groupwise-features/camel-gw-listener.c:569
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "ä»»å?¡"
 
-#: ../calendar/gui/e-task-table.c:943
+#: ../calendar/gui/e-task-table.c:949
 msgid "Cut selected tasks to the clipboard"
 msgstr "å°?é??ä¸ä»»å?¡å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-task-table.c:949
+#: ../calendar/gui/e-task-table.c:955
 msgid "Copy selected tasks to the clipboard"
 msgstr "å°?é??ä¸ä»»å?¡å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:961
 msgid "Paste tasks from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´ä»»å?¡"
 
-#: ../calendar/gui/e-task-table.c:961
+#: ../calendar/gui/e-task-table.c:967
 #: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "å? é?¤é??ä¸ç??ä»»å?¡"
 
-#: ../calendar/gui/e-task-table.c:967
+#: ../calendar/gui/e-task-table.c:973
 msgid "Select all visible tasks"
 msgstr "é??ä¸æ??æ??å?¯è§?ç??ä»»å?¡"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:326
 msgid "Select Timezone"
 msgstr "é??æ?©æ?¶å?º"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:231 ../calendar/gui/print.c:1828
+#: ../calendar/gui/e-week-view-main-item.c:225 ../calendar/gui/print.c:1847
 msgid "%d %B"
 msgstr "%-mæ??%-dæ?¥"
 
@@ -4308,23 +4286,23 @@ msgstr "æ?¥å??è§?å?¾äº?ä»¶"
 msgid "Grab Focus"
 msgstr "è?·å¾?ç?¦ç?¹"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "æ?°å»ºçº¦ä¼?"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "æ?°å»ºå?¨å¤©äº?ä»¶"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "æ?°ä¼?è®®"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "è½¬å?°ä»?å¤©"
 
-#: ../calendar/gui/ea-cal-view.c:309
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "è½¬å?°æ?¥æ??"
 
@@ -4333,7 +4311,7 @@ msgstr "è½¬å?°æ?¥æ??"
 msgid "a table to view and select the current time range"
 msgstr "å?¯æ?¥ç??å¹¶é??æ?©å½?å??æ?¶é?´è??å?´ç??è¡¨"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4341,14 +4319,14 @@ msgstr[0] "æ?? %d ä¸ªäº?ä»¶ã??"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:150
 msgid "It has no events."
 msgstr "æ? äº?ä»¶ã??"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:163
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "å·¥ä½?æ?¥è§?å?¾ï¼?%sã??%s"
@@ -4356,43 +4334,43 @@ msgstr "å·¥ä½?æ?¥è§?å?¾ï¼?%sã??%s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "æ?¥è§?å?¾ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:200
 msgid "calendar view for a work week"
 msgstr "å·¥ä½?æ?¥ç??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/ea-day-view.c:205
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for one or more days"
 msgstr "ä¸?å¤©æ??å¤?å¤©ç??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/ea-gnome-calendar.c:49
-#: ../calendar/gui/ea-gnome-calendar.c:57
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Gnome æ?¥å??"
 
-#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../calendar/gui/ea-gnome-calendar.c:197
 #: ../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
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../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"
 
-#: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../calendar/gui/ea-gnome-calendar.c:235
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../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
@@ -4408,25 +4386,25 @@ msgstr "è·³è½¬æ??é?®"
 msgid "Click here, you can find more events."
 msgstr "å??å?»æ¤å¤?å?¯æ?¥æ?¾æ?´å¤?äº?ä»¶ã??"
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:155
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "æ??è§?å?¾ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:162
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "å?¨è§?å?¾ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:196
+#: ../calendar/gui/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "æ??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/ea-week-view.c:198
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "ä¸?å?¨æ??å¤?å?¨ç??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/gnome-cal.c:2201
+#: ../calendar/gui/gnome-cal.c:2198
 msgid "Purging"
 msgstr "é??æ¯?"
 
@@ -4479,7 +4457,7 @@ msgid "Select Date"
 msgstr "é??æ?©æ?¥æ??"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Select _Today"
 msgstr "é??æ?©ä»?å¤©(_T)"
 
@@ -4487,32 +4465,32 @@ msgstr "é??æ?©ä»?å¤©(_T)"
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
+#: ../calendar/gui/itip-utils.c:573
 msgid "An organizer must be set."
 msgstr "å¿?é¡»è®¾å®?ç»?ç»?è??ã??"
 
-#: ../calendar/gui/itip-utils.c:450
+#: ../calendar/gui/itip-utils.c:469
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?ä¸ªå??å? è??"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
 msgid "Event information"
 msgstr "äº?ä»¶ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
 msgid "Task information"
 msgstr "ä»»å?¡ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
 msgid "Memo information"
 msgstr "å¤?å¿?ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
 msgid "Free/Busy information"
 msgstr "å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:669
 msgid "Calendar information"
 msgstr "æ?¥å??ä¿¡æ?¯"
 
@@ -4520,7 +4498,7 @@ msgstr "æ?¥å??ä¿¡æ?¯"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:706
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "æ?¥å??"
@@ -4529,7 +4507,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:684
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ??æ?¶æ?¥å??"
@@ -4541,7 +4519,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:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "æ??ç»?"
@@ -4550,7 +4528,7 @@ msgstr "æ??ç»?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "è¢«å§?ä»»ç??"
@@ -4558,7 +4536,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:711
+#: ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "æ?´æ?°"
@@ -4566,7 +4544,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:718
+#: ../calendar/gui/itip-utils.c:747
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -4574,7 +4552,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:725
+#: ../calendar/gui/itip-utils.c:754
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "å?·æ?°"
@@ -4582,239 +4560,239 @@ 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:732
+#: ../calendar/gui/itip-utils.c:761
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??ç¥¨è¡¨å?³"
 
-#: ../calendar/gui/itip-utils.c:803
+#: ../calendar/gui/itip-utils.c:832
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "å¿?é?²ä¿¡æ?¯ (%s å?° %s)"
 
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:840
 msgid "iCalendar information"
 msgstr "iCalendar ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:865
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "æ? æ³?é¢?çº¦èµ?æº?ï¼?æ?°äº?ä»¶ä¸?å?¶å®?äº?ä»¶å?²çª?ã??"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:869
 msgid "Unable to book a resource, error: "
 msgstr "æ? æ³?é¢?çº¦èµ?æº?ï¼?é??è¯¯ï¼?"
 
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:1032
 msgid "You must be an attendee of the event."
 msgstr "æ?¨å¿?é¡»æ?¯äº?ä»¶ç??å?ºå¸è??ã??"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:555
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:612
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:612
 msgid "Mo"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:612
 msgid "Tu"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:612
 msgid "We"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:613
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:613
 msgid "Fr"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:613
 msgid "Sa"
 msgstr "å?"
 
-#: ../calendar/gui/print.c:2969
+#: ../calendar/gui/print.c:3001
 msgid " to "
 msgstr " å?° "
 
-#: ../calendar/gui/print.c:2979
+#: ../calendar/gui/print.c:3011
 msgid " (Completed "
 msgstr " (å®?æ?? "
 
-#: ../calendar/gui/print.c:2985
+#: ../calendar/gui/print.c:3017
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#: ../calendar/gui/print.c:2995
+#: ../calendar/gui/print.c:3027
 msgid " (Due "
 msgstr " (é¢?å®? "
 
-#: ../calendar/gui/print.c:3002
+#: ../calendar/gui/print.c:3034
 msgid "Due "
 msgstr "é¢?å®? "
 
-#: ../calendar/gui/print.c:3167
+#: ../calendar/gui/print.c:3199
 #, c-format
 msgid "Summary: %s"
 msgstr "æ¦?è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:3194
+#: ../calendar/gui/print.c:3226
 msgid "Attendees: "
 msgstr "å?ºå¸è??ï¼?"
 
-#: ../calendar/gui/print.c:3237
+#: ../calendar/gui/print.c:3269
 #, c-format
 msgid "Status: %s"
 msgstr "ç?¶æ??ï¼?%s"
 
-#: ../calendar/gui/print.c:3252
+#: ../calendar/gui/print.c:3284
 #, c-format
 msgid "Priority: %s"
 msgstr "ä¼?å??çº§ï¼?%s"
 
-#: ../calendar/gui/print.c:3270
+#: ../calendar/gui/print.c:3302
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç??ï¼?%i"
 
-#: ../calendar/gui/print.c:3281
+#: ../calendar/gui/print.c:3313
 #, c-format
 msgid "URL: %s"
 msgstr "URLï¼?%s"
 
-#: ../calendar/gui/print.c:3294
+#: ../calendar/gui/print.c:3326
 #, c-format
 msgid "Categories: %s"
 msgstr "ç±»å?«ï¼?%s"
 
-#: ../calendar/gui/print.c:3305
+#: ../calendar/gui/print.c:3337
 msgid "Contacts: "
 msgstr "è??ç³»äººï¼?"
 
@@ -6567,207 +6545,211 @@ msgstr "å¤ªå¹³æ´?/æ²?å?©æ?¯"
 msgid "Pacific/Yap"
 msgstr "å¤ªå¹³æ´?/é??æµ¦"
 
-#: ../composer/e-composer-actions.c:163
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "å?¦å?ä¸º..."
 
-#: ../composer/e-composer-actions.c:259
-#: ../widgets/misc/e-attachment-view.c:380
+#: ../composer/e-composer-actions.c:287
+#: ../widgets/misc/e-attachment-view.c:377
 msgid "Attach a file"
 msgstr "æ·»å? é??ä»¶"
 
-#: ../composer/e-composer-actions.c:264
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../composer/e-composer-actions.c:292
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "å?³é?(_C)"
 
-#: ../composer/e-composer-actions.c:266
+#: ../composer/e-composer-actions.c:294
 msgid "Close the current file"
 msgstr "å?³é?å½?å??æ??ä»¶"
 
-#: ../composer/e-composer-actions.c:273
+#: ../composer/e-composer-actions.c:299
+msgid "New _Message"
+msgstr "æ?°å»ºä¿¡æ?¯(_M)"
+
+#: ../composer/e-composer-actions.c:301
+msgid "Open New Message window"
+msgstr "æ??å¼?æ?°å»ºä¿¡æ?¯çª?å?£"
+
+#: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
+msgid "Configure Evolution"
+msgstr "é??ç½® Evolution"
+
+#: ../composer/e-composer-actions.c:315
 msgid "Save the current file"
 msgstr "ä¿?å?å½?å??æ??ä»¶"
 
-#: ../composer/e-composer-actions.c:278
+#: ../composer/e-composer-actions.c:320
 msgid "Save _As..."
 msgstr "å?¦å?ä¸º(_A)..."
 
-#: ../composer/e-composer-actions.c:280
+#: ../composer/e-composer-actions.c:322
 msgid "Save the current file with a different name"
 msgstr "ç?¨ä¸?å??ç??æ??ä»¶å??ä¿?å?å½?å??æ??ä»¶"
 
-#: ../composer/e-composer-actions.c:285
-msgid "New _Message"
-msgstr "æ?°å»ºä¿¡æ?¯(_M)"
-
-#: ../composer/e-composer-actions.c:287
-msgid "Open New Message window"
-msgstr "æ??å¼?æ?°å»ºä¿¡æ?¯çª?å?£"
-
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:329
 msgid "Character _Encoding"
 msgstr "å?ç¬¦ç¼?ç ?(_E)"
 
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:346
 msgid "_Print..."
 msgstr "æ??å?°(_P)..."
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:353
 msgid "Print Pre_view"
 msgstr "æ??å?°é¢?è§?(_V)"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:360
 msgid "Save as _Draft"
 msgstr "å?¦å?ä¸ºè??ç¨¿(_D)"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:362
 msgid "Save as draft"
 msgstr "å?¦å?ä¸ºè??ç¨¿"
 
-#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:367 ../composer/e-composer-private.c:347
 msgid "S_end"
 msgstr "å??é??(_E)"
 
-#: ../composer/e-composer-actions.c:334
+#: ../composer/e-composer-actions.c:369
 msgid "Send this message"
 msgstr "å??é??è¿?æ?¡ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:342
+#: ../composer/e-composer-actions.c:377
 msgid "PGP _Encrypt"
 msgstr "PGP å? å¯?(_E)"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:379
 msgid "Encrypt this message with PGP"
 msgstr "ç?¨ PGP å? å¯?è¯¥ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:385
 msgid "PGP _Sign"
 msgstr "PGP ç¾å??(_S)"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:387
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨æ?¨ç?? PGP å¯?é?¥ç¾å??è¯¥ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:358
+#: ../composer/e-composer-actions.c:393
 msgid "_Picture Gallery"
 msgstr "å?¾ç??ç?»å»?(_P)"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:395
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "æ?¾ç¤ºä¸?ç»?å?¾ç??ï¼?æ?¨å?¯ä»¥å°?å®?ä»¬æ??æ?¾å?°æ?¨ç??ä¿¡æ?¯ä¸"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:401
 msgid "_Prioritize Message"
 msgstr "æ ?ä¸ºä¼?å??(_P)"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:403
 msgid "Set the message priority to high"
 msgstr "å°?ä¿¡æ?¯è®¾å®?ä¸ºé«?ä¼?å??çº§"
 
-#: ../composer/e-composer-actions.c:374
+#: ../composer/e-composer-actions.c:409
 msgid "Re_quest Read Receipt"
 msgstr "è¯·æ±?å·²è¯»å??æ?§(_Q)"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:411
 msgid "Get delivery notification when your message is read"
 msgstr "å½?æ?¨ç??ä¿¡æ?¯è¢«é??è¯»æ?¶å¾?å?°æ??é??é??ç?¥"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:417
 msgid "S/MIME En_crypt"
 msgstr "S/MIME å? å¯?(_C)"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:419
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME å? å¯?è¯?ä¹¦å? å¯?è¯¥ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:425
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ç¾å??(_N)"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:427
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME ç¾å??è®¤è¯?ç¾å??è¯¥ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:433
 msgid "_Bcc Field"
 msgstr "å¯?ä»¶æ??é??å??(_B)"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the BCC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå¯?ä»¶æ??é??å??"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:441
 msgid "_Cc Field"
 msgstr "æ??é??å??(_C)"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:443
 msgid "Toggles whether the CC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºæ??é??å??"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:449
 msgid "_Reply-To Field"
 msgstr "å??å¤?è?³å??(_R)"
 
-#: ../composer/e-composer-actions.c:416
+#: ../composer/e-composer-actions.c:451
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå??å¤?å??"
 
-#: ../composer/e-composer-actions.c:475
+#: ../composer/e-composer-actions.c:510
 msgid "Save Draft"
 msgstr "ä¿?å?è??ç¨¿"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:36
 msgid "Enter the recipients of the message"
 msgstr "è¾?å?¥ä¿¡æ?¯ç??æ?¶ä»¶äºº"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡æ?¯å?¯æ?¬ç??æ?¶ä»¶äººå?°å??"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:41
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡æ?¯å?¯æ?¬ï¼?ä½?ä¸?å?ºç?°å?¨æ?¶ä»¶äººå??è¡¨ä¸ç??æ?¶ä»¶äººå?°å??"
 
-#: ../composer/e-composer-header-table.c:1006
+#: ../composer/e-composer-header-table.c:1002
 msgid "Fr_om:"
 msgstr "å??ä»¶äºº(_O)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1011
 msgid "_Reply-To:"
 msgstr "å??å¤?å?°(_R)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1019
+#: ../composer/e-composer-header-table.c:1015
 msgid "_To:"
 msgstr "æ?¶ä»¶äºº(_T)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1024
+#: ../composer/e-composer-header-table.c:1020
 msgid "_Cc:"
 msgstr "æ??é??(_C)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:1025
 msgid "_Bcc:"
 msgstr "å¯?ä»¶æ??é??(_B)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Post To:"
 msgstr "æ??é??å?°(_P)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1034
 msgid "S_ubject:"
 msgstr "ä¸»é¢?(_U)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1047
+#: ../composer/e-composer-header-table.c:1043
 msgid "Si_gnature:"
 msgstr "ç¾å??(_G)ï¼?"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "å??å?»æ¤å¤?ä»¥ä½¿ç?¨å?°å??ç°¿"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:127
 msgid "Click here to select folders to post to"
 msgstr "å??å?»æ¤å¤?ä»¥é??æ?©è¦?æ??é??å?°ç??æ??ä»¶å¤¹"
 
@@ -6804,15 +6786,15 @@ msgid ""
 "account"
 msgstr "æ? æ³?å¯¹å¯?å?ºç??ä¿¡æ?¯å? å¯?ï¼?æ?ªå¯¹æ¤å¸?å?·è®¾ç½®å? å¯?è¯?ä¹¦"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2042
+#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
 msgid "Compose Message"
 msgstr "æ?°å»ºæ¶?æ?¯"
 
-#: ../composer/e-msg-composer.c:4117
+#: ../composer/e-msg-composer.c:4115
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ç¼?å??å?¨å?«æ??ä¸?å?¯ç¼?è¾?ç??é??æ??æ?¬ä¿¡ä½?ã??"
 
-#: ../composer/e-msg-composer.c:4822
+#: ../composer/e-msg-composer.c:4820
 msgid "Untitled Message"
 msgstr "æ? æ ?é¢?ä¿¡æ?¯"
 
@@ -6934,75 +6916,80 @@ msgstr "æ?¨æ? æ³?å°?æ??ä»¶â??{0}â??ä½?ä¸ºè¿?æ?¡ä¿¡æ?¯ç??é??ä»¶ã??"
 msgid "You need to configure an account before you can compose mail."
 msgstr "å?¨æ?¨å?¯ä»¥æ?°å??é?®ä»¶ä¹?å??æ?¨é??è¦?é??ç½®ä¸?ä¸ªå¸?å?·ã??"
 
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "æ?¨ç??æ¶?æ?¯å·²å??é??ï¼?ä½?å?¨å¤?ç??æ?¶å?ºç?°äº?ä¸?ä¸ªé??è¯¯ã??"
+
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Continue Editing"
 msgstr "ç»§ç»ç¼?è¾?(_C)"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Do not Recover"
 msgstr "ä¸?æ?¢å¤?(_D)"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Recover"
 msgstr "æ?¢å¤?(_R)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Draft"
 msgstr "ä¿?å?è??ç¨¿(_S)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Save to Outbox"
 msgstr "ä¿?å?å?°å??ä»¶ç®±(_S)"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "_Try Again"
 msgstr "é??è¯?(_T)"
 
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:216
 msgid "Run Anjal in a window"
 msgstr "å?¨æ?°çª?å?£ä¸è¿?è¡? Anjal"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:217
 msgid "Make Anjal the default email client"
 msgstr "å°? Anjal è®¾ä¸ºé»?è®¤ç?µå?é?®ä»¶å®¢æ?·ç«¯"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:232
+#: ../capplet/anjal-settings-main.c:224
 msgid "ID of the socket to embed in"
 msgstr "è¦?å??åµ?ç??ç«¯å?£ ID"
 
-#: ../capplet/anjal-settings-main.c:233
+#: ../capplet/anjal-settings-main.c:225
 msgid "socket"
 msgstr "å¥?æ?¥å?"
 
-#: ../capplet/anjal-settings-main.c:246
+#: ../capplet/anjal-settings-main.c:238
 msgid "Anjal email client"
 msgstr "Anjal é?®ä»¶å®¢æ?·ç«¯"
 
-#: ../capplet/settings/mail-account-view.c:73
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "è¯·è¾?å?¥æ?¨ç??å?¨å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr "è¯·è¾?å?¥æ?¨ç??ç?µå?é?®ä»¶å?°å??"
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr "æ?¨è¾?å?¥ç??ç?µå?é?®ä»¶å?°å??æ? æ??ã??"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:80
 msgid "Please enter your password."
 msgstr "è¯·è¾?å?¥æ?¨ç??å¯?ç ?ã??"
 
-#: ../capplet/settings/mail-account-view.c:255
+#: ../capplet/settings/mail-account-view.c:259
 #: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:359
-#: ../plugins/google-account-setup/google-contacts-source.c:56
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
+#: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
@@ -7094,7 +7081,7 @@ msgid ""
 msgstr "å?¨æ??ä»¬å°?è¯?è¿?æ?¥æ??å?¡å?¨å¹¶è?·å??æ?¨ç??ç?µå?é?®ä»¶ä¹?å??ï¼?è¯·æ£?æ?¥ä¸?é??æ?¨ç??é??ç½®ä¿¡æ?¯ã??"
 
 #: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2095 ../mail/em-account-editor.c:2216
+#: ../mail/em-account-editor.c:2089 ../mail/em-account-editor.c:2210
 msgid "Identity"
 msgstr "æ ?è¯?"
 
@@ -7146,7 +7133,7 @@ msgid "Back - Receiving options"
 msgstr "å??é?? - æ?¥æ?¶é??é¡¹"
 
 #: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3044
+#: ../mail/em-account-editor.c:3041
 msgid "Defaults"
 msgstr "é»?è®¤å?¼"
 
@@ -7166,27 +7153,27 @@ msgstr "å®?æ??"
 msgid "Back - Sending"
 msgstr "å??é?? - å??é??"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:740
 msgid "Setup Google contacts with Evolution"
 msgstr "è®¾ç½® Google è??ç³»äººå?° Evolution"
 
-#: ../capplet/settings/mail-account-view.c:726
+#: ../capplet/settings/mail-account-view.c:741
 msgid "Setup Google calendar with Evolution"
 msgstr "æ·»å?  Google æ?¥å??å?° Evolution"
 
-#: ../capplet/settings/mail-account-view.c:731
+#: ../capplet/settings/mail-account-view.c:746
 msgid "You may need to enable IMAP access."
 msgstr "æ?¨å?¯è?½é??è¦?å?¯ç?¨ IMAP è®¿é?®ã??"
 
-#: ../capplet/settings/mail-account-view.c:739
+#: ../capplet/settings/mail-account-view.c:754
 msgid "Google account settings:"
 msgstr "Google è´¦æ?·è®¾ç½®ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:780
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "æ·»å?  Yahoo æ?¥å??å?° Evolution"
 
-#: ../capplet/settings/mail-account-view.c:770
+#: ../capplet/settings/mail-account-view.c:784
 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 "
@@ -7195,46 +7182,46 @@ msgstr ""
 "Yahoo æ?¥å??å?½å??ä¸º å??å?_å§?æ°?ã??æ??ä»¬å°?è¯?ç??ç??æ??è¿?ç§?æ?¥å??å??ç§°ã??è¯·ç¡®è®¤å??å?æ?¯å?¦æ£ç¡®ï¼?"
 "å¦?æ??ä¸?æ£ç¡®ï¼?è¯·é??æ?°è¾?å?¥æ?¥å??å??ç§°ã??"
 
-#: ../capplet/settings/mail-account-view.c:777
+#: ../capplet/settings/mail-account-view.c:793
 msgid "Yahoo account settings:"
 msgstr "Yahoo è´¦æ?·è®¾ç½®ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:791
+#: ../capplet/settings/mail-account-view.c:807
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo æ?¥å??å??ç§°ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:1063
+#: ../capplet/settings/mail-account-view.c:1079
 msgid "Password:"
 msgstr "å¯?ç ?ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:1132
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:1130
+#: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "å?³é?æ ?ç¾"
 
-#: ../capplet/settings/mail-account-view.c:1142
+#: ../capplet/settings/mail-account-view.c:1140
 msgid "Account Wizard"
 msgstr "å¸?å?·å??å¯¼"
 
-#: ../capplet/settings/mail-capplet-shell.c:212
+#: ../capplet/settings/mail-capplet-shell.c:209
 msgid "Evolution account assistant"
 msgstr "Evolution å¸?å?·å?©æ??"
 
 #. create the local source group
-#: ../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
+#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
+#: ../mail/e-mail-store.c:228 ../mail/em-folder-tree-model.c:146
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:218
+#: ../mail/message-list.c:1721
+#: ../modules/addressbook/e-book-shell-backend.c:92
 #: ../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-cal-shell-backend.c:103
+#: ../modules/calendar/e-cal-shell-migrate.c:150
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:96
-#: ../modules/calendar/e-task-shell-migrate.c:115
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:117
 msgid "On This Computer"
 msgstr "å?¨æ¤è®¡ç®?æ?ºä¸"
 
@@ -7251,7 +7238,7 @@ msgstr "æ·»å? æ?°å¸?å?·"
 msgid "Account management"
 msgstr "å¸?å?·ç®¡ç??"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:258
 msgid "Settings"
 msgstr "è®¾ç½®"
 
@@ -7263,8 +7250,8 @@ msgstr "æ?¥å??äº?ä»¶ä¿¡æ?¯"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution æ??é??é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:951
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -7290,36 +7277,36 @@ msgid "Email Settings"
 msgstr "ç?µå?é?®ä»¶è®¾ç½®"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:223
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s(å??æ¶?ç??)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (completed)"
 msgstr "%s(å®?æ??ç??)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:232
+#: ../e-util/e-activity.c:229
 #, 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
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (æ£å?¨å??æ¶?)"
 
-#: ../e-util/e-activity.c:238
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:243
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% å®?æ??)"
@@ -7402,37 +7389,84 @@ msgid "Visual"
 msgstr "å?¯è§?"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../widgets/table/e-cell-date-edit.c:308
 msgid "Today"
 msgstr "ä»?å¤©"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??å¤©"
 
-#: ../e-util/e-datetime-format.c:212
+#: ../e-util/e-datetime-format.c:209
 msgid "Yesterday"
 msgstr "æ?¨å¤©"
 
-#. 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 "Next %a"
-msgid_plural "Next %a"
-msgstr[0] "ä¸?ä¸ª %a"
-
-#: ../e-util/e-datetime-format.c:295 ../e-util/e-datetime-format.c:305
-#: ../e-util/e-datetime-format.c:314
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:217
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "ä¸?å?¨ä¸?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:223
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "ä¸?å?¨äº?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:229
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "ä¸?å?¨ä¸?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:235
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "ä¸?å?¨å??"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:241
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "ä¸?å?¨äº?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:247
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "ä¸?å?¨å?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:253
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "ä¸?å?¨æ?¥"
+
+#: ../e-util/e-datetime-format.c:335 ../e-util/e-datetime-format.c:345
+#: ../e-util/e-datetime-format.c:354
 msgid "Use locale default"
 msgstr "ä½¿ç?¨æ?¬å?°é»?è®¤å?¼"
 
-#: ../e-util/e-datetime-format.c:510
+#: ../e-util/e-datetime-format.c:551
 msgid "Format:"
 msgstr "æ ¼å¼?ï¼?"
 
@@ -7453,8 +7487,8 @@ msgstr "æ£å?¨å??å?¥â??%sâ??"
 msgid "Writing \"%s\" to %s"
 msgstr "æ??â??%sâ??å??å?¥å?° %s"
 
-#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:378
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "å?¨"
@@ -7472,7 +7506,7 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "æ??å?°ç³»ç»?æ?ªæ?¥å??å?³äº?é??è¯¯ç??ä»»ä½?é¢?å¤?ç»?è??ã??"
 
-#: ../e-util/e-signature.c:707
+#: ../e-util/e-signature.c:703
 msgid "Autogenerated"
 msgstr "è?ªå?¨ç??æ??ç??"
 
@@ -7496,15 +7530,15 @@ msgstr "æ?¨æ??ç®?è¦?ç??å®?å??ï¼?"
 msgid "File exists \"{0}\"."
 msgstr "æ??ä»¶å·²å?å?¨â??{0}â??ã??"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:157
 msgid "_Overwrite"
 msgstr "è¦?ç??(_O)"
 
-#: ../e-util/e-util.c:154
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "æ? æ³?æ??å¼?é?¾æ?¥ã??"
 
-#: ../e-util/e-util.c:201
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "æ? æ³?æ?¾ç¤º Evolution ç??å¸®å?©ã??"
 
@@ -7517,212 +7551,212 @@ msgstr "GConf é??è¯¯ï¼?%s"
 msgid "All further errors shown only on terminal."
 msgstr "å??ç»æ??æ??ç??é??è¯¯é?½å?ªæ?¾ç¤ºå?¨ç»?ç«¯ã??"
 
-#: ../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
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1046
+#: ../mail/e-mail-tag-editor.c:324 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:70
 msgid "From"
 msgstr "å??ä»¶äºº"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1047
+#: ../modules/mail/em-mailer-prefs.c:71
 msgid "Reply-To"
 msgstr "å??å¤?è?³"
 
-#: ../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
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1049
+#: ../mail/em-format-html.c:2396 ../mail/em-format-html.c:2464
+#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "æ??é??"
 
-#: ../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
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
+#: ../mail/em-format-html.c:2397 ../mail/em-format-html.c:2468
+#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "å¯?ä»¶æ??é??"
 
-#: ../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
+#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1051
+#: ../mail/e-mail-tag-editor.c:329 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
 #: ../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:438 ../mail/em-format-html.c:2590
-#: ../modules/mail/em-mailer-prefs.c:1117
+#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2584
+#: ../modules/mail/em-mailer-prefs.c:1119
 msgid "Mailer"
 msgstr "é?®ä»¶ç¨?åº?"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1141
+#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1159
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½¬å??ç??ä¿¡æ?¯ --------"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
-#: ../widgets/misc/e-dateedit.c:551
+#: ../em-format/em-format.c:1052 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:522
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1053 ../modules/mail/em-mailer-prefs.c:77
 msgid "Newsgroups"
 msgstr "æ?°é?»ç»?"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format.c:1054 ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "å¤´å??"
 
-#: ../em-format/em-format.c:1455
+#: ../em-format/em-format.c:1451
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??ä»¶"
 
-#: ../em-format/em-format.c:1547
+#: ../em-format/em-format.c:1555
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "æ? æ³?è§£æ?? S/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??è¯¯"
 
-#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
+#: ../em-format/em-format.c:1737 ../em-format/em-format.c:1931
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "æ? æ³?è§£æ?? MIME ä¿¡æ?¯ã??æ?¾ç¤ºæº?æ??æ?¬ã??"
 
-#: ../em-format/em-format.c:1739
+#: ../em-format/em-format.c:1747
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ä¸?æ?¯æ?? multipart/encrypted ç??å? å¯?ç±»å??"
 
-#: ../em-format/em-format.c:1759
+#: ../em-format/em-format.c:1767
 msgid "Could not parse PGP/MIME message"
 msgstr "æ? æ³?è§£æ?? PGP/MIME ä¿¡æ?¯"
 
-#: ../em-format/em-format.c:1760
+#: ../em-format/em-format.c:1768
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "æ? æ³?è§£æ?? PGP/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??è¯¯"
 
-#: ../em-format/em-format.c:1951
+#: ../em-format/em-format.c:1956
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ??ç??ç¾å??æ ¼å¼?"
 
-#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
+#: ../em-format/em-format.c:1969 ../em-format/em-format.c:2141
 msgid "Error verifying signature"
 msgstr "æ ¡éª?ç¾å??é??è¯¯"
 
-#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
-#: ../em-format/em-format.c:2138
+#: ../em-format/em-format.c:1970 ../em-format/em-format.c:2128
+#: ../em-format/em-format.c:2142
 msgid "Unknown error verifying signature"
 msgstr "æ ¡éª?ç¾å??å??ç??äº?æ?ªç?¥é??è¯¯"
 
-#: ../em-format/em-format.c:2229
+#: ../em-format/em-format.c:2233
 msgid "Could not parse PGP message: "
 msgstr "æ? æ³?è§£æ?? PGP ä¿¡æ?¯ï¼?"
 
-#: ../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
+#: ../em-format/em-format.c:2239 ../mail/em-folder-tree.c:656
+#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "æ?ªç?¥é??è¯¯"
 
 #. 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
+#: ../filter/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d å°?æ?¶å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d å°?æ?¶å??"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d å¤©å??"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d å??"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d å?¨å??"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d å?¨å??"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ä¸ªæ??å??"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d ä¸ªæ??å??"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<å??å?»æ¤å¤?ä»¥é??æ?©æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
-#: ../filter/e-filter-datespec.c:158
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
 msgid "now"
 msgstr "ç?°å?¨"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/e-filter-datespec.c:286
+#: ../filter/e-filter-datespec.c:282
 msgid "Select a time to compare against"
 msgstr "é??æ?©ç?¨äº?æ¯?è¾?ç??æ?¶é?´"
 
@@ -7730,70 +7764,70 @@ msgstr "é??æ?©ç?¨äº?æ¯?è¾?ç??æ?¶é?´"
 msgid "Choose a File"
 msgstr "é??æ?©æ??ä»¶"
 
-#: ../filter/e-filter-rule.c:669
+#: ../filter/e-filter-rule.c:662
 msgid "R_ule name:"
 msgstr "è§?å??å??(_U)ï¼?"
 
-#: ../filter/e-filter-rule.c:699
+#: ../filter/e-filter-rule.c:692
 msgid "Find items that meet the following conditions"
 msgstr "æ?¥æ?¾ç¬¦å??ä¸?å??æ?¡ä»¶ç??é¡¹ç?®"
 
-#: ../filter/e-filter-rule.c:724
+#: ../filter/e-filter-rule.c:717
 msgid "If all conditions are met"
 msgstr "å¦?æ??æ»¡è¶³æ??æ??æ?¡ä»¶"
 
-#: ../filter/e-filter-rule.c:725
+#: ../filter/e-filter-rule.c:718
 msgid "If any conditions are met"
 msgstr "å¦?æ??æ»¡è¶³ä»»ä¸?æ?¡ä»¶"
 
-#: ../filter/e-filter-rule.c:728
+#: ../filter/e-filter-rule.c:721
 msgid "_Find items:"
 msgstr "æ?¥æ?¾é¡¹ç?®(_F)ï¼?"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:750
 msgid "None"
 msgstr "æ? "
 
-#: ../filter/e-filter-rule.c:758
+#: ../filter/e-filter-rule.c:751
 msgid "All related"
 msgstr "ç?¸å?³ç??å?¨é?¨"
 
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:752 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "å??å¤?"
 
-#: ../filter/e-filter-rule.c:760
+#: ../filter/e-filter-rule.c:753
 msgid "Replies and parents"
 msgstr "å??å¤?å??å??å§?é?®ä»¶"
 
-#: ../filter/e-filter-rule.c:761
+#: ../filter/e-filter-rule.c:754
 msgid "No reply or parent"
 msgstr "æ? å??å¤?æ??å??å§?é?®ä»¶"
 
-#: ../filter/e-filter-rule.c:764
+#: ../filter/e-filter-rule.c:757
 msgid "I_nclude threads"
 msgstr "å??å?«çº¿ç´¢(_N)"
 
-#: ../filter/e-filter-rule.c:789
+#: ../filter/e-filter-rule.c:782
 msgid "A_dd Condition"
 msgstr "æ·»å? å?¨ä½?(_D)"
 
-#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1129 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:316
 msgid "Incoming"
 msgstr "æ?¥æ?¶"
 
-#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
+#: ../filter/e-filter-rule.c:1129 ../mail/em-utils.c:317
 msgid "Outgoing"
 msgstr "å¯?å?º"
 
-#: ../filter/e-rule-editor.c:270
+#: ../filter/e-rule-editor.c:263
 msgid "Add Rule"
 msgstr "æ·»å? è§?å??"
 
-#: ../filter/e-rule-editor.c:359
+#: ../filter/e-rule-editor.c:349
 msgid "Edit Rule"
 msgstr "ç¼?è¾?è§?å??"
 
@@ -7904,47 +7938,47 @@ msgstr "æ?¨æ??å®?ç??æ?¶é?´"
 msgid "years"
 msgstr "å¹´"
 
-#: ../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
+#: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
+#: ../mail/em-format-html-display.c:1049 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
+#: ../widgets/misc/e-attachment-paned.c:129
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??ä»¶"
 
-#: ../mail/e-mail-attachment-bar.c:633
-#: ../widgets/misc/e-attachment-paned.c:624
+#: ../mail/e-mail-attachment-bar.c:602
+#: ../widgets/misc/e-attachment-paned.c:617
 msgid "Icon View"
 msgstr "å?¾æ ?è§?å?¾"
 
-#: ../mail/e-mail-attachment-bar.c:635
-#: ../widgets/misc/e-attachment-paned.c:626
+#: ../mail/e-mail-attachment-bar.c:604
+#: ../widgets/misc/e-attachment-paned.c:619
 msgid "List View"
 msgstr "å??è¡¨è§?å?¾"
 
-#: ../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
+#: ../mail/e-mail-browser.c:125 ../shell/e-shell-window-actions.c:1405
+#: ../shell/e-shell-window-actions.c:1412
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Close this window"
 msgstr "å?³é?æ¤çª?å?£"
 
-#: ../mail/e-mail-browser.c:289
+#: ../mail/e-mail-browser.c:282
 msgid "(No Subject)"
 msgstr "(æ? ä¸»é¢?)"
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:62
 msgid "_Add to Address Book..."
 msgstr "æ·»å? å?°å?°å??ç°¿(_A)..."
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:69
 msgid "_To This Address"
 msgstr "å?°æ¤å?°å??(_T)"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:76
 msgid "_From This Address"
 msgstr "è?ªæ¤å?°å??(_F)"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:85
 msgid "Create Search _Folder"
 msgstr "å??å»ºæ??ç´¢æ??ä»¶å¤¹(_F)"
 
@@ -7953,56 +7987,56 @@ msgstr "å??å»ºæ??ç´¢æ??ä»¶å¤¹(_F)"
 msgid "Saving message to folder '%s'"
 msgstr "æ??ä¿¡æ?¯ä¿?å?å?°æ??ä»¶å¤¹ %s ä¸"
 
-#: ../mail/e-mail-label-dialog.c:225
+#: ../mail/e-mail-label-dialog.c:218
 msgid "_Label name:"
 msgstr "æ ?ç¾å??ç§°(_L)ï¼?"
 
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:37
 msgid "I_mportant"
 msgstr "é??è¦?(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:42
+#: ../mail/e-mail-label-list-store.c:38
 msgid "_Work"
 msgstr "å·¥ä½?(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:43
+#: ../mail/e-mail-label-list-store.c:39
 msgid "_Personal"
 msgstr "ä¸ªäºº(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:44
+#: ../mail/e-mail-label-list-store.c:40
 msgid "_To Do"
 msgstr "å¾?å??(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:45
+#: ../mail/e-mail-label-list-store.c:41
 msgid "_Later"
 msgstr "ç¨?å??(_L)"
 
-#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:616
+#: ../mail/e-mail-label-manager.c:161
+#: ../modules/mail/e-mail-shell-view-actions.c:627
 msgid "Add Label"
 msgstr "æ·»å? æ ?ç¾"
 
-#: ../mail/e-mail-label-manager.c:216
+#: ../mail/e-mail-label-manager.c:212
 msgid "Edit Label"
 msgstr "ç¼?è¾?æ ?ç¾"
 
-#: ../mail/e-mail-label-manager.c:349
+#: ../mail/e-mail-label-manager.c:345
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr "æ³¨æ??ï¼?æ ?ç¾å??ä¸ç??ä¸?å??çº¿è¢«ç?¨ä½?è??å??ä¸ç??å?©è®°ç¬¦ã??"
 
-#: ../mail/e-mail-label-tree-view.c:86
+#: ../mail/e-mail-label-tree-view.c:82
 msgid "Color"
 msgstr "é¢?è?²"
 
-#: ../mail/e-mail-label-tree-view.c:96
+#: ../mail/e-mail-label-tree-view.c:92
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1297
+#: ../plugins/caldav/caldav-browse-server.c:1296
 #: ../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
@@ -8010,31 +8044,29 @@ msgid "Name"
 msgstr "å§?å??"
 
 #: ../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
+#: ../mail/em-folder-tree-model.c:737 ../mail/em-folder-tree.c:3132
+#: ../modules/mail/e-mail-shell-view-private.c:1118
+#: ../modules/mail/e-mail-shell-view-private.c:1129
 msgid "Inbox"
 msgstr "æ?¶ä»¶ç®±"
 
-#: ../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
+#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:729
+#: ../modules/mail/e-mail-shell-view-private.c:1116
 msgid "Drafts"
 msgstr "è??ç¨¿"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:741
+#: ../modules/mail/e-mail-shell-view-private.c:1120
 msgid "Outbox"
 msgstr "å??ä»¶ç®±"
 
-#: ../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
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:743
+#: ../modules/mail/e-mail-shell-view-private.c:1122
 msgid "Sent"
 msgstr "å·²å??ç®±"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:732
+#: ../modules/mail/e-mail-shell-view-private.c:1124
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:581
 msgid "Templates"
@@ -8053,11 +8085,11 @@ msgstr "è¿?ç§»"
 msgid "Migrating '%s':"
 msgstr "å??è¿?â??%sâ??ï¼?"
 
-#: ../mail/e-mail-migrate.c:657
+#: ../mail/e-mail-migrate.c:660
 msgid "Migrating Folders"
 msgstr "è¿?ç§»æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-migrate.c:658
+#: ../mail/e-mail-migrate.c:661
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8068,12 +8100,12 @@ msgstr ""
 "\n"
 "è¯·ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??ä»¶å¤¹..."
 
-#: ../mail/e-mail-migrate.c:1147
+#: ../mail/e-mail-migrate.c:1126
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "æ? æ³?å?¨â??%sâ??å??å»ºæ?¬å?°é?®ä»¶æ??ä»¶å¤¹ï¼?%s"
 
-#: ../mail/e-mail-notebook-view.c:565
+#: ../mail/e-mail-notebook-view.c:562
 msgid "Please select a folder"
 msgstr "è¯·é??æ?©ä¸?ä¸ªæ??ä»¶å¤¹"
 
@@ -8085,17 +8117,17 @@ msgstr "è¯·é??æ?©ä¸?ä¸ªæ??ä»¶å¤¹"
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??æ¬¡è¯¢é?®"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "å¤?å?¶å?°æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "å¤?å?¶(_O)"
 
 #. Translators: %s is replaced with a folder name
 #. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:510
+#: ../mail/e-mail-reader.c:523
 #, c-format
 msgid ""
 "Folder '%s' contains %d duplicate message. Are you sure you want to delete "
@@ -8105,25 +8137,25 @@ msgid_plural ""
 "them?"
 msgstr[0] "â??%sâ??æ??ä»¶å¤¹ä¸å??å?« %d æ?¡é??å¤?ä¿¡æ?¯ã??æ?¨ç¡®å®?æ?³å? é?¤å??ï¼?"
 
-#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ç§»è?³æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "ç§»å?¨(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1423
+#: ../mail/e-mail-reader.c:1467
 msgid "_Do not ask me again."
 msgstr "ä¸?å??è¯¢é?®(_D)ã??"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1472
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ?»æ?¯å¿½ç?¥å¯¹äº?é?®ä»¶å??è¡¨ç??â??å??å¤?è?³â??å??(_A)ã??"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1581
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ä¿?å?ä¿¡æ?¯"
@@ -8134,664 +8166,664 @@ 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:1579
+#: ../mail/e-mail-reader.c:1602
 #: ../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:1853
+#: ../mail/e-mail-reader.c:1876
 msgid "A_dd Sender to Address Book"
 msgstr "å°?å??ä»¶äººæ·»å? å?°å?°å??ç°¿(_D)"
 
-#: ../mail/e-mail-reader.c:1855
+#: ../mail/e-mail-reader.c:1878
 msgid "Add sender to address book"
 msgstr "å°?å??ä»¶äººæ·»å? å?°å?°å??ç°¿"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1883
 msgid "Check for _Junk"
 msgstr "æ£?æ?¥å??å?¾ä¿¡æ?¯(_J)"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1885
 msgid "Filter the selected messages for junk status"
 msgstr "æ??é??ä¸ç??ä¿¡æ?¯æ ?è®°ä¸ºå??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1890
 msgid "_Copy to Folder..."
 msgstr "å¤?å?¶å?°æ??ä»¶å¤¹(_C)..."
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1892
 msgid "Copy selected messages to another folder"
 msgstr "æ??é??ä¸ç??ä¿¡æ?¯å¤?å?¶å?°å?¶å®?æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1897
 msgid "_Delete Message"
 msgstr "å? é?¤ä¿¡æ?¯(_D)"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1899
 msgid "Mark the selected messages for deletion"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯å??å? é?¤æ ?è®°"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1904
 msgid "Filter on Mailing _List..."
 msgstr "æ ¹æ?®é?®ä»¶å??è¡¨è¿?æ»¤(_L)..."
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1906
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "å??å»ºå?¯è¿?æ»¤å¯?å¾?æ¤é?®ä»¶å??è¡¨ç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1911
 msgid "Filter on _Recipients..."
 msgstr "æ ¹æ?®æ?¶ä»¶äººè¿?æ»¤(_R)..."
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1913
 msgid "Create a rule to filter messages to these recipients"
 msgstr "å??å»ºå?¯è¿?æ»¤å¯?å¾?è¿?äº?æ?¶ä»¶äººç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1918
 msgid "Filter on Se_nder..."
 msgstr "æ ¹æ?®å??ä»¶äººè¿?æ»¤(_N)..."
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1920
 msgid "Create a rule to filter messages from this sender"
 msgstr "å??å»ºå?¯è¿?æ»¤æ¤äººå¯?æ?¥ç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1925
 msgid "Filter on _Subject..."
 msgstr "æ ¹æ?®ä¸»é¢?è¿?æ»¤(_S)..."
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1927
 msgid "Create a rule to filter messages with this subject"
 msgstr "å??å»ºå?¯è¿?æ»¤æ¤ä¸»é¢?ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1932
 msgid "A_pply Filters"
 msgstr "åº?ç?¨è¿?æ»¤è§?å??(_P)"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1934
 msgid "Apply filter rules to the selected messages"
 msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°é??ä¸ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1939
 msgid "_Find in Message..."
 msgstr "å?¨ä¿¡æ?¯ä¸æ?¥æ?¾(_F)..."
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1941
 msgid "Search for text in the body of the displayed message"
 msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??ä¸»ä½?ä¸æ??ç´¢æ??æ?¬"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1946
 msgid "_Clear Flag"
 msgstr "æ¸?é?¤æ ?å¿?(_C)"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1948
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "å? é?¤é??ä¸ä¿¡æ?¯ç??è·?é??æ ?å¿?"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1953
 msgid "_Flag Completed"
 msgstr "æ ?å¿?ä¸ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1955
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "è®¾ç½®é??ä¸ä¿¡æ?¯ç??è·?é??æ ?å¿?ä¸ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1960
 msgid "Follow _Up..."
 msgstr "è·?é??(_U)..."
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1962
 msgid "Flag the selected messages for follow-up"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯æ·»å? è·?é??æ ?å¿?"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1967
 msgid "_Attached"
 msgstr "é??ä»¶(_A)"
 
-#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
 msgid "Forward the selected message to someone as an attachment"
 msgstr "æ??é??ä¸ä¿¡æ?¯ä½?ä¸ºé??ä»¶è½¬å??ç»?æ??äºº"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1974
 msgid "Forward As _Attached"
 msgstr "ä½?ä¸ºé??ä»¶è½¬å??(_A)"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1981
 msgid "_Inline"
 msgstr "åµ?å?¥(_I)"
 
-#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
 msgid "Forward the selected message in the body of a new message"
 msgstr "å?¨æ?°ä¿¡ä½?ä¸è½¬å??é??ä¸ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1988
 msgid "Forward As _Inline"
 msgstr "åµ?å?¥æ£æ??è½¬å??(_I)"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1995
 msgid "_Quoted"
 msgstr "å¼?ç?¨(_Q)"
 
-#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1997 ../mail/e-mail-reader.c:2004
 msgid "Forward the selected message quoted like a reply"
 msgstr "ä»¥ç±»ä¼¼äº?å??å¤?ç??å¼?ç?¨æ?¹å¼?è½¬å??é??ä¸ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2002
 msgid "Forward As _Quoted"
 msgstr "ä½?æ??å¼?ç?¨è½¬å??(_Q)"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2009
 msgid "_Load Images"
 msgstr "è½½å?¥å?¾å??(_L)"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2011
 msgid "Force images in HTML mail to be loaded"
 msgstr "å¼ºå?¶è½½å?¥ HTML é?®ä»¶ä¸ç??å?¾å??"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2016
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2018
 msgid "Mark the selected messages as important"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºé??è¦?é?®ä»¶"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2023
 msgid "_Junk"
 msgstr "å??å?¾(_J)"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2025
 msgid "Mark the selected messages as junk"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºå??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2030
 msgid "_Not Junk"
 msgstr "é??å??å?¾(_N)"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2032
 msgid "Mark the selected messages as not being junk"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºé??å??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2037
 msgid "_Read"
 msgstr "è¯»å??(_R)"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2039
 msgid "Mark the selected messages as having been read"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2044
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2046
 msgid "Mark the selected messages as unimportant"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2051
 msgid "_Unread"
 msgstr "æ?ªè¯»(_U)"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2053
 msgid "Mark the selected messages as not having been read"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºæ?ªè¯»"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2058
 msgid "_Edit as New Message..."
 msgstr "ä½?ä¸ºæ?°ä¿¡æ?¯è¿?è¡?ç¼?è¾?(_E)..."
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2060
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨ç¼?è¾?å?¨ä¸æ??å¼?é??ä¸ç??ä¿¡æ?¯ä»¥ä¾¿ç¼?è¾?"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2065
 msgid "Compose _New Message"
 msgstr "æ?°å??æ?°ä¿¡æ?¯(_N)"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2067
 msgid "Open a window for composing a mail message"
 msgstr "æ??å¼?çª?å?£ä»¥æ?°å??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2072
 msgid "_Open in New Window"
 msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?(_O)"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2074
 msgid "Open the selected messages in a new window"
 msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?é??ä¸ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2079
 msgid "_Move to Folder..."
 msgstr "ç§»è?³æ??ä»¶å¤¹(_M)..."
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2081
 msgid "Move selected messages to another folder"
 msgstr "æ??é??ä¸ç??ä¿¡æ?¯ç§»è?³å?¶å®?æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2086
 msgid "_Switch to Folder"
 msgstr "å??æ?¢å?°æ??ä»¶å¤¹(_S)"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2088
 msgid "Display the parent folder"
 msgstr "æ?¾ç¤ºä¸?å±?æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2093
 msgid "Switch to _next tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?ä¸ªæ ?ç¾(_N)"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2095
 msgid "Switch to the next tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?ä¸ªæ ?ç¾"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2100
 msgid "Switch to _previous tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?ä¸ªæ ?ç¾(_P)"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2102
 msgid "Switch to the previous tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?ä¸ªæ ?ç¾"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2107
 msgid "Cl_ose current tab"
 msgstr "å?³é?å½?å??æ ?ç¾(_O)"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2109
 msgid "Close current tab"
 msgstr "å?³é?å½?å??æ ?ç¾"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2114
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å°?ä¿¡(_N)"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2116
 msgid "Display the next message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2121
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_I)"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2123
 msgid "Display the next important message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2128
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?æ?¡çº¿ç´¢(_T)"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2130
 msgid "Display the next thread"
 msgstr "æ?¾ç¤ºä¸?ä¸?æ?¡çº¿ç´¢"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2135
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªè¯»ä¿¡æ?¯(_U)"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2137
 msgid "Display the next unread message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?æ?ªè¯»ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2142
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å°?ä¿¡(_P)"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2144
 msgid "Display the previous message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2149
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_E)"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2151
 msgid "Display the previous important message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2156
 msgid "Previous T_hread"
 msgstr "ä¸?ä¸?æ?¡çº¿ç´¢(_H)"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2158
 msgid "Display the previous thread"
 msgstr "æ?¾ç¤ºä¸?ä¸?æ?¡çº¿ç´¢"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2163
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªè¯»ä¿¡æ?¯(_R)"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2165
 msgid "Display the previous unread message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?æ?ªè¯»ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2172
 msgid "Print this message"
 msgstr "æ??å?°è¯¥ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2179
 msgid "Preview the message to be printed"
 msgstr "é¢?è§?è¦?æ??å?°ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2184
 msgid "Re_direct"
 msgstr "é??å??(_D)"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2186
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é??ä¸ä¿¡æ?¯é??å??(é??å??)ç»?æ??äºº"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2191
 msgid "Remo_ve Attachments"
 msgstr "ç§»é?¤é??ä»¶(_V)"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2193
 msgid "Remove attachments"
 msgstr "ç§»é?¤é??ä»¶"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2198
 msgid "Remove Du_plicate Messages"
 msgstr "ç§»é?¤é??å¤?ç??ä¿¡æ?¯(_P)"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2200
 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
+#: ../mail/e-mail-reader.c:2205 ../mail/mail.error.xml.h:102
+#: ../modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../modules/mail/e-mail-attachment-handler.c:179
 msgid "Reply to _All"
 msgstr "å??å¤?æ??æ??äºº(_A)"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2207
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯ç??æ??æ??æ?¶ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2212 ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "å??å¤?é?®ä»¶å??è¡¨(_L)"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2214
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯ç??é?®ä»¶å??è¡¨æ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:2196
-#: ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2219
+#: ../modules/mail/e-mail-attachment-handler.c:186
 msgid "_Reply to Sender"
 msgstr "å??å¤?å??ä»¶äºº(_R)"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2221
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯ç??å??ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2226
 msgid "_Save as mbox..."
 msgstr "å?¦å?ä¸º mbox æ ¼å¼?(_S)..."
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2228
 msgid "Save selected messages as an mbox file"
 msgstr "æ??é??ä¸ä¿¡æ?¯å?¦å?ä¸º mbox æ ¼å¼?æ??ä»¶"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2233
 msgid "Search Folder from Mailing _List..."
 msgstr "å?ºäº?é?®ä»¶å??è¡¨ç??æ??ç´¢æ??ä»¶å¤¹(_L)..."
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2235
 msgid "Create a search folder for this mailing list"
 msgstr "ä¸ºæ¤é?®ä»¶å??è¡¨å??å»ºæ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2240
 msgid "Search Folder from Recipien_ts..."
 msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_T)..."
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2242
 msgid "Create a search folder for these recipients"
 msgstr "ä¸ºè¿?äº?æ?¶ä»¶äººå??å»ºæ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2247
 msgid "Search Folder from Sen_der..."
 msgstr "å?ºäº?å??ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_D)..."
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2249
 msgid "Create a search folder for this sender"
 msgstr "ä¸ºè¯¥å??ä»¶äººå??å»ºæ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2254
 msgid "Search Folder from S_ubject..."
 msgstr "å?ºäº?ä¸»é¢?ç??æ??ç´¢æ??ä»¶å¤¹(_U)..."
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2256
 msgid "Create a search folder for this subject"
 msgstr "ä¸ºè¯¥ä¸»é¢?å??å»ºæ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2261
 msgid "_Message Source"
 msgstr "ä¿¡æ?¯æº?ä»£ç ?(_M)"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2263
 msgid "Show the raw email source of the message"
 msgstr "æ?¾ç¤ºä¿¡æ?¯ç??å??å§?é?®ä»¶æº?ä»£ç ?"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2275
 msgid "_Undelete Message"
 msgstr "å??æ¶?å? é?¤ä¿¡æ?¯(_U)"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2277
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?é??ä¸ä¿¡æ?¯ç??å? é?¤"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2282
 msgid "_Normal Size"
 msgstr "æ?®é??å¤§å°?(_N)"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2284
 msgid "Reset the text to its original size"
 msgstr "æ??æ??æ?¬é??æ?°è®¾ç½®ä¸ºå??æ?¥ç??å¤§å°?"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2289
 msgid "_Zoom In"
 msgstr "æ?¾å¤§(_Z)"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2291
 msgid "Increase the text size"
 msgstr "å¢?å? æ??æ?¬å¤§å°?"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2296
 msgid "Zoom _Out"
 msgstr "ç¼©å°?(_O)"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2298
 msgid "Decrease the text size"
 msgstr "å??å°?æ??æ?¬å¤§å°?"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2305
 msgid "Create R_ule"
 msgstr "å??å»ºè§?å??(_U)"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2312
 msgid "Ch_aracter Encoding"
 msgstr "å?ç¬¦ç¼?ç ?(_A)"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2319
 msgid "F_orward As"
 msgstr "è½¬å??ä¸º(_O)"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2326
 msgid "_Group Reply"
 msgstr "å??å¤?å?¨é?¨(_G)"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2333
 msgid "_Go To"
 msgstr "è½¬å?°(_G)"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2340
 msgid "Mar_k As"
 msgstr "æ ?è®°ä¸º(_K)"
 
-#: ../mail/e-mail-reader.c:2324
+#: ../mail/e-mail-reader.c:2347
 msgid "_Message"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2354
 msgid "_Zoom"
 msgstr "ç¼©æ?¾(_Z)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2379
 msgid "Mark for Follo_w Up..."
 msgstr "æ ?è®°ä¸ºè·?é??(_W)..."
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2387
 msgid "Mark as _Important"
 msgstr "æ ?è®°ä¸ºé??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2391
 msgid "Mark as _Junk"
 msgstr "æ ?è®°ä¸ºå??å?¾(_J)"
 
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2395
 msgid "Mark as _Not Junk"
 msgstr "æ ?è®°ä¸ºé??å??å?¾(_N)"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2399
 msgid "Mar_k as Read"
 msgstr "æ ?è®°ä¸ºå·²è¯»(_K)"
 
-#: ../mail/e-mail-reader.c:2380
+#: ../mail/e-mail-reader.c:2403
 msgid "Mark as Uni_mportant"
 msgstr "æ ?è®°ä¸ºä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2407
 msgid "Mark as _Unread"
 msgstr "æ ?è®°ä¸ºæ?ªè¯»(_U)"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2451
 msgid "_Caret Mode"
 msgstr "å??æ ?æ¨¡å¼?(_C)"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2453
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??ä¿¡ä½?ä¸æ?¾ç¤ºé?ªç??å??æ ?"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2459
 msgid "All Message _Headers"
 msgstr "å?¨é?¨ä¿¡å¤´(_H)"
 
-#: ../mail/e-mail-reader.c:2438
+#: ../mail/e-mail-reader.c:2461
 msgid "Show messages with all email headers"
 msgstr "æ?¾ç¤ºä¿¡æ?¯æ?¶æ?¾ç¤ºæ??æ??ä¿¡å¤´"
 
-#: ../mail/e-mail-reader.c:2670
+#: ../mail/e-mail-reader.c:2699
 msgid "Unable to retrieve message"
 msgstr "æ? æ³?è?·å??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
+#: ../mail/e-mail-reader.c:2761 ../mail/mail-ops.c:2068
 #, 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:3344 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3379 ../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
+#: ../widgets/misc/e-account-tree-view.c:249
 msgid "Default"
 msgstr "é»?è®¤"
 
-#: ../mail/e-mail-reader.c:3524
-#: ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:3550
+#: ../modules/mail/e-mail-attachment-handler.c:172
 msgid "_Forward"
 msgstr "è½¬å??(_F)"
 
-#: ../mail/e-mail-reader.c:3525
+#: ../mail/e-mail-reader.c:3551
 msgid "Forward the selected message to someone"
 msgstr "æ??é??ä¸ä¿¡æ?¯è½¬å??ç»?æ??äºº"
 
-#: ../mail/e-mail-reader.c:3544
+#: ../mail/e-mail-reader.c:3570
 msgid "Group Reply"
 msgstr "å??å¤?å?¨é?¨"
 
-#: ../mail/e-mail-reader.c:3545
+#: ../mail/e-mail-reader.c:3571
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯ç??é?®ä»¶å??è¡¨æ??å?¨é?¨æ?¶ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:744
+#: ../mail/e-mail-reader.c:3616 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:746
 msgid "Delete"
 msgstr "å? é?¤"
 
-#: ../mail/e-mail-reader.c:3623
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
-#: ../widgets/misc/e-calendar.c:196
+#: ../mail/e-mail-reader.c:3649
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "ä¸?ä¸?é¡¹"
 
-#: ../mail/e-mail-reader.c:3627
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#: ../widgets/misc/e-calendar.c:172
+#: ../mail/e-mail-reader.c:3653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "ä¸?ä¸?é¡¹"
 
-#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3663 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "å??å¤?"
 
-#: ../mail/e-mail-reader.c:4274
+#: ../mail/e-mail-reader.c:4298
 #, c-format
 msgid "Folder '%s'"
 msgstr "æ??ä»¶å¤¹ %s"
 
-#: ../mail/e-mail-session.c:647
+#: ../mail/e-mail-session.c:643
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è¾?å?¥ %s ç??å¯?ç ?"
 
-#: ../mail/e-mail-session.c:649
+#: ../mail/e-mail-session.c:645
 msgid "Enter Passphrase"
 msgstr "è¾?å?¥å¯?ç ?"
 
-#: ../mail/e-mail-session.c:652
+#: ../mail/e-mail-session.c:648
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ä¸º %s è¾?å?¥å¯?ç ?"
 
-#: ../mail/e-mail-session.c:654
+#: ../mail/e-mail-session.c:650
 msgid "Enter Password"
 msgstr "è¾?å?¥å¯?ç ?"
 
-#: ../mail/e-mail-session.c:702
+#: ../mail/e-mail-session.c:701
 #, c-format
 msgid "User canceled operation."
 msgstr "ç?¨æ?·å·±å??æ¶?æ??ä½?ã??"
 
-#: ../mail/e-mail-session.c:870
+#: ../mail/e-mail-session.c:871
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "ç¼ºå°?å??é??ç?®æ ?å?°å??ï¼?ä¿¡æ?¯è½¬å??è¢«å??æ¶?ã??"
 
-#: ../mail/e-mail-session.c:879
+#: ../mail/e-mail-session.c:880
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ? å?¯ç?¨å¸?å?·ï¼?ä¿¡æ?¯è½¬å??è¢«å??æ¶?ã??"
 
-#: ../mail/e-mail-session.c:1268 ../mail/mail-ops.c:1220
+#: ../mail/e-mail-session.c:1283 ../mail/mail-ops.c:1220
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "æ??å¼?æ??ä»¶å¤¹ %s"
 
-#: ../mail/e-mail-session.c:1284
+#: ../mail/e-mail-session.c:1299
 #, c-format
 msgid "Invalid folder: %s"
 msgstr "æ? æ??ç??æ??ä»¶å¤¹ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "åº?ç?¨å¯?å?ºè¿?æ»¤å?¨å¤±è´¥ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
+#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
 #: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
 #, c-format
 msgid ""
@@ -8801,17 +8833,17 @@ msgstr ""
 "è¿½å? å?° %sï¼?%s å¤±è´¥\n"
 "è½¬è??è¿½å? å?°æ?¬å?°â??å·²å??â??æ??ä»¶å¤¹ã??"
 
-#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "è¿½å? å?°æ?¬å?°â??å·²å??â??æ??ä»¶å¤¹å¤±è´¥ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:765 ../mail/mail-ops.c:774
+#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
 #: ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "å??é??ä¿¡æ?¯"
 
-#: ../mail/e-mail-session-utils.c:836
+#: ../mail/e-mail-session-utils.c:850
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "æ£å?¨é??è®¢æ??ä»¶å¤¹â??%sâ??"
@@ -8826,13 +8858,13 @@ msgstr "æ?å¼?ä¸? %s ç??è¿?æ?¥"
 msgid "Reconnecting to '%s'"
 msgstr "é??æ?°è¿?æ?¥å?° %s"
 
-#: ../mail/e-mail-tag-editor.c:295
+#: ../mail/e-mail-tag-editor.c:290
 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:567 ../mail/mail-config.ui.h:69
+#: ../mail/em-account-editor.c:563 ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "ä¸?å? å¯?"
@@ -8840,7 +8872,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:571 ../mail/mail-config.ui.h:124
+#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:126
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS å? å¯?"
@@ -8848,40 +8880,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:575 ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:571 ../mail/mail-config.ui.h:91
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL å? å¯?"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:843 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:834 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ? "
 
-#: ../mail/em-account-editor.c:924
+#: ../mail/em-account-editor.c:915
 msgid "Never"
 msgstr "ä»?ä¸?"
 
-#: ../mail/em-account-editor.c:925
+#: ../mail/em-account-editor.c:916
 msgid "Always"
 msgstr "æ?»æ?¯"
 
-#: ../mail/em-account-editor.c:926
+#: ../mail/em-account-editor.c:917
 msgid "Ask for each message"
 msgstr "æ¯?æ?¡ä¿¡æ?¯é?½è¯¢é?®"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:127
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ? "
 
-#: ../mail/em-account-editor.c:2092
+#: ../mail/em-account-editor.c:2086
 msgid "Mail Configuration"
 msgstr "é?®ä»¶é??ç½®"
 
-#: ../mail/em-account-editor.c:2093
+#: ../mail/em-account-editor.c:2087
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8891,7 +8923,7 @@ msgstr ""
 "\n"
 "å??å?»â??å??è¿?â??å¼?å§?ã??"
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2090
 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 "
@@ -8900,19 +8932,19 @@ msgstr ""
 "è¯·å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å§?å??å??ç?µå?é?®ä»¶å?°å??ã??ä¸?é?¢ç??â??å?¯é??â??å??ä¸?å¿?å¡«å?¥ï¼?é?¤é??æ?¨æ?³è¦?å?¨æ?¨å??"
 "å?ºç??é?®ä»¶ä¸å??å?«æ¤ä¿¡æ?¯ã??"
 
-#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2260
+#: ../mail/em-account-editor.c:2092 ../mail/em-account-editor.c:2255
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶ç?µå?é?®ä»¶"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2093
 msgid "Please configure the following account settings."
 msgstr "è¯·é??ç½®ä¸?å??å¸?å?·è®¾ç½®ã??"
 
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2759
+#: ../mail/em-account-editor.c:2095 ../mail/em-account-editor.c:2755
 msgid "Sending Email"
 msgstr "å??é??ç?µå?é?®ä»¶"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -8920,23 +8952,23 @@ msgstr ""
 "è¯·å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å??ä»¶æ??å?¡å?¨ä¿¡æ?¯ã??å¦?æ??æ?¨ä¸?å¤ªç¡®å®?ç??è¯?ï¼?è¯·è¯¢é?®æ?¨ç??ç³»ç»?ç®¡ç??å??æ??è??"
 "äº?è??ç½?æ??å?¡æ??ä¾?å??ISPã??"
 
-#: ../mail/em-account-editor.c:2104
-msgid "Account Management"
-msgstr "å¸?å?·ç®¡ç??"
+#: ../mail/em-account-editor.c:2098 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "å¸?å?·ä¿¡æ?¯"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2099
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
+"Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 "è¯·å?¨ä¸?é?¢ç??ç©ºç?½å¤?è¾?å?¥æ¤å¸?å?·ç??æ??è¿°æ?§å??ç§°ã??\n"
 "æ¤å??ç§°å°?å?ªå?¨æ?¾ç¤ºæ?¶ä½¿ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2109
+#: ../mail/em-account-editor.c:2103
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2110
+#: ../mail/em-account-editor.c:2104
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8950,36 +8982,36 @@ msgstr ""
 "\n"
 "å??å?»â??åº?ç?¨â??å?¯ä¿?å?æ?¨ç??è®¾ç½®ã??"
 
-#: ../mail/em-account-editor.c:2573
+#: ../mail/em-account-editor.c:2569
 msgid "Check for _new messages every"
 msgstr "è?ªå?¨æ£?æ?¥æ?°ä¿¡æ?¯ç??é?´é??(_N)"
 
-#: ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2577
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2863
+#: ../mail/em-account-editor.c:2860
 msgid "Please select a folder from the current account."
 msgstr "è¯·ä»?å½?å??å¸?å?·é??æ?©ä¸?ä¸ªæ??ä»¶å¤¹ã??"
 
-#: ../mail/em-account-editor.c:3172 ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:3170 ../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:3217 ../mail/em-account-editor.c:3285
+#: ../mail/em-account-editor.c:3216 ../mail/em-account-editor.c:3284
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é??é¡¹"
 
-#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
+#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
 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
+#: ../mail/em-composer-utils.c:1154
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -8987,31 +9019,31 @@ msgstr ""
 "å?¨ ${Year}-${Month}-${Day}${AbbrevWeekdayName}ç?? ${24Hour}:${Minute} "
 "${TimeZone}ï¼?${Sender}å??é??ï¼?"
 
-#: ../mail/em-composer-utils.c:1146
+#: ../mail/em-composer-utils.c:1164
 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:1804
+#: ../mail/em-composer-utils.c:1821
 #, 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:1854
+#: ../mail/em-composer-utils.c:1871
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é?®ä»¶é??ç?¥ï¼?%s"
 
-#: ../mail/em-composer-utils.c:2272
+#: ../mail/em-composer-utils.c:2291
 msgid "an unknown sender"
 msgstr "æ?ªç?¥å??ä»¶äºº"
 
-#: ../mail/em-composer-utils.c:2696
+#: ../mail/em-composer-utils.c:2715
 msgid "Posting destination"
 msgstr "æ??é??ç?®ç??"
 
-#: ../mail/em-composer-utils.c:2697
+#: ../mail/em-composer-utils.c:2716
 msgid "Choose folders to post the message to."
 msgstr "é??æ?©è¦?å°?ä¿¡æ?¯æ??é??å?°å?ªä¸ªæ??ä»¶å¤¹ã??"
 
@@ -9262,11 +9294,11 @@ msgid "Unset Status"
 msgstr "å??æ¶?ç?¶æ??"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:539
+#: ../mail/em-filter-rule.c:536
 msgid "Then"
 msgstr "ç?¶å??"
 
-#: ../mail/em-filter-rule.c:570
+#: ../mail/em-filter-rule.c:567
 msgid "Add Ac_tion"
 msgstr "æ·»å? å?¨ä½?(_T)"
 
@@ -9297,75 +9329,75 @@ msgstr "é??é¢?ä½¿ç?¨"
 msgid "Folder Properties"
 msgstr "æ??ä»¶å¤¹å±?æ?§"
 
-#: ../mail/em-folder-selection-button.c:81
+#: ../mail/em-folder-selection-button.c:77
 msgid "<click here to select a folder>"
 msgstr "<å??å?»æ¤å¤?ä»¥é??æ?©æ??ä»¶å¤¹>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:261
 msgid "C_reate"
 msgstr "å??å»º(_R)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
 msgstr "æ??ä»¶å¤¹å??ç§°(_N)ï¼?"
 
 #. load store to mail component
-#: ../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
+#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
+#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
 msgid "Search Folders"
 msgstr "æ??ç´¢æ??ä»¶å¤¹"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
 msgid "UNMATCHED"
 msgstr "ä¸?å?¹é??"
 
-#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:807 ../mail/em-folder-tree-model.c:1084
 msgid "Loading..."
 msgstr "æ£å?¨è½½å?¥..."
 
-#: ../mail/em-folder-tree.c:201
+#: ../mail/em-folder-tree.c:197
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??ä»¶å¤¹"
 
-#: ../mail/em-folder-tree.c:629
+#: ../mail/em-folder-tree.c:625
 msgid "Folder names cannot contain '/'"
 msgstr "æ??ä»¶å¤¹å??ä¸?è?½å?«æ??å?ç¬¦â??/â??"
 
-#: ../mail/em-folder-tree.c:1191
+#: ../mail/em-folder-tree.c:1245
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1427
+#: ../mail/em-folder-tree.c:1481
 msgid "Mail Folder Tree"
 msgstr "é?®ä»¶æ??ä»¶å¤¹æ ?"
 
-#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:1937 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "ç§»å?¨æ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1941 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "å¤?å?¶æ??ä»¶å¤¹ %s"
 
-#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
+#: ../mail/em-folder-tree.c:1950 ../mail/message-list.c:2243
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ??ä¿¡æ?¯ç§»è?³æ??ä»¶å¤¹ %s"
 
-#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
+#: ../mail/em-folder-tree.c:1954 ../mail/message-list.c:2245
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ??ä¿¡æ?¯å¤?å?¶å?°æ??ä»¶å¤¹ %s"
 
-#: ../mail/em-folder-tree.c:1824
+#: ../mail/em-folder-tree.c:1973
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "æ? æ³?å°?ä¿¡æ?¯æ?¾å?°é¡¶çº§æ??ä»¶å¤¹å?å?¨"
@@ -9384,81 +9416,81 @@ msgstr "å¤?å?¶æ??ä»¶å¤¹å?°"
 msgid "Creating folder '%s'"
 msgstr "å??å»ºæ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:741
 msgid "Create Folder"
 msgstr "å??å»ºæ??ä»¶å¤¹"
 
-#: ../mail/em-folder-utils.c:746
+#: ../mail/em-folder-utils.c:742
 #: ../plugins/groupwise-features/install-shared.c:178
 #: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?å?¨å?ªé??å??å»ºæ??ä»¶å¤¹ï¼?"
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html-display.c:84 ../mail/em-format-html.c:1600
 msgid "Unsigned"
 msgstr "æ?ªç¾å??"
 
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:84
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "æ¤ä¿¡æ?¯æ?ªç¾å??ã??æ? æ³?ä¿?è¯?è¿?å°?ä¿¡æ?¯å?¯ä¿¡ç??ã??"
 
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1601
 msgid "Valid signature"
 msgstr "æ??æ??ç¾å??"
 
-#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html-display.c:85
 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:90 ../mail/em-format-html.c:1606
+#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1602
 msgid "Invalid signature"
 msgstr "æ? æ??ç¾å??"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html-display.c:86
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "æ? æ³?æ ¡éª?è¿?å°?ä¿¡ç??ç¾å??ï¼?å?¯è?½å?¨ä¼ é??ç??è¿?ç¨?ä¸é?®ä»¶è¢«ç¯¡æ?¹äº?ã??"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
+#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1603
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?å??é??è??"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:87
 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:92 ../mail/em-format-html.c:1608
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
 msgid "Signature exists, but need public key"
 msgstr "ç¾å??å·²å?å?¨ï¼?ä½?é??è¦?å?¬é?¥"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "è¿?å°?ä¿¡ç??ç¾å??æ??æ??ï¼?ä½?æ?¯æ²¡æ??ç?¸åº?ç??å?¬é?¥ã??"
 
-#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
+#: ../mail/em-format-html-display.c:95 ../mail/em-format-html.c:1610
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:95
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "è¿?å°?ä¿¡æ?ªå? å¯?ã??å?¨ Internet ä¸?ä¼ é??æ?¶æ??æ??äººé?½å?¯ä»¥ç??å?°å?¶å??å®¹ã??"
 
-#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
+#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1611
 msgid "Encrypted, weak"
 msgstr "å¼±å? å¯?"
 
-#: ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html-display.c:96
 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 "
@@ -9467,21 +9499,21 @@ msgstr ""
 "è¿?å°?ä¿¡å·²å? å¯?ï¼?ä½?ä½¿ç?¨ç??æ?¯å¼±å? å¯?ç®?æ³?ã??å¦?æ??å¤?äººæ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??å®¹ï¼?å?¯è?½è¦?è?±ä¸?"
 "å®?æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å¾?å?°é?¾ä½?å¹¶ä¸?æ?¯ä¸?å?¯è?½ã??"
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1612
 msgid "Encrypted"
 msgstr "å? å¯?"
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:97
 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:102 ../mail/em-format-html.c:1617
+#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1613
 msgid "Encrypted, strong"
 msgstr "å¼ºå? å¯?"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:98
 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 "
@@ -9490,15 +9522,15 @@ msgstr ""
 "è¿?å°?ä¿¡å·²å? å¯?ï¼?ä¸?ä½¿ç?¨ç??æ?¯å¼ºå? å¯?ç®?æ³?ã??å¦?æ??å¤?äººæ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??å®¹ï¼?å?¯è?½è¦?è?±å¤§"
 "é??æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å??å??å?°é?¾ã??"
 
-#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:234 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æ?¥ç??è¯?ä¹¦(_V)"
 
-#: ../mail/em-format-html-display.c:251
+#: ../mail/em-format-html-display.c:247
 msgid "This certificate is not viewable"
 msgstr "æ¤è¯?ä¹¦ä¸?å?¯æ?¥ç??"
 
-#: ../mail/em-format-html-display.c:506
+#: ../mail/em-format-html-display.c:502
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9506,28 +9538,28 @@ msgstr ""
 "Evolution æ? æ³?æ¸²æ??æ¤ç?µå?é?®ä»¶ï¼?å??å? æ?¯è¯¥é?®ä»¶å¤ªå¤§ã??æ?¨å?¯ä»¥ä»¥æ? æ ¼å¼?æ?¹å¼?æ?¥ç??è¯¥é?®"
 "ä»¶ï¼?æ??è??ä½¿ç?¨å¤?é?¨æ??æ?¬ç¼?è¾?å?¨æ?¥ç??ã??"
 
-#: ../mail/em-format-html-display.c:749
+#: ../mail/em-format-html-display.c:745
 msgid "Completed on"
 msgstr "å®?æ??äº?"
 
-#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html-display.c:753
 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:761
+#: ../mail/em-format-html-display.c:757
 msgid "by"
 msgstr "å??å»ºè??ï¼?"
 
-#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
+#: ../mail/em-format-html-display.c:974 ../mail/em-format-html-display.c:1021
 msgid "View _Unformatted"
 msgstr "æ? æ ¼å¼?æ?¥ç??(_U)"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:976
 msgid "Hide _Unformatted"
 msgstr "æ? æ ¼å¼?é??è??(_U)"
 
-#: ../mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1041
 msgid "O_pen With"
 msgstr "æ??å¼?æ?¹å¼?(_P)"
 
@@ -9536,55 +9568,55 @@ msgstr "æ??å¼?æ?¹å¼?(_P)"
 msgid "Page %d of %d"
 msgstr "ç¬¬ %d é¡µï¼?å?± %d é¡µ"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:161
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??ä¿¡æ?¯"
 
-#: ../mail/em-format-html.c:364
+#: ../mail/em-format-html.c:360
 msgid "Formatting Message..."
 msgstr "æ£å?¨æ ¼å¼?å??ä¿¡æ?¯..."
 
-#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
+#: ../mail/em-format-html.c:1444 ../mail/em-format-html.c:1454
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æ?¶å??â??%sâ??"
 
-#: ../mail/em-format-html.c:1979
+#: ../mail/em-format-html.c:1975
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1987
+#: ../mail/em-format-html.c:1983
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?æ£ç¡®ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:2017
+#: ../mail/em-format-html.c:2013
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "æ??å?? FTP ç«?ç?¹ (%s)"
 
-#: ../mail/em-format-html.c:2028
+#: ../mail/em-format-html.c:2024
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "å?¨ç«?ç?¹â??%2$sâ??æ??å??æ?¬å?°æ??ä»¶ (%1$s) å??æ³?"
 
-#: ../mail/em-format-html.c:2030
+#: ../mail/em-format-html.c:2026
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ??å??æ?¬å?°æ??ä»¶ (%s)"
 
-#: ../mail/em-format-html.c:2051
+#: ../mail/em-format-html.c:2047
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "æ??å??è¿?ç¨?æ?°æ?® (%s)"
 
-#: ../mail/em-format-html.c:2062
+#: ../mail/em-format-html.c:2058
 #, 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:2768
+#: ../mail/em-format-html.c:2762
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "æ¤ä¿¡æ?¯ç?± %s ä»£è¡¨ %s ç??èº«ä»½å??é??"
@@ -9595,61 +9627,61 @@ msgstr "æ¤ä¿¡æ?¯ç?± %s ä»£è¡¨ %s ç??èº«ä»½å??é??"
 msgid "No HTML stream available"
 msgstr "æ²¡æ??å?¯ç?¨ç?? HTML æµ?ã??"
 
-#: ../mail/em-subscription-editor.c:1107
+#: ../mail/em-subscription-editor.c:1103
 msgid "Folder Subscriptions"
 msgstr "æ??ä»¶å¤¹è®¢é??"
 
-#: ../mail/em-subscription-editor.c:1146
+#: ../mail/em-subscription-editor.c:1142
 msgid "_Account:"
 msgstr "è´¦æ?·(_A)ï¼?"
 
-#: ../mail/em-subscription-editor.c:1161
+#: ../mail/em-subscription-editor.c:1157
 msgid "Clear Search"
 msgstr "æ¸?é?¤æ??ç´¢"
 
-#: ../mail/em-subscription-editor.c:1179
+#: ../mail/em-subscription-editor.c:1175
 msgid "Sho_w items that contain:"
 msgstr "æ?¾ç¤ºå??å?«ä»¥ä¸?å??å®¹ç??é¡¹ç?®(_W)ï¼?"
 
-#: ../mail/em-subscription-editor.c:1218
+#: ../mail/em-subscription-editor.c:1214
 msgid "Subscribe to the selected folder"
 msgstr "è®¢é??é??å®?ç??æ??ä»¶å¤¹"
 
-#: ../mail/em-subscription-editor.c:1219
+#: ../mail/em-subscription-editor.c:1215
 msgid "Su_bscribe"
 msgstr "è®¢é??(_B)"
 
-#: ../mail/em-subscription-editor.c:1230
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../mail/em-subscription-editor.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "Unsubscribe from the selected folder"
 msgstr "å??æ¶?å¯¹é??å®?æ??ä»¶å¤¹ç??è®¢é??"
 
-#: ../mail/em-subscription-editor.c:1231
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../mail/em-subscription-editor.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Unsubscribe"
 msgstr "é??è®¢(_U)"
 
-#: ../mail/em-subscription-editor.c:1242
+#: ../mail/em-subscription-editor.c:1238
 msgid "Collapse all folders"
 msgstr "æ??å? æ??æ??æ??ä»¶å¤¹"
 
-#: ../mail/em-subscription-editor.c:1243
+#: ../mail/em-subscription-editor.c:1239
 msgid "C_ollapse All"
 msgstr "å?¨é?¨æ??å? (_O)"
 
-#: ../mail/em-subscription-editor.c:1253
+#: ../mail/em-subscription-editor.c:1249
 msgid "Expand all folders"
 msgstr "å±?å¼?æ??æ??æ??ä»¶å¤¹"
 
-#: ../mail/em-subscription-editor.c:1254
+#: ../mail/em-subscription-editor.c:1250
 msgid "E_xpand All"
 msgstr "å?¨é?¨å±?å¼?(_X)"
 
-#: ../mail/em-subscription-editor.c:1264
+#: ../mail/em-subscription-editor.c:1260
 msgid "Refresh the folder list"
 msgstr "å?·æ?°æ??ä»¶å¤¹å??è¡¨"
 
-#: ../mail/em-subscription-editor.c:1276
+#: ../mail/em-subscription-editor.c:1272
 msgid "Stop the current operation"
 msgstr "å??æ¢å½?å??æ??ä½?"
 
@@ -9664,15 +9696,15 @@ msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "æ?¨ç¡®å®?è¦?ä¸?æ¬¡æ??å¼? %d å°?ä¿¡å??ï¼?"
 
 #: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../modules/mailto-handler/evolution-mailto-handler.c:151
 msgid "_Do not show this message again"
 msgstr "ä¸?å??æ?¾ç¤ºæ¤ä¿¡æ?¯(_D)"
 
-#: ../mail/em-utils.c:327
+#: ../mail/em-utils.c:326
 msgid "Message Filters"
 msgstr "é?®ä»¶è¿?æ»¤å?¨"
 
-#: ../mail/em-utils.c:883
+#: ../mail/em-utils.c:882
 #, c-format
 msgid "Messages from %s"
 msgstr "æ?¥è?ª %s ç??ä¿¡æ?¯"
@@ -9681,7 +9713,7 @@ msgstr "æ?¥è?ª %s ç??ä¿¡æ?¯"
 msgid "Search _Folders"
 msgstr "æ??ç´¢æ??ä»¶å¤¹(_F)"
 
-#: ../mail/em-vfolder-rule.c:603
+#: ../mail/em-vfolder-rule.c:609
 msgid "Add Folder"
 msgstr "æ·»å? æ??ä»¶å¤¹"
 
@@ -10200,39 +10232,45 @@ msgstr ""
 "å?°äº?å??è¡¨æ?¶ï¼?ç¦?ç?¨æ??å?¯ç?¨å??å¤?ç??è¦å??æ??ç¤ºã??"
 
 #: ../mail/evolution-mail.schemas.in.h:101
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr "ç¦?ç?¨/å?¯ç?¨ä»¥å?¨æ?¨å°?ä¿¡æ?¯ç??ç§?äººå??å¤?å??é??è?³é?®ä»¶å??è¡¨æ?¶å??å?ºè¦å??ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Junk was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??å?¾ä¿¡æ?¯ç??æ?¶é?´ä¸ºï¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Trash was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºåº?ä»¶ç®±ç??æ?¶é?´ä¸ºï¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Layout style"
 msgstr "å¸?å±?æ ·å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 #: ../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
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of Labels and their associated colors"
 msgstr "æ ?ç¾å??å?¶å¯¹åº?é¢?è?²ç??å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "å??å?ºè¦?ä½¿ç?¨ bonobo ç»?ä»¶æ?¥ç??å?¨æ?¥ç??ç?? MIME ç±»å??"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accepted licenses"
 msgstr "å??å?ºæ?¥å??ç??è®¸å?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accounts"
 msgstr "å¸?å?·å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10240,15 +10278,15 @@ msgstr ""
 "å??å?ºäº? Evolution é?®ä»¶ç»?ä»¶å·²ç?¥ç??å¸?å?·ã??æ¤å??è¡¨å??å?«äº?ç?¸å¯¹äº? /apps/evolution/mail/"
 "accounts ç??å?ç?®å½?å?½å??å?ç¬¦ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªå®?ä¹?å¤´å??è¯¥å¤´æ?¯å?¦å?¯ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of dictionary language codes used for spell checking."
 msgstr "å??å?ºç?¨æ?¥æ?¼å??æ£?æ?¥ç??å?å?¸è¯è¨?ç¼?ç ?"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 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."
@@ -10256,15 +10294,15 @@ msgstr ""
 "å??å?ºäº? Evolution é?®ä»¶ç»?ä»¶å·²ç?¥ç??æ ?ç¾ã??å??è¡¨ä¸ç??å?ç¬¦ä¸²æ ¼å¼?å½¢å¦?â??å??ç§°:é¢?è?²â??ï¼?å?¶ä¸"
 "é¢?è?²ä½¿ç?¨äº? HTML å??å?è¿?å?¶ç¼?ç ?æ?¹å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "List of protocol names whose license has been accepted."
 msgstr "å??å?ºæ?¥å??å??è®®ç??å??è®®å??ç§°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Load images for HTML messages over HTTP"
 msgstr "å?¨ HTML ä¿¡æ?¯ä¸è½½å?¥ HTTP å?¾å??"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 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 "
@@ -10273,87 +10311,87 @@ msgstr ""
 "å?¨ HTML ä¿¡æ?¯ä¸è½½å?¥ HTTP(S) å?¾å??ã??å?¯ä¾?é??æ?©ç??å?¼æ??ï¼?0 - ç»?ä¸?ä»?ç½?ä¸?è½½å?¥å?¾å??ï¼?1 - "
 "å¦?æ??å??é??è??å?¨å?°å??ç°¿ä¸å??è½½å?¥å?¾å??ï¼?2 - æ?»æ?¯ä»?ç½?ä¸?è½½å?¥å?¾å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions"
 msgstr "è®°å½?è¿?æ»¤å?¨ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions to the specified log file."
 msgstr "å°?è¿?æ»¤å?¨ä½?è®°å½?å?°æ??å®?æ?¥å¿?æ??ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions"
 msgstr "è®°å½?è¿?æ»¤å?¨ä½?ç??æ?¥å¿?æ??ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions."
 msgstr "è®°å½?è¿?æ»¤å?¨ä½?ç??æ?¥å¿?æ??ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser height"
 msgstr "é?®ä»¶æµ?è§?å?¨é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser maximized"
 msgstr "é?®ä»¶æµ?è§?å?¨æ??å¤§å??"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser width"
 msgstr "é?®ä»¶æµ?è§?å?¨å®½åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout"
 msgstr "å?¨æ??å®?è¶?æ?¶è¿?å??æ ?ä¸ºå·²ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?è¶?æ?¶è¿?å??æ ?ä¸ºå·²ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨ä¿¡æ?¯â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨ä¿¡æ?¯â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message text limit for display"
 msgstr "ä¿¡æ?¯æ??æ?¬æ?¾ç¤ºé??å?¶"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ä¿¡æ?¯æ?¾ç¤ºé£?æ ¼(â??normalâ??æ?®é??ã??â??full headersâ??å?¨é?¨é?®ä»¶å¤´ã??â??sourceâ??æº?ä»£ç ?)"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the junk on exit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºå??å?¾ä¿¡æ?¯ç??æ??å°?å¤©æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the trash on exit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºåº?ä»¶ç®±ç??æ??å°?å¤©æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "é??å?ºæ?¶æ¸?ç©ºå??å?¾ä¿¡æ?¯ç??æ??å°?æ?¶é?´ï¼?ä»¥å¤©è®¡ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "é??å?ºæ?¶æ¸?ç©ºåº?ä»¶ç®±ç??æ??å°?å¤©æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "è¦?å?¨ TO/CC/BCC ä¸æ?¾ç¤ºç??å?°å??æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 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 "Path where picture gallery should search for its content"
+msgstr "å?¾å??åº?æ??ç´¢å??å®¹ç??è·¯å¾?"
+
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
@@ -10361,172 +10399,176 @@ msgstr ""
 "å?¯è?½ç??å??å?¼æ??ï¼?never - ä¸?å?³é?æµ?è§?å?¨çª?å?£ always - é?®é¢?å?³é?æµ?è§?å?¨çª?å?£ ask - (æ??"
 "ä»»ä½?å?¶ä»?å?¼)å°?è¯¢é?®ç?¨æ?·"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "ä¸?å??æ?¥æ?¶è??ä¸?è?½è¢«è¯?å?«ä¸ºæ??æ??ç??ç?µå?é?®ä»¶å?°å??"
+
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt on empty subject"
 msgstr "ç©ºä¸»é¢?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¨æ?·è¯?å?¾é??æ¯?æ??ä»¶å¤¹æ?¶æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¨æ?·è§?å?¾å??é??æ²¡æ??ä¸»é¢?ç??ä¿¡æ?¯æ?¶æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when deleting messages in search folder"
 msgstr "å? é?¤æ??ç´¢æ??ä»¶å¤¹ä¸ç??ä¿¡æ?¯æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "å½?é?®ä»¶å??è¡¨å?«æ??ç§?äººå??å¤?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when replying privately to list messages"
 msgstr "å½?å¯¹é?®ä»¶å??è¡¨ä½?ç§?äººå??å¤?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying to many recipients"
 msgstr "å½?å??å¤?ä¸ªæ?¶ä»¶äººå??å¤?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when user expunges"
 msgstr "ç?¨æ?·é??æ¯?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¨æ?·å?ªå¡«å?¥å¯?ä»¶æ??é??æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "å½?ç?¨æ?·è¯?å?¾ä¸?æ¬¡æ??å¼?è¶?è¿?å??å°?ä¿¡æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 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:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "å½?ç?¨æ?·è¯?å?¾å??é??æ²¡æ??æ?¶ä»¶äººæ??æ??é??ç??ä¿¡æ?¯æ?¶æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "å½?ç?¨æ?·æ?¯å?¦å??é??æ??å¤?ç?? HTML æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt while marking multiple messages"
 msgstr "æ ?è®°å¤?å°?ä¿¡æ?¯æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Put personalized signatures at the top of replies"
 msgstr "å?¨å??å¤?ç??é¡¶é?¨æ·»å? ä¸ªæ?§ç¾å??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put the cursor at the bottom of replies"
 msgstr "å°?å??æ ?ç½®äº?å??å¤?åº?é?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "è¯?å?«æ??æ?¬ä¸ç??è¡¨æ??ï¼?å¹¶å°?å?¶æ?¿æ?¢ä¸ºå?¾å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize links in text and replace them."
 msgstr "è¯?å?«æ??æ?¬ä¸ç??é?¾æ?¥å¹¶è¿?è¡?æ?¿æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Run junk test on incoming mail."
 msgstr "å¯¹æ?¶å?°ç??é?®ä»¶è¿?è¡?å??å?¾ä¿¡æ?¯æµ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Save directory"
 msgstr "ä¿?å?ç?®å½?"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°å?°å??è??ä¸æ??ç´¢å??ä»¶äººç?§ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Send HTML mail by default"
 msgstr "é»?è®¤ä»¥ HTML å??é??é?®ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default."
 msgstr "é»?è®¤ä»¥ HTML å??é??é?®ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Sender email-address column in the message list"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸æ?¾ç¤º email å?°å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Server synchronization interval"
 msgstr "æ??å?¡å?¨å??æ¥é?´é??"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
 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:163
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºå¯?ä»¶æ??é??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºæ??é??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "å?¨å??é??å??å®¹å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºå??ä»¶äººå??"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "å?¨å??é??å??å®¹å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºâ??Reply Toâ??(å??å¤?è?³)å??"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "å??é??é?®ä»¶æ?¶æ?¾ç¤ºâ??Reply Toâ??(å??å¤?è?³)å??"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show Animations"
 msgstr "æ?¾ç¤ºå?¨ç?»"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show all message headers"
 msgstr "æ?¾ç¤ºå?¨é?¨ä¿¡å¤´"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all the headers when viewing a messages."
 msgstr "æ?¥ç??ä¿¡æ?¯æ?¶æ?¾ç¤ºå?¨é?¨ä¿¡å¤´ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show animated images as animations."
 msgstr "å°?å?¨ç?»å?¾å??æ?¾ç¤ºä¸ºå?¨ç?»ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯(å¸¦æ??å? é?¤çº¿)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show image animations"
 msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "æ?¾ç¤ºå??å§?ç??é?®ä»¶å¤´æ?¥æ??å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show photo of the sender"
 msgstr "æ?¾ç¤ºå??ä»¶äººç?§ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10534,7 +10576,7 @@ msgstr ""
 "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºå¯?ä»¶æ??é??å??ã??å?¨é??å®?äº?ä¸?ä¸ªé?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??ä¸æ?§å?¶æ¤"
 "å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10542,7 +10584,7 @@ msgstr ""
 "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºæ??é??å??ã??å?¨é??å®?äº?ä¸?ä¸ªé?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??ä¸æ?§å?¶æ¤å??"
 "è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10550,7 +10592,7 @@ msgstr ""
 "å?¨å??é??å??å®¹å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºå??ä»¶äººå??ã??å?¨é??å®?äº?ä¸?ä¸ªæ?°é?»ç»?å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??ä¸æ?§"
 "å?¶æ¤å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10558,7 +10600,7 @@ msgstr ""
 "å?¨å??é??å??å®¹å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºâ??Reply Toâ??å??ã??å?¨é??å®?äº?ä¸?ä¸ªæ?°é?»ç»?å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??"
 "ä¸æ?§å?¶æ¤å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -10566,13 +10608,13 @@ msgstr ""
 "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºâ??Reply Toâ??å??ã??å?¨é??å®?äº?ä¸?ä¸ªé?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??ä¸æ?§å?¶"
 "æ¤å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ç??ä»¥å?¦å¤?ç??å??æ?¾ç¤ºç?µå?é?®ä»¶ç??å??é??è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:185
 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 "
@@ -10581,11 +10623,11 @@ msgstr ""
 "æ?¾ç¤ºå??å§?ç??é?®ä»¶å¤´â??Dateâ?? å?¼(å¦?æ??æ?¶å?ºä¸?å??é??ä¸?æ?¬å?°æ?¶é?´)ã??å?¦å??æ?»æ?¯æ??ç?§ç?¨æ?·å??å¥½ç??æ ¼"
 "å¼?å??æ?¬å?°æ?¶å?ºæ?¾ç¤ºé?®ä»¶å¤´â??Dateâ?? å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨ä¿¡æ?¯é??è¯»é?¢æ?¿ä¸æ?¾ç¤ºå??ä»¶äººç?§ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:187
 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. "
@@ -10601,37 +10643,37 @@ msgstr ""
 "ä½?ï¼?å®?ä¼?è¿?è¡?ç§?äººç??å??å¤?ï¼?è??å¦?æ??æ?¨ä½¿ç?¨â??å??å¤?å?°å??è¡¨â??è¡?ä¸ºï¼?å®?å°±ä¼?å??å¤?å?°å??è¡¨ã??å¦?æ??"
 "å?å?¨ç??è¯?ï¼?å®?ä¼?æ¯?è¾? Reply-To: å?? List-Post: æ?¥å®?æ??è¯¥ç?®ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Spell check inline"
 msgstr "å??åµ?æ?¼å??æ£?æ?¥"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell checking color"
 msgstr "æ?¼å??æ£?æ?¥é¢?è?²"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking languages"
 msgstr "æ?¼å??æ£?æ?¥è¯è¨?"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Terminal font"
 msgstr "ç»?ç«¯å?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "The default plugin for Junk hook"
 msgstr "é»?è®¤ç??å??å?¾ä¿¡æ?¯é?©å?æ??ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??å?¾ä¿¡æ?¯ç??æ?¶é?´ï¼?ä»¥è?ªæ?°çºªå??å??ç??å¤©æ?°æ?¾ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?æ¬¡æ¸?ç©ºåº?ä»¶ç®±ç??æ?¶é?´ï¼?ä»¥æ?°çºªå??å??ç??å¤©æ?°æ?¾ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 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 "
@@ -10641,40 +10683,39 @@ msgstr ""
 "å¸?å±?æ ·å¼?å?³å®?äº?å?¨å?ªé??æ?¾ç½®ä¿¡æ?¯å??è¡¨ç??é¢?è§?é?¢æ?¿ã??â??0â??(ç»?å?¸è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨æ¶?"
 "æ?¯å??è¡¨ä¸?é?¢ã??â??1â??(ç«?ç?´è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨ä¿¡æ?¯å??è¡¨æ??è¾¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "The terminal font for mail display."
 msgstr "é?®ä»¶æ?¾ç¤ºç?¨ç??ç»?ç«¯å?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr "å?¨è½¬å??ä¿¡æ?¯æ?¶æ??å?¥ç??æ??æ?¬ï¼?å??ç??ä¸?é?¢æ?¯è½¬å??ç??ä¿¡æ?¯ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 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
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
-msgstr ""
-"å?¨å??å¤?æ?¶æ??å?¥ç??æ??æ?¬ï¼?å¹¶æ ?æ³¨æ??å?¶å??ä½?è??ã??"
+msgstr "å?¨å??å¤?æ?¶æ??å?¥ç??æ??æ?¬ï¼?å¹¶æ ?æ³¨æ??å?¶å??ä½?è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "The variable width font for mail display."
 msgstr "ç?¨äº?æ?¾ç¤ºé?®ä»¶ç??å??å®½å?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:201
 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:200
+#: ../mail/evolution-mail.schemas.in.h:202
 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 "
@@ -10683,7 +10724,7 @@ msgstr ""
 "æ¤é??é¡¹å?³å®?äº? Evolution ä¸æ?¾ç¤ºç??æ??å¤§æ??æ?¬é?¨å??å¤§å°?ï¼?é»?è®¤ä¸º 4096KB (4MB)ã??æ¤å?¼ä»?"
 "å?¨ force_message_limit é?®æ¿?æ´»æ?¶æ??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:203
 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 "
@@ -10692,7 +10733,7 @@ msgstr ""
 "è¿?æ?¯é»?è®¤ç??å??å?¾ä¿¡æ?¯æ??ä»¶ï¼?å?³ä½¿å?¯ç?¨äº?å¤?ä¸ªæ??ä»¶ã??å¦?æ??é»?è®¤å??å?ºç??æ??ä»¶è¢«ç¦?ç?¨ï¼?å®?ä¸?ä¼?"
 "ç¼ºç??å?°å?¶å®?å?¯ç?¨ç??æ??ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:204
 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."
@@ -10700,7 +10741,7 @@ msgstr ""
 "æ¤é?®å?ªè¢«è¯»å??ä¸?æ¬¡å¹¶å?¨è¯»å??å??è¢«é??è®¾ä¸º falseã??å®?å??æ¶?é??ä¸å??è¡¨ä¸ç??é?®ä»¶å¹¶ç§»é?¤ç?¸åº?æ??"
 "ä»¶å¤¹ç??é¢?è§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:205
 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;"
@@ -10710,7 +10751,7 @@ msgstr ""
 "æ¤é?®åº?å??å?«æ??å®?è?ªå®?ä¹?é?®ä»¶å¤´ç?? XML ç»?æ??å??è¡¨ï¼?ä»¥å??æ?¯å?¦æ?¾ç¤ºè¿?äº?é?®ä»¶å¤´ã??XML ç»?æ??ç??"
 "æ ¼å¼?ä¸ºï¼?&lt;å?¯ç?¨ç??é?®ä»¶å¤´&gt; - è®¾ä¸º enabled å??å?¨é?®ä»¶è§?å?¾ä¸æ?¾ç¤ºè¯¥é?®ä»¶å¤´ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 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 "
@@ -10719,23 +10760,23 @@ msgstr ""
 "æ¤é??é¡¹ä¸? lookup_addressbook é?®å?¼ç?¸å?³ï¼?ç?¨äº?å?³å®?æ?¯å?¦æ?¥è¯¢æ?¬å?°å?°å??ç°¿ä»¥é?¿å??æ?¨è®¤è¯?"
 "ç??äººç»?æ?¨å??é?®ä»¶è??è¢«å??å?¾é?®ä»¶è¿?æ»¤å?¨ç»?è¿?æ»¤æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "This option would help in improving the speed of fetching."
 msgstr "æ¤é??é¡¹è?½å¸®å?©æ??é«?è?·å??ä¿¡æ?¯ç??é??åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 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:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
 msgstr "æ¤è®¾ç½®æ??å®?äº?é»?è®¤æ??å?µä¸?çº¿ç´¢æ?¯è¢«å±?å¼?è¿?æ?¯è¢«æ??å? ã??è¦?åº?ç?¨é??è¦?é??å?¯ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:210
 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 "
@@ -10744,7 +10785,7 @@ msgstr ""
 "æ¤è®¾ç½®æ??å®?äº?é»?è®¤æ??å?µä¸?æ?¯å?¦å°?çº¿ç´¢æ??çº¿ç´¢ä¸ç??æ??æ?°ä¿¡æ?¯è??ä¸?æ?¯ä¿¡æ?¯æ?¥æ??æ??åº?ã??é??è¦?é??"
 "å?¯ Evolutionã??"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:211
 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 "
@@ -10753,51 +10794,51 @@ msgstr ""
 "è¿?ä¸ªå?¼å?¯ä»¥æ?¯ç©ºå?ç¬¦ä¸²ï¼?è¡¨ç¤ºå°?ä½¿ç?¨ç³»ç»?å?¾ç??æ??ä»¶å¤¹ï¼?é??å¸¸è®¾ä¸º ~/å?¾ç??ã??å?¨è®¾ç½®ç??è·¯å¾?"
 "æ??å??ç??æ??ä»¶å¤¹ä¸?å?å?¨æ?¶ä¹?å°?ä½¿ç?¨è¯¥æ??ä»¶å¤¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "Thread the message-list based on Subject"
 msgstr "å?ºäº?ä¸»é¢?æ??çº¿ç´¢ç¼?æ??ä¿¡æ?¯å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Timeout for marking message as seen"
 msgstr "å°?ä¿¡æ?¯æ ?ä¸ºå·²ç??ç??è¶?æ?¶æ?¶é?¿"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Timeout for marking message as seen."
 msgstr "å°?ä¿¡æ?¯æ ?ä¸ºå·²ç??ç??è¶?æ?¶æ?¶é?¿ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "UID string of the default account."
 msgstr "é»?è®¤å¸?å?·ç?? UID å?ç¬¦ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "å½?ä½¿ç?¨è¡?å??æ?¼å??æ£?æ?¥æ?¶ï¼?é??è¯¯æ?¼å??å??è¯?ç??ä¸?å??çº¿ç??é¢?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Use SpamAssassin daemon and client"
 msgstr "ä½¿ç?¨å??å?¾å??æ??å®?æ?¤ç¨?åº?å??å®¢æ?·"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ä½¿ç?¨ SpamAssassin å®?æ?¤ç¨?åº?å??å®¢æ?·ç«¯(spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "ä½¿ç?¨è?ªå®?ä¹?å?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "ä½¿ç?¨è?ªå®?ä¹?å?ä½?æ?¾ç¤ºé?®ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾ä¿¡æ?¯æµ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ä¹?ä½¿ç?¨æ?¬å?°å??å?¾ä¿¡æ?¯æµ?è¯?(æ?  DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../mail/evolution-mail.schemas.in.h:223
 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 "
@@ -10806,7 +10847,7 @@ msgstr ""
 "ç?¨æ?·å¸¸ä¸ºå??å¤?ä¿¡æ?¯æ?¶å??æ ?ä½?ç½®ä¸?å®?è??æ?¼ç?«ã??è¿?ä¸ªé??é¡¹å?³å®?äº?å??å¤?æ?¶å??æ ?ä½?äº?æ¶?æ?¯é¡¶é?¨è¿?"
 "æ?¯åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:224
 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 "
@@ -10815,15 +10856,15 @@ msgstr ""
 "ç?¨æ?·å¸¸ä¸ºå??å¤?ä¿¡æ?¯æ?¶ç¾å??ä½?ç½®ä¸?å®?è??æ?¼ç?«ã??è¿?ä¸ªé??é¡¹å?³å®?äº?å??å¤?æ?¶ç¾å??ä½?äº?æ¶?æ?¯é¡¶é?¨è¿?"
 "æ?¯åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:223
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Variable width font"
 msgstr "å??å®½å?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é»?è®¤å¯¹æ??æ??ä¿¡æ?¯æ·»å? é??è¯»æ?¶æ?¡è¯·æ±?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:227
 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 "
@@ -10832,27 +10873,27 @@ msgstr ""
 "å?¨ Evolution å?¯å?¨æ?¶ï¼?æ?¯ä¸?æ?¯æ£?æ?¥æ??æ??æ´»å?¨è´¦æ?·ç??æ?°ä¿¡æ?¯è??ä¸?ç®¡è´¦æ?·ç??â??æ¯?é?? X å??é??è?ª"
 "å?¨æ£?æ?¥æ?°ä¿¡æ?¯â??é??é¡¹å¦?ä½?è®¾ç½®ã??è¯¥é??é¡¹ä¸?â??send_recv_on_startâ??é??é¡¹ä¸?èµ·ä½¿ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:228
 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
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ç¦?ç?¨æ??å?¯ç?¨ä¾§è¾¹æ ?ä¸æ??ä»¶å¤¹å??ç??ç??ç?¥æ?¾ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:230
 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:229
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦ä»¥çº¿ç´¢ä¸ç??æ??æ?°ä¿¡æ?¯æ?¥æ??åº?çº¿ç´¢"
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:232
 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 "
@@ -10861,11 +10902,11 @@ msgstr ""
 "å?¨è¿?æ»¤ç»?æ??å??æ?¯å?¦å?·æ?°å??ä»¶ç®±ã??ä»?å?¨ä½¿ç?¨è¿?ä»»ä½?â??è½¬å??ç»?â??è¿?æ»¤å?¨è¡?ä¸ºå¹¶ä¸?å?¨ä¸?æ¬¡è°?ç?¨å¤§"
 "çº¦ä¸?å??é??å??è¿?è¡?å??ä»¶ç®±å?·æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Width of the message-list pane"
 msgstr "ä¿¡æ?¯å??è¡¨é?¢æ?¿ç??é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid "Width of the message-list pane."
 msgstr "ä¿¡æ?¯å??è¡¨é?¢æ?¿ç??é«?åº¦ã??"
 
@@ -10874,9 +10915,9 @@ msgid "Importing Elm data"
 msgstr "å¯¼å?¥ Elm æ?°æ?®"
 
 #: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1045
+#: ../modules/mail/e-mail-shell-view.c:1044
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:500
+#: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "é?®ä»¶"
 
@@ -10894,13 +10935,14 @@ msgid "_Destination folder:"
 msgstr "ç?®ç??æ??ä»¶å¤¹(_D)ï¼?"
 
 #: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:233
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../plugins/dbx-import/dbx-importer.c:237
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder"
 msgstr "é??æ?©æ??ä»¶å¤¹"
 
 #: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../plugins/dbx-import/dbx-importer.c:238
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder to import into"
 msgstr "é??æ?©è¦?å¯¼å?¥å?°å?ªä¸ªæ??ä»¶å¤¹"
 
@@ -10928,10 +10970,10 @@ msgid "Importing mailbox"
 msgstr "å¯¼å?¥é?®ç®±"
 
 #. Destination folder, was set in our widget
-#: ../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
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:574
+#: ../plugins/pst-import/pst-importer.c:480
+#: ../plugins/pst-import/pst-importer.c:589
 #, c-format
 msgid "Importing '%s'"
 msgstr "æ£å?¨å¯¼å?¥â??%sâ??"
@@ -10946,7 +10988,7 @@ msgid "Importing Pine data"
 msgstr "å¯¼å?¥ Pine æ?°æ?®"
 
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Address Book"
 msgstr "å?°å??ç°¿"
 
@@ -10958,27 +11000,27 @@ msgstr "Evolution Pine å¯¼å?¥å?¨"
 msgid "Import mail from Pine."
 msgstr "ä»? Pine å¯¼å?¥é?®ä»¶ã??"
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "å??é??ç»? %s"
 
-#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
 #, c-format
 msgid "Mail from %s"
 msgstr "æ?¥è?ª %s ç??é?®ä»¶"
 
-#: ../mail/mail-autofilter.c:256
+#: ../mail/mail-autofilter.c:264
 #, c-format
 msgid "Subject is %s"
 msgstr "ä¸»é¢?æ?¯ %s"
 
-#: ../mail/mail-autofilter.c:291
+#: ../mail/mail-autofilter.c:303
 #, c-format
 msgid "%s mailing list"
 msgstr "%s é?®ä»¶å??è¡¨"
 
-#: ../mail/mail-autofilter.c:382
+#: ../mail/mail-autofilter.c:394
 msgid "Add Filter Rule"
 msgstr "æ·»å? è¿?æ»¤è§?å??"
 
@@ -10987,16 +11029,8 @@ 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:480
+#: ../mail/mail-autofilter.c:492
 #, c-format
-#| msgid ""
-#| "The filter rule \"%s\" has been updated, because it used just removed "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following filter rules\n"
-#| "%s have been updated, because they used just removed folder\n"
-#| "\"%s\"."
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
@@ -11009,10 +11043,6 @@ msgstr[0] ""
 "%s å·²ç»?ä¿®æ?¹ï¼?ä»¥ç?¨äº?å? é?¤æ??ä»¶å¤¹\n"
 "â??%sâ??ã??"
 
-#: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "å¸?å?·ä¿¡æ?¯"
-
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "æ·»å? æ?°ç¾å??(_W)..."
@@ -11055,7 +11085,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "åº?ç?¨å??æ ·ç??æ?¥ç??è®¾ç½®å?°æ??æ??æ??ä»¶å¤¹(_v)"
 
 #: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1023
+#: ../modules/addressbook/addressbook-config.c:1018
 msgid "Authentication"
 msgstr "èº«ä»½éª?è¯?"
 
@@ -11379,86 +11409,91 @@ msgstr "å??é?®ä»¶å??è¡¨é?®ç®±å??é??ç§?äººå??å¤?æ?¶(_P)"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:105
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "å??é??å?ªå¡«å??äº?å¯?ä»¶æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯æ?¶(_B)"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
 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:107
+#: ../mail/mail-config.ui.h:109
 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:109
+#: ../mail/mail-config.ui.h:111
 msgid "Sending a reply to a large _number of recipients"
 msgstr "å??å¾?å¤?æ?¶ä»¶äººå??é??å??å¤?æ?¶(_N)"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:112
 msgid "Sent _Messages Folder:"
 msgstr "å·²å??é??ä¿¡æ?¯æ??ä»¶å¤¹(_M)ï¼?"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Ser_ver requires authentication"
 msgstr "æ??å?¡å?¨é??è¦?è®¤è¯?(_V)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:114
 msgid "Server Configuration"
 msgstr "æ??å?¡å?¨é??ç½®"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "Server _Type:"
 msgstr "æ??å?¡å?¨ç±»å??(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:116
 msgid "Si_gning algorithm:"
 msgstr "ç¾å??å?½æ?°(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sig_natures"
 msgstr "ç¾å??(_N)"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "Sig_ning certificate:"
 msgstr "ç¾å??è¯?ä¹¦(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Signat_ure:"
 msgstr "ç¾å??(_U)ï¼?"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Signatures"
 msgstr "ç¾å??"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Signing _algorithm:"
 msgstr "ç¾å??å?½æ?°(_A)ï¼?"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 msgid "Special Folders"
 msgstr "ç?¹æ®?æ??ä»¶å¤¹"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:123
 msgid "Spell Checking"
 msgstr "æ?¼å??æ£?æ?¥"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Start _typing at the bottom on replying"
 msgstr "å??å¤?æ?¶å?¨åº?é?¨å¼?å§?æ??å?(_T)"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "Start up"
 msgstr "å?¯å?¨"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 msgid "T_ype:"
 msgstr "ç±»å??(_Y)ï¼?"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:128
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "å?¨æ¤å??å?ºç??è¯è¨?å??æ? äº?æ?¨æ??å®?è£?ç??å?å?¸ã??"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11467,13 +11502,13 @@ msgstr ""
 "æ¤è??æ?¬ç??è¾?å?ºå°?ç?¨äº?æ?¨ç??ç¾å??ã??æ?¨æ??å®?ç??å??ç§°å°?å?ªä¼?\n"
 "ç?¨äº?æ?¾ç¤ºã??"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr "ä¸ºäº?å¸®å?©é?¿å??ç?µå?é?®ä»¶æ??å¤?å??é?®é¢?ï¼?å?¨é??å??ä»¥ä¸?å?¾é??ç??æ??ä½?å??è¯·æ±?ç¡®è®¤ï¼?"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11481,141 +11516,141 @@ msgstr ""
 "è¾?å?¥æ?¨æ?³è¦?ç»?æ¤å¸?å?·èµ·ç??å??å?ã??\n"
 "å¦?ï¼?â??å·¥ä½?â??æ??â??ç§?äººâ??"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:135
 msgid "Us_ername:"
 msgstr "ç?¨æ?·å??(_E)ï¼?"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:136
 msgid "Use Authe_ntication"
 msgstr "ä½¿ç?¨èº«ä»½éª?è¯?(_N)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:137
 msgid "User _Name:"
 msgstr "ç?¨æ?·å??(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:138
 msgid "_Add Signature"
 msgstr "æ·»å? ç¾å??(_A)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:139
 msgid "_Always load images from the Internet"
 msgstr "æ?»æ?¯ä»? Internet ä¸?è½½å?¥å?¾å??(_A)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:140
 msgid "_Authentication Type"
 msgstr "èº«ä»½éª?è¯?ç±»å??(_A)"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:141
 msgid "_Default junk plugin:"
 msgstr "é»?è®¤ç??å??å?¾ä¿¡æ?¯æ??ä»¶(_D)ï¼?"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:142
 msgid "_Direct connection to the Internet"
 msgstr "ç?´æ?¥è¿?æ?¥å?° Internet(_D)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:143
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?è¦?ç¾å??ä¼?è®®è¯·æ±?(å?? Outlook å?¼å®¹)(_D)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:144
 msgid "_Forward style:"
 msgstr "è½¬å??æ?¹å¼?(_F)ï¼?"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:145
 msgid "_Junk Folder:"
 msgstr "å??å?¾ä¿¡æ?¯æ??ä»¶å¤¹(_J)ï¼?"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:146
 msgid "_Keep signature above the original message on replying"
 msgstr "å??å¤?æ?¶ä¿?ç??å??å§?ä¿¡æ?¯ç??ç¾å??(_K)"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:147
 msgid "_Languages"
 msgstr "è¯è¨?(_L)"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:148
 msgid "_Load images only in messages from contacts"
 msgstr "è½½å?¥æ?¥è?ªè??ç³»äººç??é?®ä»¶ä¸ç??å?¾å??(_L)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:149
 msgid "_Lookup in local address book only"
 msgstr "ä»?å?¨æ?¬å?°å?°å??ç°¿ä¸æ?¥é??(_L)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:150
 msgid "_Make this my default account"
 msgstr "ä½¿å®?æ??ä¸ºæ??ç??é»?è®¤å¸?å?·(_M)"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:151
 msgid "_Manual proxy configuration:"
 msgstr "æ??å?¨ä»£ç??æ??å?¡å?¨é??ç½®(_M)ï¼?"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:153
 msgid "_Never load images from the Internet"
 msgstr "ç»?ä¸?ä»? Internet è½½å?¥å?¾å??(_N)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:154
 msgid "_Path:"
 msgstr "è·¯å¾?(_P)ï¼?"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:155
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "å??é??ç»?ä¸?æ?³æ?¥æ?¶ HTML ç??è??ç³»äººæ?¶æ??ç¤º(_P)"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:156
 msgid "_Reply style:"
 msgstr "å??å¤?é£?æ ¼(_R)ï¼?"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:157
 msgid "_Script:"
 msgstr "è??æ?¬(_S)ï¼?"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:158
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??(_S)ï¼?"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:160 ../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:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Show animated images"
 msgstr "æ?¾ç¤ºå?¨æ??å?¾å??(_S)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨ä¿¡æ?¯é¢?è§?ä¸æ?¾ç¤ºå??é??è??ç??ç?§ç??(_S)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Trash Folder:"
 msgstr "åº?ä»¶ç®±æ??ä»¶å¤¹(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:165
 msgid "_Use Secure Connection:"
 msgstr "ä½¿ç?¨å®?å?¨è¿?æ?¥(_U)ï¼?"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:166
 msgid "_Use system defaults"
 msgstr "ä½¿ç?¨é»?è®¤å?¼(_U)"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:167
 msgid "_Use the same fonts as other applications"
 msgstr "ä½¿ç?¨ä¸?å?¶å®?åº?ç?¨ç¨?åº?ç?¸å??ç??å?ä½?(_U)"
 
-#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:170
 msgid "color"
 msgstr "é¢?è?²"
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:171
 msgid "description"
 msgstr "æ??è¿°"
 
@@ -11715,7 +11750,7 @@ msgstr "æ ?å¿?(_F)ï¼?"
 msgid "_Tick this to accept the license agreement"
 msgstr "é??ä¸æ¤å¤?ä»¥è¡¨æ??æ?¨æ?¥å??è®¸å?¯å??è®®(_T)"
 
-#: ../mail/mail-folder-cache.c:792
+#: ../mail/mail-folder-cache.c:789
 #, c-format
 msgid "Pinging %s"
 msgstr "æ?¥éª? %s"
@@ -11738,11 +11773,11 @@ msgstr "æ£å?¨å??é??ç¬¬ %d å°?ä¿¡ï¼?å?± %d å°?"
 msgid "Failed to send %d of %d messages"
 msgstr "å?¨ç¬¬%då°?ä¿¡å¤±è´¥ï¼?å?±%då°?"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:787
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:789
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
@@ -11780,77 +11815,77 @@ msgstr "æ??å¼?å?å?¨ %s"
 msgid "Removing folder '%s'"
 msgstr "å? é?¤æ??ä»¶å¤¹ %s"
 
-#: ../mail/mail-ops.c:1585
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "å?å?¨æ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/mail-ops.c:1654
+#: ../mail/mail-ops.c:1678
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "é??æ¯?å¹¶å?å?¨å¸?å?·â??%sâ??"
 
-#: ../mail/mail-ops.c:1655
+#: ../mail/mail-ops.c:1679
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?å?¨å¸?å?·â??%sâ??"
 
-#: ../mail/mail-ops.c:1713
+#: ../mail/mail-ops.c:1737
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "å?·æ?°æ??ä»¶å¤¹ %s"
 
-#: ../mail/mail-ops.c:1877
+#: ../mail/mail-ops.c:1901
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "é??æ¯?æ??ä»¶å¤¹ %s"
 
-#: ../mail/mail-ops.c:1949
+#: ../mail/mail-ops.c:1973
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?ç©ºâ??%sâ??ä¸ç??åº?ä»¶ç®±"
 
-#: ../mail/mail-ops.c:1950
+#: ../mail/mail-ops.c:1974
 msgid "Local Folders"
 msgstr "æ?¬å?°æ??ä»¶å¤¹"
 
-#: ../mail/mail-ops.c:2123
+#: ../mail/mail-ops.c:2147
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "æ?¶å?? %d å°?ä¿¡"
 
-#: ../mail/mail-ops.c:2216
+#: ../mail/mail-ops.c:2240
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ä¿?å? %d å°?ä¿¡"
 
-#: ../mail/mail-ops.c:2312
+#: ../mail/mail-ops.c:2336
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "å?¨å°?ä¿¡æ?¯ä¿?å?å?° %s æ?¶å??ç??é??è¯¯ï¼?\n"
 
-#: ../mail/mail-ops.c:2387
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æ£å?¨å??å¤?ç¦»çº¿ä½¿ç?¨å¸?å?·â??%sâ??"
 
-#: ../mail/mail-ops.c:2478
+#: ../mail/mail-ops.c:2502
 msgid "Checking Service"
 msgstr "æ£?æ?¥æ??å?¡"
 
-#: ../mail/mail-ops.c:2558
+#: ../mail/mail-ops.c:2582
 #, c-format
 msgid "Disconnecting %s"
 msgstr "æ£å?¨æ?å¼? %s"
 
-#: ../mail/mail-ops.c:2615
+#: ../mail/mail-ops.c:2639
 #, c-format
 msgid "Removing attachments"
 msgstr "æ£å?¨ç§»é?¤é??ä»¶"
 
-#: ../mail/mail-ops.c:2662
+#: ../mail/mail-ops.c:2686
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "å·²ç»?å? é?¤äº?â??%sâ??æ??ä»¶ã??"
@@ -11863,19 +11898,19 @@ msgstr "æ£å?¨å??æ¶?..."
 msgid "Send & Receive Mail"
 msgstr "å??é??å??æ?¥æ?¶é?®ä»¶"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:451
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:568
 msgid "Updating..."
 msgstr "æ£å?¨æ?´æ?°..."
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:568 ../mail/mail-send-recv.c:652
 msgid "Waiting..."
 msgstr "æ£å?¨ç?å¾?..."
 
-#: ../mail/mail-send-recv.c:903
+#: ../mail/mail-send-recv.c:902
 #, c-format
 msgid "Checking for new mail"
 msgstr "æ£?æ?¥æ?°é?®ä»¶"
@@ -11919,16 +11954,8 @@ 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:709
+#: ../mail/mail-vfolder.c:718
 #, c-format
-#| msgid ""
-#| "The Search Folder \"%s\" has been updated, because it used just removed "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following Search Folders\n"
-#| "%s have been updated, because they used just removed folder\n"
-#| "\"%s\"."
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
@@ -11942,11 +11969,11 @@ msgstr[0] ""
 "%s å·²ç»?ä¿®æ?¹ï¼?ä»¥ç?¨äº?å? é?¤æ??ä»¶å¤¹\n"
 "â??%sâ??ã??"
 
-#: ../mail/mail-vfolder.c:1273
+#: ../mail/mail-vfolder.c:1297
 msgid "Edit Search Folder"
 msgstr "ç¼?è¾?æ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/mail-vfolder.c:1380
+#: ../mail/mail-vfolder.c:1408
 msgid "New Search Folder"
 msgstr "æ?°å»ºæ??ç´¢æ??ä»¶å¤¹"
 
@@ -12145,137 +12172,142 @@ 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:50
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Disable"
 msgstr "ä¸?ç¦?ç?¨(_N)"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Send"
 msgstr "ä¸?å??é??(_N)"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:49
 msgid "Do _Not Synchronize"
 msgstr "ä¸?å??æ¥(_D)"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "æ?¨æ?³è¦?å??æ¥é?£äº?æ ?è®°ä¸ºç¦»çº¿ä½¿ç?¨ç??æ??ä»¶å¤¹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?æ??æ??æ??ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»ï¼?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "æ?¨å¸?æ??ä¿?å?æ?´æ?¹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "è¾?å?¥å¯?ç ?ã??"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "è½½å?¥è¿?æ»¤å?¨å®?ä¹?é??è¯¯ã??"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:55
 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:62
+#: ../mail/mail.error.xml.h:59
 msgid "Error while {0}."
 msgstr "{0} æ?¶å?ºé??ã??"
 
+#: ../mail/mail.error.xml.h:60
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+msgstr ""
+"é»?è®¤ç??æ?¬å?°å?å?¨å·²ç»?ä»? mbox æ ¼å¼?æ?¹ä¸º maildir æ ¼å¼?ã??æ?¨æ?³ç?°å?¨è¿?è¡?è¿?ç§»å??ï¼?\n"
+"\n"
+"å°?ä¼?å??å»ºä¸?ä¸ª mbox è´¦æ?·æ?¥ä¿?ç??æ?§ç?? mbox æ??ä»¶å¤¹ã??å?¨ç¡®ä¿¡æ?°æ?®å·²ç»?å®?å?¨è¿?ç§»å??ï¼?æ?¨å?¯"
+"ä»¥å? é?¤å®?ã??è¦?è¿?ç§»ï¼?è¯·å??ç¡®ä¿?æ??è¶³å¤?ç??ç£?ç??ç©ºé?´ã??"
+
 #: ../mail/mail.error.xml.h:63
+msgid "Evolution's local mail format has changed."
+msgstr "Evolution ç??æ?¬å?°é?®ä»¶æ ¼å¼?å·²æ?´æ?¹ã??"
+
+#: ../mail/mail.error.xml.h:64
 msgid "Failed to unsubscribe from folder."
 msgstr "æ? æ³?é??è®¢æ??ä»¶å¤¹ã??"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but cannot overwrite it."
 msgstr "æ??ä»¶å?å?¨ä½?æ? æ³?è¦?ç??ã??"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "File exists but is not a regular file."
 msgstr "æ??ä»¶å?å?¨ä½?ä¸?æ?¯æ?®é??æ??ä»¶ã??"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "â??{0}â??æ??ä»¶å¤¹ä¸æ²¡æ??é??å¤?ä¿¡æ?¯ã??"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?æ?¨å°?æ? æ³?æ?¢å¤?è¿?äº?ä¿¡æ?¯ã??"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "å¦?æ??æ?¨å? é?¤æ??ä»¶å¤¹ï¼?å?¶ä¸ç??å?¨é?¨å??å®¹å??å?¶å?æ??ä»¶å¤¹å??å®¹å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "å¦?æ??æ?¨å? é?¤æ??ä»¶å¤¹ï¼?å?¶ä¸ç??å?¨é?¨å??å®¹å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å?¨é?¨ä»£ç??æ??å?¡å?¨å¸?å?·é?½å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å¸?å?·ä¿¡æ?¯å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨ä¿¡æ?¯å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å¸?å?·ä¿¡æ?¯å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "å¦?æ??æ?¨é??å?ºï¼?è¿?äº?ä¿¡æ?¯å°?ä¼?ç?å?° Evolution ä¸?æ¬¡å?¯å?¨æ??ä¼?å??å?ºã??"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Ignore"
 msgstr "å¿½ç?¥"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Invalid authentication"
 msgstr "æ? æ??ç??èº«ä»½éª?è¯?"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "Mail Deletion Failed"
 msgstr "é?®ä»¶å? é?¤å¤±è´¥"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Mail filters automatically updated."
 msgstr "é?®ä»¶è¿?æ»¤å?¨å·²è?ªå?¨æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 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 "
@@ -12286,10 +12318,6 @@ msgstr ""
 "ä¸ªé?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??ä¿¡æ?¯ä¸å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??ä¸ºäº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?è¯¥è?³å°?å¡«å?¥"
 "ä¸?ä¸ª To: æ?? CC: æ?¶ä»¶äººã??"
 
-#: ../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 "ç¼ºå°?æ??ä»¶å¤¹ã??"
@@ -12586,120 +12614,128 @@ msgid "_Discard changes"
 msgstr "ä¸¢å¼?æ?´æ?¹(_D)"
 
 #: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1054
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "_Empty Trash"
 msgstr "æ¸?ç©ºåº?ä»¶ç®±(_E)"
 
 #: ../mail/mail.error.xml.h:152
+msgid "_Exit Evolution"
+msgstr "é??å?º Evolution(_E)"
+
+#: ../mail/mail.error.xml.h:153
 msgid "_Expunge"
 msgstr "é??æ¯?(_E)"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
+msgid "_Migrate Now"
+msgstr "è¿?ç§» Now(_M)"
+
+#: ../mail/mail.error.xml.h:155
 msgid "_No"
 msgstr "å?¦(_N)"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:156
 msgid "_Open Messages"
 msgstr "æ??å¼?ä¿¡æ?¯(_O)"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:159
 msgid "_Send Receipt"
 msgstr "å??é??å·²è¯»å??æ?§(_S)"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:160
 msgid "_Synchronize"
 msgstr "å??æ¥(_S)"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:161
 msgid "_Yes"
 msgstr "æ?¯(_Y)"
 
-#: ../mail/message-list.c:1213
+#: ../mail/message-list.c:1215
 msgid "Unseen"
 msgstr "æ?ªç??"
 
-#: ../mail/message-list.c:1214
+#: ../mail/message-list.c:1216
 msgid "Seen"
 msgstr "å·²ç??"
 
-#: ../mail/message-list.c:1215
+#: ../mail/message-list.c:1217
 msgid "Answered"
 msgstr "å·²ç?å¤?"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1218
 msgid "Forwarded"
 msgstr "å·²è½¬å??"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1219
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å°?æ?ªç??ä¿¡æ?¯"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1220
 msgid "Multiple Messages"
 msgstr "å¤?å°?ä¿¡"
 
-#: ../mail/message-list.c:1222
+#: ../mail/message-list.c:1224
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1223
+#: ../mail/message-list.c:1225
 msgid "Lower"
 msgstr "è¾?ä½?"
 
-#: ../mail/message-list.c:1227
+#: ../mail/message-list.c:1229
 msgid "Higher"
 msgstr "è¾?é«?"
 
-#: ../mail/message-list.c:1228
+#: ../mail/message-list.c:1230
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1849 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1856 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ä»?å¤©%p%l:%M"
 
-#: ../mail/message-list.c:1853
+#: ../mail/message-list.c:1865
 msgid "Yesterday %l:%M %p"
 msgstr "æ?¨å¤©%p%l:%M"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1877
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1873
+#: ../mail/message-list.c:1885
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p%l:%M"
 
-#: ../mail/message-list.c:1875
+#: ../mail/message-list.c:1887
 msgid "%b %d %Y"
 msgstr "%Yå¹´%mæ??%dæ?¥"
 
-#: ../mail/message-list.c:2642
+#: ../mail/message-list.c:2671
 msgid "Select all visible messages"
 msgstr "é??ä¸æ??æ??å?¯è§?ç??ä¿¡æ?¯"
 
-#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2829 ../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:4468 ../mail/message-list.c:4892
+#: ../mail/message-list.c:4497 ../mail/message-list.c:4921
 msgid "Generating message list"
 msgstr "ç??æ??ä¿¡æ?¯å??è¡¨"
 
-#: ../mail/message-list.c:4707
+#: ../mail/message-list.c:4736
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "æ²¡æ??ä¿¡æ?¯æ»¡è¶³æ?¨ç??æ??ç´¢æ?¡ä»¶ã??ç?¨â??æ??ç´¢â??è??å??ç??â??æ¸?é?¤â??è??å??é¡¹æ¸?é?¤"
 
-#: ../mail/message-list.c:4709
+#: ../mail/message-list.c:4738
 msgid "There are no messages in this folder."
 msgstr "æ¤æ??ä»¶å¤¹ä¸æ²¡æ??ä¿¡æ?¯ã??"
 
@@ -12728,7 +12764,7 @@ msgid "Sent Messages"
 msgstr "å·²å??é??ä¿¡æ?¯"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:570
+#: ../widgets/misc/e-attachment-tree-view.c:566
 msgid "Size"
 msgstr "å¤§å°?"
 
@@ -12737,27 +12773,27 @@ msgid "Subject - Trimmed"
 msgstr "ä¸»é¢? - è¢«æ?ªæ?"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1508
 msgid "Body contains"
 msgstr "é?®ä»¶ä½?å?«æ??"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1515
 msgid "Message contains"
 msgstr "ä¿¡æ?¯å?«æ??"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1522
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶äººå?«æ??"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "Sender contains"
 msgstr "å??ä»¶äººå?«æ??"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "Subject contains"
 msgstr "ä¸»é¢?å?«æ??"
 
@@ -12765,7 +12801,7 @@ msgstr "ä¸»é¢?å?«æ??"
 msgid "Subject or Addresses contains"
 msgstr "ä¸»é¢?æ??å?°å??å??å?«"
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:205
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -12773,7 +12809,7 @@ msgstr ""
 "é??ä¸æ¤é??é¡¹æ??å?³ç?? Evolution å?ªå?¨æ?¨ç?? LDAP æ??å?¡å?¨æ?¯æ?? SSL æ?¶æ??è¿?æ?¥å?°æ?¨ç?? LDAP "
 "æ??å?¡å?¨ã??"
 
-#: ../modules/addressbook/addressbook-config.c:211
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -12781,7 +12817,7 @@ msgstr ""
 "é??ä¸æ¤é??é¡¹æ??å?³ç?? Evolution å?ªå?¨æ?¨ç?? LDAP æ??å?¡å?¨æ?¯æ?? TLS æ?¶æ??è¿?æ?¥å?°æ?¨ç?? LDAP "
 "æ??å?¡å?¨ã??"
 
-#: ../modules/addressbook/addressbook-config.c:213
+#: ../modules/addressbook/addressbook-config.c:209
 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 "
@@ -12790,15 +12826,15 @@ msgstr ""
 "é??æ?©æ¤é??é¡¹æ??å?³ç??æ?¨ç??æ??å?¡å?¨æ?¢ä¸?æ?¯æ?? SSL ä¹?ä¸?æ?¯æ?? TLSã??å?¯è?½å¯¼è?´ç??ç»?æ??å°?æ?¯æ?¨ç??è¿?"
 "æ?¥ä¸?å¤ªå®?å?¨ï¼?æ?¨ä¹?æ??äº?å??å?°å®?å?¨æ¼?æ´?ç??æ?»å?»ã??"
 
-#: ../modules/addressbook/addressbook-config.c:612
+#: ../modules/addressbook/addressbook-config.c:608
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "å?¨ç??æ?¥å??çºªå¿µæ?¥æ?¥å??ä¸ä½¿ç?¨(_U)"
 
-#: ../modules/addressbook/addressbook-config.c:648
+#: ../modules/addressbook/addressbook-config.c:644
 msgid "Copy _book content locally for offline operation"
 msgstr "å°?å?°å??ç°¿å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?ç¦»çº¿æ??ä½?(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:756
+#: ../modules/addressbook/addressbook-config.c:751
 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 "
@@ -12807,7 +12843,7 @@ msgstr ""
 "è¿?æ?¯ LDAP æ??å?¡å?¨ä¸?ç??ç«¯å?£ï¼?Evolution å°?è¯?å?¾è¿?æ?¥å?°æ?¨æ??ç»?å?ºç??æ ?å??ç«¯å?£å??è¡¨ã??å¦?æ??"
 "æ?¨ä¸?æ¸?æ¥?è¦?æ??å®?ç??ç«¯å?£ï¼?è¯·è¯¢é?®æ?¨ç??ç³»ç»?ç®¡ç??å??ã??"
 
-#: ../modules/addressbook/addressbook-config.c:830
+#: ../modules/addressbook/addressbook-config.c:825
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -12816,7 +12852,7 @@ msgstr ""
 "è¿?æ?¯ Evolution ç?¨æ?¥è®¤è¯?æ?¨ç??æ?¹æ³?ã??è¯·æ³¨æ??è?¥å?¨æ¤è®¾å®?ä¸ºâ??ç?µå?é?®ä»¶å?°å??â??å??é??è¦?æ?¨å?·æ??"
 "å¯¹ LDAP æ??å?¡å?¨ç??å?¿å??è®¿é?®æ??é??ã??"
 
-#: ../modules/addressbook/addressbook-config.c:905
+#: ../modules/addressbook/addressbook-config.c:900
 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 "
@@ -12827,29 +12863,29 @@ msgstr ""
 "æ??ç´¢å?ºç¡?ä¸?æ??å±?ç??å?¨é?¨é¡¹ã??æ??ç´¢è??å?´è?¥ä¸ºâ??ä¸?çº§â??ï¼?å??å?ªä¼?å??å?«æ?¨æ??å®?ç??æ??ç´¢å?ºç¡?ä¹?ä¸?ä¸?"
 "çº§ç??é¡¹ç?®ã??"
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1016
 msgid "Server Information"
 msgstr "æ??å?¡å?¨ä¿¡æ?¯"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:1021
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ç»?è??"
 
-#: ../modules/addressbook/addressbook-config.c:1027
+#: ../modules/addressbook/addressbook-config.c:1022
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ??ç´¢"
 
-#: ../modules/addressbook/addressbook-config.c:1029
+#: ../modules/addressbook/addressbook-config.c:1024
 msgid "Downloading"
 msgstr "ä¸?è½½"
 
-#: ../modules/addressbook/addressbook-config.c:1235
+#: ../modules/addressbook/addressbook-config.c:1230
 msgid "Address Book Properties"
 msgstr "å?°å??ç°¿å±?æ?§"
 
-#: ../modules/addressbook/addressbook-config.c:1237
+#: ../modules/addressbook/addressbook-config.c:1232
 msgid "New Address Book"
 msgstr "æ?°å?°å??ç°¿"
 
@@ -12939,7 +12975,7 @@ 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:1138
+#: ../modules/mail/em-mailer-prefs.c:1140
 msgid "_Table column:"
 msgstr "è¡¨å??(T)ï¼?"
 
@@ -12952,50 +12988,50 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "æ?»æ?¯æ?¾ç¤ºè?ªå?¨è¡¥å?¨ç??è??ç³»äººç??å?°å??(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-backend.c:94
 #: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP æ??å?¡å?¨ä¸?"
 
-#: ../modules/addressbook/e-book-shell-backend.c:280
+#: ../modules/addressbook/e-book-shell-backend.c:276
 msgctxt "New"
 msgid "_Contact"
 msgstr "è??ç³»äºº(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-backend.c:278
 #: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "å??å»ºä¸?ä¸ªæ?°è??ç³»äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-backend.c:283
 msgctxt "New"
 msgid "Contact _List"
 msgstr "è??ç³»äººå??è¡¨(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-backend.c:285
 #: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "å??å»ºä¸?ä¸ªæ?°ç??è??ç³»äººå??è¡¨"
 
-#: ../modules/addressbook/e-book-shell-backend.c:297
+#: ../modules/addressbook/e-book-shell-backend.c:293
 msgctxt "New"
 msgid "Address _Book"
 msgstr "å?°å??ç°¿(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-backend.c:295
 #: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "å??å»ºæ?°å?°å??ç°¿"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:312
 #: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:105
 #: ../modules/calendar/e-cal-shell-migrate.c:59
 msgid "Contacts"
 msgstr "è??ç³»äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:325
+#: ../modules/addressbook/e-book-shell-backend.c:321
 msgid "Certificates"
 msgstr "è¯?ä¹¦"
 
@@ -13042,10 +13078,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:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1155
 msgid "_Rename..."
 msgstr "é??å?½å??(_R)..."
 
@@ -13126,7 +13162,7 @@ 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:1500
+#: ../modules/calendar/e-cal-shell-view-actions.c:1502
 #: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "æ??ä½?(_A)"
@@ -13134,12 +13170,12 @@ msgstr "æ??ä½?(_A)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "_Preview"
 msgstr "é¢?è§?(_P)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 #: ../modules/calendar/e-memo-shell-view-actions.c:676
 #: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
@@ -13166,7 +13202,7 @@ msgstr "æ?¾ç¤ºè??ç³»äººé¢?è§?çª?å?£"
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "_Classic View"
 msgstr "å??ç±»è§?å?¾(_C)"
 
@@ -13177,7 +13213,7 @@ msgstr "å?¨è??ç³»äººå??è¡¨ä¸?æ?¹æ?¾ç¤ºè??ç³»äººé¢?è§?"
 #: ../modules/addressbook/e-book-shell-view-actions.c:886
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "_Vertical View"
 msgstr "ç«?ç?´è§?å?¾(_V)"
 
@@ -13186,25 +13222,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:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1662
 #: ../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:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1676
 #: ../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:1684
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1501
+#: ../shell/e-shell-content.c:633
 msgid "Advanced Search"
 msgstr "é«?çº§æ??ç´¢"
 
@@ -13471,7 +13507,7 @@ msgid "Template:"
 msgstr "æ¨¡æ?¿ï¼?"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
-#: ../widgets/misc/e-dateedit.c:606
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Time"
 msgstr "æ?¶é?´"
 
@@ -13489,7 +13525,7 @@ msgid "Wee_k starts on:"
 msgstr "ä¸?å?¨å¼?å§?äº?(_K)ï¼?"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1645
 msgid "Work Week"
 msgstr "å·¥ä½?æ?¥"
 
@@ -14113,104 +14149,104 @@ msgstr "å·¥ä½?æ?¥å¼?å§?å°?æ?¶"
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥å¼?å§?å??é??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../modules/calendar/e-cal-attachment-handler.c:267
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "å¯¼å?¥(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:343
+#: ../modules/calendar/e-cal-attachment-handler.c:348
 msgid "Select a Calendar"
 msgstr "é??æ?©ä¸?ä¸ªæ?¥å??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:370
+#: ../modules/calendar/e-cal-attachment-handler.c:375
 msgid "Select a Task List"
 msgstr "é??æ?©ä¸?ä¸ªä»»å?¡å??è¡¨"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:380
+#: ../modules/calendar/e-cal-attachment-handler.c:385
 msgid "I_mport to Calendar"
 msgstr "å¯¼å?¥å?°æ?¥å??(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:387
+#: ../modules/calendar/e-cal-attachment-handler.c:392
 msgid "I_mport to Tasks"
 msgstr "å¯¼å?¥å?°ä»»å?¡(_M)"
 
 #. Create the Webcal source group
-#: ../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-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-migrate.c:194
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:98
-#: ../modules/calendar/e-task-shell-migrate.c:158
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:160
 msgid "On The Web"
 msgstr "ç½?ä¸?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:113
-#: ../plugins/calendar-weather/calendar-weather.c:120
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../plugins/calendar-weather/calendar-weather.c:121
 msgid "Weather"
 msgstr "å¤©æ°?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-backend.c:196
 #: ../modules/calendar/e-cal-shell-migrate.c:62
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??çºªå¿µæ?¥"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-backend.c:421
 msgctxt "New"
 msgid "_Appointment"
 msgstr "çº¦ä¼?(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:427
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-backend.c:423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Create a new appointment"
 msgstr "å??å»ºæ?°çº¦ä¼?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:428
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "å?¨å¤©çº¦ä¼?(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:434
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgid "Create a new all-day appointment"
 msgstr "å??å»ºæ?°å?¨å¤©çº¦ä¼?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:435
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ä¼?è®®(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-backend.c:437
 msgid "Create a new meeting request"
 msgstr "å??å»ºä¸?æ?¡æ?°ä¼?è®®è¯·æ±?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-backend.c:445
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "æ?¥å??(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:451
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Create a new calendar"
 msgstr "å??å»ºæ?°æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../modules/calendar/e-cal-shell-backend.c:750
 #: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "æ?¥å??å??ä»»å?¡"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:213
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
 msgid "Loading calendars"
 msgstr "è½½å?¥æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:634
+#: ../modules/calendar/e-cal-shell-sidebar.c:636
 msgid "_New Calendar..."
 msgstr "æ?°å»ºæ?¥å??(_N)..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:651
+#: ../modules/calendar/e-cal-shell-sidebar.c:653
 msgid "Calendar Selector"
 msgstr "æ?¥å??é??æ?©å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:994
+#: ../modules/calendar/e-cal-shell-sidebar.c:995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "å?¨ %s æ??å¼?æ?¥å??"
@@ -14256,111 +14292,111 @@ msgstr "äº?ä»¶"
 msgid "Save as iCalendar"
 msgstr "ä¿?å?ä¸º iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1290
 #: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Copy..."
 msgstr "å¤?å?¶(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "D_elete Calendar"
 msgstr "å? é?¤æ?¥å??(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
 msgid "Delete the selected calendar"
 msgstr "å? é?¤é??ä¸ç??æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Go Back"
 msgstr "å??é??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Go Forward"
 msgstr "å??è¿?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Select today"
 msgstr "é??æ?©ä»?å¤©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Select _Date"
 msgstr "é??æ?©æ?¥æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Select a specific date"
 msgstr "é??æ?©ç?¹å®?æ?¥æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "_New Calendar"
 msgstr "æ?°å»ºæ?¥å??(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 #: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "Purg_e"
 msgstr "é??æ¯?(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "Purge old appointments and meetings"
 msgstr "é??æ¯?æ?§çº¦ä¼?å??ä¼?è®®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1353
 #: ../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:1353
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Refresh the selected calendar"
 msgstr "å?·æ?°é??ä¸ç??æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Rename the selected calendar"
 msgstr "é??å?½å??é??ä¸ç??æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Show _Only This Calendar"
 msgstr "å?ªæ?¾ç¤ºæ¤æ?¥å??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Cop_y to Calendar..."
 msgstr "å¤?å?¶å?°æ?¥å??(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1381
 msgid "_Delegate Meeting..."
 msgstr "ä»£ç??ä¼?è®®(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "_Delete Appointment"
 msgstr "å? é?¤çº¦ä¼?(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Delete selected appointments"
 msgstr "å? é?¤é??ä¸ç??çº¦ä¼?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete This _Occurrence"
 msgstr "å? é?¤æ¤æ¬¡å?ºç?°(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Delete this occurrence"
 msgstr "å? é?¤æ¤æ¬¡å??ç??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete All Occ_urrences"
 msgstr "å? é?¤æ??æ??å?ºç?°(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Delete all occurrences"
 msgstr "å? é?¤å?¨é?¨å??ç??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "New All Day _Event..."
 msgstr "æ?°å»ºå?¨å¤©äº?ä»¶(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Create a new all day event"
 msgstr "å??å»ºä¸?ä¸ªæ?°ç??å?¨å¤©äº?ä»¶"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 #: ../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
@@ -14368,128 +14404,128 @@ msgstr "å??å»ºä¸?ä¸ªæ?°ç??å?¨å¤©äº?ä»¶"
 msgid "_Forward as iCalendar..."
 msgstr "ä½?ä¸º iCalendar è½¬å??(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "New _Meeting..."
 msgstr "æ?°å»ºä¼?è®®(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "Create a new meeting"
 msgstr "å??å»ºä¸?ä¸ªæ?°ç??ä¼?è®®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1430
 msgid "Mo_ve to Calendar..."
 msgstr "ç§»è?³æ?¥å??(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "New _Appointment..."
 msgstr "æ?°å»ºçº¦ä¼?(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1444
 msgid "Make this Occurrence _Movable"
 msgstr "å°?æ¤æ¬¡å??ç??å??ä¸ºå?¯ç§»å?¨(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "_Open Appointment"
 msgstr "æ??å¼?çº¦ä¼?(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "View the current appointment"
 msgstr "æ?¥ç??å½?å??çº¦ä¼?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1458
 msgid "_Reply"
 msgstr "å??å¤?(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1472
 #: ../modules/calendar/e-cal-shell-view-memopad.c:278
 msgid "Save as iCalendar..."
 msgstr "ä¿?å?ä¸º iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "_Schedule Meeting..."
 msgstr "è°?åº¦ä¼?è®®(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "Converts an appointment to a meeting"
 msgstr "è½¬æ?¢çº¦ä¼?ä¸ºä¼?è®®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Conv_ert to Appointment..."
 msgstr "è½¬æ?¢å?°çº¦ä¼?(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1488
 msgid "Converts a meeting to an appointment"
 msgstr "è½¬æ?¢ä¼?è®®ä¸ºçº¦ä¼?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Quit"
 msgstr "é??å?º"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
 msgid "Day"
 msgstr "å¤©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Show one day"
 msgstr "æ?¾ç¤ºä¸?å¤©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1622
+#: ../modules/calendar/e-cal-shell-view-actions.c:1624
 msgid "List"
 msgstr "å??è¡¨"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
 msgid "Show as list"
 msgstr "æ?¾ç¤ºä¸ºå??è¡¨"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1631
 msgid "Month"
 msgstr "æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
 msgid "Show one month"
 msgstr "æ?¾ç¤ºä¸?ä¸ªæ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1636
+#: ../modules/calendar/e-cal-shell-view-actions.c:1638
 msgid "Week"
 msgstr "å?¨"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Show one week"
 msgstr "æ?¾ç¤ºä¸?å?¨"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Show one work week"
 msgstr "æ?¾ç¤ºä¸?ä¸ªå·¥ä½?å?¨"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1655
 msgid "Active Appointments"
 msgstr "æ´»å?¨çº¦ä¼?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1669
 msgid "Next 7 Days' Appointments"
 msgstr "ä¸?ä¸?å?¨ç??çº¦ä¼?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1698
+#: ../modules/calendar/e-cal-shell-view-actions.c:1700
 #: ../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:1705
+#: ../modules/calendar/e-cal-shell-view-actions.c:1707
 #: ../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:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
 msgid "Print this calendar"
 msgstr "æ??å?°æ¤æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
 msgid "Preview the calendar to be printed"
 msgstr "é¢?è§?å°?è¦?æ??å?°ç??æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-cal-shell-view-actions.c:1799
 msgid "Go To"
 msgstr "è½¬å?°"
 
@@ -14506,7 +14542,7 @@ msgid "New _Memo"
 msgstr "æ?°å»ºå¤?å¿?(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-backend.c:283
 #: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "å??å»ºæ?°å¤?å¿?"
@@ -14572,7 +14608,7 @@ msgid "New _Task"
 msgstr "æ?°å»ºä»»å?¡(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-backend.c:282
 #: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Create a new task"
 msgstr "å??å»ºæ?°ä»»å?¡"
@@ -14610,40 +14646,40 @@ msgstr "æ?¶é?´å??æ?¥æ??(_M)ï¼?"
 msgid "_Date only:"
 msgstr "ä»?æ?¥æ??(_D)ï¼?"
 
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:281
 msgctxt "New"
 msgid "Mem_o"
 msgstr "å¤?å¿?(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "å?±äº«ç??å¤?å¿?(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:290
 msgid "Create a new shared memo"
 msgstr "å??å»ºä¸?ä¸ªæ?°ç??å?±äº«å¤?å¿?"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "å¤?å¿?å??è¡¨(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-backend.c:300
 #: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Create a new memo list"
 msgstr "å??å»ºæ?°å¤?å¿?å??è¡¨"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
 msgid "Loading memos"
 msgstr "è½½å?¥å¤?å¿?"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:587
+#: ../modules/calendar/e-memo-shell-sidebar.c:578
 msgid "Memo List Selector"
 msgstr "å¤?å¿?å??è¡¨é??æ?©å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:892
+#: ../modules/calendar/e-memo-shell-sidebar.c:882
 #, c-format
 msgid "Opening memos at %s"
 msgstr "å?¨ %s æ??å¼?å¤?å¿?"
@@ -14733,40 +14769,40 @@ msgstr "å? é?¤å¤?å¿?"
 msgid "Delete Memo"
 msgstr "å? é?¤å¤?å¿?"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:280
 msgctxt "New"
 msgid "_Task"
 msgstr "ä»»å?¡(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "å??é??ç??ä»»å?¡(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:289
 msgid "Create a new assigned task"
 msgstr "å??å»ºæ?°å??é??ç??ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ä»»å?¡å??è¡¨(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-backend.c:299
 #: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
 msgstr "å??å»ºæ?°ä»»å?¡å??è¡¨"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:216
 msgid "Loading tasks"
 msgstr "è½½å?¥ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:587
+#: ../modules/calendar/e-task-shell-sidebar.c:578
 msgid "Task List Selector"
 msgstr "ä»»å?¡å??è¡¨é??æ?©å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:892
+#: ../modules/calendar/e-task-shell-sidebar.c:882
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "å?¨ %s æ??å¼?ä»»å?¡"
@@ -14898,491 +14934,491 @@ msgid "Delete Task"
 msgstr "å? é?¤ä»»å?¡"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:380
+#: ../modules/mail/e-mail-attachment-handler.c:382
 #, 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:94
+#: ../modules/mail/e-mail-junk-hook.c:90
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ? "
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:172
+#: ../modules/mail/e-mail-shell-backend.c:185
 msgid "Compose a new mail message"
 msgstr "æ?°å??ä¸?å°?æ?°ä¿¡"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:193
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?®ä»¶æ??ä»¶å¤¹(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:182
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Create a new mail folder"
 msgstr "å??å»ºæ?°é?®ä»¶æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-backend.c:481
+#: ../modules/mail/e-mail-shell-backend.c:494
 msgid "Mail Accounts"
 msgstr "é?®ä»¶å¸?å?·"
 
-#: ../modules/mail/e-mail-shell-backend.c:489
+#: ../modules/mail/e-mail-shell-backend.c:502
 msgid "Mail Preferences"
 msgstr "é?®ä»¶é¦?é??é¡¹"
 
-#: ../modules/mail/e-mail-shell-backend.c:497
+#: ../modules/mail/e-mail-shell-backend.c:510
 msgid "Composer Preferences"
 msgstr "ç¼?å??å?¨é¦?é??é¡¹"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:518
 msgid "Network Preferences"
 msgstr "ç½?ç»?é¦?é??é¡¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1047
-#: ../modules/mail/e-mail-shell-view.c:954
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view.c:953
 msgid "_Disable Account"
 msgstr "ç¦?ç?¨å¸?å?·(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1049
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 msgid "Disable this account"
 msgstr "ç¦?ç?¨è¿?ä¸ªå¸?å?·"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1056
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??ä»¶å¤¹ä¸ç??æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1061
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "C_reate Search Folder From Search..."
 msgstr "ä»?å¤´å??å»ºæ??ç´¢æ??ä»¶å¤¹(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1068
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "_Download Messages for Offline Usage"
 msgstr "ä¸?è½½ä¿¡æ?¯ä»¥ç¦»çº¿ä½¿ç?¨(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1070
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ä¸?è½½æ ?è®°ä¸ºç¦»çº¿ä½¿ç?¨ç??å¸?å?·å??æ??ä»¶å¤¹ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1075
+#: ../modules/mail/e-mail-shell-view-actions.c:1092
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç©ºå??ä»¶ç®±(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1082
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "_Copy Folder To..."
 msgstr "æ??ä»¶å¤¹å¤?å?¶å?°(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1084
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "Copy the selected folder into another folder"
 msgstr "æ??é??ä¸ç??æ??ä»¶å¤¹å¤?å?¶å?°å?¶å®?æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1108
 msgid "Permanently remove this folder"
 msgstr "æ°¸ä¹?å? é?¤æ¤æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1096
+#: ../modules/mail/e-mail-shell-view-actions.c:1113
 msgid "E_xpunge"
 msgstr "é??æ¯?(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1098
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ä»?è¯¥æ??ä»¶å¤¹æ°¸ä¹?å? é?¤æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1103
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
 msgid "Mar_k All Messages as Read"
 msgstr "æ??å?¨é?¨ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "Mark all messages in the folder as read"
 msgstr "å°?æ¤æ??ä»¶å¤¹ä¸ç??æ??æ??ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1110
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_Move Folder To..."
 msgstr "æ??ä»¶å¤¹ç§»è?³(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "Move the selected folder into another folder"
 msgstr "æ??é??ä¸ç??æ??ä»¶å¤¹ç§»è?³å?¶å®?æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1134
 msgid "_New..."
 msgstr "æ?°å»º(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Create a new folder for storing mail"
 msgstr "å??å»ºå?å?¨é?®ä»¶ç??æ?°æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "Change the properties of this folder"
 msgstr "æ?´æ?¹æ¤æ??ä»¶å¤¹ç??å±?æ?§"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Refresh the folder"
 msgstr "å?·æ?°æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1140
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Change the name of this folder"
 msgstr "æ?´æ?¹æ¤æ??ä»¶å¤¹ç??å??ç§°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "Select Message _Thread"
 msgstr "é??æ?©ä¿¡æ?¯çº¿ç´¢(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Select all messages in the same thread as the selected message"
 msgstr "æ??å??ä¸?çº¿ç´¢ä¸ç??æ??æ??ä¿¡æ?¯é??æ?©ä¸ºé??ä¸ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Select Message S_ubthread"
 msgstr "é??æ?©ä¿¡æ?¯å?çº¿ç´¢(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "Select all replies to the currently selected message"
 msgstr "é??æ?©å½?å??é??ä¸ä¿¡æ?¯ç??æ??æ??å??å¤?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "Empty _Trash"
 msgstr "æ¸?ç©ºåº?ä»¶ç®±(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æ°¸ä¹?å? é?¤æ??æ??å¸?å?·ä¸ç??æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "_New Label"
 msgstr "æ?°å»ºæ ?ç¾(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "N_one"
 msgstr "æ? (_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "_Manage Subscriptions"
 msgstr "ç®¡ç??è®¢é??(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "è®¢é??æ??é??è®¢è¿?ç¨?æ??å?¡å?¨ä¸?ç??æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1241
 msgid "Send / _Receive"
 msgstr "å??é??/æ?¥æ?¶(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Send queued items and retrieve new items"
 msgstr "å??é??é??å??ä¸ç??ç??é?®ä»¶å¹¶æ?¶å??æ?°é?®ä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "R_eceive All"
 msgstr "å?¨é?¨æ?¥æ?¶(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Receive new items from all accounts"
 msgstr "æ?¥æ?¶æ??æ??è´¦æ?·ä¸ç??æ?°æ?¡ç?®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "_Send All"
 msgstr "å?¨é?¨å??é??(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Send queued items in all accounts"
 msgstr "å??é??æ??æ??è´¦æ?·ç??é??å??ä¸ç??æ?¡ç?®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
-#: ../widgets/misc/e-activity-proxy.c:314
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Cancel the current mail operation"
 msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1269
 msgid "Collapse All _Threads"
 msgstr "æ??å? å?¨é?¨çº¿ç´¢(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Collapse all message threads"
 msgstr "æ??å? å?¨é?¨ä¿¡æ?¯çº¿ç´¢"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1276
 msgid "E_xpand All Threads"
 msgstr "å±?å¼?å?¨é?¨çº¿ç´¢(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Expand all message threads"
 msgstr "å±?å¼?å?¨é?¨ä¿¡æ?¯çº¿ç´¢"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1283
 msgid "_Message Filters"
 msgstr "ä¿¡æ?¯è¿?æ»¤(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Create or edit rules for filtering new mail"
 msgstr "å??å»ºæ??ç¼?è¾?è¿?æ»¤æ?°é?®ä»¶ç??è§?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
 msgid "Search F_olders"
 msgstr "æ??ç´¢æ??ä»¶å¤¹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Create or edit search folder definitions"
 msgstr "å??å»ºæ??ç¼?è¾?æ??ç´¢æ??ä»¶å¤¹å®?ä¹?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1297
 msgid "_Subscriptions..."
 msgstr "è®¢é??(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "F_older"
 msgstr "æ??ä»¶å¤¹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "_Label"
 msgstr "æ ?ç¾(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1353
 msgid "_New Folder..."
 msgstr "æ?°å»ºæ??ä»¶å¤¹(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1381
 msgid "Show Message _Preview"
 msgstr "æ?¾ç¤ºä¿¡æ?¯é¢?è§?(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1383
 msgid "Show message preview pane"
 msgstr "æ?¾ç¤ºä¿¡æ?¯é¢?è§?çª?å?£"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "Show _Deleted Messages"
 msgstr "æ?¾ç¤ºå? é?¤ç??ä¿¡æ?¯(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 msgid "Show deleted messages with a line through them"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯(å¸¦æ??å? é?¤çº¿)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1397
 msgid "_Group By Threads"
 msgstr "æ??çº¿ç´¢å??ç»?(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "Threaded message list"
 msgstr "æ??çº¿ç´¢æ??å??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1403
+#: ../modules/mail/e-mail-shell-view-actions.c:1420
 msgid "Show message preview below the message list"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1410
+#: ../modules/mail/e-mail-shell-view-actions.c:1427
 msgid "Show message preview alongside the message list"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨æ??æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "All Messages"
 msgstr "å?¨é?¨ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
 msgid "Important Messages"
 msgstr "é??è¦?ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-shell-view-actions.c:1449
 msgid "Last 5 Days' Messages"
 msgstr "å??äº?å¤©ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "Messages Not Junk"
 msgstr "ä¸?æ?¯å??å?¾ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
 msgid "Messages with Attachments"
 msgstr "æ??é??ä»¶ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1470
 msgid "No Label"
 msgstr "æ? æ ?ç¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1460
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "Read Messages"
 msgstr "å·²è¯»ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1467
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
 msgid "Recent Messages"
 msgstr "æ??è¿?ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "Unread Messages"
 msgstr "æ?ªè¯»ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Subject or Addresses contain"
 msgstr "ä¸»é¢?æ??å?°å??å?«æ??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1553
 msgid "All Accounts"
 msgstr "å?¨é?¨å¸?å?·"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1560
 msgid "Current Account"
 msgstr "å½?å??å¸?å?·"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "Current Folder"
 msgstr "å½?å??æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1030
+#: ../modules/mail/e-mail-shell-view-private.c:1049
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é??ä¸ %d ä¸ªï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d å°?å·²å? é?¤"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1073
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å°?è??ç¨¿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../modules/mail/e-mail-shell-view-private.c:1091
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "ï¼?%d å°?æ?ªè¯»ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1087
+#: ../modules/mail/e-mail-shell-view-private.c:1106
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "æ?»å?± %d å°?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1107
+#: ../modules/mail/e-mail-shell-view-private.c:1126
 msgid "Trash"
 msgstr "å??æ?¶ç«?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1466
+#: ../modules/mail/e-mail-shell-view-private.c:1600
 msgid "Send / Receive"
 msgstr "å??é??/æ?¥æ?¶"
 
-#: ../modules/mail/e-mail-shell-view.c:564
+#: ../modules/mail/e-mail-shell-view.c:563
 msgid "All Account Search"
 msgstr "å?¨é?¨å¸?å?·æ??ç´¢"
 
-#: ../modules/mail/e-mail-shell-view.c:747
+#: ../modules/mail/e-mail-shell-view.c:746
 msgid "Account Search"
 msgstr "å¸?å?·æ??ç´¢"
 
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../modules/mail/e-mail-shell-view.c:951
 msgid "Proxy _Logout"
 msgstr "ä»£ç??æ??å?¡å?¨æ³¨é??(_L)"
 
-#: ../modules/mail/em-account-prefs.c:219
+#: ../modules/mail/em-account-prefs.c:215
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸?å?·å?©æ??"
 
-#: ../modules/mail/em-account-prefs.c:268
+#: ../modules/mail/em-account-prefs.c:264
 msgid "Account Editor"
 msgstr "å¸?å?·ç¼?è¾?å?¨"
 
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../modules/mail/em-composer-prefs.c:502
+#: ../modules/plugin-manager/evolution-plugin-manager.c:356
 #: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../widgets/misc/e-account-tree-view.c:220
 msgid "Enabled"
 msgstr "å·²å?¯ç?¨"
 
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:506
 msgid "Language(s)"
 msgstr "è¯è¨?"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Every time"
 msgstr "æ¯?æ¬¡"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:90
 msgid "Once per day"
 msgstr "æ¯?å¤©ä¸?æ¬¡"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Once per week"
 msgstr "æ¯?å?¨ä¸?æ¬¡"
 
-#: ../modules/mail/em-mailer-prefs.c:95
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per month"
 msgstr "æ¯?æ??ä¸?æ¬¡"
 
-#: ../modules/mail/em-mailer-prefs.c:177
+#: ../modules/mail/em-mailer-prefs.c:174
 msgid "Add Custom Junk Header"
 msgstr "æ·»å? è?ªå®?ä¹?å??å?¾ä¿¡æ?¯å¤´"
 
-#: ../modules/mail/em-mailer-prefs.c:185
+#: ../modules/mail/em-mailer-prefs.c:182
 msgid "Header Name:"
 msgstr "ä¿¡å¤´å??ç§°ï¼?"
 
-#: ../modules/mail/em-mailer-prefs.c:186
+#: ../modules/mail/em-mailer-prefs.c:183
 msgid "Header Value Contains:"
 msgstr "ä¿¡å¤´å?¼å?«æ??ï¼?"
 
-#: ../modules/mail/em-mailer-prefs.c:286
+#: ../modules/mail/em-mailer-prefs.c:283
 msgid "Header"
 msgstr "é¡µç??"
 
-#: ../modules/mail/em-mailer-prefs.c:290
+#: ../modules/mail/em-mailer-prefs.c:287
 msgid "Contains Value"
 msgstr "å??å?«å?¼"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
+#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
 #, 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:701 ../modules/mail/em-mailer-prefs.c:773
+#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:775
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s æ??ä»¶ä¸?å?¯ç?¨ã??è¯·æ£?æ?¥è½¯ä»¶å??æ?¯å?¦å·²å®?è£?ã??"
 
-#: ../modules/mail/em-mailer-prefs.c:737
+#: ../modules/mail/em-mailer-prefs.c:739
 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:1140
+#: ../modules/mail/em-mailer-prefs.c:1142
 msgid "_Date header:"
 msgstr "æ?¥æ??å¤´ï¼?(_D)"
 
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "Show _original header value"
 msgstr "æ?¾ç¤ºå??å§?é?®ä»¶å¤´å?¼(_o)"
 
@@ -15395,7 +15431,7 @@ msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "æ¯?æ¬¡å?¯å?¨ Evolution ç??æ?¶å??ï¼?æ£?æ?¥å®?æ?¯å?¦æ?¯é»?è®¤é?®ä»¶ç¨?åº?ã??"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:143
 msgid "Do you want to make Evolution your default email client?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?å°? Evolution è®¾ç½®ä¸ºæ?¨ç??é»?è®¤ç?µå?é?®ä»¶å®¢æ?·ç«¯ï¼?"
 
@@ -15425,24 +15461,24 @@ msgstr "ä½?è??"
 msgid "Plugin Manager"
 msgstr "æ??ä»¶ç®¡ç??å?¨"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+#: ../modules/plugin-manager/evolution-plugin-manager.c:266
 msgid "Note: Some changes will not take effect until restart"
 msgstr "æ³¨æ??ï¼?æ??äº?æ?´æ?¹ç?´å?°é??æ?°å?¯å?¨å??æ??ç??æ??"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+#: ../modules/plugin-manager/evolution-plugin-manager.c:295
 msgid "Overview"
 msgstr "æ¦?è§?"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:365
-#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+#: ../modules/plugin-manager/evolution-plugin-manager.c:364
+#: ../modules/plugin-manager/evolution-plugin-manager.c:447
 msgid "Plugin"
 msgstr "æ??ä»¶"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:485
 msgid "_Plugins"
 msgstr "æ??ä»¶(_P)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "Enable and disable plugins"
 msgstr "å?¯ç?¨å??ç¦?ç?¨æ??ä»¶"
 
@@ -15462,39 +15498,39 @@ msgstr "Python æµ?è¯?æ??ä»¶"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python Eplugin å? è½½å?¨æµ?è¯?æ??ä»¶ã??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:276
-#: ../widgets/misc/e-import-assistant.c:399
+#: ../modules/startup-wizard/evolution-startup-wizard.c:277
+#: ../widgets/misc/e-import-assistant.c:392
 msgid "Please select the information that you would like to import:"
 msgstr "è¯·é??æ?©æ?¨å¸?æ??å¯¼å?¥ç??ä¿¡æ?¯ï¼?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:308
-#: ../widgets/misc/e-import-assistant.c:555
+#: ../modules/startup-wizard/evolution-startup-wizard.c:309
+#: ../widgets/misc/e-import-assistant.c:548
 #, c-format
 msgid "From %s:"
 msgstr "ä»? %sï¼?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:319
-#: ../modules/startup-wizard/evolution-startup-wizard.c:416
+#: ../modules/startup-wizard/evolution-startup-wizard.c:320
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Importing Files"
 msgstr "å¯¼å?¥æ??ä»¶"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:394
+#: ../modules/startup-wizard/evolution-startup-wizard.c:395
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "å¯¼å?¥è¢«å??æ¶?ã??ç?¹å?»â??å??è¿?â??ç»§ç»"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:412
+#: ../modules/startup-wizard/evolution-startup-wizard.c:413
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "å¯¼å?¥å·²å®?æ??ã??ç?¹å?»â??å??è¿?â??ç»§ç»"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+#: ../modules/startup-wizard/evolution-startup-wizard.c:487
 msgid "Evolution Setup Assistant"
 msgstr "Evolution è®¾ç½®å?©æ??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:488
+#: ../modules/startup-wizard/evolution-startup-wizard.c:493
 msgid "Welcome"
 msgstr "æ¬¢è¿?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:498
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15565,15 +15601,15 @@ msgid "Play audio attachments directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?®ä»¶ä¿¡æ?¯é??æ?æ?¾é?³é¢?é??ä»¶"
 
 #: ../plugins/backup-restore/backup-restore.c:183
-msgid "Select name of the Evolution back up file"
+msgid "Select name of the Evolution backup file"
 msgstr "é??æ?© Evolution å¤?ä»½æ??ä»¶å??ç§°"
 
 #: ../plugins/backup-restore/backup-restore.c:216
-msgid "_Restart Evolution after back up"
+msgid "_Restart Evolution after backup"
 msgstr "å¤?ä»½å??é??æ?°å?¯å?¨ Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:242
-msgid "Select name of the Evolution back up file to restore"
+msgid "Select name of the Evolution backup file to restore"
 msgstr "é??æ?©è¦?æ?¢å¤?ç?? Evolution å¤?ä»½æ??ä»¶å??ç§°"
 
 #: ../plugins/backup-restore/backup-restore.c:255
@@ -15582,7 +15618,7 @@ msgstr "æ?¢å¤?å??é??æ?°å?¯å?¨ Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:323
 msgid ""
-"You can restore Evolution from your back up. It can restore all the Mails, "
+"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."
 msgstr ""
@@ -15590,7 +15626,7 @@ msgstr ""
 "å®?è¿?è?½æ?¢å¤?æ?¨ç??æ??æ??ç??ä¸ªäººè®¾ç½®å??é?®ä»¶è¿?æ»¤å?¨ç?ã??"
 
 #: ../plugins/backup-restore/backup-restore.c:330
-msgid "_Restore Evolution from the back up file"
+msgid "_Restore Evolution from the backup file"
 msgstr "ä»?å¤?ä»½æ??ä»¶ä¸æ?¢å¤? Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:337
@@ -15602,7 +15638,7 @@ msgid "Choose a file to restore"
 msgstr "é??æ?©è¦?æ?¢å¤?ç??æ??ä»¶"
 
 #: ../plugins/backup-restore/backup-restore.c:348
-msgid "Restore from back up"
+msgid "Restore from backup"
 msgstr "ä»?å¤?ä»½ä¸æ?¢å¤?"
 
 #: ../plugins/backup-restore/backup-restore.c:386
@@ -15702,23 +15738,23 @@ msgstr "Evolution å¤?ä»½"
 msgid "Evolution Restore"
 msgstr "Evolution æ?¢å¤?"
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:743
 msgid "Backing up Evolution Data"
 msgstr "æ£å?¨å¤?ä»½ Evolution æ?°æ?®"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:744
 msgid "Please wait while Evolution is backing up your data."
 msgstr "è¯·ç¨?å??ï¼?Evolution æ£å?¨å¤?ä»½æ?¨ç??æ?°æ?®ã??"
 
-#: ../plugins/backup-restore/backup.c:749
+#: ../plugins/backup-restore/backup.c:746
 msgid "Restoring Evolution Data"
 msgstr "æ£å?¨æ?¢å¤? Evolution æ?°æ?®"
 
-#: ../plugins/backup-restore/backup.c:750
+#: ../plugins/backup-restore/backup.c:747
 msgid "Please wait while Evolution is restoring your data."
 msgstr "è¯·ç¨?å??ï¼?Evolution æ£å?¨æ?¢å¤?æ?¨ç??æ?°æ?®ã??"
 
-#: ../plugins/backup-restore/backup.c:768
+#: ../plugins/backup-restore/backup.c:765
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "è¿?å?¯è?½è¦?è?±ä¸?ç?¹æ?¶é?´ï¼?å??å?³äº?æ?¨å¸?å?·ä¸ç??æ?°æ?®æ?»é??ã??"
 
@@ -15884,15 +15920,15 @@ msgstr "Bogofilter é??é¡¹"
 msgid "Filter junk messages using Bogofilter."
 msgstr "ä½¿ç?¨ Bogofilter è¿?æ»¤å??å?¾ä¿¡æ?¯ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:205
+#: ../plugins/caldav/caldav-browse-server.c:204
 msgid "Authentication failed. Server requires correct login."
 msgstr "éª?è¯?é??è¯¯ã??æ??å?¡å?¨é??è¦?æ£ç¡®ç??ç?»å½?ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:207
+#: ../plugins/caldav/caldav-browse-server.c:206
 msgid "Given URL cannot be found."
 msgstr "æ? æ³?æ?¾å?°ç»?å®?ç?? URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:211
+#: ../plugins/caldav/caldav-browse-server.c:210
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -15901,88 +15937,88 @@ msgstr ""
 "æ??å?¡å?¨è¿?å??æ?ªé¢?æ??ç??æ?°æ?®ã??\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:341
-#: ../plugins/caldav/caldav-browse-server.c:665
+#: ../plugins/caldav/caldav-browse-server.c:340
+#: ../plugins/caldav/caldav-browse-server.c:664
 msgid "Failed to parse server response."
 msgstr "å¤?ç??æ??å?¡å?¨å??åº?å¤±è´¥"
 
-#: ../plugins/caldav/caldav-browse-server.c:435
+#: ../plugins/caldav/caldav-browse-server.c:434
 msgid "Events"
 msgstr "äº?ä»¶"
 
-#: ../plugins/caldav/caldav-browse-server.c:457
+#: ../plugins/caldav/caldav-browse-server.c:456
 msgid "User's calendars"
 msgstr "ç?¨æ?·ç??æ?¥å??"
 
-#: ../plugins/caldav/caldav-browse-server.c:566
-#: ../plugins/caldav/caldav-browse-server.c:734
+#: ../plugins/caldav/caldav-browse-server.c:565
+#: ../plugins/caldav/caldav-browse-server.c:733
 msgid "Failed to get server URL."
 msgstr "è?·å¾?æ??å?¡å?¨ URL å¤±è´¥ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:732
-#: ../plugins/caldav/caldav-browse-server.c:773
-#: ../plugins/caldav/caldav-browse-server.c:1432
+#: ../plugins/caldav/caldav-browse-server.c:731
+#: ../plugins/caldav/caldav-browse-server.c:772
+#: ../plugins/caldav/caldav-browse-server.c:1431
 msgid "Searching for user's calendars..."
 msgstr "æ??ç´¢ç?¨æ?·ç??æ?¥å??..."
 
-#: ../plugins/caldav/caldav-browse-server.c:771
+#: ../plugins/caldav/caldav-browse-server.c:770
 msgid "Could not find any user calendar."
 msgstr "æ? æ³?æ?¾å?°ç?¨æ?·ç??æ?¥å??ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:903
+#: ../plugins/caldav/caldav-browse-server.c:902
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "ä¸?æ¬¡å°?è¯?å¤±è´¥ï¼?%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:905
+#: ../plugins/caldav/caldav-browse-server.c:904
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "ä¸?æ¬¡å°?è¯?å¤±è´¥ç ?%d"
 
-#: ../plugins/caldav/caldav-browse-server.c:910
+#: ../plugins/caldav/caldav-browse-server.c:909
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "è¾?å?¥æ??å?¡å?¨ %2$s ä¸?ç?¨æ?· %1$s ç??å¯?ç ?"
 
-#: ../plugins/caldav/caldav-browse-server.c:969
+#: ../plugins/caldav/caldav-browse-server.c:968
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "æ? æ³?ä¸º URL â??%sâ??å??å»º soup æ¶?æ?¯"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1215
+#: ../plugins/caldav/caldav-browse-server.c:1214
 msgid "Searching folder content..."
 msgstr "æ??ç´¢æ??ä»¶å¤¹å??å®¹..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1264
-#: ../plugins/caldav/caldav-source.c:255
+#: ../plugins/caldav/caldav-browse-server.c:1263
+#: ../plugins/caldav/caldav-source.c:256
 msgid "Server _handles meeting invitations"
 msgstr "æ??å?¡å?¨å¤?ç??ä¼?è®®é??è¯·(_H)"
 
-#: ../plugins/caldav/caldav-browse-server.c:1271
+#: ../plugins/caldav/caldav-browse-server.c:1270
 msgid "List of available calendars:"
 msgstr "å?¯ç?¨æ?¥å??å??è¡¨ï¼?"
 
-#: ../plugins/caldav/caldav-browse-server.c:1309
+#: ../plugins/caldav/caldav-browse-server.c:1308
 msgid "Supports"
 msgstr "æ?¯æ??"
 
-#: ../plugins/caldav/caldav-browse-server.c:1336
+#: ../plugins/caldav/caldav-browse-server.c:1335
 #: ../plugins/caldav/caldav-source.c:254
 msgid "User e-_mail:"
 msgstr "ç?¨æ?·ç?µå?é?®ç®±(_M)ï¼?"
 
-#: ../plugins/caldav/caldav-browse-server.c:1408
+#: ../plugins/caldav/caldav-browse-server.c:1407
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "å??å»ºæ?¬å?°é?®ä»¶çº¿ç´¢å¤±è´¥ï¼?%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1517
+#: ../plugins/caldav/caldav-browse-server.c:1516
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "æ??å?¡å?¨ URL %s ä¸?æ?¯æ??æ??ç?? URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1523
+#: ../plugins/caldav/caldav-browse-server.c:1522
 msgid "Browse for a CalDAV calendar"
 msgstr "æµ?è§?ä»¥æ?¥æ?¾ CalDAV æ?¥å??"
 
@@ -15992,26 +16028,26 @@ msgid "_URL:"
 msgstr "_URLï¼?"
 
 #: ../plugins/caldav/caldav-source.c:242
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../plugins/google-account-setup/google-contacts-source.c:349
 msgid "Use _SSL"
 msgstr "ä½¿ç?¨ _SSL"
 
 #: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-contacts-source.c:327
 #: ../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:257
+#: ../plugins/caldav/caldav-source.c:259
 msgid "Brows_e server for a calendar"
 msgstr "æµ?è§?æ??å?¡å?¨ä»¥æ?¥æ?¾æ?¥å??(_E)"
 
-#: ../plugins/caldav/caldav-source.c:275
-#: ../plugins/calendar-file/calendar-file.c:194
+#: ../plugins/caldav/caldav-source.c:277
+#: ../plugins/calendar-file/calendar-file.c:191
 #: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:398
-#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../plugins/calendar-weather/calendar-weather.c:399
+#: ../plugins/google-account-setup/google-contacts-source.c:367
 #: ../plugins/google-account-setup/google-source.c:645
 msgid "Re_fresh:"
 msgstr "å?·æ?°(_F)ï¼?"
@@ -16024,31 +16060,31 @@ msgstr "ä¸º Evolution æ·»å?  CalDAV æ?¯æ??ã??"
 msgid "CalDAV Support"
 msgstr "CalDAV æ?¯æ??"
 
-#: ../plugins/calendar-file/calendar-file.c:128
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "è?ªå®?ä¹?(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:147
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "æ??ä»¶å??(_N)ï¼?"
 
-#: ../plugins/calendar-file/calendar-file.c:151
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "é??æ?©æ?¥å??æ??ä»¶"
 
-#: ../plugins/calendar-file/calendar-file.c:199
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "æ??å¼?æ?¶"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "å?¨æ??ä»¶æ?¹å??æ?¶"
 
-#: ../plugins/calendar-file/calendar-file.c:201
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "å®?æ??"
 
-#: ../plugins/calendar-file/calendar-file.c:216
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "å¼ºå?¶å?ªè¯»(_O)"
 
@@ -16076,62 +16112,62 @@ msgstr "æ·»å? ç½?ç»?æ?¥å??å?° Evolutionã??"
 msgid "Web Calendars"
 msgstr "ç½?ç»?æ?¥å??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "å¤©æ°?ï¼?é?¾"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "å¤©æ°?ï¼?å¤?äº?"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°?ï¼? å¤?é?´å¤?äº?"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "å¤©æ°?ï¼? é?´"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "å¤©æ°?ï¼? é?µé?¨"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "å¤©æ°?ï¼?é?ª"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "å¤©æ°?ï¼?æ?´"
 
-#: ../plugins/calendar-weather/calendar-weather.c:70
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "å¤©æ°?ï¼? å¤?é?´æ?´"
 
-#: ../plugins/calendar-weather/calendar-weather.c:71
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°?ï¼?æ?´é£?é?¨"
 
-#: ../plugins/calendar-weather/calendar-weather.c:225
+#: ../plugins/calendar-weather/calendar-weather.c:226
 msgid "Select a location"
 msgstr "é??æ?©ä¸?ä¸ªä½?ç½®"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:331
-#: ../plugins/calendar-weather/calendar-weather.c:376
+#: ../plugins/calendar-weather/calendar-weather.c:332
+#: ../plugins/calendar-weather/calendar-weather.c:377
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "æ? "
 
-#: ../plugins/calendar-weather/calendar-weather.c:451
+#: ../plugins/calendar-weather/calendar-weather.c:452
 msgid "_Units:"
 msgstr "å??ä½?(_U)ï¼?"
 
-#: ../plugins/calendar-weather/calendar-weather.c:460
+#: ../plugins/calendar-weather/calendar-weather.c:461
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç?ç?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:463
+#: ../plugins/calendar-weather/calendar-weather.c:464
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(å??æ°?ã??è?±å¯¸ç?ç?)"
 
@@ -16160,11 +16196,7 @@ msgstr "å¦?æ??å?¯ä»¥ï¼?æ·»å? ä¸?ä¸ªå?°å?¾æ?¥æ?¾ç¤ºè??ç³»äººç??ä½?ç½®ã??"
 msgid "Map for contacts"
 msgstr "è??ç³»äººå?°å?¾"
 
-#: ../plugins/dbx-import/dbx-importer.c:233
-msgid "Select folder to import OE folder into"
-msgstr "é??æ?©è¦?å°? Outlook Express æ??ä»¶å¤¹å¯¼å?¥å?°å?ªä¸ªæ??ä»¶å¤¹"
-
-#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/dbx-import/dbx-importer.c:258
 msgid "Importing Outlook Express data"
 msgstr "å¯¼å?¥ Outlook Express æ?°æ?®"
 
@@ -16221,52 +16253,52 @@ msgstr ""
 "æ¤é?®å?¼æ??å®?äº?æ?¨å?¯ä»¥å??å??é??é?®ä»¶ä¸æ·»å? ç??è?ªå®?ä¹?å¤´ç??å??è¡¨ã??æ??å®?å¤´å??å¤´å?¼ç??æ ¼å¼?ä¸ºï¼?è?ª"
 "å®?ä¹?å¤´ç??å??ç§°ï¼?æ?¥ä¸?æ?¥æ?¯â??=â??å??å®?ç??å?¼ï¼?å¤´ä¸?å¤´ä¹?é?´ä»¥â??;â??å??å?²"
 
-#: ../plugins/email-custom-header/email-custom-header.c:319
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "å®?å?¨ï¼?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:320
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "ä¸ªäºº"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "æ?ªå??ç±»"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "å??ä¿?æ?¤ç??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:326
+#: ../plugins/email-custom-header/email-custom-header.c:323
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "æ?ºå¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:324
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "æ?ºå¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:328
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "ç»?å¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:385
+#: ../plugins/email-custom-header/email-custom-header.c:382
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "æ? "
 
-#: ../plugins/email-custom-header/email-custom-header.c:577
+#: ../plugins/email-custom-header/email-custom-header.c:574
 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:836
+#: ../plugins/email-custom-header/email-custom-header.c:833
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16274,11 +16306,11 @@ msgstr ""
 "æ??å®?å¤´å??å¤´å?¼ç??æ ¼å¼?ä¸ºï¼?\n"
 "è?ªå®?ä¹?å¤´ç??å??ç§°ï¼?å?¼ï¼?å¤´ä¸?å¤´ä¹?é?´ä»¥â??;â??å??å?²ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/email-custom-header/email-custom-header.c:887
 msgid "Key"
 msgstr "é?®"
 
-#: ../plugins/email-custom-header/email-custom-header.c:906
+#: ../plugins/email-custom-header/email-custom-header.c:903
 #: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "å?¼"
@@ -16301,7 +16333,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:128
+#: ../plugins/external-editor/external-editor.c:125
 msgid "Automatically launch when a new mail is edited"
 msgstr "å?¨ç¼?è¾?æ?°é?®ä»¶æ?¶è?ªå?¨å?¯å?¨"
 
@@ -16313,11 +16345,11 @@ msgstr "é»?è®¤å¤?é?¨ç¼?è¾?å?¨"
 msgid "The default command that must be used as the editor."
 msgstr "é»?è®¤å?½ä»¤å¿?é¡»ç?¨ä½?ç¼?è¾?å?¨ã??"
 
-#: ../plugins/external-editor/external-editor.c:117
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "è°?ç?¨ç¼?è¾?å?¨è¦?æ?§è¡?ç??å?½ä»¤ï¼?"
 
-#: ../plugins/external-editor/external-editor.c:118
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16325,8 +16357,8 @@ msgstr ""
 "Emacs åº?ä½¿ç?¨â??xemacsâ??\n"
 "VI åº?ä½¿ç?¨â??gvim -fâ??"
 
-#: ../plugins/external-editor/external-editor.c:384
-#: ../plugins/external-editor/external-editor.c:386
+#: ../plugins/external-editor/external-editor.c:381
+#: ../plugins/external-editor/external-editor.c:383
 msgid "Compose in External Editor"
 msgstr "å?¨å¤?é?¨ç¼?è¾?å?¨ä¸å??ä½?"
 
@@ -16381,22 +16413,22 @@ msgstr ""
 "ä¼?ç??æ??ã??"
 
 #: ../plugins/face/face.c:286
-msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
-msgstr "é??æ?©ä¸?ä¸ªå°?äº? 720 å?è??ç?? 48*48 ç?? PNG å?¾å??"
+msgid "Select a Face Picture"
+msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
 
 #: ../plugins/face/face.c:296
 msgid "Image files"
 msgstr "å?¾å??æ??ä»¶"
 
-#: ../plugins/face/face.c:355
+#: ../plugins/face/face.c:352
 msgid "_Insert Face picture by default"
 msgstr "æ??é»?è®¤æ?¹å¼?æ??å?¥å¤´å??å?¾ç??(_I)"
 
-#: ../plugins/face/face.c:366
+#: ../plugins/face/face.c:363
 msgid "Load new _Face picture"
 msgstr "å? è½½æ?°å¤´å??å?¾ç??(_F)"
 
-#: ../plugins/face/face.c:422
+#: ../plugins/face/face.c:420
 msgid "Include _Face"
 msgstr "å??å?«å¤´å??(_F)"
 
@@ -16428,7 +16460,7 @@ 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:314
+#: ../plugins/google-account-setup/google-contacts-source.c:315
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
 msgid "Server"
 msgstr "æ??å?¡å?¨"
@@ -16469,10 +16501,20 @@ msgstr "æ·»å? è°·æ?æ?¥å??å?°Evolutionã??"
 msgid "Google Calendars"
 msgstr "Google æ?¥å??"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:453
 msgid "Checklist"
 msgstr "å¾?å??æ¸?å??"
 
+#. Translators: First %s is the server name, second %s is user name
+#: ../plugins/groupwise-features/camel-gw-listener.c:513
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "è¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
+
+#: ../plugins/groupwise-features/camel-gw-listener.c:533
+msgid "Failed to authenticate.\n"
+msgstr "è®¤è¯?å¤±è´¥ã??\n"
+
 #: ../plugins/groupwise-features/gw-ui.c:112
 msgid "New _Shared Folder..."
 msgstr "æ?°å»ºå?±äº«æ??ä»¶å¤¹(_S)..."
@@ -16778,7 +16820,7 @@ msgid "Proxy"
 msgstr "ä»£ç??æ??å?¡å?¨"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:243
+#: ../widgets/misc/e-account-tree-view.c:239
 msgid "Account Name"
 msgstr "å¸?å?·å??"
 
@@ -16811,7 +16853,7 @@ msgid "Proxy"
 msgstr "ä»£ç??æ??å?¡å?¨"
 
 #: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:692
+#: ../plugins/groupwise-features/share-folder.c:694
 msgid "Add User"
 msgstr "æ·»å? ç?¨æ?·"
 
@@ -16820,7 +16862,7 @@ msgid "Advanced send options"
 msgstr "é«?çº§å??é??é??é¡¹"
 
 #: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:727
+#: ../plugins/groupwise-features/share-folder.c:729
 msgid "Users"
 msgstr "ç?¨æ?·"
 
@@ -16832,15 +16874,15 @@ msgstr "è¾?å?¥ç?¨æ?·å??è®¾å®?æ??é??"
 msgid "Sharing"
 msgstr "å?±äº«"
 
-#: ../plugins/groupwise-features/share-folder.c:530
+#: ../plugins/groupwise-features/share-folder.c:532
 msgid "Custom Notification"
 msgstr "è?ªå®?ä¹?é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:732
+#: ../plugins/groupwise-features/share-folder.c:734
 msgid "Add   "
 msgstr "æ·»å? "
 
-#: ../plugins/groupwise-features/share-folder.c:738
+#: ../plugins/groupwise-features/share-folder.c:740
 msgid "Modify"
 msgstr "ä¿®æ?¹"
 
@@ -18112,15 +18154,15 @@ msgid ""
 "current folder as well as all subfolders?"
 msgstr "æ?¨æ?¯æ?³è¦?å?ªæ ?è®°å½?å??æ??ä»¶å¤¹ä¸ç??ä¿¡æ?¯ï¼?è¿?æ?¯ä¹?å??æ?¬å?æ??ä»¶å¤¹ä¸ç??ä¿¡æ?¯ï¼?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:196
+#: ../plugins/mark-all-read/mark-all-read.c:193
 msgid "In Current Folder and _Subfolders"
 msgstr "å?¨å½?å??æ??ä»¶å¤¹å??å?æ??ä»¶å¤¹(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:210
+#: ../plugins/mark-all-read/mark-all-read.c:207
 msgid "In Current _Folder Only"
 msgstr "å?ªå?¨å½?å??æ??ä»¶å¤¹(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:447
+#: ../plugins/mark-all-read/mark-all-read.c:444
 msgid "Mark Me_ssages as Read"
 msgstr "æ??ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»(_S)"
 
@@ -18201,35 +18243,35 @@ msgstr "Outlook PST å¯¼å?¥"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ä¸ªäººæ??ä»¶å¤¹(.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "_Mail"
 msgstr "é?®ä»¶(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:323
+#: ../plugins/pst-import/pst-importer.c:325
 msgid "Destination folder:"
 msgstr "ç?®ç??æ??ä»¶å¤¹ï¼?"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:329
+#: ../plugins/pst-import/pst-importer.c:331
 msgid "_Address Book"
 msgstr "å?°å??ç°¿(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:338
 msgid "A_ppointments"
 msgstr "çº¦ä¼?(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:344 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "ä»»å?¡(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:348
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "_Journal entries"
 msgstr "æ?¥è®°é¡¹(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:363
+#: ../plugins/pst-import/pst-importer.c:365
 msgid "Importing Outlook data"
 msgstr "å¯¼å?¥ Outlook æ?°æ?®"
 
@@ -18388,11 +18430,11 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ä¸?è?½å??å¸?æ?¥å??ï¼?æ?¥å??å??ç«¯å·²ç»?ä¸?å?å?¨äº?"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:475
 msgid "New Location"
 msgstr "æ?°å»ºä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:477
 msgid "Edit Location"
 msgstr "ç¼?è¾?ä½?ç½®"
 
@@ -18432,11 +18474,11 @@ msgstr "SpamAssassin ç??ç®¡é??å?ºé??ï¼?é??è¯¯ç ?ï¼?%d"
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin ä¸?å?¯ç?¨ï¼?è¯·å??å®?è£?å®?ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "è¿?å°?è®©å??å?¾å??æ??æ?´å?¯é? ï¼?ä½?ç¨?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
 msgid "I_nclude remote tests"
 msgstr "å??å?«è¿?ç¨?æµ?è¯?(_N)"
 
@@ -18587,15 +18629,15 @@ msgstr "ç?¨äº?æ¨¡æ?¿æ??ä»¶ä»¥æ?¿æ?¢é?®ä»¶å??å®¹ç??é?®/å?¼å¯¹å??è¡¨ã??"
 msgid "Drafts based template plugin"
 msgstr "å?ºäº?è??ç¨¿ç??æ¨¡æ?¿å??æ??ä»¶"
 
-#: ../plugins/templates/templates.c:631
+#: ../plugins/templates/templates.c:635
 msgid "No Title"
 msgstr "æ? æ ?é¢?"
 
-#: ../plugins/templates/templates.c:741
+#: ../plugins/templates/templates.c:746
 msgid "Save as _Template"
 msgstr "å?¦å?ä¸ºæ¨¡æ?¿(_T)"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:748
 msgid "Save as Template"
 msgstr "å?¦å?ä¸ºæ¨¡æ?¿"
 
@@ -18615,26 +18657,26 @@ msgstr "åµ?å?¥ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "å?¨é?®ä»¶ä¿¡æ?¯é??ç?´æ?¥æ?¥ç?? vCardsã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:195
-#: ../plugins/vcard-inline/vcard-inline.c:280
+#: ../plugins/vcard-inline/vcard-inline.c:198
+#: ../plugins/vcard-inline/vcard-inline.c:283
 msgid "Show Full vCard"
 msgstr "æ?¾ç¤ºå®?æ?´ vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:198
+#: ../plugins/vcard-inline/vcard-inline.c:201
 msgid "Show Compact vCard"
 msgstr "æ?¾ç¤ºç´§å?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:259
+#: ../plugins/vcard-inline/vcard-inline.c:262
 msgid "There is one other contact."
 msgstr "æ??å?¦å¤? 1 ä¸ªè??ç³»äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:268
+#: ../plugins/vcard-inline/vcard-inline.c:271
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "æ??å?¦å¤? %d ä¸ªè??ç³»äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:289
+#: ../plugins/vcard-inline/vcard-inline.c:292
 msgid "Save in Address Book"
 msgstr "ä¿?å?è?³å?°å??ç°¿"
 
@@ -18961,11 +19003,11 @@ msgstr "çª?å?£æ??é?®æ ·å¼?"
 msgid "Window buttons are visible"
 msgstr "çª?å?£æ??é?®å?¯è§?"
 
-#: ../shell/e-shell-content.c:674 ../shell/e-shell-content.c:675
+#: ../shell/e-shell-content.c:694 ../shell/e-shell-content.c:695
 msgid "Searches"
 msgstr "æ??ç´¢"
 
-#: ../shell/e-shell-content.c:717
+#: ../shell/e-shell-content.c:737
 msgid "Save Search"
 msgstr "ä¿?å?æ??ç´¢"
 
@@ -18973,19 +19015,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:941
+#: ../shell/e-shell-searchbar.c:934
 msgid "Sho_w:"
 msgstr "æ?¾ç¤º(_W)ï¼?"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:974
+#: ../shell/e-shell-searchbar.c:967
 msgid "Sear_ch:"
 msgstr "æ??ç´¢(_C)ï¼?"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1037
+#: ../shell/e-shell-searchbar.c:1030
 msgid "i_n"
 msgstr "å?¨(_N) "
 
@@ -19001,7 +19043,7 @@ msgstr "iCalendar (.ics)"
 msgid "All Files (*)"
 msgstr "å?¨é?¨æ??ä»¶(*)"
 
-#: ../shell/e-shell-view.c:297
+#: ../shell/e-shell-view.c:291
 msgid "Saving user interface state"
 msgstr "ä¿?å?ç?¨æ?·ç??é?¢ç?¶æ??"
 
@@ -19023,266 +19065,262 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution ç½?ç«?"
 
-#: ../shell/e-shell-window-actions.c:1216
+#: ../shell/e-shell-window-actions.c:1215
 msgid "Bug Buddy is not installed."
 msgstr "æ?ªå®?è£? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1217
 msgid "Bug Buddy could not be run."
 msgstr "æ? æ³?è¿?è¡? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1399
+#: ../shell/e-shell-window-actions.c:1398
 msgid "Show information about Evolution"
 msgstr "æ?¾ç¤ºå?³äº? Evolution ç??ä¿¡æ?¯"
 
-#: ../shell/e-shell-window-actions.c:1404
-#: ../shell/e-shell-window-actions.c:1418
+#: ../shell/e-shell-window-actions.c:1403
+#: ../shell/e-shell-window-actions.c:1417
 msgid "_Close Window"
 msgstr "å?³é?çª?å?£(_C)"
 
-#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1424
 msgid "_Contents"
 msgstr "ç?®å½?(_C)"
 
-#: ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1426
 msgid "Open the Evolution User Guide"
 msgstr "æ??å¼? Evolution ç?¨æ?·æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1452
 msgid "Evolution _FAQ"
 msgstr "Evolution å¸¸è§?é?®é¢?(_FAQ)"
 
-#: ../shell/e-shell-window-actions.c:1455
+#: ../shell/e-shell-window-actions.c:1454
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "æ??å¼? FAQ ç½?é¡µ"
 
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1459
 msgid "_Forget Passwords"
 msgstr "ä¸¢å¼?å¯?ç ?(_F)"
 
-#: ../shell/e-shell-window-actions.c:1462
+#: ../shell/e-shell-window-actions.c:1461
 msgid "Forget all remembered passwords"
 msgstr "ä¸¢å¼?æ??æ??è®°ä½?ç??å¯?ç ?"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1466
 msgid "I_mport..."
 msgstr "å¯¼å?¥(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1469
+#: ../shell/e-shell-window-actions.c:1468
 msgid "Import data from other programs"
 msgstr "ä»?å?¶å®?ç¨?åº?å¯¼å?¥æ?°æ?®"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1473
 msgid "New _Window"
 msgstr "æ?°å»ºçª?å?£(_W)"
 
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Create a new window displaying this view"
 msgstr "å??å»ºä¸?ä¸ªæ?°çª?å?£æ?¥æ?¾ç¤ºè¿?ä¸ªè§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1490
-msgid "Configure Evolution"
-msgstr "é??ç½® Evolution"
-
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1494
 msgid "_Quick Reference"
 msgstr "å¿«é??é¦?é??é¡¹(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1497
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Show Evolution's shortcut keys"
 msgstr "æ?¾ç¤º Evolution ç??å¿«æ?·é?®"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1503
 msgid "Exit the program"
 msgstr "é??å?ºç¨?åº?"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1508
 msgid "_Advanced Search..."
 msgstr "é«?çº§æ??ç´¢(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1511
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Construct a more advanced search"
 msgstr "æ??é? ä¸?ä¸ªæ?´é«?çº§ç??æ??ç´¢"
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Clear the current search parameters"
 msgstr "æ¸?æ¥?å½?å??æ??ç´¢å??æ?°"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1522
 msgid "_Edit Saved Searches..."
 msgstr "ç¼?è¾?ä¿?å?ç??æ??ç´¢(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Manage your saved searches"
 msgstr "ç®¡ç??æ?¨ä¿?å?ç??æ??ç´¢"
 
-#: ../shell/e-shell-window-actions.c:1532
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Click here to change the search type"
 msgstr "å??å?»æ¤å¤?æ?´æ?¹æ??ç´¢ç±»å??"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1536
 msgid "_Find Now"
 msgstr "ç«?å?³æ?¥æ?¾(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Execute the current search parameters"
 msgstr "æ?§è¡?å½?å??æ??ç´¢å??æ?°"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Save Search..."
 msgstr "ä¿?å?æ??ç´¢(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Save the current search parameters"
 msgstr "ä¿?å?å½?å??æ??ç´¢å??æ?°"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1557
 msgid "Submit _Bug Report..."
 msgstr "æ??äº¤é??è¯¯æ?¥å??(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ç?¨ Bug Buddy æ??äº¤é??è¯¯æ?¥å??"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Work Offline"
 msgstr "ç¦»çº¿å·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Put Evolution into offline mode"
 msgstr "å°? Evolution è½¬å?¥ç¦»çº¿æ¨¡å¼?"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1571
 msgid "_Work Online"
 msgstr "å?¨çº¿å·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-actions.c:1574
+#: ../shell/e-shell-window-actions.c:1573
 msgid "Put Evolution into online mode"
 msgstr "å°? Evolution è½¬å?¥å?¨çº¿æ¨¡å¼?"
 
-#: ../shell/e-shell-window-actions.c:1602
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Lay_out"
 msgstr "å¸?å±?(_O)"
 
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1608
 msgid "_New"
 msgstr "æ?°å»º(_N)"
 
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1615
 msgid "_Search"
 msgstr "æ??ç´¢(_S)"
 
-#: ../shell/e-shell-window-actions.c:1623
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Switcher Appearance"
 msgstr "å??æ?¢å?¨å¤?è§?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_Window"
 msgstr "çª?å?£(_W)"
 
-#: ../shell/e-shell-window-actions.c:1666
+#: ../shell/e-shell-window-actions.c:1665
 msgid "Show Side _Bar"
 msgstr "æ?¾ç¤ºä¾§è¾¹æ ?(_B)"
 
-#: ../shell/e-shell-window-actions.c:1668
+#: ../shell/e-shell-window-actions.c:1667
 msgid "Show the side bar"
 msgstr "æ?¾ç¤ºä¾§è¾¹æ ?"
 
-#: ../shell/e-shell-window-actions.c:1674
+#: ../shell/e-shell-window-actions.c:1673
 msgid "Show _Buttons"
 msgstr "æ?¾ç¤ºæ??é?®(_B)"
 
-#: ../shell/e-shell-window-actions.c:1676
+#: ../shell/e-shell-window-actions.c:1675
 msgid "Show the switcher buttons"
 msgstr "æ?¾ç¤ºå??æ?¢å?¨æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1682
+#: ../shell/e-shell-window-actions.c:1681
 msgid "Show _Status Bar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1683
 msgid "Show the status bar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?"
 
-#: ../shell/e-shell-window-actions.c:1690
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show _Tool Bar"
 msgstr "æ?¾ç¤ºå·¥å?·æ ?(_T)"
 
-#: ../shell/e-shell-window-actions.c:1692
+#: ../shell/e-shell-window-actions.c:1691
 msgid "Show the tool bar"
 msgstr "æ?¾ç¤ºå·¥å?·æ ?"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1713
 msgid "_Icons Only"
 msgstr "å?ªæ??å?¾æ ?(_I)"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1715
 msgid "Display window buttons with icons only"
 msgstr "æ?¾ç¤ºå?ªæ??å?¾æ ?ç??çª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1720
 msgid "_Text Only"
 msgstr "å?ªæ??æ??å?(_T)"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1722
 msgid "Display window buttons with text only"
 msgstr "æ?¾ç¤ºå?ªæ??æ??å?ç??çª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1727
 msgid "Icons _and Text"
 msgstr "å?¾æ ?å??æ??å?(_A)"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1729
 msgid "Display window buttons with icons and text"
 msgstr "æ?¾ç¤ºå¸¦å?¾æ ?å??æ??å?ç??çª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Tool_bar Style"
 msgstr "å·¥å?·æ ?æ ·å¼?(_B)"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ä½¿ç?¨æ¡?é?¢å·¥å?·æ ?è®¾ç½®æ?¾ç¤ºçª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1745
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Define Views..."
 msgstr "å®?ä¹?è§?å?¾..."
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1746
 msgid "Create or edit views"
 msgstr "å??å»ºæ??ç¼?è¾?è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Save Custom View..."
 msgstr "ä¿?å?å½?å??è§?å?¾..."
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1753
 msgid "Save current custom view"
 msgstr "ä¿?å?å½?å??è?ªå®?ä¹?è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1760
 msgid "C_urrent View"
 msgstr "å½?å??è§?å?¾(_U)"
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Custom View"
 msgstr "å½?å??è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Current view is a customized view"
 msgstr "å½?å??è§?å?¾ä¸ºè?ªå®?ä¹?è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1783
+#: ../shell/e-shell-window-actions.c:1782
 msgid "Change the page settings for your current printer"
 msgstr "æ?´æ?¹å½?å??æ??å?°æ?ºç??é¡µé?¢è®¾ç½®"
 
-#: ../shell/e-shell-window-actions.c:2168
+#: ../shell/e-shell-window-actions.c:2167
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ?¢å?° %s"
 
-#: ../shell/e-shell-window-actions.c:2381
+#: ../shell/e-shell-window-actions.c:2382
 msgid "Execute these search parameters"
 msgstr "æ?§è¡?è¿?äº?æ??ç´¢å??æ?°"
 
@@ -19296,20 +19334,20 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "æ?°å»º"
 
-#: ../shell/e-shell.c:261
+#: ../shell/e-shell.c:257
 msgid "Preparing to go offline..."
 msgstr "æ£å?¨å??å¤?ç¦»çº¿..."
 
-#: ../shell/e-shell.c:314
+#: ../shell/e-shell.c:310
 msgid "Preparing to go online..."
 msgstr "æ£å?¨å??å¤?ä¸?çº¿..."
 
-#: ../shell/e-shell.c:376
+#: ../shell/e-shell.c:372
 msgid "Preparing to quit..."
 msgstr "æ£å?¨å??å¤?é??å?º..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:191
+#: ../shell/main.c:188
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19341,7 +19379,7 @@ msgstr ""
 "\n"
 "æ??ä»¬å¸?æ??æ?¨å°½æ??äº«å??æ??ä»¬å?ªå??å·¥ä½?ç??æ??æ??ï¼?æ??ä»¬ä¹?ç?å??ç?¼æ??ç??æ?¨ç??æ??è§?ï¼?\n"
 
-#: ../shell/main.c:215
+#: ../shell/main.c:212
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19349,12 +19387,13 @@ msgstr ""
 "æ??è°¢\n"
 "Evolution å?¢é??\n"
 
-#: ../shell/main.c:222
+#: ../shell/main.c:219
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é??ç?¥æ??"
 
-#. Translators: Do NOT translate the five component names, they MUST remain in English!
-#: ../shell/main.c:367
+#. Translators: Do NOT translate the five component
+#. * names, they MUST remain in English!
+#: ../shell/main.c:365
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19474,21 +19513,21 @@ msgstr ""
 "\n"
 "å¦?æ??æ?¨é??æ?©ç»§ç»ï¼?æ?¨å?¯è?½æ? æ³?è®¿é?®æ?¨ç??æ??äº?æ?§æ?°æ?®ã??\n"
 
-#: ../shell/test/e-test-shell-backend.c:60
+#: ../shell/test/e-test-shell-backend.c:56
 msgctxt "New"
 msgid "_Test Item"
 msgstr "æµ?è¯?æ?¡ç?®(_T)"
 
-#: ../shell/test/e-test-shell-backend.c:62
+#: ../shell/test/e-test-shell-backend.c:58
 msgid "Create a new test item"
 msgstr "å??å»ºæ?°æµ?è¯?é¡¹"
 
-#: ../shell/test/e-test-shell-backend.c:70
+#: ../shell/test/e-test-shell-backend.c:66
 msgctxt "New"
 msgid "Test _Source"
 msgstr "æµ?è¯?æ?¥æº?(_S)"
 
-#: ../shell/test/e-test-shell-backend.c:72
+#: ../shell/test/e-test-shell-backend.c:68
 msgid "Create a new test source"
 msgstr "å??å»ºä¸?ä¸ªæ?°ç??æµ?è¯?æ?¥æº?"
 
@@ -19527,31 +19566,31 @@ msgstr "ä¸?è?½ä¼ é??æ??æ¡£ç??URIs(ç»?ä¸?èµ?æº?å®?ä½?ç¬¦)å?°ä¸?ä¸ª'ç±»å??=é?¾æ?¥'
 msgid "Not a launchable item"
 msgstr "ä¸?æ?¯ä¸?ä¸ªå?¯å? è½½ç??æ?¡ç?®"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:223
 msgid "Disable connection to session manager"
 msgstr "ç¦?æ¢è¿?æ?¥å?°ä¼?è¯?ç®¡ç??å?¨"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:226
 msgid "Specify file containing saved configuration"
 msgstr "æ??å®?å??å?«äº?ä¿?å?ç??é??ç½®ç??æ??ä»¶ã??"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:226
 msgid "FILE"
 msgstr "æ??ä»¶"
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:229
 msgid "Specify session management ID"
 msgstr "ç?¹æ®?ç??ä¼?è¯?ç®¡ç??ID"
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:229
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:254
+#: ../smclient/eggsmclient.c:250
 msgid "Session management options:"
 msgstr "ä¼?è¯?ç®¡ç??é??é¡¹ï¼?"
 
-#: ../smclient/eggsmclient.c:255
+#: ../smclient/eggsmclient.c:251
 msgid "Show session management options"
 msgstr "æ?¾ç¤ºä¼?è¯?ç®¡ç??é??é¡¹"
 
@@ -20165,11 +20204,11 @@ msgstr "å®?ä¹?è§?å?¾"
 msgid "Define Views for \"%s\""
 msgstr "å®?ä¹?â??%sâ??ç??è§?å?¾"
 
-#: ../widgets/menus/gal-view-factory-etable.c:113
+#: ../widgets/menus/gal-view-factory-etable.c:109
 msgid "Table"
 msgstr "è¡¨æ ¼"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
 msgid "Save Current View"
 msgstr "ä¿?å?å½?å??è§?å?¾"
 
@@ -20197,36 +20236,36 @@ msgstr "è§?å?¾ç±»å??"
 msgid "Type of view:"
 msgstr "è§?å?¾ç±»å??ï¼?"
 
-#: ../widgets/misc/e-account-manager.c:355
+#: ../widgets/misc/e-account-manager.c:348
 msgid "De_fault"
 msgstr "é»?è®¤(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:274
+#: ../widgets/misc/e-account-tree-view.c:270
 msgid "Protocol"
 msgstr "å??è®®"
 
-#: ../widgets/misc/e-attachment-dialog.c:307
+#: ../widgets/misc/e-attachment-dialog.c:303
 msgid "Attachment Properties"
 msgstr "é??ä»¶å±?æ?§"
 
-#: ../widgets/misc/e-attachment-dialog.c:332
+#: ../widgets/misc/e-attachment-dialog.c:325
 msgid "_Filename:"
 msgstr "æ??ä»¶å??(_F)ï¼?"
 
-#: ../widgets/misc/e-attachment-dialog.c:367
+#: ../widgets/misc/e-attachment-dialog.c:360
 msgid "MIME Type:"
 msgstr "MIME  ç±»å??ï¼?"
 
-#: ../widgets/misc/e-attachment-dialog.c:375
-#: ../widgets/misc/e-attachment-store.c:533
+#: ../widgets/misc/e-attachment-dialog.c:368
+#: ../widgets/misc/e-attachment-store.c:529
 msgid "_Suggest automatic display of attachment"
 msgstr "å»ºè®®è?ªå?¨æ?¾ç¤ºé??ä»¶(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:100
+#: ../widgets/misc/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "ä¸?è?½è®¾ç½®ä¸ºè??æ?¯"
 
-#: ../widgets/misc/e-attachment-handler-image.c:152
+#: ../widgets/misc/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "è®¾ä¸ºè??æ?¯(_B)"
 
@@ -20243,74 +20282,74 @@ msgstr "å??é??å?°(_S)..."
 msgid "Send the selected attachments somewhere"
 msgstr "å??é??æ??ä¸ªé??ä¸ç??é??ä»¶"
 
-#: ../widgets/misc/e-attachment-icon-view.c:506
-#: ../widgets/misc/e-attachment-tree-view.c:545
+#: ../widgets/misc/e-attachment-icon-view.c:158
+#: ../widgets/misc/e-attachment-tree-view.c:541
 msgid "Loading"
 msgstr "è½½å?¥"
 
-#: ../widgets/misc/e-attachment-icon-view.c:518
-#: ../widgets/misc/e-attachment-tree-view.c:557
+#: ../widgets/misc/e-attachment-icon-view.c:170
+#: ../widgets/misc/e-attachment-tree-view.c:553
 msgid "Saving"
 msgstr "ä¿?å?"
 
-#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:93
 msgid "Hide Attachment _Bar"
 msgstr "é??è??é??ä»¶æ ?(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:102
-#: ../widgets/misc/e-attachment-paned.c:640
+#: ../widgets/misc/e-attachment-paned.c:95
+#: ../widgets/misc/e-attachment-paned.c:633
 msgid "Show Attachment _Bar"
 msgstr "æ?¾ç¤ºé??ä»¶æ ?(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:521
+#: ../widgets/misc/e-attachment-store.c:517
 msgid "Add Attachment"
 msgstr "æ·»å? é??ä»¶"
 
-#: ../widgets/misc/e-attachment-store.c:524
+#: ../widgets/misc/e-attachment-store.c:520
 msgid "A_ttach"
 msgstr "é??ä»¶(_T)"
 
-#: ../widgets/misc/e-attachment-store.c:587
+#: ../widgets/misc/e-attachment-store.c:583
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "ä¿?å?é??ä»¶"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:616
-#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
+#: ../widgets/misc/e-attachment-store.c:612
+#: ../widgets/misc/e-attachment.c:1805 ../widgets/misc/e-attachment.c:2347
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:352
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "S_ave All"
 msgstr "å?¨é?¨ä¿?å?(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:378
+#: ../widgets/misc/e-attachment-view.c:375
 msgid "A_dd Attachment..."
 msgstr "æ·»å? é??ä»¶(_D)..."
 
-#: ../widgets/misc/e-attachment-view.c:402
+#: ../widgets/misc/e-attachment-view.c:399
 msgid "_Hide"
 msgstr "é??è??(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:409
+#: ../widgets/misc/e-attachment-view.c:406
 msgid "Hid_e All"
 msgstr "å?¨é?¨é??è??(_E)"
 
-#: ../widgets/misc/e-attachment-view.c:416
+#: ../widgets/misc/e-attachment-view.c:413
 msgid "_View Inline"
 msgstr "åµ?å?¥æ?¥ç??(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:423
+#: ../widgets/misc/e-attachment-view.c:420
 msgid "Vie_w All Inline"
 msgstr "åµ?å?¥æ?¥ç??(_W)"
 
-#: ../widgets/misc/e-attachment-view.c:740
+#: ../widgets/misc/e-attachment-view.c:738
 #, c-format
 msgid "Open with \"%s\""
 msgstr "ä½¿ç?¨â??%sâ??æ??å¼?"
 
-#: ../widgets/misc/e-attachment-view.c:743
+#: ../widgets/misc/e-attachment-view.c:741
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s ä¸æ??å¼?é??ä»¶"
@@ -20319,160 +20358,160 @@ msgstr "å?¨ %s ä¸æ??å¼?é??ä»¶"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:997
+#: ../widgets/misc/e-attachment.c:993
 msgid "Attached message"
 msgstr "é??å? ç??ä¿¡æ?¯"
 
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
+#: ../widgets/misc/e-attachment.c:1848 ../widgets/misc/e-attachment.c:2649
 msgid "A load operation is already in progress"
 msgstr "ä¸?ä¸ªå·²ç»?å? è½½ç??æ??ä½?æ£å?¨è¿?è¡?"
 
-#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
+#: ../widgets/misc/e-attachment.c:1856 ../widgets/misc/e-attachment.c:2657
 msgid "A save operation is already in progress"
 msgstr "ä¸ªå·²ç»?ä¿?å?ç??æ??ä½?æ£å?¨è¿?è¡?"
 
-#: ../widgets/misc/e-attachment.c:1929
+#: ../widgets/misc/e-attachment.c:1948
 #, c-format
 msgid "Could not load '%s'"
 msgstr "ä¸?è?½å? è½½â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:1932
+#: ../widgets/misc/e-attachment.c:1951
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ä¸?è?½å? è½½é??ä»¶"
 
-#: ../widgets/misc/e-attachment.c:2208
+#: ../widgets/misc/e-attachment.c:2227
 #, c-format
 msgid "Could not open '%s'"
 msgstr "ä¸?è?½æ??å¼?â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:2211
+#: ../widgets/misc/e-attachment.c:2230
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ä¸?è?½æ??å¼?é??ä»¶"
 
-#: ../widgets/misc/e-attachment.c:2646
+#: ../widgets/misc/e-attachment.c:2665
 msgid "Attachment contents not loaded"
 msgstr "é??ä»¶å??å®¹æ?ªè½½å?¥"
 
-#: ../widgets/misc/e-attachment.c:2722
+#: ../widgets/misc/e-attachment.c:2741
 #, c-format
 msgid "Could not save '%s'"
 msgstr "ä¸?è?½ä¿?å?â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:2725
+#: ../widgets/misc/e-attachment.c:2744
 #, c-format
 msgid "Could not save the attachment"
 msgstr "æ? æ³?ä¿?å?é??ä»¶"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:362
+#: ../widgets/misc/e-buffer-tagger.c:359
 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:1259
+#: ../widgets/misc/e-calendar-item.c:1229
 msgid "%B %Y"
 msgstr "%Yå¹´%B"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:225
 msgid "Month Calendar"
 msgstr "æ??å??"
 
-#: ../widgets/misc/e-charset-combo-box.c:96
+#: ../widgets/misc/e-charset-combo-box.c:92
 msgid "Character Encoding"
 msgstr "å?ç¬¦ç¼?ç ?"
 
-#: ../widgets/misc/e-charset-combo-box.c:122
+#: ../widgets/misc/e-charset-combo-box.c:115
 msgid "Enter the character set to use"
 msgstr "è¾?å?¥è¦?ä½¿ç?¨ç??å?ç¬¦é??"
 
-#: ../widgets/misc/e-charset-combo-box.c:341
+#: ../widgets/misc/e-charset-combo-box.c:334
 msgid "Other..."
 msgstr "å?¶å®?..."
 
-#: ../widgets/misc/e-dateedit.c:507
+#: ../widgets/misc/e-dateedit.c:500
 msgid "Date and Time"
 msgstr "æ?¥æ??å??æ?¶é?´"
 
-#: ../widgets/misc/e-dateedit.c:528
+#: ../widgets/misc/e-dateedit.c:521
 msgid "Text entry to input date"
 msgstr "è¾?å?¥æ?¥æ??ç??æ??æ?¬æ¡?"
 
-#: ../widgets/misc/e-dateedit.c:550
+#: ../widgets/misc/e-dateedit.c:543
 msgid "Click this button to show a calendar"
 msgstr "å??å?»æ¤æ??é?®å?¯æ?¾ç¤ºæ?¥å??"
 
-#: ../widgets/misc/e-dateedit.c:605
+#: ../widgets/misc/e-dateedit.c:590
 msgid "Drop-down combination box to select time"
 msgstr "é??æ?©æ?¶é?´ç??ç»?å??æ¡?"
 
-#: ../widgets/misc/e-dateedit.c:677
+#: ../widgets/misc/e-dateedit.c:662
 msgid "No_w"
 msgstr "ç?°å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:683
+#: ../widgets/misc/e-dateedit.c:668
 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:691
+#: ../widgets/misc/e-dateedit.c:676
 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:1698 ../widgets/misc/e-dateedit.c:1930
+#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
 msgctxt "date"
 msgid "None"
 msgstr "æ? "
 
-#: ../widgets/misc/e-dateedit.c:1825
+#: ../widgets/misc/e-dateedit.c:1812
 msgid "Invalid Date Value"
 msgstr "æ? æ??ç??æ?¥æ??å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1869
+#: ../widgets/misc/e-dateedit.c:1856
 msgid "Invalid Time Value"
 msgstr "æ? æ??ç??æ?¶é?´å?¼"
 
-#: ../widgets/misc/e-import-assistant.c:252
+#: ../widgets/misc/e-import-assistant.c:245
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "é??æ?©æ?¨å¸?æ??å¯¼å?¥å?° Evolution ç??æ??ä»¶ï¼?å¹¶ä»?å??è¡¨ä¸é??æ?©æ??ä»¶ç??ç±»å??ã??"
 
-#: ../widgets/misc/e-import-assistant.c:269
+#: ../widgets/misc/e-import-assistant.c:262
 msgid "F_ilename:"
 msgstr "æ??ä»¶å??(_I)ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:272
 msgid "Select a file"
 msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
 
-#: ../widgets/misc/e-import-assistant.c:293
-#: ../widgets/misc/e-import-assistant.c:468
+#: ../widgets/misc/e-import-assistant.c:286
+#: ../widgets/misc/e-import-assistant.c:461
 msgid "File _type:"
 msgstr "æ??ä»¶ç±»å??(_T)ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:336
-#: ../widgets/misc/e-import-assistant.c:912
+#: ../widgets/misc/e-import-assistant.c:329
+#: ../widgets/misc/e-import-assistant.c:905
 msgid "Choose the destination for this import"
 msgstr "é??æ?©æ¤å¯¼å?¥ç??ç?®ç??ä½?ç½®"
 
-#: ../widgets/misc/e-import-assistant.c:361
+#: ../widgets/misc/e-import-assistant.c:354
 msgid "Choose the type of importer to run:"
 msgstr "é??æ?©è¦?è¿?è¡?ç??å¯¼å?¥å?¨ç±»å??ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:369
+#: ../widgets/misc/e-import-assistant.c:362
 msgid "Import data and settings from _older programs"
 msgstr "ä»?æ?§ç??ç¨?åº?ä¸å¯¼å?¥æ?°æ?®å??è®¾ç½®(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:377
+#: ../widgets/misc/e-import-assistant.c:370
 msgid "Import a _single file"
 msgstr "å¯¼å?¥å??ä¸ªæ??ä»¶(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:529
+#: ../widgets/misc/e-import-assistant.c:522
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20482,37 +20521,37 @@ msgstr ""
 "ç?°å?¯å¯¼å?¥ç??è®¾ç½®ã??å¦?æ??æ?¨æ?³è¦?å??è¯?ä¸?æ¬¡ï¼?è¯·å??å?»â??ä¸?ä¸?æ¥â??æ??é?®ã??"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:769
+#: ../widgets/misc/e-import-assistant.c:762
 msgid "_Cancel Import"
 msgstr "å??æ¶?å¯¼å?¥(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:911
+#: ../widgets/misc/e-import-assistant.c:904
 msgid "Preview data to be imported"
 msgstr "é¢?è§?è¦?å¯¼å?¥ç??ä¿¡æ?¯"
 
-#: ../widgets/misc/e-import-assistant.c:917
-#: ../widgets/misc/e-import-assistant.c:930
-#: ../widgets/misc/e-import-assistant.c:1280
-#: ../widgets/misc/e-import-assistant.c:1346
-#: ../widgets/misc/e-import-assistant.c:1355
+#: ../widgets/misc/e-import-assistant.c:910
+#: ../widgets/misc/e-import-assistant.c:923
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1336
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Import Data"
 msgstr "å¯¼å?¥æ?°æ?®"
 
-#: ../widgets/misc/e-import-assistant.c:925
+#: ../widgets/misc/e-import-assistant.c:918
 msgid "Select what type of file you want to import from the list."
 msgstr "é??æ?©æ?¨æ?³ä»?å??è¡¨å¯¼å?¥ç??ç±»å??"
 
-#: ../widgets/misc/e-import-assistant.c:1270
-#: ../widgets/misc/e-import-assistant.c:1304
+#: ../widgets/misc/e-import-assistant.c:1260
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid "Evolution Import Assistant"
 msgstr "Evolution å¯¼å?¥å?©æ??"
 
-#: ../widgets/misc/e-import-assistant.c:1287
-#: ../widgets/misc/e-import-assistant.c:1334
+#: ../widgets/misc/e-import-assistant.c:1277
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Import Location"
 msgstr "å¯¼å?¥ä½?ç½®"
 
-#: ../widgets/misc/e-import-assistant.c:1298
+#: ../widgets/misc/e-import-assistant.c:1288
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20521,27 +20560,27 @@ msgstr ""
 "æ¬¢è¿?ä½¿ç?¨ Evolution å¯¼å?¥å?©æ??ã??\n"
 "æ?¬å?©æ??å°?å?¨ç¨?æ??å¯¼æ?¨å°?å¤?é?¨æ??ä»¶å¯¼å?¥ Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1312
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid "Importer Type"
 msgstr "å¯¼å?¥å?¨ç±»å??"
 
-#: ../widgets/misc/e-import-assistant.c:1320
+#: ../widgets/misc/e-import-assistant.c:1310
 msgid "Select Information to Import"
 msgstr "é??æ?©è¦?å¯¼å?¥ç??ä¿¡æ?¯"
 
-#: ../widgets/misc/e-import-assistant.c:1327
+#: ../widgets/misc/e-import-assistant.c:1317
 msgid "Select a File"
 msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
 
-#: ../widgets/misc/e-import-assistant.c:1341
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "å??å?»â??åº?ç?¨â??ä»¥ä¾¿å¼?å§?å°?æ??ä»¶å¯¼å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-map.c:752
+#: ../widgets/misc/e-map.c:866
 msgid "World Map"
 msgstr "ä¸?ç??å?°å?¾"
 
-#: ../widgets/misc/e-map.c:754
+#: ../widgets/misc/e-map.c:869
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20549,68 +20588,68 @@ msgstr ""
 "å?ºäº?é¼ æ ?äº¤äº?ç??å?°å?¾é?¨ä»¶ï¼?å?¯ç?¨æ?¥é??æ?©æ?¶å?ºã??é?®ç??ç?¨æ?·å?¯ä»¥ä»?ä¸?æ?¹ç??ç»?å??æ¡?ä¸é??æ?©æ?¶"
 "å?ºã??"
 
-#: ../widgets/misc/e-online-button.c:27
+#: ../widgets/misc/e-online-button.c:23
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution ç?®å??å?¨çº¿ã??å??å?»è¯¥æ??é?®å?¯ç¦»çº¿å·¥ä½?ã??"
 
-#: ../widgets/misc/e-online-button.c:30
+#: ../widgets/misc/e-online-button.c:26
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution ç?®å??ç¦»çº¿ã??å??å?»è¯¥æ??é?®å?¯å?¨çº¿å·¥ä½?ã??"
 
-#: ../widgets/misc/e-online-button.c:33
+#: ../widgets/misc/e-online-button.c:29
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "å? ä¸ºç½?ç»?ä¸?å?¯ç?¨ï¼?æ??ä»¥ Evolution ç?®å??ç¦»çº¿ã??"
 
-#: ../widgets/misc/e-preferences-window.c:281
+#: ../widgets/misc/e-preferences-window.c:274
 msgid "Evolution Preferences"
 msgstr "Evolution é¦?é??é¡¹"
 
-#: ../widgets/misc/e-search-bar.c:82
+#: ../widgets/misc/e-search-bar.c:75
 #, c-format
 msgid "Matches: %d"
 msgstr "å?¹é??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:563
+#: ../widgets/misc/e-search-bar.c:556
 msgid "Close the find bar"
 msgstr "å?³é?æ?¥æ?¾æ ?"
 
-#: ../widgets/misc/e-search-bar.c:571
+#: ../widgets/misc/e-search-bar.c:564
 msgid "Fin_d:"
 msgstr "æ?¥æ?¾(_D)ï¼?"
 
-#: ../widgets/misc/e-search-bar.c:583
+#: ../widgets/misc/e-search-bar.c:576
 msgid "Clear the search"
 msgstr "æ¸?é?¤æ??ç´¢"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:600
 msgid "_Previous"
 msgstr "ä¸?ä¸?é¡¹(_P)"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:606
 msgid "Find the previous occurrence of the phrase"
 msgstr "å¯»æ?¾è¯¥è¯?å?¥å?ºç?°ç??å??ä¸?ä¸ªä½?ç½®"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../widgets/misc/e-search-bar.c:619
 msgid "_Next"
 msgstr "ä¸?ä¸?é¡¹(_N)"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:625
 msgid "Find the next occurrence of the phrase"
 msgstr "å¯»æ?¾è¯¥è¯?å?¥å?ºç?°ç??ä¸?ä¸?ä¸ªä½?ç½®"
 
-#: ../widgets/misc/e-search-bar.c:645
+#: ../widgets/misc/e-search-bar.c:638
 msgid "Mat_ch case"
 msgstr "å¤§å°?å??å?¹é??(_C)"
 
-#: ../widgets/misc/e-search-bar.c:673
+#: ../widgets/misc/e-search-bar.c:666
 msgid "Reached bottom of page, continued from top"
 msgstr "å?°è¾¾é¡µé?¢åº?é?¨ï¼?ç§»å?°é¡¶é?¨ç»§ç»"
 
-#: ../widgets/misc/e-search-bar.c:695
+#: ../widgets/misc/e-search-bar.c:688
 msgid "Reached top of page, continued from bottom"
 msgstr "å?°è¾¾é¡µé?¢é¡¶é?¨ï¼?ç§»å?°åº?é?¨ç»§ç»"
 
-#: ../widgets/misc/e-send-options.c:516
+#: ../widgets/misc/e-send-options.c:543
 msgid "When de_leted:"
 msgstr "å? é?¤æ?¶(_L)ï¼?"
 
@@ -20745,38 +20784,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "æ? "
 
-#: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:563
-#: ../widgets/misc/e-signature-manager.c:355
-#: ../widgets/misc/e-signature-script-dialog.c:219
+#: ../widgets/misc/e-signature-editor.c:134
+#: ../widgets/misc/e-signature-editor.c:559
+#: ../widgets/misc/e-signature-manager.c:348
+#: ../widgets/misc/e-signature-script-dialog.c:215
 msgid "Unnamed"
 msgstr "æ?ªå?½å??"
 
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../widgets/misc/e-signature-editor.c:210
 msgid "_Save and Close"
 msgstr "ä¿?å?å¹¶å?³é?(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:430
+#: ../widgets/misc/e-signature-editor.c:426
 msgid "Edit Signature"
 msgstr "ç¼?è¾?ç¾å??"
 
-#: ../widgets/misc/e-signature-editor.c:445
+#: ../widgets/misc/e-signature-editor.c:441
 msgid "_Signature Name:"
 msgstr "ç¾å??(_S)ï¼?"
 
-#: ../widgets/misc/e-signature-manager.c:300
+#: ../widgets/misc/e-signature-manager.c:293
 msgid "Add Signature Script"
 msgstr "æ·»å? ç¾å??è??æ?¬"
 
-#: ../widgets/misc/e-signature-manager.c:365
+#: ../widgets/misc/e-signature-manager.c:358
 msgid "Edit Signature Script"
 msgstr "ç¼?è¾?ç¾å??è??æ?¬"
 
-#: ../widgets/misc/e-signature-manager.c:583
+#: ../widgets/misc/e-signature-manager.c:576
 msgid "Add _Script"
 msgstr "æ·»å? è??æ?¬(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:269
+#: ../widgets/misc/e-signature-script-dialog.c:262
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20785,11 +20824,11 @@ msgstr ""
 "æ¤è??æ?¬ç??è¾?å?ºå°?ç?¨äº?æ?¨ç??ç¾å??ã??æ?¨æ??å®?ç??å??ç§°å°?å?ªä¼?\n"
 "ç?¨äº?æ?¾ç¤ºã??"
 
-#: ../widgets/misc/e-signature-script-dialog.c:314
+#: ../widgets/misc/e-signature-script-dialog.c:307
 msgid "S_cript:"
 msgstr "è??æ?¬(_C)ï¼?"
 
-#: ../widgets/misc/e-signature-script-dialog.c:345
+#: ../widgets/misc/e-signature-script-dialog.c:338
 msgid "Script file must be executable."
 msgstr "è??æ?¬æ??ä»¶å¿?é¡»å?¯æ?§è¡?ã??"
 
@@ -20797,41 +20836,41 @@ msgstr "è??æ?¬æ??ä»¶å¿?é¡»å?¯æ?§è¡?ã??"
 msgid "Click here to go to URL"
 msgstr "å??å?»æ¤å¤?è½¬å?° URL"
 
-#: ../widgets/misc/e-web-view.c:373
+#: ../widgets/misc/e-web-view.c:375
 msgid "_Copy Link Location"
 msgstr "å¤?å?¶é?¾æ?¥ä½?ç½®(_C)"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:377
 msgid "Copy the link to the clipboard"
 msgstr "å°?é?¾æ?¥å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../widgets/misc/e-web-view.c:383
+#: ../widgets/misc/e-web-view.c:385
 msgid "_Open Link in Browser"
 msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥(_O)"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:387
 msgid "Open the link in a web browser"
 msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥"
 
-#: ../widgets/misc/e-web-view.c:393
+#: ../widgets/misc/e-web-view.c:395
 msgid "_Copy Email Address"
 msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
+#: ../widgets/misc/e-web-view.c:424 ../widgets/misc/e-web-view.c:1079
 msgid "Select all text and images"
 msgstr "é??ä¸å?¨é?¨æ??æ?¬å??å?¾å??"
 
-#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:856 ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:860
 #, c-format
 msgid "Click to call %s"
 msgstr "å??å?»ä»¥å?¼å?« %s"
 
-#: ../widgets/misc/e-web-view.c:860
+#: ../widgets/misc/e-web-view.c:862
 msgid "Click to hide/unhide addresses"
 msgstr "å??å?»å?¯é??è??/æ?¾ç¤ºå?°å??"
 
-#: ../widgets/misc/e-web-view.c:862
+#: ../widgets/misc/e-web-view.c:864
 #, c-format
 msgid "Click to open %s"
 msgstr "å??å?»ä»¥æ??å¼? %s"
@@ -20850,25 +20889,25 @@ msgstr "æ?¥å??ï¼?ä»? %s å?° %s"
 msgid "evolution calendar item"
 msgstr "Evolution æ?¥å??é¡¹ç?®"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "å¼¹å?ºå??è¡¨"
 
-#: ../widgets/table/e-cell-date-edit.c:303
+#: ../widgets/table/e-cell-date-edit.c:300
 msgid "Now"
 msgstr "ç?°å?¨"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:320
+#: ../widgets/table/e-cell-date-edit.c:317
 msgctxt "table-date"
 msgid "None"
 msgstr "æ? "
 
-#: ../widgets/table/e-cell-date-edit.c:328
+#: ../widgets/table/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "ç¡®å®?"
 
-#: ../widgets/table/e-cell-date-edit.c:872
+#: ../widgets/table/e-cell-date-edit.c:869
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "æ?¶é?´å¿?é¡»é??ç?¨æ ¼å¼?ï¼?%s"
@@ -20877,7 +20916,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:595
+#: ../widgets/table/e-table-click-to-add.c:592
 #: ../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"
@@ -20913,7 +20952,7 @@ msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨å??(_V)ï¼?"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1668
+#: ../widgets/table/e-table-header-item.c:1660
 msgid "Ascending"
 msgstr "å??åº?"
 
@@ -20926,7 +20965,7 @@ msgid "Clear _All"
 msgstr "å?¨é?¨æ¸?é?¤(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1668
+#: ../widgets/table/e-table-header-item.c:1660
 msgid "Descending"
 msgstr "é??åº?"
 
@@ -21003,7 +21042,7 @@ msgstr "è¦?å?¨æ?¨ç??è¡¨æ ¼ä¸æ·»å? å??ï¼?è¯·å°?å?¶æ??æ?³å?°æ?¨æ?³è¦?å?¶å?ºç?°ç??
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:354
+#: ../widgets/table/e-table-group-container.c:351
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21015,71 +21054,71 @@ msgstr[0] "%sï¼?%s (%d é¡¹)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:366
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d é¡¹)"
 
-#: ../widgets/table/e-table-header-item.c:1512
+#: ../widgets/table/e-table-header-item.c:1504
 msgid "Customize Current View"
 msgstr "è?ªå®?ä¹?å½?å??è§?å?¾"
 
-#: ../widgets/table/e-table-header-item.c:1533
+#: ../widgets/table/e-table-header-item.c:1525
 msgid "Sort _Ascending"
 msgstr "å??åº?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1536
+#: ../widgets/table/e-table-header-item.c:1528
 msgid "Sort _Descending"
 msgstr "é??åº?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "_Unsort"
 msgstr "æ?ªæ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1534
 msgid "Group By This _Field"
 msgstr "æ??è¯¥å??å??ç»?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1545
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "Group By _Box"
 msgstr "æ??æ?¹æ¡?å??ç»?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1549
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Remove This _Column"
 msgstr "å? é?¤è¯¥å??(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1552
+#: ../widgets/table/e-table-header-item.c:1544
 msgid "Add a C_olumn..."
 msgstr "æ·»å? ä¸?å??(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1556
+#: ../widgets/table/e-table-header-item.c:1548
 msgid "A_lignment"
 msgstr "å¯¹é½?(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1559
+#: ../widgets/table/e-table-header-item.c:1551
 msgid "B_est Fit"
 msgstr "æ??ä½³å?¹é??(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1562
+#: ../widgets/table/e-table-header-item.c:1554
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??å??(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1566
+#: ../widgets/table/e-table-header-item.c:1558
 msgid "Custo_mize Current View..."
 msgstr "è?ªå®?ä¹?å½?å??è§?å?¾(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1625
+#: ../widgets/table/e-table-header-item.c:1617
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1635
 msgid "_Custom"
 msgstr "è?ªå®?ä¹?(_C)"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:126
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "å¼¹å?ºå?å¯¹è±¡"
 
@@ -21110,14 +21149,35 @@ msgstr "å??å?»"
 msgid "sort"
 msgstr "æ??åº?"
 
-#: ../widgets/text/e-text.c:2289
+#: ../widgets/text/e-text.c:2283
 msgid "Select All"
 msgstr "å?¨é??"
 
-#: ../widgets/text/e-text.c:2301
+#: ../widgets/text/e-text.c:2295
 msgid "Input Methods"
 msgstr "è¾?å?¥æ³?"
 
+#~ msgid "(map)"
+#~ msgstr "(å?°å?¾)"
+
+#~ msgid "map"
+#~ msgstr "å?°å?¾"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "å?¿å??è®¿é?® LDAP æ??å?¡å?¨"
+
+#~ msgid "Account Management"
+#~ msgstr "å¸?å?·ç®¡ç??"
+
+#~ msgid "Migrate local mbox folders to maildir"
+#~ msgstr "å°?æ?¬å?° mbox æ??ä»¶å¤¹è¿?ç§»å?° maildir"
+
+#~ msgid "Select folder to import OE folder into"
+#~ msgstr "é??æ?©è¦?å°? Outlook Express æ??ä»¶å¤¹å¯¼å?¥å?°å?ªä¸ªæ??ä»¶å¤¹"
+
+#~ msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+#~ msgstr "é??æ?©ä¸?ä¸ªå°?äº? 720 å?è??ç?? 48*48 ç?? PNG å?¾å??"
+
 #~ msgid "Count of default recurrence for a new event. -1 means forever."
 #~ msgstr "ä¸?ä¸ªæ?°äº?ä»¶ç??é»?è®¤é??ç?°æ¬¡æ?°ã??-1 ä»£è¡¨æ°¸è¿?é??ç?°ã??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]