From 80b90439291b0370f46c1830981e218e600f1296 Mon Sep 17 00:00:00 2001
From: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date: Thu, 8 Mar 2012 16:01:07 +0800
Subject: Updated Traditional Chinese translation(Hong Kong and Taiwan)

---
 po/zh_TW.po | 651 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 328 insertions(+), 323 deletions(-)

(limited to 'po/zh_TW.po')

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7f0fc59963..72812c1296 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-25 10:33+0800\n"
-"PO-Revision-Date: 2012-02-24 23:08+0800\n"
+"POT-Creation-Date: 2012-03-08 16:00+0800\n"
+"PO-Revision-Date: 2012-03-05 21:39+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: zh_TW\n"
@@ -231,7 +231,8 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用 {0} 的連絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:601
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../mail/em-vfolder-editor-rule.c:339
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "加入(_A)"
@@ -254,7 +255,7 @@ msgstr "將它視為(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:729
-#: ../calendar/gui/e-calendar-view.c:2076
+#: ../calendar/gui/e-calendar-view.c:2131
 msgid "Anniversary"
 msgstr "週年紀念日"
 
@@ -265,7 +266,7 @@ msgstr "週年紀念日"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:728
-#: ../calendar/gui/e-calendar-view.c:2075 ../capplet/anjal-settings-main.c:83
+#: ../calendar/gui/e-calendar-view.c:2130 ../capplet/anjal-settings-main.c:83
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "生日"
@@ -1571,7 +1572,8 @@ msgstr "位置:"
 msgid "Snooze _time:"
 msgstr "忽略時間(_T):"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert-dialog.c:164
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../libevolution-utils/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "解除(_D)"
 
@@ -3156,8 +3158,8 @@ msgid "Unable to open memos in '%s': %s"
 msgstr "無法在「%s」開啟備忘錄：%s"
 
 #: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1065
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2667
-#: ../mail/em-format-html.c:2732 ../mail/em-format-html.c:2756
+#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2666
+#: ../mail/em-format-html.c:2731 ../mail/em-format-html.c:2755
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "收件者"
@@ -3974,28 +3976,28 @@ msgstr "開始日期"
 msgid "Type"
 msgstr "類型"
 
-#: ../calendar/gui/e-calendar-view.c:427
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Cut selected events to the clipboard"
 msgstr "剪下選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:433
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Copy selected events to the clipboard"
 msgstr "複製選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:439
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Paste events from the clipboard"
 msgstr "從剪貼簿貼上事件"
 
-#: ../calendar/gui/e-calendar-view.c:445
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Delete selected events"
 msgstr "刪除選取的事件"
 
-#: ../calendar/gui/e-calendar-view.c:464 ../calendar/gui/e-memo-table.c:198
+#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:198
 #: ../calendar/gui/e-task-table.c:286
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: ../calendar/gui/e-calendar-view.c:660 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:878
 #: ../calendar/gui/e-task-table.c:1161
 msgid "Updating objects"
 msgstr "更新物件"
@@ -4003,7 +4005,7 @@ 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:1918 ../calendar/gui/e-memo-table.c:555
+#: ../calendar/gui/e-calendar-view.c:1973 ../calendar/gui/e-memo-table.c:555
 #: ../calendar/gui/e-task-table.c:827
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4012,20 +4014,20 @@ msgstr "召集人: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1922 ../calendar/gui/e-memo-table.c:560
+#: ../calendar/gui/e-calendar-view.c:1977 ../calendar/gui/e-memo-table.c:560
 #: ../calendar/gui/e-task-table.c:831
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1938 ../calendar/gui/print.c:3363
+#: ../calendar/gui/e-calendar-view.c:1993 ../calendar/gui/print.c:3363
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1969
+#: ../calendar/gui/e-calendar-view.c:2024
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -4311,7 +4313,7 @@ msgstr "失敗原因：%s"
 
 #: ../calendar/gui/e-meeting-store.c:1902
 #: ../plugins/caldav/caldav-browse-server.c:958
-#: ../plugins/google-account-setup/google-source.c:458
+#: ../plugins/google-account-setup/google-source.c:453
 #: ../plugins/publish-calendar/publish-calendar.c:339
 #: ../smime/gui/component.c:54
 msgid "Enter password"
@@ -6628,36 +6630,36 @@ msgid "Please enter your password."
 msgstr "請輸入您的密碼。"
 
 #: ../capplet/settings/mail-account-view.c:282
