1 files changed, 92 insertions, 90 deletions

diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index af2bd7b68..23a42b96d 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -33,15 +33,15 @@ $labels['addressbook'] = '通讯录';
 
 // mailbox names
 $labels['inbox']  = '收件箱';
-$labels['drafts'] = '草稿';
-$labels['sent']   = '已发送';
+$labels['drafts'] = '草稿箱';
+$labels['sent']   = '已发送邮件';
 $labels['trash']  = '已删除邮件';
 $labels['junk']   = '垃圾邮件';
 
 // message listing
 $labels['subject'] = '主题';
 $labels['from']    = '发件人';
-$labels['sender']  = 'Sender';
+$labels['sender']  = '发件人';
 $labels['to']      = '收件人';
 $labels['cc']      = '抄送';
 $labels['bcc']     = '密送';
@@ -50,22 +50,23 @@ $labels['followupto'] = '投递组';
 $labels['date']    = '日期';
 $labels['size']    = '大小';
 $labels['priority'] = '优先级';
-$labels['organization'] = '公司';
+$labels['organization'] = '组织';
 $labels['readstatus'] = '阅读状态';
-$labels['listoptions'] = 'List options...';
+$labels['listoptions'] = '列表选项';
 
-$labels['mailboxlist'] = '目录管理';
-$labels['messagesfromto'] = '第 $from 到 $to，共 $count 封邮件';
-$labels['threadsfromto'] = '第 $from 到 $to，共 $count 个主题';
-$labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
+$labels['mailboxlist'] = '邮件夹';
+$labels['messagesfromto'] = '第 $from 到 $to，共计 $count 封邮件';
+$labels['threadsfromto'] = '第 $from 到 $to，共计 $count 个主题';
+$labels['messagenrof'] = '第 $nr 封邮件，共计 $count 封';
 $labels['fromtoshort'] = '自 $from – $to 统计 $count';
 
 $labels['copy']     = '复制';
 $labels['move']     = '移动';
-$labels['moveto']   = '移动至';
+$labels['moveto']   = '移至...';
 $labels['download'] = '下载';
+$labels['open']     = '打开';
 $labels['showattachment'] = '显示';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showanyway'] = '总是显示';
 
 $labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
@@ -73,7 +74,7 @@ $labels['filesize'] = '文件大小';
 $labels['addtoaddressbook'] = '添加至通讯录';
 
 // weekdays short
-$labels['sun'] = '周日';
+$labels['sun'] = '星期日';
 $labels['mon'] = '星期一';
 $labels['tue'] = '星期二';
 $labels['wed'] = '星期三';
@@ -122,8 +123,8 @@ $labels['today'] = '今天';
 
 // toolbar buttons
 $labels['refresh']          = '刷新';
-$labels['checkmail']        = '收取新邮件';
-$labels['compose']          = '写邮件';
+$labels['checkmail']        = '检查新邮件';
+$labels['compose']          = '撰写新邮件';
 $labels['writenewmessage']  = '写邮件';
 $labels['reply']            = '回复';
 $labels['replytomessage']   = '回复发件人';
@@ -135,42 +136,43 @@ $labels['forwardinline']    = '直接转发';
 $labels['forwardattachment'] = '以附件转发';
 $labels['forwardmessage']   = '转发邮件';
 $labels['deletemessage']    = '删除邮件';
-$labels['movemessagetotrash'] = '移动邮件到回收站';
+$labels['movemessagetotrash'] = '移至已删除邮件';
 $labels['printmessage']     = '打印邮件';
 $labels['previousmessage']  = '显示上一封邮件';
 $labels['firstmessage']     = '显示第一封邮件';
 $labels['nextmessage']      = '下一封';
 $labels['lastmessage']      = '最后一封';
 $labels['backtolist']       = '返回邮件列表';
-$labels['viewsource']       = '显示邮件源文件';
+$labels['viewsource']       = '显示原始邮件文件';
 $labels['mark']             = '标记';
-$labels['markmessages']     = '标记邮件';
+$labels['markmessages']     = '标记选中的邮件为';
 $labels['markread']         = '已读';
 $labels['markunread']       = '未读';
 $labels['markflagged']      = '已标记';
 $labels['markunflagged']    = '未标记';
