[evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Mon, 15 Feb 2010 03:47:48 +0000 (UTC)
commit 4e01e35ad5858bd3f2570b5189f2e2b2bba3c005
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Mon Feb 15 11:47:38 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2223 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 2223 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 2214 insertions(+), 2232 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 5bfd903..0245b0b 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -5,13 +5,13 @@
 # Craig Jeffares <cjeffares novell com>,2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010.
 # Abel Cheung <abelcheung gmail com>, 2006.
-#: ../shell/main.c:511
+#: ../shell/main.c:512
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.29.6\n"
+"Project-Id-Version: evolution 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-21 21:07+0800\n"
-"PO-Revision-Date: 2010-01-21 21:10+0800\n"
+"POT-Creation-Date: 2010-02-15 11:46+0800\n"
+"PO-Revision-Date: 2010-02-15 11:46+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgstr "é?±å¹´ç´?å¿µæ?¥"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:110
+#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -259,7 +259,7 @@ msgstr "è¡?äº?æ??ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "è?¯çµ¡äºº"
@@ -365,7 +365,7 @@ msgstr "ç¶²èª?ï¼?"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:954
+#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "å·¥ä½?"
 
@@ -484,7 +484,7 @@ msgstr "å??ç¨±"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1287
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
 #: ../addressbook/gui/widgets/e-addressbook-model.c:522
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -637,12 +637,12 @@ msgid "_Select Address Book"
 msgstr "é?¸æ??é??è¨?é??(_S)"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:675
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
 msgid "Shell"
 msgstr "Shell"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:676
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
 msgid "The EShell singleton"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
 msgid "Contact List Editor"
 msgstr "è?¯çµ¡äººæ¸?å?®ç·¨è¼¯å?¨"
 
@@ -737,28 +737,28 @@ 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:785
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
 msgid "Contact List Members"
 msgstr "è?¯çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:933
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
 msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1199
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
 msgid "Error modifying list"
 msgstr "ç·¨è¼¯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1213
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
 msgid "Error removing list"
 msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
 #: ../addressbook/gui/widgets/e-addressbook-model.c:512
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
@@ -766,7 +766,7 @@ msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 msgid "Book"
 msgstr "æ?¸æ?¬"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1277
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
 msgid "Is New List"
 msgstr "æ?¯æ?°ç??æ¸?å?®"
 
@@ -817,20 +817,20 @@ msgstr "å??ä½µè?¯çµ¡äºº"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../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:909
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:779
-#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Email begins with"
 msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Name contains"
 msgstr "å??ç¨±å??å?«"
 
@@ -862,12 +862,12 @@ msgstr "æ??å°?è¢«ä¸æ?·"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
 #: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1061 ../calendar/gui/e-task-table.c:1360
-#: ../modules/calendar/e-memo-shell-content.c:603
-#: ../modules/calendar/e-task-shell-content.c:625
+#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:629
 #: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3349
+#: ../widgets/table/e-table.c:3359
 #: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
 #: ../widgets/text/e-text.c:3297
 msgid "Model"
@@ -890,7 +890,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?è?¯çµ¡äºº"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:735
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "Delete selected contacts"
 msgstr "å?ªé?¤é?¸å®?ç??è?¯çµ¡äºº"
 
@@ -899,10 +899,9 @@ msgid "Select all visible contacts"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??è?¯çµ¡äºº"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1078 ../calendar/gui/e-task-table.c:1377
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
 msgid "Shell View"
-msgstr "3_D å??é??è±¡æ£?æª¢è¦?"
+msgstr "Shell æª¢è¦?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Source"
@@ -1279,15 +1278,15 @@ msgstr[1] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå?¡ç??"
 msgid "Open"
 msgstr "é??å??"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:141
+#: ../addressbook/gui/widgets/ea-minicard.c:153
 msgid "Contact List: "
 msgstr "è?¯çµ¡äººæ¸?å?®: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:142
+#: ../addressbook/gui/widgets/ea-minicard.c:154
 msgid "Contact: "
 msgstr "è?¯çµ¡äºº: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:168
+#: ../addressbook/gui/widgets/ea-minicard.c:180
 msgid "evolution minicard"
 msgstr "Evolution è¿·ä½ å?¡ç??"
 
@@ -1390,7 +1389,7 @@ msgstr "ç¶²èª?"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../mail/e-mail-migrate.c:955
+#: ../mail/e-mail-migrate.c:962
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
 #: ../modules/calendar/e-cal-shell-backend.c:171
@@ -1475,9 +1474,9 @@ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:238 ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2651
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
@@ -1761,7 +1760,7 @@ msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
 #: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/google-account-setup/google-source.c:440
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -2204,16 +2203,7 @@ msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../filter/filter.ui.h:15
-#: ../plugins/caldav/caldav-source.c:496
-#: ../plugins/calendar-file/calendar-file.c:294
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:517
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-#: ../plugins/google-account-setup/google-source.c:740
-msgid "hours"
+msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
@@ -2262,20 +2252,23 @@ msgstr "ç·¨è¼¯(_E)"
 msgid "_Snooze"
 msgstr "å»¶æ??(_S)"
 
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+msgid "hours"
+msgstr "å°?æ??"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "ç´?æ??ç??å?°é»?"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../filter/filter.ui.h:17
-#: ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/caldav/caldav-source.c:495
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:516
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-#: ../plugins/google-account-setup/google-source.c:739
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
 msgstr "å??é??"
 
@@ -2917,23 +2910,23 @@ msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥é??å§?å??é??"
 
-#: ../calendar/gui/cal-editor-utils.c:102
+#: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "æ?¥æª¢è¦?"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "å·¥ä½?é?±æª¢è¦?"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "é?±æª¢è¦?"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "æ??æª¢è¦?"
 
@@ -2963,7 +2956,7 @@ msgid "Classification"
 msgstr "æ¸é¡?"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-task-table.c:500
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -2997,7 +2990,7 @@ msgstr "å?å?¨"
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "ä½?ç½®"
 
@@ -3007,14 +3000,14 @@ msgid "Organizer"
 msgstr "æ??è°å?¬é??äºº"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-task-table.c:499
+#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ç§?äºº"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
-#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
@@ -3029,7 +3022,7 @@ msgstr "é?±æ??æ?§"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:354
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "æ??è¦?"
 
@@ -3142,9 +3135,7 @@ msgstr "ä¹?å¾?(_A):"
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 #, fuzzy
 msgid "before"
-msgstr ""
-"ä¹?å??\n"
-"ä¹?å¾?"
+msgstr "å°?é?¢"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:7
@@ -3153,14 +3144,9 @@ msgstr "å¤©"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/caldav/caldav-source.c:497
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:518
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../plugins/google-account-setup/google-source.c:741
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../widgets/misc/e-send-options.ui.h:39
 msgid "days"
@@ -3297,7 +3283,7 @@ msgstr "æ??æ??äº?"
 #: ../calendar/gui/dialogs/calendar-setup.c:389
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
 #: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2653
+#: ../plugins/itip-formatter/itip-formatter.c:2666
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
@@ -3317,10 +3303,11 @@ msgstr "å??é??"
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#. Translators: "None" for not including threads; part of "Include threads: None"
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
 #. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:745 ../widgets/misc/e-send-options.ui.h:12
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
 msgid "None"
 msgstr "æ²?æ??"
 
@@ -3432,7 +3419,7 @@ msgid "Wee_k starts on:"
 msgstr "ä¸?é?±é??å§?æ?¼(_K):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Work Week"
 msgstr "å·¥ä½?é?±"
 
@@ -3614,23 +3601,23 @@ msgstr "%s  ä½ æ²?æ??å??ä»»ä½?æ?´æ?¹ï¼?æ?´æ?°é??å??ç·¨è¼¯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "ç¢ºèª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2380
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
 msgid " to "
 msgstr " å?° "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2384
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2386
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2391
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
 msgid " (Due "
 msgstr "(æ??é??)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2393
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
 msgid "Due "
 msgstr "æ??é?? "
 
@@ -3744,6 +3731,7 @@ msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "é?¸é ?(_O)"
 
@@ -3862,15 +3850,15 @@ msgstr "é??ä»¶"
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?ä½¿ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "ç?¡æ³?é??å??ä¾?æº?"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "ç?¡æ³?é??å??ç?®ç??å?°"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 
@@ -4160,7 +4148,7 @@ msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:364
+#: ../plugins/calendar-weather/calendar-weather.c:356
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
@@ -4180,7 +4168,7 @@ msgstr "æ??å°?(_F):"
 msgid "until"
 msgstr "å?®ä½?(_U):"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2529
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
 msgid "Memo"
 msgstr "å??å¿?é??"
 
@@ -4197,7 +4185,7 @@ msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??äºº"
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:224
+#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
 #: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
 #: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
@@ -4445,17 +4433,17 @@ msgstr "ç¶²é ?"
 #: ../calendar/gui/e-cal-model-tasks.c:463
 #: ../calendar/gui/e-cal-model-tasks.c:737
 #: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:221
-#: ../calendar/gui/e-task-table.c:236 ../calendar/gui/e-task-table.c:595
-#: ../calendar/gui/print.c:2605 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-task-table.c:507 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "é«?"
@@ -4465,16 +4453,16 @@ msgstr "é«?"
 #: ../calendar/gui/e-cal-component-preview.c:289
 #: ../calendar/gui/e-cal-model-tasks.c:461
 #: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:2602
+#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2645
 msgid "In Progress"
 msgstr "é?²è¡?ä¸"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:522 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-task-table.c:509 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "ä½?"
@@ -4482,7 +4470,7 @@ msgstr "ä½?"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-task-table.c:521
+#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
@@ -4492,9 +4480,9 @@ msgstr "ä¸?è?¬"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
 #: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:217
-#: ../calendar/gui/e-task-table.c:232 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:2599 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
 
@@ -4520,7 +4508,7 @@ msgstr "ç??æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:523 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
@@ -4547,7 +4535,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "æ??é??è£?æ?¹è®?/æª¢è¦?è©²å·¥ä½?ç??ç??æ??è©³ç´°è³?æ??"
 
 #: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:198
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
@@ -4673,7 +4661,7 @@ msgstr "%s å?¨ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ç?ºæ?ªç?¥ç??è§¸ç?¼é¡?å??"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:658
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "ç?¡æ¨?é¡?"
 
@@ -4719,7 +4707,7 @@ msgstr "ç¶²é ?ï¼?"
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Created"
 msgstr "å·²å»ºç«?"
 
@@ -4739,12 +4727,12 @@ msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/e-task-table.c:559
 msgid "Free"
 msgstr "ç©ºé??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
@@ -4764,7 +4752,7 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1286
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
 #: ../calendar/gui/e-meeting-store.c:856
@@ -4772,46 +4760,50 @@ msgstr "æ²?æ??"
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1286
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "å?¦"
 
-#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
+#: ../calendar/gui/e-cal-model.c:377
+msgid "Default Client"
+msgstr "é ?è¨å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
 #: ../shell/e-shell.c:836
 msgid "Shell Settings"
 msgstr "Shell è¨å®?å?¼"
 
-#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
+#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
 #: ../shell/e-shell.c:837
 msgid "Application-wide settings"
 msgstr "æ??ç?¨ç¨?å¼?è¨å®?å?¼"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:967
-#: ../calendar/gui/print.c:984 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
 #: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2325
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1282
+#: ../calendar/gui/e-cal-model.c:1306
 msgid "Recurring"
 msgstr "å¾ªç?°æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1284
+#: ../calendar/gui/e-cal-model.c:1308
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2028
+#: ../calendar/gui/e-cal-model.c:2203
 #, c-format
 msgid "Opening %s"
 msgstr "æ£å?¨é??å?? %s"
@@ -4839,7 +4831,7 @@ msgstr "å?°æ??æ?¥"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "å?ªå??ç?ç´?"
 
@@ -4871,13 +4863,13 @@ msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?äº?ä»¶"
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:195
-#: ../calendar/gui/e-task-table.c:273
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:186
+#: ../calendar/gui/e-task-table.c:264
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:854
-#: ../calendar/gui/e-task-table.c:1075
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
+#: ../calendar/gui/e-task-table.c:1062
 msgid "Updating objects"
 msgstr "æ?´æ?°ç?©ä»¶"
 
@@ -4885,7 +4877,7 @@ msgstr "æ?´æ?°ç?©ä»¶"
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "æ?¥å??"
 
@@ -4893,7 +4885,7 @@ msgstr "æ?¥å??"
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2319
+#: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "å©?æ??"
 
@@ -4907,7 +4899,7 @@ msgstr "æ?«è¨?"
 #: ../calendar/gui/e-calendar-view.c:1693
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
 
@@ -4917,22 +4909,22 @@ 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:1835 ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:750
+#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
+#: ../calendar/gui/e-task-table.c:737
 #, 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:1839 ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:753
+#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
+#: ../calendar/gui/e-task-table.c:740
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è°å?¬é??äºº: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2561
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "ä½?ç½®ï¼?%s"
@@ -4982,7 +4974,7 @@ msgstr "é¡¯ç¤ºç¬¬äº?æ??å??"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1698
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4995,7 +4987,7 @@ msgstr "%A %d %B"
 #: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
 #: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:894
 msgid "%a %d %b"
 msgstr "%-m æ?? %-d æ?¥ (%a)"
 
@@ -5007,19 +4999,19 @@ msgstr "%-m æ?? %-d æ?¥ (%a)"
 #: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
 #: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:949
+#: ../modules/calendar/e-cal-shell-view-private.c:930
 msgid "%d %b"
 msgstr "%-m æ?? %-d æ?¥"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1120 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:814
+#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:816
+#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "ä¸?å??"
 
@@ -5106,7 +5098,7 @@ msgid "Ends"
 msgstr "çµ?æ??"
 
 #: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "æ?ªæ¢"
 
@@ -5137,13 +5129,13 @@ msgstr "<br> è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸é?¸æ??ä¸?å??å??
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2300
+#: ../plugins/itip-formatter/itip-formatter.c:2313
 msgctxt "cal-itip"
 msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2316
+#: ../plugins/itip-formatter/itip-formatter.c:2329
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
@@ -5360,7 +5352,7 @@ msgid "Attendee status updated\n"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1408
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å?å?¨"
 
@@ -5414,7 +5406,7 @@ msgid "Send Latest Information"
 msgstr "é??å?ºæ??æ?°è³?è¨?"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1088
+#: ../modules/mail/e-mail-shell-view-actions.c:1030
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -5465,49 +5457,49 @@ msgstr "è³?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:963
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:964 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:969 ../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:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/print.c:965
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "è³?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/print.c:966
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "æ??è°å®¤"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:980
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "ä¸»å¸"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "å?ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "å??å¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "ç¼ºå¸è??"
 
@@ -5636,7 +5628,7 @@ msgstr "èª?è¨?"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:423
+#: ../calendar/gui/e-memo-table.c:410
 #: ../modules/calendar/e-cal-shell-content.c:399
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
@@ -5645,36 +5637,36 @@ msgstr "æ??å?¡"
 msgid "Memos"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:714
+#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:794
+#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
 msgid "Start: "
 msgstr "é??å§?:"
 
-#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:812
+#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:706
 msgid "Cut selected memos to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:712
 msgid "Copy selected memos to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:718
 msgid "Paste memos from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:737
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../calendar/gui/e-memo-table.c:724
+#: ../modules/calendar/e-memo-shell-view-actions.c:569
 msgid "Delete selected memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:743
+#: ../calendar/gui/e-memo-table.c:730
 msgid "Select all visible memos"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
@@ -5682,56 +5674,56 @@ msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 msgid "Click to add a memo"
 msgstr "è«?æ??é??è£?å¢?å? æ?°ç??å??å¿?é??"
 
-#: ../calendar/gui/e-task-table.c:542
+#: ../calendar/gui/e-task-table.c:529
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-task-table.c:543
+#: ../calendar/gui/e-task-table.c:530
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-task-table.c:544
+#: ../calendar/gui/e-task-table.c:531
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-task-table.c:545
+#: ../calendar/gui/e-task-table.c:532
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-task-table.c:533
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/e-task-table.c:534
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-task-table.c:548
+#: ../calendar/gui/e-task-table.c:535
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-task-table.c:549
+#: ../calendar/gui/e-task-table.c:536
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-task-table.c:550
+#: ../calendar/gui/e-task-table.c:537
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-task-table.c:551
+#: ../calendar/gui/e-task-table.c:538
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-task-table.c:552
+#: ../calendar/gui/e-task-table.c:539
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2006
+#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
 #: ../modules/calendar/e-cal-shell-content.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../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:437
 #: ../plugins/caldav/caldav-browse-server.c:430
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
@@ -5740,24 +5732,24 @@ msgstr "100%"
 msgid "Tasks"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:927
 msgid "Cut selected tasks to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:946
+#: ../calendar/gui/e-task-table.c:933
 msgid "Copy selected tasks to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:939
 msgid "Paste tasks from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:958
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../calendar/gui/e-task-table.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "Delete selected tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:964
+#: ../calendar/gui/e-task-table.c:951
 msgid "Select all visible tasks"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
 
@@ -5768,36 +5760,36 @@ msgstr "é?¸æ??ä¸?å??æ??å??"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1679
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:263
+#: ../calendar/gui/ea-cal-view-event.c:276
 msgid "It has alarms."
 msgstr "å®?å?·æ??é¬§é?´ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:266
+#: ../calendar/gui/ea-cal-view-event.c:279
 msgid "It has recurrences."
 msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:269
+#: ../calendar/gui/ea-cal-view-event.c:282
 msgid "It is a meeting."
 msgstr "é??æ?¯ä¸?é ?æ??è°ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:275
+#: ../calendar/gui/ea-cal-view-event.c:288
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ??è¦?ç?º %sã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:277
+#: ../calendar/gui/ea-cal-view-event.c:290
 msgid "Calendar Event: It has no summary."
 msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ²?æ??æ??è¦?ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:299
+#: ../calendar/gui/ea-cal-view-event.c:312
 msgid "calendar view event"
 msgstr "è¡?äº?æ??æª¢è¦?äº?ä»¶"
 
-#: ../calendar/gui/ea-cal-view-event.c:527
+#: ../calendar/gui/ea-cal-view-event.c:540
 msgid "Grab Focus"
 msgstr "å¾?å?°ç?¦é»?"
 
@@ -5821,14 +5813,12 @@ msgstr "ç§»è?³ä»?æ?¥"
 msgid "Go to Date"
 msgstr "ç§»è?³æ?¥æ??"
 
-#: ../calendar/gui/ea-day-view-main-item.c:305
-#: ../calendar/gui/ea-week-view-main-item.c:302
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
 
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5837,14 +5827,14 @@ msgstr[1] "å®?æ?? %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:151 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 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:158
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
@@ -5852,16 +5842,16 @@ 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:164
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-day-view.c:195
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "å·¥ä½?é?±ç??è¡?äº?æ??æª¢è¦?"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??æª¢è¦?"
 
@@ -5872,16 +5862,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome è¡?äº?æ??"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:909
+#: ../modules/calendar/e-cal-shell-view-private.c:890
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
 #: ../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:916
-#: ../modules/calendar/e-cal-shell-view-private.c:922
-#: ../modules/calendar/e-cal-shell-view-private.c:925
+#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
 msgid "%a %d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 
@@ -5889,10 +5879,10 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 #: ../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:942
-#: ../modules/calendar/e-cal-shell-view-private.c:953
-#: ../modules/calendar/e-cal-shell-view-private.c:960
-#: ../modules/calendar/e-cal-shell-view-private.c:963
+#: ../modules/calendar/e-cal-shell-view-private.c:923
+#: ../modules/calendar/e-cal-shell-view-private.c:934
+#: ../modules/calendar/e-cal-shell-view-private.c:941
+#: ../modules/calendar/e-cal-shell-view-private.c:944
 msgid "%d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
@@ -5922,12 +5912,7 @@ msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??æª¢è¦?"
 msgid "calendar view for one or more weeks"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??æª¢è¦?"
 
-#: ../calendar/gui/gnome-cal.c:1942
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "è¼?å?¥ %s ç??ç´?æ??"
-
-#: ../calendar/gui/gnome-cal.c:2557
+#: ../calendar/gui/gnome-cal.c:2144
 msgid "Purging"
 msgstr "æ¸?é?¤"
 
@@ -6098,12 +6083,11 @@ msgstr "iCalendar è³?è¨?"
 
 #: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
+msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?æ?°ç??äº?ä»¶è??å?¶ä»?äº?ä»¶æ??æ??é??ç??ã??"
 
 #: ../calendar/gui/itip-utils.c:835
-#, fuzzy
 msgid "Unable to book a resource, error: "
-msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??å»¶ä¼¸"
+msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?é?¯èª¤ç?ºï¼?"
 
 #: ../calendar/gui/itip-utils.c:988
 msgid "You must be an attendee of the event."
@@ -6233,77 +6217,77 @@ msgstr "30æ?¥"
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "å?"
 
-#: ../calendar/gui/print.c:2525
+#: ../calendar/gui/print.c:2564
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/print.c:2527
+#: ../calendar/gui/print.c:2566
 msgid "Task"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2575
+#: ../calendar/gui/print.c:2615
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2658
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2673
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2644
+#: ../calendar/gui/print.c:2691
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2702
 #, c-format
 msgid "URL: %s"
 msgstr "ç¶²å??: %s"
 
-#: ../calendar/gui/print.c:2668
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2679
+#: ../calendar/gui/print.c:2726
 msgid "Contacts: "
 msgstr "è?¯çµ¡äºº: "
 
@@ -6334,7 +6318,7 @@ msgstr "ç´?æ??å??æ??è°"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1820
+#: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
@@ -7924,7 +7908,7 @@ msgid "Save as..."
 msgstr "å?¦å?æ?°æª?..."
 
 #: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
@@ -7985,10 +7969,6 @@ msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 msgid "Character _Encoding"
 msgstr "å?ç¬¦ç·¨ç¢¼(_E)"
 
-#: ../composer/e-composer-actions.c:351
-msgid "_Security"
-msgstr "å®?å?¨æ?§(_S)"
-
 #: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PG_P å? å¯?"
@@ -8100,7 +8080,7 @@ msgid "Fr_om:"
 msgstr "å¯?ä»¶è??(_O):"
 
 #: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:958
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
@@ -8150,7 +8130,7 @@ msgstr "æ??é??è£?æ?°å¢?ç?®é??æ??å??"
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£?ï¼?é?¸å??è¦?å¼µè²¼ç??è³?æ??å¤¾"
 
-#: ../composer/e-composer-private.c:280
+#: ../composer/e-composer-private.c:284
 msgid "Save draft"
 msgstr "å?²å?è??ç¨¿"
 
@@ -8362,7 +8342,7 @@ msgstr "Evolution é?¯èª¤"
 msgid "Evolution Warning"
 msgstr "Evolution è¦å??"
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:636
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
@@ -8442,9 +8422,9 @@ msgstr "è¦?è¦º"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../plugins/itip-formatter/itip-view.c:195
-#: ../widgets/table/e-cell-date-edit.c:304
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "ä»?å¤©"
 
@@ -8568,6 +8548,12 @@ msgstr "å·²å??ç?¨"
 msgid "Whether the plugin is enabled"
 msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
 
+#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "é?±"
+
 #: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "æ??å?°æ??ç?¼ç??é?¯èª¤"
@@ -8581,7 +8567,7 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "æ??å?°ç³»çµ±æ²?æ??å??å ±ä»»ä½?é??æ?¼æ¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 
-#: ../e-util/e-signature.c:699
+#: ../e-util/e-signature.c:701
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
@@ -8626,24 +8612,24 @@ msgstr "GConf é?¯èª¤ï¼?%s"
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:961
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
 #: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
 #: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "å?¯æ?¬"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
 #: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
 #: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "å¯?ä»¶å?¯æ?¬"
 
-#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
 #: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
@@ -8651,12 +8637,12 @@ msgid "Subject"
 msgstr "ä¸»æ?¨"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2422
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
 #: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "å¯?ä»¶è??"
 
-#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1227
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
@@ -8841,56 +8827,56 @@ msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 msgid "Choose a File"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../filter/e-filter-rule.c:653
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "è¦?å??å??ç¨±(_U):"
 
-#: ../filter/e-filter-rule.c:682
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?ä»¶ç??é ?ç?®"
 
-#: ../filter/e-filter-rule.c:716
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "å? å?¥æ¢?ä»¶(_D)"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/e-filter-rule.c:724
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "å°?æ?¾é ?ç?®(_F):"
 
-#: ../filter/e-filter-rule.c:745
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/e-filter-rule.c:745 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/e-filter-rule.c:745
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/e-filter-rule.c:745
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "æ²?æ??å??å¾©æ??å??å§?é?µä»¶"
 
-#: ../filter/e-filter-rule.c:747
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾£çµ?(_N)"
 
-#: ../filter/e-filter-rule.c:1120 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:301
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/e-filter-rule.c:1120 ../mail/em-utils.c:302
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
 msgid "Outgoing"
 msgstr "å¤?å¯?"
 
@@ -9011,39 +8997,30 @@ msgstr "ç?®å??ç??æ??å?»"
 msgid "the time you specify"
 msgstr "ä½ æ??å®?ç??æ??å?»"
 
-#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:498
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:519
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-#: ../plugins/google-account-setup/google-source.c:742
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "weeks"
-msgstr "é?±"
-
 #: ../filter/filter.ui.h:23
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:119 ../mail/em-format-html-display.c:1025
-#: ../mail/mail-config.ui.h:13 ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:147
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??ä»¶"
 msgstr[1] "é??ä»¶"
 
-#: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:607
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "å??ç¤ºæª¢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:613
-#: ../widgets/misc/e-attachment-paned.c:608
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "æ¸?å?®æª¢è¦?"
 
-#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:628
+#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:631
 msgid "Focus Tracker"
 msgstr "ç?¦é»?è¿½è¹¤å?¨"
 
@@ -9108,7 +9085,7 @@ msgid "_Later"
 msgstr "ç¨?å¾?(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:505
+#: ../modules/mail/e-mail-shell-view-actions.c:515
 msgid "Add Label"
 msgstr "å? å?¥æ¨?ç±¤"
 
@@ -9130,7 +9107,7 @@ msgstr "é¡?è?²"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
 #: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
-#: ../modules/mail/e-mail-shell-view-private.c:908
+#: ../modules/mail/e-mail-shell-view-private.c:961
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
@@ -9152,32 +9129,32 @@ msgstr "å·²å?³é??"
 msgid "Templates"
 msgstr "ç¯?æ?¬"
 
-#: ../mail/e-mail-migrate.c:953 ../mail/em-filter-i18n.h:30
+#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
 msgid "Important"
 msgstr "é??è¦?"
 
 #. green
-#: ../mail/e-mail-migrate.c:956
+#: ../mail/e-mail-migrate.c:963
 msgid "To Do"
 msgstr "å¾?è¾¦"
 
 #. blue
-#: ../mail/e-mail-migrate.c:957
+#: ../mail/e-mail-migrate.c:964
 msgid "Later"
 msgstr "ç¨?å¾?"
 
-#: ../mail/e-mail-migrate.c:1103
+#: ../mail/e-mail-migrate.c:1110
 #: ../modules/addressbook/e-book-shell-migrate.c:76
 #: ../modules/calendar/e-cal-shell-migrate.c:123
 #: ../modules/calendar/e-task-shell-migrate.c:90
 msgid "Migrating..."
 msgstr "æ£å?¨ç§»è½?..."
 
-#: ../mail/e-mail-migrate.c:1136
+#: ../mail/e-mail-migrate.c:1143
 msgid "Migration"
 msgstr "ç§»è½?"
 
-#: ../mail/e-mail-migrate.c:1176
+#: ../mail/e-mail-migrate.c:1183
 #: ../modules/addressbook/e-book-shell-migrate.c:128
 #: ../modules/calendar/e-cal-shell-migrate.c:165
 #: ../modules/calendar/e-task-shell-migrate.c:132
@@ -9185,26 +9162,26 @@ msgstr "ç§»è½?"
 msgid "Migrating '%s':"
 msgstr "æ£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../mail/e-mail-migrate.c:1586
+#: ../mail/e-mail-migrate.c:1594
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?°è³?æ??å¤¾ `%s'ï¼?%s"
 
-#: ../mail/e-mail-migrate.c:1614
+#: ../mail/e-mail-migrate.c:1622
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ç?¡æ³?è¤?è£½è£½è³?æ??å¤¾ `%s' è?³ `%s'ï¼?%s"
 
-#: ../mail/e-mail-migrate.c:1809
+#: ../mail/e-mail-migrate.c:1817
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
 
-#: ../mail/e-mail-migrate.c:1815 ../mail/e-mail-migrate.c:2912
+#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2927
 msgid "Migrating Folders"
 msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
 
-#: ../mail/e-mail-migrate.c:1816
+#: ../mail/e-mail-migrate.c:1824
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -9215,27 +9192,27 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../mail/e-mail-migrate.c:2019
+#: ../mail/e-mail-migrate.c:2027
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/e-mail-migrate.c:2035
+#: ../mail/e-mail-migrate.c:2043
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "ç?¡æ³?å»ºç«? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
 
-#: ../mail/e-mail-migrate.c:2067
+#: ../mail/e-mail-migrate.c:2075
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "ç?¡æ³?è¤?è£½ POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/e-mail-migrate.c:2538 ../mail/e-mail-migrate.c:2552
+#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?¬å?°é?µä»¶å?²å?å?? `%s':%s"
 
-#: ../mail/e-mail-migrate.c:2913
+#: ../mail/e-mail-migrate.c:2928
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9249,7 +9226,7 @@ msgstr ""
 #. On This Computer is always first, and Search Folders
 #. * is always last.
 #. create the local source group
-#: ../mail/e-mail-migrate.c:2928 ../mail/e-mail-store.c:229
+#: ../mail/e-mail-migrate.c:2943 ../mail/e-mail-store.c:229
 #: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
 #: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
 #: ../modules/addressbook/e-book-shell-backend.c:125
@@ -9263,12 +9240,12 @@ msgstr ""
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
-#: ../mail/e-mail-migrate.c:3008
+#: ../mail/e-mail-migrate.c:3023
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "ç?¡æ³?å?¨ `%s' å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾:%s"
 
-#: ../mail/e-mail-migrate.c:3026
+#: ../mail/e-mail-migrate.c:3041
 #, c-format
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
@@ -9279,27 +9256,27 @@ msgstr "ç?¡æ³?å¾?ä»¥å??ç?? Evolution è®?å??è¨å®?å?¼ï¼?`evolution/config.xmldb'
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
 #: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:580
+#: ../modules/calendar/e-task-shell-view-actions.c:572
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??è©¢å??æ??"
 
-#: ../mail/e-mail-reader.c:194 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:208 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "è¤?è£½è?³è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:194 ../mail/em-folder-utils.c:382
+#: ../mail/e-mail-reader.c:208 ../mail/em-folder-utils.c:385
 msgid "C_opy"
 msgstr "è¤?è£½(_O)"
 
-#: ../mail/e-mail-reader.c:568 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:582 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ç§»è?³è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:568 ../mail/em-folder-utils.c:382
+#: ../mail/e-mail-reader.c:582 ../mail/em-folder-utils.c:385
 msgid "_Move"
 msgstr "ç§»å??(_M)"
 
-#: ../mail/e-mail-reader.c:794
+#: ../mail/e-mail-reader.c:808
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "å?²å?é?µä»¶"
@@ -9311,540 +9288,540 @@ msgstr[1] "å?²å?é?µä»¶"
 #. * 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:815 ../plugins/groupwise-features/properties.ui.h:5
+#: ../mail/e-mail-reader.c:829 ../plugins/groupwise-features/properties.ui.h:5
 #: ../widgets/table/e-table-click-to-add.c:518
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "é?µä»¶"
 msgstr[1] "é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1073
+#: ../mail/e-mail-reader.c:1087
 msgid "A_dd Sender to Address Book"
 msgstr "å? å?¥å¯?ä»¶è??å?°ç?®é??æ??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1075
+#: ../mail/e-mail-reader.c:1089
 msgid "Add sender to address book"
 msgstr "æ?°å¢?å¯?ä»¶è??è?³é??è¨?é??"
 
-#: ../mail/e-mail-reader.c:1080
+#: ../mail/e-mail-reader.c:1094
 msgid "Check for _Junk"
 msgstr "æª¢æ?¥å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1082
+#: ../mail/e-mail-reader.c:1096
 msgid "Filter the selected messages for junk status"
 msgstr "ç¯©é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
 
-#: ../mail/e-mail-reader.c:1087
+#: ../mail/e-mail-reader.c:1101
 msgid "_Copy to Folder..."
 msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)..."
 
