2 files changed, 56 insertions, 35 deletions

diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index ca7debdea..e913f7117 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -37,7 +37,7 @@ $labels['to']      = '收件者';
 $labels['cc']      = '副本';
 $labels['bcc']     = '密件副本';
 $labels['replyto'] = '回覆至';
-$labels['followupto'] = '信件跟隨至';
+$labels['followupto'] = '郵件列表回覆地址';
 $labels['date']    = '日期';
 $labels['size']    = '大小';
 $labels['priority'] = '優先順序';
@@ -45,13 +45,14 @@ $labels['organization'] = '組織';
 $labels['readstatus'] = '讀信狀態';
 $labels['listoptions'] = '列表選項...';
 $labels['mailboxlist'] = '資料夾';
-$labels['messagesfromto'] = '郵件 $from 至 $to，共有 $count 封郵件';
-$labels['threadsfromto'] = '郵件串 $from 至 $to，共有 $count 個';
+$labels['messagesfromto'] = '郵件 $from 至 $to，共 $count 封';
+$labels['threadsfromto'] = '郵件串 $from 至 $to，共 $count 個';
 $labels['messagenrof'] = '第 $nr 封郵件，共有 $count 封';
-$labels['fromtoshort'] = '自 $from – $to 統計 $count';
+$labels['fromtoshort'] = '$from – $to 共 $count 個';
 $labels['copy']     = '複製';
 $labels['move']     = '移動';
 $labels['moveto']   = '移至...';
+$labels['copyto']   = '複製到...';
 $labels['download'] = '下載';
 $labels['open']     = '開啟';
 $labels['showattachment'] = '顯示';
@@ -148,7 +149,7 @@ $labels['expand-all'] = '全部展開';
 $labels['expand-unread'] = '展開未讀取';
 $labels['collapse-all'] = '全部收起';
 $labels['threaded'] = '郵件串';
-$labels['autoexpand_threads'] = '只展開郵件串';
+$labels['autoexpand_threads'] = '展開郵件串';
 $labels['do_expand'] = '所有郵件串';
 $labels['expand_only_unread'] = '只展開未讀訊息';
 $labels['fromto'] = '寄件者/收件者';
@@ -175,6 +176,7 @@ $labels['resetsearch']  = '重設搜尋';
 $labels['searchmod']  = '修改搜尋';
 $labels['msgtext']  = '整封郵件';
 $labels['body']  = '內文';
+$labels['type'] = '類型';
 $labels['namex'] = '名稱';
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載（.eml）';
@@ -184,7 +186,7 @@ $labels['editasnew']      = '以新郵件編輯';
 $labels['send']           = '寄出';
 $labels['sendmessage']    = '立即寄出';
 $labels['savemessage']    = '儲存成草稿';
-$labels['addattachment']  = '增加附件檔案';
+$labels['addattachment']  = '加入附件檔案';
 $labels['charset']        = '郵件編碼';
 $labels['editortype']     = '編輯器類型';
 $labels['returnreceipt']  = '要求讀取回條';
@@ -196,6 +198,16 @@ $labels['spellcheck']    = '拼字';
 $labels['checkspelling'] = '拼字檢查';
 $labels['resumeediting'] = '繼續編輯';
 $labels['revertto']      = '恢復至';
+$labels['restore'] = '回復';
+$labels['restoremessage'] = '回復郵件？';
+$labels['responses'] = '預設回應';
+$labels['insertresponse'] = '插入預設回應';
+$labels['manageresponses'] = '管理預設回應';
+$labels['savenewresponse'] = '新增預設回應';
+$labels['editresponses'] = '編輯預設回應';
+$labels['editresponse'] = '預設回應';
+$labels['responsename'] = '名稱';
+$labels['responsetext'] = '預設回應內容';
 $labels['attach'] = '附件';
 $labels['attachments'] = '附加檔案';
 $labels['upload'] = '上傳';
