From 5cea366884ec515b9a815b87c0621fc5c5760181 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 14 May 2012 09:04:01 +0200
Subject: Update localizations from launchpad

---
 program/localization/zh_CN/labels.inc   | 6 +++++-
 program/localization/zh_CN/messages.inc | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'program/localization/zh_CN')

diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index ecf0874bc..df2628cea 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Christopher Meng <cickumqt@gmail.com>                         |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -272,6 +272,7 @@ $labels['delete'] = '删除';
 $labels['rename'] = '更名';
 $labels['addphoto'] = '上传';
 $labels['replacephoto'] = '覆盖';
+$labels['uploadphoto'] = '上传照片';
 $labels['newcontact'] = '新建联系人';
 $labels['deletecontact'] = '删除选中的联系人';
 $labels['composeto'] = '写信给';
@@ -282,6 +283,7 @@ $labels['exportvcards'] = '以 vCard 格式导出联系人';
 $labels['newcontactgroup'] = '创建新的组';
 $labels['grouprename'] = '重命名组';
 $labels['groupdelete'] = '删除组';
+$labels['groupremoveselected'] = '从分组中移除选中的联系人';
 $labels['previouspage'] = '上一页';
 $labels['firstpage'] = '第一页';
 $labels['nextpage'] = '下一页';
@@ -341,6 +343,7 @@ $labels['readwhendeleted'] = '删除后标记为已读';
 $labels['flagfordeletion'] = '标记邮件为已删除而不是实际删除';
 $labels['skipdeleted'] = '不显示标记为已删除的邮件';
 $labels['deletealways'] = '如果移动邮件到回收站失败，则删除';
+$labels['deletejunk'] = '在、';
 $labels['showremoteimages'] = '显示内嵌的图片';
 $labels['fromknownsenders'] = '来自已知发件人';
 $labels['always'] = '总是';
@@ -363,6 +366,7 @@ $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
 $labels['displaynext'] = '当邮件删掉/移动后显示下一封邮件';
 $labels['defaultfont'] = '默认的HTML格式字体';
 $labels['mainoptions'] = '主要选项';
+$labels['browseroptions'] = '浏览器选项';
 $labels['section'] = '项目';
 $labels['maintenance'] = '维护';
 $labels['newmessage'] = '新邮件';
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 5c02406a0..d4cf77082 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -9,12 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: snowdream <yanghui1986527@gmail.com>                          |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
 
 $messages = array();
+$messages['errortitle'] = '发生错误！';
 $messages['loginfailed'] = '登录失败';
 $messages['cookiesdisabled'] = '您的浏览器不接受 cookies';
 $messages['sessionerror'] = '会话已过期';
@@ -106,6 +107,7 @@ $messages['addingmember'] = '正在添加联系人到组...';
 $messages['removingmember'] = '正在从组中删除联系人...';
 $messages['receiptsent'] = '成功发送了一个已读回执';
 $messages['errorsendingreceipt'] = '无法发送回执';
+$messages['deleteidentityconfirm'] = '你真的想删除这个验证信息吗？';
 $messages['nodeletelastidentity'] = '无法删除这个身份，这是最后一个。';
 $messages['forbiddencharacter'] = '目录名包含隐藏字符';
 $messages['selectimportfile'] = '请选择要上传的文件';
-- 
cgit v1.2.3