-#: ../mail/e-mail-reader.c:1089
+#: ../mail/e-mail-reader.c:1103
 msgid "Copy selected messages to another folder"
 msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1094
+#: ../mail/e-mail-reader.c:1108
 msgid "_Delete Message"
 msgstr "å?ªé?¤é?µä»¶(_D)"
 
-#: ../mail/e-mail-reader.c:1096
+#: ../mail/e-mail-reader.c:1110
 msgid "Mark the selected messages for deletion"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??è¦?å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:1101
+#: ../mail/e-mail-reader.c:1115
 msgid "Filter on Mailing _List..."
 msgstr "é??ä¿¡è«?å£?é??æ¿¾å?¨(_L)..."
 
-#: ../mail/e-mail-reader.c:1103
+#: ../mail/e-mail-reader.c:1117
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1108
+#: ../mail/e-mail-reader.c:1122
 msgid "Filter on _Recipients..."
 msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_R)..."
 
-#: ../mail/e-mail-reader.c:1110
+#: ../mail/e-mail-reader.c:1124
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1115
+#: ../mail/e-mail-reader.c:1129
 msgid "Filter on Se_nder..."
 msgstr "å¯?ä»¶è??é??æ¿¾å?¨(_N)..."
 
-#: ../mail/e-mail-reader.c:1117
+#: ../mail/e-mail-reader.c:1131
 msgid "Create a rule to filter messages from this sender"
 msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1122
+#: ../mail/e-mail-reader.c:1136
 msgid "Filter on _Subject..."
 msgstr "ä¸»æ?¨é??æ¿¾å?¨(_S)..."
 
-#: ../mail/e-mail-reader.c:1124
+#: ../mail/e-mail-reader.c:1138
 msgid "Create a rule to filter messages with this subject"
 msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1129
+#: ../mail/e-mail-reader.c:1143
 msgid "A_pply Filters"
 msgstr "å¥?ç?¨é??æ¿¾å?¨(_P)"
 
-#: ../mail/e-mail-reader.c:1131
+#: ../mail/e-mail-reader.c:1145
 msgid "Apply filter rules to the selected messages"
 msgstr "å¥?ç?¨é??æ¿¾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1136
+#: ../mail/e-mail-reader.c:1150
 msgid "_Find in Message..."
 msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)..."
 
-#: ../mail/e-mail-reader.c:1138
+#: ../mail/e-mail-reader.c:1152
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1157
 msgid "_Clear Flag"
 msgstr "æ¸?é?¤æ¨?å¹?(_C)"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1159
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ç§»é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1164
 msgid "_Flag Completed"
 msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1166
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?è¨ç?ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1171
 msgid "Follow _Up..."
 msgstr "è·?é?¨(_U)..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1173
 msgid "Flag the selected messages for follow-up"
 msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1178
 msgid "_Attached"
 msgstr "é??ä»¶(_A)"
 
-#: ../mail/e-mail-reader.c:1166 ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
 msgid "Forward the selected message to someone as an attachment"
 msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??ä»¶å½¢å¼?è½?å¯?çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1185
 msgid "Forward As _Attached"
 msgstr "ä»¥é??ä»¶è½?å¯?(_A)"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1192
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
 msgid "Forward the selected message in the body of a new message"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1199
 msgid "Forward As _Inline"
 msgstr "ä»¥è¡?å?§è½?å¯?(_I)"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1206
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
-#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1208 ../mail/e-mail-reader.c:1215
 msgid "Forward the selected message quoted like a reply"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1213
 msgid "Forward As _Quoted"
 msgstr "ä»¥å¼?æ??è½?å¯?(_Q)"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1220
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1222
 msgid "Force images in HTML mail to be loaded"
 msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1227
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1229
 msgid "Mark the selected messages as important"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??é??è¦?"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1234
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1236
 msgid "Mark the selected messages as junk"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1241
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1243
 msgid "Mark the selected messages as not being junk"
 msgstr "å°?é?¸å??ç??é?µä»¶æ¨?ç¤ºæ??ä¸?æ?¯å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1248
 msgid "_Read"
 msgstr "å·²é?±è®?(_R)"
 
-#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1250
 msgid "Mark the selected messages as having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å·²ç¶?é?±è®?"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1255
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1257
 msgid "Mark the selected messages as unimportant"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??ä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1262
 msgid "_Unread"
 msgstr "æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1264
 msgid "Mark the selected messages as not having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??æ?ªé?±è®?"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1269
 msgid "_Edit as New Message..."
 msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)..."
 
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1271
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1276
 msgid "Compose _New Message"
 msgstr "æ?°å¯«æ?°é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1278
 msgid "Open a window for composing a mail message"
 msgstr "é??å??è¦?çª?ä»¥ä¾¿æ?°å¯«é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1283
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1285
 msgid "Open the selected messages in a new window"
 msgstr "ä½¿ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1290
 msgid "_Move to Folder..."
 msgstr "ç§»è?³è³?æ??å¤¾(_M)..."
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1292
 msgid "Move selected messages to another folder"
 msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1297
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1299
 msgid "Display the next message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1304
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1306
 msgid "Display the next important message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1311
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1313
 msgid "Display the next thread"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1318
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1320
 msgid "Display the next unread message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1325
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1327
 msgid "Display the previous message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1332
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1334
 msgid "Display the previous important message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1339
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1341
 msgid "Display the previous unread message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1348
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1355
 msgid "Preview the message to be printed"
 msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1360
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1362
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:1353
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../mail/e-mail-reader.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??äºº(_A)"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1369
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1374
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1376
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1381
 #: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1383
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?ä»¶è??"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1388
 msgid "_Save as mbox..."
 msgstr "å?²å?æ?? mbox(_S)..."
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1390
 msgid "Save selected messages as an mbox file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ?? mbox æª?æ¡?"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1395
 msgid "Search Folder from Mailing _List..."
 msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)..."
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1397
 msgid "Create a search folder for this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1402
 msgid "Search Folder from Recipien_ts..."
 msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)..."
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1404
 msgid "Create a search folder for these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1409
 msgid "Search Folder from Sen_der..."
 msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)..."
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1411
 msgid "Create a search folder for this sender"
 msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1402
+#: ../mail/e-mail-reader.c:1416
 msgid "Search Folder from S_ubject..."
 msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)..."
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1418
 msgid "Create a search folder for this subject"
 msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1423
 msgid "_Message Source"
 msgstr "é?µä»¶ä¾?æº?(_M)"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1425
 msgid "Show the raw email source of the message"
 msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
 
-#: ../mail/e-mail-reader.c:1423
+#: ../mail/e-mail-reader.c:1437
 msgid "_Undelete Message"
 msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1439
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1444
 msgid "_Normal Size"
 msgstr "æ£å¸¸å¤§å°?(_N)"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1446
 msgid "Reset the text to its original size"
 msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
 
-#: ../mail/e-mail-reader.c:1437
+#: ../mail/e-mail-reader.c:1451
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1453
 msgid "Increase the text size"
 msgstr "å°?æ??å?æ?¾å¤§"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1458
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1460
 msgid "Decrease the text size"
 msgstr "å°?æ??å?ç¸®å°?"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1467
 msgid "Create R_ule"
 msgstr "å»ºç«?è¦?å??(_U)"
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1474
 msgid "Ch_aracter Encoding"
 msgstr "å?ç¬¦ç·¨ç¢¼(_A)"
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1481
 msgid "F_orward As"
 msgstr "è½?å¯?ç?º(_O)"
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1488
 msgid "_Go To"
 msgstr "ç§»è?³(_G)"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1495
 msgid "Mar_k As"
 msgstr "æ¨?ç¤ºæ??(_K)"
 
-#: ../mail/e-mail-reader.c:1488
+#: ../mail/e-mail-reader.c:1502
 msgid "_Message"
 msgstr "é?µä»¶(_M)"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1509
 msgid "_Zoom"
 msgstr "ç¸®æ?¾(_Z)"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1534
 msgid "Mark for Follo_w Up..."
 msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)..."
 
-#: ../mail/e-mail-reader.c:1528
+#: ../mail/e-mail-reader.c:1542
 msgid "Mark as _Important"
 msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1532
+#: ../mail/e-mail-reader.c:1546
 msgid "Mark as _Junk"
 msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1550
 msgid "Mark as _Not Junk"
 msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1540
+#: ../mail/e-mail-reader.c:1554
 msgid "Mar_k as Read"
 msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1558
 msgid "Mark as Uni_mportant"
 msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1562
 msgid "Mark as _Unread"
 msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:1584
+#: ../mail/e-mail-reader.c:1598
 msgid "_Caret Mode"
 msgstr "æ¼?å?æ¨¡å¼?(_C)"
 
-#: ../mail/e-mail-reader.c:1586
+#: ../mail/e-mail-reader.c:1600
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
 
-#: ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1606
 msgid "All Message _Headers"
 msgstr "æ??æ??é?µä»¶æª?é (_H)"
 
-#: ../mail/e-mail-reader.c:1594
+#: ../mail/e-mail-reader.c:1608
 msgid "Show messages with all email headers"
 msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
 
-#: ../mail/e-mail-reader.c:1813
+#: ../mail/e-mail-reader.c:1831
 msgid "Unable to retrieve message"
 msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1858 ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1876 ../mail/mail-ops.c:1849
 #, 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:2352
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:612
-#: ../plugins/google-account-setup/google-source.c:783
+#: ../mail/e-mail-reader.c:2370
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:534
+#: ../plugins/google-account-setup/google-source.c:656
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "é ?è¨å?¼"
 
-#: ../mail/e-mail-reader.c:2471
+#: ../mail/e-mail-reader.c:2489
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "è½?å¯?(_F)"
 
-#: ../mail/e-mail-reader.c:2472
+#: ../mail/e-mail-reader.c:2490
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:2516 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2534 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:2520
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../mail/e-mail-reader.c:2538
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:2524
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:2528 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2546 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "å??è¦?"
 
@@ -9854,7 +9831,7 @@ 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:484 ../mail/mail-config.ui.h:72
+#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
 #: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "æ²?æ??å? å¯?"
@@ -9862,7 +9839,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:488 ../mail/mail-config.ui.h:120
+#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
 #: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "TLS å? å¯?"
@@ -9870,17 +9847,17 @@ 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:492 ../mail/mail-config.ui.h:93
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
 #: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL å? å¯?"
 
-#: ../mail/em-account-editor.c:579
+#: ../mail/em-account-editor.c:595
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:586
+#: ../mail/em-account-editor.c:602
 #, c-format
 msgid ""
 "\n"
@@ -9894,34 +9871,34 @@ msgstr ""
 "ä¸¦é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:866 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:949
+#: ../mail/em-account-editor.c:965
 msgid "Never"
 msgstr "æ°¸ä¸?"
 
-#: ../mail/em-account-editor.c:950
+#: ../mail/em-account-editor.c:966
 msgid "Always"
 msgstr "æ°¸é? "
 
-#: ../mail/em-account-editor.c:951
+#: ../mail/em-account-editor.c:967
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1683 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2039
+#: ../mail/em-account-editor.c:2055
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2040
+#: ../mail/em-account-editor.c:2056
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9931,42 +9908,42 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2042 ../mail/em-account-editor.c:2178
+#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
 #: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "èº«å??"
 
-#: ../mail/em-account-editor.c:2043
+#: ../mail/em-account-editor.c:2059
 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 "
 "information in email you send."
 msgstr "è«?å?¨ä¸?é?¢è¼¸å?¥ä½ ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??ä½ å¸?æ??å?¨é??å?ºç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
 
-#: ../mail/em-account-editor.c:2045 ../mail/em-account-editor.c:2215
+#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
 #: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2046
+#: ../mail/em-account-editor.c:2062
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨å®?ä¸?å??å¸³è??ç??è¨å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2048 ../mail/em-account-editor.c:2692
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
 msgid "Sending Email"
 msgstr "å?³é??é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2065
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr "è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??ä½ ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²çµ¡æ??å??ä¾?æ??å??ã??"
 
-#: ../mail/em-account-editor.c:2051
+#: ../mail/em-account-editor.c:2067
 msgid "Account Management"
 msgstr "å¸³è??ç¸½ç®¡"
 
-#: ../mail/em-account-editor.c:2052
+#: ../mail/em-account-editor.c:2068
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -9974,11 +9951,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??\n"
 "é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2072
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2057
+#: ../mail/em-account-editor.c:2073
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9992,62 +9969,62 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
 
-#: ../mail/em-account-editor.c:2502
+#: ../mail/em-account-editor.c:2518
 msgid "Check for _new messages every"
 msgstr "è?ªå??æª¢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2510
+#: ../mail/em-account-editor.c:2526
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2756 ../mail/mail-config.ui.h:31
+#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "é ?è¨å?¼"
 
-#: ../mail/em-account-editor.c:2818 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
 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:2855 ../mail/em-account-editor.c:2923
+#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é?¸é ?"
 
-#: ../mail/em-account-editor.c:2856 ../mail/em-account-editor.c:2924
+#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
 msgid "Checking for New Messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/em-account-editor.c:3391
+#: ../mail/em-account-editor.c:3408
 msgid "Account Editor"
 msgstr "å¸³è??ç·¨è¼¯å?¨"
 
-#: ../mail/em-account-editor.c:3391
+#: ../mail/em-account-editor.c:3408
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
-#: ../mail/em-composer-utils.c:1953
+#: ../mail/em-composer-utils.c:1954
 msgid "an unknown sender"
 msgstr "ä¸?æ??ç??å¯?ä»¶è??"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2000
