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

[Chao-Hsiung Liao <chliao src gnome org>]

commit d56a65996f8075c43b97de01a338fd9298bbb2b3
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Mon Sep 30 19:24:17 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  956 ++++++++++++++++++++++++++++-------------------------------
 po/zh_TW.po |  957 ++++++++++++++++++++++++++++-------------------------------
 2 files changed, 894 insertions(+), 1019 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 418552d..469e996 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,13 +6,14 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010, 2012.
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
+#: ../shell/main.c:555
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-23 22:00+0800\n"
-"PO-Revision-Date: 2013-09-23 22:01+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"POT-Creation-Date: 2013-09-30 19:23+0800\n"
+"PO-Revision-Date: 2013-09-30 19:23+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -262,11 +263,10 @@ msgid "_Wants to receive HTML mail"
 msgstr "可接受 H_TML 郵件"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:409
+#: ../addressbook/gui/widgets/eab-contact-merging.c:409
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:590
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:942
-#: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "電子郵件"
 
@@ -715,32 +715,32 @@ msgstr "編輯清單時發生錯誤"
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "偵測到重複的聯絡人"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:2
 msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
 msgstr "此聯絡人的名稱或電子郵件地址已經存在於此資料夾。要強制儲存更改嗎？"
 
 #. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:4
 msgid "Conflicting Contact:"
 msgstr "衝突的聯絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:5
 msgid "Changed Contact:"
 msgstr "更改後的聯絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:364
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-merging.c:364
 msgid "_Merge"
 msgstr "合併(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:3
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -748,20 +748,20 @@ msgstr ""
 "此聯絡人的名稱或電子郵件地址已經存在\n"
 "æ–¼æ­¤è³‡æ–™å¤¾ã€‚ä½ ç„¡è«–å¦‚ä½•éƒ½è¦æ–°å¢žå®ƒå—Žï¼Ÿ"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:5
 msgid "Original Contact:"
 msgstr "原本的聯絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:6
 msgid "New Contact:"
 msgstr "新的聯絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
+#: ../addressbook/gui/widgets/eab-contact-merging.c:244
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:346
+#: ../addressbook/gui/widgets/eab-contact-merging.c:346
 msgid "Merge Contact"
 msgstr "合併聯絡人"
 
@@ -1438,16 +1438,16 @@ msgstr "將卡片顯示成 vcard 或 csv 檔案"
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:136
+#: ../addressbook/tools/evolution-addressbook-export.c:134
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 --help é¸é …ä¾†æŸ¥çœ‹ç”¨æ³•ã€‚"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:150
+#: ../addressbook/tools/evolution-addressbook-export.c:148
 msgid "Only support csv or vcard format."
 msgstr "僅支援 csv 或 vcard æ ¼å¼ã€‚"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:181
+#: ../addressbook/tools/evolution-addressbook-export.c:179
 msgid "Unhandled error"
 msgstr "未處理的錯誤"
 
@@ -3553,7 +3553,7 @@ msgstr "Gnome 行事曆"
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../modules/calendar/e-cal-shell-view-private.c:1225
 msgid "%A %d %b %Y"
-msgstr "%Y年%m月%d日 (%A)"
+msgstr "%Y年%m月%d日%A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. * %b = abbreviated month name. Don't use any other specifiers.
@@ -6621,7 +6621,7 @@ msgid "S_ubject:"
 msgstr "主旨(_U):"
 
 #: ../composer/e-composer-header-table.c:813
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../mail/e-mail-config-identity-page.c:489
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
@@ -6633,28 +6633,28 @@ msgstr "按這裏新增目錄服務"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裏，選取要張貼的資料夾"
 
-#: ../composer/e-msg-composer.c:869
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件：此帳號沒有設定簽署證書"
 
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:887
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç„¡æ³•åŠ å¯†é€å‡ºçš„éƒµä»¶ï¼šæ²’æœ‰è¨­å®šåŠ å¯†è­‰æ›¸(此帳號)"
 
-#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
+#: ../composer/e-msg-composer.c:1566 ../composer/e-msg-composer.c:1967
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4213
+#: ../composer/e-msg-composer.c:4235
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
-#: ../composer/e-msg-composer.c:4886
+#: ../composer/e-msg-composer.c:4908
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
@@ -6828,9 +6828,10 @@ msgid "Manage your email, contacts and schedule"
 msgstr "ç®¡ç†ä½ çš„éƒµä»¶ã€è¯çµ¡äººå’Œè¡Œç¨‹"
 
 #: ../data/evolution.desktop.in.in.h:5
+#, fuzzy
 #| msgid "mail;calendar;contact;addressbook;task;"
 msgid "email;calendar;contact;addressbook;task;"
-msgstr "email;calendar;contact;addressbook;task;郵件;行事曆;聯絡人;通訊錄;工作;"
+msgstr "mail;calendar;contact;addressbook;task;郵件;行事曆;聯絡人;通訊錄;工作;"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -8986,7 +8987,7 @@ msgid "S/MIME encrpyted"
 msgstr "S/MIME åŠ å¯†"
 
 #: ../em-format/e-mail-formatter-print-headers.c:171
-#: ../mail/e-mail-config-security-page.c:642
+#: ../mail/e-mail-config-security-page.c:645
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:195
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:129
 msgid "Security"
@@ -8995,7 +8996,7 @@ msgstr "安全性"
 #: ../em-format/e-mail-formatter-quote-headers.c:168
 #: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
 #: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+#: ../modules/mail/em-mailer-prefs.c:69
 msgid "Subject"
 msgstr "主旨"
 
@@ -9567,7 +9568,7 @@ msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
 #: ../e-util/e-activity-proxy.c:311
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1722
 msgid "Cancel"
 msgstr "取消"
 
@@ -9817,13 +9818,13 @@ msgstr "複製備忘錄清單內容至本地以便離線作業"
 #: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
 msgctxt "CalItem"
 msgid "%B"
-msgstr "%B"
+msgstr "%m月"
 
 #. This is a strftime() format. %Y = Year.
 #: ../e-util/e-calendar-item.c:1329
 msgctxt "CalItem"
 msgid "%Y"
-msgstr "%Y"
+msgstr "%Yå¹´"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../e-util/e-calendar-item.c:1366
@@ -9926,7 +9927,7 @@ msgstr "確定"
 msgid "The time must be in the format: %s"
 msgstr "æ™‚é–“å¿…é ˆç‚ºæ­¤æ ¼å¼ï¼š%s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1850
 msgid "?"
 msgstr "?"
 
@@ -10693,7 +10694,7 @@ msgstr "åˆ°é”é é¢é ‚ç«¯ï¼Œå¾žåº•éƒ¨ç¹¼çºŒ"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
 #: ../mail/importers/pine-importer.c:419
-#: ../modules/mail/e-mail-shell-view.c:1075
+#: ../modules/mail/e-mail-shell-view.c:1074
 msgid "Mail"
 msgstr "郵件"
 
@@ -11103,7 +11104,7 @@ msgid "Flags"
 msgstr "旗標"
 
 #: ../e-util/evolution-source-viewer.c:726
-#: ../mail/e-mail-config-identity-page.c:677
+#: ../mail/e-mail-config-identity-page.c:678
 msgid "Identity"
 msgstr "身分"
 
@@ -11256,31 +11257,31 @@ msgstr[0] "取回 %d 封郵件"
 msgid "Scanning messages for duplicates"
 msgstr "掃描郵件是否有重複"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1184
+#: ../libemail-engine/e-mail-folder-utils.c:1183
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移除資料夾「%s」"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1321
+#: ../libemail-engine/e-mail-folder-utils.c:1320
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "檔案「%s」已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1324
 msgid "File has been removed."
 msgstr "檔案已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1384
+#: ../libemail-engine/e-mail-folder-utils.c:1383
 msgid "Removing attachments"
 msgstr "正在移除附件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1548
+#: ../libemail-engine/e-mail-folder-utils.c:1547
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "儲存 %d 封郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1926
+#: ../libemail-engine/e-mail-folder-utils.c:1925
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "無效的資料夾 URI「%s」"
@@ -11355,24 +11356,24 @@ msgstr "範本"
 msgid "User cancelled operation"
 msgstr "使用者取消的操作"
 
-#: ../libemail-engine/e-mail-session.c:1542
+#: ../libemail-engine/e-mail-session.c:1567
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s æ ¸å°å¤±æ•—"
 
-#: ../libemail-engine/e-mail-session.c:1592
+#: ../libemail-engine/e-mail-session.c:1617
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../libemail-engine/e-mail-session.c:1655
+#: ../libemail-engine/e-mail-session.c:1680
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "沒有提供目的地位址，郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:1668
+#: ../libemail-engine/e-mail-session.c:1693
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "找不到可使用的識別符，郵件的轉寄已經取消。"
@@ -11392,7 +11393,7 @@ msgstr "重新連線到「%s」"
 msgid "Preparing account '%s' for offline"
 msgstr "準備帳號「%s」離線工作"
 
-#: ../libemail-engine/mail-folder-cache.c:1241
+#: ../libemail-engine/mail-folder-cache.c:1240
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -11496,12 +11497,12 @@ msgstr "轉寄的郵件 - %s"
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
-#: ../libemail-engine/mail-vfolder.c:153
+#: ../libemail-engine/mail-vfolder.c:152
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
-#: ../libemail-engine/mail-vfolder.c:306
+#: ../libemail-engine/mail-vfolder.c:305
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "更新「%s」的搜尋資料夾- %s"
@@ -11511,7 +11512,7 @@ msgstr "更新「%s」的搜尋資料夾- %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:670
+#: ../libemail-engine/mail-vfolder.c:669
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -11557,8 +11558,8 @@ msgid "Account Name"
 msgstr "帳號名稱"
 
 #: ../mail/e-mail-account-tree-view.c:136
-#: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3532
+#: ../mail/e-mail-config-security-page.c:335
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3532
 #: ../mail/mail-config.ui.h:49
 msgid "Default"
 msgstr "é è¨­å€¼"
@@ -11733,15 +11734,15 @@ msgstr "電子郵件位址(_A):"
 msgid "Optional Information"
 msgstr "選擇性的資訊"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:440
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:467
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:522
 msgid "Add Ne_w Signature..."
 msgstr "åŠ å…¥æ–°çš„ç°½åæª”(_W)…"
 
@@ -11771,88 +11772,87 @@ msgstr "接收電子郵件"
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "一般"
 
-#: ../mail/e-mail-config-security-page.c:268
+#: ../mail/e-mail-config-security-page.c:269
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不簽署會議邀請 (兼容於 _Outlook)"
 
