Commit graph

3064 commits

Author SHA1 Message Date
Ivan
b441161edb Update sr.coffee
Little more translation for today.
Best regards
2016-01-29 21:29:13 +01:00
Imperadeiro98
546fdfa2b6 Fix build 2016-01-29 14:58:08 +00:00
Imperadeiro98
734797cc17 Merge pull request #3368 from Ivanmateja/patch-2
Update sr.coffee
2016-01-29 14:51:37 +00:00
Ivanmateja
4962c17107 Update sr.coffee
I have removed hashtags and signed CLA.  Hope that everything will work fine now. Sory for mistakes this Github is a little confusing at beginning.
Greetings
2016-01-29 15:21:22 +01:00
Imperadeiro98
6923491e45 Merge pull request #3367 from a1ip/patch-4
Update ru.coffee
2016-01-29 12:23:29 +00:00
Ivanmateja
ab681252e4 Update sr.coffee 2016-01-29 12:46:19 +01:00
Scott Erickson
e62e497543 Replace TeachersFreeTrialView with RequestQuoteView 2016-01-28 17:21:36 -08:00
Philippe Rigovanov
ce05659ab5 Update ru.coffee 2016-01-29 01:26:24 +03:00
Philippe Rigovanov
94c0c27a03 Update ru.coffee 2016-01-29 00:45:16 +03:00
Philippe Rigovanov
dd6f9711a4 Update ru.coffee 2016-01-27 23:15:52 +03:00
Scott Erickson
4ef5f40fa1 Network error handling fixes
* Make work there are multiple network requests and only one fails
* Test for i18n attributes instead of English translations so Travis works
* Various PR changes
2016-01-27 10:42:12 -08:00
Scott Erickson
29350bf1de Make network error handling more generic 2016-01-27 10:41:56 -08:00
Imperadeiro98
cef0ed0185 Fix build 2016-01-27 18:12:34 +00:00
Matías Olivera
a009b4aae6 Fix strings with the 'change' label 2016-01-27 13:34:50 -03:00
Matías Olivera
6e7b34c4fd Translate new strings 2016-01-26 18:14:24 -03:00
Imperadeiro98
668c6e79c4 Merge pull request #3346 from darulis1/patch-1
Update lt.coffee
2016-01-21 15:04:58 +00:00
darulis1
5b48e1a379 Update lt.coffee
Added and fixed more translations
2016-01-21 15:58:15 +02:00
ignaloidas
a26b7abff9 A litle bit more of translation 2016-01-21 13:57:34 +02:00
Elian Kamal
45070c80ae Update he.coffee
Update he.coffee
2016-01-21 13:21:03 +02:00
Philippe Rigovanov
abab78d816 Update ru.coffee 2016-01-20 20:47:15 +03:00
minwook shin
3d85c01c59 My second ko translation.
This has translated this means.
265 : Holy smokes -> Surprise [놀라다]
2016-01-19 19:02:58 +09:00
Scott Erickson
c23fb50fa7 Merge pull request #3330 from differentmatt/teacher-news
Add approved teacher trials to CodoCombat list Teachers group
2016-01-18 15:18:55 -08:00
Kuma
5a6d074aeb Update ja.coffee
Deleted # from the lines I translated.
2016-01-18 12:19:18 -06:00
Kuma
539f0ae936 Update ja.coffee
I added translations under teachers_survey:, versions:, and account_settings:.
Thanks,
2016-01-17 20:56:34 -06:00
Matt Lott
d2921f66cb Add approved teacher trials to mail news group 2016-01-17 07:39:30 -08:00
Imperadeiro98
1359dcc5c6 Fixes to previous merge 2016-01-17 09:57:02 +00:00
Imperadeiro98
3e3f083f99 Merge pull request #3329 from FedericoTomas/patch-11
Update es-419.coffee
2016-01-17 09:55:01 +00:00
Imperadeiro98
40f67c0d6f Uncommented some headers 2016-01-17 09:53:52 +00:00
Imperadeiro98
8a93026b5f Merge pull request #3318 from minwook-shin/patch-1
my first ko translation
2016-01-17 09:53:02 +00:00
Federico Tomas
44e82881c5 Update es-419.coffee
I'm back guys, trying to help you a little more.
Bye!, happy new year to everyone.
2016-01-17 03:04:15 -03:00
Robin Yang
af65b85217 Update Getting Started Area
- Upload new Course 2 guide Pdf
- Update Getting Started Pdf
- Add links to Course 2 and Educator Wiki
2016-01-15 13:15:08 -08:00
minwook shin
4c7567926a my first ko translation
I'll translate other things .
2016-01-14 11:09:43 +09:00
Nick Winter
63d643ac13 Merge branch 'brazil_coupon' 2016-01-12 12:26:36 -08:00
Imperadeiro98
49c57bbf6b Update pt-PT.coffee 2016-01-11 21:17:53 +00:00
Nick Winter
a91f33df4b Propagate i18n 2016-01-11 12:59:28 -08:00
Imperadeiro98
cfa4617e16 Add indicator to changed string 2016-01-11 20:57:42 +00:00
Imperadeiro98
f60f17ce47 Merge pull request #3313 from durianboy/patch-3
Patch 3
2016-01-11 20:27:07 +00:00
Maka
e786073f5b Updated teacher page to remove 'unlimited enrollment' reference. 2016-01-11 12:59:49 -05:00
Nick Winter
e872ead632 Implement Brazil coupon 2016-01-11 09:52:46 -08:00
durianboy
ae368894e1 Update zh-HANT.coffee 2016-01-11 17:45:41 +08:00
durianboy
62e1a0b876 Update zh-HANT.coffee 2016-01-11 17:24:39 +08:00
Imperadeiro98
150e517c73 Merge pull request #3309 from xavismeh/master
Enhanced french translation
2016-01-10 19:43:56 +00:00
Imperadeiro98
5d439834ba Merge pull request #3305 from darulis1/patch-1
Update lt.coffee
2016-01-10 19:36:19 +00:00
Xavier Coureau
3f9a0c2973 Enhanced french translation
Typo

