Merge branch 'master' of github.com:roundcube/roundcubemail

1 files changed, 0 insertions, 27 deletions

diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index c2f5f840f..5c38cfe7f 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = '过滤器';
 $labels['managefilters'] = '管理邮件过滤规则';
 $labels['filtername'] = '过滤规则名称';
@@ -49,14 +47,12 @@ $labels['messagesendcopy'] = '发送复制邮件至';
 $labels['messagereply'] = '回复以下内容';
 $labels['messagedelete'] = '删除邮件';
 $labels['messagediscard'] = '舍弃邮件并回复以下内容';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = '对新收取的邮件应用规则：';
 $labels['messagesactions'] = '执行以下操作：';
 $labels['add'] = '添加';
 $labels['del'] = '删除';
 $labels['sender'] = '发件人';
 $labels['recipient'] = '收件人';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = '发送邮件频率(单位：天):';
 $labels['vacationinterval'] = '发送邮件频率:';
 $labels['days'] = '天';
@@ -84,13 +80,11 @@ $labels['countisgreaterthanequal'] = '计数大于或等于';
 $labels['countislessthan'] = '计数小于';
 $labels['countislessthanequal'] = '计数小于或等于';
 $labels['countequals'] = '计数等于';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = '值大于';
 $labels['valueisgreaterthanequal'] = '值大于或等于';
 $labels['valueislessthan'] = '值小于';
 $labels['valueislessthanequal'] = '值小于或等于';
 $labels['valueequals'] = '值等于';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = '设定邮件的标识';
 $labels['addflags'] = '增加邮件的标识';
 $labels['removeflags'] = '删除邮件的标识';
@@ -124,20 +118,14 @@ $labels['nextstep'] = '下一步';
 $labels['...'] = '...';
 $labels['currdate'] = '当前日期';
 $labels['datetest'] = '日期';
-$labels['dateheader'] = 'header:';
 $labels['year'] = '年';
 $labels['month'] = '月';
 $labels['day'] = '天';
 $labels['date'] = '日期 (年-月-日)';
-$labels['julian'] = 'date (julian)';
 $labels['hour'] = '小时';
 $labels['minute'] = '分钟';
 $labels['second'] = '秒';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
 $labels['zone'] = '时区';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = '高级选项';
 $labels['body'] = '正文';
 $labels['address'] = '地址';
@@ -157,41 +145,26 @@ $labels['default'] = '默认';
 $labels['octet'] = '严格模式(字节)';
 $labels['asciicasemap'] = '不区分大小写(ascii 字符)';
 $labels['asciinumeric'] = '数字类型(ascii 数字)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
-
-$messages = array();
 $messages['filterunknownerror'] = '未知的服务器错误';
 $messages['filterconnerror'] = '无法连接至服务器';
-$messages['filterdeleteerror'] = '无法删除过滤器。服务器发生错误';
 $messages['filterdeleted'] = '过滤器已成功删除';
 $messages['filtersaved'] = '过滤器已成功保存。';
-$messages['filtersaveerror'] = '无法保存过滤器。服务器发生错误';
 $messages['filterdeleteconfirm'] = '您确定要删除所选择的过滤器吗？';
 $messages['ruledeleteconfirm'] = '您确定要删除所选择的规则吗？';
 $messages['actiondeleteconfirm'] = '您确定要删除所选择的操作吗？';
 $messages['forbiddenchars'] = '内容包含禁用字符';
 $messages['cannotbeempty'] = '内容不能为空';
 $messages['ruleexist'] = '指定过滤器名称已存在。';
-$messages['setactivateerror'] = '无法启用指定过滤器，服务器发生错误。';
-$messages['setdeactivateerror'] = '无法停用指定过滤器，服务器发生错误。';
-$messages['setdeleteerror'] = '无法删除指定过滤器，服务器发生错误。';
 $messages['setactivated'] = '启用过滤器集成功。';
 $messages['setdeactivated'] = '禁用过滤器集成功。';
 $messages['setdeleted'] = '删除过滤器成功。';
 $messages['setdeleteconfirm'] = '您确定要删除指定的过滤器吗？';
-$messages['setcreateerror'] = '无法创建过滤器，服务器发生错误。';
 $messages['setcreated'] = '过滤器成功创建。';
-$messages['activateerror'] = '无法启用选中的过滤器，服务器发生错误。';
-$messages['deactivateerror'] = '无法禁用选中的过滤器，服务器发生错误。';
 $messages['deactivated'] = '启用过滤器成功。';
 $messages['activated'] = '禁用过滤器成功。';
 $messages['moved'] = '移动过滤器成功。';
-$messages['moveerror'] = '无法移动选中的过滤器，服务器发生错误。';
 $messages['nametoolong'] = '无法创建过滤器集，名称太长。';
 $messages['namereserved'] = '保留名称。';
 $messages['setexist'] = '设置已存在。';
 $messages['nodata'] = '至少选择一个位置！';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
-
 ?>