-#: ../mail/em-account-editor.c:5429 ../plugins/caldav/caldav-source.c:67
+#: ../mail/em-account-editor.c:5453 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:376
 #: ../capplet/settings/mail-account-view.c:421
-#: ../mail/em-account-editor.c:5300 ../mail/em-account-editor.c:5357
+#: ../mail/em-account-editor.c:5324 ../mail/em-account-editor.c:5381
 #: ../modules/online-accounts/e-online-accounts-google.c:295
 #: ../modules/online-accounts/e-online-accounts-google.c:369
 #: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:87
+#: ../plugins/google-account-setup/google-source.c:83
 msgid "Google"
 msgstr "Google"
 
 #: ../capplet/settings/mail-account-view.c:497
 #: ../capplet/settings/mail-account-view.c:601
-#: ../mail/em-account-editor.c:4833 ../mail/em-account-editor.c:4868
+#: ../mail/em-account-editor.c:4857 ../mail/em-account-editor.c:4892
 msgid "Always (SSL)"
 msgstr "永遠 (SSL)"
 
 #: ../capplet/settings/mail-account-view.c:500
 #: ../capplet/settings/mail-account-view.c:604
-#: ../mail/em-account-editor.c:4836 ../mail/em-account-editor.c:4871
+#: ../mail/em-account-editor.c:4860 ../mail/em-account-editor.c:4895
 msgid "When possible (TLS)"
 msgstr "可能的話 (TLS)"
 
 #: ../capplet/settings/mail-account-view.c:503
 #: ../capplet/settings/mail-account-view.c:607
-#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4839
-#: ../mail/em-account-editor.c:4874
+#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4863
+#: ../mail/em-account-editor.c:4898
 msgid "Never"
 msgstr "永不"
 
@@ -6743,7 +6745,7 @@ msgid ""
 msgstr "在我們嘗試並連線到伺服器取回郵件前檢查事項的時間。"
 
 #: ../capplet/settings/mail-account-view.c:678
-#: ../mail/em-account-editor.c:2948 ../mail/em-account-editor.c:3087
+#: ../mail/em-account-editor.c:2972 ../mail/em-account-editor.c:3111
 msgid "Identity"
 msgstr "身分"
 
@@ -6795,7 +6797,7 @@ msgid "Back - Receiving options"
 msgstr "上一步 - 接收選項"
 
 #: ../capplet/settings/mail-account-view.c:683
-#: ../mail/em-account-editor.c:4100
+#: ../mail/em-account-editor.c:4124
 msgid "Defaults"
 msgstr "預設值"
 
@@ -6824,12 +6826,12 @@ msgid "Setup Google calendar with Evolution"
 msgstr "將 Google 日曆加入 Evolution"
 
 #: ../capplet/settings/mail-account-view.c:861
-#: ../mail/em-account-editor.c:4928
+#: ../mail/em-account-editor.c:4952
 msgid "You may need to enable IMAP access."
 msgstr "您可能需要啟用 IMAP 存取。"
 
 #: ../capplet/settings/mail-account-view.c:869
-#: ../mail/em-account-editor.c:4905
+#: ../mail/em-account-editor.c:4929
 msgid "Google account settings:"
 msgstr "Google 帳號設定值："
 
@@ -6838,7 +6840,7 @@ msgid "Setup Yahoo calendar with Evolution"
 msgstr "將 Yahoo 行事曆加入 Evolution"
 
 #: ../capplet/settings/mail-account-view.c:899
-#: ../mail/em-account-editor.c:4975
+#: ../mail/em-account-editor.c:4999
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -6848,7 +6850,7 @@ msgstr ""
 "它，如果有錯誤請重新輸入行事曆的名稱。"
 
 #: ../capplet/settings/mail-account-view.c:908
-#: ../mail/em-account-editor.c:4960
+#: ../mail/em-account-editor.c:4984
 msgid "Yahoo account settings:"
 msgstr "Yahoo 帳號設定值："
 
@@ -6875,7 +6877,7 @@ msgstr "Evolution 帳號助理"
 
 #. create the local source group
 #: ../capplet/settings/mail-capplet-shell.c:377
-#: ../libemail-engine/e-mail-session.c:534
+#: ../libemail-engine/e-mail-session.c:536
 #: ../modules/addressbook/e-book-shell-backend.c:106
 #: ../modules/addressbook/e-book-shell-migrate.c:136
 #: ../modules/calendar/e-cal-shell-backend.c:119
@@ -9804,14 +9806,14 @@ msgid "Reply-To"
 msgstr "回覆"
 
 #: ../em-format/em-format.c:1066 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2736