-$labels['moreactions']      = '更多动作...';
+$labels['moreactions']      = '更多操作...';
 $labels['more']             = '更多';
-$labels['back']             = '后退';
+$labels['back']             = '返回';
 $labels['options']          = '选项';
 
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
 $labels['currpage'] = '当前页';
-$labels['unread'] = '未读';
-$labels['flagged'] = '已标记';
-$labels['unanswered'] = '未回复';
-$labels['deleted'] = '删除';
-$labels['undeleted'] = 'Not deleted';
+$labels['unread'] = '未读邮件';
+$labels['flagged'] = '已标记邮件';
+$labels['unanswered'] = '未回复邮件';
+$labels['withattachment'] = 'With attachment';
+$labels['deleted'] = '已删除邮件';
+$labels['undeleted'] = '未删除邮件';
 $labels['invert'] = '反选';
 $labels['filter'] = '过滤';
 $labels['list'] = '列表';
 $labels['threads'] = '主题';
 $labels['expand-all'] = '展开全部';
 $labels['expand-unread'] = '展开未读';
-$labels['collapse-all'] = '收合全部';
-$labels['threaded'] = '线索';
+$labels['collapse-all'] = '收起全部';
+$labels['threaded'] = '所有邮件';
 
 $labels['autoexpand_threads'] = '展开消息主题';
 $labels['do_expand'] = '所有主题';
@@ -188,7 +190,7 @@ $labels['listsorting'] = '排序列';
 $labels['listorder'] = '排序';
 $labels['listmode'] = '列表视图样式';
 
-$labels['folderactions'] = '目录操作...';
+$labels['folderactions'] = '文件夹操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
 
@@ -197,31 +199,33 @@ $labels['unknown']  = '未知';
 $labels['unlimited']  = '无限制';
 
 $labels['quicksearch']  = '快速查找';
-$labels['resetsearch']  = '清空查找内容';
-$labels['searchmod']  = '搜寻模式';
-$labels['msgtext']  = '整个邮件';
+$labels['resetsearch']  = '清空';
+$labels['searchmod']  = '修改搜索';
+$labels['msgtext']  = '整封邮件';
 $labels['body']  = '正文';
 
 $labels['openinextwin'] = '在新窗口中打开';
-$labels['emlsave'] = '下载（.eml）';
+$labels['emlsave'] = '下载(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
-$labels['editasnew']      = '编辑为新邮件';
+$labels['editasnew']      = '以新邮件编辑';
 $labels['send']           = '发送';
 $labels['sendmessage']    = '立即发送';
 $labels['savemessage']    = '保存为草稿';
 $labels['addattachment']  = '添加附件';
 $labels['charset']        = '字符集';
 $labels['editortype']     = '编辑器类型';
-$labels['returnreceipt']  = '邮件回执';
-$labels['dsn']            = '投递状态提示';
-$labels['mailreplyintro'] = '于 $date, $sender 回复:';
-$labels['originalmessage'] = '原始信件';
+$labels['returnreceipt']  = '需要已读回执';
+$labels['dsn']            = '投递状态通知';
+$labels['mailreplyintro'] = '在 $date，$sender 写道：';
+$labels['originalmessage'] = '原始邮件';
 
 $labels['editidents']    = '编辑身份';
 $labels['spellcheck']    = '拼写';
 $labels['checkspelling'] = '拼写检查';
-$labels['resumeediting'] = '重新编辑';
+$labels['resumeediting'] = '继续编辑';
 $labels['revertto']      = '恢复至';
 
 $labels['attach'] = '附加';
@@ -237,19 +241,19 @@ $labels['normal']  = '普通';
 $labels['high']    = '高';
 $labels['highest'] = '最高';
 
-$labels['nosubject']  = '（无主题）';
+$labels['nosubject']  = '(无主题)';
 $labels['showimages'] = '显示图片';
 $labels['alwaysshow'] = '总是在来自 $sender 的邮件中显示图片';
-$labels['isdraft']    = '这是邮件草稿';
-$labels['andnmore']   = '$nr more...';
+$labels['isdraft']    = '这是一封草稿';
+$labels['andnmore']   = '第$nr封或更多...';
 $labels['togglemoreheaders'] = '显示更多消息头';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = '切换至原始消息头';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '纯文本';
