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_CN/messages.inc |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 4adebcc..6e8cbf4 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -133,7 +133,6 @@
 $messages['importmessageerror'] = '导入失败！文件无效';
 $messages['opnotpermitted'] = '不允许的操作!';
 $messages['nofromaddress'] = '选中的身份没有邮件地址。';
-$messages['editorwarning'] = '切换至纯文本编辑器将导致邮件正文中的所有文本格式失效，您确定要这样做吗？';
 $messages['httpreceivedencrypterror'] = '<b>您的邮件无法发送</b>，因为发生了一个严重的配置错误，请立即联系管理员。';
 $messages['smtpconnerror'] = 'SMTP 错误 ($code):连接服务器失败。';
 $messages['smtpautherror'] = 'SMTP 错误 ($code): 认证失败。';

--
Gitblit v1.9.1