codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 18:15:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6934 commits 27 branches 0 tags 134 MiB
Commit graph

1591 commits

Author SHA1 Message Date
Nick Winter
c420119212 Merge pull request #1593 from enricpc/patch-1 
Update ca.coffee
 2014-09-24 11:29:37 -07:00
Imperadeiro98
aa6db88718 Update pt-PT.coffee 2014-09-24 19:15:52 +01:00
Imperadeiro98
ed30b7b569 Update pt-PT.coffee 2014-09-24 19:14:09 +01:00
james616616
85ad253b80 Update zh-HANT.coffee 2014-09-25 01:35:17 +08:00
enricpc
3d07dfb14c Update ca.coffee 2014-09-24 17:39:38 +02:00
Nick Winter
af6e770c30 Changed name of Stop button to Skip in real-time playback. 2014-09-23 18:23:28 -07:00
Nick Winter
a6473c2cf3 Merge pull request #1588 from ThatOtherPerson/add-quotes 
Add some more quotes for #710
 2014-09-23 17:54:56 -07:00
David Beckley
f27c13e6eb Propagate i18n 2014-09-23 17:48:02 -07:00
David Beckley
8d7ed040af Add more quotes for #710 2014-09-23 17:46:02 -07:00
Nick Winter
a57cc0126e A few more tweaks for #1584. Hero victory now always goes to world map. 2014-09-23 17:13:41 -07:00
Imperadeiro98
ba4d53e92b Update pt-PT.coffee 2014-09-23 21:37:08 +01:00
Nick Winter
6a8d3082f3 Propagated i18n. Added a fallback for cast button for now until the new run button can be translated. 2014-09-23 08:08:29 -07:00
Daniel James Smith
2bdcdbe2a8 Updated German translations 2014-09-23 15:37:39 +02:00
Nick Winter
de85d8c170 Split cast button into Run and Submit. Slighted adjusted victory modal for new hero levels. Real-time playbck is now required to beat hero levels. Worked around an error in the delta expansion. 2014-09-22 14:05:13 -07:00
Nick Winter
42b52f5593 No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization. 2014-09-21 22:10:52 -07:00
Nick Winter
0d495ba36e Press Start to begin playing levels. Fixed #1574. 2014-09-21 14:35:59 -07:00
David Beckley
bee779c3c8 Propagate locale 2014-09-20 16:17:36 -07:00
Nick Winter
ae7a2dfe6a Testing out the new comment preservation in locale files. 2014-09-20 09:17:10 -07:00
Imperadeiro98
7a4b1c01ed Update pt-PT.coffee 2014-09-20 08:53:18 +01:00
Nick Winter
0a5e1a4b03 Propagated i18n. 2014-09-19 22:17:06 -07:00
Nick Winter
e3b75a69ea Working on PlayLevelModal and ChooseHeroView. 2014-09-19 22:16:05 -07:00
George Litos
43d027df45 Update el.coffee 
typographic and grammatical errors fix
 2014-09-19 23:37:16 +03:00
Nick Winter
95e37fa3b2 Starting new front view (at /front for now) and play view (at /play-hero for now). 2014-09-17 18:56:08 -07:00
TitoGa
aeea0a54af Update es-419.coffee 
Happy to help. The only liberty that i took was to change the provided example name on 266 from Nick Winters to Max Powers, as a reference to The Simpsons, episode S10E13. (=^B)
 2014-09-16 16:27:44 -03:00
Nick Winter
ee3e1fa58c Merge pull request #1561 from Titounkle/patch-5 
Update es-ES.coffee
 2014-09-15 12:40:55 -07:00
Titounkle
c6384eaf10 Update es-ES.coffee 
Ive got a few questions on the word Thang, and employer... I dont know quite well how to translate them to fix good...
Hope we finish it soon :)
 2014-09-15 21:32:26 +02:00
Imperadeiro98
562a033f46 Update pt-PT.coffee 2014-09-15 20:13:42 +01:00
Nick Winter
87cde17650 Propagated i18n. 2014-09-15 10:24:13 -07:00
Nick Winter
1f8f5ce8f3 Merge pull request #1554 from djsmith85/i18n 
Added i18n-tags in admin.jade and community.jade and updated the locale ...
 2014-09-15 10:22:29 -07:00
Daniel James Smith
a0fb51ae94 Updated the German translations 2014-09-15 18:57:09 +02:00
Daniel James Smith
3dd888469e Added i18n-tags in admin.jade and community.jade and updated the locale files (en, de-DE and de-AT) accordingly 2014-09-15 18:36:45 +02:00
Nick Winter
1d75a9ead3 Uncommented some pt-BR section headers. 2014-09-14 17:13:03 -07:00
Nick Winter
612eccd209 Merge pull request #1551 from gutierri/master 
Translation and corrections to existing translations
 2014-09-14 17:12:01 -07:00
AmyLaPazza
b9be6215ea Added translations 
Translated Lines 193,196 and 267.
 2014-09-14 19:09:22 +02:00
Gutierri Barboza
b00b48450d translation section account 2014-09-14 00:48:36 -03:00
Gutierri Barboza
4d7c0f24eb standard translation for the same word 2014-09-14 00:44:48 -03:00
Gutierri Barboza
127fce2100 translation pt-BR section user 2014-09-14 00:42:18 -03:00
Gutierri Barboza
f4d1ed8a60 partial translation archievements 2014-09-13 23:08:43 -03:00
Gutierri Barboza
e012ea5bbc wrong word 2014-09-13 22:55:50 -03:00
Gutierri Barboza
1e1f384cd3 translate pt-BR 2014-09-13 22:53:25 -03:00
Nick Winter
7a76e9ac77 Fixed a couple formatting issues in es-ES. 2014-09-12 10:22:32 -07:00
Titounkle
9d731ae80e Update es-ES.coffee 2014-09-12 19:06:49 +02:00
Gutierri Barboza
7ac09d09f3 translation pt-BR 2014-09-12 13:31:50 -03:00
Nick Winter
8c37fabe79 Merge pull request #1537 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-09-11 08:45:36 -07:00
Nick Winter
35e1931fc3 Merge pull request #1534 from Titounkle/patch-3 
Update es-ES.coffee
 2014-09-11 08:43:59 -07:00
Nick Winter
ba554f3ff0 Fixed some indentation from #1532. 2014-09-11 08:43:36 -07:00
Nick Winter
0990a45802 Merge pull request #1532 from lukigno95/patch-1 
Update it.coffee
 2014-09-11 08:41:19 -07:00
Imperadeiro98
74afea5efa Update pt-PT.coffee 2014-09-11 14:38:11 +01:00
Imperadeiro98
10132c6fd1 Update pt-PT.coffee 2014-09-10 11:02:01 +01:00
Nick Winter
0b1f4ebada Fixed two extra spaces in DE localizations. 2014-09-09 18:58:04 -07:00
djsmith85
19d3a6cc9f Updated German translations (de-DE & de-AT) 
Updated German translations (de-DE & de-AT) and added myself to the
diplomat contributors list
 2014-09-10 02:57:47 +02:00
Titounkle
d9ee5c248d Update es-ES.coffee 
Number 219 im not quite sure...I'll think about it.
 2014-09-09 18:43:28 +02:00
lukigno95
fa7f827fcb Update it.coffee 2014-09-09 01:10:24 +02:00
Nick Winter
1bd1ca0ced Fixed #1530. Propagated i18n. Starting to add some more events for the iOS app. 2014-09-07 20:54:25 -07:00
Nick Winter
40c37a8be1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-07 20:48:36 -07:00
Nick Winter
6ac8dc1d2d Merge pull request #1531 from gutierri/master 
more translations of phrases
 2014-09-07 20:47:57 -07:00
Nick Winter
4908cb4d0a Merge pull request #1529 from MajkPascal/patch-2 
Polish translation
 2014-09-07 20:47:38 -07:00
Nick Winter
25334d59a0 Merge pull request #1527 from Titounkle/patch-2 
Update es-ES.coffee
 2014-09-07 20:46:51 -07:00
Nick Winter
68812eef0a Fixed a couple types in new ar.coffee. 2014-09-07 20:41:47 -07:00
Gutierri Barboza
9f6870130f more translations of phrases 2014-09-07 23:18:35 -03:00
MajkPascal
f20b963a2b Polish translation 2014-09-07 21:31:46 +02:00
Titounkle
ff3b718bf2 Update es-ES.coffee 2014-09-07 19:59:58 +02:00
CodeIter
35382ff57c update ar 
another trans.
 2014-09-07 13:20:15 +01:00
CodeIter
fb7509612f ترجمة- translate 
it 's too hard to complete it now.
however  google translate is very useful (most translation from google are good but it always need a human verification.that 's because it 's hard to complete it)
 2014-09-07 11:54:53 +01:00
Nick Winter
19720c38be Propagated i18. 2014-09-06 19:57:03 -07:00
Nick Winter
75538a158e Merge pull request #1523 from Imperadeiro98/patch-3 
Level editor fixes
 2014-09-06 19:56:22 -07:00
Nick Winter
18114af2a3 Merge pull request #1521 from Imperadeiro98/patch-2 
Update pt-PT.coffee
 2014-09-06 19:56:01 -07:00
Imperadeiro98
253b0dc35c Update en.coffee 
Added "Documentation"
 2014-09-06 17:31:24 +01:00
Imperadeiro98
8ada8c3a88 Update pt-PT.coffee 2014-09-06 10:41:01 +01:00
Titounkle
0246bc8070 Update es-ES.coffee 
He hecho algunos cambios, pero no se muy bien como trabajais esto ya que es la primera vez que me involucro en github, basta con quitar el # de delante de las cosas que vayamos traduciendo o hay que marcarlas de alguna otra manera??

