2 files changed, 78 insertions, 22 deletions

diff --git a/program/localization/cn/labels.inc b/program/localization/cn/labels.inc
index 315775fd6..e1cbcc469 100644
--- a/program/localization/cn/labels.inc
+++ b/program/localization/cn/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- |  Simplified-chinese utf-8 by winman 2005/12/6                         |
+ |  Simplified-chinese utf-8 by winman 2006/02/19                        |
  |  Author: winman rong  <winman.rong@gmail.com>                         |
  +-----------------------------------------------------------------------+
 
@@ -35,7 +35,7 @@ $labels['addressbook'] = '地址薄';
 $labels['inbox']  = '收件箱';
 $labels['sent']   = '发件箱';
 $labels['trash']  = '垃圾桶';
-$labels['drafts'] = '早稿';
+$labels['drafts'] = '草稿';
 $labels['junk']   = '垃圾邮件';
 
 // message listing
@@ -47,14 +47,14 @@ $labels['bcc']     = '密送';
 $labels['replyto'] = '回复地址';
 $labels['date']    = '日期';
 $labels['size']    = '文件大小';
-$labels['priority'] = '优先权';
-$labels['organization'] = '机构';
+$labels['priority'] = '优先级';
+$labels['organization'] = '团体';
 
 // aliases
 $labels['reply-to'] = $labels['回复到'];
 
 $labels['mailboxlist'] = '文件夹';
-$labels['messagesfromto'] = '邮件 $from 到 $to 总共 $count';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
 
 $labels['moveto']   = '移动到...';
@@ -94,21 +94,27 @@ $labels['writenewmessage']  = '写新邮件';
 $labels['replytomessage']   = '回复邮件';
 $labels['forwardmessage']   = '转发邮件';
 $labels['deletemessage']    = '把邮件移动到垃圾桶';
-$labels['printmessage']     = '打印这封邮件';
-$labels['previousmessages'] = '查看上一封邮件';
-$labels['nextmessages']     = '查看下一封邮件';
-$labels['backtolist']       = '返回邮件列表';
+$labels['printmessage']     = '打印邮件';
+$labels['previousmessages'] = '上一封邮件';
+$labels['nextmessages']     = '下一封邮件';
+$labels['backtolist']       = '返回收件箱';
 $labels['viewsource']       = '显示源代码';
 
 $labels['select'] = '选择';
 $labels['all'] = '全部';
-$labels['none'] = '没有';
-$labels['unread'] = '还没读过的';
+$labels['none'] = '不选';
+$labels['unread'] = '没读过的';
+
+$labels['compact'] = 'Compact';
+$labels['empty'] = '空的';
+$labels['purge'] = '清除';
+
+$labels['quota'] = '空间使用';
 
 // message compose
 $labels['compose']  = '写新邮件';
 $labels['sendmessage']  = '立刻发送邮件';
-$labels['addattachment']  = '附加一个文件';
+$labels['addattachment']  = '添加附件';
 
 $labels['attachments'] = '附件';
 $labels['upload'] = '上传';
@@ -120,6 +126,7 @@ $labels['normal']  = '正常';
 $labels['high']    = '高';
 $labels['highest'] = '最高';
 
+$labels['nosubject']  = '(没有主题)';
 $labels['showimages'] = '显示图片';
 
 
@@ -138,23 +145,35 @@ $labels['save']   = '保存';
 $labels['delete'] = '删除';
 
 $labels['newcontact']     = '建立新的联系信息';
-$labels['deletecontact']  = '删除所选择的联系信息';
+$labels['addcontact']     = '将联系人添加到地址薄';
+$labels['deletecontact']  = '删除选择的联系信息';
 $labels['composeto']      = '给所选择的联系人发送邮件';
-$labels['contactsfromto'] = '联系人 $from 到 $to 总共 $count';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
 $labels['print']          = '打印';
 $labels['export']         = '导出';
 
 