+#: ../mail/em-composer-utils.c:2001
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} ${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
 
-#: ../mail/em-composer-utils.c:2144
+#: ../mail/em-composer-utils.c:2145
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-composer-utils.c:2325
+#: ../mail/em-composer-utils.c:2326
 msgid "Posting destination"
 msgstr "å¼µè²¼ç??ç?®ç??ç«¯"
 
-#: ../mail/em-composer-utils.c:2326
+#: ../mail/em-composer-utils.c:2327
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
 
@@ -10388,12 +10365,12 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??å¤¾æ¨¹"
 
-#: ../mail/em-folder-tree.c:1477
+#: ../mail/em-folder-tree.c:1477 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ£å?¨ç§»å??è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1479
+#: ../mail/em-folder-tree.c:1479 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ£å?¨è¤?è£½è³?æ??å¤¾ %s"
@@ -10412,36 +10389,31 @@ msgstr "æ£å?¨è¤?è£½é?µä»¶è?³è³?æ??å¤¾ %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?å±¤ç??å?²å?å??"
 
-#: ../mail/em-folder-utils.c:98
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "å°?ã??%sã??è¤?è£½å?°ã??%sã??"
-
-#: ../mail/em-folder-utils.c:383
+#: ../mail/em-folder-utils.c:386
 msgid "Move Folder To"
 msgstr "ç§»å??è³?æ??å¤¾å?°"
 
-#: ../mail/em-folder-utils.c:383
+#: ../mail/em-folder-utils.c:386
 msgid "Copy Folder To"
 msgstr "è¤?è£½è³?æ??å¤¾å?°"
 
-#: ../mail/em-folder-utils.c:496
+#: ../mail/em-folder-utils.c:499
 #: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "æ£å?¨å»ºç«?è³?æ??å¤¾ `%s'"
 
-#: ../mail/em-folder-utils.c:659
+#: ../mail/em-folder-utils.c:662
 msgid "Create Folder"
 msgstr "å»ºç«?è³?æ??å¤¾"
 
-#: ../mail/em-folder-utils.c:660
+#: ../mail/em-folder-utils.c:663
 #: ../plugins/groupwise-features/install-shared.c:175
 #: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?å»ºç«?è³?æ??å¤¾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-utils.c:676
+#: ../mail/em-folder-utils.c:679
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾ ã??%sã??"
@@ -10667,7 +10639,7 @@ msgstr "é?µä»¶è¦?å??"
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
 
-#: ../mail/em-vfolder-editor.c:124
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??å¤¾(_F)"
 
@@ -11613,7 +11585,7 @@ msgid "Importing Elm data"
 msgstr "è¼¸å?¥ Elm è³?æ??"
 
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:603
+#: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 msgid "Mail"
 msgstr "é?µä»¶"
@@ -12160,10 +12132,10 @@ msgstr "ä½¿ç?¨è??å??ç¨±(_E):"
 msgid "Use Authe_ntication"
 msgstr "ä½¿ç?¨é©?è?(_N)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:441
-#: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/google-account-setup/google-source.c:700
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../plugins/google-account-setup/google-contacts-source.c:283
+#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_N):"
 
@@ -12705,7 +12677,7 @@ msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??å¤¾"
 msgid "Edit Search Folder"
 msgstr "ç·¨è¼¯æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1265
+#: ../mail/mail-vfolder.c:1274
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??å¤¾"
 
@@ -13280,7 +13252,7 @@ msgid "_Do not Synchronize"
 msgstr "ä¸?è¦?å??æ¥(_D)"
 
 #: ../mail/mail.error.xml.h:138
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:862
 msgid "_Empty Trash"
 msgstr "æ¸?ç??å??æ?¶ç?(_E)"
 
@@ -13367,23 +13339,23 @@ msgid "Shell Backend"
 msgstr "Shell å¾?ç«¯ç¨?å¼?"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4885
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4887
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4720
+#: ../mail/message-list.c:4722
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "æ²?æ??é?µä»¶ç¬¦å??ä½ ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4722
+#: ../mail/message-list.c:4724
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
 msgstr "å?¨é??å??è³?æ??å¤¾ä¸å?ªæ??é?±è??ç??é?µä»¶ã??ä½¿ç?¨ æª¢è¦?->é¡¯ç¤ºé?±è??ç??é?µä»¶ ä¾?é¡¯ç¤ºå®?å??ã??"
 
-#: ../mail/message-list.c:4724
+#: ../mail/message-list.c:4726
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -13421,27 +13393,27 @@ msgid "Subject - Trimmed"
 msgstr "ä¸»æ?¨ - å·²æ?ªç?"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Body contains"
 msgstr "å?§æ??å??å?«"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Message contains"
 msgstr "é?µä»¶å??å?«"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Sender contains"
 msgstr "å¯?ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Subject contains"
 msgstr "ä¸»æ?¨å??å?«"
 
@@ -13508,6 +13480,7 @@ msgid "Details"
 msgstr "è©³ç´°è³?æ??"
 
 #: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ£å?¨æ??å°?"
 
@@ -13619,7 +13592,7 @@ msgid "_Contact"
 msgstr "è?¯çµ¡äºº(_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:763
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "Create a new contact"
 msgstr "å»ºç«?æ?°ç??è?¯çµ¡äºº"
 
@@ -13629,7 +13602,7 @@ msgid "Contact _List"
 msgstr "è?¯çµ¡äººæ¸?å?®(_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:770
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "Create a new contact list"
 msgstr "å»ºç«?æ?°ç??è?¯çµ¡äººæ¸?å?®"
 
@@ -13639,7 +13612,7 @@ msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:693
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "Create a new address book"
 msgstr "å»ºç«?æ?°é??è¨?é??"
 
@@ -13659,9 +13632,8 @@ msgid "Source List"
 msgstr "ä¾?æº?æ¸?å?®"
 
 #: ../modules/addressbook/e-book-shell-backend.c:597
-#, fuzzy
 msgid "The registry of address books"
-msgstr "æ?¬å?°ç«¯é??è¨?é??"
+msgstr "é??è¨?é??ç??è¨»å??è¡¨"
 
 #: ../modules/addressbook/e-book-shell-content.c:364
 msgid "Current View"
@@ -13680,15 +13652,15 @@ msgid "The contact being shown in the preview pane"
 msgstr "è¦?é¡¯ç¤ºå?¨é ?è¦½çª?æ ¼ç??è?¯çµ¡äºº"
 
 #: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:613
-#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/calendar/e-memo-shell-content.c:617
+#: ../modules/calendar/e-task-shell-content.c:639
 #: ../modules/mail/e-mail-shell-content.c:688
 msgid "Preview is Visible"
 msgstr "é ?è¦½ç?ºé¡¯ç¤ºç??æ??"
 
 #: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:614
-#: ../modules/calendar/e-task-shell-content.c:636
+#: ../modules/calendar/e-memo-shell-content.c:618
+#: ../modules/calendar/e-task-shell-content.c:640
 #: ../modules/mail/e-mail-shell-content.c:689
 msgid "Whether the preview pane is visible"
 msgstr "é ?è¦½çª?æ ¼æ?¯å?¦ç?ºå?¯è¦?"
@@ -13743,9 +13715,9 @@ msgstr ""
 "ç?¶ Evolution ç§»è½?ä½ ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç?å??..."
 
 #: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:608
-#: ../modules/calendar/e-memo-shell-sidebar.c:543
-#: ../modules/calendar/e-task-shell-sidebar.c:541
+#: ../modules/calendar/e-cal-shell-sidebar.c:756
+#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#: ../modules/calendar/e-task-shell-sidebar.c:682
 msgid "Source Selector Widget"
 msgstr "ä¾?æº?é?¸æ??å?¨è¦?çª?å??ä»¶"
 
@@ -13758,227 +13730,227 @@ msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºé??è¨?é??ç??ç¾£çµ?"
 msgid "Save as vCard"
 msgstr "å?²å?ç?º vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:670
+#: ../modules/addressbook/e-book-shell-view-actions.c:662
 msgid "Co_py All Contacts To..."
 msgstr "è¤?è£½æ??æ??ç??è?¯çµ¡äººå?°(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:672
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Copy the contacts of the selected address book to another"
 msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??è?¯çµ¡äººè¤?è£½å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:677
+#: ../modules/addressbook/e-book-shell-view-actions.c:669
 msgid "D_elete Address Book"
 msgstr "å?ªé?¤é??è¨?é??(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:679
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "Delete the selected address book"
 msgstr "å?ªé?¤é?¸å??ç??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:684
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
 msgid "Mo_ve All Contacts To..."
 msgstr "å°?æ??æ??ç??è?¯çµ¡äººç§»å?°(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:686
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Move the contacts of the selected address book to another"
 msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??è?¯çµ¡äººç§»å??å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:691
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "_New Address Book"
 msgstr "æ?°å¢?é??è¨?é??(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:698
+#: ../modules/addressbook/e-book-shell-view-actions.c:690
 msgid "Address _Book Properties"
 msgstr "é??è¨?é??å±¬æ?§(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Show properties of the selected address book"
 msgstr "é¡¯ç¤ºé?¸å??é??è¨?é??ç??å±¬æ?§"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:705
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
-#: ../modules/calendar/e-task-shell-view-actions.c:755
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
+#: ../modules/addressbook/e-book-shell-view-actions.c:697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_Rename..."
 msgstr "é??æ?°å?½å??(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:707
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
 msgid "Rename the selected address book"
 msgstr "é??æ?°å?½å??é?¸å??ç??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:712
+#: ../modules/addressbook/e-book-shell-view-actions.c:704
 msgid "S_ave Address Book as vCard"
 msgstr "å°?é??è¨?é??å?¦å?ç?º vC_ard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:714
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??è?¯çµ¡äººå?²å?ç?º vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:721
+#: ../modules/addressbook/e-book-shell-view-actions.c:713
 msgid "Stop loading"
 msgstr "å??æ¢è¼?å?¥"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:726
+#: ../modules/addressbook/e-book-shell-view-actions.c:718
 msgid "_Copy Contact To..."
 msgstr "è¤?è£½è?¯çµ¡äººå?°(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:728
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "Copy selected contacts to another address book"
 msgstr "å°?é?¸å??ç??è?¯çµ¡äººè¤?è£½å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:733
+#: ../modules/addressbook/e-book-shell-view-actions.c:725
 msgid "_Delete Contact"
 msgstr "å?ªé?¤è?¯çµ¡äºº(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:740
+#: ../modules/addressbook/e-book-shell-view-actions.c:732
 msgid "_Find in Contact..."
 msgstr "å?¨è?¯çµ¡äººå?§å°?æ?¾(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "Search for text in the displayed contact"
 msgstr "æ??å°?é¡¯ç¤ºç??è?¯çµ¡äººä¸ç??æ??å?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:747
+#: ../modules/addressbook/e-book-shell-view-actions.c:739
 msgid "_Forward Contact..."
 msgstr "è½?å¯?è?¯çµ¡äºº(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:749
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "Send selected contacts to another person"
 msgstr "å?³é??é?¸å??è?¯çµ¡äººçµ¦å?¶ä»?ä½¿ç?¨è??ã??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:754
+#: ../modules/addressbook/e-book-shell-view-actions.c:746
 msgid "_Move Contact To..."
 msgstr "å°?è?¯çµ¡äººç§»å?°(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:756
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "Move selected contacts to another address book"
 msgstr "å°?é?¸å??ç??è?¯çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:761
+#: ../modules/addressbook/e-book-shell-view-actions.c:753
 msgid "_New Contact..."
 msgstr "æ?°å¢?è?¯çµ¡äºº(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:768
+#: ../modules/addressbook/e-book-shell-view-actions.c:760
 msgid "New Contact _List..."
 msgstr "æ?°å¢?è?¯çµ¡äººæ¸?å?®(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:775
+#: ../modules/addressbook/e-book-shell-view-actions.c:767
 msgid "_Open Contact"
 msgstr "é??å??è?¯çµ¡äºº(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:777
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "View the current contact"
 msgstr "æª¢è¦?ç?®å??ç??è?¯çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:782
+#: ../modules/addressbook/e-book-shell-view-actions.c:774
 msgid "_Send Message to Contact..."
 msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:784
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "Send a message to the selected contacts"
 msgstr "å?³é??é?µä»¶è?³é?¸å??ç??è?¯çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:791
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "_Actions"
 msgstr "å??ä½?(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:798
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/mail/e-mail-shell-view-actions.c:1088
 msgid "_Preview"
 msgstr "é ?è¦½(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:807
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
-#: ../modules/calendar/e-task-shell-view-actions.c:833
+#: ../modules/addressbook/e-book-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Delete"
 msgstr "å?ªé?¤(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#: ../modules/addressbook/e-book-shell-view-actions.c:803
 msgid "_Properties"
 msgstr "å±¬æ?§(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:819
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "_Save as vCard..."
 msgstr "å?²å?æ?? _vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Contact _Preview"
 msgstr "è?¯çµ¡äººé ?è¦½(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
 msgid "Show contact preview window"
 msgstr "é¡¯ç¤ºè?¯çµ¡äººé ?è¦½è¦?çª?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:868
-#: ../modules/calendar/e-memo-shell-view-actions.c:738
-#: ../modules/calendar/e-task-shell-view-actions.c:902
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "_Classic View"
 msgstr "å?³çµ±æª¢è¦?(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "Show contact preview below the contact list"
 msgstr "å?¨è?¯çµ¡äººæ¸?å?®ä¸?æ?¹é¡¯ç¤ºè?¯çµ¡äººé ?è¦½"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:875
-#: ../modules/calendar/e-memo-shell-view-actions.c:745
-#: ../modules/calendar/e-task-shell-view-actions.c:909
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/calendar/e-memo-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "_Vertical View"
 msgstr "å??ç?´æª¢è¦?(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "Show contact preview alongside the contact list"
 msgstr "å?¨è?¯çµ¡äººæ¸?å?®æ??é??é¡¯ç¤ºè?¯çµ¡äººé ?è¦½"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
-#: ../modules/calendar/e-memo-shell-view-actions.c:755
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
-#: ../modules/calendar/e-cal-shell-view-actions.c:1616
-#: ../modules/calendar/e-memo-shell-view-actions.c:762
-#: ../modules/calendar/e-task-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:1608
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:953
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 #: ../shell/e-shell-content.c:516
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
 # zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:935
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Print all shown contacts"
 msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
 
 # zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Preview the contacts to be printed"
 msgstr "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
 
 # zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "Print selected contacts"
 msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Save as vCard..."
 msgstr "å?²å?ç?º vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
 msgid "Save selected contacts as a vCard"
 msgstr "å°?é?¸å??ç??è?¯çµ¡äººå?²å?ç?º vCard"
 
@@ -14059,7 +14031,7 @@ msgstr "ç?»å?¥(_G):"
 #: ../modules/addressbook/ldap-config.ui.h:12
 #, fuzzy
 msgid "One"
-msgstr "ç?¡(_O)"
+msgstr "One"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search Filter"
@@ -14083,7 +14055,7 @@ msgstr "æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?
 #: ../modules/addressbook/ldap-config.ui.h:19
 #, fuzzy
 msgid "Sub"
-msgstr "ä¸?æ¨?"
+msgstr "Sub"
 
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "Supported Search Bases"
@@ -14175,7 +14147,7 @@ msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new appointment"
 msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
 
@@ -14203,12 +14175,12 @@ msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1281
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "å»ºç«?æ?°è¡?äº?æ??"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2644
+#: ../plugins/itip-formatter/itip-formatter.c:2657
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
@@ -14240,9 +14212,9 @@ msgstr "ç?¡æ³?å¾? evolution/config.xmldb ç§»è½?è??è¨å®?"
 msgid "Unable to migrate calendar `%s'"
 msgstr "ç?¡æ³?ç§»è½?ç§»è¡?äº?æ?? `%s'"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:152
-#: ../modules/calendar/e-memo-shell-sidebar.c:149
-#: ../modules/calendar/e-task-shell-sidebar.c:147
+#: ../modules/calendar/e-cal-shell-sidebar.c:162
+#: ../modules/calendar/e-memo-shell-sidebar.c:157
+#: ../modules/calendar/e-task-shell-sidebar.c:157
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14251,27 +14223,35 @@ msgstr ""
 "%s ç?¼ç??é?¯èª¤\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:185
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
 msgid "Loading calendars"
 msgstr "æ£å?¨è¼?å?¥è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:425
+#: ../modules/calendar/e-cal-shell-sidebar.c:610
 msgid "Calendar Selector"
 msgstr "è¡?äº?æ??é?¸æ??å?¨"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:598
+#: ../modules/calendar/e-cal-shell-sidebar.c:736
 msgid "Date Navigator Widget"
 msgstr "æ?¥æ??ç??è¦½è¦?çª?å??ä»¶"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:599
+#: ../modules/calendar/e-cal-shell-sidebar.c:737
 msgid "This widget displays a miniature calendar"
 msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºä¸?å??å°?å??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:609
+#: ../modules/calendar/e-cal-shell-sidebar.c:746
+msgid "Default Calendar Client"
+msgstr "é ?è¨è¡?äº?æ??å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:747
+msgid "Default client for calendar operations"
+msgstr "è¡?äº?æ??æ??ä½?ç??é ?è¨å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:757
 msgid "This widget displays groups of calendars"
 msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºè¡?äº?æ??ç??ç¾£çµ?"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:770
+#: ../modules/calendar/e-cal-shell-sidebar.c:944
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
@@ -14313,248 +14293,246 @@ msgstr "äº?ä»¶"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
 #: ../modules/calendar/e-memo-shell-view-actions.c:507
-#: ../modules/calendar/e-task-shell-view-actions.c:632
+#: ../modules/calendar/e-task-shell-view-actions.c:624
 msgid "Save as iCalendar"
 msgstr "å?²å?ç?º iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "_Copy..."
 msgstr "è¤?è£½(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "D_elete Calendar"
 msgstr "å?ªé?¤è¡?äº?æ??(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
 msgid "Delete the selected calendar"
 msgstr "å?ªé?¤é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Back"
 msgstr "å??å¾?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Go Forward"
 msgstr "å??å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Today"
 msgstr "é?¸æ??ä»?å¤©(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select today"
 msgstr "é?¸å??ä»?æ?¥"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 msgid "Select _Date"
 msgstr "é?¸æ??æ?¥æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Select a specific date"
 msgstr "é?¸å??ç?¹å®?æ?¥æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1279
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "æ?°å¢?è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Purg_e"
 msgstr "æ¸?é?¤(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
 msgstr "å?ªé?¤è??ç´?æ??å??æ??è°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Re_fresh"
 msgstr "é??æ?°æ?´ç??(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Refresh the selected calendar"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
 msgstr "é??æ?°å?½å??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Show _Only This Calendar"
 msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Cop_y to Calendar..."
 msgstr "è¤?è£½è?³è¡?äº?æ??(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "_Delegate Meeting..."
 msgstr "å§?æ´¾æ??è°(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "_Delete Appointment"
 msgstr "å?ªé?¤ç´?æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
 msgid "Delete selected appointments"
 msgstr "å?ªé?¤é?¸å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Delete This _Occurrence"
-msgstr "å?ªé?¤é??å??äº?ä»¶(_O)"
+msgstr "å?ªé?¤é??æ¬¡ç?¼ç??ç??äº?ä»¶(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
 msgid "Delete this occurrence"
 msgstr "å?ªé?¤æ¤é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Delete All Occ_urrences"
-msgstr "æ?¯å?¦å?ªé?¤æ??æ??ç??ä¾¿æ¢?ï¼?"
+msgstr "å?ªé?¤æ??æ??ç?¼ç??ç??äº?ä»¶(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Delete all occurrences"
 msgstr "å?ªé?¤å?¨é?¨é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "New All Day _Event..."
 msgstr "æ?°å¢?å?¨å¤©äº?ä»¶(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Create a new all day event"
 msgstr "å»ºç«?æ?°ç??å?¨å¤©äº?ä»¶"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-memo-shell-view-actions.c:581
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "_Forward as iCalendar..."
 msgstr "ä»¥ iCale_ndar è½?å¯?..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "New _Meeting..."
 msgstr "æ?°å¢?æ??è°(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Create a new meeting"
 msgstr "å»ºç«?æ?°ç??æ??è°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Mo_ve to Calendar..."
 msgstr "ç§»è?³è¡?äº?æ??(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New _Appointment..."
 msgstr "æ?°å¢?ç´?æ??(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "Make this Occurrence _Movable"
 msgstr "å°?é??å??äº?ä»¶æ¨?ç¤ºæ??å?¯ç§»å??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "_Open Appointment"
 msgstr "é??å??ç´?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "View the current appointment"
 msgstr "æª¢è¦?ç?®å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "_Reply"
 msgstr "å??è¦?(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "å?²å?ç?º iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Schedule Meeting..."
 msgstr "æ??è°æ??ç¨?(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "Converts an appointment to a meeting"
 msgstr "å°?ç´?æ??è½?æ??ç?ºæ??è°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "Conv_ert to Appointment..."
 msgstr "è½?æ??ç?ºç´?æ??(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
 msgid "Converts a meeting to an appointment"
 msgstr "å°?æ??è°è½?æ??ç?ºç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Day"
 msgstr "å¤©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one day"
 msgstr "é¡¯ç¤ºä¸?å¤©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "List"
 msgstr "æ¸?å?®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show as list"
 msgstr "é¡¯ç¤ºæ??æ¸?å?®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
 msgid "Month"
 msgstr "æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1565
 msgid "Show one month"
 msgstr "é¡¯ç¤ºä¸?å??æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1570
 msgid "Week"
 msgstr "é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1572
 msgid "Show one week"
 msgstr "é¡¯ç¤ºä¸?é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one work week"
 msgstr "é¡¯ç¤ºä¸?å??å·¥ä½?é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Active Appointments"
 msgstr "é?²è¡?ä¸ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1601
 msgid "Next 7 Days' Appointments"
 msgstr "æ?ªä¾? 7 å¤©ç??ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:786
-#: ../modules/calendar/e-task-shell-view-actions.c:985
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:977
 msgid "Description contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
-#: ../modules/calendar/e-memo-shell-view-actions.c:793
-#: ../modules/calendar/e-task-shell-view-actions.c:992
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-memo-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Summary contains"
 msgstr "ä¸»æ?¨å??å?«"
 
 # zh_HK: msgstr "å??å?°é??å??è¡?äº?æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Print this calendar"
 msgstr "å??å?°é??å??è¡?äº?æ??"
 
 # zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "Preview the calendar to be printed"
 msgstr "é ?è¦½å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Go To"
 msgstr "ç§»è?³"
 
@@ -14566,35 +14544,35 @@ msgid "memo"
 msgstr "å??å¿?é??"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "New _Memo"
 msgstr "æ?°å¢?å??å¿?é??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
 msgid "Create a new memo"
 msgstr "å»ºç«?æ?°ç??å??å¿?é??"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:652
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "_Open Memo"
 msgstr "é??å??å??å¿?é??(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-memo-shell-view-actions.c:646
 msgid "View the selected memo"
 msgstr "æª¢è¦?é?¸å??ç??å??å¿?é??"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "Open _Web Page"
 msgstr "é??å??ç¶²é ?(_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
+#: ../modules/calendar/e-memo-shell-view-actions.c:811
 msgid "Print the selected memo"
 msgstr "æ??å?°é?¸å??ç??å??å¿?é??"
 
@@ -14603,22 +14581,22 @@ msgstr "æ??å?°é?¸å??ç??å??å¿?é??"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:630
+#: ../modules/calendar/e-task-shell-view-actions.c:622
 msgid "task"
 msgstr "å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Assign Task"
 msgstr "æ??æ´¾å·¥ä½?(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "_Mark as Complete"
 msgstr "æ¨?ç¤ºç?ºå®?æ??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "Mark selected tasks as complete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??å®?æ??"
 
@@ -14627,39 +14605,39 @@ msgid "_Mark as Incomplete"
 msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as incomplete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??æ?ªå®?æ??"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "New _Task"
 msgstr "æ?°å¢?å·¥ä½?(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Create a new task"
 msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "_Open Task"
 msgstr "é??å??å·¥ä½?(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "View the selected task"
 msgstr "æª¢è¦?é?¸å??ç??å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:834
-#: ../modules/calendar/e-task-shell-view-actions.c:1033
+#: ../modules/calendar/e-memo-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "_Save as iCalendar..."
 msgstr "å?²å?ç?º iCalendar[_S]..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../modules/calendar/e-task-shell-view-actions.c:1010
 msgid "Print the selected task"
 msgstr "æ??å?°é?¸å??ç??å·¥ä½?"
 
@@ -14683,7 +14661,7 @@ msgid "Memo Li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
 #: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:604
 msgid "Create a new memo list"
 msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
 
@@ -14691,23 +14669,31 @@ msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
 msgid "The registry of memo lists"
 msgstr "å??å¿?é??æ¸?å?®ç??è¨»å??è¡¨"
 
-#: ../modules/calendar/e-memo-shell-content.c:604
+#: ../modules/calendar/e-memo-shell-content.c:608
 msgid "The memo table model"
 msgstr "å??å¿?é??è¡¨æ ¼æ¨¡å??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:182
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
 msgid "Loading memos"
 msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:396
+#: ../modules/calendar/e-memo-shell-sidebar.c:564
 msgid "Memo List Selector"
 msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:544
+#: ../modules/calendar/e-memo-shell-sidebar.c:672
+msgid "Default Memo Client"
+msgstr "é ?è¨å??å¿?é??å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:673
+msgid "Default client for memo operations"
+msgstr "å??å¿?é??æ??ä½?ç??é ?è¨å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:683
 msgid "This widget displays groups of memo lists"
 msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºå??å¿?é??æ¸?å?®ç??ç¾£çµ?"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:697
+#: ../modules/calendar/e-memo-shell-sidebar.c:862
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
@@ -14718,76 +14704,76 @@ msgstr "é??å??å?¨ %s ç??å??å¿?é??"
 msgid "Print Memos"
 msgstr "å??å?°å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
 msgid "_Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:574
 msgid "_Find in Memo..."
 msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:576
 msgid "Search for text in the displayed memo"
 msgstr "æ??å°?é¡¯ç¤ºç??å??å¿?é??ä¸ç??æ??å?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
 msgid "D_elete Memo List"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:597
 msgid "Delete the selected memo list"
 msgstr "å?ªé?¤é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "_New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-memo-shell-view-actions.c:618
 msgid "Refresh the selected memo list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:625
 msgid "Rename the selected memo list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:630
 msgid "Show _Only This Memo List"
 msgstr "å?ªé¡¯ç¤ºæ¤å??å¿?é??æ¸?å?®(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
 msgid "Memo _Preview"
 msgstr "å??å¿?é??é ?è¦½(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:711
 msgid "Show memo preview pane"
 msgstr "é¡¯ç¤ºå??å¿?é??é ?è¦½çª?æ ¼"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-memo-shell-view-actions.c:732
 msgid "Show memo preview below the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå??å¿?é??é ?è¦½"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-memo-shell-view-actions.c:739
 msgid "Show memo preview alongside the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®æ??é??é¡¯ç¤ºå??å¿?é??é ?è¦½"
 
 # zh_HK: msgstr "å??å?°å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-memo-shell-view-actions.c:797
 msgid "Print the list of memos"
 msgstr "å??å?°å??å¿?é??æ¸?å?®"
 
 # zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#: ../modules/calendar/e-memo-shell-view-actions.c:804
 msgid "Preview the list of memos to be printed"
 msgstr "é ?è¦½å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:413
+#: ../modules/calendar/e-memo-shell-view-private.c:414
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d é ?å??å¿?é??"
 msgstr[1] "%d é ?å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:417
+#: ../modules/calendar/e-memo-shell-view-private.c:418
 #: ../modules/calendar/e-task-shell-view-private.c:567
 #, c-format
 msgid "%d selected"
@@ -14821,7 +14807,7 @@ msgid "Tas_k List"
 msgstr "å·¥ä½?æ¸?å?®(_K)"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
 
@@ -14829,7 +14815,7 @@ msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
 msgid "The registry of task lists"
 msgstr "å·¥ä½?æ¸?å?®ç??è¨»å??è¡¨"
 
-#: ../modules/calendar/e-task-shell-content.c:626
+#: ../modules/calendar/e-task-shell-content.c:630
 msgid "The task table model"
 msgstr "å·¥ä½?è¡¨æ ¼æ¨¡å??"
 
@@ -14850,29 +14836,37 @@ msgstr ""
 msgid "Unable to migrate tasks `%s'"
 msgstr "ç?¡æ³?ç§»è½?å·¥ä½? `%s'"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:180
+#: ../modules/calendar/e-task-shell-sidebar.c:216
 msgid "Loading tasks"
 msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:394
+#: ../modules/calendar/e-task-shell-sidebar.c:564
 msgid "Task List Selector"
 msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:542
+#: ../modules/calendar/e-task-shell-sidebar.c:672
+msgid "Default Task Client"
+msgstr "é ?è¨å·¥ä½?å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:673
+msgid "Default client for task operations"
+msgstr "å·¥ä½?æ??ä½?ç??é ?è¨å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:683
 msgid "This widget displays groups of task lists"
 msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºå·¥ä½?æ¸?å?®ç??ç¾£çµ?"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:695
+#: ../modules/calendar/e-task-shell-sidebar.c:862
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
 msgid "Print Tasks"
 msgstr "æ??å?°å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:574
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -14883,97 +14877,97 @@ msgstr ""
 "\n"
 "ç¢ºå®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "_Delete Task"
 msgstr "å?ªé?¤å·¥ä½?(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:698
 msgid "_Find in Task..."
 msgstr "å?¨å·¥ä½?å?§å°?æ?¾(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Search for text in the displayed task"
 msgstr "æ??å°?é¡¯ç¤ºç??å·¥ä½?ä¸ç??æ??å?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:720
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Copy..."
 msgstr "è¤?è£½..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:719
 msgid "D_elete Task List"
 msgstr "å?ªé?¤å·¥ä½?æ¸?å?®(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:721
 msgid "Delete the selected task list"
 msgstr "å?ªé?¤é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
 msgstr "æ?°å¢?å·¥ä½?æ¸?å?®(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Refresh the selected task list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:754
 msgid "Show _Only This Task List"
 msgstr "å?ªé¡¯ç¤ºæ¤å·¥ä½?æ¸?å?®(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "Mar_k as Incomplete"
 msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-task-shell-view-actions.c:798
 msgid "Delete completed tasks"
 msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../modules/calendar/e-task-shell-view-actions.c:873
 msgid "Task _Preview"
 msgstr "å·¥ä½?é ?è¦½(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:875
 msgid "Show task preview pane"
 msgstr "é¡¯ç¤ºå·¥ä½?é ?è¦½çª?æ ¼"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:904
+#: ../modules/calendar/e-task-shell-view-actions.c:896
 msgid "Show task preview below the task list"
 msgstr "å?¨å·¥ä½?æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå·¥ä½?é ?è¦½"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/calendar/e-task-shell-view-actions.c:903
 msgid "Show task preview alongside the task list"
 msgstr "å?¨å·¥ä½?æ¸?å?®æ??é??é¡¯ç¤ºå·¥ä½?é ?è¦½"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 msgid "Active Tasks"
 msgstr "é?²è¡?ä¸ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:925
 msgid "Completed Tasks"
 msgstr "å·²å®?æ??ç??å·¥ä½? "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:932
 msgid "Next 7 Days' Tasks"
 msgstr "æ?ªä¾? 7 å¤©ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:947
+#: ../modules/calendar/e-task-shell-view-actions.c:939
 msgid "Overdue Tasks"
 msgstr "é??æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:946
 msgid "Tasks with Attachments"
 msgstr "æ??é??ä»¶ç??å·¥ä½?"
 
 # zh_HK: msgstr "å??å?°å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/calendar/e-task-shell-view-actions.c:996
 msgid "Print the list of tasks"
 msgstr "å??å?°å·¥ä½?æ¸?å?®"
 
 # zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../modules/calendar/e-task-shell-view-actions.c:1003
 msgid "Preview the list of tasks to be printed"
 msgstr "é ?è¦½å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
 
@@ -15051,351 +15045,362 @@ msgstr "æ ¹æ??ç?¸é??é?µä»¶ç?ºç¾£çµ?"
 msgid "Whether to group messages by threads"
 msgstr "æ?¯å?¦æ ¹æ??ç?¸é??é?µä»¶ä»¥ç¾£çµ?æ?¹å¼?é¡¯ç¤º"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view.c:526
+#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "å??ç?¨å¸³è??(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Disable this account"
 msgstr "å??ç?¨é??å??å¸³è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:864
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??è³?æ??å¤¾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "C_reate Search Folder From Search..."
 msgstr "å¾?æ??å°?å»ºç«?æ??å°?è³?æ??å¤¾(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "_Download Messages for Offline Usage"
 msgstr "ä¸?è¼?é?¢ç·?ä½¿ç?¨ç??é?µä»¶(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
-msgid "Download messages of accounts and folders marked for offline"
-msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??å¸³è??/è³?æ??å¤¾ä¹?é?µä»¶"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:934
-msgid "Empty _Trash"
-msgstr "æ¸?ç??å??æ?¶ç?(_T)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:943
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??è³?æ??å¤¾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
+#: ../modules/mail/e-mail-shell-view-actions.c:878
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??å¸³è??è??è³?æ??å¤¾ä¹?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç??å¯?ä»¶å?£(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_Copy Folder To..."
 msgstr "è¤?è£½è³?æ??å¤¾å?°(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Copy the selected folder into another folder"
 msgstr "è¤?è£½å·²é?¸å®?ç??è³?æ??å¤¾å?°å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Permanently remove this folder"
 msgstr "æ°¸ä¹?ç§»é?¤é??å??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:904
 msgid "E_xpunge"
 msgstr "å?ªé?¤(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æ°¸ä¹?ç§»é?¤å?¨é??å??è³?æ??å¤¾å?§å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "Mar_k All Messages as Read"
 msgstr "æ¨?ç¤ºæ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Mark all messages in the folder as read"
 msgstr "å°?è³?æ??å¤¾ä¸å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "_Move Folder To..."
 msgstr "ç§»å??è³?æ??å¤¾å?°(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Move the selected folder into another folder"
 msgstr "å°?é?¸å®?ç??è³?æ??å¤¾ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "_New..."
 msgstr "æ?°å¢?(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Create a new folder for storing mail"
 msgstr "å»ºç«?ä¸?å??æ?°è³?æ??å¤¾ä»¥å?²å?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Change the properties of this folder"
 msgstr "æ?´æ?¹é??å??è³?æ??å¤¾ç??å±¬æ?§"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Refresh the folder"
 msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
+#: ../modules/mail/e-mail-shell-view-actions.c:948
 msgid "Change the name of this folder"
 msgstr "æ?´æ?¹é??å??è³?æ??å¤¾ç??å??ç¨±"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1018
+#: ../modules/mail/e-mail-shell-view-actions.c:953
 msgid "Select Message _Thread"
 msgstr "é?¸æ??é?µä»¶æª?é (_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1020
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "Select all messages in the same thread as the selected message"
 msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1025
+#: ../modules/mail/e-mail-shell-view-actions.c:960
 msgid "Select Message S_ubthread"
 msgstr "é?¸æ??é?µä»¶å?ç¾£çµ?(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1027
+#: ../modules/mail/e-mail-shell-view-actions.c:962
 msgid "Select all replies to the currently selected message"
 msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
+#: ../modules/mail/e-mail-shell-view-actions.c:967
 msgid "_Unsubscribe"
 msgstr "å??æ¶?è¨?é?±(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:969
 msgid "Unsubscribe from the selected folder"
 msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:974
+msgid "Empty _Trash"
+msgstr "æ¸?ç??å??æ?¶ç?(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??å¸³è??å?§å?¨é?¨å·²å?ªé?¤ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:981
 msgid "_New Label"
 msgstr "æ?°å¢?æ¨?ç±¤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:988
 msgid "N_one"
 msgstr "æ²?æ??(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:995
 msgid "Hide _Read Messages"
 msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Temporarily hide all messages that have already been read"
 msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1002
 msgid "Hide S_elected Messages"
 msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Temporarily hide the selected messages"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
 msgid "Show Hidde_n Messages"
 msgstr "é¡¯ç¤ºé?±è??ç??é?µä»¶(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "Show messages that have been temporarily hidden"
 msgstr "é¡¯ç¤ºæ?«æ??é?±è??ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
 msgid "Cancel the current mail operation"
 msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#: ../modules/mail/e-mail-shell-view-actions.c:1037
 msgid "Collapse All _Threads"
 msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1097
+#: ../modules/mail/e-mail-shell-view-actions.c:1039
 msgid "Collapse all message threads"
 msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1102
+#: ../modules/mail/e-mail-shell-view-actions.c:1044
 msgid "E_xpand All Threads"
 msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1104
+#: ../modules/mail/e-mail-shell-view-actions.c:1046
 msgid "Expand all message threads"
 msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
+#: ../modules/mail/e-mail-shell-view-actions.c:1051
 msgid "_Message Filters"
 msgstr "é?µä»¶è¦?å??(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1111
+#: ../modules/mail/e-mail-shell-view-actions.c:1053
 msgid "Create or edit rules for filtering new mail"
 msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??ç·¨è¼¯é??æ¿¾è¦?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1116
+#: ../modules/mail/e-mail-shell-view-actions.c:1058
 msgid "Search F_olders"
 msgstr "æ??å°?è³?æ??å¤¾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1118
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
 msgid "Create or edit search folder definitions"
 msgstr "å»ºç«?æ??ç·¨è¼¯æ??å°?è³?æ??å¤¾ç??å®?ç¾©"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
 msgid "_Subscriptions..."
 msgstr "è¨?é?±(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1125
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1132
+#: ../modules/mail/e-mail-shell-view-actions.c:1074
 msgid "F_older"
 msgstr "è³?æ??å¤¾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
+#: ../modules/mail/e-mail-shell-view-actions.c:1081
 msgid "_Label"
 msgstr "æ¨?ç±¤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
 msgid "_New Folder..."
 msgstr "æ?°å¢?è³?æ??å¤¾(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Hide _Deleted Messages"
 msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??ä»¥å?ªé?¤ç·?ç??å½¢å¼?é¡¯ç¤º"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Show Message _Preview"
 msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Show message preview pane"
 msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½çª?æ ¼"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "_Group By Threads"
 msgstr "æ ¹æ??ç?¸é??é?µä»¶ç?ºç¾£çµ?(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Threaded message list"
 msgstr "ç?¸é??é?µä»¶æ¸?å?®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Show message preview below the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸?æ?¹é¡¯ç¤ºé?µä»¶é ?è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "Show message preview alongside the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®æ??é??é¡¯ç¤ºé?µä»¶é ?è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
 msgid "All Messages"
 msgstr "æ??æ??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1207
 msgid "Important Messages"
 msgstr "é??è¦?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
 msgid "Last 5 Days' Messages"
 msgstr "æ??è¿? 5 å¤©ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1221
 msgid "Messages Not Junk"
 msgstr "é??å??å?¾é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
 msgid "Messages with Attachments"
 msgstr "æ??é??ä»¶ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
 msgid "No Label"
 msgstr "ç?¡æ¨?ç±¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
 msgid "Read Messages"
 msgstr "å·²è®?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
 msgid "Recent Messages"
 msgstr "æ??è¿?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
 msgid "Unread Messages"
 msgstr "æ?ªè®?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Subject or Addresses contain"
 msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
 msgid "All Accounts"
 msgstr "æ??æ??ç??å¸³è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
 msgid "Current Account"
 msgstr "ç?®å??ç??å¸³è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1390
+#: ../modules/mail/e-mail-shell-view-actions.c:1332
 msgid "Current Folder"
 msgstr "ç?®å??ç??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:836
+#: ../modules/mail/e-mail-shell-view-private.c:889
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:847
+#: ../modules/mail/e-mail-shell-view-private.c:900
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d å°?å·²å?ªé?¤"
 msgstr[1] "%d å°?å·²å?ªé?¤"
 
-#: ../modules/mail/e-mail-shell-view-private.c:853
-#: ../modules/mail/e-mail-shell-view-private.c:860
+#: ../modules/mail/e-mail-shell-view-private.c:906
+#: ../modules/mail/e-mail-shell-view-private.c:913
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 msgstr[1] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:866
+#: ../modules/mail/e-mail-shell-view-private.c:919
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å??è??ç¨¿"
 msgstr[1] "%d å??è??ç¨¿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:872
+#: ../modules/mail/e-mail-shell-view-private.c:925
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå?³é??"
 msgstr[1] "%d å°?æ?ªå?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:878
+#: ../modules/mail/e-mail-shell-view-private.c:931
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å?³é??"
 msgstr[1] "%d å°?å·²å?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:890
+#: ../modules/mail/e-mail-shell-view-private.c:943
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d å°?æ?ªè®?ï¼?"
 msgstr[1] "%d å°?æ?ªè®?ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:893
+#: ../modules/mail/e-mail-shell-view-private.c:946
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å?± %d å°?"
 msgstr[1] "å?± %d å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:524
+#: ../modules/mail/e-mail-shell-view.c:548
+msgid "All Account Search"
+msgstr "æ??æ??ç??å¸³è??æ??å°?"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "å¸³è??æ??å°?"
+
+#: ../modules/mail/e-mail-shell-view.c:873
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??ä¼ºæ??å?¨(_L)"
 
@@ -15921,11 +15926,9 @@ msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
 msgstr "è¼¸å?¥ä½¿ç?¨è?? <b>%s</b> å?¨ä¼ºæ??å?¨ <b>%s</b> ä¸?ç??å¯?ç¢¼ "
 
 #: ../plugins/caldav/caldav-browse-server.c:856
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create soup message for URL '%s'"
-msgstr ""
-"ä¸?è?½å»ºç«?è¼¸å?ºæª?æ¡?ï¼?%sï¼?\n"
-" %s"
+msgstr "ä¸?è?½å»ºç«? URLã??%sã??ç?? soup è¨?æ?¯"
 
 #. fetch content
 #: ../plugins/caldav/caldav-browse-server.c:1091
@@ -15958,27 +15961,26 @@ msgstr "ç??è¦½ CalDAV è¡?äº?æ??"
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:402
-#: ../plugins/calendar-http/calendar-http.c:171
+#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "ç¶²å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:426
-#: ../plugins/google-account-setup/google-contacts-source.c:303
+#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "ä½¿ç?¨ _SSL"
 
-#: ../plugins/caldav/caldav-source.c:468
+#: ../plugins/caldav/caldav-source.c:228
 msgid "Brows_e server for a calendar"
 msgstr "ç??è¦½ä¼ºæ??å?¨ç??è¡?äº?æ??(_E)"
 
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:480
-#: ../plugins/calendar-file/calendar-file.c:274
-#: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:501
-#: ../plugins/google-account-setup/google-contacts-source.c:322
-#: ../plugins/google-account-setup/google-source.c:717
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/google-account-setup/google-contacts-source.c:323
+#: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
@@ -15990,31 +15992,31 @@ msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
 msgid "CalDAV Support"
 msgstr "CalDAV æ?¯æ?´"
 
-#: ../plugins/calendar-file/calendar-file.c:208
+#: ../plugins/calendar-file/calendar-file.c:112
 msgid "_Customize options"
 msgstr "è?ªé?¸é?¸é ?(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:227
+#: ../plugins/calendar-file/calendar-file.c:131
 msgid "File _name:"
 msgstr "æª?æ¡?å??ç¨±(_N):"
 
-#: ../plugins/calendar-file/calendar-file.c:231
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "Choose calendar file"
 msgstr "é?¸æ??è¡?äº?æ??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:279
+#: ../plugins/calendar-file/calendar-file.c:183
 msgid "On open"
 msgstr "æ?¼é??å??ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:280
+#: ../plugins/calendar-file/calendar-file.c:184
 msgid "On file change"
 msgstr "æ?¼æ?´æ?¹ç??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:281
+#: ../plugins/calendar-file/calendar-file.c:185
 msgid "Periodically"
 msgstr "é?±æ??æ?§ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:308
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "Force read _only"
 msgstr "å¼·å?¶å?¯è®?(_O)"
 
@@ -16026,11 +16028,11 @@ msgstr "å°?æ?¬å?°ç«¯è¡?äº?æ??å? å?¥ Evolutionã??"
 msgid "Local Calendars"
 msgstr "æ?¬å?°è¡?äº?æ??"
 
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_Secure connection"
 msgstr "å®?å?¨é?£ç·?(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:455
+#: ../plugins/calendar-http/calendar-http.c:186
 msgid "Userna_me:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_M):"
 
@@ -16083,21 +16085,21 @@ msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:379
+#: ../plugins/calendar-weather/calendar-weather.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:371
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:599
+#: ../plugins/calendar-weather/calendar-weather.c:446
 msgid "_Units:"
 msgstr "å?®ä½?(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#: ../plugins/calendar-weather/calendar-weather.c:453
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:607
+#: ../plugins/calendar-weather/calendar-weather.c:454
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(è?¯æ°?ã??å?¬å??ç?)"
 
@@ -16147,23 +16149,23 @@ msgstr "é ?è¨é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "ä½ æ?¯å?¦è¦?å°? Evolution è¨ç?ºä½ ç??é ?è¨é?»å?é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ï¼?"
 
-#: ../plugins/default-source/default-source.c:94
+#: ../plugins/default-source/default-source.c:75
 msgid "Mark as _default address book"
 msgstr "æ¨?ç¤ºç?ºé ?è¨é??è¨?é??(_D)"
 
-#: ../plugins/default-source/default-source.c:119
+#: ../plugins/default-source/default-source.c:88
 msgid "A_utocomplete with this address book"
 msgstr "ç?¨é??å??é??è¨?é??é?²è¡?è?ªå??å®?æ??(_U)"
 
-#: ../plugins/default-source/default-source.c:138
+#: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
 msgstr "æ¨?ç¤ºç?ºé ?è¨è¡?äº?æ??(_D)"
 
-#: ../plugins/default-source/default-source.c:139
+#: ../plugins/default-source/default-source.c:98
 msgid "Mark as _default task list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å·¥ä½?æ¸?å?®(_D)"
 
-#: ../plugins/default-source/default-source.c:140
+#: ../plugins/default-source/default-source.c:99
 msgid "Mark as _default memo list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å??å¿?é??æ¸?å?®(_D)"
 
@@ -16379,22 +16381,22 @@ 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:51
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:82
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+#: ../plugins/google-account-setup/google-contacts-source.c:273
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
 msgid "<b>Server</b>"
 msgstr "<b>ä¼ºæ??å?¨</b>"
 
-#: ../plugins/google-account-setup/google-source.c:517
+#: ../plugins/google-account-setup/google-source.c:439
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "è¼¸å?¥ä½¿ç?¨è?? %s ç??å¯?ç¢¼ä»¥å?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16403,17 +16405,17 @@ msgstr ""
 "ä¸?è?½å¾? Google ä¼ºæ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
 #: ../plugins/mail-to-task/mail-to-task.c:725
 #: ../plugins/mail-to-task/mail-to-task.c:941
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/google-account-setup/google-source.c:758
+#: ../plugins/google-account-setup/google-source.c:631
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:793
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Retrieve _list"
 msgstr "å??å??æ¸?å?®(_L)"
 
@@ -16545,7 +16547,7 @@ msgstr "æ?¶å??é?µä»¶å?¯è?½æ??å°?è©²é?µä»¶è?ªæ?¶ä»¶è??ç??ä¿¡ç®±ç§»é?¤ã??ä½ ç¢ºå®?
 msgid "Message retracted successfully"
 msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../plugins/groupwise-features/mail-send-options.c:202
 msgid "Insert Send options"
 msgstr "æ??å?¥å?³é??é?¸é ?"
 
@@ -16793,52 +16795,52 @@ msgstr "æ?°å¢?"
 msgid "Modify"
 msgstr "ä¿®æ?¹"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Subject:"
 msgstr "ä¸»æ?¨:"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:154
 msgid "From:"
 msgstr "å¯?ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:169
 msgid "Creation date:"
 msgstr "å»ºç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:211
+#: ../plugins/groupwise-features/status-track.c:216
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Deleted: "
 msgstr "å·²å?ªé?¤:"
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:247
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
@@ -16909,195 +16911,194 @@ msgstr "æ ¡èª¿ä½ ç?? IMAP å¸³è??ã??"
 msgid "IMAP Features"
 msgstr "IMAP å??è?½"
 
-#: ../plugins/itip-formatter/itip-formatter.c:494
-#: ../plugins/itip-formatter/itip-formatter.c:619
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "è¼?å?¥è¡?äº?æ??ã??%sã??å¤±æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:639
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "è¡?äº?æ?? '%s' ä¸ç??ç´?æ??å??é??å??æ??è°ç?¸è¡?çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:675
+#: ../plugins/itip-formatter/itip-formatter.c:688
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å°?æ?¾å?¨è¡?äº?æ??ã??%sã??ä¸ç??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:774
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:781
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??ä¸æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:785
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:873
 msgid "Opening the calendar. Please wait.."
 msgstr "æ£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:863
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1044
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç?¡æ³?å?³é??é ?ç?®è?³è¡?äº?æ??ã??%sã??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1143
+#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:1160
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºä¸?ç¢ºå®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1152
+#: ../plugins/itip-formatter/itip-formatter.c:1165
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1157
+#: ../plugins/itip-formatter/itip-formatter.c:1170
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??ä¸¦è¨ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è°å?¬é??äººå·²ç§»é?¤ä»£ç??äºº %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1258
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??ä½¿å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1400
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1430
+#: ../plugins/itip-formatter/itip-formatter.c:1443
 msgid "Meeting information sent"
 msgstr "æ??è°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1433
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Task information sent"
 msgstr "å·¥ä½?è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1445
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ç?¡æ³?å¯?å?ºæ??è°è³?è¨?ï¼?è©²æ??è°ä¸¦ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1461
 msgid "Unable to send task information, the task does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå·¥ä½?è³?è¨?ï¼?è©²é ?å·¥ä½?ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1464
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå??å¿?é??è³?è¨?ï¼?è©²å??å¿?é??ä¸¦ä¸?å?å?¨"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1516
+#: ../plugins/itip-formatter/itip-formatter.c:1529
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 msgid "Save Calendar"
 msgstr "å?²å?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1574
-#: ../plugins/itip-formatter/itip-formatter.c:1585
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "é??å¸¶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "æ¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??ä¸¦é??æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1626
-#: ../plugins/itip-formatter/itip-formatter.c:1654
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid "The item in the calendar is not valid"
 msgstr "è¡?äº?æ??ä¸ç??é ?ç?®æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../plugins/itip-formatter/itip-formatter.c:1655
-#: ../plugins/itip-formatter/itip-formatter.c:1761
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "æ¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?è©²å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?ä»¶ã??å·¥ä½?æ??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??è©²å°?æ¤æª?æ¡?å?²å?å¾?å?¯å?¥å?¶ä¸ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2434
+#: ../plugins/itip-formatter/itip-formatter.c:2447
 msgid "This meeting recurs"
 msgstr "é??å??æ??è°ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2437
+#: ../plugins/itip-formatter/itip-formatter.c:2450
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2440
+#: ../plugins/itip-formatter/itip-formatter.c:2453
 msgid "This memo recurs"
 msgstr "é??å??å??å¿?é??ç??å¾ªç?°è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../plugins/itip-formatter/itip-formatter.c:2682
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2679
-#: ../plugins/itip-formatter/itip-formatter.c:2712
+#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2725
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2707
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é?¸æ??è¦?æ??å°?æ??è°è¡?çª?ç??è¡?äº?æ??"
 
@@ -18061,15 +18062,15 @@ msgid ""
 "current folder as well as all subfolders?"
 msgstr "ä½ è¦?å°?ç?®å??ç??è³?æ??å¤¾ä¸ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µä»¶ã??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:171
+#: ../plugins/mark-all-read/mark-all-read.c:168
 msgid "In Current Folder and _Subfolders"
 msgstr "æ?¼ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:185
+#: ../plugins/mark-all-read/mark-all-read.c:182
 msgid "In Current _Folder Only"
 msgstr "æ?¼ç?®å??ç??è³?æ??å¤¾(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:342
+#: ../plugins/mark-all-read/mark-all-read.c:349
 msgid "Mark Me_ssages as Read"
 msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²è®?(_S)"
 
@@ -18434,75 +18435,75 @@ msgstr "SpamAssassin é?¸é ?"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:157
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:353
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:355
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "æ??è¿°æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "å??é¡?æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "è¨»è§£æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "è?¯çµ¡äººæ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "é??å§?"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "çµ?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "ï¼?å·²å®?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "ç¶²å??"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "å?°æ??è??æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "å·²ä¿®æ?¹"
 
-#: ../plugins/save-calendar/csv-format.c:520
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV æ ¼å¼?ç??é?²é??é?¸é ?(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:527
+#: ../plugins/save-calendar/csv-format.c:537
 msgid "Prepend a _header"
 msgstr "é ?å??è¦?ç?«æª?é (_H)"
 
-#: ../plugins/save-calendar/csv-format.c:536
+#: ../plugins/save-calendar/csv-format.c:546
 msgid "_Value delimiter:"
 msgstr "æ?¸å?¼å®?ç??ç¬¦(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:543
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "_Record delimiter:"
 msgstr "ç´?é??å®?ç??ç¬¦(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:550
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "_Encapsulate values with:"
 msgstr "ä»¥æ¤å°?è£?æ?¸å?¼(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:572
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "é??è??é??é??ç??æ?¸å?¼æ ¼å¼? (.csv)"
 
@@ -18693,11 +18694,11 @@ msgstr "WebDAV è?¯çµ¡äºº"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "URL:"
 msgstr "ç¶²å??:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??ä½¿ç?¨ Apache < 2.2.8)"
 
@@ -18841,7 +18842,7 @@ msgstr "é¡¯ç¤ºå?´é??æ¬?"
 msgid "Skip development warning dialog"
 msgstr "å¿½ç?¥é??ç?¼è¦å??å°?è©±ç??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:321
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
 msgid "Start in offline mode"
 msgstr "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
@@ -18873,7 +18874,7 @@ msgstr "ä¸»è¦?çª?ç??é ?è¨é??åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
-msgstr "è³?è¨?æ?¹å¡?å??ç??é ?è¨é??åº¦ï¼?ä»¥å??ç´ è¨?ã??"
+msgstr "å?´é??æ¬?ç??é ?è¨é??åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
@@ -18989,7 +18990,7 @@ msgstr "æ??å°?"
 msgid "Save Search"
 msgstr "å?²å?æ??å°?çµ?æ??"
 
-#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
@@ -18998,19 +18999,19 @@ msgstr "%ld KB"
 #. * 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:687
+#: ../shell/e-shell-searchbar.c:883
 msgid "Sho_w:"
 msgstr "é¡¯ç¤º(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:714
+#: ../shell/e-shell-searchbar.c:910
 msgid "Sear_ch:"
 msgstr "æ??å°?(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:769
+#: ../shell/e-shell-searchbar.c:970
 msgid "i_n"
 msgstr "æ?¼(_N)"
 
@@ -19022,7 +19023,7 @@ msgstr "å·¥å?·å??æ¨£å¼?"
 msgid "The switcher's toolbar style"
 msgstr "å??æ??ç¨?å¼?å·¥å?·å??æ¨£å¼?"
 
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:737
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
 msgid "Toolbar Visible"
 msgstr "å·¥å?·å??å?¯è¦?æ?§"
 
@@ -19048,7 +19049,7 @@ msgstr "å??æ??ç¨?å¼?å??ä½?"
 
 #: ../shell/e-shell-view.c:605
 msgid "The switcher action for this shell view"
-msgstr ""
+msgstr "é??å?? shell æª¢è¦?ç??å??æ??ç¨?å¼?å??ä½?"
 
 #: ../shell/e-shell-view.c:620
 msgid "Page Number"
@@ -19056,7 +19057,7 @@ msgstr "é ?ç¢¼"
 
 #: ../shell/e-shell-view.c:621
 msgid "The notebook page number of the shell view"
-msgstr ""
+msgstr "é??å?? shell æª¢è¦?ç??ç?è¨?æ?¬é ?æ?¸"
 
 #: ../shell/e-shell-view.c:637
 msgid "Search Rule"
@@ -19067,54 +19068,48 @@ msgid "Criteria for the current search results"
 msgstr "ç?®å??ç??æ??å°?çµ?æ??ç??æ¢?ä»¶"
 
 #: ../shell/e-shell-view.c:653
-#, fuzzy
 msgid "The EShellBackend for this shell view"
-msgstr "é¡¯ç¤ºæ??é??æ?¬é??æ?²ç??èªªæ??æ??ä»¶"
+msgstr "é??å?? shell æª¢è¦?ç?? EShell å¾?ç«¯ç¨?å¼?"
 
 #: ../shell/e-shell-view.c:668
-#, fuzzy
 msgid "Shell Content Widget"
-msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
+msgstr "Shell å?§å®¹å??ä»¶"
 
 #: ../shell/e-shell-view.c:669
 msgid "The content widget appears in a shell window's right pane"
-msgstr ""
+msgstr "å?§å®¹å??ä»¶é¡¯ç¤ºæ?¼ shell è¦?çª?ç??å?³çª?æ ¼"
 
 #: ../shell/e-shell-view.c:685
-#, fuzzy
 msgid "Shell Sidebar Widget"
-msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
+msgstr "Shell å?´é??æ¬?å??ä»¶"
 
 #: ../shell/e-shell-view.c:686
 msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
+msgstr "å?´é??æ¬?å??ä»¶é¡¯ç¤ºæ?¼ shell è¦?çª?ç??å·¦çª?æ ¼"
 
 #: ../shell/e-shell-view.c:701
-#, fuzzy
 msgid "Shell Taskbar Widget"
-msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
+msgstr "Shell å·¥ä½?å??å??ä»¶"
 
 #: ../shell/e-shell-view.c:702
 msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
+msgstr "å·¥ä½?å??å??ä»¶é¡¯ç¤ºæ?¼ shell è¦?çª?ç??åº?é?¨"
 
 #: ../shell/e-shell-view.c:717
-#, fuzzy
 msgid "Shell Window"
-msgstr "è¦?çª?é«?åº¦"
+msgstr "Shell è¦?çª?"
 
 #: ../shell/e-shell-view.c:718
 msgid "The window to which the shell view belongs"
-msgstr ""
+msgstr "é??å?? shell æª¢è¦?æ??å±¬ç??è¦?çª?"
 
 #: ../shell/e-shell-view.c:734
 msgid "The key file holding widget state data"
 msgstr "å?æ?¾è¦?çª?å??ä»¶ç??æ??è³?æ??ç??è¨å®?é?µæª?æ¡?"
 
 #: ../shell/e-shell-view.c:749
-#, fuzzy
 msgid "The title of the shell view"
-msgstr "é¡¯ç¤ºä¸»å·¥å?·å??"
+msgstr "shell æª¢è¦?ç??æ¨?é¡?"
 
 #: ../shell/e-shell-view.c:763
 msgid "Current View ID"
@@ -19436,82 +19431,73 @@ msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:360
+#: ../shell/e-shell-window.c:366
 msgid "New"
 msgstr "æ?°å¢?"
 
-#: ../shell/e-shell-window.c:613
-#, fuzzy
+#: ../shell/e-shell-window.c:616
 msgid "Active Shell View"
-msgstr "é¡¯ç¤ºä¸»å·¥å?·å??"
+msgstr "ä½¿ç?¨ä¸ç?? Shell æª¢è¦?"
 
-#: ../shell/e-shell-window.c:614
-#, fuzzy
+#: ../shell/e-shell-window.c:617
 msgid "Name of the active shell view"
-msgstr "æª¢è¦?å?¨ <b>Google ç¨?å¼?ç¢¼æ??å°?</b> ä¸ç?? <i>%(name)s</i>"
+msgstr "ä½¿ç?¨ä¸ Shell æª¢è¦?ç??å??ç¨±"
 
-#: ../shell/e-shell-window.c:629
-#, fuzzy
+#: ../shell/e-shell-window.c:632
 msgid "The shell window's EFocusTracker"
-msgstr "é??å§?æ??è¦?çª?ç??ä½?ç½®"
+msgstr "shell è¦?çª?ç?? EFocus è¿½è¹¤ç¨?å¼?"
 
-#: ../shell/e-shell-window.c:643 ../shell/e-shell.c:772
+#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:772
 msgid "Geometry"
 msgstr "ä½?ç½®å¤§å°?"
 
-#: ../shell/e-shell-window.c:644 ../shell/e-shell.c:773
+#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:773
 msgid "Initial window geometry string"
 msgstr "è¦?çª?å??å§?å¤§å°?å?ä¸²"
 
-#: ../shell/e-shell-window.c:659
+#: ../shell/e-shell-window.c:662
 msgid "Safe Mode"
 msgstr "å®?å?¨æ¨¡å¼?"
 
-#: ../shell/e-shell-window.c:660
-#, fuzzy
+#: ../shell/e-shell-window.c:663
 msgid "Whether the shell window is in safe mode"
-msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
+msgstr "shell è¦?çª?æ?¯å?¦ç?ºå®?å?¨æ¨¡å¼?"
 
-#: ../shell/e-shell-window.c:691
+#: ../shell/e-shell-window.c:694
 msgid "Sidebar Visible"
 msgstr "å?´é??æ¬?å?¯è¦?æ?§"
 
-#: ../shell/e-shell-window.c:692
-#, fuzzy
+#: ../shell/e-shell-window.c:695
 msgid "Whether the shell window's side bar is visible"
-msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
+msgstr "shell è¦?çª?ç??å?´é??æ¬?æ?¯å?¦é¡¯ç¤º"
 
-#: ../shell/e-shell-window.c:706
+#: ../shell/e-shell-window.c:709
 msgid "Switcher Visible"
 msgstr "å??æ??ç¨?å¼?å?¯è¦?æ?§"
 
-#: ../shell/e-shell-window.c:707
-#, fuzzy
+#: ../shell/e-shell-window.c:710
 msgid "Whether the shell window's switcher buttons are visible"
-msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
+msgstr "shell è¦?çª?ç??å??æ??ç¨?å¼?æ??é??æ?¯å?¦é¡¯ç¤º"
 
-#: ../shell/e-shell-window.c:722
+#: ../shell/e-shell-window.c:725
 msgid "Taskbar Visible"
 msgstr "å·¥ä½?å??å?¯è¦?æ?§"
 
-#: ../shell/e-shell-window.c:723
-#, fuzzy
+#: ../shell/e-shell-window.c:726
 msgid "Whether the shell window's task bar is visible"
-msgstr "æ?¯å?¦é¡¯ç¤ºç??æ??å??ã??"
+msgstr "shell è¦?çª?ç??å·¥ä½?å??æ?¯å?¦é¡¯ç¤º"
 
-#: ../shell/e-shell-window.c:738
-#, fuzzy
+#: ../shell/e-shell-window.c:741
 msgid "Whether the shell window's tool bar is visible"
-msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
+msgstr "shell è¦?çª?ç??å·¥å?·å??æ?¯å?¦é¡¯ç¤º"
 
-#: ../shell/e-shell-window.c:752
+#: ../shell/e-shell-window.c:755
 msgid "UI Manager"
 msgstr "UI ç®¡ç??ç¨?å¼?"
 
-#: ../shell/e-shell-window.c:753
-#, fuzzy
+#: ../shell/e-shell-window.c:756
 msgid "The shell window's GtkUIManager"
-msgstr "é??å§?æ??è¦?çª?ç??ä½?ç½®"
+msgstr "shell è¦?çª?ç?? GtkUIManager"
 
 #: ../shell/e-shell.c:213
 msgid "Preparing to go offline..."
@@ -19546,12 +19532,11 @@ msgid "Online"
 msgstr "ä¸?ç·?"
 
 #: ../shell/e-shell.c:821
-#, fuzzy
 msgid "Whether the shell is online"
-msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
+msgstr "shell æ?¯å?¦ä¸?ç·?"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:166
+#: ../shell/main.c:167
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19586,7 +19571,7 @@ msgstr ""
 "æ??å??å¸?æ??ä½ äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??ä½ æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:190
+#: ../shell/main.c:191
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19594,56 +19579,56 @@ msgstr ""
 "è¬?è¬?\n"
 "Evolution å°?çµ?æ?¬ä¸?\n"
 
-#: ../shell/main.c:197
+#: ../shell/main.c:198
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:318
 msgid "Start Evolution activating the specified component"
 msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??ä»¶"
 
-#: ../shell/main.c:319
+#: ../shell/main.c:320
 msgid "Apply the given geometry to the main window"
 msgstr "å°?æ??å®?ç??å°ºå¯¸å¥?ç?¨å?°ä¸»è¦?çª?"
 
 # zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
-#: ../shell/main.c:323
+#: ../shell/main.c:324
 msgid "Start in online mode"
 msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:331
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:334
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??ä»¶ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:336
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:338
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??è?¯çµ¡äººå??å·¥ä½?ç??é ?è¦½çª?æ ¼ã??"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:342
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??ç¨±å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../shell/main.c:343
+#: ../shell/main.c:344
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?ä¸ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:498
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:523
+#: ../shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20487,7 +20472,6 @@ msgid "Action"
 msgstr "å??ä½?"
 
 #: ../widgets/misc/e-action-combo-box.c:389
-#, fuzzy
 msgid "A GtkRadioAction"
 msgstr "GtkRadioAction"
 
@@ -20548,7 +20532,7 @@ msgstr "é?±è??é??ä»¶å??(_B)"
 msgid "Show Attachment _Bar"
 msgstr "é¡¯ç¤ºé??ä»¶å??(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:626
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show _Attachment Bar"
 msgstr "é¡¯ç¤ºé??ä»¶å??(_A)"
 
@@ -20572,36 +20556,36 @@ msgstr[1] "å?²å?é??ä»¶"
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "å?²å?å?¨é?¨(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "å? å?¥é??ä»¶(_A)..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "é?±è??(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "æª¢è¦?è¡?å?§(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "ä»¥ã??%sã??é??å??"
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s ä¸é??å??é??å??é??ä»¶"
 
-#. To Translators: This text is set as a description of an attached 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.
+#. To Translators: This text is set as a description of an attached
+#. * 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:1002
 msgid "Attached message"
 msgstr "é??å? ç??é?µä»¶"
@@ -21029,9 +21013,8 @@ msgid "Delivery Options"
 msgstr "é??é??é?¸é ?"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#, fuzzy
 msgid "For Your Eyes Only"
-msgstr "å?ªå??è¨±ç¹«çµ?ç??è£?ç½®"
+msgstr "æ??é«?æ©?å¯?"
 
 #: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
@@ -21066,9 +21049,8 @@ msgid "Status Tracking"
 msgstr "ç??æ??è¿½è¹¤"
 
 #: ../widgets/misc/e-send-options.ui.h:23
-#, fuzzy
 msgid "Top Secret"
-msgstr "é«?åº¦æ©?å¯?"
+msgstr "æ??é«?æ©?å¯?"
 
 #: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
@@ -21232,21 +21214,21 @@ msgstr "evolution è¡?äº?æ??é ?ç?®"
 msgid "popup list"
 msgstr "å½?å?ºå¼?æ¸?å?®"
 
-#: ../widgets/table/e-cell-date-edit.c:296
+#: ../widgets/table/e-cell-date-edit.c:303
 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:313
+#: ../widgets/table/e-cell-date-edit.c:320
 msgctxt "table-date"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/table/e-cell-date-edit.c:321
+#: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "ç¢ºå®?"
 
-#: ../widgets/table/e-cell-date-edit.c:846
+#: ../widgets/table/e-cell-date-edit.c:862
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "æ??é??å¿?é ?ç?ºæ¤æ ¼å¼?ï¼?%s"
@@ -21287,7 +21269,7 @@ msgstr "è?²å½©æ¬?"
 msgid "BG Color Column"
 msgstr "è??æ?¯è?²å½©æ¬?"
 
-#: ../widgets/table/e-table-click-to-add.c:582
+#: ../widgets/table/e-table-click-to-add.c:586
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
 msgid "click to add"
@@ -21327,7 +21309,7 @@ msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨ç??æ¬?ä½?(_V):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-header-item.c:1637
 msgid "Ascending"
 msgstr "é??å¢?"
 
@@ -21340,7 +21322,7 @@ msgid "Clear _All"
 msgstr "å?¨é?¨æ¸?é?¤(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-header-item.c:1637
 msgid "Descending"
 msgstr "é??æ¸?"
 
@@ -21439,7 +21421,7 @@ msgstr "å??è??å??é??äº¤æ?¿ä½¿ç?¨ç??è?²å½©"
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
-#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-tree.c:3370 ../widgets/table/e-tree.c:3371
 msgid "Horizontal Draw Grid"
 msgstr "æ°´å¹³ç¹ªå??æ ¼"
 
@@ -21448,7 +21430,7 @@ msgstr "æ°´å¹³ç¹ªå??æ ¼"
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
-#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3376 ../widgets/table/e-tree.c:3377
 msgid "Vertical Draw Grid"
 msgstr "å??ç?´ç¹ªå??æ ¼"
 
@@ -21457,7 +21439,7 @@ msgstr "å??ç?´ç¹ªå??æ ¼"
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
-#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3382 ../widgets/table/e-tree.c:3383
 msgid "Draw focus"
 msgstr "ç¹ªå??ç?¦é»?"
 
@@ -21482,8 +21464,8 @@ msgstr "é?¸æ??å??æ¨¡å??"
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3336
-#: ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3365
 msgid "Length Threshold"
 msgstr "ç??é??é?·åº¦"
 
@@ -21492,8 +21474,8 @@ msgstr "ç??é??é?·åº¦"
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
 #: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
-#: ../widgets/table/e-table.c:3328 ../widgets/table/e-tree.c:3368
-#: ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3396
+#: ../widgets/table/e-tree.c:3397
 msgid "Uniform row height"
 msgstr "æ¨?æº?å??é«?"
 
@@ -21504,60 +21486,60 @@ msgstr "æ¨?æº?å??é«?"
 msgid "Frozen"
 msgstr "å??çµ?"
 
-#: ../widgets/table/e-table-header-item.c:1449
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Customize Current View"
 msgstr "è?ªé?¸ç?®å??ç??æª¢è¦?"
 
-#: ../widgets/table/e-table-header-item.c:1469
+#: ../widgets/table/e-table-header-item.c:1502
 msgid "Sort _Ascending"
 msgstr "é??å¢?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1505
 msgid "Sort _Descending"
 msgstr "é??æ¸?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1508
 msgid "_Unsort"
 msgstr "ä¸?æ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1511
 msgid "Group By This _Field"
 msgstr "æ ¹æ??æ¤æ¬?ä½?å??ç¾£çµ?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1514
 msgid "Group By _Box"
 msgstr "æ ¹æ??æ?¹å¡?ç?ºç¾£çµ?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1518
 msgid "Remove This _Column"
 msgstr "ç§»é?¤æ¤æ¬?(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1521
 msgid "Add a C_olumn..."
 msgstr "å? å?¥ä¸?æ¬?(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1525
 msgid "A_lignment"
 msgstr "æ??å??(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1528
 msgid "B_est Fit"
 msgstr "æ??é?©å¡«æ»¿(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??æ¬?(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1535
 msgid "Custo_mize Current View..."
 msgstr "è?ªé?¸ç?®å??ç??æª¢è¦?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1594
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1555
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "_Custom"
 msgstr "è?ªé?¸(_C)"
 
@@ -21577,40 +21559,40 @@ msgstr "æ¸¸æ¨?å??"
 msgid "Sort Info"
 msgstr "æ??åº?è³?è¨?"
 
-#: ../widgets/table/e-table.c:3335 ../widgets/table/e-tree.c:3375
-#: ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-table.c:3345 ../widgets/table/e-tree.c:3403
+#: ../widgets/table/e-tree.c:3404
 msgid "Always search"
 msgstr "ç¸½æ?¯æ??å°?"
 
-#: ../widgets/table/e-table.c:3342
+#: ../widgets/table/e-table.c:3352
 msgid "Use click to add"
 msgstr "è«?æ??é??è£?å? å?¥"
 
-#: ../widgets/table/e-table.c:3356
+#: ../widgets/table/e-table.c:3366
 msgid "Vertical Row Spacing"
 msgstr "å??ç?´æ¬?é??è·?"
 
-#: ../widgets/table/e-table.c:3357
+#: ../widgets/table/e-table.c:3367
 msgid "Vertical space between rows. It is added to top and to bottom of a row"
 msgstr "å??å??ä¹?é??ç??å??ç?´é??è·?ã??å®?æ??å? å?¥å?°æ¯?å??ç??é ?ç«¯å??åº?é?¨"
 
-#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3389 ../widgets/table/e-tree.c:3390
 msgid "ETree table adapter"
 msgstr "ETree è¡¨æ ¼æ©?æ?¥å?¨"
 
-#: ../widgets/table/e-tree.c:3382
+#: ../widgets/table/e-tree.c:3410
 msgid "Retro Look"
 msgstr "æ?·è??å¤?è§?"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3411
 msgid "Draw lines and +/- expanders."
 msgstr "ç¹ªå?ºç·?æ¢?è?? +/- å±?é??ç¬¦è??ã??"
 
-#: ../widgets/table/e-tree.c:3389
+#: ../widgets/table/e-tree.c:3417
 msgid "Expander Size"
 msgstr "å±?é??å?¨å¤§å°?"
 
-#: ../widgets/table/e-tree.c:3390
+#: ../widgets/table/e-tree.c:3418
 msgid "Size of the expander arrow"
 msgstr "å±?é??å?¨ç®è??ç??å¤§å°?"
 
@@ -21664,7 +21646,7 @@ msgstr "è¡¨æ ¼ç??å?²å?æ ¼"
 msgid "click"
 msgstr "é»?é?¸"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
 msgid "sort"
 msgstr "æ??åº?"
 
@@ -21780,3 +21762,12 @@ msgstr "IM å¿«é¡¯è¦?çª?"
 #: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
 msgid "Handle Popup"
 msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
+
+#~ msgid "Loading appointments at %s"
+#~ msgstr "è¼?å?¥ %s ç??ç´?æ??"
+
+#~ msgid "_Security"
+#~ msgstr "å®?å?¨æ?§(_S)"
+
+#~ msgid "Copying `%s' to `%s'"
+#~ msgstr "å°?ã??%sã??è¤?è£½å?°ã??%sã??"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2b6b7f8..c35d9da 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,13 +5,13 @@
 # Craig Jeffares <cjeffares novell com>,2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010.
 # Abel Cheung <abelcheung gmail com>, 2006.
-#: ../shell/main.c:511
+#: ../shell/main.c:512
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.29.6\n"
+"Project-Id-Version: evolution 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-21 21:07+0800\n"
-"PO-Revision-Date: 2010-01-21 15:57+0800\n"
+"POT-Creation-Date: 2010-02-15 11:46+0800\n"
+"PO-Revision-Date: 2010-02-14 22:37+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
@@ -254,7 +254,7 @@ msgstr "é?±å¹´ç´?å¿µæ?¥"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:110
+#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -270,7 +270,7 @@ msgstr "è¡?äº?æ??ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "é?£çµ¡äºº"
@@ -376,7 +376,7 @@ msgstr "ç¶²èª?ï¼?"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:954
+#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "å·¥ä½?"
 
@@ -495,7 +495,7 @@ msgstr "å??ç¨±"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1287
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
 #: ../addressbook/gui/widgets/e-addressbook-model.c:522
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -648,12 +648,12 @@ msgid "_Select Address Book"
 msgstr "é?¸æ??é??è¨?é??(_S)"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:675
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
 msgid "Shell"
 msgstr "Shell"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:676
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
 msgid "The EShell singleton"
 msgstr ""
 
@@ -723,7 +723,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
 msgid "Contact List Editor"
 msgstr "é?£çµ¡äººæ¸?å?®ç·¨è¼¯å?¨"
 
@@ -748,28 +748,28 @@ 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:785
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
 msgid "Contact List Members"
 msgstr "é?£çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:933
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
 msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1199
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
 msgid "Error modifying list"
 msgstr "ç·¨è¼¯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1213
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
 msgid "Error removing list"
 msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
 #: ../addressbook/gui/widgets/e-addressbook-model.c:512
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
@@ -777,7 +777,7 @@ msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 msgid "Book"
 msgstr "æ?¸æ?¬"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1277
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
 msgid "Is New List"
 msgstr "æ?¯æ?°ç??æ¸?å?®"
 
@@ -828,20 +828,20 @@ msgstr "å??ä½µé?£çµ¡äºº"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../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:909
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:779
-#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Email begins with"
 msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Name contains"
 msgstr "å??ç¨±å??å?«"
 
@@ -873,12 +873,12 @@ msgstr "æ??å°?è¢«ä¸æ?·"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
 #: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1061 ../calendar/gui/e-task-table.c:1360
-#: ../modules/calendar/e-memo-shell-content.c:603
-#: ../modules/calendar/e-task-shell-content.c:625
+#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:629
 #: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3349
+#: ../widgets/table/e-table.c:3359
 #: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
 #: ../widgets/text/e-text.c:3297
 msgid "Model"
@@ -901,7 +901,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?é?£çµ¡äºº"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:735
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "Delete selected contacts"
 msgstr "å?ªé?¤é?¸å®?ç??é?£çµ¡äºº"
 
@@ -910,10 +910,9 @@ msgid "Select all visible contacts"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?£çµ¡äºº"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1078 ../calendar/gui/e-task-table.c:1377
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
 msgid "Shell View"
-msgstr "3_D å??é??è±¡æ£?æª¢è¦?"
+msgstr "Shell æª¢è¦?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Source"
@@ -1290,15 +1289,15 @@ msgstr[1] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå??ç??"
 msgid "Open"
 msgstr "é??å??"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:141
+#: ../addressbook/gui/widgets/ea-minicard.c:153
 msgid "Contact List: "
 msgstr "é?£çµ¡äººæ¸?å?®: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:142
+#: ../addressbook/gui/widgets/ea-minicard.c:154
 msgid "Contact: "
 msgstr "é?£çµ¡äºº: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:168
+#: ../addressbook/gui/widgets/ea-minicard.c:180
 msgid "evolution minicard"
 msgstr "Evolution è¿·ä½ å??ç??"
 
@@ -1401,7 +1400,7 @@ msgstr "ç¶²èª?"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../mail/e-mail-migrate.c:955
+#: ../mail/e-mail-migrate.c:962
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
 #: ../modules/calendar/e-cal-shell-backend.c:171
@@ -1486,9 +1485,9 @@ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:238 ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2651
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
@@ -1777,7 +1776,7 @@ msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
 #: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/google-account-setup/google-source.c:440
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -2224,16 +2223,7 @@ msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../filter/filter.ui.h:15
-#: ../plugins/caldav/caldav-source.c:496
-#: ../plugins/calendar-file/calendar-file.c:294
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:517
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-#: ../plugins/google-account-setup/google-source.c:740
-msgid "hours"
+msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
@@ -2282,20 +2272,23 @@ msgstr "ç·¨è¼¯(_E)"
 msgid "_Snooze"
 msgstr "å»¶æ??(_S)"
 
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+msgid "hours"
+msgstr "å°?æ??"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "ç´?æ??ç??å?°é»?"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../filter/filter.ui.h:17
-#: ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/caldav/caldav-source.c:495
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:516
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-#: ../plugins/google-account-setup/google-source.c:739
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
 msgstr "å??é??"
 
@@ -2952,23 +2945,23 @@ msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥é??å§?å??é??"
 
-#: ../calendar/gui/cal-editor-utils.c:102
+#: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "æ?¥æª¢è¦?"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "å·¥ä½?é?±æª¢è¦?"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "é?±æª¢è¦?"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "æ??æª¢è¦?"
 
@@ -2998,7 +2991,7 @@ msgid "Classification"
 msgstr "æ¸é¡?"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-task-table.c:500
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3032,7 +3025,7 @@ msgstr "å?å?¨"
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "ä½?ç½®"
 
@@ -3042,14 +3035,14 @@ msgid "Organizer"
 msgstr "æ??è°å?¬é??äºº"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-task-table.c:499
+#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ç§?äºº"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
-#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
@@ -3064,7 +3057,7 @@ msgstr "é?±æ??æ?§"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:354
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "æ??è¦?"
 
@@ -3177,9 +3170,7 @@ msgstr "ä¹?å¾?(_A):"
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 #, fuzzy
 msgid "before"
-msgstr ""
-"ä¹?å??\n"
-"ä¹?å¾?"
+msgstr "å°?é?¢"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:7
@@ -3188,14 +3179,9 @@ msgstr "å¤©"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/caldav/caldav-source.c:497
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:518
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../plugins/google-account-setup/google-source.c:741
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../widgets/misc/e-send-options.ui.h:39
 msgid "days"
@@ -3332,7 +3318,7 @@ msgstr "æ??æ??äº?"
 #: ../calendar/gui/dialogs/calendar-setup.c:389
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
 #: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2653
+#: ../plugins/itip-formatter/itip-formatter.c:2666
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
@@ -3352,10 +3338,11 @@ msgstr "å??é??"
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#. Translators: "None" for not including threads; part of "Include threads: None"
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
 #. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:745 ../widgets/misc/e-send-options.ui.h:12
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
 msgid "None"
 msgstr "æ²?æ??"
 
@@ -3467,7 +3454,7 @@ msgid "Wee_k starts on:"
 msgstr "ä¸?é?±é??å§?æ?¼(_K):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Work Week"
 msgstr "å·¥ä½?é?±"
 
@@ -3649,23 +3636,23 @@ msgstr "%s  æ?¨æ²?æ??å??ä»»ä½?è®?æ?´ï¼?æ?´æ?°é??å??ç·¨è¼¯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "ç¢ºèª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2380
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
 msgid " to "
 msgstr " å?° "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2384
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2386
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2391
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
 msgid " (Due "
 msgstr "(æ??é??)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2393
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
 msgid "Due "
 msgstr "æ??é?? "
 
@@ -3779,6 +3766,7 @@ msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "é?¸é ?(_O)"
 
@@ -3897,15 +3885,15 @@ msgstr "é??ä»¶"
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?ä½¿ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "ç?¡æ³?é??å??ä¾?æº?"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "ç?¡æ³?é??å??ç?®ç??å?°"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 
@@ -4195,7 +4183,7 @@ msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:364
+#: ../plugins/calendar-weather/calendar-weather.c:356
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
@@ -4215,7 +4203,7 @@ msgstr "æ??å°?(_F):"
 msgid "until"
 msgstr "å?®ä½?(_U):"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2529
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
 msgid "Memo"
 msgstr "å??å¿?é??"
 
@@ -4232,7 +4220,7 @@ msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??äºº"
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:224
+#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
 #: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
 #: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
@@ -4480,17 +4468,17 @@ msgstr "ç¶²é ?"
 #: ../calendar/gui/e-cal-model-tasks.c:463
 #: ../calendar/gui/e-cal-model-tasks.c:737
 #: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:221
-#: ../calendar/gui/e-task-table.c:236 ../calendar/gui/e-task-table.c:595
-#: ../calendar/gui/print.c:2605 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-task-table.c:507 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "é«?"
@@ -4500,16 +4488,16 @@ msgstr "é«?"
 #: ../calendar/gui/e-cal-component-preview.c:289
 #: ../calendar/gui/e-cal-model-tasks.c:461
 #: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:2602
+#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2645
 msgid "In Progress"
 msgstr "é?²è¡?ä¸"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:522 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-task-table.c:509 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "ä½?"
@@ -4517,7 +4505,7 @@ msgstr "ä½?"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-task-table.c:521
+#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
@@ -4527,9 +4515,9 @@ msgstr "ä¸?è?¬"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
 #: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:217
-#: ../calendar/gui/e-task-table.c:232 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:2599 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
 
@@ -4555,7 +4543,7 @@ msgstr "ç??æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:523 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
@@ -4582,7 +4570,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "æ??é??è£¡æ?¹è®?/æª¢è¦?è©²å·¥ä½?ç??ç??æ??è©³ç´°è³?æ??"
 
 #: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:198
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
@@ -4708,7 +4696,7 @@ msgstr "%s å?¨ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ç?ºæ?ªç?¥ç??è§¸ç?¼é¡?å??"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:658
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "ç?¡æ¨?é¡?"
 
@@ -4754,7 +4742,7 @@ msgstr "ç¶²é ?ï¼?"
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Created"
 msgstr "å·²å»ºç«?"
 
@@ -4774,12 +4762,12 @@ msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/e-task-table.c:559
 msgid "Free"
 msgstr "ç©ºé??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
@@ -4799,7 +4787,7 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1286
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
 #: ../calendar/gui/e-meeting-store.c:856
@@ -4807,46 +4795,50 @@ msgstr "æ²?æ??"
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1286
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "å?¦"
 
-#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
+#: ../calendar/gui/e-cal-model.c:377
+msgid "Default Client"
+msgstr "é ?è¨å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
 #: ../shell/e-shell.c:836
 msgid "Shell Settings"
 msgstr "Shell è¨å®?å?¼"
 
-#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
+#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
 #: ../shell/e-shell.c:837
 msgid "Application-wide settings"
 msgstr "æ??ç?¨ç¨?å¼?è¨å®?å?¼"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:967
-#: ../calendar/gui/print.c:984 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
 #: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2325
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1282
+#: ../calendar/gui/e-cal-model.c:1306
 msgid "Recurring"
 msgstr "å¾ªç?°æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1284
+#: ../calendar/gui/e-cal-model.c:1308
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2028
+#: ../calendar/gui/e-cal-model.c:2203
 #, c-format
 msgid "Opening %s"
 msgstr "æ£å?¨é??å?? %s"
@@ -4874,7 +4866,7 @@ msgstr "å?°æ??æ?¥"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "å?ªå??ç?ç´?"
 
@@ -4906,13 +4898,13 @@ msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?äº?ä»¶"
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:195
-#: ../calendar/gui/e-task-table.c:273
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:186
+#: ../calendar/gui/e-task-table.c:264
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:854
-#: ../calendar/gui/e-task-table.c:1075
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
+#: ../calendar/gui/e-task-table.c:1062
 msgid "Updating objects"
 msgstr "æ?´æ?°ç?©ä»¶"
 
@@ -4920,7 +4912,7 @@ msgstr "æ?´æ?°ç?©ä»¶"
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "æ?¥å??"
 
@@ -4928,7 +4920,7 @@ msgstr "æ?¥å??"
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2319
+#: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "å©?æ??"
 
@@ -4942,7 +4934,7 @@ msgstr "æ?«è¨?"
 #: ../calendar/gui/e-calendar-view.c:1693
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
 
@@ -4952,22 +4944,22 @@ 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:1835 ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:750
+#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
+#: ../calendar/gui/e-task-table.c:737
 #, 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:1839 ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:753
+#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
+#: ../calendar/gui/e-task-table.c:740
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è°å?¬é??äºº: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2561
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "ä½?ç½®ï¼?%s"
@@ -5017,7 +5009,7 @@ msgstr "é¡¯ç¤ºç¬¬äº?æ??å??"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1698
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5030,7 +5022,7 @@ msgstr "%A %d %B"
 #: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
 #: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:894
 msgid "%a %d %b"
 msgstr "%-m æ?? %-d æ?¥ (%a)"
 
@@ -5042,19 +5034,19 @@ msgstr "%-m æ?? %-d æ?¥ (%a)"
 #: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
 #: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:949
+#: ../modules/calendar/e-cal-shell-view-private.c:930
 msgid "%d %b"
 msgstr "%-m æ?? %-d æ?¥"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1120 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:814
+#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:816
+#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "ä¸?å??"
 
@@ -5141,7 +5133,7 @@ msgid "Ends"
 msgstr "çµ?æ??"
 
 #: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "æ?ªæ¢"
 
@@ -5172,13 +5164,13 @@ msgstr "<br> è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸é?¸æ??ä¸?å??å??
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2300
+#: ../plugins/itip-formatter/itip-formatter.c:2313
 msgctxt "cal-itip"
 msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2316
+#: ../plugins/itip-formatter/itip-formatter.c:2329
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
@@ -5395,7 +5387,7 @@ msgid "Attendee status updated\n"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1408
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å?å?¨"
 
@@ -5449,7 +5441,7 @@ msgid "Send Latest Information"
 msgstr "é??å?ºæ??æ?°è³?è¨?"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1088
+#: ../modules/mail/e-mail-shell-view-actions.c:1030
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -5500,49 +5492,49 @@ msgstr "è³?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:963
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:964 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:969 ../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:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/print.c:965
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "è³?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/print.c:966
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "æ??è°å®¤"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:980
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "ä¸»å¸"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "å?ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "å??å¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "ç¼ºå¸è??"
 
@@ -5671,7 +5663,7 @@ msgstr "èª?è¨?"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:423
+#: ../calendar/gui/e-memo-table.c:410
 #: ../modules/calendar/e-cal-shell-content.c:399
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
@@ -5680,36 +5672,36 @@ msgstr "æ??å?¡"
 msgid "Memos"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:714
+#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:794
+#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
 msgid "Start: "
 msgstr "é??å§?:"
 
-#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:812
+#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:706
 msgid "Cut selected memos to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:712
 msgid "Copy selected memos to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:718
 msgid "Paste memos from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:737
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../calendar/gui/e-memo-table.c:724
+#: ../modules/calendar/e-memo-shell-view-actions.c:569
 msgid "Delete selected memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:743
+#: ../calendar/gui/e-memo-table.c:730
 msgid "Select all visible memos"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
@@ -5717,56 +5709,56 @@ msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 msgid "Click to add a memo"
 msgstr "è«?æ??é??è£¡å¢?å? æ?°ç??å??å¿?é??"
 
-#: ../calendar/gui/e-task-table.c:542
+#: ../calendar/gui/e-task-table.c:529
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-task-table.c:543
+#: ../calendar/gui/e-task-table.c:530
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-task-table.c:544
+#: ../calendar/gui/e-task-table.c:531
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-task-table.c:545
+#: ../calendar/gui/e-task-table.c:532
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-task-table.c:533
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/e-task-table.c:534
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-task-table.c:548
+#: ../calendar/gui/e-task-table.c:535
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-task-table.c:549
+#: ../calendar/gui/e-task-table.c:536
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-task-table.c:550
+#: ../calendar/gui/e-task-table.c:537
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-task-table.c:551
+#: ../calendar/gui/e-task-table.c:538
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-task-table.c:552
+#: ../calendar/gui/e-task-table.c:539
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2006
+#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
 #: ../modules/calendar/e-cal-shell-content.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../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:437
 #: ../plugins/caldav/caldav-browse-server.c:430
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
@@ -5775,24 +5767,24 @@ msgstr "100%"
 msgid "Tasks"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:927
 msgid "Cut selected tasks to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:946
+#: ../calendar/gui/e-task-table.c:933
 msgid "Copy selected tasks to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:939
 msgid "Paste tasks from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:958
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../calendar/gui/e-task-table.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "Delete selected tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:964
+#: ../calendar/gui/e-task-table.c:951
 msgid "Select all visible tasks"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
 
@@ -5803,36 +5795,36 @@ msgstr "é?¸æ??ä¸?å??æ??å??"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1679
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:263
+#: ../calendar/gui/ea-cal-view-event.c:276
 msgid "It has alarms."
 msgstr "å®?å?·æ??é¬§é?´ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:266
+#: ../calendar/gui/ea-cal-view-event.c:279
 msgid "It has recurrences."
 msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:269
+#: ../calendar/gui/ea-cal-view-event.c:282
 msgid "It is a meeting."
 msgstr "é??æ?¯ä¸?é ?æ??è°ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:275
+#: ../calendar/gui/ea-cal-view-event.c:288
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ??è¦?ç?º %sã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:277
+#: ../calendar/gui/ea-cal-view-event.c:290
 msgid "Calendar Event: It has no summary."
 msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ²?æ??æ??è¦?ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:299
+#: ../calendar/gui/ea-cal-view-event.c:312
 msgid "calendar view event"
 msgstr "è¡?äº?æ??æª¢è¦?äº?ä»¶"
 
-#: ../calendar/gui/ea-cal-view-event.c:527
+#: ../calendar/gui/ea-cal-view-event.c:540
 msgid "Grab Focus"
 msgstr "å¾?å?°ç?¦é»?"
 
@@ -5856,14 +5848,12 @@ msgstr "ç§»è?³ä»?æ?¥"
 msgid "Go to Date"
 msgstr "ç§»è?³æ?¥æ??"
 
-#: ../calendar/gui/ea-day-view-main-item.c:305
-#: ../calendar/gui/ea-week-view-main-item.c:302
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
 
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5872,14 +5862,14 @@ msgstr[1] "å®?æ?? %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:151 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 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:158
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
@@ -5887,16 +5877,16 @@ 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:164
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-day-view.c:195
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "å·¥ä½?é?±ç??è¡?äº?æ??æª¢è¦?"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??æª¢è¦?"
 
@@ -5907,16 +5897,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome è¡?äº?æ??"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:909
+#: ../modules/calendar/e-cal-shell-view-private.c:890
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
 #: ../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:916
-#: ../modules/calendar/e-cal-shell-view-private.c:922
-#: ../modules/calendar/e-cal-shell-view-private.c:925
+#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
 msgid "%a %d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 
@@ -5924,10 +5914,10 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 #: ../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:942
-#: ../modules/calendar/e-cal-shell-view-private.c:953
-#: ../modules/calendar/e-cal-shell-view-private.c:960
-#: ../modules/calendar/e-cal-shell-view-private.c:963
+#: ../modules/calendar/e-cal-shell-view-private.c:923
+#: ../modules/calendar/e-cal-shell-view-private.c:934
+#: ../modules/calendar/e-cal-shell-view-private.c:941
+#: ../modules/calendar/e-cal-shell-view-private.c:944
 msgid "%d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
@@ -5957,12 +5947,7 @@ msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??æª¢è¦?"
 msgid "calendar view for one or more weeks"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??æª¢è¦?"
 
-#: ../calendar/gui/gnome-cal.c:1942
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "è¼?å?¥ %s ç??ç´?æ??"
-
-#: ../calendar/gui/gnome-cal.c:2557
+#: ../calendar/gui/gnome-cal.c:2144
 msgid "Purging"
 msgstr "æ¸?é?¤"
 
@@ -6133,12 +6118,11 @@ msgstr "iCalendar è³?è¨?"
 
 #: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
+msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?æ?°ç??äº?ä»¶è??å?¶ä»?äº?ä»¶æ??æ??é??ç??ã??"
 
 #: ../calendar/gui/itip-utils.c:835
-#, fuzzy
 msgid "Unable to book a resource, error: "
-msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??å»¶ä¼¸"
+msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?é?¯èª¤ç?ºï¼?"
 
 #: ../calendar/gui/itip-utils.c:988
 msgid "You must be an attendee of the event."
@@ -6268,77 +6252,77 @@ msgstr "30æ?¥"
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "å?"
 
-#: ../calendar/gui/print.c:2525
+#: ../calendar/gui/print.c:2564
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/print.c:2527
+#: ../calendar/gui/print.c:2566
 msgid "Task"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2575
+#: ../calendar/gui/print.c:2615
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2658
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2629
+#: ../calendar/gui/print.c:2673
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2644
+#: ../calendar/gui/print.c:2691
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2702
 #, c-format
 msgid "URL: %s"
 msgstr "ç¶²å??: %s"
 
-#: ../calendar/gui/print.c:2668
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2679
+#: ../calendar/gui/print.c:2726
 msgid "Contacts: "
 msgstr "é?£çµ¡äºº: "
 
@@ -6369,7 +6353,7 @@ msgstr "ç´?æ??å??æ??è°"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1820
+#: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
@@ -7959,7 +7943,7 @@ msgid "Save as..."
 msgstr "å?¦å?æ?°æª?..."
 
 #: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
@@ -8020,10 +8004,6 @@ msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 msgid "Character _Encoding"
 msgstr "å?å??ç·¨ç¢¼(_E)"
 
-#: ../composer/e-composer-actions.c:351
-msgid "_Security"
-msgstr "å®?å?¨æ?§(_S)"
-
 #: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PG_P å? å¯?"
@@ -8136,7 +8116,7 @@ msgid "Fr_om:"
 msgstr "å¯?ä»¶è??(_O):"
 
 #: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:958
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
@@ -8186,7 +8166,7 @@ msgstr "æ??é??è£¡æ?°å¢?ç?®é??æ??å??"
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£¡ï¼?é?¸å??è¦?å¼µè²¼ç??è³?æ??å¤¾"
 
-#: ../composer/e-composer-private.c:280
+#: ../composer/e-composer-private.c:284
 msgid "Save draft"
 msgstr "å?²å?è??ç¨¿"
 
@@ -8401,7 +8381,7 @@ msgstr "Evolution é?¯èª¤"
 msgid "Evolution Warning"
 msgstr "Evolution è¦å??"
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:636
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
@@ -8481,9 +8461,9 @@ msgstr "è¦?è¦º"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../plugins/itip-formatter/itip-view.c:195
-#: ../widgets/table/e-cell-date-edit.c:304
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "ä»?å¤©"
 
@@ -8607,6 +8587,12 @@ msgstr "å·²å??ç?¨"
 msgid "Whether the plugin is enabled"
 msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
 
+#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "é?±"
+
 #: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "å??å?°æ??ç?¼ç??é?¯èª¤"
@@ -8620,7 +8606,7 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "å??å?°ç³»çµ±æ²?æ??å??å ±ä»»ä½?é??æ?¼æ¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 
-#: ../e-util/e-signature.c:699
+#: ../e-util/e-signature.c:701
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
@@ -8665,24 +8651,24 @@ msgstr "GConf é?¯èª¤ï¼?%s"
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:961
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
 #: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
 #: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "å?¯æ?¬"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
 #: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
 #: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "å¯?ä»¶å?¯æ?¬"
 
-#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
 #: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
@@ -8690,12 +8676,12 @@ msgid "Subject"
 msgstr "ä¸»æ?¨"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2422
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
 #: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "å¯?ä»¶è??"
 
-#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1227
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
@@ -8880,56 +8866,56 @@ msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 msgid "Choose a File"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../filter/e-filter-rule.c:653
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "è¦?å??å??ç¨±(_U):"
 
-#: ../filter/e-filter-rule.c:682
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?ä»¶ç??é ?ç?®"
 
-#: ../filter/e-filter-rule.c:716
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "å? å?¥æ¢?ä»¶(_D)"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/e-filter-rule.c:724
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "å°?æ?¾é ?ç?®(_F):"
 
-#: ../filter/e-filter-rule.c:745
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/e-filter-rule.c:745 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/e-filter-rule.c:745
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/e-filter-rule.c:745
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "æ²?æ??å??å¾©æ??å??å§?é?µä»¶"
 
-#: ../filter/e-filter-rule.c:747
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾¤çµ?(_N)"
 
-#: ../filter/e-filter-rule.c:1120 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:301
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/e-filter-rule.c:1120 ../mail/em-utils.c:302
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
 msgid "Outgoing"
 msgstr "å¤?å¯?"
 
@@ -9050,39 +9036,30 @@ msgstr "ç?®å??ç??æ??å?»"
 msgid "the time you specify"
 msgstr "æ?¨æ??å®?ç??æ??å?»"
 
-#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:498
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:519
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-#: ../plugins/google-account-setup/google-source.c:742
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "weeks"
-msgstr "é?±"
-
 #: ../filter/filter.ui.h:23
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:119 ../mail/em-format-html-display.c:1025
-#: ../mail/mail-config.ui.h:13 ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:147
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??ä»¶"
 msgstr[1] "é??ä»¶"
 
-#: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:607
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "å??ç¤ºæª¢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:613
-#: ../widgets/misc/e-attachment-paned.c:608
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "æ¸?å?®æª¢è¦?"
 
-#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:628
+#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:631
 msgid "Focus Tracker"
 msgstr "ç?¦é»?è¿½è¹¤å?¨"
 
@@ -9147,7 +9124,7 @@ msgid "_Later"
 msgstr "ç¨?å¾?(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:505
+#: ../modules/mail/e-mail-shell-view-actions.c:515
 msgid "Add Label"
 msgstr "å? å?¥æ¨?ç±¤"
 
@@ -9169,7 +9146,7 @@ msgstr "é¡?è?²"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
 #: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
-#: ../modules/mail/e-mail-shell-view-private.c:908
+#: ../modules/mail/e-mail-shell-view-private.c:961
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
@@ -9191,32 +9168,32 @@ msgstr "å·²å?³é??"
 msgid "Templates"
 msgstr "ç¯?æ?¬"
 
-#: ../mail/e-mail-migrate.c:953 ../mail/em-filter-i18n.h:30
+#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
 msgid "Important"
 msgstr "é??è¦?"
 
 #. green
-#: ../mail/e-mail-migrate.c:956
+#: ../mail/e-mail-migrate.c:963
 msgid "To Do"
 msgstr "å¾?è¾¦"
 
 #. blue
-#: ../mail/e-mail-migrate.c:957
+#: ../mail/e-mail-migrate.c:964
 msgid "Later"
 msgstr "ç¨?å¾?"
 
-#: ../mail/e-mail-migrate.c:1103
+#: ../mail/e-mail-migrate.c:1110
 #: ../modules/addressbook/e-book-shell-migrate.c:76
 #: ../modules/calendar/e-cal-shell-migrate.c:123
 #: ../modules/calendar/e-task-shell-migrate.c:90
 msgid "Migrating..."
 msgstr "æ£å?¨ç§»è½?..."
 
-#: ../mail/e-mail-migrate.c:1136
+#: ../mail/e-mail-migrate.c:1143
 msgid "Migration"
 msgstr "ç§»è½?"
 
-#: ../mail/e-mail-migrate.c:1176
+#: ../mail/e-mail-migrate.c:1183
 #: ../modules/addressbook/e-book-shell-migrate.c:128
 #: ../modules/calendar/e-cal-shell-migrate.c:165
 #: ../modules/calendar/e-task-shell-migrate.c:132
@@ -9224,26 +9201,26 @@ msgstr "ç§»è½?"
 msgid "Migrating '%s':"
 msgstr "æ£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../mail/e-mail-migrate.c:1586
+#: ../mail/e-mail-migrate.c:1594
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?°è³?æ??å¤¾ `%s'ï¼?%s"
 
-#: ../mail/e-mail-migrate.c:1614
+#: ../mail/e-mail-migrate.c:1622
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ç?¡æ³?è¤?è£½è£½è³?æ??å¤¾ `%s' è?³ `%s'ï¼?%s"
 
-#: ../mail/e-mail-migrate.c:1809
+#: ../mail/e-mail-migrate.c:1817
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
 
-#: ../mail/e-mail-migrate.c:1815 ../mail/e-mail-migrate.c:2912
+#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2927
 msgid "Migrating Folders"
 msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
 
-#: ../mail/e-mail-migrate.c:1816
+#: ../mail/e-mail-migrate.c:1824
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -9254,27 +9231,27 @@ msgstr ""
 "\n"
 "ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../mail/e-mail-migrate.c:2019
+#: ../mail/e-mail-migrate.c:2027
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/e-mail-migrate.c:2035
+#: ../mail/e-mail-migrate.c:2043
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "ç?¡æ³?å»ºç«? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
 
-#: ../mail/e-mail-migrate.c:2067
+#: ../mail/e-mail-migrate.c:2075
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "ç?¡æ³?è¤?è£½ POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/e-mail-migrate.c:2538 ../mail/e-mail-migrate.c:2552
+#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?¬å?°é?µä»¶å?²å?å?? `%s':%s"
 
-#: ../mail/e-mail-migrate.c:2913
+#: ../mail/e-mail-migrate.c:2928
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9288,7 +9265,7 @@ msgstr ""
 #. On This Computer is always first, and Search Folders
 #. * is always last.
 #. create the local source group
-#: ../mail/e-mail-migrate.c:2928 ../mail/e-mail-store.c:229
+#: ../mail/e-mail-migrate.c:2943 ../mail/e-mail-store.c:229
 #: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
 #: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
 #: ../modules/addressbook/e-book-shell-backend.c:125
@@ -9302,12 +9279,12 @@ msgstr ""
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
-#: ../mail/e-mail-migrate.c:3008
+#: ../mail/e-mail-migrate.c:3023
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "ç?¡æ³?å?¨ `%s' å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾:%s"
 
-#: ../mail/e-mail-migrate.c:3026
+#: ../mail/e-mail-migrate.c:3041
 #, c-format
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
@@ -9319,27 +9296,27 @@ msgstr ""
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
 #: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:580
+#: ../modules/calendar/e-task-shell-view-actions.c:572
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??è©¢å??æ??"
 
-#: ../mail/e-mail-reader.c:194 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:208 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "è¤?è£½è?³è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:194 ../mail/em-folder-utils.c:382
+#: ../mail/e-mail-reader.c:208 ../mail/em-folder-utils.c:385
 msgid "C_opy"
 msgstr "è¤?è£½(_O)"
 
-#: ../mail/e-mail-reader.c:568 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:582 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ç§»è?³è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:568 ../mail/em-folder-utils.c:382
+#: ../mail/e-mail-reader.c:582 ../mail/em-folder-utils.c:385
 msgid "_Move"
 msgstr "ç§»å??(_M)"
 
-#: ../mail/e-mail-reader.c:794
+#: ../mail/e-mail-reader.c:808
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "å?²å?é?µä»¶"
@@ -9351,540 +9328,540 @@ msgstr[1] "å?²å?é?µä»¶"
 #. * 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:815 ../plugins/groupwise-features/properties.ui.h:5
+#: ../mail/e-mail-reader.c:829 ../plugins/groupwise-features/properties.ui.h:5
 #: ../widgets/table/e-table-click-to-add.c:518
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "é?µä»¶"
 msgstr[1] "é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1073
+#: ../mail/e-mail-reader.c:1087
 msgid "A_dd Sender to Address Book"
 msgstr "å? å?¥å¯?ä»¶è??å?°ç?®é??æ??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1075
+#: ../mail/e-mail-reader.c:1089
 msgid "Add sender to address book"
 msgstr "æ?°å¢?å¯?ä»¶è??è?³é??è¨?é??"
 
-#: ../mail/e-mail-reader.c:1080
+#: ../mail/e-mail-reader.c:1094
 msgid "Check for _Junk"
 msgstr "æª¢æ?¥å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1082
+#: ../mail/e-mail-reader.c:1096
 msgid "Filter the selected messages for junk status"
 msgstr "ç¯©é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
 
-#: ../mail/e-mail-reader.c:1087
+#: ../mail/e-mail-reader.c:1101
 msgid "_Copy to Folder..."
 msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)..."
 
-#: ../mail/e-mail-reader.c:1089
+#: ../mail/e-mail-reader.c:1103
 msgid "Copy selected messages to another folder"
 msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1094
+#: ../mail/e-mail-reader.c:1108
 msgid "_Delete Message"
 msgstr "å?ªé?¤é?µä»¶(_D)"
 
-#: ../mail/e-mail-reader.c:1096
+#: ../mail/e-mail-reader.c:1110
 msgid "Mark the selected messages for deletion"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??è¦?å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:1101
+#: ../mail/e-mail-reader.c:1115
 msgid "Filter on Mailing _List..."
 msgstr "é??ä¿¡è«?å£?é??æ¿¾å?¨(_L)..."
 
-#: ../mail/e-mail-reader.c:1103
+#: ../mail/e-mail-reader.c:1117
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1108
+#: ../mail/e-mail-reader.c:1122
 msgid "Filter on _Recipients..."
 msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_R)..."
 
-#: ../mail/e-mail-reader.c:1110
+#: ../mail/e-mail-reader.c:1124
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1115
+#: ../mail/e-mail-reader.c:1129
 msgid "Filter on Se_nder..."
 msgstr "å¯?ä»¶è??é??æ¿¾å?¨(_N)..."
 
-#: ../mail/e-mail-reader.c:1117
+#: ../mail/e-mail-reader.c:1131
 msgid "Create a rule to filter messages from this sender"
 msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1122
+#: ../mail/e-mail-reader.c:1136
 msgid "Filter on _Subject..."
 msgstr "ä¸»æ?¨é??æ¿¾å?¨(_S)..."
 
-#: ../mail/e-mail-reader.c:1124
+#: ../mail/e-mail-reader.c:1138
 msgid "Create a rule to filter messages with this subject"
 msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1129
+#: ../mail/e-mail-reader.c:1143
 msgid "A_pply Filters"
 msgstr "å¥?ç?¨é??æ¿¾å?¨(_P)"
 
-#: ../mail/e-mail-reader.c:1131
+#: ../mail/e-mail-reader.c:1145
 msgid "Apply filter rules to the selected messages"
 msgstr "å¥?ç?¨é??æ¿¾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1136
+#: ../mail/e-mail-reader.c:1150
 msgid "_Find in Message..."
 msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)..."
 
-#: ../mail/e-mail-reader.c:1138
+#: ../mail/e-mail-reader.c:1152
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1157
 msgid "_Clear Flag"
 msgstr "æ¸?é?¤æ¨?å¹?(_C)"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1159
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ç§»é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1164
 msgid "_Flag Completed"
 msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1166
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?è¨ç?ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1171
 msgid "Follow _Up..."
 msgstr "è·?é?¨(_U)..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1173
 msgid "Flag the selected messages for follow-up"
 msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1178
 msgid "_Attached"
 msgstr "é??ä»¶(_A)"
 
-#: ../mail/e-mail-reader.c:1166 ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
 msgid "Forward the selected message to someone as an attachment"
 msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??ä»¶å½¢å¼?è½?å¯?çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1185
 msgid "Forward As _Attached"
 msgstr "ä»¥é??ä»¶è½?å¯?(_A)"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1192
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
 msgid "Forward the selected message in the body of a new message"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1199
 msgid "Forward As _Inline"
 msgstr "ä»¥è¡?å?§è½?å¯?(_I)"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1206
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
-#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1208 ../mail/e-mail-reader.c:1215
 msgid "Forward the selected message quoted like a reply"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1213
 msgid "Forward As _Quoted"
 msgstr "ä»¥å¼?æ??è½?å¯?(_Q)"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1220
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1222
 msgid "Force images in HTML mail to be loaded"
 msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1227
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1229
 msgid "Mark the selected messages as important"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??é??è¦?"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1234
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1236
 msgid "Mark the selected messages as junk"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1241
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1243
 msgid "Mark the selected messages as not being junk"
 msgstr "å°?é?¸å??ç??é?µä»¶æ¨?ç¤ºæ??ä¸?æ?¯å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1248
 msgid "_Read"
 msgstr "å·²é?±è®?(_R)"
 
-#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1250
 msgid "Mark the selected messages as having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å·²ç¶?é?±è®?"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1255
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1257
 msgid "Mark the selected messages as unimportant"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??ä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1262
 msgid "_Unread"
 msgstr "æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1264
 msgid "Mark the selected messages as not having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??æ?ªé?±è®?"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1269
 msgid "_Edit as New Message..."
 msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)..."
 
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1271
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1276
 msgid "Compose _New Message"
 msgstr "æ?°å¯«æ?°é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1278
 msgid "Open a window for composing a mail message"
 msgstr "é??å??è¦?çª?ä»¥ä¾¿æ?°å¯«é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1283
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1285
 msgid "Open the selected messages in a new window"
 msgstr "ä½¿ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1290
 msgid "_Move to Folder..."
 msgstr "ç§»è?³è³?æ??å¤¾(_M)..."
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1292
 msgid "Move selected messages to another folder"
 msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1297
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1299
 msgid "Display the next message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1304
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1306
 msgid "Display the next important message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1311
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1313
 msgid "Display the next thread"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1318
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1320
 msgid "Display the next unread message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1325
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1327
 msgid "Display the previous message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1332
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1334
 msgid "Display the previous important message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1339
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1341
 msgid "Display the previous unread message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1348
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1355
 msgid "Preview the message to be printed"
 msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1360
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1362
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:1353
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../mail/e-mail-reader.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??äºº(_A)"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1369
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1374
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1376
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1381
 #: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1383
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?ä»¶è??"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1388
 msgid "_Save as mbox..."
 msgstr "å?²å?æ?? mbox(_S)..."
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1390
 msgid "Save selected messages as an mbox file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ?? mbox æª?æ¡?"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1395
 msgid "Search Folder from Mailing _List..."
 msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)..."
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1397
 msgid "Create a search folder for this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1402
 msgid "Search Folder from Recipien_ts..."
 msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)..."
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1404
 msgid "Create a search folder for these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1409
 msgid "Search Folder from Sen_der..."
 msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)..."
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1411
 msgid "Create a search folder for this sender"
 msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1402