-#: ../mail/em-format-html.c:2759 ../modules/mail/em-mailer-prefs.c:73
+#: ../mail/em-format-html.c:2667 ../mail/em-format-html.c:2735
+#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "副本"
 
 #: ../em-format/em-format.c:1067 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2669 ../mail/em-format-html.c:2740
-#: ../mail/em-format-html.c:2762 ../modules/mail/em-mailer-prefs.c:74
+#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2739
+#: ../mail/em-format-html.c:2761 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "密件副本"
 
@@ -9880,12 +9882,12 @@ msgid "Could not parse PGP message: "
 msgstr "無法解析 PGP 郵件："
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2861
+#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2860
 #: ../modules/mail/em-mailer-prefs.c:1046
 msgid "Mailer"
 msgstr "寄件者"
 
-#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1221
+#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1235
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
@@ -10154,105 +10156,105 @@ msgstr "無法顯示 Evolution 的求助文件。"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:70
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒前"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d 秒後"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘前"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d 分鐘後"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時前"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d 小時後"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 日前"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d 天後"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週前"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d 週後"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 月前"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d 個月後"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年前"
 
-#: ../filter/e-filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d 年後"
 
-#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:132
 msgid "<click here to select a date>"
 msgstr "<按這裡選擇日期>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
-#: ../filter/e-filter-datespec.c:158
+#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
+#: ../filter/e-filter-datespec.c:157
 msgid "now"
 msgstr "現在"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:142
 msgid "%d-%b-%Y"
 msgstr "%Y-%b-%d"
 
-#: ../filter/e-filter-datespec.c:290
+#: ../filter/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr "選擇要比對的時間"
 
@@ -10321,11 +10323,11 @@ msgstr "內送"
 msgid "Outgoing"
 msgstr "外寄"
 
-#: ../filter/e-rule-editor.c:274
+#: ../filter/e-rule-editor.c:273
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: ../filter/e-rule-editor.c:367
+#: ../filter/e-rule-editor.c:366
 msgid "Edit Rule"
 msgstr "編輯規則"
 
@@ -10491,7 +10493,7 @@ msgstr[0] "儲存 %d 封郵件"
 msgid "Invalid folder URI '%s'"
 msgstr "無效的資料夾 URI「%s」"
 
-#: ../libemail-engine/e-mail-session.c:106 ../mail/em-folder-properties.c:333
+#: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-properties.c:333
 #: ../mail/em-folder-tree-model.c:719
 #: ../modules/mail/e-mail-shell-view-private.c:1095
 #: ../modules/mail/e-mail-shell-view-private.c:1106
@@ -10499,25 +10501,25 @@ msgid "Inbox"
 msgstr "收件匣"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:107 ../mail/em-folder-tree-model.c:712
+#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:712
 #: ../modules/mail/e-mail-shell-view-private.c:1093
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-tree-model.c:723
+#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:723
 #: ../modules/mail/e-mail-shell-view-private.c:1097
 msgid "Outbox"
 msgstr "寄件匣"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:727
+#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:727
 #: ../modules/mail/e-mail-shell-view-private.c:1099
 msgid "Sent"
 msgstr "已傳送"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:715
+#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:715
 #: ../modules/mail/e-mail-shell-view-private.c:1101
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
@@ -10525,46 +10527,50 @@ msgstr "已傳送"
 msgid "Templates"
 msgstr "範本"
 
-#: ../libemail-engine/e-mail-session.c:929
+#: ../libemail-engine/e-mail-session.c:697 ../mail/mail-vfolder-ui.c:79
+msgid "Search Folders"
+msgstr "搜尋資料夾"
+
+#: ../libemail-engine/e-mail-session.c:975
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "請輸入 %s 所需的密語"
 
-#: ../libemail-engine/e-mail-session.c:933
+#: ../libemail-engine/e-mail-session.c:979
 msgid "Enter Passphrase"
 msgstr "輸入密語"
 
-#: ../libemail-engine/e-mail-session.c:937
+#: ../libemail-engine/e-mail-session.c:983
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
 
-#: ../libemail-engine/e-mail-session.c:941
+#: ../libemail-engine/e-mail-session.c:987
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libemail-engine/e-mail-session.c:992
+#: ../libemail-engine/e-mail-session.c:1038
 #, c-format
 msgid "User canceled operation."
 msgstr "使用者已取消操作。"
 