Typo
2016-01-09 23:45:49 +01:00
Matt Lott
213f3edd0d Update /about team section 2016-01-08 10:25:21 -08:00
darulis1
838c0f20cb Update lt.coffee 2016-01-08 16:59:58 +02:00
durianboy
2f4079084b Update zh-HANT.coffee
我需要有人告訴我我這樣算是上傳pull請求嗎?
I need someone to tell me have I PULL by propose file change?
2016-01-08 05:04:30 +08:00
Xavier Coureau
f309f5dad3 Merge remote-tracking branch 'upstream/master' 2016-01-06 00:45:44 +01:00
Nick Winter
7864d3708b Change traditional Chinese label to be in traditional Chinese 2016-01-05 15:20:22 -08:00
ryang217
c29db142a1 Add locale keys for Robin About Page entry
Adding onto 57ed2fa.
2016-01-05 14:02:08 -08:00
GOBY Alexandre
061509dfb3 Update fr.coffee 2016-01-05 17:35:57 +01:00
Xavier Coureau
87741c6e93 Enhanced french translation 2016-01-05 16:19:54 +01:00
Yuki Ueda
9159ee3490 Update ja.coffee 2016-01-01 19:05:03 +09:00
Imperadeiro98
e19e997126 Merge pull request #3287 from JurianLock/patch-2
Update nl-NL.coffee
2015-12-29 15:03:54 +00:00
JurianLock
2ab3033e21 Update nl-NL.coffee 2015-12-29 02:34:39 +01:00
JurianLock
b9239503f9 Update nl-NL.coffee 2015-12-29 00:33:05 +01:00
Nainufar
718d546354 Update ca.coffee
more translations :)
2015-12-26 12:37:24 +01:00
Nick Winter
35a18eadb4 Merge zh-HAN*.coffee 2015-12-24 06:37:40 -08:00
Imperadeiro98
325c774b90 Update pt-PT.coffee 2015-12-23 23:22:54 +00:00
Nick Winter
08f983db59 Propagate i18n 2015-12-23 10:07:32 -08:00
Nick Winter
130b67d6ce Merge pull request #3273 from codecombat/clean-i18n
Remove unused i18n strings
2015-12-23 08:52:47 -08:00
Nick Winter
dfc1ef2e89 Add i18n tags for new legal page stuff 2015-12-23 08:21:49 -08:00
zxcpoiu
d54c2a786c app/locale: translation for ZH_HANT and ZH_HANS 2015-12-23 15:15:11 +08:00
Nainufar
59862f666d Update ca.coffee
some translations more
2015-12-22 01:12:45 +01:00
Nick Winter
e070c70b9d Put /schools into the main flow in place of anonymous /teachers for now 2015-12-21 15:02:11 -08:00
Imperadeiro98
7af7553bff Remove unused i18n strings 2015-12-20 15:00:58 +00:00
Scott Erickson
079109145f Cull recruiting views and translations 2015-12-18 10:34:21 -08:00
Matt Lott
94cf5654ff Update /teachers with post-HoC copy 2015-12-18 05:39:25 -08:00
Matt Lott
28c554295c Remove homepage HoC section 2015-12-18 05:15:04 -08:00
Imperadeiro98
e5e9f3e01d Merge pull request #3272 from VeggieRock/patch-1
Update es-419.coffee
2015-12-18 11:35:46 +00:00
VeggieRock
dac2f5917d Update es-419.coffee
Cambios menores en las paginas de cursos y registro, así como algunas correcciones sustituyendo la palabra "escaleras" por clasificación. ejemplo: 
Partidas de "escaleras" fue cambiado a partidas de "clasificación".
Espero y sean aceptadas pronto. Saludos!
2015-12-17 23:42:05 -06:00
Lucas P
5f143a276e Update Pt-Br -Transation
Some translation and fixes .
2015-12-17 23:38:40 -02:00
Balrogin
d8f49c1b82 Atualização Tela inicial- Front page update
Traduzi a parte do "Hour of Code" que ainda estava em inglês.
E algumas outras coisinhas.
2015-12-17 09:14:20 -02:00
Scott Erickson
e1130ff1e8 Clean up legal string interpolation 2015-12-16 16:39:46 -08:00
Nainufar
5c4e415ead Update ca.coffee
more translations
2015-12-16 16:39:46 -08:00
Aleksey Klimenko
895e9194e4 Translate some lines. 2015-12-16 16:39:45 -08:00
RUSLAN LÓPEZ CARRO
938744a580 Update es-419.coffee 2015-12-16 16:39:45 -08:00
Scott Erickson
3f6afa6580 Interpolate discount in year sub description 2015-12-16 16:39:45 -08:00
Scott Erickson
96e6920722 Update some copy to use db products 2015-12-16 16:39:44 -08:00
Nainufar
b9304f2350 Update ca.coffee
Some translations more.
2015-12-16 16:39:44 -08:00
RUSLAN LÓPEZ CARRO
a91dc6d812 Update es-419.coffee 2015-12-16 16:39:43 -08:00
Imperadeiro98
64fbb373bd Merge pull request #3259 from Nainufar/patch-1
Update ca.coffee
2015-12-13 21:01:26 +00:00
micman73
f793e58a71 Update el.coffee
Additions to cover hour of code section
2015-12-13 19:40:37 +02:00
Nainufar
a3a65e090e Update ca.coffee
some more translations and some corrections
2015-12-13 18:04:23 +01:00
Imperadeiro98
70ed07e558 Update pt-PT.coffee 2015-12-11 12:59:39 +00:00
Imperadeiro98
c71975fd40 Merge pull request #3256 from javatlacati/patch-1
Update es-419.coffee
2015-12-10 21:25:33 +00:00
Nick Winter
67ac55de7f Implement #3255 in the i18n tags instead 2015-12-10 10:57:24 -08:00
RUSLAN LÓPEZ CARRO
9ffd79f31d Update es-419.coffee 2015-12-10 11:53:34 -06:00
Scott Erickson
96c5a1a69a Fix brunch build 2015-12-09 12:26:53 -08:00
Nick Winter
7076a23fe2 Merge pull request #3252 from themaka/staff-update
Updating About page to include me
2015-12-09 08:45:21 -08:00
Maka
a11a7c38d4 Added maka_blurb + maka_title to en.coffee 2015-12-09 08:13:03 -08:00
Nick Winter
70c90d9bb5 Propagate i18n 2015-12-09 06:58:33 -08:00
Nick Winter
591749de15 Fix some button child click and duplicate tag issues with e284ec79 2015-12-09 06:57:33 -08:00
Nick Winter
0945e3ee90 Merge pull request #3250 from Imperadeiro98/master
Courses i18n
2015-12-09 06:34:13 -08:00
micman73
df8658ced5 Update el.coffee 2015-12-09 15:39:32 +02:00
Imperadeiro98
95efdcac1c Added a line I removed 2015-12-08 20:58:53 +00:00
Imperadeiro98
e284ec7959 Courses i18n
Also, removed duplicated 'Continue' string
2015-12-08 20:05:08 +00:00
Imperadeiro98
27cad5dce0 Added a resource string and fixed other 2015-12-07 22:34:35 +00:00
Imperadeiro98
b0a1334eec Removed play-level-modal
I think it is no longer used
2015-12-07 21:36:50 +00:00
Imperadeiro98
458a287abd Some fixes to last merge 2015-12-07 17:52:45 +00:00
Alessio
cebe9c7b7d Translated everything. Cool! xD 2015-12-07 04:51:41 +01:00
Imperadeiro98
43d8a8071c Merge pull request #3238 from Ikuyadeu/patch-1
Update ja.coffee
2015-12-05 20:06:07 +00:00
Yuki Ueda
72e9838ac9 Update ja.coffee 2015-12-05 14:17:12 +09:00
micman73
4401af01c9 Update el.coffee
few additions and small correction in leaderboard section for better displaying
2015-12-05 02:04:58 +02:00
Nick Winter
b21c20c08d Update free-trial-approved copy to not reference the confirmation email 2015-12-04 14:03:30 -08:00
Imperadeiro98
ac10cc3fb2 Merge pull request #3233 from micman73/patch-3
Update el.coffee
2015-12-04 13:21:31 +00:00
petteri
abcea26dd7 Update fi.coffee
Added more translations
2015-12-03 10:35:34 +02:00
micman73
1c31e3993d Update el.coffee
small corrections on lines 265,266,274 for better display.
2015-12-02 22:56:37 +02:00
Nick Winter
0d65d73024 Finish merging master into courses-vhoc 2015-12-02 10:10:50 -08:00
Nick Winter
c77e1c0fa2 Add course complete visual state for student CourseDetailsView
Also including a few misc tweaks to CourseDetailsView and the end-of-course HeroVictoryModal state.
2015-12-02 09:52:52 -08:00
Imperadeiro98
0a1e20f971 Uncommented an header from cs.coffee 2015-12-02 17:48:20 +00:00
Miroslav Suchý
b268006559 More Czech translations 2015-12-02 17:41:09 +01:00
Nick Winter
88ee363576 Add schoolName field to AuthModal 2015-12-01 17:44:03 -08:00
Nick Winter
8e1143b519 Add schoolName field to AuthModal 2015-12-01 17:32:02 -08:00
Imperadeiro98
509dd5a8f3 Update pt-PT.coffee 2015-12-01 22:28:15 +00:00
Nick Winter
ae6eca583a Present 'Play Classroom Version' before playing a campaign level when appropriate 2015-12-01 11:24:16 -08:00
Imperadeiro98
ce92f11b27 Small fixes for last merge 2015-12-01 15:57:39 +00:00
tinavincent
6863a3b303 Översatt en massa
Första gången jag testar. Hoppas att jag gjort rätt.
2015-12-01 16:40:58 +01:00
Nick Winter
851e3a092e Play button goes to /courses if that's all the player has played 2015-11-30 16:43:33 -08:00
Matt Lott
171e4f888e Update /courses/teachers
Adding edit class settings modal
Adding create new class modal
Repurposing ClassroomSettingsModal for create new class too.
2015-11-30 16:20:24 -08:00
Nick Winter
457b9d0dbf Simple AI -> Simple CPU, since players read it as 'AL' (who is SIMPLE AL?) 2015-11-30 15:27:52 -08:00
Nick Winter
fcd970dbe2 Propagate i18n 2015-11-30 10:57:45 -08:00
Nick Winter
ecfd982847 Note PayPal payment method. End limited-time year sale. 2015-11-30 10:50:34 -08:00
Nick Winter
31e7b36310 Add link to /acccount/subscription from /account/settings 2015-11-30 09:19:53 -08:00
Nick Winter
9dccf73af0 'Click to view attempt' for incomplete student solutions 2015-11-27 12:12:32 -08:00
Imperadeiro98
f240e5341f Update pt-PT.coffee 2015-11-26 16:27:48 +00:00
Imperadeiro98
620448d705 Merge pull request #3209 from criptonauta/patch-3
Update pt-BR.coffee
2015-11-26 15:05:42 +00:00
Nick Winter
ac0e21aa39 Propagate i18n 2015-11-25 16:52:10 -08:00
Matt Lott
7b01fd7b65 Add course name to victory modal 2015-11-25 14:23:35 -08:00
criptonauta
c87abeebff Update pt-BR.coffee
Some more changes in courses
2015-11-25 19:02:06 -03:00
Imperadeiro98
de23e03418 Uncommented an header 2015-11-25 18:19:49 +00:00
criptonauta
5bc44e1043 Update pt-BR.coffee
Some translations for 'courses' section
2015-11-25 12:16:29 -03:00
Saibamen
9750aa09a6 Update pl.coffee 2015-11-25 01:30:03 +01:00
Matt Lott
4cc71bd0e6 Add HoC links to homepage 2015-11-24 15:28:37 -08:00
Imperadeiro98
2a1b464d5a Fix for last merge 2015-11-24 21:01:57 +00:00
Imperadeiro98
12c228c14d Merge pull request #3203 from criptonauta/patch-1
Update pt-BR.coffee
2015-11-24 21:01:14 +00:00
Matt Lott
f261c1466a Update /teachers
Stop forwarding to HoC
Update copy with courses info.
2015-11-24 10:59:14 -08:00
Matt Lott
d7a66722b9 Update teacher surveys
Removing trial subscriptions
Updating trial page copy
Adding special HoC trial
Introducing a new course prepaid property endDate, which won’t be
returned or redeemed after the date.
2015-11-24 10:32:19 -08:00
criptonauta
d44a8b469e Update pt-BR.coffee 2015-11-24 14:36:44 -03:00
Imperadeiro98
0d35f1472e Fixes for last merge 2015-11-23 20:34:17 +00:00
Tuan Manh Lai
a0d5d2ea66 Update vi.coffee 2015-11-23 20:37:15 +07:00
Tuan Manh Lai
c00cfddf3b Update vi.coffee 2015-11-23 20:32:52 +07:00
Yuki Ueda
cfbd62a899 Update ja.coffee 2015-11-23 16:28:34 +09:00
thatguy7
c4146d046a fixed some errors and added a few new tranlations
As I played through some of the levels to see if I would suggest this
game to my students, I encountered multiple translations that were
either phrased very weirdly, grammatically incorrect or completely
nonsensical.

