2 files changed, 18 insertions, 8 deletions
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index d1766b714..26884ea91 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -26,7 +26,7 @@ $labels['server'] = '服务器';
 $labels['login'] = '登录';
 $labels['logout'] = '注销';
 $labels['mail'] = '电子邮件';
-$labels['settings'] = '个性化设置';
+$labels['settings'] = '邮箱设置';
 $labels['addressbook'] = '通讯录';
 $labels['inbox'] = '收件箱';
 $labels['drafts'] = '草稿箱';
@@ -45,7 +45,7 @@ $labels['priority'] = '优先级';
 $labels['organization'] = '组织';
 $labels['reply-to'] = '回复至';
 $labels['mailboxlist'] = '邮件夹';
-$labels['messagesfromto'] = '第 $from 到 $to 封邮件，共 $count 封';
+$labels['messagesfromto'] = '第 $from 到 $to，共 $count 封邮件';
 $labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
 $labels['moveto'] = '移动到';
 $labels['download'] = '下载';
@@ -121,10 +121,12 @@ $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
 $labels['unread'] = '未读';
+$labels['flagged'] = '已标记';
+$labels['unanswered'] = '未回复';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
 $labels['purge'] = '清除';
-$labels['quota'] = '邮箱容量使用情况';
+$labels['quota'] = '邮箱容量';
 $labels['unknown'] = '未知';
 $labels['unlimited'] = '无限制';
 $labels['quicksearch'] = '快速查找';
@@ -224,9 +226,14 @@ $labels['ignore'] = '忽略';
 $labels['readwhendeleted'] = '删除后标记为已读';
 $labels['flagfordeletion'] = '标记邮件为已删除而不是实际删除';
 $labels['skipdeleted'] = '不显示标记为已删除的邮件';
+$labels['showremoteimages'] = '显示内嵌的图片';
+$labels['fromknownsenders'] = '来自未知的发件人';
+$labels['always'] = '总是';
 $labels['showinlineimages'] = '在邮件下方显示附件中的图片';
 $labels['autosavedraft'] = '自动保存到草稿箱';
 $labels['everynminutes'] = '第 $n 分钟';
+$labels['keepaliveevery'] = '每隔 $n 分钟';
+$labels['keepalive'] = '检查新邮件';
 $labels['never'] = '从不';
 $labels['messagesdisplaying'] = '邮件显示设置';
 $labels['messagescomposition'] = '写邮件';
@@ -235,6 +242,8 @@ $labels['2231folding'] = '完整的 RFC 2231（Thunderbird）';
 $labels['miscfolding'] = 'RFC 2047/2232（MS Outlook）';
 $labels['2047folding'] = '完整的 RFC 2047（其它）';
 $labels['advancedoptions'] = '高级选项';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
 $labels['folder'] = '邮件夹';
 $labels['folders'] = '邮件夹';
 $labels['foldername'] = '邮件夹名称';
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 265a74a46..b279ac184 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -26,8 +26,8 @@ $messages['imaperror'] = '连接到邮件服务器失败';
 $messages['nomessagesfound'] = '此邮件夹内无邮件';
 $messages['loggedout'] = '您已成功注销';
 $messages['mailboxempty'] = '邮件夹为空';
-$messages['loading'] = '加载中...';
-$messages['loadingdata'] = '数据加载中...';
+$messages['loading'] = '正在加载...';
+$messages['loadingdata'] = '正在加载数据...';
 $messages['checkingmail'] = '检查新邮件...';
 $messages['sendingmessage'] = '正在发送邮件...';
 $messages['messagesent'] = '邮件发送成功';
@@ -66,10 +66,10 @@ $messages['notsentwarning'] = '邮件未发送。您确定要离开并废弃当�
 $messages['noldapserver'] = '请选择一个LDAP服务器进行查找';
 $messages['nocontactsreturned'] = '未找到联系人';
 $messages['nosearchname'] = '请输入一个联系人姓名或电子邮件地址';
-$messages['searchsuccessful'] = '共找到 $n 封邮件';
+$messages['searchsuccessful'] = '共找到 $nr 封邮件';
 $messages['searchnomatch'] = '未找到任何符合条件的邮件';
-$messages['searching'] = '查找中...';
-$messages['checking'] = '检查中...';
+$messages['searching'] = '正在查找...';
+$messages['checking'] = '正在检查...';
 $messages['nospellerrors'] = '未发现拼写错误';
 $messages['folderdeleted'] = '邮件夹已被成功删除';
 $messages['deletedsuccessfully'] = '删除成功';
@@ -94,5 +94,6 @@ $messages['importerror'] = '导入失败！所上传的文件不是有效的 vCa
 $messages['importconfirm'] = '<b>成功导入 $inserted 联系人，$skipped 乎略已存在的联系人</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = '不允许的操作';
 $messages['nofromaddress'] = '选种的身份中没有邮件地址';
+$messages['editorwarning'] = '切换到纯文本编辑器将导致邮件正文中的所有文本格式失效，您确定要这样做吗？';
 
 ?>