From 7e34e4c5b5dac037435d0fc2c6db1f71199006e0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 15 Nov 2014 04:03:58 -0500
Subject: [PATCH] Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0

---
 program/localization/zh_TW/messages.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 23c951a..e5d7df5 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -22,6 +22,7 @@
 $messages['storageerror'] = '連線到 IMAP 伺服器失敗';
 $messages['servererror'] = '伺服器錯誤！';
 $messages['servererrormsg'] = '伺服器錯誤：$msg';
+$messages['connerror'] = '連線錯誤 (無法連線到伺服器)！';
 $messages['dberror'] = '資料庫錯誤!';
 $messages['requesttimedout'] = '要求逾時';
 $messages['errorreadonly'] = '動作無法完成。資料夾唯讀';
@@ -92,6 +93,7 @@
 $messages['searchnomatch'] = '找不到任何符合的郵件';
 $messages['searching'] = '搜尋中...';
 $messages['checking'] = '檢查中...';
+$messages['stillsearching'] = '仍在搜尋中...';
 $messages['nospellerrors'] = '沒有找到任何拼字錯誤';
 $messages['folderdeleted'] = '資料夾已經成功地被刪除';
 $messages['foldersubscribed'] = '資料夾成功訂閱';
@@ -135,7 +137,7 @@
 $messages['importmessageerror'] = '匯入失敗！上載的檔案不是有效的郵件或資料夾檔案。';
 $messages['opnotpermitted'] = '不允許的操作';
 $messages['nofromaddress'] = '在選擇的身分中遺失了電子郵件位址';
-$messages['editorwarning'] = '切換到純文字編輯模式將會遺失所有設定的樣式。您確定要繼續嗎？';
+$messages['editorwarning'] = '切換編輯器模式將會遺失所有設定的樣式。您確定要繼續嗎？';
 $messages['httpreceivedencrypterror'] = '發生嚴重錯誤。請立即聯絡管理者。<b>您的郵件無法送出。</b>';
 $messages['smtpconnerror'] = 'SMTP 錯誤（$code）：與伺服器連線失敗';
 $messages['smtpautherror'] = 'SMTP 錯誤（$code）：認證失敗';

--
Gitblit v1.9.1