2 files changed, 205 insertions, 190 deletions

diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index d2765c76b..97425fe27 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -3,14 +3,15 @@
 /*
 
  +-----------------------------------------------------------------------+
- | language/zh_CN/labels.inc                                             |
+ | localization/zh_CN/labels.inc                                         |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- |  Author: winman rong  <winman.rong@gmail.com>                         |
+ | Author: kourge <kourge@gmail.com>                                     |
+ |         Xue zhong sheng <xue.zhongsheng@gmail.com>                    |
  +-----------------------------------------------------------------------+
 
  @version $Id$
@@ -18,179 +19,163 @@
 */
 
 $labels = array();
-
-// login page
-$labels['username']  = '用户名';
-$labels['password']  = '密码';
-$labels['server']    = '服务器';
-$labels['login']     = '登录';
-
-// taskbar
-$labels['logout']   = '退出';
-$labels['mail']     = '电子邮件';
-$labels['settings'] = '个人设置';
-$labels['addressbook'] = '地址薄';
-
-// mailbox names
-$labels['inbox']  = '收件箱';
-$labels['sent']   = '发件箱';
-$labels['trash']  = '垃圾桶';
-$labels['drafts'] = '早稿';
-$labels['junk']   = '垃圾邮件';
-
-// message listing
-$labels['subject'] = '邮件标题';
-$labels['from']    = '发件人';
-$labels['to']      = '接收人';
-$labels['cc']      = '副本';
-$labels['bcc']     = '密送';
-$labels['replyto'] = '回复地址';
-$labels['date']    = '日期';
-$labels['size']    = '文件大小';
-$labels['priority'] = '优先权';
-$labels['organization'] = '机构';
-
-// aliases
-$labels['reply-to'] = $labels['回复到'];
-
-$labels['mailboxlist'] = '文件夹';
-$labels['messagesfromto'] = '邮件 $from 到 $to 总共 $count';
-$labels['messagenrof'] = 'Message $nr of $count';
-
-$labels['moveto']   = '移动到...';
+$labels['welcome'] = '欢迎使用 $product';
+$labels['username'] = '用户名';
+$labels['password'] = '密码';
+$labels['server'] = '服务器';
+$labels['login'] = '登录';
+$labels['logout'] = '注销';
+$labels['mail'] = '电子邮件';
+$labels['settings'] = '系统设定';
+$labels['addressbook'] = '通讯录';
+$labels['inbox'] = '收件箱';
+$labels['drafts'] = '草稿箱';
+$labels['sent'] = '已发送邮件';
+$labels['trash'] = '垃圾邮件';
+$labels['junk'] = '回收箱';
+$labels['subject'] = '主题';
+$labels['from'] = '发件人';
+$labels['to'] = '收件人';
+$labels['cc'] = '抄送';
+$labels['bcc'] = '暗送';
+$labels['replyto'] = '回复至';
+$labels['date'] = '日期';
+$labels['size'] = '大小';
+$labels['priority'] = '优先级';
+$labels['organization'] = '组织';
+$labels['reply-to'] = '回复至';
+$labels['mailboxlist'] = '邮件夹';
+$labels['messagesfromto'] = '从 $from 到 $to，共有 $count 封邮件';
+$labels['messagenrof'] = '第 $nr 封邮件，共有 $count 封';
+$labels['moveto'] = '转移至...';
 $labels['download'] = '下载';
