[evolution/gnome-2-32] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 807f08c1f3c9d904eae88360062593546f900000
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Jan 25 18:53:52 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1021 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 1021 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 1000 insertions(+), 1042 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index dce9bf3..ac58249 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.32.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2010-09-20 15:12+0000\n"
-"PO-Revision-Date: 2010-09-21 19:08+0800\n"
+"POT-Creation-Date: 2011-01-18 14:23+0000\n"
+"PO-Revision-Date: 2011-01-25 18:52+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"
@@ -190,7 +190,7 @@ msgstr "����(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2020
+#: ../calendar/gui/e-calendar-view.c:2024
 msgid "Anniversary"
 msgstr "�年�念�"
 
@@ -201,9 +201,9 @@ 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:2019
+#: ../calendar/gui/e-calendar-view.c:2023
 #: ../capplet/anjal-settings-main.c:123
-#: ../shell/main.c:128
+#: ../shell/main.c:132
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -300,7 +300,7 @@ msgstr "å??註"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1729
 msgid "Other"
 msgstr "��"
 
@@ -474,7 +474,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "æ?°å¢?è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
@@ -1146,7 +1146,7 @@ msgstr "è¦?å??交è«?"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:491
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1190,15 +1190,15 @@ msgstr "網�"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../capplet/settings/mail-capplet-shell.c:356
 #: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/addressbook/e-book-shell-migrate.c:143
 #: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:156
+#: ../modules/calendar/e-cal-shell-migrate.c:157
 #: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-memo-shell-migrate.c:115
 #: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:121
+#: ../modules/calendar/e-task-shell-migrate.c:124
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "å??人"
@@ -1225,24 +1225,24 @@ msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
 msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??å?¯è?½è¡¨ç¤ºæ­¤ç?®é??æ??å??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?以ä¾?é?¢ç·?使ç?¨ã??è«?æ?¼ä¸?ç·?模å¼?å??次è®?å??ç?®é??æ??å??以ä¸?è¼?å®?ç??å?§å®¹ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??è«?檢æ?¥è·¯å¾? %s æ?¯å?¦å­?å?¨è??ä¸?æ¬?é??已設å®?å?¯ä»¥å­?å??å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr "æ­¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è­¯é?²å?»ã??å¦?æ??ä½ æ?³å?¨ Evolution 使ç?¨ LDAPï¼?å¿?é ?å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?件ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??表示你輸å?¥é?¯èª¤ç??URIï¼?æ??伺æ??å?¨ç?¡æ³?é?£ç·?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "詳細ç??é?¯èª¤è¨?æ?¯ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1254,7 +1254,7 @@ msgstr ""
 "è«?使ç?¨æ?´å? æ??確ç??æ?¥è©¢æ??æ?¯æ??é«?æ­¤ç?®é??æ??å??ç??ç?®é??\n"
 "伺æ??å?¨å??好設å®?中ç??çµ?æ??é??å?¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1267,49 +1267,49 @@ msgstr ""
 "æ??é??ä¸?é??ã??"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?ç?¡æ³?解æ??é??次ç??æ?¥è©¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?æ??çµ?å?·è¡?é??次ç??æ?¥è©¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "é??次ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
 msgstr "�製�絡人�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
 msgstr "�製�絡人�"
 
@@ -1800,19 +1800,19 @@ msgstr "å?³é??(_S)"
 msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
@@ -2516,7 +2516,7 @@ msgstr "歸�"
 
 #: ../calendar/gui/caltypes.xml.h:7
 #: ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525
+#: ../calendar/gui/e-cal-model.c:535
 #: ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
@@ -2571,7 +2571,7 @@ msgstr "æ??è­°å?¬é??人"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523
+#: ../calendar/gui/e-cal-model.c:533
 #: ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
@@ -2579,8 +2579,8 @@ msgstr "�人"
 
 #: ../calendar/gui/caltypes.xml.h:15
 #: ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514
-#: ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-cal-model.c:524
+#: ../calendar/gui/e-cal-model.c:531
 #: ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
@@ -2666,7 +2666,7 @@ msgid "Add Alarm"
 msgstr "��鬧�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:362
 msgid "Alarm"
 msgstr "鬧�"
 
@@ -2872,8 +2872,8 @@ msgstr "æ??æ??äº?"
 #: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:200
 #: ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2678
+#: ../modules/addressbook/addressbook-config.c:1012
+#: ../plugins/itip-formatter/itip-formatter.c:2680
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -3589,17 +3589,17 @@ msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ­¤å?°æ??è??ç??空é??/å¿?ç¢?è³?è¨?"
 
 #: ../calendar/gui/dialogs/event-editor.c:319
-#: ../calendar/gui/print.c:2610
+#: ../calendar/gui/print.c:2674
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-editor.c:387
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
+#: ../calendar/gui/dialogs/event-editor.c:580
 msgid "Print this event"
 msgstr "æ??å?°é??å??äº?件"
 
@@ -3766,41 +3766,36 @@ msgstr "æ??å?»(_T):"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#| msgid "1 day before appointment"
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "ç´?æ??å?? 1 天"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#| msgid "1 hour before appointment"
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "ç´?æ??å?? 1 å°?æ??"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-#| msgid "15 minutes before appointment"
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "ç´?æ??å?? 15 å??é??"
 
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#| msgid "for"
 msgctxt "eventpage"
 msgid "for"
 msgstr "å?±"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#| msgid "until"
 msgctxt "eventpage"
 msgid "until"
 msgstr "ç?´å?°"
 
 #: ../calendar/gui/dialogs/memo-editor.c:109
-#: ../calendar/gui/print.c:2614
+#: ../calendar/gui/print.c:2678
 msgid "Memo"
 msgstr "å??å¿?é??"
 
@@ -3828,9 +3823,9 @@ msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 #: ../calendar/gui/dialogs/memo-page.c:1078
 #: ../em-format/em-format-quote.c:270
 #: ../em-format/em-format.c:1040
-#: ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348
-#: ../mail/em-format-html.c:2372
+#: ../mail/em-format-html.c:2299
+#: ../mail/em-format-html.c:2358
+#: ../mail/em-format-html.c:2382
 #: ../mail/message-list.etspec.h:20
 #: ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
@@ -4046,49 +4041,42 @@ msgstr "é??å??ç´?æ??ç??循ç?°è¦?å??ç?º(_U)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-#| msgid "day(s)"
 msgctxt "recurrpage"
 msgid "day(s)"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-#| msgid "for"
 msgctxt "recurrpage"
 msgid "for"
 msgstr "å?±"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-#| msgid "forever"
 msgctxt "recurrpage"
 msgid "forever"
 msgstr "永�"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-#| msgid "month(s)"
 msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "æ??"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-#| msgid "until"
 msgctxt "recurrpage"
 msgid "until"
 msgstr "ç?´å?°"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-#| msgid "week(s)"
 msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "é?±"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#| msgid "year(s)"
 msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "å¹´"
@@ -4118,7 +4106,7 @@ msgstr "網�"
 #: ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230
 #: ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2761
 #: ../mail/em-sync-stream.c:151
 #: ../mail/em-sync-stream.c:178
 #: ../mail/em-sync-stream.c:199
@@ -4137,7 +4125,7 @@ msgstr "å·²å??æ¶?"
 #: ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228
 #: ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2694
+#: ../calendar/gui/print.c:2758
 #: ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
@@ -4162,7 +4150,7 @@ msgstr "é«?"
 #: ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226
 #: ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2755
 msgid "In Progress"
 msgstr "��中"
 
@@ -4179,7 +4167,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:1269
+#: ../calendar/gui/e-cal-model.c:1279
 #: ../calendar/gui/e-task-table.c:512
 #: ../calendar/gui/tasktypes.xml.h:17
 #: ../mail/message-list.c:1182
@@ -4195,7 +4183,7 @@ msgstr "��"
 #: ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224
 #: ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2688
+#: ../calendar/gui/print.c:2752
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
@@ -4212,7 +4200,7 @@ msgstr "ç??æ??(_U):"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-calendar-view.c:1777
 #: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21
@@ -4256,7 +4244,7 @@ msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
 #: ../calendar/gui/dialogs/task-editor.c:328
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2676
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "工�"
@@ -4483,7 +4471,7 @@ msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1065
-#: ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:179
@@ -4492,14 +4480,14 @@ msgid "Yes"
 msgstr "æ?¯"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1065
-#: ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "å?¦"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527
+#: ../calendar/gui/e-cal-model.c:537
 #: ../calendar/gui/e-itip-control.c:1210
 #: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
@@ -4507,25 +4495,25 @@ msgstr "å?¦"
 #: ../calendar/gui/e-meeting-store.c:127
 #: ../calendar/gui/e-meeting-store.c:162
 #: ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989
+#: ../calendar/gui/print.c:1013
+#: ../calendar/gui/print.c:1030
 #: ../e-util/e-charset.c:52
 #: ../mail/em-utils.c:967
 #: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2345
+#: ../plugins/itip-formatter/itip-formatter.c:2347
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1281
 msgid "Recurring"
 msgstr "循�模�"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1283
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2198
 #, c-format
 msgid "Opening %s"
 msgstr "æ­£å?¨é??å?? %s"
@@ -4569,53 +4557,53 @@ msgstr "é??å§?æ?¥æ??"
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "è¤?製é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "��貼簿貼��件"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?件"
 
-#: ../calendar/gui/e-calendar-view.c:444
+#: ../calendar/gui/e-calendar-view.c:448
 #: ../calendar/gui/e-memo-table.c:188
 #: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:638
+#: ../calendar/gui/e-calendar-view.c:642
 #: ../calendar/gui/e-memo-table.c:847
 #: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "���件"
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1724
 #: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189
 #: ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1725
 #: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191
 #: ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1726
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193
 #: ../calendar/gui/e-meeting-store.c:216
@@ -4623,21 +4611,21 @@ msgstr "å©?æ??"
 msgid "Tentative"
 msgstr "��"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1727
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195
 #: ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../plugins/itip-formatter/itip-formatter.c:2344
 msgid "Delegated"
 msgstr "已�派"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1728
 msgid "Needs action"
 msgstr "é??è¦?å??ä½?"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1868
+#: ../calendar/gui/e-calendar-view.c:1872
 #: ../calendar/gui/e-memo-table.c:530
 #: ../calendar/gui/e-task-table.c:745
 #, c-format
@@ -4646,7 +4634,7 @@ 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:1872
+#: ../calendar/gui/e-calendar-view.c:1876
 #: ../calendar/gui/e-memo-table.c:535
 #: ../calendar/gui/e-task-table.c:748
 #, c-format
@@ -4654,14 +4642,14 @@ msgid "Organizer: %s"
 msgstr "æ??è­°å?¬é??人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1888
-#: ../calendar/gui/print.c:2646
+#: ../calendar/gui/e-calendar-view.c:1892
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "Location: %s"
 msgstr "�置�%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1919
+#: ../calendar/gui/e-calendar-view.c:1923
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
@@ -4705,11 +4693,11 @@ msgstr "顯示第äº?æ??å??"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:897
-#: ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-day-view.c:1892
 #: ../calendar/gui/e-week-view-main-item.c:218
-#: ../calendar/gui/print.c:1744
+#: ../calendar/gui/print.c:1785
 msgid "%A %d %B"
-msgstr "%A %d %B"
+msgstr "%B %d %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -4718,12 +4706,12 @@ msgstr "%A %d %B"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:901
-#: ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-day-view.c:1909
 #: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
-msgstr "%-m æ?? %-d æ?¥ (%a)"
+msgstr "%b %d æ?¥ (%a)"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
@@ -4731,29 +4719,29 @@ msgstr "%-m æ?? %-d æ?¥ (%a)"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:905
-#: ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-day-view.c:1925
 #: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
-msgstr "%-m æ?? %-d æ?¥"
+msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1077
-#: ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1089
+#: ../calendar/gui/e-week-view.c:767
+#: ../calendar/gui/print.c:860
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080
-#: ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1092
+#: ../calendar/gui/e-week-view.c:770
+#: ../calendar/gui/print.c:862
 msgid "pm"
 msgstr "ä¸?å??"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2646
+#: ../calendar/gui/e-day-view.c:2676
 #, c-format
 msgid "Week %d"
 msgstr "第 %d �"
@@ -4871,13 +4859,13 @@ msgstr " è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2320
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgctxt "cal-itip"
 msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
@@ -5092,7 +5080,7 @@ msgid "Attendee status updated\n"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
 #: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1423
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å­?å?¨"
 
@@ -5201,14 +5189,14 @@ msgstr "��"
 #: ../calendar/gui/e-meeting-store.c:102
 #: ../calendar/gui/e-meeting-store.c:119
 #: ../calendar/gui/e-meeting-store.c:850
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/print.c:1009
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:104
 #: ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:1010
 #: ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "羣�"
@@ -5216,21 +5204,21 @@ msgstr "羣�"
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:106
 #: ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/print.c:1011
 msgid "Resource"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:108
 #: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/print.c:1012
 msgid "Room"
 msgstr "æ??議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:137
 #: ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1026
 msgid "Chair"
 msgstr "主席"
 
@@ -5238,21 +5226,21 @@ msgstr "主席"
 #: ../calendar/gui/e-meeting-store.c:139
 #: ../calendar/gui/e-meeting-store.c:156
 #: ../calendar/gui/e-meeting-store.c:853
-#: ../calendar/gui/print.c:986
+#: ../calendar/gui/print.c:1027
 msgid "Required Participant"
 msgstr "å?ºå¸­è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:141
 #: ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1028
 msgid "Optional Participant"
 msgstr "å??席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:143
 #: ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:1029
 msgid "Non-Participant"
 msgstr "缺席è??"
 
@@ -5278,7 +5266,7 @@ msgstr "��中"
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
 #: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