Un saludo
 2014-09-05 22:51:39 +02:00
kotvaska
0383b2ce2b Update ru.coffee 2014-09-05 12:49:23 -07:00
Nick Winter
ddddc44651 Fixed en-GB.coffee. 2014-09-05 12:49:23 -07:00
Nick Winter
ca8df87f8a Propagated i18n. 2014-09-05 09:13:09 -07:00
Nick Winter
88144024c4 Updated about page i18n. 2014-09-05 09:12:05 -07:00
Nick Winter
14b50f8b57 Merge pull request #1517 from Imperadeiro98/patch-1 
Updated i18n
 2014-09-05 09:02:52 -07:00
Nick Winter
5b3dc75d86 Merge pull request #1515 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-09-05 08:50:05 -07:00
Imperadeiro98
2c2811fc25 Update en.coffee 
Removed redundant code and updated some i18n
 2014-09-05 09:24:08 +01:00
George Saines
0beb34e3db redoing the about page 2014-09-04 16:59:46 -07:00
Imperadeiro98
aeafc6b648 Update pt-PT.coffee 2014-09-04 21:26:38 +01:00
Scott Erickson
621c684c74 Tweaked the randomize buttons and modal (also changing it to "generate terrain" and refactoring related files accordingly). 2014-09-02 17:53:39 -07:00
Nick Winter
2c22fdf84e Merge pull request #1498 from 99133799/patch-1 
Update ro.coffee
 2014-09-01 22:21:11 -07:00
Nick Winter
7af2690c47 Propagated i18h. 2014-09-01 22:20:48 -07:00
Imperadeiro98
a28269c531 Update en.coffee 
I don't know if is necessary to change something in codecombat / app / templates / play.jade
 2014-09-01 23:10:14 +01:00
MajkPascal
dc81e0d84b Update pl.coffee 2014-08-31 22:31:28 +02:00
Nick Winter
5f132e55ba Fixed #1414. Also started lazily loading certain level editor tabs. 2014-08-30 23:04:45 -07:00
Nick Winter
77e7efebeb Fixed #1385: no more redundant fallback localization files. 2014-08-30 19:30:33 -07:00
Nick Winter
1b0346a1b7 Propagated volume label i18n. 2014-08-30 08:24:14 -07:00
Nick Winter
da9bda3e8a Merge pull request #1501 from Imperadeiro98/patch-2 
Update pt-PT.coffee
 2014-08-30 08:16:52 -07:00
Nick Winter
384d702c4b Merge pull request #1500 from Imperadeiro98/patch-1 
Fixed errors
 2014-08-30 08:15:41 -07:00
Imperadeiro98
1f86430076 Update pt-PT.coffee 2014-08-30 14:04:31 +01:00
Imperadeiro98
93b1f782aa Added "Volume" and fixed error 2014-08-30 13:48:36 +01:00
Tore Haugland
635f0224e4 Updated locale\no with a more common norwegian than a direct translation from English to make it easier to read for all ages 2014-08-30 11:06:10 +02:00
Tore Haugland
41e9778b3c Updated locale\no with correct letter case on several translations 2014-08-30 10:54:30 +02:00
99133799
ece96bce2a Update ro.coffee 2014-08-30 10:31:24 +03:00
Imperadeiro98
92055aaa21 Update pt-PT.coffee 2014-08-28 18:20:52 +01:00
Nick Winter
a39097b366 Fixed #1494. 2014-08-28 09:29:38 -07:00
Nick Winter
28431703f5 Fixed #953. 2014-08-27 22:23:24 -07:00
Nick Winter
92b29915e2 Finished fixing #841. 2014-08-27 17:26:56 -07:00
Rikard Gehlin
7aa1a4112a Update sv.coffee 2014-08-28 00:08:43 +02:00
djsmith85
8b80ac5c44 Added a few German translations 
Added translations to de.coffee and synced them with de-DE.coffee and
de-AT.coffee.
 2014-08-27 11:28:23 +01:00
Nick Winter
871cd4b3c9 Fixed #784. 2014-08-26 17:34:00 -07:00
Nick Winter
35b107cf58 Refactored grid. Fixed #158. 2014-08-26 13:56:57 -07:00
Imperadeiro98
5dde2572ff Update pt-PT.coffee 2014-08-26 19:15:50 +01:00
Nick Winter
397fc02d6c Realized we still needed nav.editor. Propagated i18n. 2014-08-26 08:20:31 -07:00
Nick Winter
51bc98665a Removed more old editor root page bits. Like #1486 but keeping the editor titles. 2014-08-26 08:16:29 -07:00
Imperadeiro98
203dc19ee2 Update pt-PT.coffee 2014-08-26 10:31:25 +01:00
Imperadeiro98
732a9b3762 Update pt-PT.coffee 2014-08-26 10:24:14 +01:00
Nick Winter
e666ee1dac Added stop playback button and real-time countdown screen. 2014-08-25 22:05:30 -07:00
Nick Winter
e278f3ecb4 Merge branch 'stream' 2014-08-25 09:11:57 -07:00
Nick Winter
ac3f1647e4 Merge pull request #1480 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-08-25 08:29:50 -07:00
Nick Winter
718d586f07 A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in. 2014-08-24 21:39:34 -07:00
Nick Winter
f8ddc17a9f Merge pull request #1482 from ZephyrSails/master 
Update zh-HANS.coffee
 2014-08-24 20:51:28 -07:00
Imperadeiro98
4da9b470ab Update pt-PT.coffee 2014-08-24 09:03:25 +01:00
Nick Winter
92b70ae833 Propagated i18n. Fixed #1478. 2014-08-23 08:45:14 -07:00
Nick Winter
4e87dc5e46 Uncommented es units header. 2014-08-23 08:32:22 -07:00
Nick Winter
c1aa147f41 Merge branch 'patch-1' of git://github.com/mugenryuk/codecombat into mugenryuk-patch-1 2014-08-23 08:31:55 -07:00
Nick Winter
d70f86b166 Merged conflicting ru translations. 2014-08-23 08:31:17 -07:00
Nick Winter
9b86ccd6d1 Merge pull request #1461 from bonkboykz/patch-1 
Update ru.coffee
 2014-08-23 08:27:55 -07:00
Xiu Zhiping
3178abab05 Han(s) translation 2014-08-22 00:19:06 +08:00
Nick Winter
7b3fe0a3fb Merge pull request #1470 from ZephyrSails/patch-1 
zephyer's change
 2014-08-21 08:37:46 -07:00
Imperadeiro98
c0a5e1d646 Update pt-PT.coffee 2014-08-21 09:46:40 +01:00
Xiu Zhiping
71058474b3 zephyer's change 
does this part of work changed to HANs & HANt?
 2014-08-21 10:56:38 +08:00
mugenryuk
c362024536 Update es.coffee 2014-08-20 16:13:40 -05:00
Nick Winter
28fb435bfe Merge pull request #1454 from logicomPL/patch-1 
Update pl.coffee
 2014-08-20 14:12:49 -07:00
mugenryuk
ae859ebb19 Update es.coffee 2014-08-20 15:08:48 -05:00
Fedorsturov
45629ad7cb Update ru.coffee 2014-08-20 22:14:20 +04:00
Imperadeiro98
0d4fb9a777 Update pt-PT.coffee 2014-08-20 12:06:54 +01:00
Imperadeiro98
bd84434088 Fixed typo 2014-08-20 11:49:53 +01:00
bonkboykz
528ca31102 Update ru.coffee 2014-08-20 15:42:26 +06:00
Nick Winter
2c6fc67db2 Some simulation and ladder fixes. Preparing Criss-Cross tournament. 2014-08-18 21:49:58 -07:00
Szymon Gabrek
664853f5e9 Update pl.coffee 2014-08-18 19:47:00 +02:00
Imperadeiro98
89e8d523c5 Update pt-PT.coffee 2014-08-16 09:35:34 +01:00
Imperadeiro98
2cbbb1c0dc Update pt-PT.coffee 2014-08-15 11:32:30 +01:00
Nick Winter
18b0208aac Updated i18n. 2014-08-14 10:57:57 -07:00
Scott Erickson
c31a509472 Working on the inventory view. Added a way to get the current equipment config from the inventory view. 2014-08-14 10:44:04 -07:00
Imperadeiro98
553b124de8 Update uk.coffee 2014-08-14 09:05:56 +01:00
Imperadeiro98
8e4f9189a0 Update locale.coffee 2014-08-14 09:05:47 +01:00
Nick Winter
0084b64d67 Made some updates to the community page. 2014-08-13 20:45:33 -07:00
Scott Erickson
e3088ad813 Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements 2014-08-13 10:49:10 -07:00
Ruben Vereecken
3fd396974d Merge branch 'master' into achievements 
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
 2014-08-13 10:43:42 +02:00
Imperadeiro98
eccf148793 Big update to pt-PT.coffee 2014-08-12 22:11:14 +01:00
Imperadeiro98
2ec8a69de0 Update locale.coffee 
Updated pt-PT description and added Catalan.
 2014-08-12 22:09:46 +01:00
Ruben Vereecken
8ae116200f Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
Imperadeiro98
612056eaf6 Started Contribute 
I started translating Contribute and I will uncomment when it is translated integrally.
 2014-08-12 14:05:39 +01:00
Ruben Vereecken
d6f5b7512d i18n for all new pages 2014-08-12 14:05:01 +02:00
Imperadeiro98
8a3d9d6af2 Update pt-PT.coffee 
In line 451, does it refer to "Game" or "Games".
 2014-08-12 12:40:41 +01:00