-
-$labels['filename'] = '文件名称';
+$labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
-
-$labels['preferhtml'] = '允许以HTML格式显示邮件内容';
-$labels['htmlmessage'] = 'HTML格式邮件';
-$labels['prettydate'] = 'Pretty dates';
-
-$labels['addtoaddressbook'] = '加到地址薄';
-
-// weekdays short
-$labels['sun'] = '星期日';
-$labels['mon'] = '星期一';
-$labels['tue'] = '星期二';
-$labels['wed'] = '星期三';
-$labels['thu'] = '星期四';
-$labels['fri'] = '星期五';
-$labels['sat'] = '星期六';
-
-// weekdays long
-$labels['sunday']    = '星期日';
-$labels['monday']    = '星期一';
-$labels['tuesday']   = '星期二';
+$labels['preferhtml'] = '使用HTML显示';
+$labels['htmlmessage'] = 'HTML邮件';
+$labels['prettydate'] = '短日期格式';
+$labels['addtoaddressbook'] = '添加到通讯录';
+$labels['sun'] = '日';
+$labels['mon'] = '一';
+$labels['tue'] = '二';
+$labels['wed'] = '三';
+$labels['thu'] = '四';
+$labels['fri'] = '五';
+$labels['sat'] = '六';
+$labels['sunday'] = '星期日';
+$labels['monday'] = '星期一';
+$labels['tuesday'] = '星期二';
 $labels['wednesday'] = '星期三';
-$labels['thursday']  = '星期四';
-$labels['friday']    = '星期五';
-$labels['saturday']  = '星期六';
-
-$labels['today'] = '今天';
-
-// toolbar buttons
-$labels['writenewmessage']  = '写新邮件';
-$labels['replytomessage']   = '回复邮件';
-$labels['forwardmessage']   = '转发邮件';
-$labels['deletemessage']    = '把邮件移动到垃圾桶';
-$labels['printmessage']     = '打印这封邮件';
-$labels['previousmessages'] = '查看上一封邮件';
-$labels['nextmessages']     = '查看下一封邮件';
-$labels['backtolist']       = '返回邮件列表';
-$labels['viewsource']       = '显示源代码';
-
+$labels['thursday'] = '星期四';
+$labels['friday'] = '星期五';
+$labels['saturday'] = '星期六';
+$labels['today'] = '今日';
+$labels['checkmail'] = '检查邮件';
+$labels['writenewmessage'] = '写新邮件';
+$labels['replytomessage'] = '回复';
+$labels['replytoallmessage'] = '全部回复';
+$labels['forwardmessage'] = '转发';
+$labels['deletemessage'] = '删除';
+$labels['printmessage'] = '打印';
+$labels['previousmessage'] = '上一封';
+$labels['previousmessages'] = '上一页';
+$labels['firstmessage'] = '第一封';
+$labels['firstmessages'] = '第一页';
+$labels['nextmessage'] = '下一封';
+$labels['nextmessages'] = '下一页';
+$labels['lastmessage'] = '最后一封';
+$labels['lastmessages'] = '最后一页';
+$labels['backtolist'] = '返回邮件列表';
+$labels['viewsource'] = '显示邮件原文';
 $labels['select'] = '选择';
 $labels['all'] = '全部';
-$labels['none'] = '没有';
-$labels['unread'] = '还没读过的';
-
-// message compose
-$labels['compose']  = '写新邮件';
-$labels['sendmessage']  = '立刻发送邮件';
-$labels['addattachment']  = '附加一个文件';
-
+$labels['none'] = '无';
+$labels['unread'] = '未读';
+$labels['compact'] = '压缩';
+$labels['empty'] = '清空';
+$labels['purge'] = '清除';
+$labels['quota'] = '空间使用';
+$labels['unknown'] = '未知';
+$labels['unlimited'] = '无限制';
+$labels['quicksearch'] = '快速查找';
+$labels['resetsearch'] = '重新查找';
+$labels['compose'] = '写新邮件';
+$labels['sendmessage'] = '立即发送';
+$labels['savemessage'] = '暂存至草稿箱';
+$labels['addattachment'] = '添加附件';
+$labels['charset'] = '字符集';
+$labels['editortype'] = '编辑器类型';
+$labels['returnreceipt'] = '邮件回执';
+$labels['checkspelling'] = '拼写检查';
+$labels['resumeediting'] = '继续编辑';
+$labels['revertto'] = '恢复至';
 $labels['attachments'] = '附件';
 $labels['upload'] = '上传';