+msgstr "%Y å¹´ %B %d (%A)"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
@@ -5440,13 +5428,13 @@ msgid "%d%%"
 msgstr "%d%%"
 
 #: ../calendar/gui/e-task-table.c:631
-#: ../calendar/gui/print.c:2072
+#: ../calendar/gui/print.c:2113
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
+#: ../modules/calendar/e-task-shell-view.c:440
 #: ../plugins/caldav/caldav-browse-server.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
@@ -5483,7 +5471,7 @@ msgstr "é?¸æ??ä¸?å??æ??å??"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:235
-#: ../calendar/gui/print.c:1725
+#: ../calendar/gui/print.c:1766
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5589,7 +5577,7 @@ msgstr "Gnome è¡?äº?æ??"
 #: ../calendar/gui/ea-gnome-calendar.c:199
 #: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
-msgstr "%Y/%m/%d (%a)"
+msgstr "%Y å¹´ %b %d (%A)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
@@ -5598,7 +5586,7 @@ msgstr "%Y/%m/%d (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1023
 #: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
+msgstr "%Y å¹´ %b %d (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:228
 #: ../calendar/gui/ea-gnome-calendar.c:234
@@ -5609,7 +5597,7 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1061
 #: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
+msgstr "%Y å¹´ %b %d"
 
 #: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
@@ -5637,7 +5625,7 @@ msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??檢è¦?"
 msgid "calendar view for one or more weeks"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/gnome-cal.c:2311
+#: ../calendar/gui/gnome-cal.c:2310
 msgid "Purging"
 msgstr "��"
 
@@ -5825,225 +5813,225 @@ msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?é?¯èª¤ç?ºï¼?"
 msgid "You must be an attendee of the event."
 msgstr "ä½ å¿?é ?æ?¯æ­¤äº?件ç??å?°æ??è??ã??"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:522
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Mo"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Tu"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "We"
 msgstr "�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Fr"
 msgstr "�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Sa"
 msgstr "å?­"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2513
 msgid " to "
 msgstr " å?° "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:2457
+#: ../calendar/gui/print.c:2521
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2461
+#: ../calendar/gui/print.c:2525
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/print.c:2533
 msgid " (Due "
 msgstr "(æ??é??)"
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2538
 msgid "Due "
 msgstr "æ??é?? "
 
-#: ../calendar/gui/print.c:2637
+#: ../calendar/gui/print.c:2701
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2661
+#: ../calendar/gui/print.c:2725
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2704
+#: ../calendar/gui/print.c:2768
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2719
+#: ../calendar/gui/print.c:2783
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2737
+#: ../calendar/gui/print.c:2801
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2748
+#: ../calendar/gui/print.c:2812
 #, c-format
 msgid "URL: %s"
 msgstr "網å??: %s"
 
-#: ../calendar/gui/print.c:2761
+#: ../calendar/gui/print.c:2825
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2772
+#: ../calendar/gui/print.c:2836
 msgid "Contacts: "
 msgstr "�絡人: "
 
@@ -6072,7 +6060,7 @@ msgstr "ç´?æ??å??æ??è­°"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1835
+#: ../plugins/itip-formatter/itip-formatter.c:1837
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
@@ -8030,15 +8018,15 @@ msgid "Cannot encrypt outgoing message: No encryption certificate set for this a
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??設å®?å? å¯?è­?æ?¸(此帳è??)"
 
 #: ../composer/e-msg-composer.c:1466
-#: ../composer/e-msg-composer.c:1811
+#: ../composer/e-msg-composer.c:1809
 msgid "Compose Message"
 msgstr "編輯�件"
 
-#: ../composer/e-msg-composer.c:3477
+#: ../composer/e-msg-composer.c:3475
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å­?ç??é?µä»¶å?§æ??ã??"
 
-#: ../composer/e-msg-composer.c:4085
+#: ../composer/e-msg-composer.c:4083
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
@@ -8262,8 +8250,8 @@ msgid "Time to check things over before we try and connect to the server and fet
 msgstr "å?¨æ??å??å??試並é?£ç·?å?°ä¼ºæ??å?¨å??å??é?µä»¶å??檢æ?¥äº?é ?ç??æ??é??ã??"
 
 #: ../capplet/settings/mail-account-view.c:614
-#: ../mail/em-account-editor.c:2101
-#: ../mail/em-account-editor.c:2222
+#: ../mail/em-account-editor.c:2107
+#: ../mail/em-account-editor.c:2228
 #: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "身å??"
@@ -8316,7 +8304,7 @@ msgid "Back - Receiving options"
 msgstr "��步 - 正�����"
 
 #: ../capplet/settings/mail-account-view.c:619
-#: ../mail/em-account-editor.c:2988
+#: ../mail/em-account-editor.c:3003
 #: ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "�設�"
@@ -8387,9 +8375,9 @@ msgid "Evolution account assistant"
 msgstr "Evolution 帳è??å?©ç??"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342
+#: ../capplet/settings/mail-capplet-shell.c:348
 #: ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227
+#: ../mail/e-mail-store.c:230
 #: ../mail/em-folder-tree-model.c:148
 #: ../mail/em-folder-tree-model.c:151
 #: ../mail/em-folder-tree-model.c:154
@@ -8399,13 +8387,13 @@ msgstr "Evolution 帳è??å?©ç??"
 #: ../mail/mail-vfolder.c:207
 #: ../mail/message-list.c:1666
 #: ../modules/addressbook/e-book-shell-backend.c:96
-#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/addressbook/e-book-shell-migrate.c:135
 #: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:146
+#: ../modules/calendar/e-cal-shell-migrate.c:147
 #: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:105
 #: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:114
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
@@ -8435,7 +8423,7 @@ msgid "Evolution Alarm Notify"
 msgstr "Evolution 鬧é?´é??ç?¥"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../mail/e-mail-browser.c:845
+#: ../mail/e-mail-browser.c:847
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8590,38 +8578,30 @@ msgid "Today"
 msgstr "�天"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205
+#: ../e-util/e-datetime-format.c:207
 #: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??天"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:209
 msgid "Yesterday"
 msgstr "�天"
 
 #. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:211
+#: ../e-util/e-datetime-format.c:213
 #, c-format
 msgid "%d day from now"
 msgid_plural "%d days from now"
 msgstr[0] "���起 %d 天"
 msgstr[1] "���起 %d 天"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:214
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天å??"
-msgstr[1] "%d 天å??"
-
-#: ../e-util/e-datetime-format.c:289
-#: ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:290
+#: ../e-util/e-datetime-format.c:300
+#: ../e-util/e-datetime-format.c:309
 msgid "Use locale default"
 msgstr "使ç?¨å?°å??設å®?é ?設å?¼"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:503
 msgid "Format:"
 msgstr "格��"
 
@@ -8779,23 +8759,23 @@ msgstr "å??è¦?"
 
 #: ../em-format/em-format-quote.c:270
 #: ../em-format/em-format.c:1041
-#: ../mail/em-format-html.c:2290
-#: ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375
+#: ../mail/em-format-html.c:2300
+#: ../mail/em-format-html.c:2362
+#: ../mail/em-format-html.c:2385
 #: ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "��"
 
 #: ../em-format/em-format-quote.c:270
 #: ../em-format/em-format.c:1042
-#: ../mail/em-format-html.c:2291
-#: ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378
+#: ../mail/em-format-html.c:2301
+#: ../mail/em-format-html.c:2366
+#: ../mail/em-format-html.c:2388
 #: ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "�件��"
 
-#: ../em-format/em-format-quote.c:410
+#: ../em-format/em-format-quote.c:414
 #: ../em-format/em-format.c:1043
 #: ../mail/e-mail-tag-editor.c:328
 #: ../mail/em-filter-i18n.h:74
@@ -8807,13 +8787,13 @@ msgid "Subject"
 msgstr "主�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421
-#: ../mail/em-format-html.c:2472
+#: ../em-format/em-format-quote.c:425
+#: ../mail/em-format-html.c:2482
 #: ../modules/mail/em-mailer-prefs.c:1120
 msgid "Mailer"
 msgstr "å¯?件è??"
 
-#: ../em-format/em-format-quote.c:500
+#: ../em-format/em-format-quote.c:504
 #: ../mail/em-composer-utils.c:1296
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
@@ -8837,52 +8817,53 @@ msgstr "æ?°è??ç¾£çµ?"
 msgid "Face"
 msgstr "��"
 
-#: ../em-format/em-format.c:1431
+#: ../em-format/em-format.c:1433
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??件"
 
-#: ../em-format/em-format.c:1503
+#: ../em-format/em-format.c:1522
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1662
-#: ../em-format/em-format.c:1846
+#: ../em-format/em-format.c:1681
+#: ../em-format/em-format.c:1866
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?解æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../em-format/em-format.c:1672
+#: ../em-format/em-format.c:1691
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../em-format/em-format.c:1688
+#: ../em-format/em-format.c:1708
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../em-format/em-format.c:1689
+#: ../em-format/em-format.c:1709
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1871
+#: ../em-format/em-format.c:1891
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??簽署格å¼?"
 
-#: ../em-format/em-format.c:1881
-#: ../em-format/em-format.c:2041
+#: ../em-format/em-format.c:1901
+#: ../em-format/em-format.c:2061
 msgid "Error verifying signature"
 msgstr "檢é©?簽署ç?¼ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1882
-#: ../em-format/em-format.c:2029
-#: ../em-format/em-format.c:2042
+#: ../em-format/em-format.c:1902
+#: ../em-format/em-format.c:2049
+#: ../em-format/em-format.c:2062
 msgid "Unknown error verifying signature"
 msgstr "檢é©?簽署ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../em-format/em-format.c:2129
+#: ../em-format/em-format.c:2149
 msgid "Could not parse PGP message: "
 msgstr "ç?¡æ³?解æ?? PGP é?µä»¶ï¼?"
 
-#: ../em-format/em-format.c:2135
+#: ../em-format/em-format.c:2155
+#: ../mail/mail-ops.c:614
 #: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254
 #: ../plugins/face/face.c:169
@@ -8890,49 +8871,51 @@ msgstr "ç?¡æ³?解æ?? PGP é?µä»¶ï¼?"
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../filter/e-filter-datespec.c:74
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 ��"
 msgstr[1] "%d ��"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 å??é??å¾?"
 msgstr[1] "%d å??é??å¾?"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 å°?æ??å¾?"
 msgstr[1] "%d å°?æ??å¾?"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -8953,57 +8936,57 @@ msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 ��"
 msgstr[1] "%d ��"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 å??æ??å¾?"
 msgstr[1] "%d å??æ??å¾?"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:83
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 å¹´å¾?"
 msgstr[1] "%d å¹´å¾?"
 
-#: ../filter/e-filter-datespec.c:122
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:125
 #: ../filter/e-filter-datespec.c:136
 #: ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "��"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:132
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/e-filter-datespec.c:275
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
@@ -9199,7 +9182,7 @@ msgstr "å¹´"
 
 #: ../mail/e-mail-attachment-bar.c:91
 #: ../mail/e-mail-attachment-bar.c:96
-#: ../mail/em-format-html-display.c:1024
+#: ../mail/em-format-html-display.c:1027
 #: ../mail/mail-config.ui.h:15
 #: ../mail/message-list.etspec.h:1
 #: ../widgets/misc/e-attachment-paned.c:129
@@ -9219,23 +9202,23 @@ msgstr "å??示檢è¦?"
 msgid "List View"
 msgstr "��檢�"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:267
 msgid "(No Subject)"
 msgstr "(æ²?æ??主æ?¨)"
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:67
 msgid "_Add to Address Book..."
 msgstr "å? å?¥å?°é??è¨?é??(_A)..."
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:74
 msgid "_To This Address"
 msgstr "å?°é??å??ä½?å??(_T)"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:81
 msgid "_From This Address"
 msgstr "å¾?é??å??ä½?å??(_F)"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:90
 msgid "Create Search _Folder"
 msgstr "建ç«?æ??å°?è³?æ??夾(_F)"
 
@@ -9299,29 +9282,29 @@ msgstr "å??稱"
 
 #: ../mail/e-mail-local.c:37
 #: ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696
+#: ../mail/em-folder-tree-model.c:697
 #: ../mail/em-folder-tree.c:2840
 #: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "�件�"
 
 #: ../mail/e-mail-local.c:38
-#: ../mail/em-folder-tree-model.c:688
+#: ../mail/em-folder-tree-model.c:689
 msgid "Drafts"
 msgstr "è??稿"
 
 #: ../mail/e-mail-local.c:39
-#: ../mail/em-folder-tree-model.c:700
+#: ../mail/em-folder-tree-model.c:701
 msgid "Outbox"
 msgstr "�件�"
 
 #: ../mail/e-mail-local.c:40
-#: ../mail/em-folder-tree-model.c:702
+#: ../mail/em-folder-tree-model.c:703
 msgid "Sent"
 msgstr "å·²å?³é??"
 
 #: ../mail/e-mail-local.c:41
-#: ../mail/em-folder-tree-model.c:691
+#: ../mail/em-folder-tree-model.c:692
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:578
 msgid "Templates"
@@ -9948,14 +9931,14 @@ msgid "Unable to retrieve message"
 msgstr "�����件"
 
 #: ../mail/e-mail-reader.c:2329
-#: ../mail/mail-ops.c:1891
+#: ../mail/mail-ops.c:1896
 #, 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:2893
+#: ../mail/e-mail-reader.c:2913
 #: ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
@@ -9964,47 +9947,47 @@ msgstr "æ­£å?¨å??å??é?µä»¶ã??%sã??"
 msgid "Default"
 msgstr "�設�"
 
-#: ../mail/e-mail-reader.c:3041
+#: ../mail/e-mail-reader.c:3061
 #: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "��(_F)"
 