-$labels['savesentmessagein'] = '将已发送邮件保存到';
+$labels['savesentmessagein'] = '保存已发送邮件至';
 $labels['dontsave'] = '不保存';
-$labels['maxuploadsize'] = '允许的最大文件大小是 $size';
+$labels['maxuploadsize'] = '上传附件最大不超过 $size';
 
 $labels['addcc'] = '添加抄送';
 $labels['addbcc'] = '添加密送';
@@ -257,10 +261,10 @@ $labels['addreplyto'] = '添加回复';
 $labels['addfollowupto'] = '添加投递组';
 
 // mdn
-$labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送通知。您是否希望通知发件人？';
-$labels['receiptread'] = '发送回执（已读）';
+$labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送已读通知。您是否希望通知发件人？';
+$labels['receiptread'] = '发送回执(已读)';
 $labels['yourmessage'] = '这是您的邮件回执';
-$labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或已理解邮件的内容。';
+$labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或了解邮件内容。';
 
 // address boook
 $labels['name']         = '显示名称';
@@ -272,9 +276,9 @@ $labels['namesuffix']   = '后缀';
 $labels['nickname']     = '昵称';
 $labels['jobtitle']     = '职位';
 $labels['department']   = '部门';
-$labels['gender']       = 'Gender';
+$labels['gender']       = '性别';
 $labels['maidenname']   = '娘家姓';
-$labels['email']        = 'Email';
+$labels['email']        = '邮件地址';
 $labels['phone']        = '电话';
 $labels['address']      = '地址';
 $labels['street']       = '街道';
@@ -285,14 +289,14 @@ $labels['country']      = '国家';
 $labels['birthday']     = '生日';
 $labels['anniversary']  = '纪念日';
 $labels['website']      = '主页';
-$labels['instantmessenger'] = 'QQ';
+$labels['instantmessenger'] = '即时通讯';
 $labels['notes'] = '备注';
 $labels['male']   = '男';
 $labels['female'] = '女';
 $labels['manager'] = '经理';
 $labels['assistant'] = '助理';
 $labels['spouse'] = '配偶';
-$labels['allfields'] = '所有项目';
+$labels['allfields'] = '所有栏目';
 $labels['search'] = '查询';
 $labels['advsearch'] = '高级查询';
 $labels['advanced'] = '高级选项';
@@ -302,7 +306,7 @@ $labels['typehome']   = '家庭';
 $labels['typework']   = '工作';
 $labels['typeother']  = '其他';
 $labels['typemobile']  = '手机';
-$labels['typemain']  = '主';
+$labels['typemain']  = '主要';
 $labels['typehomefax']  = '家庭传真';
 $labels['typeworkfax']  = '工作传真';
 $labels['typecar']  = '车牌';
@@ -311,10 +315,10 @@ $labels['typevideo']  = '视频';
 $labels['typeassistant']  = '助理';
 $labels['typehomepage']  = '主页';
 $labels['typeblog'] = '博客';
-$labels['typeprofile'] = '资历';
+$labels['typeprofile'] = '资料';
 
-$labels['addfield'] = '增加项..';
-$labels['addcontact'] = '添加联系人';
+$labels['addfield'] = '新增条目...';
+$labels['addcontact'] = '新建联系人';
 $labels['editcontact'] = '编辑联系人';
 $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
@@ -324,24 +328,24 @@ $labels['edit']   = '编辑';
 $labels['cancel'] = '取消';
 $labels['save']   = '保存';
 $labels['delete'] = '删除';
-$labels['rename'] = '更名';
+$labels['rename'] = '重命名';
 $labels['addphoto'] = '上传';
-$labels['replacephoto'] = '覆盖';
+$labels['replacephoto'] = '替换照片';
 $labels['uploadphoto'] = '上传照片';
 
 $labels['newcontact']     = '新建联系人';
 $labels['deletecontact']  = '删除选中的联系人';
-$labels['composeto']      = '写信给';
+$labels['composeto']      = '写信至选中的联系人';
 $labels['contactsfromto'] = '第 $from 到 $to 个联系人，共 $count 个';
 $labels['print']          = '打印';
 $labels['export']         = '导出';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = '以 vCard 格式导出联系人';
