2 files changed, 50 insertions, 45 deletions

diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index fd914b305..fcafbfce9 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'] = '草稿箱';
@@ -37,7 +37,7 @@ $labels['subject'] = '主题';
 $labels['from'] = '发件人';
 $labels['to'] = '收件人';
 $labels['cc'] = '抄送';
-$labels['bcc'] = '暗送';
+$labels['bcc'] = '密送';
 $labels['replyto'] = '回复至';
 $labels['date'] = '日期';
 $labels['size'] = '大小';
@@ -45,14 +45,15 @@ $labels['priority'] = '优先级';
 $labels['organization'] = '组织';
 $labels['reply-to'] = '回复至';
 $labels['mailboxlist'] = '邮件夹';
-$labels['messagesfromto'] = '从 $from 到 $to，共有 $count 封邮件';
-$labels['messagenrof'] = '第 $nr 封邮件，共有 $count 封';
-$labels['moveto'] = '转移至...';
+$labels['messagesfromto'] = '第 $from 到 $to 封邮件，共 $count 封';
+$labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
+$labels['moveto'] = '移动到';
 $labels['download'] = '下载';
 $labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
-$labels['preferhtml'] = '使用HTML显示';
-$labels['htmlmessage'] = 'HTML邮件';
+$labels['preferhtml'] = '以 HTML 格式显示';
+$labels['htmlmessage'] = 'HTML 邮件';
+$labels['showknownimages'] = '显示已知的发件人的邮件中的图片';
 $labels['prettydate'] = '短日期格式';
 $labels['addtoaddressbook'] = '添加到通讯录';
 $labels['sun'] = '日';
@@ -94,24 +95,24 @@ $labels['longoct'] = '十月';
 $labels['longnov'] = '十一月';
 $labels['longdec'] = '十二月';
 $labels['today'] = '今日';
-$labels['checkmail'] = '检查邮件';
+$labels['checkmail'] = '收取新邮件';
 $labels['writenewmessage'] = '写新邮件';
-$labels['replytomessage'] = '回复';
+$labels['replytomessage'] = '回复发件人';
 $labels['replytoallmessage'] = '全部回复';
-$labels['forwardmessage'] = '转发';
-$labels['deletemessage'] = '删除';
+$labels['forwardmessage'] = '转发邮件';
+$labels['deletemessage'] = '删除邮件';
 $labels['movemessagetotrash'] = '移动邮件到回收站';
-$labels['printmessage'] = '打印';
-$labels['previousmessage'] = '上一封';
+$labels['printmessage'] = '打印邮件';
+$labels['previousmessage'] = '显示上一封邮件';
 $labels['previousmessages'] = '上一页';
-$labels['firstmessage'] = '第一封';
+$labels['firstmessage'] = '显示第一封邮件';
 $labels['firstmessages'] = '第一页';
 $labels['nextmessage'] = '下一封';
 $labels['nextmessages'] = '下一页';
 $labels['lastmessage'] = '最后一封';
 $labels['lastmessages'] = '最后一页';
 $labels['backtolist'] = '返回邮件列表';
-$labels['viewsource'] = '显示邮件原文';
+$labels['viewsource'] = '显示邮件源文件';
 $labels['markmessages'] = '标记邮件';
 $labels['markread'] = '已读';
 $labels['markunread'] = '未读';
@@ -122,20 +123,20 @@ $labels['unread'] = '未读';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
 $labels['purge'] = '清除';
-$labels['quota'] = '空间使用';
+$labels['quota'] = '邮箱容量使用情况';
 $labels['unknown'] = '未知';
 $labels['unlimited'] = '无限制';
 $labels['quicksearch'] = '快速查找';
-$labels['resetsearch'] = '重新查找';
+$labels['resetsearch'] = '清空查找内容';
 $labels['compose'] = '写新邮件';