+#: ../mail/e-mail-reader.c:1416
 msgid "Search Folder from S_ubject..."
 msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)..."
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1418
 msgid "Create a search folder for this subject"
 msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1423
 msgid "_Message Source"
 msgstr "é?µä»¶ä¾?æº?(_M)"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1425
 msgid "Show the raw email source of the message"
 msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
 
-#: ../mail/e-mail-reader.c:1423
+#: ../mail/e-mail-reader.c:1437
 msgid "_Undelete Message"
 msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1439
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1444
 msgid "_Normal Size"
 msgstr "æ£å¸¸å¤§å°?(_N)"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1446
 msgid "Reset the text to its original size"
 msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
 
-#: ../mail/e-mail-reader.c:1437
+#: ../mail/e-mail-reader.c:1451
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1453
 msgid "Increase the text size"
 msgstr "å°?æ??å?æ?¾å¤§"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1458
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1460
 msgid "Decrease the text size"
 msgstr "å°?æ??å?ç¸®å°?"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1467
 msgid "Create R_ule"
 msgstr "å»ºç«?è¦?å??(_U)"
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1474
 msgid "Ch_aracter Encoding"
 msgstr "å?å??ç·¨ç¢¼(_A)"
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1481
 msgid "F_orward As"
 msgstr "è½?å¯?ç?º(_O)"
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1488
 msgid "_Go To"
 msgstr "ç§»è?³(_G)"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1495
 msgid "Mar_k As"
 msgstr "æ¨?ç¤ºæ??(_K)"
 