-#: ../mail/e-mail-config-security-page.c:290
+#: ../mail/e-mail-config-security-page.c:291
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "嚴密私隱權 (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:298
+#: ../mail/e-mail-config-security-page.c:300
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP 密碼匙 ID(_K):"
 
-#: ../mail/e-mail-config-security-page.c:320
+#: ../mail/e-mail-config-security-page.c:322
 msgid "Si_gning algorithm:"
 msgstr "簽署演算法(_G):"
 
-#: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
+#: ../mail/e-mail-config-security-page.c:338
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:50
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
+#: ../mail/e-mail-config-security-page.c:341
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:51
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
+#: ../mail/e-mail-config-security-page.c:344
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:52
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
+#: ../mail/e-mail-config-security-page.c:347
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:53
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:361
+#: ../mail/e-mail-config-security-page.c:363
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽署(_W)"
 
-#: ../mail/e-mail-config-security-page.c:373
+#: ../mail/e-mail-config-security-page.c:375
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ç•¶å‚³é€åŠ å¯†éƒµä»¶æ™‚æ°¸é è‡ªæˆ‘åŠ å¯†(_M)"
 
-#: ../mail/e-mail-config-security-page.c:385
+#: ../mail/e-mail-config-security-page.c:387
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "åŠ å¯†æ™‚æ°¸é ä¿¡ä»»æˆ‘çš„å¯†ç¢¼åŒ™åœˆè£çš„å¯†ç¢¼åŒ™(_T)"
 
-#: ../mail/e-mail-config-security-page.c:409
+#: ../mail/e-mail-config-security-page.c:411
 msgid "Secure MIME (S/MIME)"
 msgstr "安全式 MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:417
+#: ../mail/e-mail-config-security-page.c:420
 msgid "Sig_ning certificate:"
 msgstr "簽署證書(_N):"
 
-#: ../mail/e-mail-config-security-page.c:441
-#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:444
+#: ../mail/e-mail-config-security-page.c:550
 msgid "Select"
 msgstr "選擇"
 
-#: ../mail/e-mail-config-security-page.c:459
+#: ../mail/e-mail-config-security-page.c:462
 msgid "Signing _algorithm:"
 msgstr "簽署演算法(_A):"
 
-#: ../mail/e-mail-config-security-page.c:500
+#: ../mail/e-mail-config-security-page.c:503
 msgid "Always sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽署"
 
-#: ../mail/e-mail-config-security-page.c:523
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Encryption certificate:"
 msgstr "åŠ å¯†è­‰æ›¸ï¼š"
 
-#: ../mail/e-mail-config-security-page.c:565
+#: ../mail/e-mail-config-security-page.c:568
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "ä½¿ç”¨æ­¤å¸³è™Ÿæ™‚ä¸€å®šåœ¨å¤–é€çš„éƒµä»¶åŠ å¯†"
 
-#: ../mail/e-mail-config-security-page.c:585
+#: ../mail/e-mail-config-security-page.c:588
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "ç•¶å‚³é€åŠ å¯†éƒµä»¶æ™‚æ°¸é è‡ªæˆ‘åŠ å¯†"
 
@@ -11997,7 +11997,7 @@ msgid "_Later"
 msgstr "稍後(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:1025
+#: ../modules/mail/e-mail-shell-view-actions.c:1024
 msgid "Add Label"
 msgstr "åŠ å…¥æ¨™ç±¤"
 
@@ -12058,7 +12058,7 @@ msgstr "第 %d / %d é "
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:517
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:516
 msgid "C_opy"
 msgstr "複製(_O)"
 
@@ -12066,7 +12066,7 @@ msgstr "複製(_O)"
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:517
+#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:516
 msgid "_Move"
 msgstr "移動(_M)"
 
@@ -12673,7 +12673,7 @@ msgstr[0] "郵件"
 msgid "Parsing message"
 msgstr "解析郵件"
 
-#: ../mail/e-mail-request.c:182
+#: ../mail/e-mail-request.c:197
 msgid "The message has no text content."
 msgstr "這個郵件沒有文字內容。"
 
@@ -13018,41 +13018,41 @@ msgstr "建立(_R)"
 msgid "Folder _name:"
 msgstr "資料夾名稱(_N):"
 
-#: ../mail/em-folder-tree.c:637
+#: ../mail/em-folder-tree.c:636
 msgid "Folder names cannot contain '/'"
 msgstr "資料夾名稱不能包含斜線。"
 
-#: ../mail/em-folder-tree.c:774
+#: ../mail/em-folder-tree.c:773
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1599
+#: ../mail/em-folder-tree.c:1598
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-#: ../mail/em-folder-tree.c:2168 ../mail/em-folder-utils.c:112
+#: ../mail/em-folder-tree.c:2167 ../mail/em-folder-utils.c:112
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2171 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2170 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2178 ../mail/message-list.c:2280
+#: ../mail/em-folder-tree.c:2177 ../mail/message-list.c:2279
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2182 ../mail/message-list.c:2282
+#: ../mail/em-folder-tree.c:2181 ../mail/message-list.c:2281
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2201
+#: ../mail/em-folder-tree.c:2200
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
@@ -13066,19 +13066,19 @@ msgstr "不符合"
 msgid "Loading..."
 msgstr "載入中…"
 
-#: ../mail/em-folder-utils.c:518
+#: ../mail/em-folder-utils.c:517
 msgid "Move Folder To"
 msgstr "移動資料夾到"
 
-#: ../mail/em-folder-utils.c:518
+#: ../mail/em-folder-utils.c:517
 msgid "Copy Folder To"
 msgstr "複製資料夾到"
 
-#: ../mail/em-folder-utils.c:616
+#: ../mail/em-folder-utils.c:615
 msgid "Create Folder"
 msgstr "建立資料夾"
 
-#: ../mail/em-folder-utils.c:617
+#: ../mail/em-folder-utils.c:616
 msgid "Specify where to create the folder:"
 msgstr "指定要建立資料夾的位置："
 
@@ -13095,7 +13095,7 @@ msgid "Subscribe To _All"
 msgstr "全部訂閱(_A)"
 
 #: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
@@ -13132,7 +13132,7 @@ msgid "Su_bscribe"
 msgstr "訂閱(_B)"
 
 #: ../mail/em-subscription-editor.c:1835
-#: ../modules/mail/e-mail-shell-view-actions.c:1632
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "Unsubscribe from the selected folder"
 msgstr "取消訂閱選取的資料夾"
 
@@ -13986,7 +13986,7 @@ msgid ""
 msgstr "要永久移除所有資料夾中所有刪除的郵件？"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1518
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
@@ -14596,46 +14596,46 @@ msgstr "高"
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:466 ../mail/message-list.c:5719
+#: ../mail/message-list.c:466 ../mail/message-list.c:5715
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
+#: ../mail/message-list.c:1857 ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:1866
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %p %l:%M"
 
-#: ../mail/message-list.c:1879
+#: ../mail/message-list.c:1878
 msgid "%a %l:%M %p"
-msgstr "%a %p %l:%M"
+msgstr "%A %p %l:%M"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1886
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %p %l:%M"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:1888
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2767
+#: ../mail/message-list.c:2766
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3394 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "郵件"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4764
+#: ../mail/message-list.c:4760
 msgid "Follow-up"
 msgstr "跟隨"
 
-#: ../mail/message-list.c:5657
+#: ../mail/message-list.c:5653
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -14643,7 +14643,7 @@ msgid ""
 "by changing the query above."
 msgstr "æ²’æœ‰éƒµä»¶æ»¿è¶³ä½ çš„æœå°‹æ¢ä»¶ã€‚è«‹å¾žä¸Šåˆ—ä¸‹æ‹‰å¼é¸å–®é¸æ“‡é¡¯ç¤ºéƒµä»¶éŽæ¿¾å™¨æˆ–åŸ·è¡Œæ–°çš„æœå°‹ï¼Œå¯å¾ž 搜尋->清除 é¸å–®é …ç›®æ¸…é™¤å®ƒæˆ–æ”¹è®Šä¸Šé¢çš„æŸ¥è©¢ã€‚"
 
-#: ../mail/message-list.c:5665
+#: ../mail/message-list.c:5661
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -14680,27 +14680,27 @@ msgid "Subject or Addresses contains"
 msgstr "主旨或電子郵件位址包含"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2001
+#: ../modules/mail/e-mail-shell-view-actions.c:2000
 msgid "Recipients contain"
 msgstr "收件者包含"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1994
+#: ../modules/mail/e-mail-shell-view-actions.c:1993
 msgid "Message contains"
 msgstr "郵件包含"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2015
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Subject contains"
 msgstr "主旨包含"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2008
+#: ../modules/mail/e-mail-shell-view-actions.c:2007
 msgid "Sender contains"
 msgstr "寄件者包含"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1987
+#: ../modules/mail/e-mail-shell-view-actions.c:1986
 msgid "Body contains"
 msgstr "內文包含"
 
@@ -14854,7 +14854,7 @@ msgstr "顯示已選取通訊錄中所有聯絡人的地圖"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1421
 #: ../modules/calendar/e-memo-shell-view-actions.c:643
 #: ../modules/calendar/e-task-shell-view-actions.c:767
-#: ../modules/mail/e-mail-shell-view-actions.c:1609
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "_Rename..."
 msgstr "重新命名(_R)…"
 
@@ -14935,7 +14935,7 @@ msgstr "動作(_A)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1017
 #: ../modules/calendar/e-memo-shell-view-actions.c:680
 #: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1774
+#: ../modules/mail/e-mail-shell-view-actions.c:1773
 msgid "_Preview"
 msgstr "é è¦½(_P)"
 
@@ -14947,7 +14947,7 @@ msgid "_Delete"
 msgstr "刪除(_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1030
-#: ../modules/mail/e-mail-shell-view-actions.c:1525
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "_Properties"
 msgstr "屬性(_P)"
 
@@ -14974,7 +14974,7 @@ msgstr "åœ¨è¯çµ¡äººé è¦½è¦–çª—é¡¯ç¤ºåœ°åœ–"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1099
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:914
-#: ../modules/mail/e-mail-shell-view-actions.c:1904
+#: ../modules/mail/e-mail-shell-view-actions.c:1903
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
@@ -14985,7 +14985,7 @@ msgstr "åœ¨è¯çµ¡äººæ¸…å–®ä¸‹æ–¹é¡¯ç¤ºè¯çµ¡äººé è¦½"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1106
 #: ../modules/calendar/e-memo-shell-view-actions.c:757
 #: ../modules/calendar/e-task-shell-view-actions.c:921
