Merge branch 'RoyXue-master'

This commit is contained in:
Nick Winter 2014-05-06 06:56:17 -07:00
commit 73f38f84ac

View file

@ -17,7 +17,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
retry: "重试" retry: "重试"
# watch: "Watch" # watch: "Watch"
# unwatch: "Unwatch" # unwatch: "Unwatch"
# submit_patch: "Submit Patch" submit_patch: "提交补丁"
units: units:
second: "" second: ""
@ -36,7 +36,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
nav: nav:
play: "" play: ""
# community: "Community" community: "社区"
editor: "编辑" editor: "编辑"
blog: "博客" blog: "博客"
forum: "论坛" forum: "论坛"
@ -53,7 +53,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
versions: versions:
save_version_title: "保存新版本" save_version_title: "保存新版本"
new_major_version: "最新主要版本" new_major_version: "最新主要版本"
# cla_prefix: "To save changes, first you must agree to our" cla_prefix: "要保存更改, 首先你必须要统一我们的"
# cla_url: "CLA" # cla_url: "CLA"
# cla_suffix: "." # cla_suffix: "."
cla_agree: "我同意" cla_agree: "我同意"
@ -61,7 +61,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
login: login:
sign_up: "注册" sign_up: "注册"
log_in: "登录" log_in: "登录"
# logging_in: "Logging In" logging_in: "登录中..."
log_out: "登出" log_out: "登出"
recover: "找回账户" recover: "找回账户"
@ -78,7 +78,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
creating: "账户在创新中" creating: "账户在创新中"
sign_up: "注册" sign_up: "注册"
log_in: "以密码登录" log_in: "以密码登录"
# social_signup: "Or, you can sign up through Facebook or G+:" social_signup: "或者, 你可以通过Facebook 或者 G+ 注册:"
home: home:
slogan: "通过游戏学习Javascript脚本语言" slogan: "通过游戏学习Javascript脚本语言"
@ -130,21 +130,21 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
# learn_more: "Learn more about being a Diplomat" # learn_more: "Learn more about being a Diplomat"
# subscribe_as_diplomat: "Subscribe as a Diplomat" # subscribe_as_diplomat: "Subscribe as a Diplomat"
# wizard_settings: wizard_settings:
# title: "Wizard Settings" title: "巫师设定"
# customize_avatar: "Customize Your Avatar" customize_avatar: "设置你的头像"
# active: "Active" active: "启用"
# color: "Color" color: "颜色"
# group: "Group" group: "类别"
# clothes: "Clothes" clothes: "衣服"
# trim: "Trim" trim: "条纹"
# cloud: "Cloud" cloud: ""
# team: "Team" team: "队伍"
# spell: "Spell" spell: "魔法球"
# boots: "Boots" boots: "鞋子"
# hue: "Hue" hue: "色彩"
# saturation: "Saturation" saturation: "饱和度"
# lightness: "Lightness" lightness: "亮度"
# account_settings: # account_settings:
# title: "Account Settings" # title: "Account Settings"