-$labels['savemessage'] = '暂存至草稿箱';
+$labels['savemessage'] = '保存为草稿';
 $labels['sendmessage'] = '立即发送';
 $labels['addattachment'] = '添加附件';
 $labels['charset'] = '字符集';
 $labels['editortype'] = '编辑器类型';
 $labels['returnreceipt'] = '邮件回执';
 $labels['checkspelling'] = '拼写检查';
-$labels['resumeediting'] = '继续编辑';
+$labels['resumeediting'] = '重新编辑';
 $labels['revertto'] = '恢复至';
 $labels['attachments'] = '附件';
 $labels['upload'] = '上传';
@@ -147,69 +148,73 @@ $labels['high'] = '高';
 $labels['highest'] = '最高';
 $labels['nosubject'] = '（无主题）';
 $labels['showimages'] = '显示图片';
+$labels['alwaysshow'] = '总是在来自 $sender 的邮件中显示图片';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '纯文本';
 $labels['addcc'] = '添加抄送';
-$labels['addbcc'] = '添加暗送';
+$labels['addbcc'] = '添加密送';
 $labels['addreplyto'] = '添加回复';
 $labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送通知。您是否希望通知发件人？';
 $labels['receiptread'] = '发送回执（已读）';
 $labels['yourmessage'] = '这是您的邮件回执';
 $labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或已理解邮件的内容。';
 $labels['name'] = '显示名称';
-$labels['firstname'] = '名称';
+$labels['firstname'] = '名字';
 $labels['surname'] = '姓氏';
-$labels['email'] = '电子邮件地址';
+$labels['email'] = '邮件地址';
 $labels['addcontact'] = '添加联系人';
 $labels['editcontact'] = '修改联系人';
 $labels['edit'] = '编辑';
 $labels['cancel'] = '取消';
-$labels['save'] = '储存';
+$labels['save'] = '保存';
 $labels['delete'] = '删除';
-$labels['newcontact'] = '建立联系人卡片';
+$labels['newcontact'] = '新建联系人';
 $labels['deletecontact'] = '删除选中的联系人';
 $labels['composeto'] = '写信给';
-$labels['contactsfromto'] = '从 $from 到 $to，共有 $count 个联系人';
+$labels['contactsfromto'] = '第 $from 到 $to 个联系人，共 $count 个';
 $labels['print'] = '打印';
 $labels['export'] = '导出';
-$labels['previouspage'] = '上页';
-$labels['firstpage'] = '首页';
-$labels['nextpage'] = '下页';
-$labels['lastpage'] = '末页';
+$labels['previouspage'] = '上一页';
+$labels['firstpage'] = '第一页';
+$labels['nextpage'] = '下一页';
+$labels['lastpage'] = '最后一页';
 $labels['groups'] = '分组';
 $labels['personaladrbook'] = '个人住址';
 $labels['settingsfor'] = '设置';
-$labels['preferences'] = '偏好';
+$labels['preferences'] = '偏好设置';
 $labels['userpreferences'] = '个人偏好';
 $labels['editpreferences'] = '修改个人偏好';
-$labels['identities'] = '身份';
+$labels['identities'] = '发邮件的身份';
 $labels['manageidentities'] = '管理此账号的身份';
 $labels['newidentity'] = '添加身份';
 $labels['newitem'] = '添加条目';
 $labels['edititem'] = '修改条目';
-$labels['setdefault'] = '默认值';
+$labels['setdefault'] = '设为默认';
 $labels['language'] = '语言';
 $labels['timezone'] = '时区';
-$labels['pagesize'] = '每页邮件数量';
+$labels['pagesize'] = '每页显示的邮件数量';
 $labels['signature'] = '签名';
 $labels['dstactive'] = '夏令时';
-$labels['htmleditor'] = '使用HTML编辑器';
-$labels['htmlsignature'] = '使用HTML签名';
+$labels['htmleditor'] = '使用 HTML 编辑器';
+$labels['htmlsignature'] = '使用 HTML 签名';
 $labels['previewpane'] = '显示预览窗口';
 $labels['logoutclear'] = '退出时清空回收站';
 $labels['logoutcompact'] = '退出时压缩收件箱';
 $labels['uisettings'] = '用户界面';
 $labels['serversettings'] = '服务器设置';