Imperadeiro98
ab3b6f29f3 Update pt-PT.coffee 2014-08-12 09:49:23 +01:00
Imperadeiro98
73e18a66e7 Update pt-PT.coffee 2014-08-12 09:45:54 +01:00
Imperadeiro98
bd0f75a414 Update pt-PT.coffee 2014-08-11 20:35:41 +01:00
Imperadeiro98
6c2a0ef77c Update pt-PT.coffee 2014-08-11 20:04:23 +01:00
Imperadeiro98
18380f4dd5 Update pt-PT.coffee 
In line 432, is the string right?
 2014-08-11 20:03:29 +01:00
Imperadeiro98
010afc7e95 Update pt-PT.coffee 2014-08-11 19:29:54 +01:00
Nick Winter
45c762fddc Moved multiplayer from modal into Game Menu. Deleted MultiplayerLaunchModal. Updated some i18n. 2014-08-10 17:26:30 -07:00
Nick Winter
fb95f48f73 Implemented GameMenu OptionsView. 2014-08-10 16:27:33 -07:00
Nick Winter
4dcc5bd8ee Adding some options to the game menu options tab. 2014-08-10 15:56:45 -07:00
Nick Winter
6b2c079ff5 More work on game menu skeleton. 2014-08-08 15:57:20 -07:00
Nick Winter
da74a5ae77 Merge pull request #1410 from kisik21/patch-1 
Update ru.coffee
 2014-08-08 15:05:38 -07:00
kisik21
dfd5fad258 Update ru.coffee 
Oh nooooo...
 2014-08-09 01:34:41 +04:00
kisik21
450831548e Update ru.coffee 
Slag, why I am so stupid? I am making more and more commits, to fix MY errors, when I can do not make them...
 2014-08-09 01:28:06 +04:00
kisik21
8bfb8a5049 Update ru.coffee 
Fixed some errors in formatting, seems like I broke that...
 2014-08-09 01:13:28 +04:00
kisik21
e882abcb79 Update ru.coffee 
Кое что подправил, по совету Alexei Nikitin (Прошу прощения, если неправильно написал ник)
Fixed some strings with Alexei Nikitin (Sorry if I wrote your nickname incorrectly)
 2014-08-09 00:54:03 +04:00
Nick Winter
dc59aff9d0 Starting skeleton for GameMenuModal and its subviews. 2014-08-08 11:36:41 -07:00
kisik21
46c6051102 Update ru.coffee 2014-08-06 02:42:30 +04:00
Nick Winter
8a86e86012 Merge pull request #1390 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-08-04 12:45:13 -07:00
Imperadeiro98
0663dbc414 Update pt-PT.coffee 2014-08-01 10:39:30 +01:00
Imperadeiro98
4b932593be Update pt-PT.coffee 2014-07-31 18:39:13 +01:00
Imperadeiro98
96fb84362a Update pt-PT.coffee 2014-07-31 18:21:23 +01:00
Imperadeiro98
c7212226ae Update pt-PT.coffee 2014-07-31 18:01:09 +01:00
Imperadeiro98
68e3110e74 Update pt-PT.coffee 2014-07-31 17:38:14 +01:00
Michael Schmatz
0b9df5150d Merge pull request #1393 from Melondonut/patch-3 
Korean translation - patch3
 2014-07-31 08:10:22 -07:00
Imperadeiro98
3d71d155b6 Update pt-PT.coffee 2014-07-31 10:50:01 +01:00
Imperadeiro98
1f8ce2eaf2 Update pt-PT.coffee 2014-07-30 20:47:03 +01:00
Melondonut
9b830fff26 Update ko.coffee 2014-07-28 18:58:48 +09:00
Melondonut
9d93d871e1 Update ko.coffee 2014-07-28 13:35:05 +09:00
Melondonut
5307515553 Update ko.coffee 2014-07-28 13:07:18 +09:00
Melondonut
53dd446db1 Update ko.coffee 2014-07-28 12:44:20 +09:00
Imperadeiro98
3ffeda8bbc Update pt-PT.coffee 2014-07-27 19:31:56 +01:00
Imperadeiro98
19f257f1d0 Update pt-PT.coffee 2014-07-24 22:43:39 +01:00
Melondonut
26ab77b1ae Update ko.coffee 2014-07-24 15:43:23 +09:00
Melondonut
f082aa6e9b Update ko.coffee 2014-07-24 15:30:54 +09:00
Michael Schmatz
be28f3e6a0 Uncommented some commented translated lines 2014-07-23 15:23:53 -07:00
Melondonut
cb3f547b9e Update ko.coffee 2014-07-23 14:32:11 +09:00
Melondonut
dbb3d92b81 Update ko.coffee 2014-07-23 13:56:18 +09:00
greyhusky
a313c3ab27 More translations 
Translated the "about" page and parts of "legal" page as well as some other stuff
 2014-07-22 15:01:47 +02:00
Melondonut
8476aa33f9 Update ko.coffee 2014-07-22 18:21:00 +09:00
Melondonut
e266f403ff Update ko.coffee 2014-07-22 10:13:24 +09:00
Melondonut
fed5f3bce0 uncommented line 485 2014-07-21 14:11:17 +09:00
Melondonut
f5ac5423f8 Update ko.coffee 
I translated a bit more. I corrected some of word spacing, too. Please let me know if there is anything wrong.
 2014-07-21 06:03:53 +09:00
Melondonut
9724c4f218 Update ko.coffee 
Hi there. 
I'm not sure that if it is okay to to this .. but anyway I thought there were a lot of thing that I could help so I did translate a bit. I checked out the code combat website but they just says "go to github, and translate."  
thank you, 
Melondonut.

안녕하세요. 제가 이래도 되는 건지는 모르겠지만, 제가 도움이 될 수 있을 것 같아 시험삼아 조금 번역해보았습니다. 코드 컴뱃 사이트를 확인했는데, 깃헙에 가서 번역한 다음 리퀘스트하라는 말만 있더라구요; 확인해주시면 감사하겠습니다.
 2014-07-20 23:19:41 +09:00
Imperadeiro98
3ac1d6c77c Update pt-PT.coffee 2014-07-18 15:48:36 +01:00
Imperadeiro98
051fd9ecbc Update pt-PT.coffee 2014-07-18 13:40:05 +01:00
Nick Winter
207f0adf11 Propagated i18n tags for code language blurbs. 2014-07-17 20:13:30 -07:00
Nick Winter
2d7b6eb145 Updated code language logos. Added code language blurb i18n tags. 2014-07-17 20:12:59 -07:00
Imperadeiro98
17a4a689e4 Update pt-PT.coffee 2014-07-17 14:18:29 +01:00
Imperadeiro98
991ef61d62 Update pt-PT.coffee 2014-07-17 13:44:14 +01:00
Imperadeiro98
1b6fc95d77 Update pt-PT.coffee 2014-07-17 13:25:25 +01:00
Nick Winter
781e1da93e Fixed typo: massword -> password. 2014-07-16 16:14:48 -07:00
Nick Winter
5ce0cff538 Propagated i18n. Added password repeat to base en.coffee. 2014-07-16 08:03:25 -07:00
Nick Winter
1fd28c0181 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-16 07:54:23 -07:00
Nick Winter
bf0e1ead92 Merge pull request #1335 from rubenvereecken/settings_patch 
Did UX changes, added an error and fixed a job profile editing bug
 2014-07-16 07:52:04 -07:00
Nick Winter
085951fa4a Removed more counselor stuff. 2014-07-16 07:47:41 -07:00
Nick Winter
5b693d02cf Merge pull request #1330 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-07-16 07:47:08 -07:00
Ruben Vereecken
bfc4ef58b0 Did UX changes, added an error and fixed a job profile editing bug 2014-07-16 14:47:55 +02:00
Imperadeiro98
4dbb49aa72 Update en.coffee 2014-07-16 13:24:16 +01:00
George Saines
8c9c41f477 copy tweak on the employer homepage 2014-07-15 17:27:26 -07:00
Imperadeiro98
7d476470c7 Corrected a mistake 2014-07-15 20:17:50 +01:00
Imperadeiro98
32d4408f67 Update pt-PT.coffee 
Delete lines 747-753 and 775-776.
 2014-07-15 20:02:23 +01:00
Nick Winter
39bea855d1 Propagated new i18n tags with the script. 2014-07-15 08:22:02 -07:00
Nick Winter
42cf0b5cce Added missing starting quote. 2014-07-14 07:30:18 -07:00
Inez KEMENES
ca3a2b620b Update hu.coffee 
I must have made a mistake again. I have deleted a star instead of a double cross and some lines disappeared. Sorry! Please correct.
 2014-07-14 07:22:19 +02:00
Nick Winter
f9822b65e4 Merge branch 'master' of git://github.com/jayant1992/codecombat 2014-07-13 18:21:27 -07:00
Jayant Jain
493ebd07e6 Changes randomise to randomize 2014-07-14 06:01:09 +05:30
Michael Schmatz
2a5a366c12 Made language selection in opponent modal 2014-07-13 17:22:06 -07:00
Nick Winter
a076822a08 Merge pull request #1306 from kerradus/master 
update ru.coffee
 2014-07-13 17:07:45 -07:00
Jayant Jain
be223197df Updates i18n tags and en.coffee 2014-07-14 01:33:45 +05:30
Dmitry
e60832bcfa Update ru.coffee 
some fixes
 2014-07-13 23:13:42 +04:00