I fixed those and also translated a few new lines along the way.

The german word for buy ("kaufen") is shorter than the word for unlock
("freschalten") and should fit in the button. I suggest changing that,
but it feels like avoiding the word buy was a design decision, so I left
it as it is.
2015-11-22 00:11:12 +01:00
Imperadeiro98
f3eae6e171 Merge pull request #3186 from mancusoa74/patch-1
Update it.coffee
2015-11-20 12:34:54 +00:00
Nick Winter
d673dd9973 Ask, 'How fun was this level?' on course victory 2015-11-19 14:49:29 -08:00
Scott Erickson
ee1e484dda Have play buttons show 'Compete!' for arena levels on CourseDetails levels list 2015-11-18 14:08:25 -08:00
Antonio Mancuso
fe7eb89a03 Update it.coffee
I would like contributing to this great game.
I woul dlike to help completing the Italian translation asap to enable Italian kids to play and learn with CodeCombat

thnx
Antonio
2015-11-18 22:37:40 +01:00
Jhoon Saravia
b375e10c68 Finish translation of new strings 2015-11-16 21:44:28 -05:00
Jhoon Saravia
4c25062d78 Make uniform translation of the word subscription 2015-11-16 20:52:31 -05:00
Jhoon Saravia
9d6de4c0ba Translate half of new strings 2015-11-15 20:47:05 -05:00
Imperadeiro98
6f81a72adf Merge pull request #3176 from Raphaelwuhao/patch-1
Update zh-HANS.coffee
2015-11-16 12:56:11 +00:00
Imperadeiro98
e268e20390 Fixed last merge 2015-11-15 18:13:47 +00:00
SILVIA BINDELLI
bdf2df12be Italian translations added or fixed 2015-11-15 17:57:37 +01:00
Raphaelwuhao
6d989a523a Update zh-HANS.coffee 2015-11-14 22:20:58 -08:00
Raphaelwuhao
104ca4f2cd Update zh-HANS.coffee 2015-11-14 20:57:30 -08:00
Matt Lott
b3362c8d0d Add courses to top menu
Bumping about to bottom menu, removing clans.
2015-11-13 11:33:03 -08:00
Imperadeiro98
12523dd247 Update pt-PT.coffee 2015-11-13 13:21:08 +00:00
Imperadeiro98
d555b04ca4 Merge pull request #3173 from Ikuyadeu/patch-1
Update ja.coffee
2015-11-13 13:00:36 +00:00
Imperadeiro98
fc4008567c Fix build 2015-11-13 12:59:34 +00:00
Yuki Ueda
e6d769bab0 Update ja.coffee 2015-11-13 15:59:19 +09:00
Nick Winter
d744d2db2b Propagate i18n 2015-11-12 16:42:37 -08:00
Matt Lott
840970c267 🐛Fix greek translation file indentation 2015-11-12 16:39:44 -08:00
Nick Winter
3c62b5b39e Merge pull request #3172 from zsdregas/master
Greek Translation
2015-11-12 16:36:15 -08:00
Nick Winter
9e61928080 Add reset progress feature in account settings 2015-11-12 15:27:28 -08:00
Zacharias Sdregas
fdeb86e353 Greek Translation 121115 2015-11-12 23:09:22 +02:00
Zacharias Sdregas
b9d2b7b07b Almost Done 2015-11-12 23:07:38 +02:00
Zacharias Sdregas
ca0e5af481 Some more translated 2015-11-12 15:03:07 +02:00
Zacharias Sdregas
88eeb2b3b7 some 250 more strings translated 2015-11-11 18:16:41 +02:00
Imperadeiro98
18eef3b0ec Merge pull request #3171 from probil/patch-4
Update ukrainian l18n
2015-11-11 14:25:34 +00:00
Imperadeiro98
a36220694a Indentation fix 2015-11-11 14:25:17 +00:00
Imperadeiro98
871738ecdb Merge pull request #3134 from janjoos/patch-2
Smart update
2015-11-11 14:24:41 +00:00
Nick Winter
4497334e6d Update a couple team avatar and descriptions 2015-11-10 15:21:34 -08:00
Max Lyashuk
f69d28b8cb Update ukrainian l18n
Translated more lines, fix wrong translations, fix language specific things
2015-11-11 00:41:07 +02:00
Zacharias Sdregas
5491bf4860 318 more strings translated 2015-11-10 17:42:55 +02:00
Zacharias Sdregas
0c8f8e3d78 Greek Translation - A few more string translated 2015-11-10 07:23:04 +02:00
Max Lyashuk
596bae17d6 Update ukrainian l18n, fix bugs 2015-11-09 21:16:01 +02:00
Zacharias Sdregas
9aa66db52d More strings translated 2015-11-09 16:03:51 +02:00
zacharias
6fc2e339de more strings translated 2015-11-06 13:37:39 +02:00
RUSLAN LÓPEZ CARRO
2de074821c Update es-419.coffee 2015-11-05 11:24:13 -06:00
Imperadeiro98
424bea90b6 Reverted resources strings removal 2015-11-04 22:44:46 +00:00
Imperadeiro98
89521e2dbe Remove a lot of unused strings 2015-11-04 21:45:15 +00:00
Imperadeiro98
dbd9e325d4 Merge pull request #3155 from mads232/patch-2
Update da.coffee
2015-11-04 18:04:24 +00:00
Imperadeiro98
b0908524c4 Merge pull request #3153 from snarkota/patch-4
Update lt.coffee
2015-11-04 17:52:58 +00:00
Imperadeiro98
81e68ca795 Merge pull request #3152 from abdalim/msmy-home
Add Bahasa Melayu translations for Home
2015-11-04 17:50:45 +00:00
Imperadeiro98
7dacacf232 Merge pull request #3151 from poshus1984/patch-1
Update lt.coffee
2015-11-04 17:50:11 +00:00
mads232
841412a87d Update da.coffee 2015-11-03 18:43:55 +01:00
Nick Winter
05e95923c2 Add Carlos to /about 2015-11-02 16:15:43 -08:00
Josh Callebaut
f885a0e45d This updates the en.coffee file to account for josh_c's blurb and title. 2015-11-02 16:08:03 -08:00
Nick Winter
caab006c5e Merge pull request #3149 from dillonforrest/master
Change visible references of 'HipChat' to 'Slack'.
2015-11-02 10:32:48 -08:00
snarkota
ce376564a9 Update lt.coffee 2015-11-02 16:55:14 +02:00
Alim
0b156242d9 Add Bahasa Melayu translations for Home 2015-11-01 13:57:19 +08:00
Sigitas Mockus
20017691d3 Update lt.coffee 2015-10-31 19:10:43 +02:00
Imperadeiro98
1cdb598350 Fixes to last merge 2015-10-31 14:06:13 +00:00
albenarammou
94cb1075e8 Update bg.coffee 2015-10-31 09:24:05 +02:00
Rob
cea412c0a9 Fix indentation. 2015-10-30 11:16:48 -04:00
Imperadeiro98
6e01f367d9 Fixes to last merge 2015-10-30 14:37:05 +00:00
Imperadeiro98
08e9d682d0 Merge pull request #3143 from RobertLukowski/patch-3
Update de-DE.coffee
2015-10-30 14:35:05 +00:00
dillon
493d302a0d Change visible references of 'HipChat' to 'Slack'. 2015-10-30 00:07:58 -07:00
RUSLAN LÓPEZ CARRO
9283492cb8 Update es-419.coffee
Some already translated strings appear as untranslated :S
2015-10-29 14:32:15 -06:00
Imperadeiro98
f2ca1dbd63 Updates to i18n 2015-10-29 15:57:22 +00:00
Nick Winter
3352042af5 Uncomment nl-BE section header 2015-10-29 07:40:30 -07:00
Nick Winter
46c8b4f81d Merge nl-BE.coffee 2015-10-29 07:37:06 -07:00
RobertLukowski
0d2f747a6e Update de-DE.coffee
I hope the de-Translation is better
2015-10-29 15:19:40 +01:00
WardLanssens
8acaa80397 Update nl-BE.coffee 2015-10-29 15:18:50 +01:00
Imperadeiro98
16e30f5b9a Update pt-PT.coffee 2015-10-28 17:37:59 +00:00
Nick Winter
448e1c3d9f Propagated i18n 2015-10-28 09:08:05 -07:00
Imperadeiro98
d2c6540c2d Merge pull request #3137 from evvanderplas/patch-1
Update nl-NL.coffee: typos, grammar
2015-10-28 14:33:09 +00:00
Nick Winter
a970f322f9 Merge pull request #3132 from Imperadeiro98/i18n-updates
Updated i18n across some files
2015-10-28 06:41:35 -07:00
Nick Winter
20f2abfb37 Propagate i18n 2015-10-28 06:26:01 -07:00
Nick Winter
ead9cf11df Add Estonian locale stub 2015-10-28 06:25:42 -07:00
evvanderplas
2af15f7667 Update nl-NL.coffee: typos, grammar
First obvious typos fixed
2015-10-27 19:12:46 +01:00
Matt Lott
48786372d8 🐛Prevent parallel managed sub unsubscribes
Our unsubscribe API does not support this.  Removing option from
subscription UI.