@@ -222,7 +234,7 @@ $labels['maxuploadsize'] = '上傳檔案大小限制為 $size';
 $labels['addcc'] = '新增副本';
 $labels['addbcc'] = '新增密件副本';
 $labels['addreplyto'] = '新增回覆地址';
-$labels['addfollowupto'] = '新增 信件跟隨至';
+$labels['addfollowupto'] = '新增郵件列表回覆地址';
 $labels['mdnrequest'] = '此郵件的寄件者希望在你閱讀此郵件時受到通知。你想要通知寄件者嗎？';
 $labels['receiptread'] = '郵件回條（已閱讀）';
 $labels['yourmessage'] = '這是你郵件的郵件回條';
@@ -259,7 +271,7 @@ $labels['spouse'] = '配偶';
 $labels['allfields'] = '所有欄位';
 $labels['search'] = '搜尋';
 $labels['advsearch'] = '進階搜尋';
-$labels['advanced'] = '進階設定';
+$labels['advanced'] = '進階';
 $labels['other'] = '其他';
 $labels['typehome']   = '住家';
 $labels['typework']   = '工作';
@@ -292,7 +304,7 @@ $labels['uploadphoto'] = '上傳相片';
 $labels['newcontact']     = '建立新聯絡人資料';
 $labels['deletecontact']  = '刪除所選擇的聯絡人';
 $labels['composeto']      = '寄信至所選擇的聯絡人';
-$labels['contactsfromto'] = '聯絡人 $from 至 $to，共有 $count 人';
+$labels['contactsfromto'] = '聯絡人 $from 至 $to，共 $count 人';
 $labels['print']          = '列印';
 $labels['export']         = '匯出通訊錄';
 $labels['exportall']      = '匯出全部';
@@ -308,16 +320,19 @@ $labels['nextpage']       = '顯示下一頁';
 $labels['lastpage']       = '顯示最後一頁';
 $labels['group'] = '群組';
 $labels['groups'] = '群組';
+$labels['listgroup'] = '列出群組成員';
 $labels['personaladrbook'] = '個人通訊錄';
 $labels['searchsave'] = '儲存搜尋結果';
 $labels['searchdelete'] = '刪除搜尋結果';
 $labels['import'] = '匯入通訊錄';
-$labels['importcontacts'] = '由檔案匯入通訊錄';
+$labels['importcontacts'] = '匯入通訊錄';
 $labels['importfromfile'] = '選擇你要匯入的檔案:';
-$labels['importreplace'] = '以匯入的資料取代已存在的重複資料';
-$labels['importgroupsall'] = '全部(如有必要,新增群組)';
+$labels['importtarget'] = '新增聯絡人到';
+$labels['importreplace'] = '取代整個';
+$labels['importgroups'] = '匯入群組';
+$labels['importgroupsall'] = '全部(必要時新增群組)';
 $labels['importgroupsexisting'] = '僅限於既有群組';
-$labels['importdesc'] = '您可以將已存在的資料匯入通訊錄，目前支援匯入 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 與 CSV (逗點分隔)格式資料';
+$labels['importdesc'] = '您可以將現有的聯絡人匯入通訊錄。<br/>目前支援匯入 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 與 CSV (逗點分隔)格式。';
 $labels['done'] = '完成';
 $labels['settingsfor'] = '設定';
 $labels['about'] = '關於';
@@ -341,7 +356,7 @@ $labels['setdefault']  = '設成預設值';
 $labels['autodetect']  = '自動選擇';
 $labels['language']  = '語言';
 $labels['timezone']  = '時區';
-$labels['pagesize']  = '每頁郵件數';
+$labels['pagesize']  = '每頁顯示列數';
 $labels['signature'] = '簽名檔';
 $labels['dstactive']  = '日光節約時間';
 $labels['showinextwin'] = '在新視窗中顯示郵件';