-$labels['close']  = '关闭';
-
-$labels['low']     = '低';
-$labels['lowest']  = '最低';
-$labels['normal']  = '正常';
-$labels['high']    = '高';
+$labels['close'] = '关闭';
+$labels['low'] = '低';
+$labels['lowest'] = '最低';
+$labels['normal'] = '普通';
+$labels['high'] = '高';
 $labels['highest'] = '最高';
-
+$labels['nosubject'] = '（无主题）';
 $labels['showimages'] = '显示图片';
-
-// address boook
-$labels['name']      = '显示名字';
-$labels['firstname'] = '名';
-$labels['surname']   = '姓';
-$labels['email']     = '电子邮件';
-
-$labels['addcontact'] = '增加新联系人';
-$labels['editcontact'] = '编辑联系信息';
-
-$labels['edit']   = '编辑';
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = '纯文本';
+$labels['name'] = '显示名称';
+$labels['firstname'] = '名称';
+$labels['surname'] = '姓氏';
+$labels['email'] = '电子邮件地址';
+$labels['addcontact'] = '添加联系人';
+$labels['editcontact'] = '修改联系人';
+$labels['edit'] = '编辑';
 $labels['cancel'] = '取消';
-$labels['save']   = '保存';
+$labels['save'] = '储存';
 $labels['delete'] = '删除';
-
-$labels['newcontact']     = '建立新的联系信息';
-$labels['deletecontact']  = '删除所选择的联系信息';
-$labels['composeto']      = '给所选择的联系人发送邮件';
-$labels['contactsfromto'] = '联系人 $from 到 $to 总共 $count';
-$labels['print']          = '打印';
-$labels['export']         = '导出';
-
-// settings
-$labels['settingsfor']  = 'Settings for';
-
-$labels['preferences']  = '个人设定';
-$labels['userpreferences']  = '用户喜好设定';
-$labels['editpreferences']  = '编辑用户设定';
-
-$labels['identities']  = '发件人身份';
-$labels['manageidentities']  = '管理帐号资料';
-$labels['newidentity']  = '建立新标识';
-
-$labels['newitem']  = 'New item';
-$labels['edititem']  = 'Edit item';
-
-$labels['setdefault']  = '设置为默认';
-$labels['language']  = '语言';
-$labels['timezone']  = '时区';
-$labels['pagesize']  = '每页邮件数';
-
-$labels['folders']  = '文件夹';
-$labels['foldername']  = '文件夹名称';
-$labels['subscribed']  = '显示与否';
-$labels['create']  = '创建';
-$labels['createfolder']  = '建立新文件夹';
-$labels['deletefolder']  = '删除文件夹';
-$labels['managefolders']  = '管理文件夹';
-
-// New Words since 0.1 beta
-$labels['welcome'] = '欢迎使用 $product';
-
-$labels['unknown'] = '未知';
-$labels['unlimited'] = '无限制';
-$labels['dstactive'] = 'Daylight savings';
-
-$labels['previouspage'] = '上一页';
-$labels['nextpage']     = '下一页';
-
-$labels['returnreceipt'] = '返回邮件阅读回执';
-
-$labels['checkmail'] = '检查邮件';
-$labels['checkspelling'] = '拼写检查';
-$labels['resumeediting'] = '继续编辑';
-$labels['revertto'] = '恢复';
-
-$labels['savemessage']  = '存储为草稿';
+$labels['newcontact'] = '建立联系人卡片';
+$labels['deletecontact'] = '删除选中的联系人';
+$labels['composeto'] = '写信给';
+$labels['contactsfromto'] = '从 $from 到 $to，共有 $count 个联系人';
+$labels['print'] = '打印';
+$labels['export'] = '导出';
+$labels['previouspage'] = '上页';
+$labels['firstpage'] = '首页';
+$labels['nextpage'] = '下页';
+$labels['lastpage'] = '末页';
+$labels['groups'] = '分组';
+$labels['personaladrbook'] = '个人住址';
+$labels['settingsfor'] = '设置';
+$labels['preferences'] = '偏好';
+$labels['userpreferences'] = '个人偏好';
+$labels['editpreferences'] = '修改个人偏好';
+$labels['identities'] = '身份';
+$labels['manageidentities'] = '管理此账号的身份';
+$labels['newidentity'] = '添加身份';
+$labels['newitem'] = '添加条目';
+$labels['edititem'] = '修改条目';
+$labels['setdefault'] = '默认值';
+$labels['language'] = '语言';
+$labels['timezone'] = '时区';
+$labels['pagesize'] = '第页邮件数量';
+$labels['signature'] = '签名';
+$labels['dstactive'] = '夏令时';
+$labels['htmleditor'] = '使用HTML编辑器';
+$labels['htmlsignature'] = '使用HTML签名';
+$labels['previewpane'] = '显示预览窗口';
+$labels['autosavedraft'] = '自动保存到草稿箱';
+$labels['everynminutes'] = '第 $n 分钟';
+$labels['never'] = '从不';
+$labels['folder'] = '邮件夹';
+$labels['folders'] = '邮件夹';
+$labels['foldername'] = '邮件夹名称';
+$labels['subscribed'] = '已订阅';
+$labels['create'] = '建立';
+$labels['createfolder'] = '建立新邮件夹';
 $labels['rename'] = '重命名';