-#: ../mail/e-mail-reader.c:1488
+#: ../mail/e-mail-reader.c:1502
 msgid "_Message"
 msgstr "é?µä»¶(_M)"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1509
 msgid "_Zoom"
 msgstr "ç¸®æ?¾(_Z)"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1534
 msgid "Mark for Follo_w Up..."
 msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)..."
 
-#: ../mail/e-mail-reader.c:1528
+#: ../mail/e-mail-reader.c:1542
 msgid "Mark as _Important"
 msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1532
+#: ../mail/e-mail-reader.c:1546
 msgid "Mark as _Junk"
 msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1550
 msgid "Mark as _Not Junk"
 msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1540
+#: ../mail/e-mail-reader.c:1554
 msgid "Mar_k as Read"
 msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1558
 msgid "Mark as Uni_mportant"
 msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1562
 msgid "Mark as _Unread"
 msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:1584
+#: ../mail/e-mail-reader.c:1598
 msgid "_Caret Mode"
 msgstr "æ¼?å?æ¨¡å¼?(_C)"
 
-#: ../mail/e-mail-reader.c:1586
+#: ../mail/e-mail-reader.c:1600
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
 
-#: ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1606
 msgid "All Message _Headers"
 msgstr "æ??æ??é?µä»¶æª?é (_H)"
 
