translations update

2 files changed, 101 insertions, 3 deletions

diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index 9fb98747e..892125747 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -46,14 +46,14 @@ $labels['organization'] = '组织';
 $labels['reply-to'] = '回复至';
 $labels['mailboxlist'] = '邮件夹';
 $labels['messagesfromto'] = '第 $from 到 $to，共 $count 封邮件';
+$labels['threadsfromto'] = '第 $from 到 $to，共 $count 个主题';
 $labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
+$labels['copy'] = '复制';
+$labels['move'] = '移动';
 $labels['moveto'] = '移动到';
 $labels['download'] = '下载';
 $labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
-$labels['preferhtml'] = '以 HTML 格式显示';
-$labels['htmlmessage'] = 'HTML 邮件';
-$labels['prettydate'] = '短日期格式';
 $labels['addtoaddressbook'] = '添加到通讯录';
 $labels['sun'] = '日';
 $labels['mon'] = '一';
@@ -117,13 +117,39 @@ $labels['markread'] = '已读';
 $labels['markunread'] = '未读';
 $labels['markflagged'] = '已标记';
 $labels['markunflagged'] = '未标记';
+$labels['messageactions'] = '更多操作...';
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
+$labels['currpage'] = '当前页';
 $labels['unread'] = '未读';
 $labels['flagged'] = '已标记';
 $labels['unanswered'] = '未回复';
+$labels['deleted'] = '删除';
+$labels['invert'] = '反选';
 $labels['filter'] = '过滤';
+$labels['list'] = '列表';
+$labels['threads'] = '主题';
+$labels['expand-all'] = '展开全部';
+$labels['expand-unread'] = '展开未读';
+$labels['collapse-all'] = '收合全部';
+$labels['threaded'] = '线索';
+$labels['autoexpand_threads'] = '展开消息主题';
+$labels['do_expand'] = '所有主题';
+$labels['expand_only_unread'] = '仅未读消息';
+$labels['fromto'] = '发件人/收件人';
+$labels['flag'] = '标志';
+$labels['attachment'] = '附件';
+$labels['nonesort'] = '无';
+$labels['sentdate'] = '发送日期';
+$labels['arrival'] = '到达日期';
+$labels['asc'] = '升序';
+$labels['desc'] = '降序';
+$labels['listcolumns'] = '列表列';
+$labels['listsorting'] = '排序列';
+$labels['listorder'] = '排序';
+$labels['listmode'] = '列表视图样式';
+$labels['folderactions'] = '目录操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
 $labels['purge'] = '清除';
@@ -132,8 +158,12 @@ $labels['unknown'] = '未知';
 $labels['unlimited'] = '无限制';
 $labels['quicksearch'] = '快速查找';
 $labels['resetsearch'] = '清空查找内容';
+$labels['searchmod'] = '搜寻模式';
+$labels['msgtext'] = '整个邮件';
 $labels['openinextwin'] = '在新窗口中打开';
+$labels['emlsave'] = '下载（.eml）';
 $labels['compose'] = '写新邮件';
+$labels['editasnew'] = '编辑为新邮件';
 $labels['savemessage'] = '保存为草稿';
 $labels['sendmessage'] = '立即发送';
 $labels['addattachment'] = '添加附件';
@@ -183,10 +213,13 @@ $labels['contactsfromto'] = '第 $from 到 $to 个联系人，共 $count 个';
 $labels['print'] = '打印';
 $labels['export'] = '导出';
 $labels['exportvcards'] = '以 vCard 格式导出联系人';
+$labels['newcontactgroup'] = '创建新的联系人组';
+$labels['groupactions'] = '联系人组操作...';
 $labels['previouspage'] = '上一页';
 $labels['firstpage'] = '第一页';
 $labels['nextpage'] = '下一页';
 $labels['lastpage'] = '最后一页';
+$labels['group'] = '分组';
 $labels['groups'] = '分组';
 $labels['personaladrbook'] = '个人住址';
 $labels['import'] = '导入';
@@ -204,6 +237,10 @@ $labels['manageidentities'] = '管理此账号的身份';
 $labels['newidentity'] = '添加身份';
 $labels['newitem'] = '添加条目';
 $labels['edititem'] = '修改条目';