-#: ../mail/e-mail-reader.c:3042
+#: ../mail/e-mail-reader.c:3062
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?給æ??人"
 
-#: ../mail/e-mail-reader.c:3061
+#: ../mail/e-mail-reader.c:3081
 msgid "Group Reply"
 msgstr "ç¾£çµ?å??è¦?"
 
-#: ../mail/e-mail-reader.c:3062
+#: ../mail/e-mail-reader.c:3082
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "å??è¦?給é??ä¿¡è«?å£?ï¼?æ??æ?¯çµ¦æ??æ??ç??æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:3107
+#: ../mail/e-mail-reader.c:3127
 #: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "��"
 
-#: ../mail/e-mail-reader.c:3140
+#: ../mail/e-mail-reader.c:3160
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3144
+#: ../mail/e-mail-reader.c:3164
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3154
+#: ../mail/e-mail-reader.c:3174
 #: ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "å??è¦?"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:3742
 #, c-format
 msgid "Folder '%s'"
 msgstr "è³?æ??夾ã??%sã??"
@@ -10015,7 +9998,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:512
+#: ../mail/em-account-editor.c:513
 #: ../mail/mail-config.ui.h:77
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
@@ -10024,7 +10007,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:516
+#: ../mail/em-account-editor.c:517
 #: ../mail/mail-config.ui.h:136
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
@@ -10033,18 +10016,18 @@ 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:520
+#: ../mail/em-account-editor.c:521
 #: ../mail/mail-config.ui.h:105
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ��"
 
-#: ../mail/em-account-editor.c:607
+#: ../mail/em-account-editor.c:608
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:614
+#: ../mail/em-account-editor.c:615
 #, c-format
 msgid ""
 "\n"
@@ -10058,36 +10041,36 @@ msgstr ""
 "並é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:901
+#: ../mail/em-account-editor.c:902
 #: ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:985
+#: ../mail/em-account-editor.c:986
 msgid "Never"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:986
+#: ../mail/em-account-editor.c:987
 msgid "Always"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:987
+#: ../mail/em-account-editor.c:988
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1723
+#: ../mail/em-account-editor.c:1726
 #: ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2104
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10097,34 +10080,34 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2108
 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:2104
-#: ../mail/em-account-editor.c:2261
+#: ../mail/em-account-editor.c:2110
+#: ../mail/em-account-editor.c:2267
 #: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "�����件"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2111
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨­å®?ä¸?å??帳è??ç??設å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2107
-#: ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2113
+#: ../mail/em-account-editor.c:2758
 msgid "Sending Email"
 msgstr "å?³é??é?»å­?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2114
 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:2110
+#: ../mail/em-account-editor.c:2116
 msgid "Account Management"
 msgstr "帳è??總管"
 
-#: ../mail/em-account-editor.c:2111
+#: ../mail/em-account-editor.c:2117
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10132,11 +10115,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??空é??輸å?¥æ??è¿°é??å??帳è??ç??å??稱ã??\n"
 "é??å??å??稱å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2115
+#: ../mail/em-account-editor.c:2121
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2116
+#: ../mail/em-account-editor.c:2122
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10150,67 +10133,67 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å­?設å®?ã??"
 
-#: ../mail/em-account-editor.c:2557
+#: ../mail/em-account-editor.c:2572
 msgid "Check for _new messages every"
 msgstr "è?ªå??檢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2565
+#: ../mail/em-account-editor.c:2580
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2841
+#: ../mail/em-account-editor.c:2856
 msgid "Please select a folder from the current account."
 msgstr "è«?é?¸æ??ç?®å??帳è??ç??è³?æ??夾ã??"
 
-#: ../mail/em-account-editor.c:3111
+#: ../mail/em-account-editor.c:3126
 #: ../mail/mail-config.ui.h:112
 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:3156
-#: ../mail/em-account-editor.c:3224
+#: ../mail/em-account-editor.c:3171
+#: ../mail/em-account-editor.c:3239
 msgid "Receiving Options"
 msgstr "����"
 
-#: ../mail/em-account-editor.c:3157
-#: ../mail/em-account-editor.c:3225
+#: ../mail/em-account-editor.c:3172
+#: ../mail/em-account-editor.c:3240
 msgid "Checking for New Messages"
 msgstr "檢���件"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1729
+#: ../mail/em-composer-utils.c:1735
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "ä½ å¯?給 %s 主æ?¨ã??%sã?? (%s) ç??é?µä»¶å·²è¢«é?±è®?ã??"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1777
+#: ../mail/em-composer-utils.c:1783
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é??é??é??ç?¥ï¼?ã??%sã??"
 
-#: ../mail/em-composer-utils.c:2186
+#: ../mail/em-composer-utils.c:2192
 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:2233
+#: ../mail/em-composer-utils.c:2239
 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:2377
+#: ../mail/em-composer-utils.c:2383
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-composer-utils.c:2589
+#: ../mail/em-composer-utils.c:2595
 msgid "Posting destination"
 msgstr "張貼ç??ç?®ç??端"
 
-#: ../mail/em-composer-utils.c:2590
+#: ../mail/em-composer-utils.c:2596
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??夾ä¾?張貼é?µä»¶ã??"
 
@@ -10534,8 +10517,8 @@ msgstr "æ??å°?è³?æ??夾"
 msgid "UNMATCHED"
 msgstr "ä¸?符å??"
 
-#: ../mail/em-folder-tree-model.c:766
-#: ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:767
+#: ../mail/em-folder-tree-model.c:1114
 msgid "Loading..."
 msgstr "��中..."
 
@@ -10723,16 +10706,16 @@ msgstr "å?°æ??æ?¥:"
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:949
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:999
 msgid "View _Unformatted"
 msgstr "檢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1019
 msgid "O_pen With"
 msgstr "以...é??å??(_O)"
 
@@ -10755,42 +10738,42 @@ msgstr "æ ¼å¼?å??é?µä»¶..."
 msgid "Retrieving '%s'"
 msgstr "æ­£å?¨å??å??ã??%sã??"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1911
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1919
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:1960
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??示"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:1962
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:1983
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:1994
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ä¸?æ??ç??å¤?é?¨æª?æ¡?æ??示 (ã??%sã??é¡?å??)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2647
+#: ../mail/em-format-html.c:2657
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "é??å°?é?µä»¶æ?¯ç?± %s 代表 %s å¯?å?º"
@@ -11720,7 +11703,7 @@ msgstr "輸å?¥ Elm è³?æ??"
 
 #: ../mail/importers/elm-importer.c:325
 #: ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:964
+#: ../modules/mail/e-mail-shell-view.c:1011
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
@@ -11792,7 +11775,7 @@ msgid "Importing Pine data"
 msgstr "輸å?¥ç®¡é??è³?æ??"
 
 #: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Address Book"
 msgstr "é??è¨?é??"
 
@@ -11901,7 +11884,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "å?¨æ??æ??è³?æ??夾å¥?ç?¨ç?¸å??ç??檢è¦?設å®?å?¼(_V)"
 
 #: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../modules/addressbook/addressbook-config.c:1020
 msgid "Authentication"
 msgstr "é©?è­?"
 
@@ -12639,7 +12622,7 @@ msgstr "��(_F):"
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ­¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:782
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -12652,13 +12635,13 @@ msgstr "é??濾é?¸æ??ç??é?µä»¶"
 msgid "Fetching Mail"
 msgstr "���件"
 
-#: ../mail/mail-ops.c:592
+#: ../mail/mail-ops.c:596
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??濾å?¨ï¼?%s"
 
-#: ../mail/mail-ops.c:608
-#: ../mail/mail-ops.c:635
+#: ../mail/mail-ops.c:612
+#: ../mail/mail-ops.c:640
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -12667,139 +12650,139 @@ msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
 "æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ã??"
 
-#: ../mail/mail-ops.c:654
+#: ../mail/mail-ops.c:659
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ï¼?%s"
 
-#: ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/mail-ops.c:779
+#: ../mail/mail-ops.c:871
 msgid "Sending message"
 msgstr "æ­£å?¨å?³é??é?µä»¶"
 
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:787
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ­£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:831
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??第 %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:828
+#: ../mail/mail-ops.c:833
 #: ../mail/mail-send-recv.c:783
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:830
+#: ../mail/mail-ops.c:835
 #: ../mail/mail-send-recv.c:785
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:938
+#: ../mail/mail-ops.c:943
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "å?²å­?é?µä»¶å?°è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1023
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "å°?é?µä»¶ç§»å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1023
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "å°?é?µä»¶è¤?製å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1132
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1276
+#: ../mail/mail-ops.c:1281
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "é??å??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1347
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "å??å¾?è³?æ??夾ã??%sã??ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1419
 #, c-format
 msgid "Opening store '%s'"
 msgstr "é??å??貯è??ã??%sã??"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移é?¤è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1614
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æ­£å?¨è²¯è??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1677
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?空å??å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1678
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1732
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "é??æ?°æ?´ç??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1772
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æ­£å?¨å?ªå?»è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1817
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?空ã??%sã??ç??å??æ?¶ç­?"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1818
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??夾"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2021
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "�� %d ��件"
 msgstr[1] "�� %d ��件"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2197
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "å?²å­?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 
-#: ../mail/mail-ops.c:2265
+#: ../mail/mail-ops.c:2270
 msgid "Saving attachment"
 msgstr "å?²å­?é??件"
 
-#: ../mail/mail-ops.c:2285
-#: ../mail/mail-ops.c:2295
+#: ../mail/mail-ops.c:2290
+#: ../mail/mail-ops.c:2300
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12808,26 +12791,26 @@ msgstr ""
 "��建�輸����%s�\n"
 " %s"
 
-#: ../mail/mail-ops.c:2310
+#: ../mail/mail-ops.c:2315
 msgid "Could not write data: "
 msgstr "ç?¡æ³?寫å?¥è³?æ??ï¼?"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2459
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "中æ?·è??ã??%sã??ç??é?£ç·?"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2459
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2555
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2636
+#: ../mail/mail-ops.c:2641
 msgid "Checking Service"
 msgstr "檢æ?¥æ??å??"
 
@@ -12857,35 +12840,35 @@ msgstr "正���..."
 msgid "Checking for new mail"
 msgstr "檢���件"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:228
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?輸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:230
 msgid "Enter Passphrase"
 msgstr "輸���"
 
-#: ../mail/mail-session.c:230
+#: ../mail/mail-session.c:233
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?輸å?¥ %s æ??é??ç??å¯?碼"
 
-#: ../mail/mail-session.c:232
+#: ../mail/mail-session.c:235
 msgid "Enter Password"
 msgstr "輸��碼"
 
-#: ../mail/mail-session.c:277
+#: ../mail/mail-session.c:283
 #, c-format
 msgid "User canceled operation."
 msgstr "使ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
-#: ../mail/mail-session.c:722
+#: ../mail/mail-session.c:728
 #, c-format
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-session.c:731
+#: ../mail/mail-session.c:737
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??帳è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
@@ -13556,15 +13539,15 @@ msgstr "�天 %p %l:%M"
 
 #: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
-msgstr "%A%p %-l:%M"
+msgstr "%a %p %l:%M"
 
 #: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
-msgstr "%mæ??%dæ?¥%p %l:%M"
+msgstr "%b %d %p %l:%M"
 
 #: ../mail/message-list.c:1833
 msgid "%b %d %Y"
-msgstr "%Y/%m/%d"
+msgstr "%Y %b %d"
 
 #: ../mail/message-list.c:2598
 msgid "Select all visible messages"
@@ -13658,49 +13641,49 @@ msgstr "é?¸å??æ­¤é?¸é ?表示ï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP 伺æ??å?¨ (
 msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
 msgstr "é?¸å??æ­¤é?¸é ?表示ï¼?ä½ ç??伺æ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??表示你ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?ä½ ç??å®?å?¨æ??æ¼?æ´?ã?? "
 
-#: ../modules/addressbook/addressbook-config.c:602
+#: ../modules/addressbook/addressbook-config.c:609
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?念æ?¥è¡?äº?æ??(_S)"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:645
 msgid "Copy _book content locally for offline operation"
 msgstr "è¤?製é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?業(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:746
+#: ../modules/addressbook/addressbook-config.c:753
 msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
 msgstr "é??æ?¯ LDAP 伺æ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??試é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?洽詢你ç??系統管ç??å?¡ï¼?ç?­è§£ä½ æ??該æ??å®?ç??å? ã??"
 
-#: ../modules/addressbook/addressbook-config.c:820
+#: ../modules/addressbook/addressbook-config.c:827
 msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
 msgstr "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è­?ä½ ç??æ?¹æ³?ã??注æ??è¦?設å®?æ­¤é ?è?³ã??é?»å­?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿å??å­?å??ä½ ç?? LDAP 伺æ??å?¨ã??"
 
-#: ../modules/addressbook/addressbook-config.c:895
+#: ../modules/addressbook/addressbook-config.c:902
 msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 msgstr "æ??å°?ç¯?å??æ??å®?義你æ?³å¾?網絡ç?®é??樹å¾?ä¸?延伸æ??å°?ç??深度ã??ã??subã??(å­?é ?)ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??oneã??(å?®ä¸?)ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??層ç´?ã??"
 
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../modules/addressbook/addressbook-config.c:1018
 msgid "Server Information"
 msgstr "伺æ??å?¨è³?è¨?"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1023
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "詳細è³?æ??"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1024
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ­£å?¨æ??å°?"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1026
 msgid "Downloading"
 msgstr "��中"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1232
 msgid "Address Book Properties"
 msgstr "é??è¨?é??å?§å®¹"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1234
 msgid "New Address Book"
 msgstr "æ?°é??è¨?é??"
 
@@ -13784,7 +13767,7 @@ msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??è?¯çµ¡äººä½?å??(_S)"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:98
-#: ../modules/addressbook/e-book-shell-migrate.c:148
+#: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP 伺æ??å?¨"
 