@@ -359,23 +374,23 @@ $labels['uisettings'] = '使用者介面';
 $labels['serversettings'] = '伺服器設定';
 $labels['mailboxview'] = '信箱顯示';
 $labels['mdnrequests'] = '讀取回條回應';
-$labels['askuser'] = '詢問使用者';
+$labels['askuser'] = '詢問我';
 $labels['autosend'] = '自動送出';
-$labels['autosendknown'] = '只對我的聯絡人傳送回條，其他詢問使用者';
-$labels['autosendknownignore'] = '只對我的聯絡人傳送回條，其他忽略';
+$labels['autosendknown'] = '傳送回條給我的聯絡人，其他則詢問我';
+$labels['autosendknownignore'] = '傳送回條給我的聯絡人，其他則忽略';
 $labels['ignore'] = '完全忽略';
 $labels['readwhendeleted'] = '將刪除的郵件標示為已讀取';
-$labels['flagfordeletion'] = '刪除郵件時將原始郵件標示為已刪除';
+$labels['flagfordeletion'] = '刪除郵件時只將郵件標示為已刪除';
 $labels['skipdeleted'] = '不要顯示已刪除的郵件';
-$labels['deletealways'] = '如果移到垃圾桶失敗，就直接刪除';
-$labels['deletejunk'] = '直接從垃圾郵件刪除';
+$labels['deletealways'] = '如果移動郵件到垃圾桶失敗，就直接刪除';
+$labels['deletejunk'] = '直接刪除垃圾郵件中的郵件';
 $labels['showremoteimages'] = '顯示遠端郵件內文中的圖片';
 $labels['fromknownsenders'] = '從已知的寄件者';
 $labels['always'] = '是';
 $labels['showinlineimages'] = '將附加檔案的圖片顯示於郵件最後';
 $labels['autosavedraft']  = '自動儲存草稿';
 $labels['everynminutes']  = '每 $n 分鐘';
-$labels['refreshinterval']  = '重新整理 (確認是否新郵件)';
+$labels['refreshinterval']  = '重新整理 (檢查新郵件等)';
 $labels['never']  = '永不';
 $labels['immediately']  = '馬上';
 $labels['messagesdisplaying'] = '郵件顯示';
@@ -385,10 +400,10 @@ $labels['2231folding'] = '完全 RFC 2231 模式（Thunderbird）';
 $labels['miscfolding'] = 'RFC 2047/2231 混合模式（MS Outlook）';
 $labels['2047folding'] = '完全 RFC 2047 模式（其他）';
 $labels['force7bit'] = '對 8 位元字元使用 MIME 編碼';
-$labels['advancedoptions'] = '顯示進階設定選項';
+$labels['advancedoptions'] = '進階選項';
 $labels['focusonnewmessage'] = '收到新郵件時使瀏覽器獲得焦點';
 $labels['checkallfolders'] = '檢查所有資料夾中的新郵件';
-$labels['displaynext'] = '郵件刪除／移動時顯示下一個郵件';
+$labels['displaynext'] = '郵件刪除/移動時顯示下一封郵件';
 $labels['defaultfont'] = 'HTML格式預設字型';
 $labels['mainoptions'] = '主要選項';
 $labels['browseroptions'] = '瀏覽選項';
@@ -398,8 +413,8 @@ $labels['newmessage'] = '新郵件';
 $labels['signatureoptions'] = '簽名檔選項';
 $labels['whenreplying'] = '回覆時';
 $labels['replyempty'] = '不要包含原來的信件內容';
-$labels['replytopposting'] = '在原來的上方開始新訊息';
-$labels['replybottomposting'] = '在原來的下方開始新訊息';
+$labels['replytopposting'] = '在原文的上方開始新訊息';
+$labels['replybottomposting'] = '在原文的下方開始新訊息';
 $labels['replyremovesignature'] = '回覆時移除原有簽名檔';
 $labels['autoaddsignature'] = '自動附加簽名';
 $labels['newmessageonly'] = '只有新訊息';