Fixes #2976
2015-10-26 13:45:38 -07:00
janjoos
db7add6bc5 Smart update
2 codes
2015-10-26 11:54:40 +01:00
Imperadeiro98
09422910f7 Updated i18n 2015-10-23 16:49:05 +01:00
Imperadeiro98
9b06d53856 Fixed previous merge 2015-10-20 18:25:07 +01:00
snarkota
343f6c378c Update lt.coffee
More translation strings
2015-10-20 19:35:45 +03:00
AkaKaras
e1e8dc33d2 zh-hans typos 2015-10-18 21:17:13 -04:00
AkaKaras
11baf3fd61 megre 2015-10-18 21:08:51 -04:00
AkaKaras
1d6d6011d8 zh-HANS and zh-HANT translation
both i18n are done, also had fix some typos
2015-10-18 21:05:40 -04:00
Nick Winter
d5288a254b Remove Ace of Coders tournament blurb from home page 2015-10-16 14:55:58 -07:00
RUSLAN LÓPEZ CARRO
bf8da65060 Update es-419.coffee 2015-10-15 12:48:53 -05:00
Imperadeiro98
63d7df538c Fixed previous merge 2015-10-15 15:21:10 +01:00
Derevianko Liubov
58ba08ddb7 changed and added some ru and uk locales 2015-10-15 17:10:12 +03:00
RUSLAN LÓPEZ CARRO
8e9b46b73c Update es-419.coffee 2015-10-13 18:08:44 -05:00
Imperadeiro98
9184566d67 Update pt-PT and standardize new tip 2015-10-13 21:07:21 +01:00
Nick Winter
8209c4a0c7 Propagate i18n 2015-10-13 12:32:51 -07:00
Nick Winter
2336668b09 Actually commit my ru.coffee merge 2015-10-13 12:32:14 -07:00
Nick Winter
537ede7740 Merge pull request #3108 from Imperadeiro98/i18n-and-cleanups
Added i18n to some strings
2015-10-13 12:27:58 -07:00
Nick Winter
28530f44e6 Merge ru.coffee and uk.coffee 2015-10-13 12:26:28 -07:00
Nick Winter
ac750456b7 Merge ru.coffee and uk.coffee 2015-10-13 12:25:23 -07:00
Nick Winter
0c7169f5c0 Merge pull request #3088 from javatlacati/patch-1
Update level_loading.jade
2015-10-13 12:21:19 -07:00
Imperadeiro98
20371fa146 Indentation re-fix 2015-10-13 16:14:43 +01:00
Imperadeiro98
2b8856aead Fixed indentation 2015-10-13 16:08:20 +01:00
Imperadeiro98
fbfb80d4bf Added i18n to some strings 2015-10-13 16:05:47 +01:00
Imperadeiro98
c969768800 Merge pull request #3104 from tufik000/patch-2
Link to Ace of Coders
2015-10-13 14:58:22 +01:00
Matt Lott
708f78153b Route /hoc to courses
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
2015-10-12 16:25:23 -07:00
Imperadeiro98
56c4c5a1b3 Merge pull request #3105 from AkaKaras/translation
Translation
2015-10-12 22:37:35 +01:00
AkaKaras
1a3ab303be zh-hant latest translation
finally finished the translation, proud of myself (●—●)  b
2015-10-12 16:54:14 -04:00
tufik000
00170d6821 Link to Ace of Coders
Changed "torneir" to "torneio" and  "Era dos Programadores" to "Ás dos Programadores"
2015-10-11 23:02:20 -03:00
Derevianko Liubov
9312d8ad84 added some ru and uk locales 2015-10-11 23:13:07 +03:00
Derevianko Liubov
82c23183c8 added some ru and uk locales 2015-10-11 23:11:20 +03:00
Imperadeiro98
cac0739084 Merge pull request #3101 from HelloSeaNation/patch-2
Fix another typo
2015-10-11 20:01:57 +01:00
AkaKaras
3325b91b5a Merge remote-tracking branch 'codecombat/master' into translation
Conflicts:
	app/locale/zh-HANT.coffee