+$labels['preferhtml'] = '以 HTML 格式显示';
+$labels['defaultcharset'] = '默认字符集';
+$labels['htmlmessage'] = 'HTML 邮件';
+$labels['prettydate'] = '短日期格式';
 $labels['setdefault'] = '设为默认';
 $labels['autodetect'] = '自动';
 $labels['language'] = '语言';
@@ -227,6 +264,7 @@ $labels['ignore'] = '忽略';
 $labels['readwhendeleted'] = '删除后标记为已读';
 $labels['flagfordeletion'] = '标记邮件为已删除而不是实际删除';
 $labels['skipdeleted'] = '不显示标记为已删除的邮件';
+$labels['deletealways'] = '如果移动邮件到回收站失败，则删除';
 $labels['showremoteimages'] = '显示内嵌的图片';
 $labels['fromknownsenders'] = '来自未知的发件人';
 $labels['always'] = '总是';
@@ -235,15 +273,37 @@ $labels['autosavedraft'] = '自动保存到草稿箱';
 $labels['everynminutes'] = '每隔 $n 分钟';
 $labels['keepalive'] = '检查新邮件';
 $labels['never'] = '从不';
+$labels['immediately'] = '立即';
 $labels['messagesdisplaying'] = '邮件显示设置';
 $labels['messagescomposition'] = '写邮件';
 $labels['mimeparamfolding'] = '附件名';
 $labels['2231folding'] = '完整的 RFC 2231（Thunderbird）';
 $labels['miscfolding'] = 'RFC 2047/2232（MS Outlook）';
 $labels['2047folding'] = '完整的 RFC 2047（其它）';
+$labels['force7bit'] = '对8位字符使用MIME编码';
 $labels['advancedoptions'] = '高级选项';
 $labels['focusonnewmessage'] = '新邮件到达时将窗口提升为焦点窗口';
 $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
+$labels['displaynext'] = '当邮件删掉/移动后显示下一封邮件';
+$labels['mainoptions'] = '主要选项';
+$labels['section'] = '项目';
+$labels['maintenance'] = '维护';
+$labels['newmessage'] = '新邮件';
+$labels['listoptions'] = '列表选项';
+$labels['signatureoptions'] = '签名选项';
+$labels['whenreplying'] = '当回复时';
+$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 秒之后';
 $labels['folder'] = '邮件夹';
 $labels['folders'] = '邮件夹';
 $labels['foldername'] = '邮件夹名称';
@@ -263,5 +323,23 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '英语';
+$labels['westerneuropean'] = '西欧';
+$labels['easterneuropean'] = '东欧';
+$labels['southeasterneuropean'] = '东南欧';
+$labels['baltic'] = '波罗的海';
+$labels['cyrillic'] = '西里尔语';
+$labels['arabic'] = '阿拉伯语';
+$labels['greek'] = '希腊语';
+$labels['hebrew'] = '希伯来语';
+$labels['turkish'] = '土耳其语';
+$labels['nordic'] = '北欧';
+$labels['thai'] = '泰语';
+$labels['celtic'] = '塞尔特';
+$labels['vietnamese'] = '越南语';
+$labels['japanese'] = '日文';
+$labels['korean'] = '韩语';
+$labels['chinese'] = '中文';
 
 ?>
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index ba5d89fe1..cd30b539d 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -23,10 +23,13 @@ $messages['loginfailed'] = '登录失败';
 $messages['cookiesdisabled'] = '您的浏览器不接受 cookies';
 $messages['sessionerror'] = '会话已过期';
 $messages['imaperror'] = '连接到邮件服务器失败';
+$messages['servererror'] = '服务器错误！';
+$messages['invalidrequest'] = '无效的请求！数据保存失败。';
 $messages['nomessagesfound'] = '此邮件夹内无邮件';
 $messages['loggedout'] = '您已成功注销';
 $messages['mailboxempty'] = '邮件夹为空';
 $messages['loading'] = '正在加载...';
+$messages['uploading'] = '正在上传文件...';
 $messages['loadingdata'] = '正在加载数据...';
 $messages['checkingmail'] = '检查新邮件...';
 $messages['sendingmessage'] = '正在发送邮件...';