@@ -13822,7 +13805,7 @@ msgstr "建ç«?æ?°é??è¨?é??"
 #: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
 #: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/calendar/e-cal-shell-migrate.c:58
 msgid "Contacts"
 msgstr "�絡人"
 
@@ -14214,11 +14197,11 @@ msgstr "���工�(_M)"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:181
+#: ../modules/calendar/e-cal-shell-migrate.c:182
 #: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-memo-shell-migrate.c:139
 #: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-task-shell-migrate.c:148
 msgid "On The Web"
 msgstr "�網��"
 
@@ -14228,7 +14211,7 @@ msgid "Weather"
 msgstr "天氣"
 
 #: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-migrate.c:61
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥"
 
@@ -14270,8 +14253,8 @@ msgstr "è¡?äº?æ??(_N)"
 msgid "Create a new calendar"
 msgstr "建ç«?æ?°è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../modules/calendar/e-cal-shell-backend.c:729
+#: ../plugins/itip-formatter/itip-formatter.c:2671
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
@@ -14971,11 +14954,11 @@ msgid_plural "%d tasks"
 msgstr[0] "%d �工�"
 msgstr[1] "%d �工�"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:354
 msgid "Delete Tasks"
 msgstr "��工�"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:356
 msgid "Delete Task"
 msgstr "��工�"
 
@@ -15027,7 +15010,7 @@ msgid "Network Preferences"
 msgstr "網絡å??好設å®?"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:880
-#: ../modules/mail/e-mail-shell-view.c:883
+#: ../modules/mail/e-mail-shell-view.c:930
 msgid "_Disable Account"
 msgstr "å??ç?¨å¸³è??(_D)"
 
@@ -15352,11 +15335,11 @@ msgstr[1] "å?± %d å°?"
 msgid "All Account Search"
 msgstr "æ??æ??ç??帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:686
+#: ../modules/mail/e-mail-shell-view.c:733
 msgid "Account Search"
 msgstr "帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:881
+#: ../modules/mail/e-mail-shell-view.c:928
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??伺æ??å?¨(_L)"
 
@@ -15613,105 +15596,104 @@ msgstr "æ­£å?¨é??å?? Evolution ç??設å®?å?¼(_E)..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "å¾?æª?æ¡?庫é??å?? Evolution ç??è³?æ??è??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:77
+#: ../plugins/backup-restore/backup.c:80
 msgid "Backup Evolution directory"
 msgstr "å??份 Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../plugins/backup-restore/backup.c:82
 msgid "Restore Evolution directory"
 msgstr "é??å?? Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:84
 msgid "Check Evolution Backup"
 msgstr "檢æ?¥ Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../plugins/backup-restore/backup.c:86
 msgid "Restart Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:88
 msgid "With Graphical User Interface"
 msgstr "使ç?¨å??形使ç?¨è??ä»?é?¢"
 
-#: ../plugins/backup-restore/backup.c:203
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:290
+#: ../plugins/backup-restore/backup.c:400
 msgid "Shutting down Evolution"
 msgstr "æ­£å?¨é??é?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:210
+#: ../plugins/backup-restore/backup.c:297
 msgid "Backing Evolution accounts and settings"
 msgstr "å??份 Evolution ç??帳è??è??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:216
+#: ../plugins/backup-restore/backup.c:305
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æ­£å?¨å??份 Evolution è³?æ?? (é?µä»¶ã??è?¯çµ¡äººã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??)"
 
-#: ../plugins/backup-restore/backup.c:227
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backup complete"
 msgstr "å??份å®?æ??"
 
-#: ../plugins/backup-restore/backup.c:232
-#: ../plugins/backup-restore/backup.c:253
-#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:323
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restarting Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:269
+#: ../plugins/backup-restore/backup.c:404
 msgid "Back up current Evolution data"
 msgstr "å??份ç?®å??ç?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:410
 msgid "Extracting files from backup"
 msgstr "å¾?å??份解é??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:467
 msgid "Loading Evolution settings"
 msgstr "æ­£å?¨è®?å?? Evolution ç??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:288
+#: ../plugins/backup-restore/backup.c:482
 msgid "Removing temporary backup files"
 msgstr "移é?¤æ?«å­?ç??å??份æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:295
+#: ../plugins/backup-restore/backup.c:492
 msgid "Ensuring local sources"
 msgstr "正�確���端��"
 
-#: ../plugins/backup-restore/backup.c:464
+#: ../plugins/backup-restore/backup.c:679
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ­£å??份è?³è³?æ??夾 %s"
 
-#: ../plugins/backup-restore/backup.c:469
+#: ../plugins/backup-restore/backup.c:684
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "å¾?è³?æ??夾é??å?? %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Backup"
 msgstr "Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:532
+#: ../plugins/backup-restore/backup.c:747
 msgid "Backing up Evolution Data"
 msgstr "å??份 Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:533
+#: ../plugins/backup-restore/backup.c:748
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??份你ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:750
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:751
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??ä½ ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:554
+#: ../plugins/backup-restore/backup.c:769
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??決æ?¼ä½ ç??帳è??中è³?æ??ç??å¤?寡ã??"
 
@@ -16906,157 +16888,157 @@ msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸­æ?¾å?°é??é ?å·¥ä½?"
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸­æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Opening the calendar. Please wait.."
 msgstr "æ­£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:878
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å­?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1059
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1146
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç?¡æ³?å?³é??é ?ç?®è?³è¡?äº?æ??ã??%sã??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1158
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºä¸?確å®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1167
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1172
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??並設ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è­°å?¬é??人已移é?¤ä»£ç??人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1386
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1415
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Meeting information sent"
 msgstr "æ??è­°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Task information sent"
 msgstr "工�����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ç?¡æ³?å¯?å?ºæ??è­°è³?è¨?ï¼?該æ??議並ä¸?å­?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send task information, the task does not exist"
 msgstr "����工����該�工����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1466
 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:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1531
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1536
 msgid "Save Calendar"
 msgstr "å?²å­?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid "The calendar attached is not valid"
 msgstr "é??帶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1600
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "æ­¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??並é??æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "The item in the calendar is not valid"
 msgstr "è¡?äº?æ??中ç??é ?ç?®æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1641
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1778
 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:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1683
 msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??該å°?æ­¤æª?æ¡?å?²å­?å¾?å?¯å?¥å?¶ä¸­ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2456
 msgid "This meeting recurs"
 msgstr "é??å??æ??è­°ç??循ç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2459
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??循ç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2462
 msgid "This memo recurs"
 msgstr "é??å??å??å¿?é??ç??循ç?°è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2696
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2704
-#: ../plugins/itip-formatter/itip-formatter.c:2737
+#: ../plugins/itip-formatter/itip-formatter.c:2706
+#: ../plugins/itip-formatter/itip-formatter.c:2739
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2721
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é?¸æ??è¦?æ??å°?æ??è­°è¡?çª?ç??è¡?äº?æ??"
 
@@ -17076,7 +17058,7 @@ msgstr "�天 %H:%M:%S"
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
-msgstr "�天%p %l:%M:%S"
+msgstr "�天 %p %l:%M:%S"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
@@ -17094,13 +17076,13 @@ msgstr "æ??天 %H:%M:%S"
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
-msgstr "æ??天%p %-l:%M"
+msgstr "æ??天 %p %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "æ??天%p %-l:%M:%S"
+msgstr "æ??天 %p %l:%M:%S"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:256
@@ -17124,73 +17106,73 @@ msgstr "%A %H:%M:%S"
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
-msgstr "%a %p %l:%M"
+msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
-msgstr "%A%p %-l:%M:%S"
+msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
-msgstr "%-m æ?? %d æ?¥ (%A)"
+msgstr "%B %e (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
-msgstr "%-m æ?? %d æ?¥ (%A) %H:%M"
+msgstr "%B %e (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%-m æ?? %d æ?¥ (%A) %H:%M:%S"
+msgstr "%B %e (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
-msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M"
+msgstr "%B %e (%A) %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M:%S"
+msgstr "%B %e (%A) %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
+msgstr "%Y å¹´ %B %e (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M"
+msgstr "%Y å¹´ %B %e (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M:%S"
+msgstr "%Y å¹´ %B %e (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M"
+msgstr "%Y å¹´ %B %e (%A) %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M:%S"
+msgstr "%Y å¹´ %B %e (%A) %p %l:%M:%S"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #: ../plugins/itip-formatter/itip-view.c:455
@@ -18041,35 +18023,35 @@ msgstr "å??好ç´?æ??å­?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "以ç´?æ??å­?æ?¹å¼?檢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:208
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??顯示ä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:208
 msgid "Let Evolution choose the best part to show."
 msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:209
 msgid "Show plain text if present"
 msgstr "å¦?æ??ä¾?ç´?æ??å­?å??顯示å®?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:209
 msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
 msgstr "å¦?æ??æ??ç´?æ??å­?ç??é?¨å??就顯示å®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å­?顯示"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid "Always show plain text part and make attachments from other parts, if requested."
 msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å­?ç??é?¨å??並å¾?å?¶ä»?ç??é?¨å??製ä½?é??件ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:257
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "å°?æ??å?¶ç?? HTML é?¨å??顯示ç?ºé??件(_U)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:277
 msgid "HTML _Mode"
 msgstr "HT_ML 模�"
 
@@ -18490,15 +18472,15 @@ msgstr "使ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå­?/æ?¸å?¼çµ?æ¸?
 msgid "Drafts based template plugin"
 msgstr "å?ºæ?¼è??稿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
 
-#: ../plugins/templates/templates.c:621
+#: ../plugins/templates/templates.c:627
 msgid "No Title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:715
+#: ../plugins/templates/templates.c:722
 msgid "Save as _Template"
 msgstr "�����(_T)"
 
-#: ../plugins/templates/templates.c:717
+#: ../plugins/templates/templates.c:724
 msgid "Save as Template"
 msgstr "�����"
 
@@ -18699,7 +18681,7 @@ msgid "Skip development warning dialog"
 msgstr "忽ç?¥é??ç?¼è­¦å??å°?話ç??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:35
-#: ../shell/main.c:337
+#: ../shell/main.c:341
 msgid "Start in offline mode"
 msgstr "以é?¢ç·?模å¼?å??å??"
 
@@ -19176,7 +19158,7 @@ msgid "Preparing to quit..."
 msgstr "æº?å??çµ?æ??..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:186
+#: ../shell/main.c:190
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19211,7 +19193,7 @@ msgstr ""
 "æ??å??å¸?æ??你享å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??ä½ æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19219,57 +19201,57 @@ msgstr ""
 "��\n"
 "Evolution ����\n"
 
-#: ../shell/main.c:217
+#: ../shell/main.c:221
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:337
 msgid "Start Evolution activating the specified component"
 msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??件"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:339
 msgid "Apply the given geometry to the main window"
 msgstr "å°?æ??å®?ç??尺寸å¥?ç?¨å?°ä¸»è¦?çª?"
 
 # zh_HK: msgstr "以ç·?ä¸?模å¼?å??å??"
-#: ../shell/main.c:339
+#: ../shell/main.c:343
 msgid "Start in online mode"
 msgstr "以ç·?ä¸?模å¼?å??å??"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:345
 msgid "Start in \"express\" mode"
 msgstr "以ã??å¿«é??ã??模å¼?å??å??"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:348
 msgid "Forcibly shut down Evolution"
 msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:347
+#: ../shell/main.c:351
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??件ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:349
+#: ../shell/main.c:353
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:351
+#: ../shell/main.c:355
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??è?¯çµ¡äººå??å·¥ä½?ç??é ?覽çª?æ ¼ã??"
 
-#: ../shell/main.c:355
+#: ../shell/main.c:359
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??稱å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../shell/main.c:357
+#: ../shell/main.c:361
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?中ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:501
-#: ../shell/main.c:509
+#: ../shell/main.c:505
+#: ../shell/main.c:513
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20474,31 +20456,26 @@ msgid "Delivery Options"
 msgstr "é??é??é?¸é ?"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#| msgid "_Until"
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "ç?´å?°(_U)"
 
 #: ../widgets/misc/e-send-options.ui.h:7
-#| msgid "_After"
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "æ??æ?¼(_A)"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-#| msgid "days"
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "天"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-#| msgid "Wi_thin"
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "��(_T)"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#| msgid "days"
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "天"
@@ -20585,13 +20562,12 @@ msgstr "ç?¶é??å??æ??(_W):"
 
 #. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-#| msgid "None"
 msgctxt "send-options"
 msgid "None"
 msgstr "æ²?æ??"
 
 #: ../widgets/misc/e-signature-editor.c:136
-#: ../widgets/misc/e-signature-editor.c:524
+#: ../widgets/misc/e-signature-editor.c:555
 #: ../widgets/misc/e-signature-manager.c:353
 #: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
@@ -20601,11 +20577,11 @@ msgstr "æ?ªå?½å??ç??"
 msgid "_Save and Close"
 msgstr "å?²å­?å¾?é??é??(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:391
+#: ../widgets/misc/e-signature-editor.c:422
 msgid "Edit Signature"
 msgstr "編輯簽å??æª?"
 
-#: ../widgets/misc/e-signature-editor.c:406
+#: ../widgets/misc/e-signature-editor.c:437
 msgid "_Signature Name:"
 msgstr "ç°½å??æª?å??稱(_S):"
 
@@ -20937,11 +20913,6 @@ msgstr "��(_C)"
 msgid "popup a child"
 msgstr "�����"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "é??å§?編輯此å?²å­?æ ¼"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -20977,3 +20948,11 @@ msgstr "å?¨é?¨é?¸å??"
 msgid "Input Methods"
 msgstr "輸��"
 