+// LDAP search
+$labels['ldapsearch'] = 'LDAP 目录搜索';
+
+$labels['ldappublicsearchname']    = '联系人名字';
+$labels['ldappublicsearchtype'] = '精确匹配?';
+$labels['ldappublicserverselect'] = '选择服务器';
+$labels['ldappublicsearchfield'] = 'Search on';
+$labels['ldappublicsearchform'] = 'Look for a contact';
+$labels['ldappublicsearch'] = '搜索';
+
+
 // settings
-$labels['settingsfor']  = 'Settings for';
+$labels['settingsfor']  = '设置';
 
 $labels['preferences']  = '参数选择';
 $labels['userpreferences']  = '用户参数';
 $labels['editpreferences']  = '编辑用户参数';
 
 $labels['identities']  = '发件人身份';
-$labels['manageidentities']  = '管理帐号资料';
-$labels['newidentity']  = '建立新标识';
+$labels['manageidentities']  = '管理发件人资料';
+$labels['newidentity']  = '建立新身份';
 
 $labels['newitem']  = 'New item';
 $labels['edititem']  = 'Edit item';
@@ -162,9 +181,11 @@ $labels['edititem']  = 'Edit item';
 $labels['setdefault']  = '设置为默认';
 $labels['language']  = '语言';
 $labels['timezone']  = '时区';
-$labels['pagesize']  = '每页邮件数';
+$labels['pagesize']  = '每页行数';
+$labels['signature'] = '签名';
 
 
+$labels['folder']  = '文件夹';
 $labels['folders']  = '文件夹';
 $labels['foldername']  = '文件夹名称';
 $labels['subscribed']  = '显示与否';
@@ -173,5 +194,8 @@ $labels['createfolder']  = '建立新文件夹';
 $labels['deletefolder']  = '删除文件夹';
 $labels['managefolders']  = '管理文件夹';
 
+$labels['sortby'] = 'Sort by';
+$labels['sortasc']  = '由小到大排列';
+$labels['sortdesc'] = '由大到小排列';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/cn/messages.inc b/program/localization/cn/messages.inc
index 2c01a8876..067c3a5ae 100644
--- a/program/localization/cn/messages.inc
+++ b/program/localization/cn/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- |  Simplified-chinese utf-8 by winman 2005/12/6                         |
+ |  Simplified-chinese utf-8 by winman 2006/02/19                        |
  |  Author: winman rong  <winman.rong@gmail.com>                         |
  +-----------------------------------------------------------------------+
 
@@ -23,7 +23,7 @@ $messages['loginfailed']  = '登录失败';
 
 $messages['cookiesdisabled'] = '你的浏览器目前关闭了cookies，请打开cookies再试';
 
-$messages['sessionerror'] = '当前 session 无效或者超时 ';
+$messages['sessionerror'] = '当前 session 无效或者超时';
 
 $messages['imaperror'] = '不能连接IMAP服务器';
 
@@ -31,15 +31,19 @@ $messages['nomessagesfound'] = '没有邮件在这个邮箱里';
 
 $messages['loggedout'] = '成功结束当前会话. 再见!';
 
-$messages['mailboxempty'] = '邮箱现在是空的';
+$messages['mailboxempty'] = '邮箱是空的';
+
+$messages['loading'] = '读取...';
 
 $messages['loadingdata'] = '读取数据...';
 
+$messages['sendingmessage'] = '正在发送邮件...';
+
 $messages['messagesent'] = '邮件发送成功';
 
 $messages['successfullysaved'] = '保存成功';
 
-$messages['addedsuccessfully'] = '联系信息已经成功增加到地址薄';
+$messages['addedsuccessfully'] = '联系信息成功增加到地址薄';
 
 $messages['contactexists'] = '这个邮件地址已经存在';
 
@@ -57,5 +61,33 @@ $messages['errormoving'] = '移动邮件出错';
 
 $messages['errordeleting'] = '删除邮件出错';
 
+$messages['deletecontactconfirm']  = '你确定要删除所选择的联系人信息吗?';
+
+$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'] = '请输入一个联系人名字或者电子邮件地址';
+
 
 ?>
\ No newline at end of file