-$labels['renamefolder'] = '重命名文件夹';
-
-$labels['description'] = '描述';
+$labels['renamefolder'] = '重命名邮件夹';
+$labels['deletefolder'] = '删除邮件夹';
+$labels['managefolders'] = '管理邮件夹';
+$labels['sortby'] = '排序';
+$labels['sortasc'] = '递增排序';
+$labels['sortdesc'] = '递减排序';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index bc7b4e0a5..a1fe808c1 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -3,14 +3,15 @@
 /*
 
  +-----------------------------------------------------------------------+
- | language/zh_CN/messages.inc                                           |
+ | localization/zh_CN/messages.inc                                       |
  |                                                                       |
  | Language file of the RoundCube Webmail client                         |
  | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- |  Author: winman rong  <winman.rong@gmail.com>                         |
+ | Author: kourge <kourge@gmail.com>                                     |
+ |         Xue zhong sheng <xue.zhongsheng@gmail.com>                    |
  +-----------------------------------------------------------------------+
 
  @version $Id$
@@ -18,31 +19,60 @@
 */
 
 $messages = array();
-$messages['loginfailed']  = '登录失败';
-$messages['cookiesdisabled'] = '你的浏览器目前关闭了cookies，请打开cookies再试';
-$messages['sessionerror'] = '当前 session 无效或者超时 ';
-$messages['imaperror'] = '不能连接IMAP服务器';
-$messages['nomessagesfound'] = '没有邮件在这个邮箱里';
-$messages['loggedout'] = '成功结束当前会话. 再见!';
-$messages['mailboxempty'] = '邮箱现在是空的';
-$messages['loadingdata'] = '读取数据...';
+$messages['loginfailed'] = '登录失败';
+$messages['cookiesdisabled'] = '你的浏览器不接受 cookies';
+$messages['sessionerror'] = '会话已过期';
+$messages['imaperror'] = '连接到邮件服务器失败';
+$messages['nomessagesfound'] = '此邮件夹内无邮件';
+$messages['loggedout'] = '你已成功注销';
+$messages['mailboxempty'] = '邮件夹为空';
+$messages['loading'] = '加载中...';
+$messages['loadingdata'] = '数据加载中...';
+$messages['checkingmail'] = '检查新邮件...';
+$messages['sendingmessage'] = '正在发送邮件...';
 $messages['messagesent'] = '邮件发送成功';
+$messages['savingmessage'] = '正在储存邮件...';
+$messages['messagesaved'] = '邮件已暂存到草稿箱';
 $messages['successfullysaved'] = '保存成功';