-$labels['newcontactgroup'] = '创建新的组';
-$labels['grouprename']    = '重命名组';
-$labels['groupdelete']    = '删除组';
-$labels['groupremoveselected'] = '从分组中移除选中的联系人';
+$labels['exportall']      = '导出全部';
+$labels['exportsel']      = '导出选中';
+$labels['exportvcards']   = '导出联系人为 vCard 格式';
+$labels['newcontactgroup'] = '创建新的联系人群组';
+$labels['grouprename']    = '重命名群组';
+$labels['groupdelete']    = '删除群组组';
+$labels['groupremoveselected'] = '删除选中';
 
 $labels['previouspage']   = '上一页';
 $labels['firstpage']      = '第一页';
@@ -356,19 +360,19 @@ $labels['searchsave'] = '保存搜索';
 $labels['searchdelete'] = '删除搜索';
 
 $labels['import'] = '导入';
-$labels['importcontacts'] = '导入联系人';
+$labels['importcontacts'] = '导入通讯录';
 $labels['importfromfile'] = '从文件导入';
-$labels['importtarget'] = '增加新联系人到通讯录:';
-$labels['importreplace'] = '替换整个地址簿';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importtarget'] = '添加新联系人至通讯录:';
+$labels['importreplace'] = '替换全部通讯录';
+$labels['importdesc'] = '您可以从通讯录文件上传联系人，目前已支持 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 和 CSV(逗号分隔)格式';
 $labels['done'] = '完成';
 
 // settings
 $labels['settingsfor'] = '设置';
 $labels['about'] = '关于';
-$labels['preferences'] = '偏好设置';
-$labels['userpreferences'] = '个人偏好';
-$labels['editpreferences'] = '修改个人偏好';
+$labels['preferences'] = '选项';
+$labels['userpreferences'] = '个人选项';
+$labels['editpreferences'] = '修改个人选项';
 
 $labels['identities'] = '发件身份';
 $labels['manageidentities'] = '管理此账号的身份';
@@ -380,7 +384,7 @@ $labels['edititem'] = '编辑条目';
 $labels['preferhtml'] = '以 HTML 格式显示';
 $labels['defaultcharset'] = '默认字符集';
 $labels['htmlmessage'] = 'HTML 邮件';
-$labels['messagepart'] = 'Part';
+$labels['messagepart'] = '部分';
 $labels['digitalsig'] = '数字签名';
 $labels['dateformat'] = '日期格式';
 $labels['timeformat'] = '时间格式';
@@ -392,12 +396,13 @@ $labels['timezone']  = '时区';
 $labels['pagesize']  = '每页显示的邮件数量';
 $labels['signature'] = '签名';
 $labels['dstactive']  = '夏令时';
-$labels['showinextwin'] = 'Open message in a new window';
+$labels['showinextwin'] = '在新窗口中打开';
 $labels['composeextwin'] = '在新窗口中撰写';
 $labels['htmleditor'] = '使用 HTML 编辑器';
-$labels['htmlonreply'] = '仅当回复HTML邮件';
+$labels['htmlonreply'] = '仅当回复 HTML 邮件';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '使用 HTML 签名';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '显示预览窗口';
 $labels['skin'] = '界面皮肤';
 $labels['logoutclear'] = '退出时清空回收站';
@@ -422,7 +427,7 @@ $labels['always'] = '总是';
 $labels['showinlineimages'] = '在邮件下方显示附件中的图片';
 $labels['autosavedraft']  = '自动保存到草稿箱';
 $labels['everynminutes']  = '每隔 $n 分钟';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = '刷新间隔';
 $labels['never']  = '从不';
 $labels['immediately']  = '立即';
 $labels['messagesdisplaying'] = '显示参数';
@@ -431,12 +436,12 @@ $labels['mimeparamfolding'] = '附件名';
 $labels['2231folding'] = '完整的 RFC 2231（Thunderbird）';
 $labels['miscfolding'] = 'RFC 2047/2232（MS Outlook）';
 $labels['2047folding'] = '完整的 RFC 2047（其它）';
-$labels['force7bit'] = '对8位字符使用MIME编码';
+$labels['force7bit'] = '对8位字符使用 MIME 编码';
 $labels['advancedoptions'] = '高级选项';
 $labels['focusonnewmessage'] = '新邮件到达时将窗口提升为焦点窗口';
 $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
