2 files changed, 27 insertions, 36 deletions

diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 7fd3b76dd..e4f99b265 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -118,14 +118,14 @@ $labels['markread'] = '標示為已讀取';
 $labels['markunread'] = '標示為未讀取';
 $labels['markflagged'] = '標上旗標';
 $labels['markunflagged'] = '移除旗標';
-$labels['messageactions'] = '更多選項...';
+$labels['messageactions'] = '更多動作…';
 $labels['select'] = '選取';
 $labels['all'] = '全部郵件';
 $labels['none'] = '無';
 $labels['unread'] = '未讀取的郵件';
 $labels['flagged'] = '已加標記的郵件';
 $labels['unanswered'] = '未回覆的郵件';
-$labels['deleted'] = '已刪除';
+$labels['deleted'] = '已刪除的郵件';
 $labels['invert'] = '反選';
 $labels['filter'] = '篩選範圍';
 $labels['compact'] = '壓縮';
@@ -139,9 +139,9 @@ $labels['resetsearch'] = '重設搜尋';
 $labels['searchmod'] = '修改搜尋';
 $labels['msgtext'] = '整封郵件';
 $labels['openinextwin'] = '在新視窗開啟';
-$labels['emlsave'] = '下載(.eml檔)';
+$labels['emlsave'] = '下載（.eml）';
 $labels['compose'] = '撰寫新郵件';
-$labels['editasnew'] = '作為新郵件編輯';
+$labels['editasnew'] = '已新郵件編輯';
 $labels['savemessage'] = '儲存成草稿';
 $labels['sendmessage'] = '立即寄出';
 $labels['addattachment'] = '增加附件檔案';
@@ -212,7 +212,7 @@ $labels['manageidentities'] = '管理此帳號的身份資訊';
 $labels['newidentity'] = '新增身份資訊';
 $labels['newitem'] = '新增項目';
 $labels['edititem'] = '編輯項目';
-$labels['setdefault'] = '設成預設值';
+$labels['setdefault'] = '設成預設i值';
 $labels['autodetect'] = '自動選擇';
 $labels['language'] = '語言';
 $labels['timezone'] = '時區';
@@ -246,30 +246,21 @@ $labels['never'] = '絕對不要';
 $labels['messagesdisplaying'] = '郵件顯示設定';
 $labels['messagescomposition'] = '撰寫郵件設定';
 $labels['mimeparamfolding'] = '附加檔案名稱的編碼方式';
-$labels['2231folding'] = '完全 RFC 2231 模式 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 混合模式 (MS Outlook)';
-$labels['2047folding'] = '完全 RFC 2047 模式 (其他)';
+$labels['2231folding'] = '完全 RFC 2231 模式（Thunderbird）';
+$labels['miscfolding'] = 'RFC 2047/2231 混合模式（MS Outlook）';
+$labels['2047folding'] = '完全 RFC 2047 模式（其他）';
 $labels['advancedoptions'] = '顯示進階設定選項';
 $labels['focusonnewmessage'] = '收到新郵件時使瀏覽器獲得焦點';
 $labels['checkallfolders'] = '檢查所有資料夾中的新郵件';
-$labels['displaynext'] = '在刪除或移動郵件後顯示下一封郵件';
-$labels['indexsort'] = '以日期排序';
+$labels['displaynext'] = '郵件刪除／移動時顯示下一個郵件';
+$labels['indexsort'] = '用 message index 以日期排序';
 $labels['mainoptions'] = '主要選項';
-$labels['section'] = '各項設定';
-$labels['maintenance'] = '維護選項';
+$labels['section'] = '分類';
+$labels['maintenance'] = '管理';
 $labels['newmessage'] = '新郵件';
-$labels['listoptions'] = '排序選項';
+$labels['listoptions'] = '排列選項';
 $labels['signatureoptions'] = '簽名檔選項';
-$labels['whenreplying'] = '當回信時';
-$labels['replytopposting'] = '在原始內容之前編輯新郵件';
-$labels['replybottomposting'] = '在原始內容之後編輯新郵件';
-$labels['replyremovesignature'] = '回信時去除信件原有簽名';
-$labels['autoaddsignature'] = '自動增加簽名';
-$labels['newmessageonly'] = '只顯示新郵件';
-$labels['replyandforwardonly'] = '只顯示回覆和轉寄郵件';
-$labels['replysignaturepos'] = '回信或轉寄時放置簽名';
-$labels['belowquote'] = '在引用文之後';
-$labels['abovequote'] = '在引用文之前';
+$labels['autoaddsignature'] = '自動附加簽名';
 $labels['insertsignature'] = '插入簽名檔';
 $labels['folder'] = '資料夾';
 $labels['folders'] = '資料夾';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index fc6b0cdc8..cfb1ea294 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -24,13 +24,13 @@ $messages['loginfailed'] = '登入失敗';
 $messages['cookiesdisabled'] = '你的瀏覽器不接受 cookies';
 $messages['sessionerror'] = '你的工作階段已失效或過期';
 $messages['imaperror'] = '連線到 IMAP 伺服器失敗';
