From f7695a83ac990ae4c1eb621c7c448a72036b18aa Mon Sep 17 00:00:00 2001 From: Jonathan Date: Sat, 11 Jan 2014 09:27:54 +0800 Subject: [PATCH 1/3] Update Simp Chinese (zh_CN) translation #2. --- config/locales/client.zh_CN.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 13f8b14aa7e..61c92d6fec5 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -597,7 +597,7 @@ zh_CN: new: "你没有新主题可读。" read: "你尚未阅读任何主题。" posted: "你尚未在任何主题中发帖。" - latest: "伤心啊，没有主题。" + latest: "伤心啊，没有主题。 :(" hot: "没有热门主题。" category: "没有 {{category}} 分类的主题。" bottom: @@ -1497,7 +1497,7 @@ zh_CN: latest: '先按 g 再按 l 查看最新内容' new: '先按 g 再按 n 查看新主题' unread: '先按 g 再按 u 查看未阅主题' - favorited: '先按 g 再按 f 查看收藏主题' + starred: '先按 g 再按 f 查看收藏主题' categories: '先按 g 再按 c 查看分类列表' navigation: title: '导航' @@ -1513,7 +1513,7 @@ zh_CN: help: '? 打开快捷键列表' actions: title: '动作' - favorite: 'f 收藏主题' + star: 'f 收藏主题' share_topic: 's 分享主题' share_post: 'shift s 分享帖子' reply_topic: 'r 回复主题' @@ -1523,7 +1523,7 @@ zh_CN: bookmark: 'b 给帖子添加书签' edit: 'e 编辑帖子' delete: 'd 删除帖子' - mark_muted: '<先按 b>m 再按 m 把主题设为免打扰主题' + mark_muted: '先按 m 再按 m 把主题设为免打扰主题' mark_regular: '先按 m 再按 r 把主题设为常规主题' mark_tracking: '先按 m 再按 t 追踪主题' mark_watching: '先按 m 再按 w 关注主题' From b5b33c8027d779eec1fa171861cfdb1855bc3754 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Sat, 11 Jan 2014 09:33:36 +0800 Subject: [PATCH 2/3] Update Simp Chinese (zh_CN) translation #3. --- config/locales/client.zh_CN.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 61c92d6fec5..b83b7d093e6 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -1502,7 +1502,7 @@ zh_CN: navigation: title: '导航' back: 'u 返回' - up_down: 'k/j 上/下移动' + up_down: 'k 和 j 上/下移动' open: 'o 或者 Enter 打开选中的主题' next_prev: '`/~ 下一个/上一个选区' application: From f926eab05558de8100273e7d1bbfe1b01186a3d3 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Sat, 11 Jan 2014 12:13:09 +0800 Subject: [PATCH 3/3] Update Simp Chinese (zh_CN) translation #4. --- config/locales/server.zh_CN.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 6207ad69933..2de43c2cda6 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -873,7 +873,8 @@ zh_CN: why: "这里是自从我们在 %{last_seen_at} 最后一次见到你之后，在 %{site_link} 发生的事情的简单汇总。" subject_template: "[%{site_name}] %{date} 的论坛动态" new_activity: "在你的主题和帖子里的动态：" - new_topics: "新主题：" + top_topics: "我们喜欢的新主题：" + other_new_topics: "其它新主题:" unsubscribe: "这封来自 %{site_link} 的汇总邮件是当我们有一段时间没有见到你之后，作为一个礼貌的通知发送给你的。\n如果你希望关闭它或者修改你的邮件设置，请访问 %{unsubscribe_link}。" click_here: "点击此处" from: "%{site_name} 摘要"