-#: ../modules/mail/e-mail-shell-view-actions.c:1911
+#: ../modules/mail/e-mail-shell-view-actions.c:1910
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
@@ -15004,7 +15004,7 @@ msgstr "沒有相符資料"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1764
 #: ../modules/calendar/e-memo-shell-view-actions.c:784
 #: ../modules/calendar/e-task-shell-view-actions.c:983
-#: ../modules/mail/e-mail-shell-view-actions.c:1980
+#: ../modules/mail/e-mail-shell-view-actions.c:1979
 #: ../shell/e-shell-content.c:658
 msgid "Advanced Search"
 msgstr "進階搜尋"
@@ -15366,7 +15366,7 @@ msgid "Using LDAP"
 msgstr "使用 LDAP"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:117
+#: ../modules/mail/e-mail-shell-view.c:116
 msgid "Searching"
 msgstr "正在搜尋"
 
@@ -15925,6 +15925,7 @@ msgid "Rename the selected calendar"
 msgstr "重新命名選取的行事曆"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#, fuzzy
 #| msgid "Find _next"
 msgid "Find _Next"
 msgstr "尋找下一個(_N)"
@@ -15934,6 +15935,7 @@ msgid "Find next occurrence of the current search string"
 msgstr "尋找目前搜尋字詞下一個出現處"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#, fuzzy
 #| msgid "Find _previous"
 msgid "Find _Previous"
 msgstr "尋找上一個(_P)"
@@ -15943,6 +15945,7 @@ msgid "Find previous occurrence of the current search string"
 msgstr "尋找目前搜尋字詞上一個出現處"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#, fuzzy
 #| msgid "Stop _running search"
 msgid "Stop _Running Search"
 msgstr "停止執行搜尋(_R)"
@@ -16641,61 +16644,61 @@ msgstr "%A %p %l:%M:%S"
 #. * without a year.
 #: ../modules/itip-formatter/itip-view.c:322
 msgid "%A, %B %e"
-msgstr "%m月%e日(%A)"
+msgstr "%b%eæ—¥%A"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
 #: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %H:%M"
-msgstr "%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:337
 msgid "%A, %B %e %l:%M %p"
-msgstr "%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:341
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%m月%e日(%A) %p %l:%M:%S"
+msgstr "%b%eæ—¥%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
 #: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y"
-msgstr "%Y年%m月%e日(%A)"
+msgstr "%Yå¹´%b%eæ—¥%A"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
 #: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%Y年%m月%e日(%A) %H:%M"
+msgstr "%Yå¹´%b%eæ—¥%A %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
 #: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%Y年%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Y年%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Y年%m月%e日(%A) %p %l:%M:%S"
+msgstr "%Yå¹´%b%eæ—¥%A %p %l:%M:%S"
 
 #: ../modules/itip-formatter/itip-view.c:403
 #: ../modules/itip-formatter/itip-view.c:404
@@ -17457,319 +17460,319 @@ msgctxt "label"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:659
+#: ../modules/mail/e-mail-shell-view-actions.c:658
 msgid "Marking messages as read..."
 msgstr "將郵件標示成已經閱讀…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "_Disable Account"
 msgstr "停用帳號(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Disable this account"
 msgstr "停用這個帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1520
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "Edit properties of this account"
 msgstr "編輯這個帳號的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1532
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1534
+#: ../modules/mail/e-mail-shell-view-actions.c:1533
 msgid "Refresh list of folders of this account"
 msgstr "重新整理這個帳號的資料夾清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1539
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "_Download Messages for Offline Usage"
 msgstr "下載離線使用的郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1541
+#: ../modules/mail/e-mail-shell-view-actions.c:1540
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下載標記為離線使用的帳號與資料夾之郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1546
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Fl_ush Outbox"
 msgstr "清理寄件匣(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1552
 msgid "_Copy Folder To..."
 msgstr "複製資料夾到(_C)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "Copy the selected folder into another folder"
 msgstr "複製已選定的資料夾到另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
+#: ../modules/mail/e-mail-shell-view-actions.c:1561
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
-#: ../modules/mail/e-mail-shell-view-actions.c:1676
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Mark all messages in the folder as read"
 msgstr "將資料夾中全部的郵件標示成已閱讀"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1588
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
 msgid "_New..."
 msgstr "新增(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Create a new folder for storing mail"
 msgstr "建立一個新資料夾以儲存郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
 msgid "Change the properties of this folder"
 msgstr "更改這個資料夾的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1604
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
 msgid "Refresh the folder"
 msgstr "重新載入資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1611
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "Change the name of this folder"
 msgstr "更改這個資料夾的名稱"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
 msgid "Select Message _Thread"
 msgstr "é¸æ“‡éƒµä»¶æª”é ­(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1618
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "Select Message S_ubthread"
 msgstr "選擇郵件子羣組(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1625
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Select all replies to the currently selected message"
 msgstr "選擇所有回覆選定郵件的信"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1636
 msgid "Empty _Trash"
 msgstr "清理回收筒(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久移除在所有帳號內全部已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1643
 msgid "_New Label"
 msgstr "新增標籤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
 msgid "N_one"
 msgstr "沒有(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "_Manage Subscriptions"
 msgstr "管理訂閱(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1669
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "è¨‚é–±æˆ–å–æ¶ˆè¨‚é–±åœ¨é ç«¯ä¼ºæœå™¨çš„è³‡æ–™å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1681
-#: ../modules/mail/e-mail-shell-view-actions.c:1702
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Send queued items and retrieve new items"
 msgstr "å‚³é€å¾…é€çš„é …ç›®ä¸¦æŽ¥æ”¶æ–°çš„é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1688
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Receive new items from all accounts"
 msgstr "æŽ¥æ”¶åœ¨æ‰€æœ‰å¸³è™Ÿå…§çš„æ–°é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1695
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
 msgid "_Send All"
 msgstr "全部傳送(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "Send queued items in all accounts"
 msgstr "å‚³é€åœ¨æ‰€æœ‰å¸³è™Ÿå…§å¾…é€çš„é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Cancel the current mail operation"
 msgstr "取消目前郵件所作的行動"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1729
 msgid "Collapse All _Threads"
 msgstr "收摺所有相關郵件(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1736
 msgid "E_xpand All Threads"
 msgstr "展開所有相關郵件(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Expand all message threads"
 msgstr "展開所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
 msgid "_Message Filters"
 msgstr "郵件規則(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1750
 msgid "_Subscriptions..."
 msgstr "訂閱(_S)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1760
+#: ../modules/mail/e-mail-shell-view-actions.c:1759
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#: ../modules/mail/e-mail-shell-view-actions.c:1766
 msgid "_Label"
 msgstr "標籤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1784
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1791
+#: ../modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Create or edit search folder definitions"
 msgstr "建立或編輯搜尋資料夾的定義"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1832
+#: ../modules/mail/e-mail-shell-view-actions.c:1831
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1860
+#: ../modules/mail/e-mail-shell-view-actions.c:1859
 msgid "Show Message _Preview"
 msgstr "é¡¯ç¤ºéƒµä»¶é è¦½(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1862
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "Show message preview pane"
 msgstr "é¡¯ç¤ºéƒµä»¶é è¦½çª—æ ¼"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Show _Deleted Messages"
 msgstr "顯示已刪除郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1870
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
 msgid "Show deleted messages with a line through them"
 msgstr "顯示已刪除的郵件 (åŠ ä¸Šåˆªé™¤ç·š)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1876
+#: ../modules/mail/e-mail-shell-view-actions.c:1875
 msgid "_Group By Threads"
 msgstr "æ ¹æ“šç›¸é—œéƒµä»¶ç‚ºç¾£çµ„(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1878
+#: ../modules/mail/e-mail-shell-view-actions.c:1877
 msgid "Threaded message list"
 msgstr "相關郵件清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1884
+#: ../modules/mail/e-mail-shell-view-actions.c:1883
 msgid "_Unmatched Folder Enabled"
 msgstr "未符合資料夾已啟用(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1886
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "切換是否啟用未符合搜尋資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1906
+#: ../modules/mail/e-mail-shell-view-actions.c:1905
 msgid "Show message preview below the message list"
 msgstr "åœ¨éƒµä»¶æ¸…å–®ä¸‹æ–¹é¡¯ç¤ºéƒµä»¶é è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1913
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "Show message preview alongside the message list"
 msgstr "åœ¨éƒµä»¶æ¸…å–®æ—é‚Šé¡¯ç¤ºéƒµä»¶é è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1921
+#: ../modules/mail/e-mail-shell-view-actions.c:1920
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1928
+#: ../modules/mail/e-mail-shell-view-actions.c:1927
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1935
+#: ../modules/mail/e-mail-shell-view-actions.c:1934
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1942
+#: ../modules/mail/e-mail-shell-view-actions.c:1941
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1949
+#: ../modules/mail/e-mail-shell-view-actions.c:1948
 msgid "Messages with Attachments"
 msgstr "有附件的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1956
+#: ../modules/mail/e-mail-shell-view-actions.c:1955
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1963
+#: ../modules/mail/e-mail-shell-view-actions.c:1962
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1970
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2021
 msgid "Subject or Addresses contain"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../modules/mail/e-mail-shell-view-actions.c:2031
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2039
+#: ../modules/mail/e-mail-shell-view-actions.c:2038
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2046
+#: ../modules/mail/e-mail-shell-view-actions.c:2045
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../modules/mail/e-mail-shell-view.c:630
+#: ../modules/mail/e-mail-shell-view.c:629
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view.c:734
+#: ../modules/mail/e-mail-shell-view.c:733
 msgid "Account Search"
 msgstr "帳號搜尋"
 
@@ -17878,24 +17881,24 @@ msgstr "是否要將 Evolution è¨­ç‚ºä½ çš„é è¨­é›»å­éƒµä»¶å®¢æˆ¶ç«¯ï¼Ÿ"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:311
+#: ../modules/mdn/evolution-mdn.c:310
 #, 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.
-#: ../modules/mdn/evolution-mdn.c:378
+#: ../modules/mdn/evolution-mdn.c:377
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "「%s」的遞送通知"
 
-#: ../modules/mdn/evolution-mdn.c:543
+#: ../modules/mdn/evolution-mdn.c:542
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "傳送郵件回條給「%s」"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:548
+#: ../modules/mdn/evolution-mdn.c:547
 msgid "_Notify Sender"
 msgstr "通知寄件者(_N)"
 