-#: ../libemail-engine/e-mail-session.c:1111
+#: ../libemail-engine/e-mail-session.c:1157
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "沒有提供目的地位址，郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:1120
+#: ../libemail-engine/e-mail-session.c:1166
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "找不到可使用的帳號，郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:1274
+#: ../libemail-engine/e-mail-session.c:1320
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 驗證失敗"
 
-#: ../libemail-engine/e-mail-session.c:1348
+#: ../libemail-engine/e-mail-session.c:1394
 #, c-format
 msgid "No password was provided"
 msgstr "沒有提供密碼"
@@ -10721,10 +10727,169 @@ msgstr "轉寄的郵件 - %s"
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
+#: ../libemail-engine/mail-vfolder.c:77
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "設定搜尋資料夾： %s"
+
+#: ../libemail-engine/mail-vfolder.c:214
+#, c-format
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "更新「%s」的搜尋資料夾- %s"
+
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../libemail-engine/mail-vfolder.c:554
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"搜尋資料夾「%s」已經修改，因為它只用在剛剛刪除的資料夾\n"
+"「%s」。"
+
 #: ../libemail-utils/e-signature.c:710
 msgid "Autogenerated"
 msgstr "自動產生的"
 
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:1660 ../widgets/misc/e-signature-combo-box.c:79
+msgctxt "mail-signature"
+msgid "None"
+msgstr "沒有"
+
+#: ../mail/em-account-editor.c:1753
+msgid "Always"
+msgstr "永遠"
+
+#: ../mail/em-account-editor.c:1754
+msgid "Ask for each message"
+msgstr "每封郵件皆詢問"
+
+#: ../mail/em-account-editor.c:2921 ../mail/mail-config.ui.h:170
+msgid "_Path:"
+msgstr "路徑(_P):"
+
+#: ../mail/em-account-editor.c:2924
+msgid "Fil_e:"
+msgstr "檔案(_E):"
+
+#: ../mail/em-account-editor.c:2969
+msgid "Mail Configuration"
+msgstr "郵件組態"
+
+#: ../mail/em-account-editor.c:2970
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"歡迎使用 Evolution 郵件組態助理。\n"
+"\n"
+"按一下「繼續」開始。 "
+
+#: ../mail/em-account-editor.c:2973
+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:2975 ../mail/em-account-editor.c:3184
+msgid "Receiving Email"
+msgstr "接收電子郵件"
+
+#: ../mail/em-account-editor.c:2976
+msgid "Please configure the following account settings."
+msgstr "請在設定下列帳號的設定值。"
+
+#: ../mail/em-account-editor.c:2978 ../mail/em-account-editor.c:3803
+msgid "Sending Email"
+msgstr "傳送電子郵件"
+
+#: ../mail/em-account-editor.c:2979
+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:2981
+msgid "Account Summary"
+msgstr "帳號摘要"
+
+#: ../mail/em-account-editor.c:2982
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
+msgstr "這是用來存取您郵件的設定值的摘要。"
+
+#: ../mail/em-account-editor.c:2986
+msgid "Done"
+msgstr "完成"
+
+#: ../mail/em-account-editor.c:2987
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"恭喜您，郵件設定已經完成。\n"
+"\n"
+"您現在可以開始使用 Evolution 收發電子郵件。\n"
+"\n"
+"請按一下「套用」儲存設定。"
+
+#: ../mail/em-account-editor.c:3550
+msgid "Check for _new messages every"
+msgstr "自動檢查新郵件每(_N)"
+
+#: ../mail/em-account-editor.c:3558
+msgid "minu_tes"
+msgstr "分鐘(_T)"
+
+#: ../mail/em-account-editor.c:4276 ../mail/mail-config.ui.h:109
+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:4331 ../mail/em-account-editor.c:4433
+msgid "Receiving Options"
+msgstr "接收選項"
+
+#: ../mail/em-account-editor.c:4332 ../mail/em-account-editor.c:4434
+msgid "Checking for New Messages"
+msgstr "檢查新郵件"
+
+#: ../mail/em-account-editor.c:4937
+msgid "Setup Google con_tacts with Evolution"
+msgstr "將 Google 連絡人加入 Evolu_tion"
+
+#: ../mail/em-account-editor.c:4944
+msgid "Setup Google ca_lendar with Evolution"
+msgstr "將 Google 日曆加入 Evo_lution"
+
+#: ../mail/em-account-editor.c:4992
+msgid "Setup _Yahoo calendar with Evolution"
+msgstr "將 _Yahoo 行事曆加入 Evolution"
+
+#: ../mail/em-account-editor.c:5017
+msgid "Yahoo Calen_dar name:"
+msgstr "Yahoo 行事曆名稱(_D):"
+
 #: ../mail/e-mail-account-manager.c:405
 msgid "_Restore Default"
 msgstr "還原為預設值(_R)"
