From 7e34e4c5b5dac037435d0fc2c6db1f71199006e0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 15 Nov 2014 04:03:58 -0500
Subject: [PATCH] Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0

---
 program/localization/zh_CN/labels.inc |  103 ++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index c3b1439..e1e0541 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -52,6 +52,7 @@
 $labels['copy']     = '复制';
 $labels['move']     = '移动';
 $labels['moveto']   = '移至...';
+$labels['copyto']   = '复制至';
 $labels['download'] = '下载';
 $labels['open']     = '打开';
 $labels['showattachment'] = '显示';
@@ -130,16 +131,24 @@
 $labels['more']             = '更多';
 $labels['back']             = '返回';
 $labels['options']          = '个人选项';
+$labels['first'] = '首';
+$labels['last'] = '尾';
+$labels['previous'] = '前一';
+$labels['next'] = '后一';
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
 $labels['currpage'] = '当前页';
+$labels['isread'] = '读';
 $labels['unread'] = '未读邮件';
 $labels['flagged'] = '已标记邮件';
+$labels['unflagged'] = '未标记';
 $labels['unanswered'] = '未回复邮件';
 $labels['withattachment'] = '包含附件';
 $labels['deleted'] = '已删除邮件';
 $labels['undeleted'] = '未删除邮件';
+$labels['replied'] = '已回复';
+$labels['forwarded'] = '已转发';
 $labels['invert'] = '反选';
 $labels['filter'] = '过滤';
 $labels['list'] = '列表';
@@ -170,6 +179,11 @@
 $labels['quota'] = '邮箱容量';
 $labels['unknown']  = '未知';
 $labels['unlimited']  = '无限制';
+$labels['quotatype'] = '容量类型';
+$labels['quotatotal'] = '限额';
+$labels['quotaused'] = '已用';
+$labels['quotastorage'] = '存储空间';
+$labels['quotamessage'] = '邮件数统计';
 $labels['quicksearch']  = '快速查找';
 $labels['resetsearch']  = '清空';
 $labels['searchmod']  = '修改搜索';
@@ -177,6 +191,10 @@
 $labels['body']  = '正文';
 $labels['type'] = '类型：';
 $labels['namex'] = '姓名';
+$labels['searchscope'] = '范围';
+$labels['currentfolder'] = '当前文件夹';
+$labels['subfolders'] = '当前文件夹及其子文件夹';
+$labels['allfolders'] = '所有文件夹';
 $labels['openinextwin'] = '在新窗口中打开';
 $labels['emlsave'] = '下载(.eml)';
 $labels['changeformattext'] = '以文本格式显示';
@@ -192,6 +210,10 @@
 $labels['dsn']            = '投递状态通知';
 $labels['mailreplyintro'] = '在 $date，$sender 写道：';
 $labels['originalmessage'] = '原始邮件';
+$labels['selectimage']    = '选择图片';
+$labels['addimage']       = '添加图片';
+$labels['selectmedia']    = '选择影片';
+$labels['addmedia']       = '添加影片';
 $labels['editidents']    = '编辑身份';
 $labels['spellcheck']    = '拼写';
 $labels['checkspelling'] = '拼写检查';
@@ -202,9 +224,10 @@
 $labels['responses'] = '回复';
 $labels['insertresponse'] = '插入回复';
 $labels['manageresponses'] = '管理回复';
-$labels['savenewresponse'] = '保存新回复';
-$labels['editresponses'] = '编辑回复';
+$labels['savenewresponse'] = '创建新回复';
+$labels['addresponse'] = '添加回复';
 $labels['editresponse'] = '编辑回复';
+$labels['editresponses'] = '编辑回复';
 $labels['responsename'] = '姓名';
 $labels['responsetext'] = '以文本形式回复';
 $labels['attach'] = '附加';
@@ -213,6 +236,7 @@
 $labels['uploadprogress'] = '$percent ($current / $total)';
 $labels['close']  = '关闭';
 $labels['messageoptions']  = '邮件选项...';
+$labels['togglecomposeoptions'] = '切换布局选项';
 $labels['low']     = '低';
 $labels['lowest']  = '最低';
 $labels['normal']  = '普通';
@@ -287,11 +311,13 @@
 $labels['typeblog'] = '博客';
 $labels['typeprofile'] = '资料';
 $labels['addfield'] = '新增条目...';
-$labels['addcontact'] = '新建联系人';
+$labels['addcontact'] = '添加联系人';
 $labels['editcontact'] = '编辑联系人';
 $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
+$labels['contactnameandorg'] = '姓名和公司';
 $labels['personalinfo'] = '个人信息';
+$labels['contactphoto'] = '联系人照片';
 $labels['edit']   = '编辑';
 $labels['cancel'] = '取消';
 $labels['save']   = '保存';
@@ -309,10 +335,11 @@
 $labels['exportall']      = '导出全部';
 $labels['exportsel']      = '导出选中';
 $labels['exportvcards']   = '导出联系人为 vCard 格式';
-$labels['newcontactgroup'] = '创建新的联系人群组';
+$labels['newcontactgroup']       = '创建新组';
 $labels['grouprename']    = '重命名群组';
 $labels['groupdelete']    = '删除群组';
 $labels['groupremoveselected'] = '删除选中';
+$labels['uponelevel']     = '升一级';
 $labels['previouspage']   = '上一页';
 $labels['firstpage']      = '首页';
 $labels['nextpage']       = '下一页';
@@ -339,10 +366,10 @@
 $labels['userpreferences'] = '个人选项';
 $labels['editpreferences'] = '修改个人选项';
 $labels['identities'] = '发件人身份';