@@ -18594,7 +18597,7 @@ msgid ""
 "closed as long as the editor is active."
 msgstr "外部編輯器仍在執行中。只要該編輯器仍在使用，郵件編輯器視窗就不能關閉。"
 
-#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
+#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:330
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
@@ -19771,11 +19774,11 @@ msgid ""
 "System error: %s"
 msgstr "不能啟動 Evolution。可能有另一個 Evolution 實體沒有回應。系統錯誤：%s"
 
-#: ../shell/main.c:499 ../shell/main.c:504
+#: ../shell/main.c:497 ../shell/main.c:502
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:569
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19784,7 +19787,7 @@ msgstr ""
 "%s： --online 和 --offline 不能一起使用。\n"
 "  使用 '%s --help' 取得進一步資訊。\n"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:575
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19838,174 +19841,105 @@ msgstr ""
 "\n"
 "編輯信任設定值："
 
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:120
 msgid "Certificate Name"
 msgstr "證書名稱"
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
 msgid "Issued To Organization"
 msgstr "發給組織"
 
-#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
 msgid "Issued To Organizational Unit"
 msgstr "發給組織單位"
 
-#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114
-#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
 msgid "Serial Number"
 msgstr "序號"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:123
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116
-#: ../smime/gui/certificate-viewer.c:640
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:124
 msgid "Issued By"
 msgstr "發照者"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Issued By Organization"
 msgstr "發照組織"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Issued By Organizational Unit"
 msgstr "發照組織單位"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued"
 msgstr "發行者"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Expires"
 msgstr "到期"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
-#: ../smime/gui/certificate-viewer.c:650
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
-#: ../smime/gui/certificate-viewer.c:651
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:121
 msgid "Email Address"
 msgstr "電子郵件位址"
 
-#: ../smime/gui/certificate-manager.c:614
+#: ../smime/gui/certificate-manager.c:622
 msgid "Select a certificate to import..."
 msgstr "選取要匯入的證書…"
 
-#: ../smime/gui/certificate-manager.c:628
+#: ../smime/gui/certificate-manager.c:636
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:672
 msgid "Failed to import certificate"
 msgstr "無法匯入證書"
 
-#: ../smime/gui/certificate-manager.c:1046
+#: ../smime/gui/certificate-manager.c:1054
 msgid "All PKCS12 files"
 msgstr "所有的 PKCS12 檔案"
 
-#: ../smime/gui/certificate-manager.c:1063
+#: ../smime/gui/certificate-manager.c:1071
 msgid "All email certificate files"
 msgstr "所有的電子郵件證書檔案"
 
-#: ../smime/gui/certificate-manager.c:1080
+#: ../smime/gui/certificate-manager.c:1088
 msgid "All CA certificate files"
 msgstr "所有的 CA 證書檔案"
 
-#: ../smime/gui/certificate-viewer.c:292
-msgid "Not part of certificate"
-msgstr "不是證書的部份"
-
-#: ../smime/gui/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr "此證書已經檢驗用於下列用途："
-
-#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
-msgid "SSL Client Certificate"
-msgstr "SSL 用戶端證書"
-
-#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "SSL 伺服器證書"
-
-#: ../smime/gui/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "電子郵件簽署者證書"
-
-#: ../smime/gui/certificate-viewer.c:619
-msgid "Email Recipient Certificate"
-msgstr "電子郵件收件者證書"
-
-#: ../smime/gui/certificate-viewer.c:634
-msgid "Issued To"
-msgstr "發給"
-
-#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr "一般名稱 (CN)"
-
-#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "組織 (O)"
-
-#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "組織單位 (OU)"
-
-#: ../smime/gui/certificate-viewer.c:645
-msgid "Validity"
-msgstr "有效性"
-
-#: ../smime/gui/certificate-viewer.c:646
-msgid "Issued On"
-msgstr "發照日期"
-
-#: ../smime/gui/certificate-viewer.c:647
-msgid "Expires On"
-msgstr "到期日期"
-
-#: ../smime/gui/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr "數碼指紋"
-
-#: ../smime/gui/certificate-viewer.c:671
-msgid "Certificate Hierarchy"
-msgstr "證書階層"
-
-#: ../smime/gui/certificate-viewer.c:674
-msgid "Certificate Fields"
-msgstr "證書欄位"
-
-#: ../smime/gui/certificate-viewer.c:677
-msgid "Field Value"
-msgstr "欄位數值"
-
-#: ../smime/gui/certificate-viewer.c:679
-msgid "Details"
-msgstr "詳細資料"
-
 #: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
@@ -20122,7 +20056,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr "ä¿¡ä»»æ­¤æ ¸è­‰æ©Ÿé—œä¹‹å‰ï¼Œå¦‚æžœå¯ä»¥çš„è©±ï¼Œä½ æ‡‰è©²å…ˆæª¢æŸ¥å®ƒçš„è­‰æ›¸ä»¥åŠå®ƒçš„æ”¿ç­–å’Œç¨‹åºã€‚"
 
-#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "Certificate"
 msgstr "證書"
 
@@ -20146,190 +20080,20 @@ msgstr "不信任此證書的有效性"
 msgid "_Edit CA Trust"
 msgstr "ç·¨è¼¯æ ¸è­‰æ©Ÿé—œ (CA) 信任度(_E)"
 
-#: ../smime/lib/e-asn1-object.c:95
-msgid "Version"
-msgstr "版本"
-
-#: ../smime/lib/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "版本 1"
-
-#: ../smime/lib/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "版本 2"
-
-#: ../smime/lib/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "版本 3"
-
-#: ../smime/lib/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "證書密碼匙使用"
-
-#: ../smime/lib/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Netscape 證書類型"
-
-#: ../smime/lib/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "æ ¸è­‰æ©Ÿé—œå¯†ç¢¼åŒ™è­˜åˆ¥ç¢¼"
-
-#: ../smime/lib/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "物件識別碼 (%s)"
-
-#: ../smime/lib/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "演算法識別碼"
-
-#: ../smime/lib/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "演算法參數"
-
-#: ../smime/lib/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "主旨公開密碼匙資訊"
-
-#: ../smime/lib/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "主旨公開密碼匙演算法"
-
-#: ../smime/lib/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "主旨的公開密碼匙"
-
-#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "錯誤：無法處理延伸"
-
-#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "物件簽署者"
-
-#: ../smime/lib/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "SSL 證書單位"
-
-#: ../smime/lib/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "電子郵件單位"
-
-#: ../smime/lib/e-asn1-object.c:436
-msgid "Signing"
-msgstr "簽署中"
-
-#: ../smime/lib/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "不可拒絕"
-
-#: ../smime/lib/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "å¯†ç¢¼åŒ™åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "資料密碼"
-
-#: ../smime/lib/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "密碼匙合同"
-
-#: ../smime/lib/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "證書簽署者"
-
-#: ../smime/lib/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL 簽署者"
-
-#: ../smime/lib/e-asn1-object.c:509
-msgid "Critical"
-msgstr "重要"
-
-#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "不重要"
-
-#: ../smime/lib/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "延伸"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
-msgid "Certificate Signature Algorithm"
-msgstr "證書簽署演算法"
-
-#: ../smime/lib/e-asn1-object.c:681
-msgid "Issuer"
-msgstr "發照者"
-
-#: ../smime/lib/e-asn1-object.c:735
-msgid "Issuer Unique ID"
-msgstr "發照者獨有 ID"
-
-#: ../smime/lib/e-asn1-object.c:754
-msgid "Subject Unique ID"
-msgstr "主旨獨有 ID"
-
-#: ../smime/lib/e-asn1-object.c:813
-msgid "Certificate Signature Value"
-msgstr "證書簽署值"
-
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:404
 msgid "Sign"
 msgstr "簽署"
 
-#: ../smime/lib/e-cert.c:393
+#: ../smime/lib/e-cert.c:405
 msgid "Encrypt"
 msgstr "åŠ å¯†"
 
-#: ../smime/lib/e-cert-db.c:864
+#: ../smime/lib/e-cert-db.c:718
 msgid "Certificate already exists"
 msgstr "證書已經存在"
 
@@ -20417,6 +20181,180 @@ msgstr "到期日(_D):"
 msgid "With _Status"
 msgstr "設定狀態(_S)"
 
+#~ msgid "Not part of certificate"
+#~ msgstr "不是憑證的部份"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "此憑證已經檢驗用於下列用途："
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL 用戶端憑證"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL 伺服器憑證"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "電子郵件簽署者憑證"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "電子郵件收件者憑證"
+
+#~ msgid "Issued To"
+#~ msgstr "發給"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "一般名稱 (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "組織 (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "組織單位 (OU)"
+
+#~ msgid "Validity"
+#~ msgstr "有效性"
+
+#~ msgid "Issued On"
+#~ msgstr "發照日期"
+
+#~ msgid "Expires On"
+#~ msgstr "到期日期"
+
+#~ msgid "Fingerprints"
+#~ msgstr "數位指紋"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "憑證階層"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "憑證欄位"
+
+#~ msgid "Field Value"
+#~ msgstr "欄位數值"
+
+#~ msgid "Details"
+#~ msgstr "詳細資料"
+
+#~ msgid "Version"
+#~ msgstr "版本"
+
+#~ msgid "Version 1"
+#~ msgstr "版本 1"
+
+#~ msgid "Version 2"
+#~ msgstr "版本 2"
+
+#~ msgid "Version 3"
+#~ msgstr "版本 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "PKCS #1 MD2 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "PKCS #1 MD5 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-1 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-256 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-384 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-512 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA åŠ å¯†"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "憑證金鑰使用"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Netscape 憑證類型"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "憑證管理中心金鑰識別碼"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "物件識別碼 (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "演算法識別碼"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "演算法參數"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "主旨公鑰資訊"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "主旨公鑰演算法"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "主旨的公鑰"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "錯誤：無法處理延伸"
+
+#~ msgid "Object Signer"
+#~ msgstr "物件簽署者"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "SSL 憑證單位"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "電子郵件單位"
+
+#~ msgid "Signing"
+#~ msgstr "簽署中"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "不可拒絕"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "é‡‘é‘°åŠ å¯†"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "資料密碼"
+
+#~ msgid "Key Agreement"
+#~ msgstr "金鑰合同"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "憑證簽署者"
+
+#~ msgid "CRL Signer"
+#~ msgstr "CRL 簽署者"
+
+#~ msgid "Critical"
+#~ msgstr "重要"
+
+#~ msgid "Not Critical"
+#~ msgstr "不重要"
+
+#~ msgid "Extensions"
+#~ msgstr "延伸"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "æ†‘è­‰ç°½ç« æ¼”ç®—æ³•"
+
+#~ msgid "Issuer"
+#~ msgstr "發照者"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "發照者獨有 ID"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "主旨獨有 ID"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "æ†‘è­‰ç°½ç« å€¼"
+
 #~ msgid "Could not open %s: Unknown error"
 #~ msgstr "無法開啟 %s：未知的錯誤"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9002c78..dfa72f2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,13 +6,14 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010, 2012.
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
+#: ../shell/main.c:555
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-23 22:00+0800\n"
-"PO-Revision-Date: 2013-09-23 22:00+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"POT-Creation-Date: 2013-09-30 19:23+0800\n"
+"PO-Revision-Date: 2013-09-29 02:25+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -270,11 +271,10 @@ msgid "_Wants to receive HTML mail"
 msgstr "可接受 H_TML 郵件"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:409