@@ -10750,11 +10915,11 @@ msgstr "帳號名稱"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3425
+#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3439
 #: ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:558
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../plugins/google-account-setup/google-source.c:311
+#: ../plugins/google-account-setup/google-source.c:553
+#: ../plugins/google-account-setup/google-source.c:690
 msgid "Default"
 msgstr "預設值"
 
@@ -11449,49 +11614,49 @@ msgstr "所有郵件檔頭(_H)"
 msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
-#: ../mail/e-mail-reader.c:2698
+#: ../mail/e-mail-reader.c:2712
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "正在取回郵件「%s」"
 
-#: ../mail/e-mail-reader.c:3618
+#: ../mail/e-mail-reader.c:3632
 #: ../modules/mail/e-mail-attachment-handler.c:174
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/e-mail-reader.c:3619
+#: ../mail/e-mail-reader.c:3633
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
-#: ../mail/e-mail-reader.c:3638
+#: ../mail/e-mail-reader.c:3652
 msgid "Group Reply"
 msgstr "群組回覆"
 
-#: ../mail/e-mail-reader.c:3639
+#: ../mail/e-mail-reader.c:3653
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "回覆給通信論壇，或是給所有的收件者"
 
-#: ../mail/e-mail-reader.c:3696 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3710 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "刪除"
 
-#: ../mail/e-mail-reader.c:3729
+#: ../mail/e-mail-reader.c:3743
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "下一個"
 
-#: ../mail/e-mail-reader.c:3733
+#: ../mail/e-mail-reader.c:3747
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "上一個"
 
-#: ../mail/e-mail-reader.c:3742 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/e-mail-reader.c:4443
+#: ../mail/e-mail-reader.c:4457
 #, c-format
 msgid "Folder '%s'"
 msgstr "資料夾「%s」"
@@ -11531,145 +11696,11 @@ msgstr[0] "郵件"
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
-#: ../mail/e-mail-ui-session.c:534 ../mail/mail-vfolder.c:1115
-msgid "Search Folders"
-msgstr "搜尋資料夾"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1660 ../widgets/misc/e-signature-combo-box.c:79
-msgctxt "mail-signature"
-msgid "None"
-msgstr "沒有"
-
-#: ../mail/em-account-editor.c:1753
-msgid "Always"
-msgstr "永遠"
-
-#: ../mail/em-account-editor.c:1754
-msgid "Ask for each message"
-msgstr "每封郵件皆詢問"
-
-#: ../mail/em-account-editor.c:2905 ../mail/mail-config.ui.h:170
-msgid "_Path:"
-msgstr "路徑(_P):"
-
-#: ../mail/em-account-editor.c:2908
-msgid "Fil_e:"
-msgstr "檔案(_E):"
-
-#: ../mail/em-account-editor.c:2945
-msgid "Mail Configuration"
-msgstr "郵件組態"
-
-#: ../mail/em-account-editor.c:2946
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
-msgstr ""
-"歡迎使用 Evolution 郵件組態助理。\n"
-"\n"
-"按一下「繼續」開始。 "
-
-#: ../mail/em-account-editor.c:2949
-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:2951 ../mail/em-account-editor.c:3160
-msgid "Receiving Email"
-msgstr "接收電子郵件"
-
-#: ../mail/em-account-editor.c:2952
-msgid "Please configure the following account settings."
-msgstr "請在設定下列帳號的設定值。"
-
-#: ../mail/em-account-editor.c:2954 ../mail/em-account-editor.c:3779
-msgid "Sending Email"
-msgstr "傳送電子郵件"
-
-#: ../mail/em-account-editor.c:2955
-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:2957
-msgid "Account Summary"
-msgstr "帳號摘要"
-
-#: ../mail/em-account-editor.c:2958
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr "這是用來存取您郵件的設定值的摘要。"
-
-#: ../mail/em-account-editor.c:2962
-msgid "Done"
-msgstr "完成"
-
-#: ../mail/em-account-editor.c:2963
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"恭喜您，郵件設定已經完成。\n"
-"\n"
-"您現在可以開始使用 Evolution 收發電子郵件。\n"
-"\n"
-"請按一下「套用」儲存設定。"
-
-#: ../mail/em-account-editor.c:3526
-msgid "Check for _new messages every"
-msgstr "自動檢查新郵件每(_N)"
-
-#: ../mail/em-account-editor.c:3534
-msgid "minu_tes"
-msgstr "分鐘(_T)"
-
-#: ../mail/em-account-editor.c:4252 ../mail/mail-config.ui.h:109
-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:4307 ../mail/em-account-editor.c:4409
-msgid "Receiving Options"
-msgstr "接收選項"
-
-#: ../mail/em-account-editor.c:4308 ../mail/em-account-editor.c:4410
-msgid "Checking for New Messages"
-msgstr "檢查新郵件"
-
-#: ../mail/em-account-editor.c:4913
-msgid "Setup Google con_tacts with Evolution"
-msgstr "將 Google 連絡人加入 Evolu_tion"
-
-#: ../mail/em-account-editor.c:4920
-msgid "Setup Google ca_lendar with Evolution"
-msgstr "將 Google 日曆加入 Evo_lution"
-
-#: ../mail/em-account-editor.c:4968
-msgid "Setup _Yahoo calendar with Evolution"
-msgstr "將 _Yahoo 行事曆加入 Evolution"
-
-#: ../mail/em-account-editor.c:4993
-msgid "Yahoo Calen_dar name:"
-msgstr "Yahoo 行事曆名稱(_D):"
-
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1215
+#: ../mail/em-composer-utils.c:1229
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11677,23 +11708,23 @@ msgstr ""
 "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender} 提到："
 