2015-10-11 09:15:45 -04:00
AkaKaras
f6217a5626 zh-hant
translation
2015-10-11 09:15:28 -04:00
HelloSeaNation
e75413fbe2 Fix another typo 2015-10-11 00:56:37 +13:00
HelloSeaNation
727dce6f2c Fix typo 2015-10-11 00:54:59 +13:00
Tery Lim
0b9e78e2b8 Some zh-HANS translations
- Translate `prepaid`
- Change `codecombat` => `CodeCombat`
2015-10-10 22:38:21 +13:00
Tery Lim
124b61a70c Update harry's tips
`Yer a Wizard,`
2015-10-10 21:42:02 +13:00
Imperadeiro98
a74a09a532 Added change to a string 2015-10-09 16:37:19 +01:00
Imperadeiro98
50961e2c68 Update pt-PT.coffee 2015-10-09 16:31:19 +01:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
dcab1eecc0 Update en.coffee 2015-10-09 09:39:15 -05:00
Nick Winter
0d6f84cab6 Merginate uk.coffee 2015-10-09 06:08:36 -07:00
Imperadeiro98
442f9d2265 Merge pull request #3092 from kumabotz/patch-2
Translate careers
2015-10-09 12:32:54 +01:00
Imperadeiro98
20cd6643c8 Merge pull request #3091 from kumabotz/patch-1
Update to zh-HANS period ( 。)
2015-10-09 12:32:18 +01:00
Derevianko Liubov
cf7952149d add some uk locales 2015-10-09 11:06:09 +03:00
Nick Winter
a34e4b3afd Merge pull request #3084 from Imperadeiro98/clean-up
Cleaned up a couple of files
2015-10-08 16:25:50 -07:00
Tery Lim
fb29cd1950 Translate careers 2015-10-09 12:03:46 +13:00
Tery Lim
4a26afd9b2 Update to zh-HANS period ( 。) 2015-10-09 11:11:51 +13:00
RUSLAN LÓPEZ CARRO
721b2c024e Update es-419.coffee 2015-10-08 16:35:21 -05:00
RUSLAN LÓPEZ CARRO
853d08b71e Update es-419.coffee 2015-10-08 11:44:13 -05:00
Nick Winter
d651380040 Fix merge conflicts in es-419 2015-10-07 13:24:19 -07:00
Jhoon Saravia
beb8a425f0 Translated new sections and updated other translations 2015-10-07 10:54:49 -05:00
Scott Erickson
3a90356f59 Add class invite system 2015-10-05 16:01:32 -07:00
Imperadeiro98
7949e4fbab Cleaned up a couple of files
Removed some unused strings, an unnecessary style and an event
2015-10-05 22:30:02 +01:00
tieskedh
6a34e5b813 Update nl-NL.coffee 2015-10-04 15:45:31 +02:00
Imperadeiro98
403cfe2f53 Fixed previous merge 2015-10-03 19:58:12 +01:00
Imperadeiro98
43476ed87f Merge pull request #3082 from etem/master
Updated Bulgarian translation
2015-10-03 19:55:59 +01:00
Etem Hyusnev
42056fafdf Translated action_cooldown 2015-10-03 17:05:05 +03:00
Etem Hyusnev
07a0fbf109 Updated Bulgarian translation 2015-10-03 17:01:22 +03:00
Imperadeiro98
a61655f6b8 Uncommented an header 2015-10-02 20:43:30 +01:00
tieskedh
122c9c2d4f added some dutch translations 2015-10-02 18:57:53 +02:00
Imperadeiro98
f3e791bcbd Update pt-PT.coffee 2015-09-30 20:24:28 +01:00
Imperadeiro98
0a658aa1c0 Merge pull request #3079 from javatlacati/patch-2
Update es-419.coffee
2015-09-30 19:41:11 +01:00
Imperadeiro98
3960c0911f Uncommented an header 2015-09-30 19:40:57 +01:00
RUSLAN LÓPEZ CARRO
2b9dbeafbf Update es-419.coffee 2015-09-30 12:02:30 -05:00
RUSLAN LÓPEZ CARRO
c466c80bf5 Update es-ES.coffee
A translation for Thang has been proposed.
2015-09-30 11:39:20 -05:00
Imperadeiro98
4f5f2c72c7 Uncommented some headers from nl-NL.coffee 2015-09-30 14:59:31 +01:00
Imperadeiro98
5c68bd6a10 Merge pull request #3076 from tieskedh/patch-1
Update nl-NL.coffee
2015-09-30 14:54:32 +01:00
RUSLAN LÓPEZ CARRO
0bb6b0d0dc Update es-419.coffee
Finished translation?!!! :D
2015-09-29 18:06:45 -05:00
tieskedh
dfdc601af8 Update nl-NL.coffee
added new translations
2015-09-30 00:58:59 +02:00
Imperadeiro98
42f6e5d151 Merge pull request #3075 from javatlacati/patch-3
Update fr.coffee
2015-09-29 20:13:36 +01:00
Imperadeiro98
b6753293a5 Uncommented an header from it.coffee 2015-09-29 20:12:22 +01:00
Imperadeiro98
71632554db Merge pull request #3074 from javatlacati/patch-2
Update it.coffee
2015-09-29 20:11:26 +01:00
RUSLAN LÓPEZ CARRO
93106d2f0c Update fr.coffee
Je ne parle pas fraçaise mais...
2015-09-29 13:44:22 -05:00
RUSLAN LÓPEZ CARRO
1ee7989b67 Update it.coffee 2015-09-29 12:40:12 -05:00
RUSLAN LÓPEZ CARRO
f74758ae31 Update es-419.coffee
NOTE: review in spanish classes are grupos and lessons are clases. ( false cognate )
Nota: revisar; en inglés las classes significan grupos y las clases significan lessons ( es un cognado falso )
BTW... streamlined means that the groups have a chat and screen streamming with the professor?
2015-09-29 11:01:06 -05:00
RUSLAN LÓPEZ CARRO
5c1c40a83b Update es-419.coffee
ooops forgot to send yesterday :$
2015-09-29 09:35:34 -05:00
Dmitry Suprun
75bc889f5a update courses section 2015-09-28 22:57:40 +03:00
Imperadeiro98
04a385c555 Uncommented two headers 2015-09-28 19:57:11 +01:00
RUSLAN LÓPEZ CARRO
2c2dd88505 es-419 Updated some courses translation
title: "Título" #person title?
2015-09-28 13:24:33 -05:00
Imperadeiro98
bae9e85ac2 Update pt-PT.coffee 2015-09-28 13:28:37 +01:00
Nick Winter
88d11afb1d Propagate i18n 2015-09-27 19:57:57 -07:00
Nick Winter
26d9d20c26 Fix merge conflicts in es-ES.coffee 2015-09-27 19:56:41 -07:00
Nick Winter
4582a4499f Merge pull request #3059 from Imperadeiro98/master
Added i18n to courses
2015-09-27 19:52:52 -07:00
Imperadeiro98
350deee4f8 Uncommented an header from tr.coffee 2015-09-27 19:21:37 +01:00
Imperadeiro98
8ea5de0a88 Merge pull request #3061 from ecemm/patch-1
Update tr.coffee
2015-09-27 19:20:12 +01:00
Imperadeiro98
63e13a0222 Merge pull request #3067 from ilo/patch-2
Changes for the Clan section
2015-09-27 19:18:03 +01:00
duhow
d94eed98d4 Update es-ES.coffee
Added some new translates and changes.
2015-09-27 19:22:01 +02:00
Iñaki López
871a12e4ba Changes for the Clan section
Translated clan section page strings, and fixed a typo.
2015-09-27 23:09:25 +10:00
Iñaki López
040d075cac Update es-ES.coffee
Some visible strings on the UI to a free account.
2015-09-27 20:56:55 +10:00
ecemm
3a07c6a257 Update tr.coffee 2015-09-26 00:32:57 +03:00
RUSLAN LÓPEZ CARRO
4060a1b029 Update es-419.coffee 2015-09-25 16:32:15 -05:00
Imperadeiro98
446b193f8c Added i18n to courses 2015-09-25 20:51:51 +01:00
Imperadeiro98
17a24bbcba Merge pull request #3057 from christotsvetanov/master
Bulgarian translation
2015-09-25 19:51:39 +01:00
Matt Lott
928f72e2cf Merge branch 'prepaid-v2' into master 2015-09-25 10:28:27 -07:00
jpss256
ab97c1d5d4 Bulgarian translation 2015-09-25 19:19:34 +03:00
Imperadeiro98
4cd872091e Uncommented an header 2015-09-23 20:00:38 +01:00
rohmunhoz
0e149e84e1 Translate and correct
Translate some strings and correted the translation of some other ones
2015-09-23 15:49:56 -03:00
Imperadeiro98
0492d455b0 Merge pull request #3041 from tuomastanner/patch-1
A few tip translations
2015-09-23 14:08:27 +01:00
Imperadeiro98
1a08730ae7 Uncommented an header 2015-09-23 14:05:09 +01:00
Imperadeiro98
4efd1eeb1a Merge pull request #3048 from mads232/patch-1
Update da.coffee
2015-09-23 14:04:04 +01:00
Nick Winter
3dd36ebe6e Fixed merge conflicts. 2015-09-22 13:13:12 -07:00
mads232
ca629e383f Update da.coffee 2015-09-22 17:16:45 +02:00
Imperadeiro98
8cee4d8baf Update pt-PT.coffee 2015-09-21 21:30:59 +01:00
Imperadeiro98
7b183e3ae5 Removed some old 'changed' from en.coffee 2015-09-21 21:03:55 +01:00
Nick Winter
3ac8a32be8 Propagate i18n 2015-09-21 12:41:16 -07:00
Nick Winter
c2c3ae4c4c Add /careers and Ace of Coders links to home page 2015-09-21 12:40:33 -07:00
Imperadeiro98
83f6f8f5d4 Uncommented headers from last merge 2015-09-21 16:36:06 +01:00
Imperadeiro98
d0ba986ba4 Merge pull request #3037 from Mephisto07/patch-1
Labels translated to portuguese
2015-09-21 16:33:52 +01:00
Imperadeiro98
30c54639a0 Merge pull request #3043 from giaba90/patch-1
Update it.coffee
2015-09-19 22:23:36 +01:00
Imperadeiro98
6863e77c42 Merge pull request #3040 from AkaKaras/translation
update the tournament translation
2015-09-19 22:20:16 +01:00
giaba90
03da5d06f4 Update it.coffee
i have translated some string
2015-09-19 12:01:11 +02:00
Tuomas Tanner
c5ac99f4c9 A few tip translations 2015-09-18 17:16:47 +03:00
AkaKaras
c667ecef7b eh just find some typos 2015-09-17 21:25:41 -04:00
AkaKaras
cd4230002b add the new translations
add the tournament translation
2015-09-17 21:22:47 -04:00
AkaKaras
f2e1da53ac Update zh-HANT.coffee 2015-09-17 21:20:07 -04:00
AkaKaras
b271fd60ee new zh-hans translation
add the the tournament translation
2015-09-17 21:18:41 -04:00
Nicolas Segeti
03af6bee8e Labels translated to portuguese
I added some translated texts to the project.
2015-09-17 15:32:58 -03:00
Imperadeiro98
6506b95bad Merge pull request #3033 from kerradus/ru-translation
RU translation
2015-09-16 19:50:22 +01:00
Imperadeiro98
8d4af16e2d Fixed indentation 2015-09-16 19:43:15 +01:00
Imperadeiro98
979d9d35fc Merge pull request #3036 from javatlacati/patch-2
Update es-419.coffee
2015-09-16 19:41:47 +01:00
RUSLAN LÓPEZ CARRO
e8b137398f Update es-419.coffee
Some word mispell and auto-translated fixing.
2015-09-16 13:31:50 -05:00
RUSLAN LÓPEZ CARRO
810cbb954e Update es-ES.coffee 2015-09-16 13:11:40 -05:00
Dmitry Suprun
222878454a add ru translation 2015-09-16 19:27:48 +03:00
Nicholas Winter
5151ab9091 Describe Ace of Coders tournament 2015-09-15 16:36:50 -07:00
Ikuyadeu
d791736420 Update ja.coffee 2015-09-15 15:46:29 +09:00
Imperadeiro98
3268440b9d Fixed last merge 2015-09-14 12:23:46 +01:00
Liubov Derevianko
f5642f3f08 add ru and uk locales 2015-09-14 11:01:02 +03:00
Imperadeiro98
ee612daaa6 Merge pull request #3025 from javatlacati/patch-1
Update es-419.coffee
2015-09-13 21:14:16 +01:00
RUSLAN LÓPEZ CARRO
3ce32837ce Update es-419.coffee
Finished! :D
2015-09-13 12:46:39 -05:00
Ikuyadeu
14f9ac4d71 Update ja.coffee 2015-09-13 17:11:39 +09:00
Imperadeiro98
bdc1dea168 Merge pull request #3019 from javatlacati/patch-1
Update es-419.coffee
2015-09-12 21:07:59 +01:00
RUSLAN LÓPEZ CARRO
ecd7c24014 Update es-419.coffee
Changed to formal language for teachers survey.
$120 dollars? D: OMG perhaps a little expensive for third worlders like me.
Is it finally done? :D
2015-09-12 13:56:13 -05:00
AkaKaras
c04e347543 add new translation
same reason as zh-HANS
2015-09-11 18:25:09 -04:00
AkaKaras
672bfa1417 added new translation
added new translation that i found from en
2015-09-11 18:23:16 -04:00
Imperadeiro98
31587b9aa7 Uncommented some translations 2015-09-11 19:51:02 +01:00
albenarammou
7be5dd0d14 Update bg.coffee 2015-09-11 19:31:47 +03:00
RUSLAN LÓPEZ CARRO
45cd6f5411 Update es-419.coffee
Addeded spanish slang for Thang.
Amigos hispanohablantes, favor de opinar. ( A los mexicanos seguros nos encantará )
2015-09-10 19:15:13 -05:00