Apply changes from trunk to 0.1-stable

1 files changed, 4 insertions, 4 deletions

diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index da1682ec8..6abadd8fc 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -30,8 +30,8 @@ $labels['addressbook'] = '通讯录';
 $labels['inbox'] = '收件箱';
 $labels['drafts'] = '草稿箱';
 $labels['sent'] = '已发送邮件';
-$labels['trash'] = '垃圾邮件';
-$labels['junk'] = '回收箱';
+$labels['trash'] = '回收站';
+$labels['junk'] = '垃圾邮件';
 $labels['subject'] = '主题';
 $labels['from'] = '发件人';
 $labels['to'] = '收件人';
@@ -99,8 +99,8 @@ $labels['unlimited'] = '无限制';
 $labels['quicksearch'] = '快速查找';
 $labels['resetsearch'] = '重新查找';
 $labels['compose'] = '写新邮件';
-$labels['sendmessage'] = '立即发送';
 $labels['savemessage'] = '暂存至草稿箱';
+$labels['sendmessage'] = '立即发送';
 $labels['addattachment'] = '添加附件';
 $labels['charset'] = '字符集';
 $labels['editortype'] = '编辑器类型';
@@ -154,7 +154,7 @@ $labels['edititem'] = '修改条目';
 $labels['setdefault'] = '默认值';
 $labels['language'] = '语言';
 $labels['timezone'] = '时区';
-$labels['pagesize'] = '第页邮件数量';
+$labels['pagesize'] = '每页邮件数量';
 $labels['signature'] = '签名';
 $labels['dstactive'] = '夏令时';
 $labels['htmleditor'] = '使用HTML编辑器';