+#: ../addressbook/gui/widgets/eab-contact-merging.c:409
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:590
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:942
-#: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "電子郵件"
 
@@ -723,32 +723,32 @@ msgstr "編輯清單時發生錯誤"
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "偵測到重複的連絡人"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:2
 msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
 msgstr "此連絡人的名稱或電子郵件地址已經存在於此資料夾。要強制儲存變更嗎？"
 
 #. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:4
 msgid "Conflicting Contact:"
 msgstr "衝突的連絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:5
 msgid "Changed Contact:"
 msgstr "變更後的連絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:364
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-merging.c:364
 msgid "_Merge"
 msgstr "合併(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:3
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -756,20 +756,20 @@ msgstr ""
 "此連絡人的名稱或電子郵件地址已經存在\n"
 "於此資料夾。您無論如何都要新增它嗎？"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:5
 msgid "Original Contact:"
 msgstr "原本的連絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:6
 msgid "New Contact:"
 msgstr "新的連絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
+#: ../addressbook/gui/widgets/eab-contact-merging.c:244
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:346
+#: ../addressbook/gui/widgets/eab-contact-merging.c:346
 msgid "Merge Contact"
 msgstr "合併連絡人"
 
@@ -1451,16 +1451,16 @@ msgstr "將名片顯示成 vcard 或 csv 檔案"
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:136
+#: ../addressbook/tools/evolution-addressbook-export.c:134
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 --help é¸é …ä¾†æŸ¥çœ‹ç”¨æ³•ã€‚"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:150
+#: ../addressbook/tools/evolution-addressbook-export.c:148
 msgid "Only support csv or vcard format."
 msgstr "僅支援 csv 或 vcard æ ¼å¼ã€‚"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:181
+#: ../addressbook/tools/evolution-addressbook-export.c:179
 msgid "Unhandled error"
 msgstr "未處理的錯誤"
 
@@ -3566,7 +3566,7 @@ msgstr "Gnome 行事曆"
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../modules/calendar/e-cal-shell-view-private.c:1225
 msgid "%A %d %b %Y"
-msgstr "%Y年%m月%d日 (%A)"
+msgstr "%Y年%m月%d日%A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. * %b = abbreviated month name. Don't use any other specifiers.
@@ -6635,7 +6635,7 @@ msgid "S_ubject:"
 msgstr "主旨(_U):"
 
 #: ../composer/e-composer-header-table.c:813
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../mail/e-mail-config-identity-page.c:489
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
@@ -6647,28 +6647,28 @@ msgstr "按這裡新增目錄服務"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡，選取要張貼的資料夾"
 
-#: ../composer/e-msg-composer.c:869
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç„¡æ³•ç°½ç½²é€å‡ºçš„éƒµä»¶ï¼šæ­¤å¸³è™Ÿæ²’æœ‰è¨­å®šç°½ç« æ†‘è­‰"
 
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:887
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç„¡æ³•åŠ å¯†é€å‡ºçš„éƒµä»¶ï¼šæ²’æœ‰è¨­å®šåŠ å¯†æ†‘è­‰(此帳號)"
 
-#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
+#: ../composer/e-msg-composer.c:1566 ../composer/e-msg-composer.c:1967
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4213
+#: ../composer/e-msg-composer.c:4235
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
-#: ../composer/e-msg-composer.c:4886
+#: ../composer/e-msg-composer.c:4908
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
@@ -6847,10 +6847,10 @@ msgid "Manage your email, contacts and schedule"
 msgstr "管理您的郵件、連絡人和行程"
 
 #: ../data/evolution.desktop.in.in.h:5
+#, fuzzy
 #| msgid "mail;calendar;contact;addressbook;task;"
 msgid "email;calendar;contact;addressbook;task;"
-msgstr ""
-"email;calendar;contact;addressbook;task;郵件;行事曆;連絡人;通訊錄;工作;"
+msgstr "mail;calendar;contact;addressbook;task;郵件;行事曆;連絡人;通訊錄;工作;"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -9110,7 +9110,7 @@ msgid "S/MIME encrpyted"
 msgstr "S/MIME åŠ å¯†"
 
 #: ../em-format/e-mail-formatter-print-headers.c:171
-#: ../mail/e-mail-config-security-page.c:642
+#: ../mail/e-mail-config-security-page.c:645
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:195
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:129
 msgid "Security"
@@ -9119,7 +9119,7 @@ msgstr "安全性"
 #: ../em-format/e-mail-formatter-quote-headers.c:168
 #: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
 #: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+#: ../modules/mail/em-mailer-prefs.c:69
 msgid "Subject"
 msgstr "主旨"
 
@@ -9695,7 +9695,7 @@ msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
 #: ../e-util/e-activity-proxy.c:311
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1722
 msgid "Cancel"
 msgstr "取消"
 
@@ -9945,13 +9945,13 @@ msgstr "複製備忘錄清單內容至本地以便離線作業"
 #: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
 msgctxt "CalItem"
 msgid "%B"
-msgstr "%B"
+msgstr "%m月"
 
 #. This is a strftime() format. %Y = Year.
 #: ../e-util/e-calendar-item.c:1329
 msgctxt "CalItem"
 msgid "%Y"
-msgstr "%Y"
+msgstr "%Yå¹´"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../e-util/e-calendar-item.c:1366
@@ -10054,7 +10054,7 @@ msgstr "確定"
 msgid "The time must be in the format: %s"
 msgstr "æ™‚é–“å¿…é ˆç‚ºæ­¤æ ¼å¼ï¼š%s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1850
 msgid "?"
 msgstr "?"
 
@@ -10825,7 +10825,7 @@ msgstr "åˆ°é”é é¢é ‚ç«¯ï¼Œå¾žåº•éƒ¨ç¹¼çºŒ"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
 #: ../mail/importers/pine-importer.c:419
-#: ../modules/mail/e-mail-shell-view.c:1075
+#: ../modules/mail/e-mail-shell-view.c:1074
 msgid "Mail"
 msgstr "郵件"
 
@@ -11235,7 +11235,7 @@ msgid "Flags"
 msgstr "旗標"
 
 #: ../e-util/evolution-source-viewer.c:726
-#: ../mail/e-mail-config-identity-page.c:677
+#: ../mail/e-mail-config-identity-page.c:678
 msgid "Identity"
 msgstr "身分"
 
@@ -11388,31 +11388,31 @@ msgstr[0] "取回 %d 封郵件"
 msgid "Scanning messages for duplicates"
 msgstr "掃描郵件是否有重複"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1184
+#: ../libemail-engine/e-mail-folder-utils.c:1183
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移除資料夾「%s」"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1321
+#: ../libemail-engine/e-mail-folder-utils.c:1320
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "檔案「%s」已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1324
 msgid "File has been removed."
 msgstr "檔案已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1384
+#: ../libemail-engine/e-mail-folder-utils.c:1383
 msgid "Removing attachments"
 msgstr "正在移除附件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1548
+#: ../libemail-engine/e-mail-folder-utils.c:1547
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "儲存 %d 封郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1926
+#: ../libemail-engine/e-mail-folder-utils.c:1925
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "無效的資料夾 URI「%s」"
@@ -11487,24 +11487,24 @@ msgstr "範本"
 msgid "User cancelled operation"
 msgstr "使用者取消的操作"
 
-#: ../libemail-engine/e-mail-session.c:1542
+#: ../libemail-engine/e-mail-session.c:1567
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s æ ¸å°å¤±æ•—"
 
-#: ../libemail-engine/e-mail-session.c:1592
+#: ../libemail-engine/e-mail-session.c:1617
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../libemail-engine/e-mail-session.c:1655
+#: ../libemail-engine/e-mail-session.c:1680
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "沒有提供目的地位址，郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:1668
+#: ../libemail-engine/e-mail-session.c:1693
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "找不到可使用的識別符，郵件的轉寄已經取消。"
@@ -11524,7 +11524,7 @@ msgstr "重新連線到「%s」"
 msgid "Preparing account '%s' for offline"
 msgstr "準備帳號「%s」離線工作"
 
-#: ../libemail-engine/mail-folder-cache.c:1241
+#: ../libemail-engine/mail-folder-cache.c:1240
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -11630,12 +11630,12 @@ msgstr "轉寄的郵件 - %s"
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
-#: ../libemail-engine/mail-vfolder.c:153
+#: ../libemail-engine/mail-vfolder.c:152
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
-#: ../libemail-engine/mail-vfolder.c:306
+#: ../libemail-engine/mail-vfolder.c:305
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "更新「%s」的搜尋資料夾- %s"
@@ -11645,7 +11645,7 @@ msgstr "更新「%s」的搜尋資料夾- %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:670
+#: ../libemail-engine/mail-vfolder.c:669
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -11691,8 +11691,8 @@ msgid "Account Name"
 msgstr "帳號名稱"
 
 #: ../mail/e-mail-account-tree-view.c:136
-#: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3532
+#: ../mail/e-mail-config-security-page.c:335
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3532
 #: ../mail/mail-config.ui.h:49
 msgid "Default"
 msgstr "é è¨­å€¼"
@@ -11869,15 +11869,15 @@ msgstr "電子郵件位址(_A):"
 msgid "Optional Information"
 msgstr "選擇性的資訊"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:440
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:467
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:522
 msgid "Add Ne_w Signature..."
 msgstr "åŠ å…¥æ–°çš„ç°½åæª”(_W)…"
 
@@ -11907,88 +11907,87 @@ msgstr "接收電子郵件"
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "一般"
 