Nick Winter
868a6ed43b Fixed a couple i18n issues. Fixed #1302. 2014-07-13 09:31:56 -07:00
Nick Winter
39f6874682 Merge pull request #1304 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-07-13 07:48:42 -07:00
Dmitry
b1aa0a1973 update ru.coffee 2014-07-13 15:33:50 +04:00
Imperadeiro98
178e147565 Update pt-PT.coffee 2014-07-12 08:54:16 +01:00
Nick Winter
f13f0ddfef Merge pull request #1296 from dreamist/patch-1 
Update th.coffee
 2014-07-11 18:11:57 -07:00
dreamist
ca78638a21 Update th.coffee 
One fix and a few more translations
 2014-07-12 03:07:58 +07:00
Imperadeiro98
bad11f0eea Update pt-PT.coffee 2014-07-11 19:08:14 +01:00
Imperadeiro98
d4c21e0349 Update pt-PT.coffee 2014-07-11 18:34:22 +01:00
Imperadeiro98
ef9ea0c489 Fixed a issue with headers 
There was a issue with the headers that is now corrected.
 2014-07-11 18:12:12 +01:00
Imperadeiro98
6f94b0ce6f Update pt-PT.coffee 2014-07-11 15:18:26 +01:00
Imperadeiro98
a979c32567 Update pt-PT.coffee 2014-07-11 15:17:16 +01:00
Nick Winter
65e39ad4e3 Propagated i18n updates. 2014-07-10 19:24:44 -07:00
Nick Winter
45545796a0 Fixes, tweaks, and i18n for the employers page. 2014-07-10 19:17:51 -07:00
Alphir
0ee0b2d5e3 Update fr.coffee 2014-07-09 22:13:05 +02:00
Nick Winter
9381a4dec6 Merged in some Russian translations from a1ip and fixd a merge conflict in server.coffee style cleanups. 2014-07-07 20:16:00 -07:00
Nick Winter
d414ed64ec Merge pull request #1264 from kinez/patch-12 
Update hu.coffee
 2014-07-07 20:13:36 -07:00
Michael Schmatz
05560662dd Various fixes to employer page/profile view 2014-07-07 19:34:36 -07:00
Scott Erickson
fd564fa2d4 Merge pull request #1261 from Imperadeiro98/master 
Translated some more strings
 2014-07-07 18:50:20 -07:00
Imperadeiro98
d9d1d25c3c Update pt-PT.coffee 2014-07-07 13:31:03 +01:00
Inez KEMENES
cc0e818824 Update hu.coffee 2014-07-06 16:26:51 +02:00
Imperadeiro98
21c180e206 Update pt-PT.coffee 2014-07-06 11:11:44 +01:00
Imperadeiro98
e3bb93c4f5 Update pt-PT.coffee 2014-07-06 10:01:55 +01:00
Imperadeiro98
183b744d07 Update pt-PT.coffee 2014-07-05 22:10:21 +01:00
Imperadeiro98
cc8fec9283 Update pt-PT.coffee 2014-07-05 19:11:58 +01:00
Imperadeiro98
b5ef1742f4 Update pt-PT.coffee 2014-07-05 19:11:06 +01:00
Imperadeiro98
dbdd8c672c Update pt-PT.coffee 2014-07-03 14:11:30 +01:00
Imperadeiro98
3b04343034 Update pt-PT.coffee 2014-07-03 14:06:40 +01:00
Imperadeiro98
08a9b4f05b Update pt-PT.coffee 2014-07-03 13:55:50 +01:00
greyhusky
467b9adf74 new translations 
i translated some parts, will translate more later
 2014-07-02 11:33:19 +02:00
Philippe Rigovanov
dd6209cd99 Update ru.coffee 
With @M-r-A fixes
 2014-06-27 04:33:05 +04:00