@@ -45,7 +48,9 @@ $messages['senttooquickly'] = '您需要等待 $sec 秒才能发送邮件';
 $messages['errorsavingsent'] = '保存已发送邮件时出现错误';
 $messages['errorsaving'] = '保存过程中发生错误';
 $messages['errormoving'] = '无法移动邮件';
+$messages['errorcopying'] = '无法复制邮件';
 $messages['errordeleting'] = '无法删除邮件';
+$messages['errormarking'] = '无法标记邮件';
 $messages['deletecontactconfirm'] = '确定要删除已选中的联系人？';
 $messages['deletemessagesconfirm'] = '确定要删除已选中的邮件？';
 $messages['deletefolderconfirm'] = '确定要删除已选中的邮件夹？';
@@ -66,6 +71,7 @@ $messages['notsentwarning'] = '邮件未发送。您确定要离开并废弃当�
 $messages['noldapserver'] = '请选择一个LDAP服务器进行查找';
 $messages['nocontactsreturned'] = '未找到联系人';
 $messages['nosearchname'] = '请输入一个联系人姓名或电子邮件地址';
+$messages['notuploadedwarning'] = '附件还没有全部上传，请等待或者取消上传。';
 $messages['searchsuccessful'] = '共找到 $nr 封邮件';
 $messages['searchnomatch'] = '未找到任何符合条件的邮件';
 $messages['searching'] = '正在查找...';
@@ -82,6 +88,7 @@ $messages['copyerror'] = '无法复制地址';
 $messages['sourceisreadonly'] = '源地址为只读';
 $messages['errorsavingcontact'] = '无法保存联系人的地址';
 $messages['movingmessage'] = '移动邮件到...';
+$messages['copyingmessage'] = '复制邮件到...';
 $messages['receiptsent'] = '成功发送了一个已读回执';
 $messages['errorsendingreceipt'] = '无法发送回执';
 $messages['nodeletelastidentity'] = '无法删除这个身份，这是最后一个。';
@@ -89,11 +96,24 @@ $messages['addsubfolderhint'] = '新建的文件夹将成为所选文件夹的�
 $messages['forbiddencharacter'] = '目录名包含隐藏字符';
 $messages['selectimportfile'] = '请选择要上传的文件';
 $messages['addresswriterror'] = '已选择的地址簿不可写';
+$messages['contactaddedtogroup'] = '成功添加联系人到这个分组';
+$messages['contactremovedfromgroup'] = '成功从这个分组移除联系人';
 $messages['importwait'] = '正在导入，请稍后...';
 $messages['importerror'] = '导入失败！所上传的文件不是有效的 vCard 文件。';
 $messages['importconfirm'] = '<b>成功导入 $inserted 联系人，$skipped 乎略已存在的联系人</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = '不允许的操作';
 $messages['nofromaddress'] = '选种的身份中没有邮件地址';
 $messages['editorwarning'] = '切换到纯文本编辑器将导致邮件正文中的所有文本格式失效，您确定要这样做吗？';
+$messages['httpreceivedencrypterror'] = '发送一个致命的配置错误，请立即联系管理员。<b>您的邮件无法发送.</b>';
+$messages['smtpconnerror'] = 'SMTP 错误 ($code):连接服务器失败';
+$messages['smtpautherror'] = 'SMTP 错误 ($code): 认证失败';
+$messages['smtpfromerror'] = 'SMTP 错误 ($code):添加发件人失败 "$from" ($msg)';
+$messages['smtptoerror'] = 'SMTP 错误 ($code): 添加收件人失败 "$to" ($msg)';
+$messages['smtprecipientserror'] = 'SMTP 错误: 无法解析收件人列表';
+$messages['smtperror'] = 'SMTP 错误: $msg';
+$messages['emailformaterror'] = '无效的邮件地址：$email';
+$messages['toomanyrecipients'] = '邮件人太多，请减少收件人数量至 $max.';
+$messages['maxgroupmembersreached'] = '组员数量超过最大值 $max';
+$messages['internalerror'] = '遇到一个内部错误，请重试';
 
 ?>