@@ -411,15 +426,16 @@ $labels['reqmdn'] = '永遠索取讀取回條';
 $labels['reqdsn'] = '總是要求傳送狀態通知';
 $labels['replysamefolder'] = '將回信放在與原信件相同的資料夾';
 $labels['defaultabook'] = '預設通訊錄';
-$labels['autocompletesingle'] = '在自動完成中略過另一個email';
-$labels['listnamedisplay'] = '標記聯絡人為';
+$labels['autocompletesingle'] = '在自動完成時略過其他電郵地址';
+$labels['listnamedisplay'] = '聯絡人顯示方式';
 $labels['spellcheckbeforesend'] = '寄送前執行拼字檢查';
 $labels['spellcheckoptions'] = '拼字檢查選項';
 $labels['spellcheckignoresyms'] = '忽略符號';
 $labels['spellcheckignorenums'] = '忽略數字';
 $labels['spellcheckignorecaps'] = '忽略大寫字母';
 $labels['addtodict'] = '加入詞典';
-$labels['mailtoprotohandler'] = '註冊mailto:協定處理程式';
+$labels['mailtoprotohandler'] = '註冊為 mailto: 連結的預設處理常式';
+$labels['standardwindows'] = '以新視窗顯示彈出式對話框';
 $labels['forwardmode'] = '郵件轉寄方式';
 $labels['inline'] = '放入內文';
 $labels['asattachment'] = '當成附件';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index c52116a55..430ad16d1 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,6 @@ $messages['invalidrequest'] = '要求無效！未儲存任何資料。';
 $messages['invalidhost'] = '無效的伺服器名稱';
 $messages['nomessagesfound'] = '此郵件匣沒有任何郵件';
 $messages['loggedout'] = '你已成功地登出並結束工作階段了。再見！';
-$messages['mailboxempty'] = '郵件匣是空的';
 $messages['refreshing'] = '重新整理中...';
 $messages['loading'] = '載入中...';
 $messages['uploading'] = '上傳檔案中...';
@@ -44,6 +43,8 @@ $messages['messagesent'] = '郵件寄出成功';
 $messages['savingmessage'] = '儲存郵件中...';
 $messages['messagesaved'] = '郵件已經儲存至草稿匣';
 $messages['successfullysaved'] = '儲存成功';
+$messages['savingresponse'] = '儲存預設回應中...';
+$messages['deleteresponseconfirm'] = '你確定要刪除這個預設回應嗎？';
 $messages['addedsuccessfully'] = '聯絡人已經成功地新增至通訊錄';
 $messages['contactexists'] = '此聯絡人的電子郵件位址已存在';
 $messages['contactnameexists'] = '已存在相同名稱的連絡人';
@@ -54,6 +55,8 @@ $messages['contactnotfound'] = '找不到要求的聯絡人';
 $messages['contactsearchonly'] = '輸入關鍵字找尋連絡人';
 $messages['sendingfailed'] = '郵件寄出失敗';
 $messages['senttooquickly'] = '你寄出的郵件太過於頻繁，請稍候 $sec 秒後再試一次。';
+$messages['errorsavingsent'] = '儲存郵件到寄件備份時發生錯誤。';
+$messages['errorsaving'] = '儲存時發生錯誤。';
 $messages['errormoving'] = '無法移動此郵件';
 $messages['errorcopying'] = '無法訊息';
 $messages['errordeleting'] = '無法刪除此郵件';
@@ -78,6 +81,7 @@ $messages['norecipientwarning'] = '請輸入至少一位收信者';
 $messages['nosubjectwarning']  = '「主旨」欄是空的。你要輸入一個主旨嗎？';
 $messages['nobodywarning'] = '要傳送沒有內文的郵件嗎？';
 $messages['notsentwarning'] = '郵件尚未寄出。你確定要離開並且捨棄此郵件？';