-#: ../mail/em-composer-utils.c:1226
+#: ../mail/em-composer-utils.c:1240
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
-#: ../mail/em-composer-utils.c:2453
+#: ../mail/em-composer-utils.c:2467
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-#: ../mail/em-composer-utils.c:2848
+#: ../mail/em-composer-utils.c:2862
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../mail/em-composer-utils.c:2849
+#: ../mail/em-composer-utils.c:2863
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
-#: ../mail/em-filter-folder-element.c:243
+#: ../mail/em-filter-editor-folder-element.c:156
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
@@ -12068,93 +12099,93 @@ msgstr "格式化郵件"
 msgid "Formatting Message..."
 msgstr "格式化郵件…"
 
-#: ../mail/em-format-html.c:1640 ../mail/em-format-html.c:1654
+#: ../mail/em-format-html.c:1637 ../mail/em-format-html.c:1651
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "正在取回「%s」"
 
-#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:97
 msgid "Unsigned"
 msgstr "未簽名"
 
-#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html.c:1803 ../mail/em-format-html-display.c:98
 msgid "Valid signature"
 msgstr "有效的簽名"
 
-#: ../mail/em-format-html.c:1807 ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:99
 msgid "Invalid signature"
 msgstr "無效的簽名"
 
-#: ../mail/em-format-html.c:1808 ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:100
 msgid "Valid signature, but cannot verify sender"
 msgstr "簽名有效，但是無法檢驗寄件者"
 
-#: ../mail/em-format-html.c:1809 ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:101
 msgid "Signature exists, but need public key"
 msgstr "簽章存在，但需要公開金鑰"
 
-#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:108
+#: ../mail/em-format-html.c:1812 ../mail/em-format-html-display.c:108
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html.c:1816 ../mail/em-format-html-display.c:109
+#: ../mail/em-format-html.c:1813 ../mail/em-format-html-display.c:109
 msgid "Encrypted, weak"
 msgstr "已加密，不嚴密"
 
-#: ../mail/em-format-html.c:1817 ../mail/em-format-html-display.c:110
+#: ../mail/em-format-html.c:1814 ../mail/em-format-html-display.c:110
 msgid "Encrypted"
 msgstr "已加密"
 
-#: ../mail/em-format-html.c:1818 ../mail/em-format-html-display.c:111
+#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:111
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
-#: ../mail/em-format-html.c:2211
+#: ../mail/em-format-html.c:2210
 msgid "Unknown external-body part."
 msgstr "未知的外加本文部分。"
 
-#: ../mail/em-format-html.c:2221
+#: ../mail/em-format-html.c:2220
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
-#: ../mail/em-format-html.c:2252
+#: ../mail/em-format-html.c:2251
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-#: ../mail/em-format-html.c:2263
+#: ../mail/em-format-html.c:2262
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s」有效的指示"
 
-#: ../mail/em-format-html.c:2265
+#: ../mail/em-format-html.c:2264
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: ../mail/em-format-html.c:2286
+#: ../mail/em-format-html.c:2285
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
-#: ../mail/em-format-html.c:2301
+#: ../mail/em-format-html.c:2300
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:3009
+#: ../mail/em-format-html.c:3008
 #: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "寄件者：%s"
 