Philippe Rigovanov
e138d2eed6 Update ru.coffee 
With fixes from [M-r-A](https://github.com/M-r-A)
 2014-06-27 04:11:46 +04:00
Nick Winter
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -07:00
Darredevil
c6f19f7d3a Added new tip tag 2014-06-26 06:23:36 +03:00
Inez KEMENES
96f74183a5 Update hu.coffee 2014-06-25 17:28:13 +02:00
Nick Winter
512e287b6a Merge pull request #1184 from greyhusky/patch-1 
Update de-CH.coffee
 2014-06-24 17:41:32 -07:00
George Saines
68d7b3997a modifying the employer page to be more explanatory 2014-06-24 16:43:27 -07:00
Scott Erickson
ee0b14eb61 Changed the versions history modal to show name and date. 2014-06-24 16:41:55 -04:00
Philippe Rigovanov
f7ec30a586 Update ru.coffee 2014-06-23 01:55:45 +04:00
Airunedz
dfff43d66a Improve Spanish (Spain) translations 
Changes: Add some translations to Spanish (I'm from Spanin)
 2014-06-22 01:07:05 +02:00
Nick Winter
52b2e756ef Merge pull request #1195 from thanosme/patch-1 
Update el.coffee
 2014-06-21 08:44:43 -07:00
Thanasis Manousos
5e2dececb5 Update el.coffee 2014-06-21 18:31:26 +03:00
Nick Winter
dde71485bf A bit of cleanup. 2014-06-20 20:52:50 -07:00
Nick Winter
17366af245 Merge pull request #1188 from a1ip/master 
Update ru.coffee
 2014-06-20 20:49:19 -07:00
Nick Winter
d8e1fa880c Merge pull request #1181 from djsmith85/patch-1 
Update de.coffee
 2014-06-20 20:45:27 -07:00
Nick Winter
d3d9908ef2 Merge pull request #1180 from djsmith85/patch-2 
Update de-DE.coffee
 2014-06-20 20:45:02 -07:00
Nick Winter
ac0f6e74aa Merged. 2014-06-20 20:41:34 -07:00
thanosme
625750614a Update el.coffee 
Added some tranlations with minor corrections
 2014-06-20 01:14:30 +03:00
Nick Winter
a58f3e0fb6 More styling work on code language selector. 2014-06-19 12:31:56 -07:00
Philippe Rigovanov
ebaeac7e80 Some translations 2014-06-19 05:42:15 +04:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b integrated autocomplete 2014-06-18 17:57:42 +02:00
greyhusky
6fe9623244 Update de-CH.coffee 
Hoi zeme, i übersetze mega gern und wieni gseh ha isches no es reechts Stück wo z übersetze isch. Ha mol agfange, i hoff ihr findeds guet. :)
 2014-06-18 11:09:10 +02:00
djsmith85
2fff271200 Update de-DE.coffee 
Updated a few translations in the German locale file.
 2014-06-17 23:52:57 +02:00
djsmith85
5a90a7c880 Update de.coffee 
Updated a few translations in the German locale file and merged the translations from de-DE.coffee
 2014-06-17 23:52:54 +02:00
Nick Winter
0b8a0c8f6f Added UserRemarks. 2014-06-17 13:03:13 -07:00
Nick Winter
9a64ca5973 A few misc fixes. 2014-06-16 10:49:20 -07:00
Nick Winter
3d2bee3256 Merge pull request #1168 from kinez/patch-9 
Update hu.coffee
 2014-06-16 08:22:21 -07:00
Nick Winter
7198a8fc42 Merge pull request #1166 from ChrisLightman/patch-6 
Upsate /// Translate
 2014-06-16 08:21:56 -07:00
Nick Winter
0418d80c6d Merged. 2014-06-16 08:12:52 -07:00
Inez KEMENES
c611cafa25 Update hu.coffee 2014-06-16 16:39:02 +02:00
Clement
931f3ea330 Upsate /// Translate 
Enjoy
 2014-06-16 11:38:25 +02:00
barbuddha
ff5f46e5fb Update ru.coffee 2014-06-16 08:43:27 +04:00
Nick Winter
babfa04a9e Fixed a tiny typo. 2014-06-14 18:02:22 -07:00
djsmith85
a22a098fdc Update de-DE.coffee 2014-06-14 14:02:42 +02:00
Nick Winter
79cbc4bb25 Propagated i18n. 2014-06-13 08:50:52 -07:00
Nick Winter
2bda60796a Copy / i18n tweaks for tournament ending and employers blurb. 2014-06-13 08:08:13 -07:00
Nick Winter
28264d5ace Added tournament results and a way to email them out. 2014-06-12 17:52:08 -07:00
George Saines
fb7b3f8580 adding a top info arena on top of the employers page 2014-06-12 16:01:34 -07:00
Scott Erickson
c855327cef Merge pull request #1150 from rubenvereecken/achievements 
Achievements - Update with some tests and admin endpoint
 2014-06-12 11:28:25 -07:00
Ruben Vereecken
b0666ace0d Refactorings performed necessary to have searchable for more uses 2014-06-12 19:40:59 +02:00
Lucas Castro
ebf0cba45d Update pt-BR.coffee 2014-06-12 10:11:49 -03:00
oaugereau
f7ee40a3a2 Update fr.coffee 2014-06-12 14:39:41 +02:00
oaugereau
0d5e213daa Update fr.coffee 2014-06-12 14:17:36 +02:00
oaugereau
028feaafc6 Update fr.coffee 2014-06-12 09:42:57 +02:00
Nick Winter
77920b5416 Improvements to profile views. Added links to players' code. 2014-06-11 19:38:47 -07:00
Lucas Castro
60a0a6ee80 Update pt-BR.coffee 2014-06-11 14:04:19 -03:00
Lucas Castro
fe9e584767 Update pt-BR.coffee 2014-06-11 14:00:52 -03:00
barbuddha
d361ab5809 Update ru.coffee 2014-06-11 09:56:15 +04:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07:00
Lucas Castro
132a7b62f1 Update pt-BR.coffee 2014-06-10 11:04:02 -03:00
Nick Winter
22ca9507d0 Upgrades to employer's candidate indexing. 2014-06-09 22:17:53 -07:00
Nick Winter
67b10474e8 Suggested improvements to profile pages. 2014-06-07 00:33:18 -06:00
Nick Winter
d00c4c2af3 Propagate i18n. Merged in good stuff from 6b675f from kinez for hu.coffee. 2014-06-06 15:39:03 -06:00
Nichlas Torgersen
657182c8c0 Updates to norwegian translation 
I noticed there were some misspellings and grammar errors which I corrected. Especially the sign in-message, it went along the lines in norwegian as: "Draw yourself in", that doesn't make sense now does it.

Also removed some unneeded capitalizations, norwegian grammar is all about that and how you build a word. Most words can be combined into one, like in english: "Door handle" would be "Doorhandle" if english was using norwegian grammar rules.
 2014-06-06 01:44:05 +02:00
Nick Winter
47b99adddf Uncommented some fr.coffee section headers to go with the new translations. 2014-06-05 10:28:40 -06:00
Clement
9895432dd2 Syntax Update and Traduction Update 2014-06-05 18:03:33 +02:00
Clement
a7d0b540cd Big Update /// Syntax Correction and Traduction 2014-06-05 13:35:03 +02:00
Nick Winter
143597dc0f Merge pull request #1124 from ChrisLightman/patch-2 
Update Line 723-734 : Full Traduction
 2014-06-03 08:26:54 -07:00
Nick Winter
bebb200090 Merge pull request #1122 from ChrisLightman/patch-1 
Update fr.coffee
 2014-06-03 08:26:44 -07:00
ChrisLightman
12da959550 Update Line 723-734 : Full Traduction 2014-06-02 20:52:49 +02:00
Ruben Vereecken
c2d2f2a2b8 Refactorings performed necessary to have searchable for more uses 2014-06-02 20:31:09 +02:00
Nick Winter
51891887e5 Fixed merge conflict 2014-06-02 10:43:31 -07:00
Nick Winter
257fe4cec3 Fixed merge conflict 2014-06-02 10:42:34 -07:00
Gutierri Barboza
8a8b80bcf5 More translations pt-br 2014-06-02 14:34:30 -03:00
ChrisLightman
cfcaece743 Update fr.coffee 
Modification mineures de syntaxe ( Majuscules )
 2014-06-02 11:36:05 +02:00
Nick Winter
f3d5b724de Merge branch 'inline-profile' 2014-06-01 16:45:49 -07:00
Nick Winter
10754e6825 Added i18n, error handling, autocomplete, highlighting the next section, animation for completing sections, and complete example skeleton. 2014-06-01 16:45:19 -07:00
Nick Winter
400fddc294 Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry. 2014-05-31 22:09:41 -07:00
Inez KEMENES
a97d243100 Update hu.coffee 2014-05-31 16:16:28 +02:00
Nick Winter
852053022a Started the horrifying migration to an inline jobs profile editor. 2014-05-30 22:12:44 -07:00
Nick Winter
ed36dba3f5 Merge pull request #1041 from Shpionus/patch-1 
Update ru.coffee
 2014-05-25 12:17:12 -07:00
Nick Winter
6b554e03ef Merge pull request #1084 from domenukk/feature/step-single-frame 
Added shortcut for frame single-stepping
 2014-05-25 09:37:13 -07:00
z3t1
d8b448ab60 Update zh.coffee 
Update some phrases.
 2014-05-25 16:05:35 +08:00
Dominik Maier
f62cd7f38b + added shortcut for frame single-stepping 
+ fixed single stepping for frames
 2014-05-24 17:31:59 +02:00
Nick Winter
bda8f10508 Fixed a couple typos in the hu merge. 2014-05-23 09:27:02 -07:00
Inez KEMENES
1d595e9a0d Update hu.coffee 
The line no. 123 disappeared. I may have accidentally deleted it while working on 122. Sorry. Please correct.
 2014-05-23 16:21:46 +02:00
Scott Erickson
bfa90f671d Fixes #940, merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal. 2014-05-22 11:26:08 -07:00
Rafael Gomes
09db5cb9ee Updated some words and phrases 
Just a few words and phares until have more experience in the project.
 2014-05-21 14:38:08 -03:00
Burlutskiy Ivan
70403409f3 Update ru.coffee 
reverted team translation by @M-r-A request.
 2014-05-21 12:18:44 +04:00
Nick Winter
de9f1fab0d Merged. 2014-05-20 15:09:48 -07:00
Burlutskiy Ivan
a8a50df025 Update ru.coffee 
Fixed previous typos; uncommented translations.
 2014-05-21 01:32:15 +04:00
Burlutskiy Ivan
65a364d3f7 Update ru.coffee 2014-05-21 00:21:10 +04:00
Nick Winter
b6406b9b0e Put some tournament details in there. Muted some extra casting sounds during level load. 2014-05-19 21:56:20 -07:00
Nick Winter
341097c5ca A couple improvements for the LadderSubmissionView. 2014-05-19 19:51:24 -07:00
Nick Winter
116965fcdc Rules wording tweaks; highlighting new matches and end of ranking with sounds. 2014-05-19 19:13:36 -07:00
Nick Winter
af31bcf008 Fleshed out tournament prizes tab. 2014-05-19 17:40:06 -07:00
Scott Erickson
62ad8dd26a Added a status message to the goals view. 2014-05-19 16:36:45 -07:00
Nick Winter
8a5a45950f Simulator now pleads for you to help simulate when your match is being ranked. 2014-05-19 14:59:47 -07:00
Nick Winter
68a4483e91 Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view. 2014-05-19 11:58:53 -07:00
Nick Winter
5dffca7a9c Propagated i18n tags. 2014-05-19 10:11:18 -07:00
Nick Winter
b89615cea4 Added helpful keyboard shortcuts modal. 2014-05-19 10:08:34 -07:00
Nick Winter
3c9428ffd3 Refactored game ranking buttons into a LadderSubmissionView. 2014-05-17 11:55:51 -07:00
Gutierri Barboza
589de9b4b2 correction in "candidate_location" 2014-05-17 13:11:05 -03:00
Gutierri Barboza
ac3c5276b5 update PT-BR 2014-05-17 13:07:51 -03:00
Pablo Lobato
8794921018 Update es-ES.coffee 2014-05-17 11:09:55 +02:00
Nick Winter
dbcafbb29b Working on level-specific coding languages, with non-writable code in JavaScript. 2014-05-14 21:54:36 -07:00
George Saines
75ab5d6435 making our recruitment % consistent 2014-05-14 14:55:04 -07:00
Scott Erickson
4b404ae124 Finished tuning the supermodel loading and progress. 2014-05-13 14:39:45 -07:00
Nick Winter
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -07:00
Scott Erickson
e9fc3df7c1 Set up the versions modal to display changes between versions when you select two of them. 2014-05-08 10:54:39 -07:00
Nick Winter
9e40dcd2e3 Added a couple i18n tags. 2014-05-06 06:58:20 -07:00
Nick Winter
af5b878166 Fixed wizard setting things. 2014-05-06 06:56:14 -07:00
Roy Xue
03e5d1ca50 Merge pull request #1 from codecombat/master 
Update CodeCombat
 2014-05-06 14:09:42 +08:00
Nick Winter
0e0ca785d9 Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab. 2014-05-05 16:59:12 -07:00
Scott Erickson
8f9aea1b9b Fixed the patches view. 2014-05-05 15:19:35 -07:00
Roy Xue
2b2fea3092 Update zh.coffee 2014-05-05 21:33:01 +08:00
Vic___
e64ba30d33 Update zh-HANS.coffee 2014-05-05 20:05:57 +08:00
Nick Winter
3b891e6628 Merge pull request #954 from marc-portier/master 
first translation contribution
 2014-05-04 21:25:05 -07:00
Roy Xue
fd3c008ca7 Update zh-HANS.coffee 2014-05-04 11:03:43 +08:00
Nick Winter
fbf5f52228 Merge pull request #955 from benojan/patch-3 
Update zh-WUU-HANT.coffee
 2014-05-03 07:22:57 -07:00
Nick Winter
8fbe2dedfc Propagated Wu name update. 2014-05-03 07:21:18 -07:00
Marc Portier
5212eca404 fixing typox - thx to @JasperDhaene 2014-05-03 16:04:08 +02:00
Marc Portier
f7b746c3ea making case consistent - thx to @JasperDhaene 2014-05-03 16:01:17 +02:00
Marc Portier
add2944a28 ogre ==> ork and a serious spelling error 2014-05-03 15:59:16 +02:00
Benojan
8a11990e89 Update locale.coffee 
巫师吴语->吴语
巫師吳語->吳語
 2014-05-03 17:55:36 +08:00
Benojan
50d4078ade Update zh-WUU-HANT.coffee 
translate others that was not translated.
 2014-05-03 17:14:11 +08:00
Marc Portier
d348c6f333 translate space 2014-05-03 11:06:39 +02:00
Marc Portier
e1482280c3 first translation contribution 2014-05-03 08:23:36 +02:00
Nick Winter
d54149d0f3 Reworked LevelView loading priorities to try to get world simulating earlier. 2014-05-02 12:32:41 -07:00
Nick Winter
e610ecb476 Propagated new i18n tags. 2014-05-02 11:02:48 -07:00
Nick Winter
9d45b22057 Added some i18n tags. 2014-05-02 11:00:30 -07:00
Scott Erickson
eacbf571c6 Merge branch 'master' into feature/thangload 2014-05-02 10:32:05 -07:00
Nick Winter
ef036b409b Merge pull request #930 from M-r-A/patch-1 
Update ru.coffee
 2014-05-02 09:58:55 -07:00
Nick Winter
3ac052a4a6 Merge branch 'benojan-patch-2' 2014-05-02 09:49:35 -07:00
Nick Winter
082a9d141a Keeping Wu English stub. 2014-05-02 09:49:02 -07:00
Nick Winter
302cb78095 Added zh-WUU-HANS stubs. 2014-05-02 09:48:40 -07:00
Nick Winter
f92fd122c6 Integrating Wu as zh-WUU-HANS and zh-WUU-HANT; hacking on a fork of i18next to do so. 2014-05-02 09:46:00 -07:00
Scott Erickson
92687b17de Merge branch 'master' into feature/thangload 
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
 2014-05-02 08:19:47 -07:00
Benojan
28a56c1c83 Create new language--the wuu-chinese 
Just for Wuu Chinese, including Shanghainese and such language in Zhejiang Province, China.
 2014-05-02 19:19:21 +08:00
Benojan
770345f84d Update zh.coffee 2014-05-02 16:09:13 +08:00
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -07:00
Scott Erickson
6f2e309d6d Added one last resource name. 2014-04-28 11:53:57 -07:00
Scott Erickson
02a74ae40c Migrated and fixed the rest of the views using the new loading system. 2014-04-28 11:52:04 -07:00
Scott Erickson
8164c6881c Fixed a patches resource name. 2014-04-28 11:10:27 -07:00
Scott Erickson
17a0bf54c6 Merge branch 'master' into feature/loading-views 2014-04-28 10:10:57 -07:00
Alexei Nikitin
d82c62f4e6 Update ru.coffee 
I am extremely dissatisfied the support of CodeCombat internationalization by programmers. Make changes to the requirements of the new code; it must be completely covered by the i18n tags reflected in en.coffee.
 2014-04-28 09:23:56 -07:00
Nick Winter
0de5e715c7 Double-checked i18n propagation. 2014-04-27 20:28:53 -07:00
Nick Winter
8cb8c63f21 Fixed merge conflicts in uk.coffee. 2014-04-27 20:23:13 -07:00
Nick Winter
c1637fe37a Fixed merge conflicts in es-419.coffee. 2014-04-27 20:19:05 -07:00
Nick Winter
938a2bca1d Merge pull request #900 from julycoolwind/patch4 
Translate items under multiplayer_launch
 2014-04-27 20:13:27 -07:00
Nick Winter
e65202434b Merge pull request #890 from treby/update_ja_resource 
Update ja resource.
 2014-04-27 20:12:14 -07:00
Nick Winter
d542898663 Fixed indentation / commenting on a few lines from #924. 2014-04-27 09:40:43 -07:00
belian
75f37864da Update fr.coffee 
New update for "fr.coffee"
 2014-04-27 11:52:55 +02:00
Scott Erickson
fed5d681f2 Merge branch 'master' into feature/loading-views 2014-04-26 12:54:37 -07:00
Scott Erickson
6cd7c723d8 Fixed up showing errors, made sure they work with the play view. 2014-04-25 15:31:38 -07:00
Nick Winter
0975a86345 Propagated i18n. 2014-04-24 14:32:56 -07:00
Scott Erickson
2d43b36022 Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText 2014-04-24 13:29:24 -07:00
Nick Winter
b9173a5ea5 Fixed #913, I think. (This was just built into marked.) 2014-04-24 12:24:22 -07:00
lordbam
8b9bc0c504 Update uk.coffee 
I have translated part of it. please check it for mistakes and add it to your page if all is alright. in few days i‘ll try to translate to the end
 2014-04-24 17:25:11 +03:00
Nick Winter
d1ceec16bb Propagated i18n tags, as reminded by #884. 2014-04-23 10:48:31 -07:00
marianoluzza
0db33213f3 Update es-419.coffee 
Various sections translated
 2014-04-23 13:44:13 -03:00
林鑫
de1eb3860a Translate items under multiplayer_launch 2014-04-23 17:26:39 +08:00
dpen2000
dd00e2abe6 Replace generic text Sign Up to Create a New Content 2014-04-23 00:37:10 +01:00
Glen De Cauwsemaecker
afc447e596 Removed double got_questions i18n tag in en.coffee from commit e439e3f 2014-04-22 23:47:11 +02:00
Glen De Cauwsemaecker
7da89e8b00 Merge branch 'master' of https://github.com/JasperDhaene/codecombat into jasper-master 2014-04-22 23:44:50 +02:00
treby
4898ff78a1 Updated ja.coffee 2014-04-22 08:54:10 +09:00
JasperDhaene
e439e3fec8 added missing i18n tag 2014-04-21 19:56:38 +02:00
JasperDhaene
c49dc9457d fixed some lines to fit proper context 2014-04-21 19:54:14 +02:00
JasperDhaene
4d7e6ba849 fixed some lines to fit proper context 2014-04-21 19:52:27 +02:00
JasperDhaene
6a1d43435a fixed some lines to fit proper context 2014-04-21 19:50:43 +02:00
Daniel
baff84f0ae Update es-ES.coffee 
Hi!
I have translated the remaining lines. I have not tested all the text yet in order to remove overflowing or cut off texts (I had to modify two lines to avoid a couple of linguistic bugs) but I hope to do it soon.
Cheers!
 2014-04-21 01:13:34 +02:00
Nick Winter
5e2f3ac7cb Merge pull request #878 from JasperDhaene/master 
Update Dutch locale
 2014-04-20 13:21:07 -07:00
JasperDhaene
ef9ee024e1 update nl-NL.coffee 2014-04-20 21:34:43 +02:00
JasperDhaene
ad212d428c update nl-BE.coffee 2014-04-20 21:33:19 +02:00
JasperDhaene
6a03ddad74 Update nl.coffee 2014-04-20 21:31:11 +02:00
Nick Winter
6fa3d81fa1 Merged, fixed conflicts, restored rest of file. 2014-04-20 11:44:44 -07:00
Nick Winter
a829f3a537 Merge branch 'patch-2' of git://github.com/kinez/codecombat 2014-04-20 11:42:05 -07: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
Inez KEMENES
4a2bcc2030 Update hu.coffee 2014-04-20 19:04:07 +02: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
Nick Winter
ae65f07e7e Added some i18n and improved employer page. 2014-04-11 12:49:44 -07:00
Nick Winter
ca13324e99 Resolved merge conflicts. 2014-04-11 11:32:51 -07:00
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
Jasper D'haene
f2332b0694 Completed + reviewed latest Dutch locale changes 2014-04-11 09:11:12 +02:00
Jasper D'haene
23cb736d71 resolved merge conflicts 2014-04-11 08:05:11 +02:00
Nick Winter
7a35a6248f Adding contact form for employers to contact candidates. 2014-04-10 14:59:32 -07:00
Nick Winter
dd46f9d039 Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks. 2014-04-09 16:46:44 -07:00
DjBRINE
7f4c251f43 Update ru.coffee 2014-04-09 03:57:40 -07:00
Alper ALIN
a2ebcc6433 Update tr.coffee 
a few changes
 2014-04-09 12:31:25 +03:00
Glen De Cauwsemaecker
4bd058d1be Merge branch 'master' of https://github.com/1c7/codecombat 2014-04-08 16:25:29 +02:00
1c7
102c707fa9 Chinese Translate(zh-HANS.coffee) 2014-04-08 22:17:40 +08:00
Glen De Cauwsemaecker
e02087f4ed Merge pull request #798 from endrilian/patch-1 
Update uk.coffee
 2014-04-08 15:15:58 +02:00
Alexei Nikitin
33f26c3da0 Sync i18n 2014-04-08 12:23:16 +04:00
Glen De Cauwsemaecker
afbfa08416 fixed errors made in last contribution to the Turkish translation. 2014-04-08 09:06:11 +02:00
Alexei Nikitin
f8d6857633 Fix crlf 2014-04-08 10:50:58 +04:00
Alex
f798142b87 Update uk.coffee 2014-04-08 01:51:40 +03:00
Alexei Nikitin
e87c0c4b91 Work on thang tab 2014-04-08 02:49:27 +04:00
Alper ALIN
51847c77ce Update tr.coffee 2014-04-08 00:40:25 +03:00
Alexei Nikitin
5f062ad25c Work on revert, save modal 2014-04-08 01:38:46 +04:00
Alexei Nikitin
d64690e8d9 Work on fork modal 2014-04-08 00:29:40 +04:00
Alexei Nikitin
69406df0ed Work on create_new modal 2014-04-07 23:27:42 +04:00
Alexei Nikitin
630c44135a Work on wizard settings 2014-04-07 21:44:47 +04:00
Alexei Nikitin
9dab4b39e6 Update ru.coffee 2014-04-07 19:46:01 +04:00
OlenaGapak
780541ea58 Update uk.coffee 
ukrainian localization
 2014-04-07 15:35:09 +03:00
Nick Winter
4070aab48a Merge pull request #777 from Digot/patch-1 
Update de.coffee
 2014-04-06 14:37:43 -07:00
Nick Winter
06d846ccbf Fixed bugs with some i18n from #793; copied new i18n tags over. 2014-04-06 14:35:40 -07:00
Nick Winter
8f1ef4e3bb Merge pull request #793 from kinez/patch-4 
Update hu.coffee
 2014-04-06 14:26:06 -07:00
Nick Winter
31a170bf67 Merge pull request #771 from kinez/patch-2 
Update hu.coffee
 2014-04-06 14:24:38 -07:00
Nick Winter
69ba442261 Merge pull request #770 from kinez/patch-1 
Update hu.coffee
 2014-04-06 14:24:32 -07:00
Inez KEMENES
7d3b7de8b4 Update hu.coffee 2014-04-06 16:49:00 +02:00
Glen De Cauwsemaecker
3feb694756 Merge pull request #788 from 1c7/master 
Chinese translate for windows automatic tool
 2014-04-06 12:17:01 +02:00
Glen De Cauwsemaecker
9ea8282b89 Merge pull request #790 from zloysmiertniy/patch-1 
Update es-419.coffee
 2014-04-06 12:12:44 +02:00
Vindurrin
7a8f3849a6 Update es-ES.coffee 
Line #231, “Atajos de teclado” means “Keyboard Shortcuts” — let me know if this isn’t close enough to what is meant by “Key Bindings”: the reason that I chose this phrase is because I don’t know of an exact or approximate translation of “key bindings” into Spanish, but several other software platforms have used the phrase “atajos de teclado” to express this meaning.
 2014-04-05 21:09:10 -04:00
Nick Winter
5c8c7fff1d Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower. 2014-04-05 17:05:03 -07:00
Evelyn Solorzano
af887fd4b8 Update es-419.coffee 
Translated some commented lines up to play: category
 2014-04-05 18:21:05 -05:00
1c7
51142627d4 translate app/locale/zh-HANS.coffee 2014-04-05 14:34:21 +08:00
Alexei Nikitin
63f72cb454 Update ru.coffee 2014-04-04 10:01:03 -07:00
Vindurrin
79d19d61db Update pt-BR.coffee 2014-04-04 00:14:28 -04:00
Scott Erickson
978c84bc89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-03 18:43:36 -07:00
Scott Erickson
3b3b825be0 Set up a new loading/progress system for views. 2014-04-03 18:43:29 -07:00
Darredevil
df3b51e5bd Update ro.coffee 2014-04-04 02:15:50 +03:00
Nick Winter
62f91d14b0 Merged. 2014-04-03 16:06:32 -07:00
Vindurrin
d58c70b456 Update es-ES.coffee 2014-04-03 16:11:09 -04:00
Digot
eca934d6a5 Update de.coffee 2014-04-03 21:58:12 +02:00
Michael Schmatz
c434325ec0 Fixed line endings and locale error 2014-04-03 10:53:29 -07:00
Glen De Cauwsemaecker
12cf298467 Merge conflicts master 2014-04-03 17:42:08 +02:00
Glen De Cauwsemaecker
a2ac89094a Merge conflicts: ms.coffee 2014-04-03 17:38:46 +02:00
Nick Winter
52de546727 Merged. 2014-04-02 15:09:40 -07:00
Inez KEMENES
70d42b6eae Update hu.coffee 2014-04-02 16:00:15 +02:00
Inez KEMENES
9acde85c8c Update hu.coffee 2014-04-02 15:24:26 +02:00
Nick Winter
ae9769e3ce Added read only notification in editors. Fixed #374. 2014-04-01 13:15:30 -07:00
Nick Winter
7807fdbbc6 Merged pt-PT locale conflicts. 2014-04-01 10:41:40 -07:00
Dominik Kundel
45f1d8d408 added two programming quotes 2014-04-01 17:16:35 +02:00
OlenaGapak
1799310261 Update uk.coffee 
ukrainian localization
 2014-04-01 14:59:46 +03:00
jaudhaen
be9edb74af updated dutch locale 2014-04-01 09:26:42 +02:00
Michael Schmatz
f084588adf Merge pull request #758 from dkundel/master 
update de.coffee
 2014-03-31 16:06:38 -07:00
Nick Winter
0bd8321345 Updated Mondo Bizarro i18n comma. 2014-03-31 16:02:56 -07:00
Dominik Kundel
a9b225ec03 fixed indentation de.coffee 2014-04-01 00:55:45 +02:00
Dominik Kundel
069a7a41e4 update de.coffee 2014-04-01 00:34:51 +02:00
Michael Schmatz
b021b65ee1 Copied new i18n tags to all languages 2014-03-31 15:31:38 -07:00
Alexei Nikitin
0473ce2df1 Update ru.coffee 2014-03-31 15:11:56 -07:00
Alexei Nikitin
6ff8d0fbe3 Update en.coffee 2014-03-31 15:10:51 -07:00
Bia41
898018ac91 Updated pt-PT locale 
Added some translations for European Portuguese.
 2014-03-31 22:53:08 +01:00
Jazzis18
c3e4b4d279 Update ru.coffee 
Добавил пробел в начало строки переменной join_desc_3, а то в тексте получалось слитно всё.
 2014-04-01 03:34:45 +06:00
Alexei Nikitin
4c3e8671a3 Update ru.coffee 2014-03-31 13:33:22 -07:00
Alexei Nikitin
9e1e59bb3f Update en.coffee 2014-03-31 13:32:11 -07:00
Nick Winter
a9a0a55331 Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master 2014-03-31 12:42:53 -07:00
Dominik Kundel
725a8bc2d9 updated locales 2014-03-31 20:48:07 +02:00
Dominik Kundel
1c6aea9c1c Merge remote-tracking branch 'upstream/master' 2014-03-31 20:35:32 +02:00
Alexei Nikitin
1719358856 Update ru.coffee 2014-03-31 11:32:01 -07:00
Nick Winter
8df80ad1bc Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions. 2014-03-30 13:33:21 -07:00
Nick Winter
1b92654a44 Merged. 2014-03-29 17:45:01 -07:00
Nick Winter
a79fe37ca1 Merged; made a couple tweaks. 2014-03-29 17:30:12 -07:00
Alexei Nikitin
ee5ee4bc88 Update ru.coffee 2014-03-29 17:28:44 -07:00
Dominik Maier
78c18b03b6 Merged new tips 2014-03-30 00:48:31 +01:00
Dominik Maier
fb607d06fa Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670 2014-03-30 00:38:45 +01:00
Herbert Vojčík
f0298f4596 some more Slovak 2014-03-29 03:18:45 +01:00
Nick Winter
5e30ab091b Updated i18n tags. 2014-03-28 13:19:17 -07:00
Nick Winter
13d5536eb3 Merged. 2014-03-28 13:08:30 -07:00
Jasper D'haene
7f6510823a merged 2014-03-28 20:59:05 +01:00
Jasper D'haene
fa6ef5aa49 added authors to quotations 2014-03-28 19:58:33 +01:00
Jasper D'haene
cd3019296c added tips/quotes to loading bar 2014-03-28 19:01:31 +01:00
Michael Schmatz
20c54400b8 Merge pull request #722 from dc55028/master 
fr.coffee: fixed typos and translated glen_description
 2014-03-28 09:16:35 -07:00
Michael Schmatz
e0f50d04a8 Uncomment translations 2014-03-28 09:13:08 -07:00
Dominik Kundel
35a16b47ff Merge remote-tracking branch 'upstream/master' 2014-03-28 14:37:14 +01:00
Dom
15590252f1 Update fr.coffee 
fixed other typos and translated a definition
 2014-03-28 00:38:31 +01:00
Arni Mc.Frag
0388376d99 Update ca.coffee 2014-03-28 00:29:54 +01:00
Dom
6f02748311 Update fr.coffee 
fixed typos
 2014-03-28 00:29:31 +01:00
Darredevil
f4a81f43a2 Added funny tip 2014-03-28 00:13:30 +02:00
AKeeper
d21fbbfe4d Update ru.coffee 2014-03-27 16:48:30 +02:00
Alexei Nikitin
780743a40d Update ru.coffee 2014-03-26 15:57:16 -07:00
Alexei Nikitin
2ffc2efaa5 Update ru.coffee 2014-03-26 15:42:03 -07:00
Glen De Cauwsemaecker
5825b2676b Added myself to the signature. 2014-03-26 04:46:49 +01:00
Dominik Kundel
fe8a4901de Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/locale/de.coffee
	bower.json
 2014-03-25 17:07:36 +01:00
Michael Schmatz
06f46af603 Merge pull request #688 from 1c7/master 
Translate some word from English -> Chinese.  (zh-HANS.coffee)
 2014-03-25 08:44:29 -07:00
1c7
ed2e17aedc Translate some word from English -> Chinese. (zh-HANS.coffee) 2014-03-25 23:15:17 +08:00
Glen De Cauwsemaecker
305e2f6d68 Merge pull request #685 from JasperDhaene/master 
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
 2014-03-25 13:27:13 +01:00
JasperDhaene
748081b4a7 Added myself to the diplomate list, fixed typos and made corrections to Dutch locale 2014-03-25 09:25:20 +01:00
Darredevil
4bb1ee5c74 Update ro.coffee 2014-03-25 02:55:07 +02:00
Glen De Cauwsemaecker
3382750c7e Merge branch 'dutch_diff' of github.com:rubenvereecken/codecombat 2014-03-25 01:13:30 +01:00
Ruben Vereecken
a3f65ace7a Created differentation between nl-BE and nl-NL 2014-03-24 22:21:34 +01:00
Glen De Cauwsemaecker
d6178aa2cc Fixed a small error 2014-03-24 00:46:44 +01:00
Glen De Cauwsemaecker
724592601c Merge branch 'master' of github.com:JasperDhaene/codecombat 2014-03-24 00:45:09 +01:00
JasperDhaene
58601e95f6 finished review of nl.coffee 2014-03-23 22:54:30 +01:00
JasperDhaene
e5d2c07ff1 general revision until line 254 2014-03-23 17:30:45 +01:00
Nick Winter
4c1dc0d7f9 Merge pull request #661 from M-r-A/patch-2 
Update ru.coffee
 2014-03-23 09:11:52 -07:00
Nick Winter
90832f6015 Merge pull request #653 from 3rr3s3v3n/patch-1 
Translating Multiplayer lines
 2014-03-23 09:11:11 -07:00
JasperDhaene
dde626e759 Update nl.coffee - small revisions/additions 2014-03-23 16:57:33 +01:00
Alexei Nikitin
20e111d307 Update ru.coffee 2014-03-23 07:30:14 -07:00
3rr3s3v3n
f4de280cee Translating more Lines. 
Password remains password in Italian, such as VS.
 2014-03-23 11:53:39 +01:00
3rr3s3v3n
5ef6f6974f Translation actived! 
I removed the # mark from the lines I've translated yesterday.
 2014-03-23 11:39:35 +01:00
Michael Schmatz
c3b745b271 Added Catalan language file 2014-03-22 11:30:58 -07:00
3rr3s3v3n
6b660dade2 Translating Multiplayer lines 
Ok, I tried to translate in italian some lines ;) hope this helps.
 2014-03-22 10:38:32 +01:00