+#~ msgid "%d day ago"
+
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d 天å??"
+#~ msgstr[1] "%d 天å??"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "é??å§?編輯此å?²å­?æ ¼"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c952115..443660d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.32.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2010-09-20 15:12+0000\n"
-"PO-Revision-Date: 2010-09-21 19:07+0800\n"
+"POT-Creation-Date: 2011-01-18 14:23+0000\n"
+"PO-Revision-Date: 2011-01-20 20:20+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@ msgstr "����(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2020
+#: ../calendar/gui/e-calendar-view.c:2024
 msgid "Anniversary"
 msgstr "�年�念�"
 
@@ -201,9 +201,9 @@ 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:2019
+#: ../calendar/gui/e-calendar-view.c:2023
 #: ../capplet/anjal-settings-main.c:123
-#: ../shell/main.c:128
+#: ../shell/main.c:132
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -300,7 +300,7 @@ msgstr "å??註"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1729
 msgid "Other"
 msgstr "��"
 
@@ -474,7 +474,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "æ?°å¢?é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
@@ -1146,7 +1146,7 @@ msgstr "��交�"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:491
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1190,15 +1190,15 @@ msgstr "網�"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../capplet/settings/mail-capplet-shell.c:356
 #: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/addressbook/e-book-shell-migrate.c:143
 #: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:156
+#: ../modules/calendar/e-cal-shell-migrate.c:157
 #: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-memo-shell-migrate.c:115
 #: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:121
+#: ../modules/calendar/e-task-shell-migrate.c:124
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "å??人"
@@ -1225,24 +1225,24 @@ msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
 msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??å?¯è?½è¡¨ç¤ºæ­¤ç?®é??æ??å??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?以ä¾?é?¢ç·?使ç?¨ã??è«?æ?¼ä¸?ç·?模å¼?å??次è®?å??ç?®é??æ??å??以ä¸?è¼?å®?ç??å?§å®¹ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??è«?檢æ?¥è·¯å¾? %s æ?¯å?¦å­?å?¨è??ä¸?æ¬?é??已設å®?å?¯ä»¥å­?å??å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr "æ­¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è­¯é?²å?»ã??å¦?æ??æ?¨æ?³å?¨ Evolution 使ç?¨ LDAPï¼?å¿?é ?å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?件ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??表示æ?¨è¼¸å?¥é?¯èª¤ç??URIï¼?æ??伺æ??å?¨ç?¡æ³?é?£ç·?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "詳細ç??é?¯èª¤è¨?æ?¯ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1254,7 +1254,7 @@ msgstr ""
 "è«?使ç?¨æ?´å? æ??確ç??æ?¥è©¢æ??æ?¯æ??é«?æ­¤ç?®é??æ??å??ç??ç?®é??\n"
 "伺æ??å?¨å??好設å®?中ç??çµ?æ??é??å?¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1267,49 +1267,49 @@ msgstr ""
 "æ??é??ä¸?é??ã??"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?ç?¡æ³?解æ??é??次ç??æ?¥è©¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?æ??çµ?å?·è¡?é??次ç??æ?¥è©¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "é??次ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
 msgstr "�製�絡人�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
 msgstr "�製�絡人�"
 
@@ -1800,19 +1800,19 @@ msgstr "å?³é??(_S)"
 msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
@@ -2516,7 +2516,7 @@ msgstr "歸�"
 
 #: ../calendar/gui/caltypes.xml.h:7
 #: ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525
+#: ../calendar/gui/e-cal-model.c:535
 #: ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
@@ -2571,7 +2571,7 @@ msgstr "æ??è­°å?¬é??人"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523
+#: ../calendar/gui/e-cal-model.c:533
 #: ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
@@ -2579,8 +2579,8 @@ msgstr "�人"
 
 #: ../calendar/gui/caltypes.xml.h:15
 #: ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514
-#: ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-cal-model.c:524
+#: ../calendar/gui/e-cal-model.c:531
 #: ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
@@ -2666,7 +2666,7 @@ msgid "Add Alarm"
 msgstr "��鬧�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:362
 msgid "Alarm"
 msgstr "鬧�"
 
@@ -2872,8 +2872,8 @@ msgstr "æ??æ??äº?"
 #: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:200
 #: ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2678
+#: ../modules/addressbook/addressbook-config.c:1012
+#: ../plugins/itip-formatter/itip-formatter.c:2680
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -3589,17 +3589,17 @@ msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ­¤å?°æ??è??ç??空é??/å¿?ç¢?è³?è¨?"
 
 #: ../calendar/gui/dialogs/event-editor.c:319
-#: ../calendar/gui/print.c:2610
+#: ../calendar/gui/print.c:2674
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-editor.c:387
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
+#: ../calendar/gui/dialogs/event-editor.c:580
 msgid "Print this event"
 msgstr "å??å?°é??å??äº?件"
 
@@ -3766,41 +3766,36 @@ msgstr "æ??å?»(_T):"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#| msgid "1 day before appointment"
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "ç´?æ??å?? 1 天"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#| msgid "1 hour before appointment"
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "ç´?æ??å?? 1 å°?æ??"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-#| msgid "15 minutes before appointment"
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "ç´?æ??å?? 15 å??é??"
 
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#| msgid "for"
 msgctxt "eventpage"
 msgid "for"
 msgstr "å?±"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#| msgid "until"
 msgctxt "eventpage"
 msgid "until"
 msgstr "ç?´å?°"
 
 #: ../calendar/gui/dialogs/memo-editor.c:109
-#: ../calendar/gui/print.c:2614
+#: ../calendar/gui/print.c:2678
 msgid "Memo"
 msgstr "å??å¿?é??"
 
@@ -3828,9 +3823,9 @@ msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 #: ../calendar/gui/dialogs/memo-page.c:1078
 #: ../em-format/em-format-quote.c:270
 #: ../em-format/em-format.c:1040
-#: ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348
-#: ../mail/em-format-html.c:2372
+#: ../mail/em-format-html.c:2299
+#: ../mail/em-format-html.c:2358
+#: ../mail/em-format-html.c:2382
 #: ../mail/message-list.etspec.h:20
 #: ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
@@ -4046,49 +4041,42 @@ msgstr "é??å??ç´?æ??ç??循ç?°è¦?å??ç?º(_U)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-#| msgid "day(s)"
 msgctxt "recurrpage"
 msgid "day(s)"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-#| msgid "for"
 msgctxt "recurrpage"
 msgid "for"
 msgstr "å?±"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-#| msgid "forever"
 msgctxt "recurrpage"
 msgid "forever"
 msgstr "永�"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-#| msgid "month(s)"
 msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "æ??"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-#| msgid "until"
 msgctxt "recurrpage"
 msgid "until"
 msgstr "ç?´å?°"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-#| msgid "week(s)"
 msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "é?±"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#| msgid "year(s)"
 msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "å¹´"
@@ -4118,7 +4106,7 @@ msgstr "網�"
 #: ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230
 #: ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2761
 #: ../mail/em-sync-stream.c:151
 #: ../mail/em-sync-stream.c:178
 #: ../mail/em-sync-stream.c:199
@@ -4137,7 +4125,7 @@ msgstr "å·²å??æ¶?"
 #: ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228
 #: ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2694
+#: ../calendar/gui/print.c:2758
 #: ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
@@ -4162,7 +4150,7 @@ msgstr "é«?"
 #: ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226
 #: ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2755
 msgid "In Progress"
 msgstr "��中"
 
@@ -4179,7 +4167,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:1269
+#: ../calendar/gui/e-cal-model.c:1279
 #: ../calendar/gui/e-task-table.c:512
 #: ../calendar/gui/tasktypes.xml.h:17
 #: ../mail/message-list.c:1182
@@ -4195,7 +4183,7 @@ msgstr "��"
 #: ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224
 #: ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2688
+#: ../calendar/gui/print.c:2752
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
@@ -4212,7 +4200,7 @@ msgstr "ç??æ??(_U):"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-calendar-view.c:1777
 #: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21
@@ -4256,7 +4244,7 @@ msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
 #: ../calendar/gui/dialogs/task-editor.c:328
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2676
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "工�"
@@ -4483,7 +4471,7 @@ msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1065
-#: ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:179
@@ -4492,14 +4480,14 @@ msgid "Yes"
 msgstr "æ?¯"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1065
-#: ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "å?¦"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527
+#: ../calendar/gui/e-cal-model.c:537
 #: ../calendar/gui/e-itip-control.c:1210
 #: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
@@ -4507,25 +4495,25 @@ msgstr "å?¦"
 #: ../calendar/gui/e-meeting-store.c:127
 #: ../calendar/gui/e-meeting-store.c:162
 #: ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989
+#: ../calendar/gui/print.c:1013
+#: ../calendar/gui/print.c:1030
 #: ../e-util/e-charset.c:52
 #: ../mail/em-utils.c:967
 #: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2345
+#: ../plugins/itip-formatter/itip-formatter.c:2347
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1281
 msgid "Recurring"
 msgstr "循�模�"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1283
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2198
 #, c-format
 msgid "Opening %s"
 msgstr "æ­£å?¨é??å?? %s"
@@ -4569,53 +4557,53 @@ msgstr "é??å§?æ?¥æ??"
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "è¤?製é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "��貼簿貼��件"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?件"
 
-#: ../calendar/gui/e-calendar-view.c:444
+#: ../calendar/gui/e-calendar-view.c:448
 #: ../calendar/gui/e-memo-table.c:188
 #: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:638
+#: ../calendar/gui/e-calendar-view.c:642
 #: ../calendar/gui/e-memo-table.c:847
 #: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "���件"
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1724
 #: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189
 #: ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1725
 #: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191
 #: ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1726
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193
 #: ../calendar/gui/e-meeting-store.c:216
@@ -4623,21 +4611,21 @@ msgstr "å©?æ??"
 msgid "Tentative"
 msgstr "��"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1727
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195
 #: ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../plugins/itip-formatter/itip-formatter.c:2344
 msgid "Delegated"
 msgstr "已�派"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1728
 msgid "Needs action"
 msgstr "é??è¦?å??ä½?"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1868
+#: ../calendar/gui/e-calendar-view.c:1872
 #: ../calendar/gui/e-memo-table.c:530
 #: ../calendar/gui/e-task-table.c:745
 #, c-format
@@ -4646,7 +4634,7 @@ 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:1872
+#: ../calendar/gui/e-calendar-view.c:1876
 #: ../calendar/gui/e-memo-table.c:535
 #: ../calendar/gui/e-task-table.c:748
 #, c-format
@@ -4654,14 +4642,14 @@ msgid "Organizer: %s"
 msgstr "æ??è­°å?¬é??人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1888
-#: ../calendar/gui/print.c:2646
+#: ../calendar/gui/e-calendar-view.c:1892
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "Location: %s"
 msgstr "�置�%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1919
+#: ../calendar/gui/e-calendar-view.c:1923
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
@@ -4705,11 +4693,11 @@ msgstr "顯示第äº?æ??å??"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:897
-#: ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-day-view.c:1892
 #: ../calendar/gui/e-week-view-main-item.c:218
-#: ../calendar/gui/print.c:1744
+#: ../calendar/gui/print.c:1785
 msgid "%A %d %B"
-msgstr "%A %d %B"
+msgstr "%B %d %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -4718,12 +4706,12 @@ msgstr "%A %d %B"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:901
-#: ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-day-view.c:1909
 #: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
-msgstr "%-m æ?? %-d æ?¥ (%a)"
+msgstr "%b %d æ?¥ (%a)"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
@@ -4731,29 +4719,29 @@ msgstr "%-m æ?? %-d æ?¥ (%a)"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:905
-#: ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-day-view.c:1925
 #: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
-msgstr "%-m æ?? %-d æ?¥"
+msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1077
-#: ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1089
+#: ../calendar/gui/e-week-view.c:767
+#: ../calendar/gui/print.c:860
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080
-#: ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1092
+#: ../calendar/gui/e-week-view.c:770
+#: ../calendar/gui/print.c:862
 msgid "pm"
 msgstr "ä¸?å??"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2646
+#: ../calendar/gui/e-day-view.c:2676
 #, c-format
 msgid "Week %d"
 msgstr "第 %d �"
@@ -4871,13 +4859,13 @@ msgstr " è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2320
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgctxt "cal-itip"
 msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
@@ -5092,7 +5080,7 @@ msgid "Attendee status updated\n"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
 #: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1423
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å­?å?¨"
 
@@ -5201,14 +5189,14 @@ msgstr "��"
 #: ../calendar/gui/e-meeting-store.c:102
 #: ../calendar/gui/e-meeting-store.c:119
 #: ../calendar/gui/e-meeting-store.c:850
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/print.c:1009
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:104
 #: ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:1010
 #: ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "群�"
@@ -5216,21 +5204,21 @@ msgstr "群�"
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:106
 #: ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/print.c:1011
 msgid "Resource"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:108
 #: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/print.c:1012
 msgid "Room"
 msgstr "æ??議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:137
 #: ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1026
 msgid "Chair"
 msgstr "主席"
 
@@ -5238,21 +5226,21 @@ msgstr "主席"
 #: ../calendar/gui/e-meeting-store.c:139
 #: ../calendar/gui/e-meeting-store.c:156
 #: ../calendar/gui/e-meeting-store.c:853
-#: ../calendar/gui/print.c:986
+#: ../calendar/gui/print.c:1027
 msgid "Required Participant"
 msgstr "å?ºå¸­è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:141
 #: ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1028
 msgid "Optional Participant"
 msgstr "å??席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:143
 #: ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:1029
 msgid "Non-Participant"
 msgstr "缺席è??"
 
@@ -5278,7 +5266,7 @@ msgstr "��中"
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
 #: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
+msgstr "%Y å¹´ %B %d (%A)"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
@@ -5440,13 +5428,13 @@ msgid "%d%%"
 msgstr "%d%%"
 
 #: ../calendar/gui/e-task-table.c:631
-#: ../calendar/gui/print.c:2072
+#: ../calendar/gui/print.c:2113
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
+#: ../modules/calendar/e-task-shell-view.c:440
 #: ../plugins/caldav/caldav-browse-server.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
@@ -5483,7 +5471,7 @@ msgstr "é?¸æ??ä¸?å??æ??å??"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:235
-#: ../calendar/gui/print.c:1725
+#: ../calendar/gui/print.c:1766
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5589,7 +5577,7 @@ msgstr "Gnome è¡?äº?æ??"
 #: ../calendar/gui/ea-gnome-calendar.c:199
 #: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
-msgstr "%Y/%m/%d (%a)"
+msgstr "%Y å¹´ %b %d (%A)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
@@ -5598,7 +5586,7 @@ msgstr "%Y/%m/%d (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1023
 #: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
+msgstr "%Y å¹´ %b %d (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:228
 #: ../calendar/gui/ea-gnome-calendar.c:234
@@ -5609,7 +5597,7 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1061
 #: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
+msgstr "%Y å¹´ %b %d"
 
 #: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
@@ -5637,7 +5625,7 @@ msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??檢è¦?"
 msgid "calendar view for one or more weeks"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/gnome-cal.c:2311
+#: ../calendar/gui/gnome-cal.c:2310
 msgid "Purging"
 msgstr "��"
 
@@ -5825,225 +5813,225 @@ msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?é?¯èª¤ç?ºï¼?"
 msgid "You must be an attendee of the event."
 msgstr "æ?¨å¿?é ?æ?¯æ­¤äº?件ç??å?°æ??è??ã??"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:522
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Mo"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Tu"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "We"
 msgstr "�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Fr"
 msgstr "�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Sa"
 msgstr "å?­"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2513
 msgid " to "
 msgstr " å?° "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:2457
+#: ../calendar/gui/print.c:2521
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2461
+#: ../calendar/gui/print.c:2525
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/print.c:2533
 msgid " (Due "
 msgstr "(æ??é??)"
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2538
 msgid "Due "
 msgstr "æ??é?? "
 
-#: ../calendar/gui/print.c:2637
+#: ../calendar/gui/print.c:2701
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2661
+#: ../calendar/gui/print.c:2725
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2704
+#: ../calendar/gui/print.c:2768
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2719
+#: ../calendar/gui/print.c:2783
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2737
+#: ../calendar/gui/print.c:2801
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2748
+#: ../calendar/gui/print.c:2812
 #, c-format
 msgid "URL: %s"
 msgstr "網å??: %s"
 
-#: ../calendar/gui/print.c:2761
+#: ../calendar/gui/print.c:2825
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2772
+#: ../calendar/gui/print.c:2836
 msgid "Contacts: "
 msgstr "�絡人: "
 
@@ -6072,7 +6060,7 @@ msgstr "ç´?æ??å??æ??è­°"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1835
+#: ../plugins/itip-formatter/itip-formatter.c:1837
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
@@ -8030,15 +8018,15 @@ msgid "Cannot encrypt outgoing message: No encryption certificate set for this a
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??設å®?å? å¯?æ??è­?(此帳è??)"
 
 #: ../composer/e-msg-composer.c:1466
-#: ../composer/e-msg-composer.c:1811
+#: ../composer/e-msg-composer.c:1809
 msgid "Compose Message"
 msgstr "編輯�件"
 
-#: ../composer/e-msg-composer.c:3477
+#: ../composer/e-msg-composer.c:3475
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å­?ç??é?µä»¶å?§æ??ã??"
 
-#: ../composer/e-msg-composer.c:4085
+#: ../composer/e-msg-composer.c:4083
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
@@ -8262,8 +8250,8 @@ msgid "Time to check things over before we try and connect to the server and fet
 msgstr "å?¨æ??å??å??試並é?£ç·?å?°ä¼ºæ??å?¨å??å??é?µä»¶å??檢æ?¥äº?é ?ç??æ??é??ã??"
 
 #: ../capplet/settings/mail-account-view.c:614
-#: ../mail/em-account-editor.c:2101
-#: ../mail/em-account-editor.c:2222
+#: ../mail/em-account-editor.c:2107
+#: ../mail/em-account-editor.c:2228
 #: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "身å??"
@@ -8316,7 +8304,7 @@ msgid "Back - Receiving options"
 msgstr "��步 - 正�����"
 
 #: ../capplet/settings/mail-account-view.c:619
-#: ../mail/em-account-editor.c:2988
+#: ../mail/em-account-editor.c:3003
 #: ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "�設�"
@@ -8387,9 +8375,9 @@ msgid "Evolution account assistant"
 msgstr "Evolution 帳è??å?©ç??"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342
+#: ../capplet/settings/mail-capplet-shell.c:348
 #: ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227
+#: ../mail/e-mail-store.c:230
 #: ../mail/em-folder-tree-model.c:148
 #: ../mail/em-folder-tree-model.c:151
 #: ../mail/em-folder-tree-model.c:154
@@ -8399,13 +8387,13 @@ msgstr "Evolution 帳è??å?©ç??"
 #: ../mail/mail-vfolder.c:207
 #: ../mail/message-list.c:1666
 #: ../modules/addressbook/e-book-shell-backend.c:96
-#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/addressbook/e-book-shell-migrate.c:135
 #: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:146
+#: ../modules/calendar/e-cal-shell-migrate.c:147
 #: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:105
 #: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:114
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
@@ -8435,7 +8423,7 @@ msgid "Evolution Alarm Notify"
 msgstr "Evolution 鬧é?´é??ç?¥"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../mail/e-mail-browser.c:845
+#: ../mail/e-mail-browser.c:847
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8590,38 +8578,30 @@ msgid "Today"
 msgstr "�天"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205
+#: ../e-util/e-datetime-format.c:207
 #: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??天"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:209
 msgid "Yesterday"
 msgstr "�天"
 
 #. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:211
+#: ../e-util/e-datetime-format.c:213
 #, c-format
 msgid "%d day from now"
 msgid_plural "%d days from now"
 msgstr[0] "���起 %d 天"
 msgstr[1] "���起 %d 天"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:214
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天å??"
-msgstr[1] "%d 天å??"
-
-#: ../e-util/e-datetime-format.c:289
-#: ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:290
+#: ../e-util/e-datetime-format.c:300
+#: ../e-util/e-datetime-format.c:309
 msgid "Use locale default"
 msgstr "使ç?¨å?°å??設å®?é ?設å?¼"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:503
 msgid "Format:"
 msgstr "格��"
 
@@ -8779,23 +8759,23 @@ msgstr "å??è¦?"
 
 #: ../em-format/em-format-quote.c:270
 #: ../em-format/em-format.c:1041
-#: ../mail/em-format-html.c:2290
-#: ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375
+#: ../mail/em-format-html.c:2300
+#: ../mail/em-format-html.c:2362
+#: ../mail/em-format-html.c:2385
 #: ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "��"
 
 #: ../em-format/em-format-quote.c:270
 #: ../em-format/em-format.c:1042
-#: ../mail/em-format-html.c:2291
-#: ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378
+#: ../mail/em-format-html.c:2301
+#: ../mail/em-format-html.c:2366
+#: ../mail/em-format-html.c:2388
 #: ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "�件��"
 
-#: ../em-format/em-format-quote.c:410
+#: ../em-format/em-format-quote.c:414
 #: ../em-format/em-format.c:1043
 #: ../mail/e-mail-tag-editor.c:328
 #: ../mail/em-filter-i18n.h:74
@@ -8807,13 +8787,13 @@ msgid "Subject"
 msgstr "主�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421
-#: ../mail/em-format-html.c:2472
+#: ../em-format/em-format-quote.c:425
+#: ../mail/em-format-html.c:2482
 #: ../modules/mail/em-mailer-prefs.c:1120
 msgid "Mailer"
 msgstr "å¯?件è??"
 
-#: ../em-format/em-format-quote.c:500
+#: ../em-format/em-format-quote.c:504
 #: ../mail/em-composer-utils.c:1296
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
@@ -8837,52 +8817,53 @@ msgstr "æ?°è??群çµ?"
 msgid "Face"
 msgstr "��"
 
-#: ../em-format/em-format.c:1431
+#: ../em-format/em-format.c:1433
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??件"
 
-#: ../em-format/em-format.c:1503
+#: ../em-format/em-format.c:1522
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1662
-#: ../em-format/em-format.c:1846
+#: ../em-format/em-format.c:1681
+#: ../em-format/em-format.c:1866
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?解æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../em-format/em-format.c:1672
+#: ../em-format/em-format.c:1691
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../em-format/em-format.c:1688
+#: ../em-format/em-format.c:1708
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../em-format/em-format.c:1689
+#: ../em-format/em-format.c:1709
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1871
+#: ../em-format/em-format.c:1891
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??ç°½å??æ ¼å¼?"
 
-#: ../em-format/em-format.c:1881
-#: ../em-format/em-format.c:2041
+#: ../em-format/em-format.c:1901
+#: ../em-format/em-format.c:2061
 msgid "Error verifying signature"
 msgstr "檢é©?ç°½å??ç?¼ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1882
-#: ../em-format/em-format.c:2029
-#: ../em-format/em-format.c:2042
+#: ../em-format/em-format.c:1902
+#: ../em-format/em-format.c:2049
+#: ../em-format/em-format.c:2062
 msgid "Unknown error verifying signature"
 msgstr "檢é©?ç°½å??ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../em-format/em-format.c:2129
+#: ../em-format/em-format.c:2149
 msgid "Could not parse PGP message: "
 msgstr "ç?¡æ³?解æ?? PGP é?µä»¶ï¼?"
 
-#: ../em-format/em-format.c:2135
+#: ../em-format/em-format.c:2155
+#: ../mail/mail-ops.c:614
 #: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254
 #: ../plugins/face/face.c:169
@@ -8890,49 +8871,51 @@ msgstr "ç?¡æ³?解æ?? PGP é?µä»¶ï¼?"
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../filter/e-filter-datespec.c:74
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 ��"
 msgstr[1] "%d ��"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 å??é??å¾?"
 msgstr[1] "%d å??é??å¾?"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 å°?æ??å¾?"
 msgstr[1] "%d å°?æ??å¾?"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -8953,57 +8936,57 @@ msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 ��"
 msgstr[1] "%d ��"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 å??æ??å¾?"
 msgstr[1] "%d å??æ??å¾?"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:83
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 å¹´å¾?"
 msgstr[1] "%d å¹´å¾?"
 
-#: ../filter/e-filter-datespec.c:122
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:125
 #: ../filter/e-filter-datespec.c:136
 #: ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "��"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:132
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/e-filter-datespec.c:275
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
@@ -9199,7 +9182,7 @@ msgstr "å¹´"
 
 #: ../mail/e-mail-attachment-bar.c:91
 #: ../mail/e-mail-attachment-bar.c:96
-#: ../mail/em-format-html-display.c:1024
+#: ../mail/em-format-html-display.c:1027
 #: ../mail/mail-config.ui.h:15
 #: ../mail/message-list.etspec.h:1
 #: ../widgets/misc/e-attachment-paned.c:129
@@ -9219,23 +9202,23 @@ msgstr "å??示檢è¦?"
 msgid "List View"
 msgstr "��檢�"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:267
 msgid "(No Subject)"
 msgstr "(æ²?æ??主æ?¨)"
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:67
 msgid "_Add to Address Book..."
 msgstr "å? å?¥å?°é??è¨?é??(_A)..."
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:74
 msgid "_To This Address"
 msgstr "å?°é??å??ä½?å??(_T)"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:81
 msgid "_From This Address"
 msgstr "å¾?é??å??ä½?å??(_F)"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:90
 msgid "Create Search _Folder"
 msgstr "建ç«?æ??å°?è³?æ??夾(_F)"
 
@@ -9299,29 +9282,29 @@ msgstr "å??稱"
 
 #: ../mail/e-mail-local.c:37
 #: ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696
+#: ../mail/em-folder-tree-model.c:697
 #: ../mail/em-folder-tree.c:2840
 #: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "�件�"
 
 #: ../mail/e-mail-local.c:38
-#: ../mail/em-folder-tree-model.c:688
+#: ../mail/em-folder-tree-model.c:689
 msgid "Drafts"
 msgstr "è??稿"
 
 #: ../mail/e-mail-local.c:39
-#: ../mail/em-folder-tree-model.c:700
+#: ../mail/em-folder-tree-model.c:701
 msgid "Outbox"
 msgstr "�件�"
 
 #: ../mail/e-mail-local.c:40
-#: ../mail/em-folder-tree-model.c:702
+#: ../mail/em-folder-tree-model.c:703
 msgid "Sent"
 msgstr "å·²å?³é??"
 
 #: ../mail/e-mail-local.c:41
-#: ../mail/em-folder-tree-model.c:691
+#: ../mail/em-folder-tree-model.c:692
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:578
 msgid "Templates"
@@ -9948,14 +9931,14 @@ msgid "Unable to retrieve message"
 msgstr "�����件"
 
 #: ../mail/e-mail-reader.c:2329
-#: ../mail/mail-ops.c:1891
+#: ../mail/mail-ops.c:1896
 #, 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:2893
+#: ../mail/e-mail-reader.c:2913
 #: ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
@@ -9964,47 +9947,47 @@ msgstr "æ­£å?¨å??å??é?µä»¶ã??%sã??"
 msgid "Default"
 msgstr "�設�"
 
-#: ../mail/e-mail-reader.c:3041
+#: ../mail/e-mail-reader.c:3061
 #: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "��(_F)"
 
-#: ../mail/e-mail-reader.c:3042
+#: ../mail/e-mail-reader.c:3062
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?給æ??人"
 
-#: ../mail/e-mail-reader.c:3061
+#: ../mail/e-mail-reader.c:3081
 msgid "Group Reply"
 msgstr "群çµ?å??è¦?"
 
-#: ../mail/e-mail-reader.c:3062
+#: ../mail/e-mail-reader.c:3082
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "å??è¦?給é??ä¿¡è«?å£?ï¼?æ??æ?¯çµ¦æ??æ??ç??æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:3107
+#: ../mail/e-mail-reader.c:3127
 #: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "��"
 
-#: ../mail/e-mail-reader.c:3140
+#: ../mail/e-mail-reader.c:3160
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3144
+#: ../mail/e-mail-reader.c:3164
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3154
+#: ../mail/e-mail-reader.c:3174
 #: ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "å??è¦?"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:3742
 #, c-format
 msgid "Folder '%s'"
 msgstr "è³?æ??夾ã??%sã??"
@@ -10015,7 +9998,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:512
+#: ../mail/em-account-editor.c:513
 #: ../mail/mail-config.ui.h:77
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
@@ -10024,7 +10007,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:516
+#: ../mail/em-account-editor.c:517
 #: ../mail/mail-config.ui.h:136
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
@@ -10033,18 +10016,18 @@ 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:520
+#: ../mail/em-account-editor.c:521
 #: ../mail/mail-config.ui.h:105
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ��"
 
-#: ../mail/em-account-editor.c:607
+#: ../mail/em-account-editor.c:608
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:614
+#: ../mail/em-account-editor.c:615
 #, c-format
 msgid ""
 "\n"
@@ -10058,36 +10041,36 @@ msgstr ""
 "並é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:901
+#: ../mail/em-account-editor.c:902
 #: ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:985
+#: ../mail/em-account-editor.c:986
 msgid "Never"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:986
+#: ../mail/em-account-editor.c:987
 msgid "Always"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:987
+#: ../mail/em-account-editor.c:988
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1723
+#: ../mail/em-account-editor.c:1726
 #: ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2104
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10097,34 +10080,34 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2108
 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:2104
-#: ../mail/em-account-editor.c:2261
+#: ../mail/em-account-editor.c:2110
+#: ../mail/em-account-editor.c:2267
 #: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "�����件"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2111
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨­å®?ä¸?å??帳è??ç??設å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2107
-#: ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2113
+#: ../mail/em-account-editor.c:2758
 msgid "Sending Email"
 msgstr "å?³é??é?»å­?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2114
 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:2110
+#: ../mail/em-account-editor.c:2116
 msgid "Account Management"
 msgstr "帳è??總管"
 
-#: ../mail/em-account-editor.c:2111
+#: ../mail/em-account-editor.c:2117
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10132,11 +10115,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??空é??輸å?¥æ??è¿°é??å??帳è??ç??å??稱ã??\n"
 "é??å??å??稱å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2115
+#: ../mail/em-account-editor.c:2121
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2116
+#: ../mail/em-account-editor.c:2122
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10150,67 +10133,67 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å­?設å®?ã??"
 
-#: ../mail/em-account-editor.c:2557
+#: ../mail/em-account-editor.c:2572
 msgid "Check for _new messages every"
 msgstr "è?ªå??檢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2565
+#: ../mail/em-account-editor.c:2580
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2841
+#: ../mail/em-account-editor.c:2856
 msgid "Please select a folder from the current account."
 msgstr "è«?é?¸æ??ç?®å??帳è??ç??è³?æ??夾ã??"
 
-#: ../mail/em-account-editor.c:3111
+#: ../mail/em-account-editor.c:3126
 #: ../mail/mail-config.ui.h:112
 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:3156
-#: ../mail/em-account-editor.c:3224
+#: ../mail/em-account-editor.c:3171
+#: ../mail/em-account-editor.c:3239
 msgid "Receiving Options"
 msgstr "����"
 
-#: ../mail/em-account-editor.c:3157
-#: ../mail/em-account-editor.c:3225
+#: ../mail/em-account-editor.c:3172
+#: ../mail/em-account-editor.c:3240
 msgid "Checking for New Messages"
 msgstr "檢���件"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1729
+#: ../mail/em-composer-utils.c:1735
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "æ?¨å¯?給 %s 主æ?¨ã??%sã?? (%s) ç??é?µä»¶å·²è¢«é?±è®?ã??"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1777
+#: ../mail/em-composer-utils.c:1783
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é??é??é??ç?¥ï¼?ã??%sã??"
 
-#: ../mail/em-composer-utils.c:2186
+#: ../mail/em-composer-utils.c:2192
 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:2233
+#: ../mail/em-composer-utils.c:2239
 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:2377
+#: ../mail/em-composer-utils.c:2383
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-composer-utils.c:2589
+#: ../mail/em-composer-utils.c:2595
 msgid "Posting destination"
 msgstr "張貼ç??ç?®ç??端"
 
-#: ../mail/em-composer-utils.c:2590
+#: ../mail/em-composer-utils.c:2596
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??夾ä¾?張貼é?µä»¶ã??"
 
@@ -10534,8 +10517,8 @@ msgstr "æ??å°?è³?æ??夾"
 msgid "UNMATCHED"
 msgstr "ä¸?符å??"
 
-#: ../mail/em-folder-tree-model.c:766
-#: ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:767
+#: ../mail/em-folder-tree-model.c:1114
 msgid "Loading..."
 msgstr "��中..."
 
@@ -10723,16 +10706,16 @@ msgstr "å?°æ??æ?¥:"
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:949
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:999
 msgid "View _Unformatted"
 msgstr "檢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:954
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1019
 msgid "O_pen With"
 msgstr "以...é??å??(_O)"
 
@@ -10755,42 +10738,42 @@ msgstr "æ ¼å¼?å??é?µä»¶..."
 msgid "Retrieving '%s'"
 msgstr "æ­£å?¨å??å??ã??%sã??"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1911
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1919
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:1949
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:1960
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??示"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:1962
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:1983
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:1994
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ä¸?æ??ç??å¤?é?¨æª?æ¡?æ??示 (ã??%sã??é¡?å??)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2647
+#: ../mail/em-format-html.c:2657
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "é??å°?é?µä»¶æ?¯ç?± %s 代表 %s å¯?å?º"
@@ -11720,7 +11703,7 @@ msgstr "輸å?¥ Elm è³?æ??"
 
 #: ../mail/importers/elm-importer.c:325
 #: ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:964
+#: ../modules/mail/e-mail-shell-view.c:1011
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
@@ -11792,7 +11775,7 @@ msgid "Importing Pine data"
 msgstr "輸å?¥ç®¡é??è³?æ??"
 
 #: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Address Book"
 msgstr "é??è¨?é??"
 
@@ -11901,7 +11884,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "å?¨æ??æ??è³?æ??夾å¥?ç?¨ç?¸å??ç??檢è¦?設å®?å?¼(_V)"
 
 #: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../modules/addressbook/addressbook-config.c:1020
 msgid "Authentication"
 msgstr "é©?è­?"
 
@@ -12639,7 +12622,7 @@ msgstr "��(_F):"
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ­¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:782
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -12652,13 +12635,13 @@ msgstr "é??濾é?¸æ??ç??é?µä»¶"
 msgid "Fetching Mail"
 msgstr "���件"
 
-#: ../mail/mail-ops.c:592
+#: ../mail/mail-ops.c:596
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??濾å?¨ï¼?%s"
 
-#: ../mail/mail-ops.c:608
-#: ../mail/mail-ops.c:635
+#: ../mail/mail-ops.c:612
+#: ../mail/mail-ops.c:640
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -12667,139 +12650,139 @@ msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
 "æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ã??"
 
-#: ../mail/mail-ops.c:654
+#: ../mail/mail-ops.c:659
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ï¼?%s"
 
-#: ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/mail-ops.c:779
+#: ../mail/mail-ops.c:871
 msgid "Sending message"
 msgstr "æ­£å?¨å?³é??é?µä»¶"
 
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:787
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ­£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:831
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??第 %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:828
+#: ../mail/mail-ops.c:833
 #: ../mail/mail-send-recv.c:783
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:830
+#: ../mail/mail-ops.c:835
 #: ../mail/mail-send-recv.c:785
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:938
+#: ../mail/mail-ops.c:943
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "å?²å­?é?µä»¶å?°è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1023
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "å°?é?µä»¶ç§»å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1023
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "å°?é?µä»¶è¤?製å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1132
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1276
+#: ../mail/mail-ops.c:1281
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "é??å??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1347
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "å??å¾?è³?æ??夾ã??%sã??ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1419
 #, c-format
 msgid "Opening store '%s'"
 msgstr "é??å??貯è??ã??%sã??"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移é?¤è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1614
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æ­£å?¨è²¯è??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1677
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?空å??å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1678
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1732
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "é??æ?°æ?´ç??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1772
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æ­£å?¨å?ªå?»è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1817
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?空ã??%sã??ç??å??æ?¶ç­?"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1818
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??夾"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2021
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "�� %d ��件"
 msgstr[1] "�� %d ��件"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2197
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "å?²å­?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 
-#: ../mail/mail-ops.c:2265
+#: ../mail/mail-ops.c:2270
 msgid "Saving attachment"
 msgstr "å?²å­?é??件"
 
-#: ../mail/mail-ops.c:2285
-#: ../mail/mail-ops.c:2295
+#: ../mail/mail-ops.c:2290
+#: ../mail/mail-ops.c:2300
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12808,26 +12791,26 @@ msgstr ""
 "��建�輸����%s�\n"
 " %s"
 
-#: ../mail/mail-ops.c:2310
+#: ../mail/mail-ops.c:2315
 msgid "Could not write data: "
 msgstr "ç?¡æ³?寫å?¥è³?æ??ï¼?"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2459
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "中æ?·è??ã??%sã??ç??é?£ç·?"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2459
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2555
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2636
+#: ../mail/mail-ops.c:2641
 msgid "Checking Service"
 msgstr "檢æ?¥æ??å??"
 
@@ -12857,35 +12840,35 @@ msgstr "正���..."
 msgid "Checking for new mail"
 msgstr "檢���件"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:228
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?輸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:230
 msgid "Enter Passphrase"
 msgstr "輸���"
 
-#: ../mail/mail-session.c:230
+#: ../mail/mail-session.c:233
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?輸å?¥ %s æ??é??ç??å¯?碼"
 
-#: ../mail/mail-session.c:232
+#: ../mail/mail-session.c:235
 msgid "Enter Password"
 msgstr "輸��碼"
 
-#: ../mail/mail-session.c:277
+#: ../mail/mail-session.c:283
 #, c-format
 msgid "User canceled operation."
 msgstr "使ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
-#: ../mail/mail-session.c:722
+#: ../mail/mail-session.c:728
 #, c-format
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-session.c:731
+#: ../mail/mail-session.c:737
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??帳è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
@@ -13556,15 +13539,15 @@ msgstr "�天 %p %l:%M"
 
 #: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
-msgstr "%A%p %-l:%M"
+msgstr "%a %p %l:%M"
 
 #: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
-msgstr "%mæ??%dæ?¥%p %l:%M"
+msgstr "%b %d %p %l:%M"
 
 #: ../mail/message-list.c:1833
 msgid "%b %d %Y"
-msgstr "%Y/%m/%d"
+msgstr "%Y %b %d"
 
 #: ../mail/message-list.c:2598
 msgid "Select all visible messages"
@@ -13658,49 +13641,49 @@ msgstr "é?¸å??æ­¤é?¸é ?表示ï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP 伺æ??å?¨ (
 msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
 msgstr "é?¸å??æ­¤é?¸é ?表示ï¼?æ?¨ç??伺æ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??表示æ?¨ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?æ?¨ç??å®?å?¨æ??æ¼?æ´?ã?? "
 
-#: ../modules/addressbook/addressbook-config.c:602
+#: ../modules/addressbook/addressbook-config.c:609
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?念æ?¥è¡?äº?æ??(_S)"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:645
 msgid "Copy _book content locally for offline operation"
 msgstr "è¤?製é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?業(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:746
+#: ../modules/addressbook/addressbook-config.c:753
 msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
 msgstr "é??æ?¯ LDAP 伺æ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??試é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?洽詢æ?¨ç??系統管ç??å?¡ï¼?ç?­è§£æ?¨æ??該æ??å®?ç??å? ã??"
 
-#: ../modules/addressbook/addressbook-config.c:820
+#: ../modules/addressbook/addressbook-config.c:827
 msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
 msgstr "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è­?æ?¨ç??æ?¹æ³?ã??注æ??è¦?設å®?æ­¤é ?è?³ã??é?»å­?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿å??å­?å??æ?¨ç?? LDAP 伺æ??å?¨ã??"
 
-#: ../modules/addressbook/addressbook-config.c:895
+#: ../modules/addressbook/addressbook-config.c:902
 msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 msgstr "æ??å°?ç¯?å??æ??å®?義æ?¨æ?³å¾?網路ç?®é??樹å¾?ä¸?延伸æ??å°?ç??深度ã??ã??subã??(å­?é ?)ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??oneã??(å?®ä¸?)ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??層ç´?ã??"
 
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../modules/addressbook/addressbook-config.c:1018
 msgid "Server Information"
 msgstr "伺æ??å?¨è³?è¨?"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1023
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "詳細è³?æ??"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1024
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ­£å?¨æ??å°?"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1026
 msgid "Downloading"
 msgstr "��中"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1232
 msgid "Address Book Properties"
 msgstr "é??è¨?é??å?§å®¹"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1234
 msgid "New Address Book"
 msgstr "æ?°é??è¨?é??"
 
@@ -13784,7 +13767,7 @@ msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??é?£çµ¡äººä½?å??(_S)"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:98
-#: ../modules/addressbook/e-book-shell-migrate.c:148
+#: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP 伺æ??å?¨"
 
@@ -13822,7 +13805,7 @@ msgstr "建ç«?æ?°é??è¨?é??"
 #: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
 #: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/calendar/e-cal-shell-migrate.c:58
 msgid "Contacts"
 msgstr "�絡人"
 
@@ -14214,11 +14197,11 @@ msgstr "���工�(_M)"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:181
+#: ../modules/calendar/e-cal-shell-migrate.c:182
 #: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-memo-shell-migrate.c:139
 #: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-task-shell-migrate.c:148
 msgid "On The Web"
 msgstr "�網��"
 
@@ -14228,7 +14211,7 @@ msgid "Weather"
 msgstr "天氣"
 
 #: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-migrate.c:61
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥"
 
@@ -14270,8 +14253,8 @@ msgstr "è¡?äº?æ??(_N)"
 msgid "Create a new calendar"
 msgstr "建ç«?æ?°è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../modules/calendar/e-cal-shell-backend.c:729
+#: ../plugins/itip-formatter/itip-formatter.c:2671
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
@@ -14971,11 +14954,11 @@ msgid_plural "%d tasks"
 msgstr[0] "%d �工�"
 msgstr[1] "%d �工�"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:354
 msgid "Delete Tasks"
 msgstr "��工�"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:356
 msgid "Delete Task"
 msgstr "��工�"
 
@@ -15027,7 +15010,7 @@ msgid "Network Preferences"
 msgstr "網路å??好設å®?"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:880
-#: ../modules/mail/e-mail-shell-view.c:883
+#: ../modules/mail/e-mail-shell-view.c:930
 msgid "_Disable Account"
 msgstr "å??ç?¨å¸³è??(_D)"
 
@@ -15352,11 +15335,11 @@ msgstr[1] "å?± %d å°?"
 msgid "All Account Search"
 msgstr "æ??æ??ç??帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:686
+#: ../modules/mail/e-mail-shell-view.c:733
 msgid "Account Search"
 msgstr "帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:881
+#: ../modules/mail/e-mail-shell-view.c:928
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??伺æ??å?¨(_L)"
 
@@ -15613,105 +15596,104 @@ msgstr "æ­£å?¨é??å?? Evolution ç??設å®?å?¼(_E)..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "å¾?æª?æ¡?庫é??å?? Evolution ç??è³?æ??è??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:77
+#: ../plugins/backup-restore/backup.c:80
 msgid "Backup Evolution directory"
 msgstr "å??份 Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../plugins/backup-restore/backup.c:82
 msgid "Restore Evolution directory"
 msgstr "é??å?? Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:84
 msgid "Check Evolution Backup"
 msgstr "檢æ?¥ Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../plugins/backup-restore/backup.c:86
 msgid "Restart Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:88
 msgid "With Graphical User Interface"
 msgstr "使ç?¨å??形使ç?¨è??ä»?é?¢"
 
-#: ../plugins/backup-restore/backup.c:203
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:290
+#: ../plugins/backup-restore/backup.c:400
 msgid "Shutting down Evolution"
 msgstr "æ­£å?¨é??é?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:210
+#: ../plugins/backup-restore/backup.c:297
 msgid "Backing Evolution accounts and settings"
 msgstr "å??份 Evolution ç??帳è??è??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:216
+#: ../plugins/backup-restore/backup.c:305
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æ­£å?¨å??份 Evolution è³?æ?? (é?µä»¶ã??é?£çµ¡äººã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??)"
 
-#: ../plugins/backup-restore/backup.c:227
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backup complete"
 msgstr "å??份å®?æ??"
 
-#: ../plugins/backup-restore/backup.c:232
-#: ../plugins/backup-restore/backup.c:253
-#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:323
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restarting Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:269
+#: ../plugins/backup-restore/backup.c:404
 msgid "Back up current Evolution data"
 msgstr "å??份ç?®å??ç?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:410
 msgid "Extracting files from backup"
 msgstr "å¾?å??份解é??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:467
 msgid "Loading Evolution settings"
 msgstr "æ­£å?¨è®?å?? Evolution ç??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:288
+#: ../plugins/backup-restore/backup.c:482
 msgid "Removing temporary backup files"
 msgstr "移é?¤æ?«å­?ç??å??份æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:295
+#: ../plugins/backup-restore/backup.c:492
 msgid "Ensuring local sources"
 msgstr "正�確���端��"
 
-#: ../plugins/backup-restore/backup.c:464
+#: ../plugins/backup-restore/backup.c:679
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ­£å??份è?³è³?æ??夾 %s"
 
-#: ../plugins/backup-restore/backup.c:469
+#: ../plugins/backup-restore/backup.c:684
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "å¾?è³?æ??夾é??å?? %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Backup"
 msgstr "Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:532
+#: ../plugins/backup-restore/backup.c:747
 msgid "Backing up Evolution Data"
 msgstr "å??份 Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:533
+#: ../plugins/backup-restore/backup.c:748
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??份æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:750
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:751
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:554
+#: ../plugins/backup-restore/backup.c:769
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??決æ?¼æ?¨ç??帳è??中è³?æ??ç??å¤?寡ã??"
 
@@ -16906,157 +16888,157 @@ msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸­æ?¾å?°é??é ?å·¥ä½?"
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸­æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:875
 msgid "Opening the calendar. Please wait.."
 msgstr "æ­£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:878
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å­?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1059
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1146
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç?¡æ³?å?³é??é ?ç?®è?³è¡?äº?æ??ã??%sã??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1158
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºä¸?確å®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1167
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1172
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??並設ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è­°å?¬é??人已移é?¤ä»£ç??人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1386
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1415
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Meeting information sent"
 msgstr "æ??è­°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Task information sent"
 msgstr "工�����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1460
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ç?¡æ³?å¯?å?ºæ??è­°è³?è¨?ï¼?該æ??議並ä¸?å­?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 msgid "Unable to send task information, the task does not exist"
 msgstr "����工����該�工����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1466
 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:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1531
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1536
 msgid "Save Calendar"
 msgstr "å?²å­?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid "The calendar attached is not valid"
 msgstr "é??帶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1600
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "æ­¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??並é??æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "The item in the calendar is not valid"
 msgstr "è¡?äº?æ??中ç??é ?ç?®æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1641
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1778
 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:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1683
 msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??該å°?æ­¤æª?æ¡?å?²å­?å¾?å?¯å?¥å?¶ä¸­ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2456
 msgid "This meeting recurs"
 msgstr "é??å??æ??è­°ç??循ç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2459
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??循ç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2462
 msgid "This memo recurs"
 msgstr "é??å??å??å¿?é??ç??循ç?°è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2696
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2704
-#: ../plugins/itip-formatter/itip-formatter.c:2737
+#: ../plugins/itip-formatter/itip-formatter.c:2706
+#: ../plugins/itip-formatter/itip-formatter.c:2739
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2721
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é?¸æ??è¦?æ??å°?æ??è­°è¡?çª?ç??è¡?äº?æ??"
 
@@ -17076,7 +17058,7 @@ msgstr "�天 %H:%M:%S"
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
-msgstr "�天%p %l:%M:%S"
+msgstr "�天 %p %l:%M:%S"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
@@ -17094,13 +17076,13 @@ msgstr "æ??天 %H:%M:%S"
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
-msgstr "æ??天%p %-l:%M"
+msgstr "æ??天 %p %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "æ??天%p %-l:%M:%S"
+msgstr "æ??天 %p %l:%M:%S"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:256
@@ -17124,73 +17106,73 @@ msgstr "%A %H:%M:%S"
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
-msgstr "%a %p %l:%M"
+msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
-msgstr "%A%p %-l:%M:%S"
+msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
-msgstr "%-m æ?? %d æ?¥ (%A)"
+msgstr "%B %e (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
-msgstr "%-m æ?? %d æ?¥ (%A) %H:%M"
+msgstr "%B %e (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%-m æ?? %d æ?¥ (%A) %H:%M:%S"
+msgstr "%B %e (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
-msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M"
+msgstr "%B %e (%A) %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M:%S"
+msgstr "%B %e (%A) %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
+msgstr "%Y å¹´ %B %e (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M"
+msgstr "%Y å¹´ %B %e (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M:%S"
+msgstr "%Y å¹´ %B %e (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M"
+msgstr "%Y å¹´ %B %e (%A) %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M:%S"
+msgstr "%Y å¹´ %B %e (%A) %p %l:%M:%S"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #: ../plugins/itip-formatter/itip-view.c:455
@@ -18041,35 +18023,35 @@ msgstr "å??好ç´?æ??å­?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "以ç´?æ??å­?æ?¹å¼?檢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:208
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??顯示ä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:208
 msgid "Let Evolution choose the best part to show."
 msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:209
 msgid "Show plain text if present"
 msgstr "å¦?æ??ä¾?ç´?æ??å­?å??顯示å®?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:209
 msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
 msgstr "å¦?æ??æ??ç´?æ??å­?ç??é?¨å??就顯示å®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å­?顯示"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:210
 msgid "Always show plain text part and make attachments from other parts, if requested."
 msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å­?ç??é?¨å??並å¾?å?¶ä»?ç??é?¨å??製ä½?é??件ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:257
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "å°?æ??å?¶ç?? HTML é?¨å??顯示ç?ºé??件(_U)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:277
 msgid "HTML _Mode"
 msgstr "HT_ML 模�"
 
@@ -18490,15 +18472,15 @@ msgstr "使ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå­?/æ?¸å?¼çµ?æ¸?
 msgid "Drafts based template plugin"
 msgstr "å?ºæ?¼è??稿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
 
-#: ../plugins/templates/templates.c:621
+#: ../plugins/templates/templates.c:627
 msgid "No Title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:715
+#: ../plugins/templates/templates.c:722
 msgid "Save as _Template"
 msgstr "�����(_T)"
 
-#: ../plugins/templates/templates.c:717
+#: ../plugins/templates/templates.c:724
 msgid "Save as Template"
 msgstr "�����"
 
@@ -18699,7 +18681,7 @@ msgid "Skip development warning dialog"
 msgstr "忽ç?¥é??ç?¼è­¦å??å°?話ç??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:35
-#: ../shell/main.c:337
+#: ../shell/main.c:341
 msgid "Start in offline mode"
 msgstr "以é?¢ç·?模å¼?å??å??"
 
@@ -19176,7 +19158,7 @@ msgid "Preparing to quit..."
 msgstr "æº?å??çµ?æ??..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:186
+#: ../shell/main.c:190
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19211,7 +19193,7 @@ msgstr ""
 "æ??å??å¸?æ??æ?¨äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??æ?¨æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19219,57 +19201,57 @@ msgstr ""
 "��\n"
 "Evolution ����\n"
 
-#: ../shell/main.c:217
+#: ../shell/main.c:221
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:337
 msgid "Start Evolution activating the specified component"
 msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??件"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:339
 msgid "Apply the given geometry to the main window"
 msgstr "å°?æ??å®?ç??尺寸å¥?ç?¨å?°ä¸»è¦?çª?"
 
 # zh_HK: msgstr "以ç·?ä¸?模å¼?å??å??"
-#: ../shell/main.c:339
+#: ../shell/main.c:343
 msgid "Start in online mode"
 msgstr "以ç·?ä¸?模å¼?å??å??"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:345
 msgid "Start in \"express\" mode"
 msgstr "以ã??å¿«é??ã??模å¼?å??å??"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:348
 msgid "Forcibly shut down Evolution"
 msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:347
+#: ../shell/main.c:351
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??件ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:349
+#: ../shell/main.c:353
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:351
+#: ../shell/main.c:355
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??é?£çµ¡äººå??å·¥ä½?ç??é ?覽çª?æ ¼ã??"
 
-#: ../shell/main.c:355
+#: ../shell/main.c:359
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??稱å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../shell/main.c:357
+#: ../shell/main.c:361
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?中ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:501
-#: ../shell/main.c:509
+#: ../shell/main.c:505
+#: ../shell/main.c:513
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20474,31 +20456,26 @@ msgid "Delivery Options"
 msgstr "é??é??é?¸é ?"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#| msgid "_Until"
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "ç?´å?°(_U)"
 
 #: ../widgets/misc/e-send-options.ui.h:7
-#| msgid "_After"
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "æ??æ?¼(_A)"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-#| msgid "days"
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "天"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-#| msgid "Wi_thin"
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "��(_T)"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#| msgid "days"
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "天"
@@ -20585,13 +20562,12 @@ msgstr "ç?¶é??å??æ??(_W):"
 
 #. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-#| msgid "None"
 msgctxt "send-options"
 msgid "None"
 msgstr "æ²?æ??"
 
 #: ../widgets/misc/e-signature-editor.c:136
-#: ../widgets/misc/e-signature-editor.c:524
+#: ../widgets/misc/e-signature-editor.c:555
 #: ../widgets/misc/e-signature-manager.c:353
 #: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
@@ -20601,11 +20577,11 @@ msgstr "æ?ªå?½å??ç??"
 msgid "_Save and Close"
 msgstr "å?²å­?å¾?é??é??(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:391
+#: ../widgets/misc/e-signature-editor.c:422
 msgid "Edit Signature"
 msgstr "編輯簽å??æª?"
 
-#: ../widgets/misc/e-signature-editor.c:406
+#: ../widgets/misc/e-signature-editor.c:437
 msgid "_Signature Name:"
 msgstr "ç°½å??æª?å??稱(_S):"
 
@@ -20937,11 +20913,6 @@ msgstr "��(_C)"
 msgid "popup a child"
 msgstr "�����"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "é??å§?編輯此å?²å­?æ ¼"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -20977,3 +20948,11 @@ msgstr "å?¨é?¨é?¸å??"
 msgid "Input Methods"
 msgstr "輸��"
 
+#~ msgid "%d day ago"
+
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d 天å??"
+#~ msgstr[1] "%d 天å??"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "é??å§?編輯此å?²å­?æ ¼"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]