codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-01 15:50:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'benojan-patch-4'

Browse source
This commit is contained in:
Nick Winter 2014-05-03 07:21:23 -07:00
commit 7535f5b49d
5 changed files with 6 additions and 6 deletions

4
app/locale/locale.coffee
View file

@ -19,8 +19,8 @@ module.exports =
zh: require './zh' # 中文, Chinese
'zh-HANS': require './zh-HANS' # 简体中文, Chinese (Simplified)
'zh-HANT': require './zh-HANT' # 繁体中文, Chinese (Traditional)
'zh-WUU-HANS': require './zh-WUU-HANS' # 巫师吴语, Wuu (Simplified)
'zh-WUU-HANT': require './zh-WUU-HANT' # 巫師吳語, Wuu (Traditional)
'zh-WUU-HANS': require './zh-WUU-HANS' # 吴语, Wuu (Simplified)
'zh-WUU-HANT': require './zh-WUU-HANT' # 吳語, Wuu (Traditional)
fr: require './fr' # français, French
ja: require './ja' # 日本語, Japanese
ar: require './ar' # العربية, Arabic

2
app/locale/zh-WUU-HANS.coffee
View file

@ -1,4 +1,4 @@
module.exports = nativeDescription: "巫师吴语", englishDescription: "Wuu (Simplified)", translation:
module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplified)", translation:
common:
loading: "徕搭读取……"
# saving: "Saving..."

2
app/locale/zh-WUU-HANT.coffee
View file

@ -1,4 +1,4 @@
module.exports = nativeDescription: "巫師吳語", englishDescription: "Wuu (Traditional)", translation:
module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditional)", translation:
common:
loading: "徠搭讀取……"
saving: "徠搭存檔……"

2
app/styles/editor/level/settings_tab.sass
View file

@ -2,4 +2,4 @@
color: black
.treema-value img
width: 100%
max-width: 100%

2
bower.json
View file

@ -28,7 +28,7 @@
"lodash": "~2.4.1",
"backbone": "1.1.0",
"jquery-mousewheel": "~3.1.9",
"i18next": "git@github.com:/nwinter/i18next.git",
"i18next": "git://github.com/nwinter/i18next.git",
"firepad": "~0.1.2",
"marked": "~0.3.0",
"moment": "~2.5.0",