Commit graph

2886 commits

Author SHA1 Message Date
Ihsara
895d8f378d Update vi.coffee
contributors update
2016-02-11 13:36:56 +02:00
Ihsara
489a3ccb64 Update vi.coffee
monor changes
2016-02-11 12:21:00 +02:00
Tran Anh Khoa
27a48616f7 Update vi.coffee 2016-02-10 17:58:12 -06:00
Tran Anh Khoa
8c86e8be24 Merge pull request #5 from khoa102/Ihsara-patch-1.0viTrans
Update vi.coffee
2016-02-10 16:53:10 -06:00
Ihsara
5079413059 Merge pull request #4 from khoa102/khoa102-patch-1-viTranslation
Update vi.coffee
2016-02-11 00:02:05 +02:00
Ihsara
506b6996c0 Update vi.coffee
minor
2016-02-10 23:58:38 +02:00
Tran Anh Khoa
f50371e14d Update vi.coffee
Change a few tip into Vietnamese
2016-02-10 15:41:32 -06:00
Tran Anh Khoa
7ed371520f Merge pull request #3 from khoa102/Ihsara-patch-1.0viTrans
Ihsara patch 1.0vi trans
2016-02-10 15:21:47 -06:00
Ihsara
35a9bb96a7 Update vi.coffee 2016-02-10 23:11:42 +02:00
Tran Anh Khoa
60796ca83f Update vi.coffee 2016-02-10 13:30:27 -06:00
Ihsara
f54619607a Update vi.coffee 2016-02-10 21:25:35 +02:00
Tran Anh Khoa
5d0235828b Update vi.coffee 2016-02-10 11:04:05 -06:00
Tran Anh Khoa
e2abbc317a Update vi.coffee 2016-02-10 10:53:44 -06:00
sungame
9cbb5ad924 Update sv.coffee
Translated some english to swedish
2016-02-06 17:06:27 +01:00
Nick Winter
378ddccce7 Change loop concept to be specifically while loops 2016-02-05 18:11:27 -08:00
Imperadeiro98
bc8476bff7 Merge pull request #3384 from chinesedfan/trans_zhs
Update zh-HANS.coffee
2016-02-05 16:22:36 +00:00
chinesedfan
eff2f68f43 Update zh-HANS.coffee 2016-02-05 15:52:50 +08:00
jamesvdh
3eca097675 Update nl-BE.coffee
Finished the translation. Some words or phrases might be slightly off due to the lack of context info. But in general it should be ok.
2016-02-03 17:53:40 +01:00
Yuki Ueda
2006feb9b3 Update ja.coffee 2016-02-03 17:12:41 +09:00
Thijs de Haan
3a05c9ed6f Update nl-NL.coffee 2016-02-01 22:07:48 +01:00
Scott Erickson
5fffb2eefb Remove TeachersFreeTrialView 2016-02-01 10:40:22 -08:00
Imperadeiro98
5a1d1e93dd Fix build 2016-01-30 10:21:36 +00:00
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