+$messages['restoresavedcomposedata'] = '發現一封上次編寫但尚未寄出的郵件。\n\n主旨: $subject\n日期: $date\n\n你要回復這封郵件嗎？';
 $messages['noldapserver'] = '請選擇一個 LDAP 伺服器進行搜尋';
 $messages['nosearchname'] = '請輸入一個聯絡人姓名或電子郵件位址';
 $messages['notuploadedwarning'] = '尚有附加檔案未上傳完畢，請等待或取消上傳';
@@ -95,8 +99,8 @@ $messages['folderexpunged'] = '資料夾成功壓縮';
 $messages['deletedsuccessfully'] = '刪除成功';
 $messages['converting'] = '移除郵件格式中...';
 $messages['messageopenerror'] = '無法從伺服器載入郵件';
-$messages['fileuploaderror'] = '檔案上傳失敗';
-$messages['filesizeerror'] = '上傳的檔案超過了 $size 的大小限制';
+$messages['fileuploaderror'] = '檔案上傳失敗。';
+$messages['filesizeerror'] = '上傳的檔案超過了 $size 的大小限制。';
 $messages['copysuccess'] = '成功複製 $nr 個聯絡人。';
 $messages['movesuccess'] = '成功移動 $nr 個聯絡人。';
 $messages['copyerror'] = '無法複製任何聯絡人。';
@@ -116,17 +120,17 @@ $messages['errorsendingreceipt'] = '無法傳送回條';
 $messages['deleteidentityconfirm'] = '您確定要刪除這位連絡人嗎?';
 $messages['nodeletelastidentity'] = '你不能刪除此身份，因為只剩一個身份。';
 $messages['forbiddencharacter'] = '資料夾名稱中包含非法的字元';
-$messages['selectimportfile'] = '請選擇一個上傳的檔案';
+$messages['selectimportfile'] = '請選擇一個要上傳的檔案。';
 $messages['addresswriterror'] = '無法寫入選擇的通訊錄';
 $messages['contactaddedtogroup'] = '成功把聯絡人加入此群組';
 $messages['contactremovedfromgroup'] = '成功把移除此群組中的聯絡人';
 $messages['nogroupassignmentschanged'] = '群組資料沒有異動';
 $messages['importwait'] = '匯入中，請稍候...';
-$messages['importformaterror'] = '匯入失敗！上載的檔案格式不支援';
+$messages['importformaterror'] = '匯入失敗！不支援上載的檔案格式。';
 $messages['importconfirm'] = '<b>成功匯入 $inserted 筆資料，略過 $skipped 筆已存在的資料</b>：<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>略過 $skipped 個已存在的項目</b>';
 $messages['importmessagesuccess'] = '成功匯入 $nr 封郵件';
-$messages['importmessageerror'] = '匯入失敗！上載的檔案不是有效的郵件或資料夾檔案';
+$messages['importmessageerror'] = '匯入失敗！上載的檔案不是有效的郵件或資料夾檔案。';
 $messages['opnotpermitted'] = '不允許的操作';
 $messages['nofromaddress'] = '在選擇的身分中遺失了電子郵件位址';
 $messages['editorwarning'] = '切換到純文字編輯模式將會遺失所有設定的樣式。您確定要繼續嗎？';
@@ -140,6 +144,7 @@ $messages['smtperror'] = 'SMTP 錯誤：$msg';
 $messages['emailformaterror'] = '錯誤電子郵件：$email';
 $messages['toomanyrecipients'] = '太多收件人。請減少至 $max 人';
 $messages['maxgroupmembersreached'] = '太多群組成員，超過最大人數 $max 人';
+$messages['internalerror'] = '發生內部錯誤。請再次嘗試。';
 $messages['contactdelerror'] = '無法刪除聯絡人';
 $messages['contactdeleted'] = '聯絡人成功刪除';
 $messages['contactrestoreerror'] = '無法復原刪除的連絡人';