From 89acec13dce5ac6d8db3b08085c63454e45eb4c8 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Sat, 5 Jul 2014 15:04:29 -0400
Subject: [PATCH] latest translations from transifex

---
 public/language/zh_CN/topic.json | 20 ++++++++++----------
 public/language/zh_CN/user.json  |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json
index d67431ad90..d51e30f9a4 100644
--- a/public/language/zh_CN/topic.json
+++ b/public/language/zh_CN/topic.json
@@ -4,7 +4,7 @@
     "topic_id_placeholder": "输入主题 ID",
     "no_topics_found": "没有找到主题!",
     "no_posts_found": "没有找到帖子!",
-    "post_is_deleted": "帖子被删除!",
+    "post_is_deleted": "此帖已被删除!",
     "profile": "资料",
     "posted_by": "%1 发布",
     "posted_by_guest": "游客发布",
@@ -34,7 +34,7 @@
     "login_to_subscribe": "请注册或登录以订阅此主题。",
     "markAsUnreadForAll.success": "全部主题标为未读。",
     "watch": "监视",
-    "watch.title": "本主题有新回复时通知我",
+    "watch.title": "此主题有新回复时通知我",
     "share_this_post": "分享此帖",
     "thread_tools.title": "管理工具",
     "thread_tools.markAsUnreadForAll": "未读标记",
@@ -43,7 +43,7 @@
     "thread_tools.lock": "锁定主题",
     "thread_tools.unlock": "解锁主题",
     "thread_tools.move": "移动主题",
-    "thread_tools.move_all": "全部移动",
+    "thread_tools.move_all": "移动全部",
     "thread_tools.fork": "分割主题",
     "thread_tools.delete": "删除主题",
     "thread_tools.delete_confirm": "确定要删除这条线索?",
@@ -51,10 +51,10 @@
     "thread_tools.restore_confirm": "确定要恢复线索吗?",
     "thread_tools.purge": "清除主题",
     "thread_tools.purge_confirm": "确定要清除此主题吗?",
-    "topic_move_success": "主题被移到%1",
-    "post_delete_confirm": "确定要删除帖子?",
-    "post_restore_confirm": "确定要恢复帖子?",
-    "post_purge_confirm": "确认要清除此帖吗?",
+    "topic_move_success": "此主题已成功移到 %1",
+    "post_delete_confirm": "确定删除此帖吗?",
+    "post_restore_confirm": "确定恢复此帖吗?",
+    "post_purge_confirm": "确定清除此帖吗?",
     "load_categories": "版面载入中",
     "disabled_categories_note": "停用的版面为灰色",
     "confirm_move": "移动",
@@ -84,9 +84,9 @@
     "composer.thumb_file_label": "或上传文件",
     "composer.thumb_remove": "清除字段",
     "composer.drag_and_drop_images": "拖拽图片到这里",
-    "more_users_and_guests": "%1个用户和%2个游客",
-    "more_users": "%1个用户",
-    "more_guests": "%1个游客",
+    "more_users_and_guests": "多于 %1 名用户和 %2 名游客",
+    "more_users": "多于 %1 名用户",
+    "more_guests": "多于 %1 名游客",
     "sort_by": "排序",
     "oldest_to_newest": "从旧到新",
     "newest_to_oldest": "从新到旧",
diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json
index ff74ece9e3..a21b71f317 100644
--- a/public/language/zh_CN/user.json
+++ b/public/language/zh_CN/user.json
@@ -10,10 +10,10 @@
     "website": "网站",
     "location": "位置",
     "age": "年龄",
-    "joined": "加入时间",
-    "lastonline": "最后在线",
+    "joined": "注册时间",
+    "lastonline": "最后登录",
     "profile": "资料",
-    "profile_views": "资料被查看",
+    "profile_views": "资料浏览",
     "reputation": "声望",
     "favourites": "收藏的帖子",
     "followers": "粉丝",
@@ -45,7 +45,7 @@
     "image_spec": "您只能上传 PNG, JPG 或者 GIF 图片文件",
     "max": "最大.",
     "settings": "设置",
-    "show_email": "显示我的电子邮箱",
+    "show_email": "公开我的电子邮箱",
     "digest_label": "订阅摘要",
     "digest_description": "订阅此论坛的定期电子邮件更新 (新通知和主题)",
     "digest_off": "关闭",