-#: ../mail/e-mail-config-security-page.c:268
+#: ../mail/e-mail-config-security-page.c:269
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不簽署會議邀請 (相容於 _Outlook)"
 
-#: ../mail/e-mail-config-security-page.c:290
+#: ../mail/e-mail-config-security-page.c:291
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "嚴密隱私權 (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:298
+#: ../mail/e-mail-config-security-page.c:300
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP 金鑰 ID(_K):"
 
-#: ../mail/e-mail-config-security-page.c:320
+#: ../mail/e-mail-config-security-page.c:322
 msgid "Si_gning algorithm:"
 msgstr "ç°½ç« æ¼”ç®—æ³•(_G):"
 
-#: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
+#: ../mail/e-mail-config-security-page.c:338
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:50
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
+#: ../mail/e-mail-config-security-page.c:341
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:51
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
+#: ../mail/e-mail-config-security-page.c:344
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:52
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
+#: ../mail/e-mail-config-security-page.c:347
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:53
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:361
+#: ../mail/e-mail-config-security-page.c:363
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名(_W)"
 
-#: ../mail/e-mail-config-security-page.c:373
+#: ../mail/e-mail-config-security-page.c:375
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ç•¶å‚³é€åŠ å¯†éƒµä»¶æ™‚æ°¸é è‡ªæˆ‘åŠ å¯†(_M)"
 
-#: ../mail/e-mail-config-security-page.c:385
+#: ../mail/e-mail-config-security-page.c:387
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "åŠ å¯†æ™‚æ°¸é ä¿¡ä»»æˆ‘çš„é‘°åŒ™åœˆè£¡çš„é‡‘é‘°(_T)"
 
-#: ../mail/e-mail-config-security-page.c:409
+#: ../mail/e-mail-config-security-page.c:411
 msgid "Secure MIME (S/MIME)"
 msgstr "安全式 MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:417
+#: ../mail/e-mail-config-security-page.c:420
 msgid "Sig_ning certificate:"
 msgstr "簽名憑證(_N):"
 
-#: ../mail/e-mail-config-security-page.c:441
-#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:444
+#: ../mail/e-mail-config-security-page.c:550
 msgid "Select"
 msgstr "選擇"
 
-#: ../mail/e-mail-config-security-page.c:459
+#: ../mail/e-mail-config-security-page.c:462
 msgid "Signing _algorithm:"
 msgstr "ç°½ç« æ¼”ç®—æ³•(_A):"
 
-#: ../mail/e-mail-config-security-page.c:500
+#: ../mail/e-mail-config-security-page.c:503
 msgid "Always sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名"
 
-#: ../mail/e-mail-config-security-page.c:523
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Encryption certificate:"
 msgstr "åŠ å¯†æ†‘è­‰ï¼š"
 
-#: ../mail/e-mail-config-security-page.c:565
+#: ../mail/e-mail-config-security-page.c:568
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "ä½¿ç”¨æ­¤å¸³è™Ÿæ™‚ä¸€å®šåœ¨å¤–é€çš„éƒµä»¶åŠ å¯†"
 
-#: ../mail/e-mail-config-security-page.c:585
+#: ../mail/e-mail-config-security-page.c:588
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "ç•¶å‚³é€åŠ å¯†éƒµä»¶æ™‚æ°¸é è‡ªæˆ‘åŠ å¯†"
 
@@ -12133,7 +12132,7 @@ msgid "_Later"
 msgstr "稍後(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:1025
+#: ../modules/mail/e-mail-shell-view-actions.c:1024
 msgid "Add Label"
 msgstr "åŠ å…¥æ¨™ç±¤"
 
@@ -12194,7 +12193,7 @@ msgstr "第 %d / %d é "
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:517
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:516
 msgid "C_opy"
 msgstr "複製(_O)"
 
@@ -12202,7 +12201,7 @@ msgstr "複製(_O)"
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:517
+#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:516
 msgid "_Move"
 msgstr "移動(_M)"
 
@@ -12809,7 +12808,7 @@ msgstr[0] "郵件"
 msgid "Parsing message"
 msgstr "解析郵件"
 
-#: ../mail/e-mail-request.c:182
+#: ../mail/e-mail-request.c:197
 msgid "The message has no text content."
 msgstr "這個郵件沒有文字內容。"
 
@@ -13156,41 +13155,41 @@ msgstr "建立(_R)"
 msgid "Folder _name:"
 msgstr "資料夾名稱(_N):"
 
-#: ../mail/em-folder-tree.c:637
+#: ../mail/em-folder-tree.c:636
 msgid "Folder names cannot contain '/'"
 msgstr "資料夾名稱不能包含斜線。"
 
-#: ../mail/em-folder-tree.c:774
+#: ../mail/em-folder-tree.c:773
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1599
+#: ../mail/em-folder-tree.c:1598
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-#: ../mail/em-folder-tree.c:2168 ../mail/em-folder-utils.c:112
+#: ../mail/em-folder-tree.c:2167 ../mail/em-folder-utils.c:112
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2171 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2170 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2178 ../mail/message-list.c:2280
+#: ../mail/em-folder-tree.c:2177 ../mail/message-list.c:2279
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2182 ../mail/message-list.c:2282
+#: ../mail/em-folder-tree.c:2181 ../mail/message-list.c:2281
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2201
+#: ../mail/em-folder-tree.c:2200
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
@@ -13204,19 +13203,19 @@ msgstr "不符合"
 msgid "Loading..."
 msgstr "載入中…"
 
-#: ../mail/em-folder-utils.c:518
+#: ../mail/em-folder-utils.c:517
 msgid "Move Folder To"
 msgstr "移動資料夾到"
 
-#: ../mail/em-folder-utils.c:518
+#: ../mail/em-folder-utils.c:517
 msgid "Copy Folder To"
 msgstr "複製資料夾到"
 
-#: ../mail/em-folder-utils.c:616
+#: ../mail/em-folder-utils.c:615
 msgid "Create Folder"
 msgstr "建立資料夾"
 
-#: ../mail/em-folder-utils.c:617
+#: ../mail/em-folder-utils.c:616
 msgid "Specify where to create the folder:"
 msgstr "指定要建立資料夾的位置："
 
@@ -13233,7 +13232,7 @@ msgid "Subscribe To _All"
 msgstr "全部訂閱(_A)"
 
 #: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
@@ -13270,7 +13269,7 @@ msgid "Su_bscribe"
 msgstr "訂閱(_B)"
 
 #: ../mail/em-subscription-editor.c:1835
-#: ../modules/mail/e-mail-shell-view-actions.c:1632
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "Unsubscribe from the selected folder"
 msgstr "取消訂閱選取的資料夾"
 
@@ -14138,7 +14137,7 @@ msgid ""
 msgstr "要永久移除所有資料夾中所有刪除的郵件？"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1518
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
@@ -14758,46 +14757,46 @@ msgstr "高"
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:466 ../mail/message-list.c:5719
+#: ../mail/message-list.c:466 ../mail/message-list.c:5715
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
+#: ../mail/message-list.c:1857 ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:1866
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %p %l:%M"
 
-#: ../mail/message-list.c:1879
+#: ../mail/message-list.c:1878
 msgid "%a %l:%M %p"
-msgstr "%a %p %l:%M"
+msgstr "%A %p %l:%M"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1886
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %p %l:%M"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:1888
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2767
+#: ../mail/message-list.c:2766
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3394 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "郵件"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4764
+#: ../mail/message-list.c:4760
 msgid "Follow-up"
 msgstr "跟隨"
 
-#: ../mail/message-list.c:5657
+#: ../mail/message-list.c:5653
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -14807,7 +14806,7 @@ msgstr ""
 "沒有郵件滿足您的搜尋條件。請從上列下拉式選單選擇顯示郵件過濾器或執行新的搜"
 "尋，可從 搜尋->清除 é¸å–®é …ç›®æ¸…é™¤å®ƒæˆ–æ”¹è®Šä¸Šé¢çš„æŸ¥è©¢ã€‚"
 
-#: ../mail/message-list.c:5665
+#: ../mail/message-list.c:5661
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -14844,27 +14843,27 @@ msgid "Subject or Addresses contains"
 msgstr "主旨或電子郵件位址包含"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2001
+#: ../modules/mail/e-mail-shell-view-actions.c:2000
 msgid "Recipients contain"
 msgstr "收件者包含"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1994
+#: ../modules/mail/e-mail-shell-view-actions.c:1993
 msgid "Message contains"
 msgstr "郵件包含"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2015
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Subject contains"
 msgstr "主旨包含"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2008
+#: ../modules/mail/e-mail-shell-view-actions.c:2007
 msgid "Sender contains"
 msgstr "寄件者包含"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1987
+#: ../modules/mail/e-mail-shell-view-actions.c:1986
 msgid "Body contains"
 msgstr "內文包含"
 
@@ -15018,7 +15017,7 @@ msgstr "顯示已選取通訊錄中所有連絡人的地圖"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1421
 #: ../modules/calendar/e-memo-shell-view-actions.c:643
 #: ../modules/calendar/e-task-shell-view-actions.c:767
-#: ../modules/mail/e-mail-shell-view-actions.c:1609
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "_Rename..."
 msgstr "重新命名(_R)…"
 
@@ -15099,7 +15098,7 @@ msgstr "動作(_A)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1017
 #: ../modules/calendar/e-memo-shell-view-actions.c:680
 #: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1774
+#: ../modules/mail/e-mail-shell-view-actions.c:1773
 msgid "_Preview"
 msgstr "é è¦½(_P)"
 
@@ -15111,7 +15110,7 @@ msgid "_Delete"
 msgstr "刪除(_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1030
-#: ../modules/mail/e-mail-shell-view-actions.c:1525
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "_Properties"
 msgstr "屬性(_P)"
 
@@ -15138,7 +15137,7 @@ msgstr "åœ¨é€£çµ¡äººé è¦½è¦–çª—é¡¯ç¤ºåœ°åœ–"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1099
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:914
-#: ../modules/mail/e-mail-shell-view-actions.c:1904
+#: ../modules/mail/e-mail-shell-view-actions.c:1903
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
@@ -15149,7 +15148,7 @@ msgstr "åœ¨é€£çµ¡äººæ¸…å–®ä¸‹æ–¹é¡¯ç¤ºé€£çµ¡äººé è¦½"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1106
 #: ../modules/calendar/e-memo-shell-view-actions.c:757
 #: ../modules/calendar/e-task-shell-view-actions.c:921