-$labels['manageidentities'] = '管理此账号的身份';
-$labels['newidentity'] = '添加身份';
-$labels['newitem'] = '添加条目';
-$labels['edititem'] = '编辑条目';
+$labels['manageidentities'] = '管理身份';
+$labels['newidentity'] = '创建新身份';
+$labels['addidentity'] = '添加身份';
+$labels['edititem'] = '编辑身份';
 $labels['preferhtml'] = '以 HTML 格式显示';
 $labels['defaultcharset'] = '默认字符集';
 $labels['htmlmessage'] = 'HTML 邮件';
@@ -400,6 +427,7 @@
 $labels['2047folding'] = '完整的 RFC 2047（其它）';
 $labels['force7bit'] = '对 8 位字符使用 MIME 编码';
 $labels['advancedoptions'] = '高级选项';
+$labels['toggleadvancedoptions'] = '切换高级选项';
 $labels['focusonnewmessage'] = '新邮件到达时将窗口提升为焦点窗口';
 $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
 $labels['displaynext'] = '当邮件删除/移动后显示下一封邮件';
@@ -441,14 +469,14 @@
 $labels['replyallmode'] = '[回复所有]按钮的默认动作';
 $labels['replyalldefault'] = '回复全部';
 $labels['replyalllist'] = '只回复邮件列表中的联系人(找到的)';
-$labels['folder']  = '文件夹管理';
-$labels['folders']  = '文件夹管理';
-$labels['foldername']  = '邮件夹名称';
-$labels['subscribed']  = '已订阅';
+$labels['folder'] = '文件夹管理';
+$labels['folders'] = '文件夹管理';
+$labels['foldername'] = '邮件夹名称';
+$labels['subscribed'] = '已订阅';
 $labels['messagecount'] = '邮件数量';
-$labels['create']  = '建立';
-$labels['createfolder']  = '建立新邮件夹';
-$labels['managefolders']  = '管理邮件夹';
+$labels['create'] = '建立';
+$labels['createfolder'] = '建立新邮件夹';
+$labels['managefolders'] = '管理邮件夹';
 $labels['specialfolders'] = '自定义邮件夹';
 $labels['properties'] = '属性';
 $labels['folderproperties'] = '文件夹属性';
@@ -458,9 +486,9 @@
 $labels['getfoldersize'] = '获得文件夹容量';
 $labels['changesubscription'] = '更改订阅';
 $labels['foldertype'] = '文件夹类型';
-$labels['personalfolder']  = '私有文件夹';
-$labels['otherfolder']  = '他人文件夹';
-$labels['sharedfolder']  = '共享文件夹';
+$labels['personalfolder'] = '私有文件夹';
+$labels['otherfolder'] = '他人文件夹';
+$labels['sharedfolder'] = '共享文件夹';
 $labels['sortby'] = '排序';
 $labels['sortasc']  = '递增排序';
 $labels['sortdesc'] = '递减排序';
@@ -493,4 +521,43 @@
 $labels['japanese'] = '日文';
 $labels['korean'] = '韩语';
 $labels['chinese'] = '中文';
+$labels['arialabeltopnav'] = '窗口控制';
+$labels['arialabeltasknav'] = '应用事务';
+$labels['arialabeltoolbar'] = '应用工具栏';
+$labels['arialabelactivetask'] = '活动事务';
+$labels['arialabelmessagessearchfilter'] = '邮件列表过滤器';
+$labels['arialabelmailsearchform'] = '邮件信息查询表单';
+$labels['arialabelcontactsearchform'] = '联系人查询表单';
+$labels['arialabelmailquicksearchbox'] = '邮件查询条件';
+$labels['arialabelquicksearchbox'] = '查询条件';
+$labels['arialabelfolderlist'] = '邮件文件夹选择';
+$labels['arialabelmessagelist'] = '邮件信息列表';
+$labels['arialabelmailpreviewframe'] = '邮件预览';
+$labels['arialabelmailboxmenu'] = '文件夹操作菜单';
+$labels['arialabellistselectmenu'] = '列表选择菜单';
+$labels['arialabelthreadselectmenu'] = '线程列表菜单';
+$labels['arialabelmessagelistoptions'] = '邮件列表显示和排序选项';
+$labels['arialabelmailimportdialog'] = '邮件导入对话框';
+$labels['arialabelmessagenav'] = '邮件导航';
+$labels['arialabelmessagebody'] = '邮件正文';
+$labels['arialabelmessageactions'] = '邮件动作';
+$labels['arialabelcontactquicksearch'] = '联系人查询表单';
+$labels['arialabelcontactsearchbox'] = '联系人查询条件';
+$labels['arialabelmessageheaders'] = '邮件头';
+$labels['arialabelforwardingoptions'] = '转发选项';
+$labels['arialabelreplyalloptions'] = '回复全部选项';
+$labels['arialabelmoremessageactions'] = '更多邮件选项';
+$labels['arialabelmarkmessagesas'] = '标记选中邮件为...';
+$labels['arialabelcomposeoptions'] = '布局选项';
+$labels['arialabelresponsesmenu'] = '预设回复菜单';
+$labels['arialabelattachmentuploadform'] = '附件上传表单';
+$labels['arialabelattachmentpreview'] = '附件预览';
+$labels['ariasummarycomposecontacts'] = '选择联系人或组作为收件人';
+$labels['arialabelcontactexportoptions'] = '联系人导出选项';
+$labels['arialabelabookgroupoptions'] = '地址簿/组选项';
+$labels['arialabelpreferencesform'] = '偏好设置表单';
+$labels['arialabelidentityeditfrom'] = '标识编辑表单';
+$labels['arialabelresonseeditfrom'] = '回复编辑表单';
+$labels['helplistnavigation'] = '列表键盘导航';
+$labels['helplistkeyboardnavcontacts'] = "回车：打开选中的联系人";
 ?>

--
Gitblit v1.9.1