-$messages['addedsuccessfully'] = '联系信息已经成功增加到地址薄';
-$messages['contactexists'] = '这个邮件地址已经存在';
-$messages['blockedimages'] = '为了保障个人私隐, 阻挡了邮件里的图片.';
-$messages['encryptedmessage'] = '抱歉!不能显示加密邮件.';
-$messages['nocontactsfound'] = '没有发现联系人';
-$messages['sendingfailed'] = '邮件发送失败';
-$messages['errorsaving'] = '当发生错误时保存信息';
-$messages['errormoving'] = '移动邮件出错';
-$messages['errordeleting'] = '删除邮件出错';
-// New Words since 0.1 beta
-$messages['checking'] = '检查...';
-$messages['nospellerrors'] = '没发现拼写错误';
-$messages['checkingmail'] = '检查新邮件...';
-$messages['savingmessage'] = '保存邮件...';
-$messages['messagesaved'] = '将邮件保存为草稿';
-$messages['folderdeleted'] = '成功删除文件夹';
+$messages['addedsuccessfully'] = '成功添加联系人';
+$messages['contactexists'] = '当前联系人的电子邮件地址已存在';
+$messages['blockedimages'] = '为保护隐私，此邮件中的远程图片未显示';
+$messages['encryptedmessage'] = '因此邮件已加密，无法正常显示';
+$messages['nocontactsfound'] = '未找到联系人';
+$messages['contactnotfound'] = '未找到指定的联系人';
+$messages['sendingfailed'] = '发送失败';
+$messages['errorsaving'] = '保存过程中发生错误';
+$messages['errormoving'] = '无法移动邮件';
+$messages['errordeleting'] = '无法删除邮件';
+$messages['deletecontactconfirm'] = '你是否确认要删除已选中的联系人？';
+$messages['deletemessagesconfirm'] = '你是否确认要删除已选中的邮件？';
+$messages['deletefolderconfirm'] = '你是否确认要删除已选中的邮件夹？';
+$messages['purgefolderconfirm'] = '你是否确认要删除当前邮件夹中的所有邮件？';
+$messages['formincomplete'] = '当前表单未填写完整，请完整填写';
+$messages['noemailwarning'] = '请输入一个有效的邮件地址';
+$messages['nonamewarning'] = '请输入名字';
+$messages['nopagesizewarning'] = '请输入每页显示的邮件数量';
+$messages['norecipientwarning'] = '至少需要一个收件人';
+$messages['nosubjectwarning'] = '主题为空。你要输入一个主题吗？';
+$messages['nobodywarning'] = '要发送无正文的邮件吗？';
+$messages['notsentwarning'] = '邮件未发送。你确定要离开并废弃当前邮件？';
+$messages['noldapserver'] = '请选择一个LDAP服务器进行查找';
+$messages['nocontactsreturned'] = '未找到联系人';
+$messages['nosearchname'] = '请输入一个联系人姓名或电子邮件地址';
+$messages['searchsuccessful'] = '共找到 $n 封邮件';
+$messages['searchnomatch'] = '未找到任何符合条件的邮件';
+$messages['searching'] = '查找中...';
+$messages['checking'] = '检查中...';
+$messages['nospellerrors'] = '未发现拼写错误';
+$messages['folderdeleted'] = '邮件夹已被成功删除';
+$messages['deletedsuccessfully'] = '删除成功';
+$messages['converting'] = '格式转换中...';
+$messages['messageopenerror'] = '无法从服务器上加载邮件内容';
+$messages['fileuploaderror'] = '文件上传失败';
+$messages['filesizeerror'] = '上传的文件超过了 $size 的大小限制';
+$messages['copysuccess'] = '成功复制 $nr 个地址';
+$messages['copyerror'] = '无法复制地址';
+$messages['sourceisreadonly'] = '源地址为只读';
+$messages['errorsavingcontact'] = '无法保存联系人的地址';
 
 ?>
\ No newline at end of file