-#: ../modules/mail/e-mail-shell-view-actions.c:1911
+#: ../modules/mail/e-mail-shell-view-actions.c:1910
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
@@ -15168,7 +15167,7 @@ msgstr "沒有相符資料"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1764
 #: ../modules/calendar/e-memo-shell-view-actions.c:784
 #: ../modules/calendar/e-task-shell-view-actions.c:983
-#: ../modules/mail/e-mail-shell-view-actions.c:1980
+#: ../modules/mail/e-mail-shell-view-actions.c:1979
 #: ../shell/e-shell-content.c:658
 msgid "Advanced Search"
 msgstr "進階搜尋"
@@ -15537,7 +15536,7 @@ msgid "Using LDAP"
 msgstr "使用 LDAP"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:117
+#: ../modules/mail/e-mail-shell-view.c:116
 msgid "Searching"
 msgstr "正在搜尋"
 
@@ -16100,6 +16099,7 @@ msgid "Rename the selected calendar"
 msgstr "重新命名選取的行事曆"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#, fuzzy
 #| msgid "Find _next"
 msgid "Find _Next"
 msgstr "尋找下一個(_N)"
@@ -16109,6 +16109,7 @@ msgid "Find next occurrence of the current search string"
 msgstr "尋找目前搜尋字詞下一個出現處"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#, fuzzy
 #| msgid "Find _previous"
 msgid "Find _Previous"
 msgstr "尋找上一個(_P)"
@@ -16118,6 +16119,7 @@ msgid "Find previous occurrence of the current search string"
 msgstr "尋找目前搜尋字詞上一個出現處"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#, fuzzy
 #| msgid "Stop _running search"
 msgid "Stop _Running Search"
 msgstr "停止執行搜尋(_R)"
@@ -16817,61 +16819,61 @@ msgstr "%A %p %l:%M:%S"
 #. * without a year.
 #: ../modules/itip-formatter/itip-view.c:322
 msgid "%A, %B %e"
-msgstr "%m月%e日(%A)"
+msgstr "%b%eæ—¥%A"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
 #: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %H:%M"
-msgstr "%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:337
 msgid "%A, %B %e %l:%M %p"
-msgstr "%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:341
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%m月%e日(%A) %p %l:%M:%S"
+msgstr "%b%eæ—¥%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
 #: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y"
-msgstr "%Y年%m月%e日(%A)"
+msgstr "%Yå¹´%b%eæ—¥%A"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
 #: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%Y年%m月%e日(%A) %H:%M"
+msgstr "%Yå¹´%b%eæ—¥%A %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
 #: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%Y年%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Y年%m月%e日(%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.
 #: ../modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Y年%m月%e日(%A) %p %l:%M:%S"
+msgstr "%Yå¹´%b%eæ—¥%A %p %l:%M:%S"
 
 #: ../modules/itip-formatter/itip-view.c:403
 #: ../modules/itip-formatter/itip-view.c:404
@@ -17634,319 +17636,319 @@ msgctxt "label"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:659
+#: ../modules/mail/e-mail-shell-view-actions.c:658
 msgid "Marking messages as read..."
 msgstr "將郵件標示成已經閱讀…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "_Disable Account"
 msgstr "停用帳號(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Disable this account"
 msgstr "停用這個帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1520
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "Edit properties of this account"
 msgstr "編輯這個帳號的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1532
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1534
+#: ../modules/mail/e-mail-shell-view-actions.c:1533
 msgid "Refresh list of folders of this account"
 msgstr "重新整理這個帳號的資料夾清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1539
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "_Download Messages for Offline Usage"
 msgstr "下載離線使用的郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1541
+#: ../modules/mail/e-mail-shell-view-actions.c:1540
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下載標記為離線使用的帳號與資料夾之郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1546
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Fl_ush Outbox"
 msgstr "清理寄件匣(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1552
 msgid "_Copy Folder To..."
 msgstr "複製資料夾到(_C)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "Copy the selected folder into another folder"
 msgstr "複製已選定的資料夾到另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
+#: ../modules/mail/e-mail-shell-view-actions.c:1561
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
-#: ../modules/mail/e-mail-shell-view-actions.c:1676
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Mark all messages in the folder as read"
 msgstr "將資料夾中全部的郵件標示成已閱讀"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1588
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
 msgid "_New..."
 msgstr "新增(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Create a new folder for storing mail"
 msgstr "建立一個新資料夾以儲存郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
 msgid "Change the properties of this folder"
 msgstr "變更這個資料夾的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1604
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
 msgid "Refresh the folder"
 msgstr "重新載入資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1611
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "Change the name of this folder"
 msgstr "變更這個資料夾的名稱"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
 msgid "Select Message _Thread"
 msgstr "é¸æ“‡éƒµä»¶æª”é ­(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1618
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "Select Message S_ubthread"
 msgstr "選擇郵件子群組(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1625
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Select all replies to the currently selected message"
 msgstr "選擇所有回覆選定郵件的信"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1636
 msgid "Empty _Trash"
 msgstr "清理回收筒(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久移除在所有帳號內全部已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1643
 msgid "_New Label"
 msgstr "新增標籤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
 msgid "N_one"
 msgstr "沒有(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "_Manage Subscriptions"
 msgstr "管理訂閱(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1669
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "è¨‚é–±æˆ–å–æ¶ˆè¨‚é–±åœ¨é ç«¯ä¼ºæœå™¨çš„è³‡æ–™å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1681
-#: ../modules/mail/e-mail-shell-view-actions.c:1702
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Send queued items and retrieve new items"
 msgstr "å‚³é€å¾…é€çš„é …ç›®ä¸¦æŽ¥æ”¶æ–°çš„é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1688
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Receive new items from all accounts"
 msgstr "æŽ¥æ”¶åœ¨æ‰€æœ‰å¸³è™Ÿå…§çš„æ–°é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1695
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
 msgid "_Send All"
 msgstr "全部傳送(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "Send queued items in all accounts"
 msgstr "å‚³é€åœ¨æ‰€æœ‰å¸³è™Ÿå…§å¾…é€çš„é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Cancel the current mail operation"
 msgstr "取消目前郵件所作的行動"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1729
 msgid "Collapse All _Threads"
 msgstr "收摺所有相關郵件(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1736
 msgid "E_xpand All Threads"
 msgstr "展開所有相關郵件(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Expand all message threads"
 msgstr "展開所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
 msgid "_Message Filters"
 msgstr "郵件規則(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1750
 msgid "_Subscriptions..."
 msgstr "訂閱(_S)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1760
+#: ../modules/mail/e-mail-shell-view-actions.c:1759
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#: ../modules/mail/e-mail-shell-view-actions.c:1766
 msgid "_Label"
 msgstr "標籤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1784
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1791
+#: ../modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Create or edit search folder definitions"
 msgstr "建立或編輯搜尋資料夾的定義"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1832
+#: ../modules/mail/e-mail-shell-view-actions.c:1831
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1860
+#: ../modules/mail/e-mail-shell-view-actions.c:1859
 msgid "Show Message _Preview"
 msgstr "é¡¯ç¤ºéƒµä»¶é è¦½(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1862
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "Show message preview pane"
 msgstr "é¡¯ç¤ºéƒµä»¶é è¦½çª—æ ¼"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Show _Deleted Messages"
 msgstr "顯示已刪除郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1870
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
 msgid "Show deleted messages with a line through them"
 msgstr "顯示已刪除的郵件 (åŠ ä¸Šåˆªé™¤ç·š)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1876
+#: ../modules/mail/e-mail-shell-view-actions.c:1875
 msgid "_Group By Threads"
 msgstr "依相關郵件為群組(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1878
+#: ../modules/mail/e-mail-shell-view-actions.c:1877
 msgid "Threaded message list"
 msgstr "相關郵件清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1884
+#: ../modules/mail/e-mail-shell-view-actions.c:1883
 msgid "_Unmatched Folder Enabled"
 msgstr "未符合資料夾已啟用(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1886
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "切換是否啟用未符合搜尋資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1906
+#: ../modules/mail/e-mail-shell-view-actions.c:1905
 msgid "Show message preview below the message list"
 msgstr "åœ¨éƒµä»¶æ¸…å–®ä¸‹æ–¹é¡¯ç¤ºéƒµä»¶é è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1913
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "Show message preview alongside the message list"
 msgstr "åœ¨éƒµä»¶æ¸…å–®æ—é‚Šé¡¯ç¤ºéƒµä»¶é è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1921
+#: ../modules/mail/e-mail-shell-view-actions.c:1920
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1928
+#: ../modules/mail/e-mail-shell-view-actions.c:1927
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1935
+#: ../modules/mail/e-mail-shell-view-actions.c:1934
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1942
+#: ../modules/mail/e-mail-shell-view-actions.c:1941
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1949
+#: ../modules/mail/e-mail-shell-view-actions.c:1948
 msgid "Messages with Attachments"
 msgstr "有附件的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1956
+#: ../modules/mail/e-mail-shell-view-actions.c:1955
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1963
+#: ../modules/mail/e-mail-shell-view-actions.c:1962
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1970
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2021
 msgid "Subject or Addresses contain"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../modules/mail/e-mail-shell-view-actions.c:2031
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2039
+#: ../modules/mail/e-mail-shell-view-actions.c:2038
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2046
+#: ../modules/mail/e-mail-shell-view-actions.c:2045
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../modules/mail/e-mail-shell-view.c:630
+#: ../modules/mail/e-mail-shell-view.c:629
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view.c:734
+#: ../modules/mail/e-mail-shell-view.c:733
 msgid "Account Search"
 msgstr "帳號搜尋"
 
@@ -18055,24 +18057,24 @@ msgstr "是否要將 Evolution è¨­ç‚ºæ‚¨çš„é è¨­é›»å­éƒµä»¶å®¢æˆ¶ç«¯ï¼Ÿ"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:311
+#: ../modules/mdn/evolution-mdn.c:310
 #, 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.
-#: ../modules/mdn/evolution-mdn.c:378
+#: ../modules/mdn/evolution-mdn.c:377
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "「%s」的遞送通知"
 
-#: ../modules/mdn/evolution-mdn.c:543
+#: ../modules/mdn/evolution-mdn.c:542
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "傳送郵件回條給「%s」"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:548
+#: ../modules/mdn/evolution-mdn.c:547
 msgid "_Notify Sender"
 msgstr "通知寄件者(_N)"
 
@@ -18773,7 +18775,7 @@ msgid ""
 "closed as long as the editor is active."
 msgstr "外部編輯器仍在執行中。只要該編輯器仍在使用，郵件編輯器視窗就不能關閉。"
 