Nick Winter
f0640dd2e8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-21 16:22:51 -07:00
Nick Winter
ba66dbf5a1 Adding CLAs view. 2014-03-21 16:22:47 -07:00
Sérgio Batista
ee4858f725 Update pt-PT.coffee 
Some new additions and minor fixes to old ones
 2014-03-21 16:39:47 +01:00
Nick Winter
b30bf35945 Fixed #638, I hope. 2014-03-21 08:09:08 -07:00
Nick Winter
a3dadd6a40 Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks 2014-03-21 07:25:33 -07:00
Muhammad Nuzaihan Bin Kamal Luddin
eaa9443969 grammar mistake 2014-03-21 17:10:03 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
966e99510e Probably too little commits at one time. more grammar fixes 2014-03-21 16:45:34 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
cb8c146029 grammar fixes 2014-03-21 16:41:23 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d876f975e6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-21 16:33:18 +08:00
Mikhail Koltsov
0ece400a18 Level editor: selecting a thang now moves the scroll in existant-thang list 2014-03-21 11:54:55 +04:00
David Hallberg Jönsson
75138cb67b Update sv.coffee 
Updated some existing translations, mostly grammar corrections.
 2014-03-21 08:40:37 +01:00
Muhammad Nuzaihan Bin Kamal Luddin
4804065c94 Comment out WIP. Uncomment missed line. 2014-03-21 15:07:35 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6f0915e7ce Messed up with string interpolation 2014-03-21 15:03:40 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
9a44c3fd31 Some important information 2014-03-21 14:53:43 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
b288e53a89 Put 'parti' in blockquotes so highlight difference from 'political party' 2014-03-21 14:47:11 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d71e13977f More grammar issues.... sigh 2014-03-21 14:40:13 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
e51c3502c1 some grammar fixes 2014-03-21 14:36:42 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d84bee3c3e Fix malay grammatical errors 2014-03-21 14:27:43 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
9ec615f58c Correct some punctuations and add new translations 2014-03-21 14:25:35 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
3b18a3f24e Errors in Daftar masuk 2014-03-21 13:24:09 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
ffde1595da Some small details on accounts 2014-03-21 13:14:50 +08:00
Nick Winter
89d720dc30 Uncommented multiplayer modal i18n section for Polish. 2014-03-20 21:29:03 -07:00
Nick Winter
0c6a22e26d Merge pull request #631 from TigroTigro/patch-3 
Update pl.coffee
 2014-03-20 21:27:53 -07:00
