Commit graph

578 commits

Author SHA1 Message Date
JasperDhaene
6a03ddad74 Update nl.coffee 2014-04-20 21:31:11 +02:00
Nick Winter
baca3876ca Merge pull request #869 from treby/improve_ja_resources
Updated  for Japanese(ja).
2014-04-20 11:20:46 -07:00
Nick Winter
f281aa8e2d Fixed quotes. 2014-04-19 17:43:01 -07:00
Nick Winter
b806436232 Merge branch 'patch-3' of git://github.com/julycoolwind/codecombat into julycoolwind-patch-3 2014-04-19 17:40:58 -07:00
林鑫
984f2c2cc4 Translate some items under common,account_settions,employers,play_level. 2014-04-19 23:22:03 +08:00
Alexei Nikitin
ac47a88c39 Update ru 2014-04-19 13:54:51 +04:00
treby
fb2bf865cd Added some translation for Japanese. 2014-04-19 16:42:34 +09:00
Nick Winter
7186b414cf Merge pull request #861 from onion7878/patch-1
Update zh-HANS.coffee
2014-04-18 17:49:55 -07:00
Nick Winter
848ebf2ffe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 09:53:34 -07:00
Nick Winter
844c1391ca Reworked top nav. Many improvements to job profile form. 2014-04-18 09:53:28 -07:00
Scott Erickson
07afba01df Merge branch 'master' into feature/jsondiffpatch
Conflicts:
	app/views/editor/level/thangs_tab_view.coffee
2014-04-17 13:25:42 -07:00
Scott Erickson
8859405e18 Reworked the nav bars in the level editor. 2014-04-17 11:02:00 -07:00
ONion
498bb21280 Update zh-HANS.coffee
more translation
2014-04-17 13:27:43 +08:00
ONion
8724e23f1b Update zh-HANS.coffee
add punctuation
2014-04-17 12:57:44 +08:00
ONion
cf9cd1a228 Update zh-HANS.coffee
Translate some
2014-04-17 12:55:58 +08:00
Nick Winter
f95d814e90 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-16 12:57:31 -07:00
Nick Winter
f6242bbbac Fixed case on de-CH.coffee. 2014-04-16 12:28:39 -07:00
Nick Winter
1a4274a6db Broken German up into multiple country-specific Germans. 2014-04-16 12:28:15 -07:00
Glen De Cauwsemaecker
0bf4c81c91 Merge branch 'enGB' of https://github.com/edtrist/codecombat 2014-04-16 20:11:03 +02:00
Nick Winter
cc9e200db8 Merge branch 'patch-2' of git://github.com/npani13/codecombat into npani13-patch-2 2014-04-16 11:01:28 -07:00
Nick Winter
d65699736f Fixed accidental hu.coffee truncation from #833. 2014-04-16 10:58:27 -07:00
Scott Erickson
731726dcd3 Merge branch 'master' into feature/jsondiffpatch 2014-04-16 10:42:43 -07:00
edtrist
0047835021 Added some specific en-GB spellings 2014-04-16 18:42:37 +01:00
Scott Erickson
c395a3414e Merge branch 'master' into feature/jsondiffpatch 2014-04-15 15:18:57 -07:00
Scott Erickson
58b1019934 Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor. 2014-04-15 15:09:36 -07:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Inez KEMENES
844643454d Update hu.coffee 2014-04-15 17:03:17 +02:00
Glen De Cauwsemaecker
1354bc3d59 Merge https://github.com/codecombat/codecombat 2014-04-15 02:05:38 +02:00
Glen De Cauwsemaecker
891cf74a8a Resolved merge conflicts of Jasper's translations 2014-04-15 02:04:52 +02:00
Nick Winter
e908ae2fb4 Fixed #772. 2014-04-14 14:49:38 -07:00
npani13
5d16f8e5ba Create de-ch.coffee
Speechdata for Swissgerman (CH)
2014-04-14 20:21:58 +02:00
Michael Schmatz
b40e4dca37 Simulation leaderboard aggregation framework and local fixes 2014-04-14 08:46:46 -07:00
Glen De Cauwsemaecker
df17021344 Merged conflicts and fixed line endings windows => unix 2014-04-14 10:12:23 +02:00
OlenaGapak
aea7b3ada0 Update uk.coffee
Ukrainian localization
2014-04-14 10:36:55 +03:00
Nick Winter
fbc8b6ac35 Propagated new i18n tags. 2014-04-13 19:04:43 -07:00
林鑫
2bf654c8fa Translate some items under 'common','versions' and 'editor'. 2014-04-14 08:57:04 +08:00
Nick Winter
af0b8aa5e2 A few fixes and cleanup for #831. 2014-04-13 15:28:16 -07:00
Inez KEMENES
094704f0c5 Update hu.coffee 2014-04-13 17:29:29 +02:00
Glen De Cauwsemaecker
0ce04b147d Merge pull request #824 from julycoolwind/patch-1
Update zh-HANS.coffee
2014-04-13 13:49:55 +02:00
Jasper D'haene
9f1ef2bb8d updated Dutch locale + README 2014-04-13 12:05:45 +02:00
Alexei Nikitin
9879cffdbc Update RU.coffee 2014-04-13 01:06:42 +04:00
Scott Erickson
6eab5003f8 Merge branch 'feature/jsondiffpatch' 2014-04-12 08:52:35 -07:00
Scott Erickson
10b1660419 Fixed the level editor so you can save again. 2014-04-12 08:48:49 -07:00
julycoolwind
9078061af2 Update zh-HANS.coffee
Translate items under editor.
2014-04-12 17:56:56 +08:00
Scott Erickson
35fe47bbac Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
Scott Erickson
53579b2632 Merge branch 'master' into feature/jsondiffpatch
Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
2014-04-11 22:52:05 -07:00
Nick Winter
bbf26ecc9c Fixed lcoale line endings again. 2014-04-11 15:02:01 -07:00
Glen De Cauwsemaecker
e9715f078f Fixed merge conflicts for Jasper's commits. 2014-04-12 01:28:25 +02:00
Nick Winter
82b47f6c0f Added i18n for #809. 2014-04-11 13:37:39 -07:00
Nick Winter
5ccdf680db Updated all i18n tags. 2014-04-11 13:19:38 -07:00