-#: ../mail/em-format-html.c:3031
+#: ../mail/em-format-html.c:3030
 msgid "(no subject)"
 msgstr "(沒有主旨)"
 
-#: ../mail/em-format-html.c:3107
+#: ../mail/em-format-html.c:3106
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "這封郵件是由 %s 代表 %s 寄出"
@@ -12385,7 +12416,7 @@ msgstr "不要再顯示這個訊息(_D)"
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../mail/em-utils.c:978
+#: ../mail/em-utils.c:979
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
@@ -12394,7 +12425,7 @@ msgstr "來自 %s 的郵件"
 msgid "Search _Folders"
 msgstr "搜尋資料夾(_F)"
 
-#: ../mail/em-vfolder-rule.c:601
+#: ../mail/em-vfolder-editor-rule.c:339
 msgid "Add Folder"
 msgstr "加入資料夾"
 
@@ -13400,10 +13431,10 @@ msgstr "使用驗證(_N)"
 msgid "User _Name:"
 msgstr "使用者名稱(_N):"
 
-#: ../mail/mail-config.ui.h:153 ../plugins/caldav/caldav-source.c:249
+#: ../mail/mail-config.ui.h:153 ../plugins/caldav/caldav-source.c:250
 #: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:660
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:272
+#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:273
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
@@ -14368,40 +14399,11 @@ msgstr "正在等待…"
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
-#: ../mail/mail-vfolder.c:82
-#, c-format
-msgid "Setting up Search Folder: %s"
-msgstr "設定搜尋資料夾： %s"
-
-#: ../mail/mail-vfolder.c:219
-#, c-format
-msgid "Updating Search Folders for '%s' - %s"
-msgstr "更新「%s」的搜尋資料夾- %s"
-
-#. Translators: The first %s is name of the affected
-#. * search folder(s), the second %s is the URI of the
-#. * removed folder. For more than one search folder is
-#. * each of them on a separate line, with four spaces
-#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:562
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
-msgid_plural ""
-"The following Search Folders\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
-msgstr[0] ""
-"搜尋資料夾「%s」已經修改，因為它只用在剛剛刪除的資料夾\n"
-"「%s」。"
-
-#: ../mail/mail-vfolder.c:1195
+#: ../mail/mail-vfolder-ui.c:159
 msgid "Edit Search Folder"
 msgstr "編輯搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:1306
+#: ../mail/mail-vfolder-ui.c:270
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
@@ -17049,47 +17051,47 @@ msgstr "這會讓 SpamAssasin 更可靠，但速度變慢。"
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:283
+#: ../modules/startup-wizard/evolution-startup-wizard.c:136
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications."
+msgstr ""
+"歡迎使用 Evolution。以下畫面會讓 Evolution 連線至您的電子郵件帳號，以及從其他"
+"應用程式匯入檔案。"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:297
 #: ../widgets/misc/e-import-assistant.c:403
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊："
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:315
+#: ../modules/startup-wizard/evolution-startup-wizard.c:329
 #: ../widgets/misc/e-import-assistant.c:559
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s："
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:326
-#: ../modules/startup-wizard/evolution-startup-wizard.c:424
+#: ../modules/startup-wizard/evolution-startup-wizard.c:340
+#: ../modules/startup-wizard/evolution-startup-wizard.c:438
 msgid "Importing Files"
 msgstr "正在匯入檔案"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:402
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Import cancelled."
 msgstr "匯入已取消。"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:420
+#: ../modules/startup-wizard/evolution-startup-wizard.c:434
 msgid "Import complete."
 msgstr "匯入完成。"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:494
+#: ../modules/startup-wizard/evolution-startup-wizard.c:508
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助理"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:500
+#: ../modules/startup-wizard/evolution-startup-wizard.c:514
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:505
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications."
-msgstr ""
-"歡迎使用 Evolution。以下畫面會讓 Evolution 連線至您的電子郵件帳號，以及從其他"
-"應用程式匯入檔案。"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:626
 msgid "Loading accounts..."
 msgstr "正在載入帳號…"
 
@@ -17483,7 +17485,7 @@ msgid "Searching folder content..."
 msgstr "搜尋資料夾內容…"
 
 #: ../plugins/caldav/caldav-browse-server.c:1326
-#: ../plugins/caldav/caldav-source.c:261
+#: ../plugins/caldav/caldav-source.c:262
 msgid "Server _handles meeting invitations"
 msgstr "伺服器處理會議邀請(_H)"
 