Nick Winter
53f39e9cc7 Pointed locale at correct file. 2014-03-20 21:25:20 -07:00
Nick Winter
f55654130e Merge branch 'master' of git://github.com/muhammadn/codecombat into muhammadn-master 2014-03-20 21:23:12 -07:00
Muhammad Nuzaihan Bin Kamal Luddin
3047d5c696 Minor changes 2014-03-21 10:47:46 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6e32b79921 and to dan 2014-03-21 10:46:27 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
cf4f8dc9b7 Add some must-have information in translation 2014-03-21 10:45:11 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
282fd50b3c Major additions to MS locale in Codecombat 2014-03-21 09:58:52 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6eccb459cf Additions to Bahasa Malaysia 2014-03-21 09:28:39 +08:00
Nick Winter
ca1e3742c0 Added simulation counts. 2014-03-20 15:40:02 -07:00
Glen De Cauwsemaecker
18cf143bfb Corrected some errors in the swedisch local. file 2014-03-20 23:03:19 +01:00
TigroTigro
a8716000a4 Update pl.coffee 2014-03-20 22:16:26 +01:00
iamhj
d0be8b36b6 Update sv.coffee 
Added Swedish text to all the places where there wasn't any.
 2014-03-20 20:13:54 +01:00
Nick Winter
81a459dc02 Merged and fixed indentation to two spaces instead of three. 2014-03-20 08:25:12 -07:00
OlenaGapak
d43c05b558 Update uk.coffee 
ukrainian localization. spelling fixes, new translation
 2014-03-20 15:05:58 +02:00