-$labels['displaynext'] = '当邮件删掉/移动后显示下一封邮件';
-$labels['defaultfont'] = '默认的HTML格式字体';
+$labels['displaynext'] = '当邮件删除/移动后显示下一封邮件';
+$labels['defaultfont'] = '默认的 HTML 格式字体';
 $labels['mainoptions'] = '主要选项';
 $labels['browseroptions'] = '浏览器选项';
 $labels['section'] = '项目';
@@ -444,16 +449,13 @@ $labels['maintenance'] = '维护';
 $labels['newmessage'] = '新邮件';
 $labels['signatureoptions'] = '签名选项';
 $labels['whenreplying'] = '当回复时';
-$labels['replyempty'] = 'do not quote the original message';
+$labels['replyempty'] = '不要引用原始邮件';
 $labels['replytopposting'] = '在原文上面开始新邮件';
 $labels['replybottomposting'] = '在原文下面开始新邮件';
 $labels['replyremovesignature'] = '当回复时从邮件移除原始签名';
 $labels['autoaddsignature'] = '自动插入签名';
 $labels['newmessageonly'] = '仅新邮件';
 $labels['replyandforwardonly'] = '仅回复和转发邮件';
-$labels['replysignaturepos'] = '当回复或转发时插入签名';
-$labels['belowquote'] = '位于原文下方';
-$labels['abovequote'] = '位于原文上方';
 $labels['insertsignature'] = '插入签名';
 $labels['previewpanemarkread']  = '标记预览邮件为已读';
 $labels['afternseconds']  = '$n 秒之后';
@@ -462,7 +464,7 @@ $labels['reqdsn'] = '总是要求投递状态通知';
 $labels['replysamefolder'] = '保存回复邮件到邮件相同的目录';
 $labels['defaultabook'] = '默认地址薄';
 $labels['autocompletesingle'] = '跳过自动完成的电子邮件地址';
-$labels['listnamedisplay'] = 'List contacts as';
+$labels['listnamedisplay'] = '列出联系人为';
 $labels['spellcheckbeforesend'] = '发邮件前进行拼写检查';
 $labels['spellcheckoptions'] = '拼写检查选项';
 $labels['spellcheckignoresyms'] = '忽略带符号的单词';
@@ -470,9 +472,9 @@ $labels['spellcheckignorenums'] = '忽略带数字的单词';
 $labels['spellcheckignorecaps'] = '忽略所有大写字母的单词';
 $labels['addtodict'] = '添加到字典中';
 $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['forwardmode'] = '邮件转发方式';
+$labels['inline'] = '内嵌';
+$labels['asattachment'] = '作为附件';
 
 $labels['folder']  = '目录管理';
 $labels['folders']  = '目录管理';
@@ -503,9 +505,9 @@ $labels['undo'] = '撤销';
 $labels['installedplugins'] = '已安装插件';
 $labels['plugin'] = '插件';
 $labels['version'] = '版本';
-$labels['source'] = '源';
+$labels['source'] = '源代码';
 $labels['license'] = '许可协议';
-$labels['support'] = '获取支持';
+$labels['support'] = '支持';
 
 // units
 $labels['B'] = 'B';
@@ -519,7 +521,7 @@ $labels['english'] = '英语';
 $labels['westerneuropean'] = '西欧';
 $labels['easterneuropean'] = '东欧';
 $labels['southeasterneuropean'] = '东南欧';
-$labels['baltic'] = '波罗的海';
+$labels['baltic'] = '波罗的语';
 $labels['cyrillic'] = '西里尔语';
 $labels['arabic'] = '阿拉伯语';
 $labels['greek'] = '希腊语';
@@ -527,7 +529,7 @@ $labels['hebrew'] = '希伯来语';
 $labels['turkish'] = '土耳其语';
 $labels['nordic'] = '北欧';
 $labels['thai'] = '泰语';
-$labels['celtic'] = '塞尔特';
+$labels['celtic'] = '塞尔特语';
 $labels['vietnamese'] = '越南语';
 $labels['japanese'] = '日文';
 $labels['korean'] = '韩语';