Imperadeiro98
b3d432d3ae
Some fixes to last commit
2015-02-06 15:19:05 +00:00
newmilktea
5e0c266094
Update zh-HANT.coffee
2015-02-06 22:14:15 +08:00
newmilktea
5e4a1ba4c8
Update zh-HANT.coffee
2015-02-06 22:08:26 +08:00
newmilktea
cf5b14e2c5
Update zh-HANT.coffee
2015-02-06 21:13:06 +08:00
newmilktea
6f4897da4d
Update zh-HANT.coffee
2015-02-06 21:08:39 +08:00
newmilktea
1752f12b32
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/locale/zh-HANT.coffee
2015-02-06 20:52:02 +08:00
newmilktea
cee95397fa
Update zh-HANT.coffee
2015-02-06 20:49:09 +08:00
Nick Winter
1d8f91c42f
Added campaign world selector portal screen for half of players.
2015-02-05 15:05:33 -08:00
Imperadeiro98
b92a029a04
Removed unused strings
2015-02-05 18:48:22 +00:00
JulR43
1ca3a8d7e1
Update de-DE.coffee
...
A few translations
2015-02-05 16:16:55 +00:00
Imperadeiro98
7433e7a5ca
Update pt-PT.coffee
2015-02-05 14:57:21 +00:00
Imperadeiro98
230d2ce727
Merge pull request #2243 from JulR43/patch-1
...
Update fr.coffee
2015-02-05 14:44:49 +00:00
Imperadeiro98
f9e730ac30
Some fixes to last merge
2015-02-05 14:44:09 +00:00
Imperadeiro98
3ae135ac70
Merge pull request #2242 from Pammer/patch-2
...
Update ru.coffee
2015-02-05 14:42:50 +00:00
Imperadeiro98
c92caf8fc9
Small fix for last merge
2015-02-05 14:38:55 +00:00
Imperadeiro98
8c849aad18
Merge pull request #2241 from emmanuel-z/patch-2
...
Update es-419.coffee
2015-02-05 14:37:46 +00:00
Imperadeiro98
461ffecd4f
Merge pull request #2240 from emmanuel-z/patch-1
...
Update es-419.coffee
2015-02-05 14:36:21 +00:00
JulR43
e4553ac5a3
Update fr.coffee
...
Correction
2015-02-05 08:33:26 +00:00
JulR43
5e1d8f9623
Update fr.coffee
...
Some translations
2015-02-05 08:31:49 +00:00
Pammer
dc4f1c0142
Update ru.coffee
...
"scores" + new part of "subcribe" + "parent_email"
2015-02-05 12:43:05 +09:00
Nick Winter
df68c3c108
Propagated i18n.
2015-02-04 16:19:13 -08:00
Emmanuel Zarzosa
fed29c6890
Update es-419.coffee
2015-02-04 21:18:13 -03:00
Imperadeiro98
3bfc7e1a9c
Small fix
2015-02-04 23:09:23 +00:00
Emmanuel Zarzosa
51c4ba5d0f
Update es-419.coffee
2015-02-04 20:04:38 -03:00
Matt Lott
c842f45786
Update subscribe modal with parent help button
2015-02-04 13:54:38 -08:00
Imperadeiro98
77778c7829
Merge pull request #2231 from Pammer/patch-1
...
Update ru.coffee
2015-02-04 18:00:18 +00:00
Imperadeiro98
df1018ab53
Uncommented header
2015-02-04 17:58:59 +00:00
newmilktea
94499f670c
Update zh-HANT.coffee
2015-02-04 22:53:33 +08:00
newmilktea
fd56a0c218
Update zh-HANT.coffee
2015-02-04 22:34:05 +08:00
Nick Winter
5542bd8a89
Upgraded level info popover; made it a click instead of a hover; added view scores button to it when level has been completed.
2015-02-03 18:25:38 -08:00
Nick Winter
d341e59b54
Merge branch 'master' of git://github.com/ArthurLu/codecombat into ArthurLu-master
2015-02-03 12:29:16 -08:00
Bård Eik-Hvidsten
5159ff56f7
Update nb.coffee
2015-02-03 20:25:05 +01:00
Imperadeiro98
2448be11b3
Small fix
2015-02-03 18:25:13 +00:00
Imperadeiro98
036ae7d7f7
Revert "Update zh-HANT.coffee"
2015-02-03 18:16:32 +00:00
Imperadeiro98
51f55bb376
Merge pull request #2230 from Coderaulic/patch-1
...
Update ja.coffee
2015-02-03 18:03:47 +00:00
Pammer
bd5ddab9e9
Update ru.coffee
2015-02-04 01:18:49 +09:00
newmilktea
275fb219a3
Update zh-HANT.coffee
2015-02-03 23:54:13 +08:00
newmilktea
89d4ca6039
Update zh-HANT.coffee
2015-02-03 23:26:17 +08:00
Pammer
641e8d7abf
Update ru.coffee
2015-02-03 14:37:58 +09:00
Coderaulic
d8cdb6960c
Update ja.coffee
...
Updated misc translations.
2015-02-02 20:13:58 -08:00
Arthur
d47a04208a
Update zh-HANT.coffee
...
Finish the rest of general
2015-02-03 11:50:55 +08:00
Arthur
752e71f74c
Update zh-HANT.coffee
...
update the part of general
2015-02-03 11:36:21 +08:00
Imperadeiro98
837ad8b5a4
Update pt-PT.coffee
2015-02-02 20:20:41 +00:00
Nick Winter
b3db9962bd
Propagated i18n.
2015-02-02 11:51:15 -08:00
Imperadeiro98
cd61969475
Small fixes for last PR
2015-02-02 19:48:42 +00:00
Imperadeiro98
3d5ae45565
Merge pull request #2201 from Coderaulic/patch-1
...
Update ja.coffee
2015-02-02 19:44:55 +00:00
Nick Winter
c8a5712d43
Merge pull request #2197 from purenickery/patch-3
...
Update en.coffee
2015-02-02 09:24:32 -08:00
Coderaulic
92e779259a
Update ja.coffee
...
Fixed miscellaneous translations from previous.
Updated all of -
game_menu:
inventory:
buy_gems:
choose_hero:
general:
I left in the original English as comments for long translations should there be a need to revisit, unless single words.
Lines 179, 186, 155, 396 all seem to cause 'compiler error'. They begin with key words so not sure how to fix those...maybe senior coder can take a look and fix?
2015-02-01 21:38:38 -08:00
Imperadeiro98
6551395278
A little fix
2015-02-01 19:19:22 +00:00
Imperadeiro98
734a401974
Merge pull request #2199 from nixel2007/master
...
Update ru.coffee
2015-02-01 19:18:20 +00:00