Mikhail Koltsov
a6523719e4 Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks 
Conflicts:
	app/locale/ru.coffee
 2014-03-20 09:07:11 +04:00
Nick Winter
1ce67710c5 Merged. 2014-03-19 19:26:17 -07:00
kvasnyk
802f0069b7 Polish language translations bug fixes. 2014-03-20 03:03:03 +01:00
Nick Winter
097c6bc2cd Changed line endings on en.coffee and nl.coffee away from DOS. Trying out fix for Firefox embed. 2014-03-19 17:25:56 -07:00
Glen De Cauwsemaecker
225fd6d355 Fixed a spelling mistake I made yesterday. 2014-03-20 02:02:40 +01:00
Glen De Cauwsemaecker
71a13a5670 Adding missing translations for the Dutch local file 2014-03-20 00:33:50 +01:00
Glen De Cauwsemaecker
e2a7c15776 Merge conflicts resolved from Ruben's branch 2014-03-20 00:05:41 +01:00
OverProgram
f6e5ceb1ef More Updates fore he.coffee 
Here is some more translate to hebrow.
 2014-03-19 20:18:30 +02:00
Nick Winter
777420ebd8 Merge pull request #614 from M-r-A/patch-2 
Update ru.coffee
 2014-03-19 09:28:39 -07:00
Nick Winter
6a5c24cc69 Merge pull request #616 from OverProgram/patch-1 
Update he.coffee
 2014-03-19 09:28:12 -07:00
Nick Winter
9edd5e751d Merge pull request #615 from MartinDelille/translation 
first multiplayer translations
 2014-03-19 09:26:29 -07:00
OverProgram
00d17c6d2f Update he.coffee 2014-03-19 16:13:41 +02:00
Alexei Nikitin
5b2a219ca5 Update ru.coffee 2014-03-19 03:42:38 -07:00
Alexei Nikitin
4a119cd6b0 Update ru.coffee 2014-03-19 02:53:13 -07:00
Glen De Cauwsemaecker
c98ee7314a Applied Vietnamese translations made by Nguyen Thi Thien An via email. 2014-03-19 03:24:16 +01:00
Glen De Cauwsemaecker
91ff1bd4c6 Translated glen_description in dutch (Nederlands). 2014-03-19 02:49:55 +01:00
Glen De Cauwsemaecker
a523d74b2d Added the glen_description i18n tag to all languages. 2014-03-19 02:47:25 +01:00
Glen De Cauwsemaecker
a9fc1cb35a Added a newline 2014-03-19 02:34:23 +01:00
iulianR
8735ed20d4 Updated ro.coffee 2014-03-19 02:06:02 +02:00
Mikhail Koltsov
dfe5cd8f41 Polished ru.coffee a bit 2014-03-19 03:29:53 +04:00
Martin Delille
93ec4f94fc first translation shot 2014-03-18 22:37:10 +01:00
Ruben Vereecken
04465eb72c Wrapped up locale files 2014-03-18 10:24:58 +01:00
Ruben Vereecken
e4fee7296c Merged in old locale 2014-03-18 10:19:33 +01:00
Ruben Vereecken
b476e6b333 Ladder i18n refactoring 2014-03-18 10:18:38 +01:00
Dominik Kundel
084ef5563b Merge remote-tracking branch 'upstream/master' 2014-03-18 01:10:43 +01:00
Damien
71d248afef Add some french translations 2014-03-17 23:38:41 +01:00
Nick Winter
a58faa1acd Merged. 2014-03-17 14:07:37 -07:00
Nick Winter
2dd762a0d7 Merge pull request #600 from M-r-A/patch-2 
Update ru.coffee
 2014-03-17 14:01:48 -07:00
Nick Winter
2098bef39e Fixed quoting problem. 2014-03-17 13:58:40 -07:00
Nick Winter
21ca74d76f Merge branch 'patch-koreanlocale' of git://github.com/walkingtospace/codecombat into walkingtospace-patch-koreanlocale 2014-03-17 13:58:11 -07:00
Björn Kimminich
4ea7d0e9b2 Update de.coffee 2014-03-17 21:36:53 +01:00
Björn Kimminich
b0a361abb2 Update de.coffee 2014-03-17 20:32:57 +01:00
Alexei Nikitin
4860e2e7a1 Update ru.coffee 2014-03-17 12:00:28 -07:00
fist0512
9d75fa5588 Added korean locale and modified unnatural translation 2014-03-18 03:49:15 +09:00
armaldio
2eb84252f3 Update fr.coffee 2014-03-17 19:47:44 +01:00
Dominik Kundel
c55b608886 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/templates/play/level/modal/editor_config.jade
 2014-03-17 19:39:38 +01:00
Nick Winter
bf323d59f2 Merge pull request #594 from ahmed80dz/patch-1 
Update ar.coffee
 2014-03-17 11:09:17 -07:00
Cassio Cardoso
970d5e46a2 Update pt-BR.coffee 
Add multiplayer translation
 2014-03-17 14:47:22 -03:00