-$labels['mailboxview'] = '邮箱查看';
+$labels['mailboxview'] = '邮箱查看方式';
 $labels['mdnrequests'] = '发件人通知';
 $labels['askuser'] = '询问用户';
 $labels['autosend'] = '自动发送';
-$labels['ignore'] = '乎略';
+$labels['ignore'] = '忽略';
 $labels['readwhendeleted'] = '删除后标记为已读';
 $labels['flagfordeletion'] = '标记邮件为已删除而不是实际删除';
+$labels['showinlineimages'] = '在邮件下方显示附件中的图片';
 $labels['autosavedraft'] = '自动保存到草稿箱';
 $labels['everynminutes'] = '第 $n 分钟';
 $labels['never'] = '从不';
+$labels['messagesdisplaying'] = '邮件显示设置';
+$labels['messagescomposition'] = '邮件写作';
 $labels['folder'] = '邮件夹';
 $labels['folders'] = '邮件夹';
 $labels['foldername'] = '邮件夹名称';
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 79f46bed6..845342d4a 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -20,11 +20,11 @@
 
 $messages = array();
 $messages['loginfailed'] = '登录失败';
-$messages['cookiesdisabled'] = '你的浏览器不接受 cookies';
+$messages['cookiesdisabled'] = '您的浏览器不接受 cookies';
 $messages['sessionerror'] = '会话已过期';
 $messages['imaperror'] = '连接到邮件服务器失败';
 $messages['nomessagesfound'] = '此邮件夹内无邮件';
-$messages['loggedout'] = '你已成功注销';
+$messages['loggedout'] = '您已成功注销';
 $messages['mailboxempty'] = '邮件夹为空';
 $messages['loading'] = '加载中...';
 $messages['loadingdata'] = '数据加载中...';
@@ -44,18 +44,18 @@ $messages['sendingfailed'] = '发送失败';
 $messages['errorsaving'] = '保存过程中发生错误';
 $messages['errormoving'] = '无法移动邮件';
 $messages['errordeleting'] = '无法删除邮件';
-$messages['deletecontactconfirm'] = '你是否确认要删除已选中的联系人？';
-$messages['deletemessagesconfirm'] = '你是否确认要删除已选中的邮件？';
-$messages['deletefolderconfirm'] = '你是否确认要删除已选中的邮件夹？';
-$messages['purgefolderconfirm'] = '你是否确认要删除当前邮件夹中的所有邮件？';
+$messages['deletecontactconfirm'] = '确定要删除已选中的联系人？';
+$messages['deletemessagesconfirm'] = '确定要删除已选中的邮件？';
+$messages['deletefolderconfirm'] = '确定要删除已选中的邮件夹？';
+$messages['purgefolderconfirm'] = '是否确认要删除当前邮件夹中的所有邮件？';
 $messages['formincomplete'] = '当前表单未填写完整，请完整填写';
 $messages['noemailwarning'] = '请输入一个有效的邮件地址';
 $messages['nonamewarning'] = '请输入名字';
 $messages['nopagesizewarning'] = '请输入每页显示的邮件数量';
 $messages['norecipientwarning'] = '至少需要一个收件人';
-$messages['nosubjectwarning'] = '主题为空。你要输入一个主题吗？';
+$messages['nosubjectwarning'] = '主题为空。您要输入一个主题吗？';
 $messages['nobodywarning'] = '要发送无正文的邮件吗？';
-$messages['notsentwarning'] = '邮件未发送。你确定要离开并废弃当前邮件？';
+$messages['notsentwarning'] = '邮件未发送。您确定要离开并废弃当前邮件吗？';
 $messages['noldapserver'] = '请选择一个LDAP服务器进行查找';
 $messages['nocontactsreturned'] = '未找到联系人';
 $messages['nosearchname'] = '请输入一个联系人姓名或电子邮件地址';