-#: ../mail/e-mail-reader.c:1594
+#: ../mail/e-mail-reader.c:1608
 msgid "Show messages with all email headers"
 msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
 
-#: ../mail/e-mail-reader.c:1813
+#: ../mail/e-mail-reader.c:1831
 msgid "Unable to retrieve message"
 msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1858 ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1876 ../mail/mail-ops.c:1849
 #, 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:2352
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:612
-#: ../plugins/google-account-setup/google-source.c:783
+#: ../mail/e-mail-reader.c:2370
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:534
+#: ../plugins/google-account-setup/google-source.c:656
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "é ?è¨å?¼"
 
-#: ../mail/e-mail-reader.c:2471
+#: ../mail/e-mail-reader.c:2489
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "è½?å¯?(_F)"
 
-#: ../mail/e-mail-reader.c:2472
+#: ../mail/e-mail-reader.c:2490
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:2516 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2534 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:2520
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../mail/e-mail-reader.c:2538
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:2524
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:2528 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2546 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "å??è¦?"
 
@@ -9894,7 +9871,7 @@ 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:484 ../mail/mail-config.ui.h:72
+#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
 #: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "æ²?æ??å? å¯?"
@@ -9902,7 +9879,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:488 ../mail/mail-config.ui.h:120
+#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
 #: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "TLS å? å¯?"
@@ -9910,17 +9887,17 @@ 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:492 ../mail/mail-config.ui.h:93
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
 #: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL å? å¯?"
 
-#: ../mail/em-account-editor.c:579
+#: ../mail/em-account-editor.c:595
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:586
+#: ../mail/em-account-editor.c:602
 #, c-format
 msgid ""
 "\n"
@@ -9934,34 +9911,34 @@ msgstr ""
 "ä¸¦é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:866 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:949
+#: ../mail/em-account-editor.c:965
 msgid "Never"
 msgstr "æ°¸ä¸?"
 
-#: ../mail/em-account-editor.c:950
+#: ../mail/em-account-editor.c:966
 msgid "Always"
 msgstr "æ°¸é? "
 
-#: ../mail/em-account-editor.c:951
+#: ../mail/em-account-editor.c:967
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1683 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2039
+#: ../mail/em-account-editor.c:2055
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2040
+#: ../mail/em-account-editor.c:2056
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9971,12 +9948,12 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2042 ../mail/em-account-editor.c:2178
+#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
 #: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "èº«å??"
 
-#: ../mail/em-account-editor.c:2043
+#: ../mail/em-account-editor.c:2059
 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 "
@@ -9985,20 +9962,20 @@ msgstr ""
 "è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??æ?¨å¸?æ??å?¨é??å?º"
 "ç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
 
-#: ../mail/em-account-editor.c:2045 ../mail/em-account-editor.c:2215
+#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
 #: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2046
+#: ../mail/em-account-editor.c:2062
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨å®?ä¸?å??å¸³è??ç??è¨å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2048 ../mail/em-account-editor.c:2692
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
 msgid "Sending Email"
 msgstr "å?³é??é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2065
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10006,11 +9983,11 @@ msgstr ""
 "è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??æ?¨ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²è·¯æ??å??ä¾?"
 "æ??å??ã??"
 
-#: ../mail/em-account-editor.c:2051
+#: ../mail/em-account-editor.c:2067
 msgid "Account Management"
 msgstr "å¸³è??ç¸½ç®¡"
 
-#: ../mail/em-account-editor.c:2052
+#: ../mail/em-account-editor.c:2068
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10018,11 +9995,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??\n"
 "é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2072
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2057
+#: ../mail/em-account-editor.c:2073
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10036,48 +10013,48 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
 
-#: ../mail/em-account-editor.c:2502
+#: ../mail/em-account-editor.c:2518
 msgid "Check for _new messages every"
 msgstr "è?ªå??æª¢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2510
+#: ../mail/em-account-editor.c:2526
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2756 ../mail/mail-config.ui.h:31
+#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "é ?è¨å?¼"
 
-#: ../mail/em-account-editor.c:2818 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
 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:2855 ../mail/em-account-editor.c:2923
+#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é?¸é ?"
 
-#: ../mail/em-account-editor.c:2856 ../mail/em-account-editor.c:2924
+#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
 msgid "Checking for New Messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/em-account-editor.c:3391
+#: ../mail/em-account-editor.c:3408
 msgid "Account Editor"
 msgstr "å¸³è??ç·¨è¼¯å?¨"
 
-#: ../mail/em-account-editor.c:3391
+#: ../mail/em-account-editor.c:3408
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
-#: ../mail/em-composer-utils.c:1953
+#: ../mail/em-composer-utils.c:1954
 msgid "an unknown sender"
 msgstr "ä¸?æ??ç??å¯?ä»¶è??"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2000
+#: ../mail/em-composer-utils.c:2001
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10085,15 +10062,15 @@ msgstr ""
 "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} "
 "${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
 
-#: ../mail/em-composer-utils.c:2144
+#: ../mail/em-composer-utils.c:2145
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-composer-utils.c:2325
+#: ../mail/em-composer-utils.c:2326
 msgid "Posting destination"
 msgstr "å¼µè²¼ç??ç?®ç??ç«¯"
 
-#: ../mail/em-composer-utils.c:2326
+#: ../mail/em-composer-utils.c:2327
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
 
@@ -10434,12 +10411,12 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??å¤¾æ¨¹"
 
-#: ../mail/em-folder-tree.c:1477
+#: ../mail/em-folder-tree.c:1477 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ£å?¨ç§»å??è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1479
+#: ../mail/em-folder-tree.c:1479 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ£å?¨è¤?è£½è³?æ??å¤¾ %s"
@@ -10458,36 +10435,31 @@ msgstr "æ£å?¨è¤?è£½é?µä»¶è?³è³?æ??å¤¾ %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?å±¤ç??å?²å?å??"
 
-#: ../mail/em-folder-utils.c:98
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "å°?ã??%sã??è¤?è£½å?°ã??%sã??"
-
-#: ../mail/em-folder-utils.c:383
+#: ../mail/em-folder-utils.c:386
 msgid "Move Folder To"
 msgstr "ç§»å??è³?æ??å¤¾å?°"
 
-#: ../mail/em-folder-utils.c:383
+#: ../mail/em-folder-utils.c:386
 msgid "Copy Folder To"
 msgstr "è¤?è£½è³?æ??å¤¾å?°"
 
-#: ../mail/em-folder-utils.c:496
+#: ../mail/em-folder-utils.c:499
 #: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "æ£å?¨å»ºç«?è³?æ??å¤¾ `%s'"
 
-#: ../mail/em-folder-utils.c:659
+#: ../mail/em-folder-utils.c:662
 msgid "Create Folder"
 msgstr "å»ºç«?è³?æ??å¤¾"
 
-#: ../mail/em-folder-utils.c:660
+#: ../mail/em-folder-utils.c:663
 #: ../plugins/groupwise-features/install-shared.c:175
 #: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?å»ºç«?è³?æ??å¤¾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-utils.c:676
+#: ../mail/em-folder-utils.c:679
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾ ã??%sã??"
@@ -10719,7 +10691,7 @@ msgstr "é?µä»¶è¦?å??"
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
 
-#: ../mail/em-vfolder-editor.c:124
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??å¤¾(_F)"
 
@@ -11724,7 +11696,7 @@ msgid "Importing Elm data"
 msgstr "è¼¸å?¥ Elm è³?æ??"
 
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:603
+#: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 msgid "Mail"
 msgstr "é?µä»¶"
@@ -12271,10 +12243,10 @@ msgstr "ä½¿ç?¨è??å??ç¨±(_E):"
 msgid "Use Authe_ntication"
 msgstr "ä½¿ç?¨é©?è?(_N)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:441
-#: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/google-account-setup/google-source.c:700
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../plugins/google-account-setup/google-contacts-source.c:283
+#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_N):"
 
@@ -12816,7 +12788,7 @@ msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??å¤¾"
 msgid "Edit Search Folder"
 msgstr "ç·¨è¼¯æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1265
+#: ../mail/mail-vfolder.c:1274
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??å¤¾"
 
@@ -13403,7 +13375,7 @@ msgid "_Do not Synchronize"
 msgstr "ä¸?è¦?å??æ¥(_D)"
 
 #: ../mail/mail.error.xml.h:138
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:862
 msgid "_Empty Trash"
 msgstr "æ¸?ç??å??æ?¶ç?(_E)"
 
@@ -13490,24 +13462,24 @@ msgid "Shell Backend"
 msgstr "Shell å¾?ç«¯ç¨?å¼?"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4885
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4887
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4720
+#: ../mail/message-list.c:4722
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 "æ²?æ??é?µä»¶ç¬¦å??æ?¨ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4722
+#: ../mail/message-list.c:4724
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
 msgstr "å?¨é??å??è³?æ??å¤¾ä¸å?ªæ??é?±è??ç??é?µä»¶ã??ä½¿ç?¨ æª¢è¦?->é¡¯ç¤ºé?±è??ç??é?µä»¶ ä¾?é¡¯ç¤ºå®?å??ã??"
 
-#: ../mail/message-list.c:4724
+#: ../mail/message-list.c:4726
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -13545,27 +13517,27 @@ msgid "Subject - Trimmed"
 msgstr "ä¸»æ?¨ - å·²æ?ªç?"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Body contains"
 msgstr "å?§æ??å??å?«"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Message contains"
 msgstr "é?µä»¶å??å?«"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Sender contains"
 msgstr "å¯?ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Subject contains"
 msgstr "ä¸»æ?¨å??å?«"
 
@@ -13644,6 +13616,7 @@ msgid "Details"
 msgstr "è©³ç´°è³?æ??"
 
 #: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ£å?¨æ??å°?"
 
@@ -13757,7 +13730,7 @@ msgid "_Contact"
 msgstr "é?£çµ¡äºº(_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:763
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "Create a new contact"
 msgstr "å»ºç«?æ?°ç??é?£çµ¡äºº"
 
@@ -13767,7 +13740,7 @@ msgid "Contact _List"
 msgstr "é?£çµ¡äººæ¸?å?®(_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:770
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "Create a new contact list"
 msgstr "å»ºç«?æ?°ç??é?£çµ¡äººæ¸?å?®"
 
@@ -13777,7 +13750,7 @@ msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:693
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "Create a new address book"
 msgstr "å»ºç«?æ?°é??è¨?é??"
 
@@ -13797,9 +13770,8 @@ msgid "Source List"
 msgstr "ä¾?æº?æ¸?å?®"
 
 #: ../modules/addressbook/e-book-shell-backend.c:597
-#, fuzzy
 msgid "The registry of address books"
-msgstr "æ?¬å?°ç«¯é??è¨?é??"
+msgstr "é??è¨?é??ç??è¨»å??è¡¨"
 
 #: ../modules/addressbook/e-book-shell-content.c:364
 msgid "Current View"
@@ -13818,15 +13790,15 @@ msgid "The contact being shown in the preview pane"
 msgstr "è¦?é¡¯ç¤ºå?¨é ?è¦½çª?æ ¼ç??é?£çµ¡äºº"
 
 #: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:613
-#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/calendar/e-memo-shell-content.c:617
+#: ../modules/calendar/e-task-shell-content.c:639
 #: ../modules/mail/e-mail-shell-content.c:688
 msgid "Preview is Visible"
 msgstr "é ?è¦½ç?ºé¡¯ç¤ºç??æ??"
 
 #: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:614
-#: ../modules/calendar/e-task-shell-content.c:636
+#: ../modules/calendar/e-memo-shell-content.c:618
+#: ../modules/calendar/e-task-shell-content.c:640
 #: ../modules/mail/e-mail-shell-content.c:689
 msgid "Whether the preview pane is visible"
 msgstr "é ?è¦½çª?æ ¼æ?¯å?¦ç?ºå?¯è¦?"
@@ -13881,9 +13853,9 @@ msgstr ""
 "ç?¶ Evolution ç§»è½?æ?¨ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç?å??..."
 
 #: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:608
-#: ../modules/calendar/e-memo-shell-sidebar.c:543
-#: ../modules/calendar/e-task-shell-sidebar.c:541
+#: ../modules/calendar/e-cal-shell-sidebar.c:756
+#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#: ../modules/calendar/e-task-shell-sidebar.c:682
 msgid "Source Selector Widget"
 msgstr "ä¾?æº?é?¸æ??å?¨è¦?çª?å??ä»¶"
 
@@ -13896,227 +13868,227 @@ msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºé??è¨?é??ç??ç¾¤çµ?"
 msgid "Save as vCard"
 msgstr "å?²å?ç?º vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:670
+#: ../modules/addressbook/e-book-shell-view-actions.c:662
 msgid "Co_py All Contacts To..."
 msgstr "è¤?è£½æ??æ??ç??é?£çµ¡äººå?°(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:672
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Copy the contacts of the selected address book to another"
 msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??é?£çµ¡äººè¤?è£½å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:677
+#: ../modules/addressbook/e-book-shell-view-actions.c:669
 msgid "D_elete Address Book"
 msgstr "å?ªé?¤é??è¨?é??(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:679
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "Delete the selected address book"
 msgstr "å?ªé?¤é?¸å??ç??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:684
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
 msgid "Mo_ve All Contacts To..."
 msgstr "å°?æ??æ??ç??é?£çµ¡äººç§»å?°(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:686
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Move the contacts of the selected address book to another"
 msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??é?£çµ¡äººç§»å??å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:691
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "_New Address Book"
 msgstr "æ?°å¢?é??è¨?é??(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:698
+#: ../modules/addressbook/e-book-shell-view-actions.c:690
 msgid "Address _Book Properties"
 msgstr "é??è¨?é??å±¬æ?§(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Show properties of the selected address book"
 msgstr "é¡¯ç¤ºé?¸å??é??è¨?é??ç??å±¬æ?§"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:705
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
-#: ../modules/calendar/e-task-shell-view-actions.c:755
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
+#: ../modules/addressbook/e-book-shell-view-actions.c:697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_Rename..."
 msgstr "é??æ?°å?½å??(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:707
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
 msgid "Rename the selected address book"
 msgstr "é??æ?°å?½å??é?¸å??ç??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:712
+#: ../modules/addressbook/e-book-shell-view-actions.c:704
 msgid "S_ave Address Book as vCard"
 msgstr "å°?é??è¨?é??å?¦å?ç?º vC_ard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:714
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??é?£çµ¡äººå?²å?ç?º vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:721
+#: ../modules/addressbook/e-book-shell-view-actions.c:713
 msgid "Stop loading"
 msgstr "å??æ¢è¼?å?¥"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:726
+#: ../modules/addressbook/e-book-shell-view-actions.c:718
 msgid "_Copy Contact To..."
 msgstr "è¤?è£½é?£çµ¡äººå?°(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:728
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "Copy selected contacts to another address book"
 msgstr "å°?é?¸å??ç??é?£çµ¡äººè¤?è£½å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:733
+#: ../modules/addressbook/e-book-shell-view-actions.c:725
 msgid "_Delete Contact"
 msgstr "å?ªé?¤é?£çµ¡äºº(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:740
+#: ../modules/addressbook/e-book-shell-view-actions.c:732
 msgid "_Find in Contact..."
 msgstr "å?¨é?£çµ¡äººå?§å°?æ?¾(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "Search for text in the displayed contact"
 msgstr "æ??å°?é¡¯ç¤ºç??é?£çµ¡äººä¸ç??æ??å?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:747
+#: ../modules/addressbook/e-book-shell-view-actions.c:739
 msgid "_Forward Contact..."
 msgstr "è½?å¯?é?£çµ¡äºº(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:749
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "Send selected contacts to another person"
 msgstr "å?³é??é?¸å??é?£çµ¡äººçµ¦å?¶ä»?ä½¿ç?¨è??ã??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:754
+#: ../modules/addressbook/e-book-shell-view-actions.c:746
 msgid "_Move Contact To..."
 msgstr "å°?é?£çµ¡äººç§»å?°(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:756
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "Move selected contacts to another address book"
 msgstr "å°?é?¸å??ç??é?£çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:761
+#: ../modules/addressbook/e-book-shell-view-actions.c:753
 msgid "_New Contact..."
 msgstr "æ?°å¢?é?£çµ¡äºº(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:768
+#: ../modules/addressbook/e-book-shell-view-actions.c:760
 msgid "New Contact _List..."
 msgstr "æ?°å¢?é?£çµ¡äººæ¸?å?®(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:775
+#: ../modules/addressbook/e-book-shell-view-actions.c:767
 msgid "_Open Contact"
 msgstr "é??å??é?£çµ¡äºº(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:777
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "View the current contact"
 msgstr "æª¢è¦?ç?®å??ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:782
+#: ../modules/addressbook/e-book-shell-view-actions.c:774
 msgid "_Send Message to Contact..."
 msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:784
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "Send a message to the selected contacts"
 msgstr "å?³é??é?µä»¶è?³é?¸å??ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:791
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "_Actions"
 msgstr "å??ä½?(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:798
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/mail/e-mail-shell-view-actions.c:1088
 msgid "_Preview"
 msgstr "é ?è¦½(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:807
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
-#: ../modules/calendar/e-task-shell-view-actions.c:833
+#: ../modules/addressbook/e-book-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Delete"
 msgstr "å?ªé?¤(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#: ../modules/addressbook/e-book-shell-view-actions.c:803
 msgid "_Properties"
 msgstr "å±¬æ?§(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:819
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "_Save as vCard..."
 msgstr "å?²å?æ?? _vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Contact _Preview"
 msgstr "é?£çµ¡äººé ?è¦½(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
 msgid "Show contact preview window"
 msgstr "é¡¯ç¤ºé?£çµ¡äººé ?è¦½è¦?çª?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:868
-#: ../modules/calendar/e-memo-shell-view-actions.c:738
-#: ../modules/calendar/e-task-shell-view-actions.c:902
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "_Classic View"
 msgstr "å?³çµ±æª¢è¦?(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "Show contact preview below the contact list"
 msgstr "å?¨é?£çµ¡äººæ¸?å?®ä¸?æ?¹é¡¯ç¤ºé?£çµ¡äººé ?è¦½"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:875
-#: ../modules/calendar/e-memo-shell-view-actions.c:745
-#: ../modules/calendar/e-task-shell-view-actions.c:909
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/calendar/e-memo-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "_Vertical View"
 msgstr "å??ç?´æª¢è¦?(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "Show contact preview alongside the contact list"
 msgstr "å?¨é?£çµ¡äººæ¸?å?®æ??é??é¡¯ç¤ºé?£çµ¡äººé ?è¦½"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
-#: ../modules/calendar/e-memo-shell-view-actions.c:755
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
-#: ../modules/calendar/e-cal-shell-view-actions.c:1616
-#: ../modules/calendar/e-memo-shell-view-actions.c:762
-#: ../modules/calendar/e-task-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:1608
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:953
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 #: ../shell/e-shell-content.c:516
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
 # zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:935
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Print all shown contacts"
 msgstr "å??å?°æ??æ??é¡¯ç¤ºç??é?£çµ¡äºº"
 
 # zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Preview the contacts to be printed"
 msgstr "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
 
 # zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "Print selected contacts"
 msgstr "å??å?°å·²é?¸å??ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Save as vCard..."
 msgstr "å?²å?ç?º vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
 msgid "Save selected contacts as a vCard"
 msgstr "å°?é?¸å??ç??é?£çµ¡äººå?²å?ç?º vCard"
 