-#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
+#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:330
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
@@ -19958,11 +19960,11 @@ msgid ""
 "System error: %s"
 msgstr "不能啟動 Evolution。可能有另一個 Evolution 實體沒有回應。系統錯誤：%s"
 
-#: ../shell/main.c:499 ../shell/main.c:504
+#: ../shell/main.c:497 ../shell/main.c:502
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:569
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19971,7 +19973,7 @@ msgstr ""
 "%s： --online 和 --offline 不能一起使用。\n"
 "  使用 '%s --help' 取得進一步資訊。\n"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:575
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20027,174 +20029,105 @@ msgstr ""
 "\n"
 "編輯信任設定值："
 
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:120
 msgid "Certificate Name"
 msgstr "憑證名稱"
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
 msgid "Issued To Organization"
 msgstr "發給組織"
 
-#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
 msgid "Issued To Organizational Unit"
 msgstr "發給組織單位"
 
-#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114
-#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
 msgid "Serial Number"
 msgstr "序號"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:123
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116
-#: ../smime/gui/certificate-viewer.c:640
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:124
 msgid "Issued By"
 msgstr "發照者"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Issued By Organization"
 msgstr "發照組織"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Issued By Organizational Unit"
 msgstr "發照組織單位"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued"
 msgstr "發行者"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Expires"
 msgstr "到期"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
-#: ../smime/gui/certificate-viewer.c:650
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
-#: ../smime/gui/certificate-viewer.c:651
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:121
 msgid "Email Address"
 msgstr "電子郵件位址"
 
-#: ../smime/gui/certificate-manager.c:614
+#: ../smime/gui/certificate-manager.c:622
 msgid "Select a certificate to import..."
 msgstr "選取要匯入的憑證…"
 
-#: ../smime/gui/certificate-manager.c:628
+#: ../smime/gui/certificate-manager.c:636
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:672
 msgid "Failed to import certificate"
 msgstr "無法匯入憑證"
 
-#: ../smime/gui/certificate-manager.c:1046
+#: ../smime/gui/certificate-manager.c:1054
 msgid "All PKCS12 files"
 msgstr "所有的 PKCS12 檔案"
 
-#: ../smime/gui/certificate-manager.c:1063
+#: ../smime/gui/certificate-manager.c:1071
 msgid "All email certificate files"
 msgstr "所有的電子郵件憑證檔案"
 
-#: ../smime/gui/certificate-manager.c:1080
+#: ../smime/gui/certificate-manager.c:1088
 msgid "All CA certificate files"
 msgstr "所有的 CA 憑證檔案"
 
-#: ../smime/gui/certificate-viewer.c:292
-msgid "Not part of certificate"
-msgstr "不是憑證的部份"
-
-#: ../smime/gui/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr "此憑證已經檢驗用於下列用途："
-
-#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
-msgid "SSL Client Certificate"
-msgstr "SSL 用戶端憑證"
-
-#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "SSL 伺服器憑證"
-
-#: ../smime/gui/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "電子郵件簽署者憑證"
-
-#: ../smime/gui/certificate-viewer.c:619
-msgid "Email Recipient Certificate"
-msgstr "電子郵件收件者憑證"
-
-#: ../smime/gui/certificate-viewer.c:634
-msgid "Issued To"
-msgstr "發給"
-
-#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr "一般名稱 (CN)"
-
-#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "組織 (O)"
-
-#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "組織單位 (OU)"
-
-#: ../smime/gui/certificate-viewer.c:645
-msgid "Validity"
-msgstr "有效性"
-
-#: ../smime/gui/certificate-viewer.c:646
-msgid "Issued On"
-msgstr "發照日期"
-
-#: ../smime/gui/certificate-viewer.c:647
-msgid "Expires On"
-msgstr "到期日期"
-
-#: ../smime/gui/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr "數位指紋"
-
-#: ../smime/gui/certificate-viewer.c:671
-msgid "Certificate Hierarchy"
-msgstr "憑證階層"
-
-#: ../smime/gui/certificate-viewer.c:674
-msgid "Certificate Fields"
-msgstr "憑證欄位"
-
-#: ../smime/gui/certificate-viewer.c:677
-msgid "Field Value"
-msgstr "欄位數值"
-
-#: ../smime/gui/certificate-viewer.c:679
-msgid "Details"
-msgstr "詳細資料"
-
 #: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
@@ -20317,7 +20250,7 @@ msgstr ""
 "信任此憑證管理中心之前，如果可以的話，您應該先檢查它的憑證以及它的政策和程"
 "序。"
 
-#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "Certificate"
 msgstr "憑證"
 
@@ -20341,190 +20274,20 @@ msgstr "不信任此憑證的有效性"
 msgid "_Edit CA Trust"
 msgstr "編輯憑證管理中心 (CA) 信任度(_E)"
 
-#: ../smime/lib/e-asn1-object.c:95
-msgid "Version"
-msgstr "版本"
-
-#: ../smime/lib/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "版本 1"
-
-#: ../smime/lib/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "版本 2"
-
-#: ../smime/lib/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "版本 3"
-
-#: ../smime/lib/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 附 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "憑證金鑰使用"
-
-#: ../smime/lib/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Netscape 憑證類型"
-
-#: ../smime/lib/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "憑證管理中心金鑰識別碼"
-
-#: ../smime/lib/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "物件識別碼 (%s)"
-
-#: ../smime/lib/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "演算法識別碼"
-
-#: ../smime/lib/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "演算法參數"
-
-#: ../smime/lib/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "主旨公鑰資訊"
-
-#: ../smime/lib/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "主旨公鑰演算法"
-
-#: ../smime/lib/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "主旨的公鑰"
-
-#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "錯誤：無法處理延伸"
-
-#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "物件簽署者"
-
-#: ../smime/lib/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "SSL 憑證單位"
-
-#: ../smime/lib/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "電子郵件單位"
-
-#: ../smime/lib/e-asn1-object.c:436
-msgid "Signing"
-msgstr "簽署中"
-
-#: ../smime/lib/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "不可拒絕"
-
-#: ../smime/lib/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "é‡‘é‘°åŠ å¯†"
-
-#: ../smime/lib/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "資料密碼"
-
-#: ../smime/lib/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "金鑰合同"
-
-#: ../smime/lib/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "憑證簽署者"
-
-#: ../smime/lib/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL 簽署者"
-
-#: ../smime/lib/e-asn1-object.c:509
-msgid "Critical"
-msgstr "重要"
-
-#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "不重要"
-
-#: ../smime/lib/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "延伸"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
-msgid "Certificate Signature Algorithm"
-msgstr "æ†‘è­‰ç°½ç« æ¼”ç®—æ³•"
-
-#: ../smime/lib/e-asn1-object.c:681
-msgid "Issuer"
-msgstr "發照者"
-
-#: ../smime/lib/e-asn1-object.c:735
-msgid "Issuer Unique ID"
-msgstr "發照者獨有 ID"
-
-#: ../smime/lib/e-asn1-object.c:754
-msgid "Subject Unique ID"
-msgstr "主旨獨有 ID"
-
-#: ../smime/lib/e-asn1-object.c:813
-msgid "Certificate Signature Value"
-msgstr "æ†‘è­‰ç°½ç« å€¼"
-
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:404
 msgid "Sign"
 msgstr "簽署"
 
-#: ../smime/lib/e-cert.c:393
+#: ../smime/lib/e-cert.c:405
 msgid "Encrypt"
 msgstr "åŠ å¯†"
 
-#: ../smime/lib/e-cert-db.c:864
+#: ../smime/lib/e-cert-db.c:718
 msgid "Certificate already exists"
 msgstr "憑證已經存在"
 
@@ -20612,6 +20375,180 @@ msgstr "到期日(_D):"
 msgid "With _Status"
 msgstr "設定狀態(_S)"
 
+#~ msgid "Not part of certificate"
+#~ msgstr "不是憑證的部份"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "此憑證已經檢驗用於下列用途："
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL 用戶端憑證"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL 伺服器憑證"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "電子郵件簽署者憑證"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "電子郵件收件者憑證"
+
+#~ msgid "Issued To"
+#~ msgstr "發給"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "一般名稱 (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "組織 (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "組織單位 (OU)"
+
+#~ msgid "Validity"
+#~ msgstr "有效性"
+
+#~ msgid "Issued On"
+#~ msgstr "發照日期"
+
+#~ msgid "Expires On"
+#~ msgstr "到期日期"
+
+#~ msgid "Fingerprints"
+#~ msgstr "數位指紋"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "憑證階層"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "憑證欄位"
+
+#~ msgid "Field Value"
+#~ msgstr "欄位數值"
+
+#~ msgid "Details"
+#~ msgstr "詳細資料"
+
+#~ msgid "Version"
+#~ msgstr "版本"
+
+#~ msgid "Version 1"
+#~ msgstr "版本 1"
+
+#~ msgid "Version 2"
+#~ msgstr "版本 2"
+
+#~ msgid "Version 3"
+#~ msgstr "版本 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "PKCS #1 MD2 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "PKCS #1 MD5 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-1 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-256 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-384 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-512 附 RSA åŠ å¯†"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA åŠ å¯†"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "憑證金鑰使用"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Netscape 憑證類型"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "憑證管理中心金鑰識別碼"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "物件識別碼 (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "演算法識別碼"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "演算法參數"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "主旨公鑰資訊"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "主旨公鑰演算法"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "主旨的公鑰"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "錯誤：無法處理延伸"
+
+#~ msgid "Object Signer"
+#~ msgstr "物件簽署者"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "SSL 憑證單位"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "電子郵件單位"
+
+#~ msgid "Signing"
+#~ msgstr "簽署中"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "不可拒絕"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "é‡‘é‘°åŠ å¯†"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "資料密碼"
+
+#~ msgid "Key Agreement"
+#~ msgstr "金鑰合同"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "憑證簽署者"
+
+#~ msgid "CRL Signer"
+#~ msgstr "CRL 簽署者"
+
+#~ msgid "Critical"
+#~ msgstr "重要"
+
+#~ msgid "Not Critical"
+#~ msgstr "不重要"
+
+#~ msgid "Extensions"
+#~ msgstr "延伸"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "æ†‘è­‰ç°½ç« æ¼”ç®—æ³•"
+
+#~ msgid "Issuer"
+#~ msgstr "發照者"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "發照者獨有 ID"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "主旨獨有 ID"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "æ†‘è­‰ç°½ç« å€¼"
+
 #~ msgid "Could not open %s: Unknown error"
 #~ msgstr "無法開啟 %s：未知的錯誤"