-$messages['servererror'] = '伺服器發生錯誤!';
-$messages['invalidrequest'] = '無效的請求! 沒有資料被儲存';
+$messages['servererror'] = '伺服器錯誤！';
+$messages['invalidrequest'] = '要求無效！未儲存任何資料。';
 $messages['nomessagesfound'] = '此郵件匣沒有任何郵件';
 $messages['loggedout'] = '你已成功地登出並結束工作階段了。再見！';
 $messages['mailboxempty'] = '郵件匣是空的';
 $messages['loading'] = '載入中...';
-$messages['uploading'] = '上傳檔案中...';
+$messages['uploading'] = '上傳檔案中…';
 $messages['loadingdata'] = '載入資料中...';
 $messages['checkingmail'] = '檢查新郵件...';
 $messages['sendingmessage'] = '寄出郵件中...';
@@ -50,7 +50,7 @@ $messages['errorsavingsent'] = '儲存寄件備份時發生錯誤';
 $messages['errorsaving'] = '儲存時發生錯誤';
 $messages['errormoving'] = '無法移動此郵件';
 $messages['errordeleting'] = '無法刪除此郵件';
-$messages['errormarking'] = '無法標記此郵件';
+$messages['errormarking'] = '無法標上旗標';
 $messages['deletecontactconfirm'] = '你確定要刪除已選擇的聯絡人？';
 $messages['deletemessagesconfirm'] = '你確定要刪除已選擇的郵件？';
 $messages['deletefolderconfirm'] = '你確定要刪除這個資料夾嗎？';
@@ -71,7 +71,7 @@ $messages['notsentwarning'] = '郵件尚未寄出。你確定要離開並且捨�
 $messages['noldapserver'] = '請選擇一個 LDAP 伺服器進行搜尋';
 $messages['nocontactsreturned'] = '沒有找到任何聯絡人';
 $messages['nosearchname'] = '請輸入一個聯絡人姓名或電子郵件位址';
-$messages['notuploadedwarning'] = '附件尚未上傳完畢。請稍等或取消上傳。';
+$messages['notuploadedwarning'] = '尚有附加檔案未上傳完畢，請等待或取消上傳';
 $messages['searchsuccessful'] = '共找到 $nr 封郵件';
 $messages['searchnomatch'] = '找不到任何符合的郵件';
 $messages['searching'] = '搜尋中...';
@@ -101,13 +101,13 @@ $messages['importconfirm'] = '<b>成功匯入 $inserted 筆資料，略過 $skip
 $messages['opnotpermitted'] = '不允許的操作';
 $messages['nofromaddress'] = '在選擇的身分中遺失了電子郵件位址';
 $messages['editorwarning'] = '切換到純文字編輯模式將會遺失所有設定的樣式。您確定要繼續嗎？';
-$messages['smtpconnerror'] = 'SMTP 發生錯誤 ($code): 連結到伺服器失敗';
-$messages['smtpautherror'] = 'SMTP 發生錯誤 ($code): 認證失敗';
-$messages['smtpfromerror'] = 'SMTP 發生錯誤 ($code): 設定寄件者失敗 "$from"';
-$messages['smtptoerror'] = 'SMTP 發生錯誤 ($code): 增加收件者失敗 "$from"';
-$messages['smtprecipientserror'] = 'SMTP 發生錯誤 ($code): 無法分析收件者清單
-';
-$messages['smtperror'] = 'SMTP 發生錯誤: $msg';
-$messages['emailformaterror'] = '不正確的e-mail位址: $email';
+$messages['httpreceivedencrypterror'] = '發生嚴重錯誤。請立即聯絡管理者。<b>您的郵件無法送出。</b>';
+$messages['smtpconnerror'] = 'SMTP 錯誤（$code）：與伺服器連線失敗';
+$messages['smtpautherror'] = 'SMTP 錯誤（$code）：認證失敗';
+$messages['smtpfromerror'] = 'SMTP 錯誤（$code）：無法設寄建者「$from」';
+$messages['smtptoerror'] = 'SMTP 錯誤（$code）：無法加收件者「$to」';
+$messages['smtprecipientserror'] = 'SMTP 錯誤：無法分析收件者';
+$messages['smtperror'] = 'SMTP 錯誤：$msg';
+$messages['emailformaterror'] = '錯誤電子郵件：$email';
 
 ?>