@@ -14197,7 +14169,7 @@ msgstr "ç?»å?¥(_G):"
 #: ../modules/addressbook/ldap-config.ui.h:12
 #, fuzzy
 msgid "One"
-msgstr "ç?¡(_O)"
+msgstr "One"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search Filter"
@@ -14223,7 +14195,7 @@ msgstr ""
 #: ../modules/addressbook/ldap-config.ui.h:19
 #, fuzzy
 msgid "Sub"
-msgstr "ä¸?æ¨?"
+msgstr "Sub"
 
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "Supported Search Bases"
@@ -14315,7 +14287,7 @@ msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new appointment"
 msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
 
@@ -14343,12 +14315,12 @@ msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1281
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "å»ºç«?æ?°è¡?äº?æ??"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2644
+#: ../plugins/itip-formatter/itip-formatter.c:2657
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
@@ -14380,9 +14352,9 @@ msgstr "ç?¡æ³?å¾? evolution/config.xmldb ç§»è½?è??è¨å®?"
 msgid "Unable to migrate calendar `%s'"
 msgstr "ç?¡æ³?ç§»è½?ç§»è¡?äº?æ?? `%s'"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:152
-#: ../modules/calendar/e-memo-shell-sidebar.c:149
-#: ../modules/calendar/e-task-shell-sidebar.c:147
+#: ../modules/calendar/e-cal-shell-sidebar.c:162
+#: ../modules/calendar/e-memo-shell-sidebar.c:157
+#: ../modules/calendar/e-task-shell-sidebar.c:157
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14391,27 +14363,35 @@ msgstr ""
 "%s ç?¼ç??é?¯èª¤\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:185
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
 msgid "Loading calendars"
 msgstr "æ£å?¨è¼?å?¥è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:425
+#: ../modules/calendar/e-cal-shell-sidebar.c:610
 msgid "Calendar Selector"
 msgstr "è¡?äº?æ??é?¸æ??å?¨"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:598
+#: ../modules/calendar/e-cal-shell-sidebar.c:736
 msgid "Date Navigator Widget"
 msgstr "æ?¥æ??ç??è¦½è¦?çª?å??ä»¶"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:599
+#: ../modules/calendar/e-cal-shell-sidebar.c:737
 msgid "This widget displays a miniature calendar"
 msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºä¸?å??å°?å??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:609
+#: ../modules/calendar/e-cal-shell-sidebar.c:746
+msgid "Default Calendar Client"
+msgstr "é ?è¨è¡?äº?æ??å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:747
+msgid "Default client for calendar operations"
+msgstr "è¡?äº?æ??æ??ä½?ç??é ?è¨å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:757
 msgid "This widget displays groups of calendars"
 msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºè¡?äº?æ??ç??ç¾¤çµ?"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:770
+#: ../modules/calendar/e-cal-shell-sidebar.c:944
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
@@ -14454,248 +14434,246 @@ msgstr "äº?ä»¶"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
 #: ../modules/calendar/e-memo-shell-view-actions.c:507
-#: ../modules/calendar/e-task-shell-view-actions.c:632
+#: ../modules/calendar/e-task-shell-view-actions.c:624
 msgid "Save as iCalendar"
 msgstr "å?²å?ç?º iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "_Copy..."
 msgstr "è¤?è£½(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "D_elete Calendar"
 msgstr "å?ªé?¤è¡?äº?æ??(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
 msgid "Delete the selected calendar"
 msgstr "å?ªé?¤é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Back"
 msgstr "å??å¾?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Go Forward"
 msgstr "å??å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Today"
 msgstr "é?¸æ??ä»?å¤©(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select today"
 msgstr "é?¸å??ä»?æ?¥"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 msgid "Select _Date"
 msgstr "é?¸æ??æ?¥æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Select a specific date"
 msgstr "é?¸å??ç?¹å®?æ?¥æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1279
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "æ?°å¢?è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Purg_e"
 msgstr "æ¸?é?¤(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
 msgstr "å?ªé?¤è??ç´?æ??å??æ??è°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Re_fresh"
 msgstr "é??æ?°æ?´ç??(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Refresh the selected calendar"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
 msgstr "é??æ?°å?½å??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Show _Only This Calendar"
 msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Cop_y to Calendar..."
 msgstr "è¤?è£½è?³è¡?äº?æ??(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "_Delegate Meeting..."
 msgstr "å§?æ´¾æ??è°(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "_Delete Appointment"
 msgstr "å?ªé?¤ç´?æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
 msgid "Delete selected appointments"
 msgstr "å?ªé?¤é?¸å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Delete This _Occurrence"
-msgstr "å?ªé?¤é??å??äº?ä»¶(_O)"
+msgstr "å?ªé?¤é??æ¬¡ç?¼ç??ç??äº?ä»¶(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
 msgid "Delete this occurrence"
 msgstr "å?ªé?¤æ¤é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Delete All Occ_urrences"
-msgstr "æ?¯å?¦å?ªé?¤æ??æ??ç??ä¾¿æ¢?ï¼?"
+msgstr "å?ªé?¤æ??æ??ç?¼ç??ç??äº?ä»¶(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Delete all occurrences"
 msgstr "å?ªé?¤å?¨é?¨é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "New All Day _Event..."
 msgstr "æ?°å¢?å?¨å¤©äº?ä»¶(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Create a new all day event"
 msgstr "å»ºç«?æ?°ç??å?¨å¤©äº?ä»¶"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-memo-shell-view-actions.c:581
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "_Forward as iCalendar..."
 msgstr "ä»¥ iCale_ndar è½?å¯?..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "New _Meeting..."
 msgstr "æ?°å¢?æ??è°(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Create a new meeting"
 msgstr "å»ºç«?æ?°ç??æ??è°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Mo_ve to Calendar..."
 msgstr "ç§»è?³è¡?äº?æ??(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New _Appointment..."
 msgstr "æ?°å¢?ç´?æ??(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "Make this Occurrence _Movable"
 msgstr "å°?é??å??äº?ä»¶æ¨?ç¤ºæ??å?¯ç§»å??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "_Open Appointment"
 msgstr "é??å??ç´?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "View the current appointment"
 msgstr "æª¢è¦?ç?®å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "_Reply"
 msgstr "å??è¦?(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "å?²å?ç?º iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Schedule Meeting..."
 msgstr "æ??è°æ??ç¨?(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "Converts an appointment to a meeting"
 msgstr "å°?ç´?æ??è½?æ??ç?ºæ??è°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "Conv_ert to Appointment..."
 msgstr "è½?æ??ç?ºç´?æ??(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
 msgid "Converts a meeting to an appointment"
 msgstr "å°?æ??è°è½?æ??ç?ºç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Day"
 msgstr "å¤©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one day"
 msgstr "é¡¯ç¤ºä¸?å¤©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "List"
 msgstr "æ¸?å?®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show as list"
 msgstr "é¡¯ç¤ºæ??æ¸?å?®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
 msgid "Month"
 msgstr "æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1565
 msgid "Show one month"
 msgstr "é¡¯ç¤ºä¸?å??æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1570
 msgid "Week"
 msgstr "é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1572
 msgid "Show one week"
 msgstr "é¡¯ç¤ºä¸?é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one work week"
 msgstr "é¡¯ç¤ºä¸?å??å·¥ä½?é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Active Appointments"
 msgstr "é?²è¡?ä¸ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1601
 msgid "Next 7 Days' Appointments"
 msgstr "æ?ªä¾? 7 å¤©ç??ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:786
-#: ../modules/calendar/e-task-shell-view-actions.c:985
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:977
 msgid "Description contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
-#: ../modules/calendar/e-memo-shell-view-actions.c:793
-#: ../modules/calendar/e-task-shell-view-actions.c:992
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-memo-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Summary contains"
 msgstr "ä¸»æ?¨å??å?«"
 
 # zh_HK: msgstr "å??å?°é??å??è¡?äº?æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Print this calendar"
 msgstr "å??å?°é??å??è¡?äº?æ??"
 
 # zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "Preview the calendar to be printed"
 msgstr "é ?è¦½å°?è¦?å??å?°ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Go To"
 msgstr "ç§»è?³"
 
@@ -14707,35 +14685,35 @@ msgid "memo"
 msgstr "å??å¿?é??"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "New _Memo"
 msgstr "æ?°å¢?å??å¿?é??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
 msgid "Create a new memo"
 msgstr "å»ºç«?æ?°ç??å??å¿?é??"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:652
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "_Open Memo"
 msgstr "é??å??å??å¿?é??(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-memo-shell-view-actions.c:646
 msgid "View the selected memo"
 msgstr "æª¢è¦?é?¸å??ç??å??å¿?é??"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "Open _Web Page"
 msgstr "é??å??ç¶²é ?(_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
+#: ../modules/calendar/e-memo-shell-view-actions.c:811
 msgid "Print the selected memo"
 msgstr "å??å?°é?¸å??ç??å??å¿?é??"
 
@@ -14744,22 +14722,22 @@ msgstr "å??å?°é?¸å??ç??å??å¿?é??"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:630
+#: ../modules/calendar/e-task-shell-view-actions.c:622
 msgid "task"
 msgstr "å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Assign Task"
 msgstr "æ??æ´¾å·¥ä½?(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "_Mark as Complete"
 msgstr "æ¨?ç¤ºç?ºå®?æ??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "Mark selected tasks as complete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??å®?æ??"
 
@@ -14768,39 +14746,39 @@ msgid "_Mark as Incomplete"
 msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as incomplete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??æ?ªå®?æ??"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "New _Task"
 msgstr "æ?°å¢?å·¥ä½?(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Create a new task"
 msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "_Open Task"
 msgstr "é??å??å·¥ä½?(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "View the selected task"
 msgstr "æª¢è¦?é?¸å??ç??å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:834
-#: ../modules/calendar/e-task-shell-view-actions.c:1033
+#: ../modules/calendar/e-memo-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "_Save as iCalendar..."
 msgstr "å?²å?ç?º iCalendar[_S]..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../modules/calendar/e-task-shell-view-actions.c:1010
 msgid "Print the selected task"
 msgstr "å??å?°é?¸å??ç??å·¥ä½?"
 
@@ -14824,7 +14802,7 @@ msgid "Memo Li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
 #: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:604
 msgid "Create a new memo list"
 msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
 
@@ -14832,23 +14810,31 @@ msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
 msgid "The registry of memo lists"
 msgstr "å??å¿?é??æ¸?å?®ç??è¨»å??è¡¨"
 
-#: ../modules/calendar/e-memo-shell-content.c:604
+#: ../modules/calendar/e-memo-shell-content.c:608
 msgid "The memo table model"
 msgstr "å??å¿?é??è¡¨æ ¼æ¨¡å??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:182
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
 msgid "Loading memos"
 msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:396
+#: ../modules/calendar/e-memo-shell-sidebar.c:564
 msgid "Memo List Selector"
 msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:544
+#: ../modules/calendar/e-memo-shell-sidebar.c:672
+msgid "Default Memo Client"
+msgstr "é ?è¨å??å¿?é??å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:673
+msgid "Default client for memo operations"
+msgstr "å??å¿?é??æ??ä½?ç??é ?è¨å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:683
 msgid "This widget displays groups of memo lists"
 msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºå??å¿?é??æ¸?å?®ç??ç¾¤çµ?"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:697
+#: ../modules/calendar/e-memo-shell-sidebar.c:862
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
@@ -14859,76 +14845,76 @@ msgstr "é??å??å?¨ %s ç??å??å¿?é??"
 msgid "Print Memos"
 msgstr "å??å?°å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
 msgid "_Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:574
 msgid "_Find in Memo..."
 msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:576
 msgid "Search for text in the displayed memo"
 msgstr "æ??å°?é¡¯ç¤ºç??å??å¿?é??ä¸ç??æ??å?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
 msgid "D_elete Memo List"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:597
 msgid "Delete the selected memo list"
 msgstr "å?ªé?¤é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "_New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-memo-shell-view-actions.c:618
 msgid "Refresh the selected memo list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:625
 msgid "Rename the selected memo list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:630
 msgid "Show _Only This Memo List"
 msgstr "å?ªé¡¯ç¤ºæ¤å??å¿?é??æ¸?å?®(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
 msgid "Memo _Preview"
 msgstr "å??å¿?é??é ?è¦½(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:711
 msgid "Show memo preview pane"
 msgstr "é¡¯ç¤ºå??å¿?é??é ?è¦½çª?æ ¼"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-memo-shell-view-actions.c:732
 msgid "Show memo preview below the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå??å¿?é??é ?è¦½"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-memo-shell-view-actions.c:739
 msgid "Show memo preview alongside the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®æ??é??é¡¯ç¤ºå??å¿?é??é ?è¦½"
 
 # zh_HK: msgstr "å??å?°å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-memo-shell-view-actions.c:797
 msgid "Print the list of memos"
 msgstr "å??å?°å??å¿?é??æ¸?å?®"
 
 # zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#: ../modules/calendar/e-memo-shell-view-actions.c:804
 msgid "Preview the list of memos to be printed"
 msgstr "é ?è¦½å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:413
+#: ../modules/calendar/e-memo-shell-view-private.c:414
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d é ?å??å¿?é??"
 msgstr[1] "%d é ?å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:417
+#: ../modules/calendar/e-memo-shell-view-private.c:418
 #: ../modules/calendar/e-task-shell-view-private.c:567
 #, c-format
 msgid "%d selected"
@@ -14962,7 +14948,7 @@ msgid "Tas_k List"
 msgstr "å·¥ä½?æ¸?å?®(_K)"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
 
@@ -14970,7 +14956,7 @@ msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
 msgid "The registry of task lists"
 msgstr "å·¥ä½?æ¸?å?®ç??è¨»å??è¡¨"
 
-#: ../modules/calendar/e-task-shell-content.c:626
+#: ../modules/calendar/e-task-shell-content.c:630
 msgid "The task table model"
 msgstr "å·¥ä½?è¡¨æ ¼æ¨¡å??"
 
@@ -14991,29 +14977,37 @@ msgstr ""
 msgid "Unable to migrate tasks `%s'"
 msgstr "ç?¡æ³?ç§»è½?å·¥ä½? `%s'"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:180
+#: ../modules/calendar/e-task-shell-sidebar.c:216
 msgid "Loading tasks"
 msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:394
+#: ../modules/calendar/e-task-shell-sidebar.c:564
 msgid "Task List Selector"
 msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:542
+#: ../modules/calendar/e-task-shell-sidebar.c:672
+msgid "Default Task Client"
+msgstr "é ?è¨å·¥ä½?å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:673
+msgid "Default client for task operations"
+msgstr "å·¥ä½?æ??ä½?ç??é ?è¨å®¢æ?¶ç«¯ç¨?å¼?"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:683
 msgid "This widget displays groups of task lists"
 msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºå·¥ä½?æ¸?å?®ç??ç¾¤çµ?"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:695
+#: ../modules/calendar/e-task-shell-sidebar.c:862
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
 msgid "Print Tasks"
 msgstr "å??å?°å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:574
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15025,97 +15019,97 @@ msgstr ""
 "\n"
 "ç¢ºå®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "_Delete Task"
 msgstr "å?ªé?¤å·¥ä½?(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:698
 msgid "_Find in Task..."
 msgstr "å?¨å·¥ä½?å?§å°?æ?¾(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Search for text in the displayed task"
 msgstr "æ??å°?é¡¯ç¤ºç??å·¥ä½?ä¸ç??æ??å?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:720
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Copy..."
 msgstr "è¤?è£½..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:719
 msgid "D_elete Task List"
 msgstr "å?ªé?¤å·¥ä½?æ¸?å?®(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:721
 msgid "Delete the selected task list"
 msgstr "å?ªé?¤é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
 msgstr "æ?°å¢?å·¥ä½?æ¸?å?®(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Refresh the selected task list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:754
 msgid "Show _Only This Task List"
 msgstr "å?ªé¡¯ç¤ºæ¤å·¥ä½?æ¸?å?®(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "Mar_k as Incomplete"
 msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-task-shell-view-actions.c:798
 msgid "Delete completed tasks"
 msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../modules/calendar/e-task-shell-view-actions.c:873
 msgid "Task _Preview"
 msgstr "å·¥ä½?é ?è¦½(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:875
 msgid "Show task preview pane"
 msgstr "é¡¯ç¤ºå·¥ä½?é ?è¦½çª?æ ¼"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:904
+#: ../modules/calendar/e-task-shell-view-actions.c:896
 msgid "Show task preview below the task list"
 msgstr "å?¨å·¥ä½?æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå·¥ä½?é ?è¦½"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/calendar/e-task-shell-view-actions.c:903
 msgid "Show task preview alongside the task list"
 msgstr "å?¨å·¥ä½?æ¸?å?®æ??é??é¡¯ç¤ºå·¥ä½?é ?è¦½"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 msgid "Active Tasks"
 msgstr "é?²è¡?ä¸ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:925
 msgid "Completed Tasks"
 msgstr "å·²å®?æ??ç??å·¥ä½? "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:932
 msgid "Next 7 Days' Tasks"
 msgstr "æ?ªä¾? 7 å¤©ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:947
+#: ../modules/calendar/e-task-shell-view-actions.c:939
 msgid "Overdue Tasks"
 msgstr "é??æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:946
 msgid "Tasks with Attachments"
 msgstr "æ??é??ä»¶ç??å·¥ä½?"
 
 # zh_HK: msgstr "å??å?°å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/calendar/e-task-shell-view-actions.c:996
 msgid "Print the list of tasks"
 msgstr "å??å?°å·¥ä½?æ¸?å?®"
 
 # zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../modules/calendar/e-task-shell-view-actions.c:1003
 msgid "Preview the list of tasks to be printed"
 msgstr "é ?è¦½å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
 
@@ -15193,351 +15187,362 @@ msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?"
 msgid "Whether to group messages by threads"
 msgstr "æ?¯å?¦ä¾?ç?¸é??é?µä»¶ä»¥ç¾¤çµ?æ?¹å¼?é¡¯ç¤º"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view.c:526
+#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "å??ç?¨å¸³è??(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Disable this account"
 msgstr "å??ç?¨é??å??å¸³è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:864
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??è³?æ??å¤¾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "C_reate Search Folder From Search..."
 msgstr "å¾?æ??å°?å»ºç«?æ??å°?è³?æ??å¤¾(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "_Download Messages for Offline Usage"
 msgstr "ä¸?è¼?é?¢ç·?ä½¿ç?¨ç??é?µä»¶(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