@@ -17496,7 +17498,7 @@ msgid "Supports"
 msgstr "支援"
 
 #: ../plugins/caldav/caldav-browse-server.c:1402
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-source.c:260
 msgid "User e_mail:"
 msgstr "使用者 e_mail："
 
@@ -17514,28 +17516,28 @@ msgstr "伺服器 URL「%s」不是有效的 URL"
 msgid "Browse for a CalDAV calendar"
 msgstr "瀏覽 CalDAV 行事曆"
 
-#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/caldav/caldav-source.c:241
 #: ../plugins/calendar-http/calendar-http.c:109
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:261
 msgid "_URL:"
 msgstr "網址(_U):"
 
-#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/caldav/caldav-source.c:248
 #: ../plugins/calendar-http/calendar-http.c:149
 #: ../plugins/google-account-setup/google-contacts-source.c:359
 msgid "Use _secure connection"
 msgstr "使用安全連線(_S)"
 
-#: ../plugins/caldav/caldav-source.c:264
+#: ../plugins/caldav/caldav-source.c:265
 msgid "Brows_e server for a calendar"
 msgstr "瀏覽伺服器的行事曆(_E)"
 
-#: ../plugins/caldav/caldav-source.c:282
+#: ../plugins/caldav/caldav-source.c:283
 #: ../plugins/calendar-file/calendar-file.c:207
 #: ../plugins/calendar-http/calendar-http.c:132
 #: ../plugins/calendar-weather/calendar-weather.c:421
 #: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:666
+#: ../plugins/google-account-setup/google-source.c:661
 msgid "Re_fresh:"
 msgstr "重新整理(_F):"
 
@@ -17548,8 +17550,8 @@ msgid "CalDAV Support"
 msgstr "CalDAV 支援"
 
 #: ../plugins/calendar-file/calendar-file.c:136
-msgid "_Customize options"
-msgstr "自訂選項(_C)"
+msgid "C_ustomize options"
+msgstr "自訂選項(_U)"
 
 #: ../plugins/calendar-file/calendar-file.c:155
 #: ../widgets/misc/e-attachment-dialog.c:333
@@ -17561,19 +17563,22 @@ msgstr "檔案名稱(_I):"
 msgid "Choose calendar file"
 msgstr "選擇行事曆檔案"
 
-#: ../plugins/calendar-file/calendar-file.c:212
+#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "On open"
 msgstr "於開啟的"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
+#: ../plugins/calendar-file/calendar-file.c:215
 msgid "On file change"
 msgstr "於變更的檔案"
 
-#: ../plugins/calendar-file/calendar-file.c:214
+#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
+#: ../plugins/calendar-file/calendar-file.c:217
 msgid "Periodically"
 msgstr "週期性的"
 
-#: ../plugins/calendar-file/calendar-file.c:235
+#: ../plugins/calendar-file/calendar-file.c:238
 msgid "Force read _only"
 msgstr "強制唯讀(_O)"
 
@@ -17892,16 +17897,16 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "您選取的檔案似乎不是有效的 .png 圖片。錯誤：{0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:249
 msgid "Server"
 msgstr "伺服器"
 
-#: ../plugins/google-account-setup/google-source.c:457
+#: ../plugins/google-account-setup/google-source.c:452
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "輸入使用者 %s 的密碼以存取已訂閱的行事曆清單。"
 
-#: ../plugins/google-account-setup/google-source.c:569
+#: ../plugins/google-account-setup/google-source.c:564
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17910,17 +17915,17 @@ msgstr ""
 "不能從 Google 伺服器讀取資料。\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:569
+#: ../plugins/google-account-setup/google-source.c:564
 #: ../plugins/mail-to-task/mail-to-task.c:840
 #: ../plugins/mail-to-task/mail-to-task.c:1103
 msgid "Unknown error."
 msgstr "不明的錯誤。"
 
-#: ../plugins/google-account-setup/google-source.c:670
+#: ../plugins/google-account-setup/google-source.c:665
 msgid "Cal_endar:"
 msgstr "行事曆(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:707
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Retrieve _List"
 msgstr "取回清單(_L)"
 
@@ -19539,11 +19544,11 @@ msgstr "將 WebDAV 連絡人加入 Evolution。"
 msgid "WebDAV contacts"
 msgstr "WebDAV 連絡人"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:70
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:286
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:287
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfM_atch (需使用 Apache < 2.2.8)"
 
-- 
cgit v1.2.3