-msgid "Download messages of accounts and folders marked for offline"
-msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??å¸³è??/è³?æ??å¤¾ä¹?é?µä»¶"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:934
-msgid "Empty _Trash"
-msgstr "æ¸?ç??å??æ?¶ç?(_T)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:943
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??è³?æ??å¤¾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
+#: ../modules/mail/e-mail-shell-view-actions.c:878
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??å¸³è??è??è³?æ??å¤¾ä¹?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç??å¯?ä»¶å?£(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_Copy Folder To..."
 msgstr "è¤?è£½è³?æ??å¤¾å?°(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Copy the selected folder into another folder"
 msgstr "è¤?è£½å·²é?¸å®?ç??è³?æ??å¤¾å?°å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Permanently remove this folder"
 msgstr "æ°¸ä¹?ç§»é?¤é??å??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:904
 msgid "E_xpunge"
 msgstr "å?ªé?¤(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æ°¸ä¹?ç§»é?¤å?¨é??å??è³?æ??å¤¾å?§å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "Mar_k All Messages as Read"
 msgstr "æ¨?ç¤ºæ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Mark all messages in the folder as read"
 msgstr "å°?è³?æ??å¤¾ä¸å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "_Move Folder To..."
 msgstr "ç§»å??è³?æ??å¤¾å?°(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Move the selected folder into another folder"
 msgstr "å°?é?¸å®?ç??è³?æ??å¤¾ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "_New..."
 msgstr "æ?°å¢?(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Create a new folder for storing mail"
 msgstr "å»ºç«?ä¸?å??æ?°è³?æ??å¤¾ä»¥å?²å?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Change the properties of this folder"
 msgstr "è®?æ?´é??å??è³?æ??å¤¾ç??å±¬æ?§"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Refresh the folder"
 msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
+#: ../modules/mail/e-mail-shell-view-actions.c:948
 msgid "Change the name of this folder"
 msgstr "è®?æ?´é??å??è³?æ??å¤¾ç??å??ç¨±"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1018
+#: ../modules/mail/e-mail-shell-view-actions.c:953
 msgid "Select Message _Thread"
 msgstr "é?¸æ??é?µä»¶æª?é (_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1020
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "Select all messages in the same thread as the selected message"
 msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1025
+#: ../modules/mail/e-mail-shell-view-actions.c:960
 msgid "Select Message S_ubthread"
 msgstr "é?¸æ??é?µä»¶å?ç¾¤çµ?(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1027
+#: ../modules/mail/e-mail-shell-view-actions.c:962
 msgid "Select all replies to the currently selected message"
 msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
+#: ../modules/mail/e-mail-shell-view-actions.c:967
 msgid "_Unsubscribe"
 msgstr "å??æ¶?è¨?é?±(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:969
 msgid "Unsubscribe from the selected folder"
 msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:974
+msgid "Empty _Trash"
+msgstr "æ¸?ç??å??æ?¶ç?(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??å¸³è??å?§å?¨é?¨å·²å?ªé?¤ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:981
 msgid "_New Label"
 msgstr "æ?°å¢?æ¨?ç±¤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:988
 msgid "N_one"
 msgstr "æ²?æ??(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:995
 msgid "Hide _Read Messages"
 msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Temporarily hide all messages that have already been read"
 msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1002
 msgid "Hide S_elected Messages"
 msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Temporarily hide the selected messages"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
 msgid "Show Hidde_n Messages"
 msgstr "é¡¯ç¤ºé?±è??ç??é?µä»¶(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "Show messages that have been temporarily hidden"
 msgstr "é¡¯ç¤ºæ?«æ??é?±è??ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
 msgid "Cancel the current mail operation"
 msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1095
+#: ../modules/mail/e-mail-shell-view-actions.c:1037
 msgid "Collapse All _Threads"
 msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1097
+#: ../modules/mail/e-mail-shell-view-actions.c:1039
 msgid "Collapse all message threads"
 msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1102
+#: ../modules/mail/e-mail-shell-view-actions.c:1044
 msgid "E_xpand All Threads"
 msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1104
+#: ../modules/mail/e-mail-shell-view-actions.c:1046
 msgid "Expand all message threads"
 msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
+#: ../modules/mail/e-mail-shell-view-actions.c:1051
 msgid "_Message Filters"
 msgstr "é?µä»¶è¦?å??(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1111
+#: ../modules/mail/e-mail-shell-view-actions.c:1053
 msgid "Create or edit rules for filtering new mail"
 msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??ç·¨è¼¯é??æ¿¾è¦?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1116
+#: ../modules/mail/e-mail-shell-view-actions.c:1058
 msgid "Search F_olders"
 msgstr "æ??å°?è³?æ??å¤¾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1118
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
 msgid "Create or edit search folder definitions"
 msgstr "å»ºç«?æ??ç·¨è¼¯æ??å°?è³?æ??å¤¾ç??å®?ç¾©"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
 msgid "_Subscriptions..."
 msgstr "è¨?é?±(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1125
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1132
+#: ../modules/mail/e-mail-shell-view-actions.c:1074
 msgid "F_older"
 msgstr "è³?æ??å¤¾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
+#: ../modules/mail/e-mail-shell-view-actions.c:1081
 msgid "_Label"
 msgstr "æ¨?ç±¤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
 msgid "_New Folder..."
 msgstr "æ?°å¢?è³?æ??å¤¾(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Hide _Deleted Messages"
 msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??ä»¥å?ªé?¤ç·?ç??å½¢å¼?é¡¯ç¤º"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Show Message _Preview"
 msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Show message preview pane"
 msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½çª?æ ¼"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "_Group By Threads"
 msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Threaded message list"
 msgstr "ç?¸é??é?µä»¶æ¸?å?®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Show message preview below the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸?æ?¹é¡¯ç¤ºé?µä»¶é ?è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "Show message preview alongside the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®æ??é??é¡¯ç¤ºé?µä»¶é ?è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
 msgid "All Messages"
 msgstr "æ??æ??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1207
 msgid "Important Messages"
 msgstr "é??è¦?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
 msgid "Last 5 Days' Messages"
 msgstr "æ??è¿? 5 å¤©ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1221
 msgid "Messages Not Junk"
 msgstr "é??å??å?¾é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
 msgid "Messages with Attachments"
 msgstr "æ??é??ä»¶ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
 msgid "No Label"
 msgstr "ç?¡æ¨?ç±¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
 msgid "Read Messages"
 msgstr "å·²è®?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
 msgid "Recent Messages"
 msgstr "æ??è¿?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
 msgid "Unread Messages"
 msgstr "æ?ªè®?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Subject or Addresses contain"
 msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
 msgid "All Accounts"
 msgstr "æ??æ??ç??å¸³è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
 msgid "Current Account"
 msgstr "ç?®å??ç??å¸³è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1390
+#: ../modules/mail/e-mail-shell-view-actions.c:1332
 msgid "Current Folder"
 msgstr "ç?®å??ç??è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:836
+#: ../modules/mail/e-mail-shell-view-private.c:889
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:847
+#: ../modules/mail/e-mail-shell-view-private.c:900
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d å°?å·²å?ªé?¤"
 msgstr[1] "%d å°?å·²å?ªé?¤"
 
-#: ../modules/mail/e-mail-shell-view-private.c:853
-#: ../modules/mail/e-mail-shell-view-private.c:860
+#: ../modules/mail/e-mail-shell-view-private.c:906
+#: ../modules/mail/e-mail-shell-view-private.c:913
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 msgstr[1] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:866
+#: ../modules/mail/e-mail-shell-view-private.c:919
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å??è??ç¨¿"
 msgstr[1] "%d å??è??ç¨¿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:872
+#: ../modules/mail/e-mail-shell-view-private.c:925
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå?³é??"
 msgstr[1] "%d å°?æ?ªå?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:878
+#: ../modules/mail/e-mail-shell-view-private.c:931
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å?³é??"
 msgstr[1] "%d å°?å·²å?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:890
+#: ../modules/mail/e-mail-shell-view-private.c:943
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d å°?æ?ªè®?ï¼?"
 msgstr[1] "%d å°?æ?ªè®?ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:893
+#: ../modules/mail/e-mail-shell-view-private.c:946
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å?± %d å°?"
 msgstr[1] "å?± %d å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:524
+#: ../modules/mail/e-mail-shell-view.c:548
+msgid "All Account Search"
+msgstr "æ??æ??ç??å¸³è??æ??å°?"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "å¸³è??æ??å°?"
+
+#: ../modules/mail/e-mail-shell-view.c:873
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??ä¼ºæ??å?¨(_L)"
 
@@ -16071,11 +16076,9 @@ msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
 msgstr "è¼¸å?¥ä½¿ç?¨è?? <b>%s</b> å?¨ä¼ºæ??å?¨ <b>%s</b> ä¸?ç??å¯?ç¢¼ "
 
 #: ../plugins/caldav/caldav-browse-server.c:856
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create soup message for URL '%s'"
-msgstr ""
-"ä¸?è?½å»ºç«?è¼¸å?ºæª?æ¡?ï¼?%sï¼?\n"
-" %s"
+msgstr "ä¸?è?½å»ºç«? URLã??%sã??ç?? soup è¨?æ?¯"
 
 #. fetch content
 #: ../plugins/caldav/caldav-browse-server.c:1091
@@ -16108,27 +16111,26 @@ msgstr "ç??è¦½ CalDAV è¡?äº?æ??"
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:402
-#: ../plugins/calendar-http/calendar-http.c:171
+#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "ç¶²å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:426
-#: ../plugins/google-account-setup/google-contacts-source.c:303
+#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "ä½¿ç?¨ _SSL"
 
-#: ../plugins/caldav/caldav-source.c:468
+#: ../plugins/caldav/caldav-source.c:228
 msgid "Brows_e server for a calendar"
 msgstr "ç??è¦½ä¼ºæ??å?¨ç??è¡?äº?æ??(_E)"
 
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:480
-#: ../plugins/calendar-file/calendar-file.c:274
-#: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:501
-#: ../plugins/google-account-setup/google-contacts-source.c:322
-#: ../plugins/google-account-setup/google-source.c:717
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/google-account-setup/google-contacts-source.c:323
+#: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
@@ -16140,31 +16142,31 @@ msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
 msgid "CalDAV Support"
 msgstr "CalDAV æ?¯æ?´"
 
-#: ../plugins/calendar-file/calendar-file.c:208
+#: ../plugins/calendar-file/calendar-file.c:112
 msgid "_Customize options"
 msgstr "è?ªè¨?é?¸é ?(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:227
+#: ../plugins/calendar-file/calendar-file.c:131
 msgid "File _name:"
 msgstr "æª?æ¡?å??ç¨±(_N):"
 
-#: ../plugins/calendar-file/calendar-file.c:231
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "Choose calendar file"
 msgstr "é?¸æ??è¡?äº?æ??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:279
+#: ../plugins/calendar-file/calendar-file.c:183
 msgid "On open"
 msgstr "æ?¼é??å??ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:280
+#: ../plugins/calendar-file/calendar-file.c:184
 msgid "On file change"
 msgstr "æ?¼è®?æ?´ç??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:281
+#: ../plugins/calendar-file/calendar-file.c:185
 msgid "Periodically"
 msgstr "é?±æ??æ?§ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:308
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "Force read _only"
 msgstr "å¼·å?¶å?¯è®?(_O)"
 
@@ -16176,11 +16178,11 @@ msgstr "å°?æ?¬å?°ç«¯è¡?äº?æ??å? å?¥ Evolutionã??"
 msgid "Local Calendars"
 msgstr "æ?¬å?°è¡?äº?æ??"
 
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_Secure connection"
 msgstr "å®?å?¨é?£ç·?(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:455
+#: ../plugins/calendar-http/calendar-http.c:186
 msgid "Userna_me:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_M):"
 
@@ -16233,21 +16235,21 @@ msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:379
+#: ../plugins/calendar-weather/calendar-weather.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:371
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:599
+#: ../plugins/calendar-weather/calendar-weather.c:446
 msgid "_Units:"
 msgstr "å?®ä½?(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#: ../plugins/calendar-weather/calendar-weather.c:453
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å?¬å??ç?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:607
+#: ../plugins/calendar-weather/calendar-weather.c:454
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(è?¯æ°?ã??å?¬å??ç?)"
 
@@ -16297,23 +16299,23 @@ msgstr "é ?è¨é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "æ?¨æ?¯å?¦è¦?å°? Evolution è¨ç?ºæ?¨ç??é ?è¨é?»å?é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ï¼?"
 
-#: ../plugins/default-source/default-source.c:94
+#: ../plugins/default-source/default-source.c:75
 msgid "Mark as _default address book"
 msgstr "æ¨?ç¤ºç?ºé ?è¨é??è¨?é??(_D)"
 
-#: ../plugins/default-source/default-source.c:119
+#: ../plugins/default-source/default-source.c:88
 msgid "A_utocomplete with this address book"
 msgstr "ç?¨é??å??é??è¨?é??é?²è¡?è?ªå??å®?æ??(_U)"
 
-#: ../plugins/default-source/default-source.c:138
+#: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
 msgstr "æ¨?ç¤ºç?ºé ?è¨è¡?äº?æ??(_D)"
 
-#: ../plugins/default-source/default-source.c:139
+#: ../plugins/default-source/default-source.c:98
 msgid "Mark as _default task list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å·¥ä½?æ¸?å?®(_D)"
 
-#: ../plugins/default-source/default-source.c:140
+#: ../plugins/default-source/default-source.c:99
 msgid "Mark as _default memo list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å??å¿?é??æ¸?å?®(_D)"
 
@@ -16534,22 +16536,22 @@ 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:51
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:82
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+#: ../plugins/google-account-setup/google-contacts-source.c:273
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
 msgid "<b>Server</b>"
 msgstr "<b>ä¼ºæ??å?¨</b>"
 
-#: ../plugins/google-account-setup/google-source.c:517
+#: ../plugins/google-account-setup/google-source.c:439
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "è¼¸å?¥ä½¿ç?¨è?? %s ç??å¯?ç¢¼ä»¥å?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16558,17 +16560,17 @@ msgstr ""
 "ä¸?è?½å¾? Google ä¼ºæ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
 #: ../plugins/mail-to-task/mail-to-task.c:725
 #: ../plugins/mail-to-task/mail-to-task.c:941
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/google-account-setup/google-source.c:758
+#: ../plugins/google-account-setup/google-source.c:631
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:793
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Retrieve _list"
 msgstr "å??å??æ¸?å?®(_L)"
 
@@ -16700,7 +16702,7 @@ msgstr "æ?¶å??é?µä»¶å?¯è?½æ??å°?è©²é?µä»¶è?ªæ?¶ä»¶è??ç??ä¿¡ç®±ç§»é?¤ã??æ?¨ç¢ºå®?
 msgid "Message retracted successfully"
 msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../plugins/groupwise-features/mail-send-options.c:202
 msgid "Insert Send options"
 msgstr "æ??å?¥å?³é??é?¸é ?"
 
@@ -16950,52 +16952,52 @@ msgstr "æ?°å¢?"
 msgid "Modify"
 msgstr "ä¿®æ?¹"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Subject:"
 msgstr "ä¸»æ?¨:"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:154
 msgid "From:"
 msgstr "å¯?ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:169
 msgid "Creation date:"
 msgstr "å»ºç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:211
+#: ../plugins/groupwise-features/status-track.c:216
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Deleted: "
 msgstr "å·²å?ªé?¤:"
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:247
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
@@ -17066,196 +17068,195 @@ msgstr "æ ¡èª¿æ?¨ç?? IMAP å¸³è??ã??"
 msgid "IMAP Features"
 msgstr "IMAP å??è?½"
 
-#: ../plugins/itip-formatter/itip-formatter.c:494
-#: ../plugins/itip-formatter/itip-formatter.c:619
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "è¼?å?¥è¡?äº?æ??ã??%sã??å¤±æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:639
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "è¡?äº?æ?? '%s' ä¸ç??ç´?æ??å??é??å??æ??è°ç?¸è¡?çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:675
+#: ../plugins/itip-formatter/itip-formatter.c:688
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å°?æ?¾å?¨è¡?äº?æ??ã??%sã??ä¸ç??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:774
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:781
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??ä¸æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:785
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:873
 msgid "Opening the calendar. Please wait.."
 msgstr "æ£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:863
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1044
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç?¡æ³?å?³é??é ?ç?®è?³è¡?äº?æ??ã??%sã??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1143
+#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:1160
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºä¸?ç¢ºå®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1152
+#: ../plugins/itip-formatter/itip-formatter.c:1165
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1157
+#: ../plugins/itip-formatter/itip-formatter.c:1170
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??ä¸¦è¨ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è°å?¬é??äººå·²ç§»é?¤ä»£ç??äºº %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1258
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1260
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??ä½¿å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1400
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1430
+#: ../plugins/itip-formatter/itip-formatter.c:1443
 msgid "Meeting information sent"
 msgstr "æ??è°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1433
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Task information sent"
 msgstr "å·¥ä½?è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1445
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ç?¡æ³?å¯?å?ºæ??è°è³?è¨?ï¼?è©²æ??è°ä¸¦ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1461
 msgid "Unable to send task information, the task does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå·¥ä½?è³?è¨?ï¼?è©²é ?å·¥ä½?ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1464
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå??å¿?é??è³?è¨?ï¼?è©²å??å¿?é??ä¸¦ä¸?å?å?¨"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1516
+#: ../plugins/itip-formatter/itip-formatter.c:1529
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 msgid "Save Calendar"
 msgstr "å?²å?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1574
-#: ../plugins/itip-formatter/itip-formatter.c:1585
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "é??å¸¶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "æ¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??ä¸¦é??æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1626
-#: ../plugins/itip-formatter/itip-formatter.c:1654
-#: ../plugins/itip-formatter/itip-formatter.c:1760
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid "The item in the calendar is not valid"
 msgstr "è¡?äº?æ??ä¸ç??é ?ç?®æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../plugins/itip-formatter/itip-formatter.c:1655
-#: ../plugins/itip-formatter/itip-formatter.c:1761
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 "æ¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?è©²å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?ä»¶ã??å·¥ä½?æ??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??è©²å°?æ¤æª?æ¡?å?²å?å¾?å?¯å?¥å?¶ä¸ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2434
+#: ../plugins/itip-formatter/itip-formatter.c:2447
 msgid "This meeting recurs"
 msgstr "é??å??æ??è°ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2437
+#: ../plugins/itip-formatter/itip-formatter.c:2450
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2440
+#: ../plugins/itip-formatter/itip-formatter.c:2453
 msgid "This memo recurs"
 msgstr "é??å??å??å¿?é??ç??å¾ªç?°è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../plugins/itip-formatter/itip-formatter.c:2682
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2679
-#: ../plugins/itip-formatter/itip-formatter.c:2712
+#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2725
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2707
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é?¸æ??è¦?æ??å°?æ??è°è¡?çª?ç??è¡?äº?æ??"
 
@@ -18227,15 +18228,15 @@ msgstr ""
 "æ?¨è¦?å°?ç?®å??ç??è³?æ??å¤¾ä¸ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µ"
 "ä»¶ã??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:171
+#: ../plugins/mark-all-read/mark-all-read.c:168
 msgid "In Current Folder and _Subfolders"
 msgstr "æ?¼ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:185
+#: ../plugins/mark-all-read/mark-all-read.c:182
 msgid "In Current _Folder Only"
 msgstr "æ?¼ç?®å??ç??è³?æ??å¤¾(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:342
+#: ../plugins/mark-all-read/mark-all-read.c:349
 msgid "Mark Me_ssages as Read"
 msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²è®?(_S)"
 
@@ -18600,75 +18601,75 @@ msgstr "SpamAssassin é?¸é ?"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:157
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:353
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:355
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "æ??è¿°æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "å??é¡?æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "è¨»è§£æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "é?£çµ¡äººæ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "é??å§?"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "çµ?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "ï¼?å·²å®?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "ç¶²å??"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "å?°æ??è??æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "å·²ä¿®æ?¹"
 
-#: ../plugins/save-calendar/csv-format.c:520
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV æ ¼å¼?ç??é?²é??é?¸é ?(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:527
+#: ../plugins/save-calendar/csv-format.c:537
 msgid "Prepend a _header"
 msgstr "é ?å??è¦?ç?«æª?é (_H)"
 
-#: ../plugins/save-calendar/csv-format.c:536
+#: ../plugins/save-calendar/csv-format.c:546
 msgid "_Value delimiter:"
 msgstr "æ?¸å?¼å®?ç??ç¬¦(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:543
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "_Record delimiter:"
 msgstr "ç´?é??å®?ç??ç¬¦(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:550
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "_Encapsulate values with:"
 msgstr "ä»¥æ¤å°?è£?æ?¸å?¼(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:572
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "é??è??é??é??ç??æ?¸å?¼æ ¼å¼? (.csv)"
 
@@ -18859,11 +18860,11 @@ msgstr "WebDAV é?£çµ¡äºº"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "URL:"
 msgstr "ç¶²å??:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??ä½¿ç?¨ Apache < 2.2.8)"
 
@@ -19013,7 +19014,7 @@ msgstr "é¡¯ç¤ºå?´é??æ¬?"
 msgid "Skip development warning dialog"
 msgstr "å¿½ç?¥é??ç?¼è¦å??å°?è©±ç??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:321
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
 msgid "Start in offline mode"
 msgstr "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
@@ -19046,7 +19047,7 @@ msgstr "ä¸»è¦?çª?ç??é ?è¨å¯¬åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
-msgstr "è³?è¨?æ?¹å¡?å??ç??é ?è¨å¯¬åº¦ï¼?ä»¥å??ç´ è¨?ã??"
+msgstr "å?´é??æ¬?ç??é ?è¨å¯¬åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
@@ -19176,7 +19177,7 @@ msgstr "æ??å°?"
 msgid "Save Search"
 msgstr "å?²å?æ??å°?çµ?æ??"
 
-#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
@@ -19185,19 +19186,19 @@ msgstr "%ld KB"
 #. * 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:687
+#: ../shell/e-shell-searchbar.c:883
 msgid "Sho_w:"
 msgstr "é¡¯ç¤º(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:714
+#: ../shell/e-shell-searchbar.c:910
 msgid "Sear_ch:"
 msgstr "æ??å°?(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:769
+#: ../shell/e-shell-searchbar.c:970
 msgid "i_n"
 msgstr "æ?¼(_N)"
 
@@ -19209,7 +19210,7 @@ msgstr "å·¥å?·å??æ¨£å¼?"
 msgid "The switcher's toolbar style"
 msgstr "å??æ??ç¨?å¼?å·¥å?·å??æ¨£å¼?"
 
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:737
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
 msgid "Toolbar Visible"
 msgstr "å·¥å?·å??å?¯è¦?æ?§"
 
@@ -19235,7 +19236,7 @@ msgstr "å??æ??ç¨?å¼?å??ä½?"
 
 #: ../shell/e-shell-view.c:605
 msgid "The switcher action for this shell view"
-msgstr ""
+msgstr "é??å?? shell æª¢è¦?ç??å??æ??ç¨?å¼?å??ä½?"
 
 #: ../shell/e-shell-view.c:620
 msgid "Page Number"
@@ -19243,7 +19244,7 @@ msgstr "é ?ç¢¼"
 
 #: ../shell/e-shell-view.c:621
 msgid "The notebook page number of the shell view"
-msgstr ""
+msgstr "é??å?? shell æª¢è¦?ç??ç?è¨?æ?¬é ?æ?¸"
 
 #: ../shell/e-shell-view.c:637
 msgid "Search Rule"
@@ -19254,54 +19255,48 @@ msgid "Criteria for the current search results"
 msgstr "ç?®å??ç??æ??å°?çµ?æ??ç??æ¢?ä»¶"
 
 #: ../shell/e-shell-view.c:653
-#, fuzzy
 msgid "The EShellBackend for this shell view"
-msgstr "é¡¯ç¤ºæ??é??æ?¬é??æ?²ç??èªªæ??æ??ä»¶"
+msgstr "é??å?? shell æª¢è¦?ç?? EShell å¾?ç«¯ç¨?å¼?"
 
 #: ../shell/e-shell-view.c:668
-#, fuzzy
 msgid "Shell Content Widget"
-msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
+msgstr "Shell å?§å®¹å??ä»¶"
 
 #: ../shell/e-shell-view.c:669
 msgid "The content widget appears in a shell window's right pane"
-msgstr ""
+msgstr "å?§å®¹å??ä»¶é¡¯ç¤ºæ?¼ shell è¦?çª?ç??å?³çª?æ ¼"
 
 #: ../shell/e-shell-view.c:685
-#, fuzzy
 msgid "Shell Sidebar Widget"
-msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
+msgstr "Shell å?´é??æ¬?å??ä»¶"
 
 #: ../shell/e-shell-view.c:686
 msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
+msgstr "å?´é??æ¬?å??ä»¶é¡¯ç¤ºæ?¼ shell è¦?çª?ç??å·¦çª?æ ¼"
 
 #: ../shell/e-shell-view.c:701
-#, fuzzy
 msgid "Shell Taskbar Widget"
-msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
+msgstr "Shell å·¥ä½?å??å??ä»¶"
 
 #: ../shell/e-shell-view.c:702
 msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
+msgstr "å·¥ä½?å??å??ä»¶é¡¯ç¤ºæ?¼ shell è¦?çª?ç??åº?é?¨"
 
 #: ../shell/e-shell-view.c:717
-#, fuzzy
 msgid "Shell Window"
-msgstr "è¦?çª?é«?åº¦"
+msgstr "Shell è¦?çª?"
 
 #: ../shell/e-shell-view.c:718
 msgid "The window to which the shell view belongs"
-msgstr ""
+msgstr "é??å?? shell æª¢è¦?æ??å±¬ç??è¦?çª?"
 
 #: ../shell/e-shell-view.c:734
 msgid "The key file holding widget state data"
 msgstr "å?æ?¾è¦?çª?å??ä»¶ç??æ??è³?æ??ç??è¨å®?é?µæª?æ¡?"
 
 #: ../shell/e-shell-view.c:749
-#, fuzzy
 msgid "The title of the shell view"
-msgstr "é¡¯ç¤ºä¸»å·¥å?·å??"
+msgstr "shell æª¢è¦?ç??æ¨?é¡?"
 
 #: ../shell/e-shell-view.c:763
 msgid "Current View ID"
@@ -19623,82 +19618,73 @@ msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:360
+#: ../shell/e-shell-window.c:366
 msgid "New"
 msgstr "æ?°å¢?"
 
-#: ../shell/e-shell-window.c:613
-#, fuzzy
+#: ../shell/e-shell-window.c:616
 msgid "Active Shell View"
-msgstr "é¡¯ç¤ºä¸»å·¥å?·å??"
+msgstr "ä½¿ç?¨ä¸ç?? Shell æª¢è¦?"
 
-#: ../shell/e-shell-window.c:614
-#, fuzzy
+#: ../shell/e-shell-window.c:617
 msgid "Name of the active shell view"
-msgstr "æª¢è¦?å?¨ <b>Google ç¨?å¼?ç¢¼æ??å°?</b> ä¸ç?? <i>%(name)s</i>"
+msgstr "ä½¿ç?¨ä¸ Shell æª¢è¦?ç??å??ç¨±"
 
-#: ../shell/e-shell-window.c:629
-#, fuzzy
+#: ../shell/e-shell-window.c:632
 msgid "The shell window's EFocusTracker"
-msgstr "é??å§?æ??è¦?çª?ç??ä½?ç½®"
+msgstr "shell è¦?çª?ç?? EFocus è¿½è¹¤ç¨?å¼?"
 
-#: ../shell/e-shell-window.c:643 ../shell/e-shell.c:772
+#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:772
 msgid "Geometry"
 msgstr "ä½?ç½®å¤§å°?"
 
-#: ../shell/e-shell-window.c:644 ../shell/e-shell.c:773
+#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:773
 msgid "Initial window geometry string"
 msgstr "è¦?çª?å??å§?å¤§å°?å?ä¸²"
 
-#: ../shell/e-shell-window.c:659
+#: ../shell/e-shell-window.c:662
 msgid "Safe Mode"
 msgstr "å®?å?¨æ¨¡å¼?"
 
-#: ../shell/e-shell-window.c:660
-#, fuzzy
+#: ../shell/e-shell-window.c:663
 msgid "Whether the shell window is in safe mode"
-msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
+msgstr "shell è¦?çª?æ?¯å?¦ç?ºå®?å?¨æ¨¡å¼?"
 
-#: ../shell/e-shell-window.c:691
+#: ../shell/e-shell-window.c:694
 msgid "Sidebar Visible"
 msgstr "å?´é??æ¬?å?¯è¦?æ?§"
 
-#: ../shell/e-shell-window.c:692
-#, fuzzy
+#: ../shell/e-shell-window.c:695
 msgid "Whether the shell window's side bar is visible"
-msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
+msgstr "shell è¦?çª?ç??å?´é??æ¬?æ?¯å?¦é¡¯ç¤º"
 
-#: ../shell/e-shell-window.c:706
+#: ../shell/e-shell-window.c:709
 msgid "Switcher Visible"
 msgstr "å??æ??ç¨?å¼?å?¯è¦?æ?§"
 
-#: ../shell/e-shell-window.c:707
-#, fuzzy
+#: ../shell/e-shell-window.c:710
 msgid "Whether the shell window's switcher buttons are visible"
-msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
+msgstr "shell è¦?çª?ç??å??æ??ç¨?å¼?æ??é??æ?¯å?¦é¡¯ç¤º"
 
-#: ../shell/e-shell-window.c:722
+#: ../shell/e-shell-window.c:725
 msgid "Taskbar Visible"
 msgstr "å·¥ä½?å??å?¯è¦?æ?§"
 
-#: ../shell/e-shell-window.c:723
-#, fuzzy
+#: ../shell/e-shell-window.c:726
 msgid "Whether the shell window's task bar is visible"
-msgstr "æ?¯å?¦é¡¯ç¤ºç??æ??å??ã??"
+msgstr "shell è¦?çª?ç??å·¥ä½?å??æ?¯å?¦é¡¯ç¤º"
 
-#: ../shell/e-shell-window.c:738
-#, fuzzy
+#: ../shell/e-shell-window.c:741
 msgid "Whether the shell window's tool bar is visible"
-msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
+msgstr "shell è¦?çª?ç??å·¥å?·å??æ?¯å?¦é¡¯ç¤º"
 
-#: ../shell/e-shell-window.c:752
+#: ../shell/e-shell-window.c:755
 msgid "UI Manager"
 msgstr "UI ç®¡ç??ç¨?å¼?"
 
-#: ../shell/e-shell-window.c:753
-#, fuzzy
+#: ../shell/e-shell-window.c:756
 msgid "The shell window's GtkUIManager"
-msgstr "é??å§?æ??è¦?çª?ç??ä½?ç½®"
+msgstr "shell è¦?çª?ç?? GtkUIManager"
 
 #: ../shell/e-shell.c:213
 msgid "Preparing to go offline..."
@@ -19733,12 +19719,11 @@ msgid "Online"
 msgstr "ä¸?ç·?"
 
 #: ../shell/e-shell.c:821
-#, fuzzy
 msgid "Whether the shell is online"
-msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
+msgstr "shell æ?¯å?¦ä¸?ç·?"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:166
+#: ../shell/main.c:167
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19773,7 +19758,7 @@ msgstr ""
 "æ??å??å¸?æ??æ?¨äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??æ?¨æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:190
+#: ../shell/main.c:191
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19781,56 +19766,56 @@ msgstr ""
 "è¬?è¬?\n"
 "Evolution å°?çµ?æ?¬ä¸?\n"
 
-#: ../shell/main.c:197
+#: ../shell/main.c:198
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:318
 msgid "Start Evolution activating the specified component"
 msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??ä»¶"
 
-#: ../shell/main.c:319
+#: ../shell/main.c:320
 msgid "Apply the given geometry to the main window"
 msgstr "å°?æ??å®?ç??å°ºå¯¸å¥?ç?¨å?°ä¸»è¦?çª?"
 
 # zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
-#: ../shell/main.c:323
+#: ../shell/main.c:324
 msgid "Start in online mode"
 msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:331
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:334
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??ä»¶ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:336
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:338
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??é?£çµ¡äººå??å·¥ä½?ç??é ?è¦½çª?æ ¼ã??"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:342
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??ç¨±å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../shell/main.c:343
+#: ../shell/main.c:344
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?ä¸ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:498
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:523
+#: ../shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20683,7 +20668,6 @@ msgid "Action"
 msgstr "å??ä½?"
 
 #: ../widgets/misc/e-action-combo-box.c:389
-#, fuzzy
 msgid "A GtkRadioAction"
 msgstr "GtkRadioAction"
 
@@ -20744,7 +20728,7 @@ msgstr "é?±è??é??ä»¶å??(_B)"
 msgid "Show Attachment _Bar"
 msgstr "é¡¯ç¤ºé??ä»¶å??(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:626
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show _Attachment Bar"
 msgstr "é¡¯ç¤ºé??ä»¶å??(_A)"
 
@@ -20768,36 +20752,36 @@ msgstr[1] "å?²å?é??ä»¶"
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "å?²å?å?¨é?¨(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "å? å?¥é??ä»¶(_A)..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "é?±è??(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "æª¢è¦?è¡?å?§(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "ä»¥ã??%sã??é??å??"
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s ä¸é??å??é??å??é??ä»¶"
 
-#. To Translators: This text is set as a description of an attached 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.
+#. To Translators: This text is set as a description of an attached
+#. * 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:1002
 msgid "Attached message"
 msgstr "é??å? ç??é?µä»¶"
@@ -21229,9 +21213,8 @@ msgid "Delivery Options"
 msgstr "é??é??é?¸é ?"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#, fuzzy
 msgid "For Your Eyes Only"
-msgstr "å?ªå??è¨±ç¹«çµ?ç??è£?ç½®"
+msgstr "æ??é«?æ©?å¯?"
 
 #: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
@@ -21266,9 +21249,8 @@ msgid "Status Tracking"
 msgstr "ç??æ??è¿½è¹¤"
 
 #: ../widgets/misc/e-send-options.ui.h:23
-#, fuzzy
 msgid "Top Secret"
-msgstr "é«?åº¦æ©?å¯?"
+msgstr "æ??é«?æ©?å¯?"
 
 #: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
@@ -21432,21 +21414,21 @@ msgstr "evolution è¡?äº?æ??é ?ç?®"
 msgid "popup list"
 msgstr "å½?å?ºå¼?æ¸?å?®"
 
-#: ../widgets/table/e-cell-date-edit.c:296
+#: ../widgets/table/e-cell-date-edit.c:303
 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:313
+#: ../widgets/table/e-cell-date-edit.c:320
 msgctxt "table-date"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/table/e-cell-date-edit.c:321
+#: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "ç¢ºå®?"
 
-#: ../widgets/table/e-cell-date-edit.c:846
+#: ../widgets/table/e-cell-date-edit.c:862
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "æ??é??å¿?é ?ç?ºæ¤æ ¼å¼?ï¼?%s"
@@ -21487,7 +21469,7 @@ msgstr "è?²å½©æ¬?"
 msgid "BG Color Column"
 msgstr "è??æ?¯è?²å½©æ¬?"
 
-#: ../widgets/table/e-table-click-to-add.c:582
+#: ../widgets/table/e-table-click-to-add.c:586
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
 msgid "click to add"
@@ -21527,7 +21509,7 @@ msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨ç??æ¬?ä½?(_V):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-header-item.c:1637
 msgid "Ascending"
 msgstr "é??å¢?"
 
@@ -21540,7 +21522,7 @@ msgid "Clear _All"
 msgstr "å?¨é?¨æ¸?é?¤(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-header-item.c:1637
 msgid "Descending"
 msgstr "é??æ¸?"
 
@@ -21639,7 +21621,7 @@ msgstr "å??è??å??é??äº¤æ?¿ä½¿ç?¨ç??è?²å½©"
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
-#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-tree.c:3370 ../widgets/table/e-tree.c:3371
 msgid "Horizontal Draw Grid"
 msgstr "æ°´å¹³ç¹ªå??æ ¼"
 
@@ -21648,7 +21630,7 @@ msgstr "æ°´å¹³ç¹ªå??æ ¼"
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
-#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3376 ../widgets/table/e-tree.c:3377
 msgid "Vertical Draw Grid"
 msgstr "å??ç?´ç¹ªå??æ ¼"
 
@@ -21657,7 +21639,7 @@ msgstr "å??ç?´ç¹ªå??æ ¼"
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
-#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3382 ../widgets/table/e-tree.c:3383
 msgid "Draw focus"
 msgstr "ç¹ªå??ç?¦é»?"
 
@@ -21682,8 +21664,8 @@ msgstr "é?¸æ??å??æ¨¡å??"
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3336
-#: ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3365
 msgid "Length Threshold"
 msgstr "ç??é??é?·åº¦"
 
@@ -21692,8 +21674,8 @@ msgstr "ç??é??é?·åº¦"
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
 #: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
-#: ../widgets/table/e-table.c:3328 ../widgets/table/e-tree.c:3368
-#: ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3396
+#: ../widgets/table/e-tree.c:3397
 msgid "Uniform row height"
 msgstr "æ¨?æº?å??é«?"
 
@@ -21704,60 +21686,60 @@ msgstr "æ¨?æº?å??é«?"
 msgid "Frozen"
 msgstr "å??çµ?"
 
-#: ../widgets/table/e-table-header-item.c:1449
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Customize Current View"
 msgstr "è?ªè¨?ç?®å??ç??æª¢è¦?"
 
-#: ../widgets/table/e-table-header-item.c:1469
+#: ../widgets/table/e-table-header-item.c:1502
 msgid "Sort _Ascending"
 msgstr "é??å¢?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1505
 msgid "Sort _Descending"
 msgstr "é??æ¸?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1508
 msgid "_Unsort"
 msgstr "ä¸?æ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1511
 msgid "Group By This _Field"
 msgstr "ä¾?æ¤æ¬?ä½?å??ç¾¤çµ?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1514
 msgid "Group By _Box"
 msgstr "ä¾?æ?¹å¡?ç?ºç¾¤çµ?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1518
 msgid "Remove This _Column"
 msgstr "ç§»é?¤æ¤æ¬?(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1521
 msgid "Add a C_olumn..."
 msgstr "å? å?¥ä¸?æ¬?(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1525
 msgid "A_lignment"
 msgstr "æ??å??(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1528
 msgid "B_est Fit"
 msgstr "æ??é?©å¡«æ»¿(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??æ¬?(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1535
 msgid "Custo_mize Current View..."
 msgstr "è?ªè¨?ç?®å??ç??æª¢è¦?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1594
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1555
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "_Custom"
 msgstr "è?ªè¨?(_C)"
 
@@ -21777,40 +21759,40 @@ msgstr "æ¸¸æ¨?å??"
 msgid "Sort Info"
 msgstr "æ??åº?è³?è¨?"
 
-#: ../widgets/table/e-table.c:3335 ../widgets/table/e-tree.c:3375
-#: ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-table.c:3345 ../widgets/table/e-tree.c:3403
+#: ../widgets/table/e-tree.c:3404
 msgid "Always search"
 msgstr "ç¸½æ?¯æ??å°?"
 
-#: ../widgets/table/e-table.c:3342
+#: ../widgets/table/e-table.c:3352
 msgid "Use click to add"
 msgstr "è«?æ??é??è£¡å? å?¥"
 
-#: ../widgets/table/e-table.c:3356
+#: ../widgets/table/e-table.c:3366
 msgid "Vertical Row Spacing"
 msgstr "å??ç?´æ¬?é??è·?"
 
-#: ../widgets/table/e-table.c:3357
+#: ../widgets/table/e-table.c:3367
 msgid "Vertical space between rows. It is added to top and to bottom of a row"
 msgstr "å??å??ä¹?é??ç??å??ç?´é??è·?ã??å®?æ??å? å?¥å?°æ¯?å??ç??é ?ç«¯å??åº?é?¨"
 
-#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3389 ../widgets/table/e-tree.c:3390
 msgid "ETree table adapter"
 msgstr "ETree è¡¨æ ¼æ©?æ?¥å?¨"
 
-#: ../widgets/table/e-tree.c:3382
+#: ../widgets/table/e-tree.c:3410
 msgid "Retro Look"
 msgstr "æ?·è??å¤?è§?"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3411
 msgid "Draw lines and +/- expanders."
 msgstr "ç¹ªå?ºç·?æ¢?è?? +/- å±?é??ç¬¦è??ã??"
 
-#: ../widgets/table/e-tree.c:3389
+#: ../widgets/table/e-tree.c:3417
 msgid "Expander Size"
 msgstr "å±?é??å?¨å¤§å°?"
 
-#: ../widgets/table/e-tree.c:3390
+#: ../widgets/table/e-tree.c:3418
 msgid "Size of the expander arrow"
 msgstr "å±?é??å?¨ç®è??ç??å¤§å°?"
 
@@ -21864,7 +21846,7 @@ msgstr "è¡¨æ ¼ç??å?²å?æ ¼"
 msgid "click"
 msgstr "å?®æ??"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
 msgid "sort"
 msgstr "æ??åº?"
 
@@ -21980,3 +21962,12 @@ msgstr "IM å¿«é¡¯è¦?çª?"
 #: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
 msgid "Handle Popup"
 msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
+
+#~ msgid "Loading appointments at %s"
+#~ msgstr "è¼?å?¥ %s ç??ç´?æ??"
+
+#~ msgid "_Security"
+#~ msgstr "å®?å?¨æ?§(_S)"
+
+#~ msgid "Copying `%s' to `%s'"
+#~ msgstr "å°?ã??%sã??è¤?è£½å?°ã??%sã??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]