Commit graph

2129 commits

Author SHA1 Message Date
Nick Winter
34a92838a5 Propagated i18n. 2015-02-23 16:01:06 -08:00
Nick Winter
88c55fa7fd Fix for making ja start game text break lines in the right places. #2386 2015-02-23 15:57:43 -08:00
Coderaulic
21ddb9ca59 Update ja.coffee
Some minor fixes added based on last changes.
Can you tell me how to add a line break?
Is it " text \ text " for:
text
text
as output? Or "ABC '\' DEF" for:
ABC
DEF
Not familiar with line breaks in coffee script.
2015-02-23 12:24:00 -08:00
Imperadeiro98
6afad49d8f Some fixes to last merge 2015-02-23 20:21:10 +00:00
Imperadeiro98
c375a8ed12 Merge pull request #2384 from etem/master
Update bg.coffee
2015-02-23 20:16:08 +00:00
Imperadeiro98
aad40bbe33 Merge pull request #2383 from musicogeek/patch-1
Update es-419.coffee
2015-02-23 20:12:01 +00:00
Imperadeiro98
7ea804458c Merge pull request #2382 from ITz7/patch-3
Update zh-HANT.coffee
2015-02-23 19:59:01 +00:00
Imperadeiro98
0d0dc5597d Merge pull request #2380 from ITz7/patch-2
Update zh-HANS.coffee
2015-02-23 19:57:54 +00:00
Imperadeiro98
9acea40089 Uncommented an header for last commit 2015-02-23 19:52:22 +00:00
Imperadeiro98
f392ffcb71 Merge pull request #2362 from leotada/patch-1
Translation PT-BR
2015-02-23 19:51:21 +00:00
Etem Hyusnev
7d7b77e753 Updated translation 2015-02-23 20:15:01 +02:00
Etem Hyusnev
3baf791e77 Updated translation 2015-02-23 19:00:09 +02:00
Etem Hyusnev
68b46778ad Updated translation 2015-02-23 18:01:32 +02:00
Orlando Hernández
887936fd79 Update es-419.coffee 2015-02-23 11:29:19 -04:30
ITz7
56feac3f5f Update zh-HANS.coffee 2015-02-23 23:47:37 +08:00
ITz7
2c301df0ba Update zh-HANS.coffee 2015-02-23 22:36:58 +08:00
ITz7
8c64a69012 Update zh-HANT.coffee 2015-02-23 21:39:14 +08:00
ITz7
faa5b43902 Update zh-HANS.coffee 2015-02-23 19:58:38 +08:00
Etem Hyusnev
9280444f57 Updated translation 2015-02-23 09:11:23 +02:00
Etem Hyusnev
ce074921b4 Updated translation 2015-02-22 22:29:04 +02:00
Imperadeiro98
2e25beccd4 Uncommented some translations from last merge 2015-02-22 16:10:20 +00:00
Etem Hyusnev
3179546430 Updated Bulgarian translation 2015-02-22 17:43:44 +02:00
Coderaulic
8915f0a98e Update ja.coffee
Various translations added and some minor fixes.
2015-02-21 23:49:48 -08:00
Shady Kamal
f32572e94c Update he.coffee
+Another update for "he.coffe" file
2015-02-20 20:38:30 +02:00
Leonardo
de7f216d22 translation
translation.
2015-02-20 15:35:37 -02:00
enricpc
e113c7accb Update ca.coffee 2015-02-20 08:51:29 +01:00
laituan245
d325623699 Added ability to delete account 2015-02-20 08:19:30 +09:00
sohalya
a3ce088657 Update fr.coffee
Some translations and french grammar corrections.
2015-02-19 17:21:46 +01:00
Shady
928748ff5f Update he.coffee
a minor update for he.coffee
2015-02-19 14:16:23 +02:00
Imperadeiro98
227a8edffa Merge pull request #2350 from vampirelower/patch-2
Update uk.coffee
2015-02-18 20:45:49 +00:00
Shady
a7bff7a011 Update he.coffee - 2
second update done
2015-02-18 22:16:12 +02:00
Edward Litvinchyck
ff4487d79f Update uk.coffee 2015-02-18 21:10:33 +02:00
Imperadeiro98
0a332073e9 Merge pull request #2347 from divyanshu013/patch-1
Update hi.coffee
2015-02-18 17:35:37 +00:00
Imperadeiro98
35284a3d18 Uncommented some translations from last commit 2015-02-18 17:35:15 +00:00
Imperadeiro98
8b0a9a5c68 Merge pull request #2346 from ChaosCat/patch-2
Update he.coffee
2015-02-18 17:32:12 +00:00
Imperadeiro98
639da031fc Uncommented an header for last commit 2015-02-18 17:31:15 +00:00
Divyanshu Maithani
e55d3251bc Update hi.coffee 2015-02-18 21:26:36 +05:30
ChaosCat
0b1b28ff8e Update he.coffee
some updates to he.coffee
2015-02-18 17:33:19 +02:00
Volkan Gezer
375a61fcc6 Update tr.coffee 2015-02-18 16:13:35 +01:00
Imperadeiro98
055922a967 Some fixes to last merge 2015-02-18 12:06:38 +00:00
Imperadeiro98
30f451985d Merge pull request #2340 from ChaosCat/patch-1
Fixed errors and added more translations to he.coffee
2015-02-18 12:05:24 +00:00
Nick Winter
dc703c40b0 Merge pull request #2336 from divyanshu013/master
Added some Hindi localizations for hi.coffee
2015-02-17 15:26:41 -08:00
Imperadeiro98
ef8f3cff1a Couple fixes to pt-PT 2015-02-17 22:33:14 +00:00
ChaosCat
589ab03438 תיקון שגיאות והוספת מידע
חלק מהתרגומום שונו לנוסח רשמי\ברור יותר
נא לתקן במידת הצורך
2015-02-17 23:37:20 +02:00
Imperadeiro98
697e5a0ab3 Uncommented an header for last commit 2015-02-17 20:09:47 +00:00
Imperadeiro98
59aa6e257a Merge pull request #2337 from laituan245/master
Update ko.coffee
2015-02-17 20:09:12 +00:00
Nick Winter
ae07a25657 Fixed #2329: ordered spoken languages first by popularity (for top 8), then by alphabetical. 2015-02-17 09:29:21 -08:00
Tuan Manh Lai
e09d6fd709 Update ko.coffee 2015-02-17 22:07:13 +09:00
Tuan Manh Lai
b1e280ccd3 Update ko.coffee 2015-02-17 21:44:41 +09:00
Tuan Manh Lai
f99239c11a Update ko.coffee 2015-02-17 15:36:51 +09:00
divyanshu013
82b3221e0d Added some Hindi localizations 2015-02-17 11:28:38 +05:30
Louis Clergue
7f128f6773 Update ca.coffee 2015-02-17 00:26:58 +01:00
Imperadeiro98
158560f42d Merge pull request #2331 from vampirelower/patch-1
Update uk.coffee
2015-02-16 23:20:02 +00:00
Imperadeiro98
3f9169a18f Uncommented an header 2015-02-16 23:18:23 +00:00
ptsoumaki
ef5363c1cb Update el.coffee 2015-02-17 00:21:38 +02:00
Edward Litvinchyck
8ffe11fd05 Update uk.coffee 2015-02-17 00:10:58 +02:00
Nick Winter
de11743df9 Merge pull request #2326 from laituan245/master
Add type (warrior/ranger/wizard)  to hero selector modal (Issue #2307)
2015-02-16 10:29:26 -08:00
laituan245
dfaa29c596 Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307) 2015-02-17 00:50:01 +09:00
ZeAntwan
1d332f2afe FR Translations and corrections
Categories Translated :
- contact
- classes

Corrections :
(Note aux français) : Il faut différencier les "Subscribe" des "Sign Up". Subscribe équivaut à l'abonnement payant !
- legal > page-title

ATTENTION :
- (417) parent_button : The translation is out of box, text size need to be reduced to around 21px to fit.
2015-02-16 14:15:17 +01:00
Imperadeiro98
b29bb787d8 Merge pull request #2320 from laituan245/laituan245-patch-1
Update vi.coffee
2015-02-16 11:48:58 +00:00
Imperadeiro98
6ff6d11323 Merge pull request #2322 from ZeAntwan/patch-1
Update fr.coffee
2015-02-16 11:46:28 +00:00
ZeAntwan
91313a0015 Update fr.coffee
Translated following strings : 
share_progress_modal 
(309) tip_reticulating
(326) tip_superpower
(329) tip_code_never_lies
(335) : tip_move_forward
(337) : tip_adding_evil (Traduction approximative de "evil" vers "mechanceté")
subscribe (lots of things)

Correction 427 (ecriVant pas ecriSant)
2015-02-16 03:47:57 +01:00
Tuan Manh Lai
6377484db5 Update vi.coffee 2015-02-16 01:38:58 +09:00
Tuan Manh Lai
f01b0d1b9a Update vi.coffee 2015-02-15 05:41:06 +09:00
Tuan Manh Lai
5421c4ec46 Update vi.coffee 2015-02-15 05:35:57 +09:00
Tuan Manh Lai
377d8a768d Update vi.coffee 2015-02-15 05:21:31 +09:00
Barney
dd40a07fc0 Update zh-HANT.coffee 2015-02-14 21:22:02 +08:00
Barney
00242f5767 Merge remote-tracking branch 'upstream/master' 2015-02-14 16:03:22 +08:00
Imperadeiro98
8b978c0047 Removed unused string 2015-02-13 20:39:03 +00:00
Barney
140ba5f9e0 Update zh-HANT.coffee 2015-02-14 03:57:09 +08:00
Barney
dde3546564 Update zh-HANT.coffee 2015-02-14 03:53:44 +08:00
Barney
e6008f2a5c Merge remote-tracking branch 'upstream/master' 2015-02-14 02:46:11 +08:00
Nick Winter
574f0b1442 Fixed #2303. Sorry, TBL. 2015-02-13 09:29:18 -08:00
Nick Winter
a9fddb8eb2 Propagated i18n. 2015-02-13 09:13:24 -08:00
Nick Winter
4fec64c3ca Merge pull request #2313 from laituan245/master
Added a "god mode" button to the local dev environment  (issue #2164)
2015-02-13 09:08:09 -08:00
laituan245
9c754bbd96 Added a "god mode" button to the local dev environment #2164 2015-02-14 01:46:04 +09:00
Barney
ae2d52d31a Merge remote-tracking branch 'upstream/master' 2015-02-13 23:50:25 +08:00
Barney
6f88af50f9 Update zh-HANT.coffee 2015-02-13 23:50:12 +08:00
Gutierri Barboza
74babe01ea more translations pt-br 2015-02-13 13:22:48 -02:00
Imperadeiro98
c54cd428ad Removed unused strings 2015-02-13 14:54:04 +00:00
Imperadeiro98
2785d3fa2b Fixed indentation issue in last merge 2015-02-13 14:40:36 +00:00
Imperadeiro98
6bd56e040c Merge pull request #2310 from jimmysvk/patch-3
Around hundred new lines of Slovak translation
2015-02-13 14:38:08 +00:00
jimmysvk
6574a4b978 Around hundred new lines of Slovak translation
Completed translations of home, nav, diplomat_suggestion, play, common, general, almost whole play_level, buy_gems, skill_docs, versions
2015-02-13 10:19:13 +01:00
Barney
6917ebc110 Update zh-HANT.coffee 2015-02-13 13:02:47 +08:00
Barney
295ecf53c2 Merge remote-tracking branch 'upstream/master' 2015-02-13 12:34:37 +08:00
Imperadeiro98
1f20402bb0 Update pt-PT.coffee 2015-02-12 18:31:01 +00:00
Barney
df0a588870 Update zh-HANT.coffee 2015-02-13 02:21:52 +08:00
Imperadeiro98
42a4ca9299 Uncommented some headers 2015-02-12 17:25:31 +00:00
jimmysvk
03800e4360 Update of SVK translation
Translated achievments, user, article, save_load, inventory, game_menu, some of play_level, some of general, rest of login, rest of nav
2015-02-12 18:17:03 +01:00
Imperadeiro98
cf5aa3bc25 Uncommented some headers 2015-02-12 17:02:13 +00:00
jimmysvk
892ea201eb Some lines of SVK translation updated
Just for the begining. Looking forward to complete translation ; )
2015-02-12 16:54:06 +01:00
Imperadeiro98
3188ba15b8 Merge pull request #2297 from laituan245/laituan245-patch-1
Update vi.coffee
2015-02-12 14:22:00 +00:00
Imperadeiro98
838363fd63 Uncommented an header 2015-02-12 14:20:13 +00:00
Tuan Manh Lai
cf9da099a5 Update vi.coffee 2015-02-12 17:17:19 +07:00
Tuan Manh Lai
f0ca5d1a5b Update vi.coffee 2015-02-12 17:05:41 +07:00
Melondonut
4f3ae1b73d Update ko.coffee 2015-02-12 16:26:24 +09:00
Barney
b63bbf870b Update zh-HANT.coffee 2015-02-12 13:15:22 +08:00
Erik Mogensen (@mogsie)
102bb50870 i18n/nb: wording, punctuation. 2015-02-11 23:02:59 +01:00
Erik Mogensen (@mogsie)
71ff84538e i18n/nb: capitalization, wording. 2015-02-11 22:17:33 +01:00
Tuan Manh Lai
01f5ff9d1a Update vi.coffee 2015-02-12 05:49:09 +09:00
Erik Mogensen (@mogsie)
8029ce22f0 i18n/nb: Teacher page grammar, typos, wording. 2015-02-11 21:15:30 +01:00
Erik Mogensen (@mogsie)
5dc4d52c27 Merge remote-tracking branch 'upstream/master' 2015-02-11 20:54:31 +01:00
Erik Mogensen (@mogsie)
762eaca9dc i18n: nb, grammar 2015-02-11 20:53:22 +01:00
nixel2007
f06ed33129 Update ru.coffee. fix comma 2015-02-11 22:45:56 +03:00
nixel2007
a54a9d6016 Update ru.coffee
Translated new blocks and small fixes with You/you
2015-02-11 22:42:46 +03:00
Imperadeiro98
9ead6600b0 Enabling translations 2015-02-11 18:58:17 +00:00
Tuan Manh Lai
5e793cbbe5 Update vi.coffee 2015-02-12 01:49:08 +07:00
Tuan Manh Lai
3c67cba78e Update vi.coffee 2015-02-12 01:46:03 +07:00
Imperadeiro98
10e0cf50ed Enabled some translations 2015-02-11 17:02:36 +00:00
Imperadeiro98
9f6bf3a8d2 Merge pull request #2288 from laituan245/master
Update vi.coffee
2015-02-11 17:01:21 +00:00
Barney
0341f50ad8 Update zh-HANT.coffee 2015-02-11 20:51:19 +08:00
Tuan Manh Lai
bacf86201a Update ko.coffee 2015-02-11 17:11:18 +09:00
Tuan Manh Lai
405f5921c4 Update vi.coffee
Translated some words and sentences into Vietnamese
2015-02-11 16:50:48 +09:00
Barney
bc369b94a4 Update zh-HANT.coffee 2015-02-11 15:20:40 +08:00
Barney
d1bd7b3803 Update zh-HANT.coffee 2015-02-11 14:00:02 +08:00
Melondonut
f1859a7341 Update ko.coffee 2015-02-11 13:41:20 +09:00
Melondonut
217590b930 Update ko.coffee 2015-02-11 12:16:17 +09:00
Melondonut
381c2af331 Update ko.coffee 2015-02-11 12:06:48 +09:00
Imperadeiro98
c35b925cb1 Update pt-PT.coffee 2015-02-10 22:32:52 +00:00
Nick Winter
76f03790fd Propagated i18n. 2015-02-10 14:14:14 -08:00
Nick Winter
413edb3b4c Deleted no.coffee in favor of nb.coffee and nn.coffee as discussed in #2284. 2015-02-10 14:13:15 -08:00
Erik Mogensen (@mogsie)
36d5f132cc Norwegian translation: Some typos and punctuation. 2015-02-10 22:44:12 +01:00
Erik Mogensen (@mogsie)
ab8346c6b2 Better tanslation from @matifol. 2015-02-10 22:31:02 +01:00
Erik Mogensen (@mogsie)
427aea9457 Fix speling. 2015-02-10 22:29:14 +01:00
Popey456963
da64bea348 Revert "Remove Hour of Code References from teachers.jade"
This reverts commit b30c0d059a.
2015-02-10 21:14:34 +00:00
Popey456963
b30c0d059a Remove Hour of Code References from teachers.jade 2015-02-10 21:13:06 +00:00
Nick Winter
b03d6fb3d4 Merged nb.coffee. 2015-02-10 12:54:25 -08:00
Nick Winter
a610bac948 Merge pull request #2261 from mogsie/master
More norwegian translations.
2015-02-10 12:50:18 -08:00
Erik Mogensen (@mogsie)
62baa53ec0 Fix missing " 2015-02-10 21:45:17 +01:00
Nick Winter
00c8c9016c Merge pull request #2277 from AnirudhGP/patch-3
Added some quotes for #710
2015-02-10 12:43:57 -08:00
Martin Folkeseth
1fb2771d24 Edited nb.coffee 2015-02-10 21:39:04 +01:00
Imperadeiro98
c37398b2c1 Small fix to last merge 2015-02-10 19:57:34 +00:00
Nick Winter
db2b0c29fe Merginated. 2015-02-10 11:54:57 -08:00
Barney
201ef800bc Merge remote-tracking branch 'upstream/master' 2015-02-11 03:38:47 +08:00
Barney
31c5ce30cd Update zh-HANT.coffee 2015-02-11 03:38:43 +08:00
Imperadeiro98
92b8e2354e Small fix to last merge 2015-02-10 19:27:27 +00:00
Imperadeiro98
94cfe2011c Merge pull request #2282 from matifol/patch-1
Translated share_progress_modal
2015-02-10 19:25:56 +00:00
Imperadeiro98
d8eea3923f Small fix to last commit 2015-02-10 19:09:11 +00:00
Imperadeiro98
92b80b591d Merge pull request #2283 from ArthurLu/master
Update zh-HANT.coffee
2015-02-10 19:07:26 +00:00
Barney
2e4c261ada Update zh-HANT.coffee 2015-02-11 02:27:54 +08:00
Martin Folkeseth
28f6c5dc38 Translated share_progress_modal
Kept all the old strings for future reference.
2015-02-10 19:06:51 +01:00
Barney
2546082eaf Update zh-HANT.coffee 2015-02-11 01:02:37 +08:00
Anirudh GP
b422508f2d Added some quotes for #710 2015-02-10 14:41:04 +05:30
Barney
6b8e9ad808 Update zh-HANT.coffee 2015-02-10 14:04:43 +08:00
Barney
60ff41ccf4 Merge remote-tracking branch 'upstream/master' 2015-02-10 13:12:11 +08:00
Barney
16708aacc8 Update zh-HANT.coffee 2015-02-10 13:12:09 +08:00
FedericoTomas
fa5134d09b Actualizando(Update)
Actualice un poco.
2015-02-10 01:18:25 -03:00
Jhoon Saravia
f2534e2098 Translating leaderboard section and some tips 2015-02-09 18:22:52 -05:00
Jhoon Saravia
c9c8c3e755 Translating share_progress_modal 2015-02-09 18:08:59 -05:00
Martin005
44fb8281bf Update cs.coffee
Finally done all translations :)
2015-02-09 23:22:04 +01:00
Imperadeiro98
92531e366b Update en.coffee 2015-02-09 20:01:51 +00:00
Imperadeiro98
bebada7f43 Update pt-PT.coffee 2015-02-09 19:50:18 +00:00
Imperadeiro98
8fb8e139b7 Small indentation fix 2015-02-09 19:47:09 +00:00
Nick Winter
19a9d8c9aa Propagated i18n. 2015-02-09 11:31:42 -08:00
Nick Winter
16a8478f97 Merginated. 2015-02-09 11:30:52 -08:00
Nick Winter
61896083a9 Missed my save on that last one. 2015-02-09 08:39:40 -08:00
Nick Winter
1c41c1df91 Merged more tips in en.coffee. 2015-02-09 08:38:29 -08:00
Nick Winter
65c0abd3ab Merged those tips in en.coffee. 2015-02-09 08:35:38 -08:00
Imperadeiro98
983d8c761a Merge pull request #2262 from ArthurLu/master
Update zh-HANT.coffee
2015-02-08 19:55:00 +00:00
TJ Ledwith
a7b7d61c08 Update en.coffee 2015-02-08 14:06:25 -05:00
Barney
245de23aff Update zh-HANT.coffee 2015-02-08 21:21:32 +08:00
Barney
5f0adfae0c Update zh-HANT.coffee 2015-02-08 20:56:23 +08:00
Barney
c88ccd7d8f Update zh-HANT.coffee 2015-02-08 20:41:20 +08:00
Erik Mogensen (@mogsie)
00f4e1e894 lint complained 2015-02-08 12:47:49 +01:00
Erik Mogensen (@mogsie)
eab4174f78 More norwegian translations. 2015-02-08 12:38:17 +01:00
tutosfaciles48
6ccba1b1a9 Update fr.coffee
changement d'une phrase encore en anglais.
2015-02-07 22:23:09 +01:00
Imperadeiro98
8b721a7c47 Better indentation 2015-02-07 10:47:31 +00:00
Matt Lott
972c3d0d6f Share progress modal
Shown after forgetful-gemsmith
2015-02-06 14:49:50 -08:00
Imperadeiro98
d2f0f3d1fc Update pt-PT.coffee 2015-02-06 20:49:51 +00:00
Nick Winter
0f7b7c7a9c Propagated i18n. Fixed #2253. 2015-02-06 12:08:31 -08:00
Imperadeiro98
b30de2bfa8 Small fix to last commit 2015-02-06 20:04:44 +00:00
JulR43
ef2f610ba2 Update fr.coffee
Translations
2015-02-06 19:06:10 +01:00
Imperadeiro98
b3d432d3ae Some fixes to last commit 2015-02-06 15:19:05 +00:00
newmilktea
5e0c266094 Update zh-HANT.coffee 2015-02-06 22:14:15 +08:00
newmilktea
5e4a1ba4c8 Update zh-HANT.coffee 2015-02-06 22:08:26 +08:00
newmilktea
cf5b14e2c5 Update zh-HANT.coffee 2015-02-06 21:13:06 +08:00
newmilktea
6f4897da4d Update zh-HANT.coffee 2015-02-06 21:08:39 +08:00
newmilktea
1752f12b32 Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/locale/zh-HANT.coffee
2015-02-06 20:52:02 +08:00
newmilktea
cee95397fa Update zh-HANT.coffee 2015-02-06 20:49:09 +08:00
Nick Winter
1d8f91c42f Added campaign world selector portal screen for half of players. 2015-02-05 15:05:33 -08:00
Martin005
d7592018a8 Update cs.coffee
Translated almost all new strings. Just want to save it and then will finish by translating rest of "teachers" strings.
2015-02-05 21:35:55 +01:00
Imperadeiro98
b92a029a04 Removed unused strings 2015-02-05 18:48:22 +00:00
JulR43
1ca3a8d7e1 Update de-DE.coffee
A few translations
2015-02-05 16:16:55 +00:00
Imperadeiro98
7433e7a5ca Update pt-PT.coffee 2015-02-05 14:57:21 +00:00
Imperadeiro98
230d2ce727 Merge pull request #2243 from JulR43/patch-1
Update fr.coffee
2015-02-05 14:44:49 +00:00
Imperadeiro98
f9e730ac30 Some fixes to last merge 2015-02-05 14:44:09 +00:00
Imperadeiro98
3ae135ac70 Merge pull request #2242 from Pammer/patch-2
Update ru.coffee
2015-02-05 14:42:50 +00:00
Imperadeiro98
c92caf8fc9 Small fix for last merge 2015-02-05 14:38:55 +00:00
Imperadeiro98
8c849aad18 Merge pull request #2241 from emmanuel-z/patch-2
Update es-419.coffee
2015-02-05 14:37:46 +00:00
Imperadeiro98
461ffecd4f Merge pull request #2240 from emmanuel-z/patch-1
Update es-419.coffee
2015-02-05 14:36:21 +00:00
JulR43
e4553ac5a3 Update fr.coffee
Correction
2015-02-05 08:33:26 +00:00
JulR43
5e1d8f9623 Update fr.coffee
Some translations
2015-02-05 08:31:49 +00:00
Pammer
dc4f1c0142 Update ru.coffee
"scores" + new part of  "subcribe" + "parent_email"
2015-02-05 12:43:05 +09:00
Nick Winter
df68c3c108 Propagated i18n. 2015-02-04 16:19:13 -08:00
Emmanuel Zarzosa
fed29c6890 Update es-419.coffee 2015-02-04 21:18:13 -03:00
Imperadeiro98
3bfc7e1a9c Small fix 2015-02-04 23:09:23 +00:00
Emmanuel Zarzosa
51c4ba5d0f Update es-419.coffee 2015-02-04 20:04:38 -03:00
Matt Lott
c842f45786 Update subscribe modal with parent help button 2015-02-04 13:54:38 -08:00
Imperadeiro98
77778c7829 Merge pull request #2231 from Pammer/patch-1
Update ru.coffee
2015-02-04 18:00:18 +00:00
Imperadeiro98
df1018ab53 Uncommented header 2015-02-04 17:58:59 +00:00
newmilktea
94499f670c Update zh-HANT.coffee 2015-02-04 22:53:33 +08:00
newmilktea
fd56a0c218 Update zh-HANT.coffee 2015-02-04 22:34:05 +08:00
Nick Winter
5542bd8a89 Upgraded level info popover; made it a click instead of a hover; added view scores button to it when level has been completed. 2015-02-03 18:25:38 -08:00
Nick Winter
d341e59b54 Merge branch 'master' of git://github.com/ArthurLu/codecombat into ArthurLu-master 2015-02-03 12:29:16 -08:00
Bård Eik-Hvidsten
5159ff56f7 Update nb.coffee 2015-02-03 20:25:05 +01:00
Imperadeiro98
2448be11b3 Small fix 2015-02-03 18:25:13 +00:00
Imperadeiro98
036ae7d7f7 Revert "Update zh-HANT.coffee" 2015-02-03 18:16:32 +00:00
Imperadeiro98
51f55bb376 Merge pull request #2230 from Coderaulic/patch-1
Update ja.coffee
2015-02-03 18:03:47 +00:00
Pammer
bd5ddab9e9 Update ru.coffee 2015-02-04 01:18:49 +09:00
newmilktea
275fb219a3 Update zh-HANT.coffee 2015-02-03 23:54:13 +08:00
newmilktea
89d4ca6039 Update zh-HANT.coffee 2015-02-03 23:26:17 +08:00
Pammer
641e8d7abf Update ru.coffee 2015-02-03 14:37:58 +09:00
Coderaulic
d8cdb6960c Update ja.coffee
Updated misc translations.
2015-02-02 20:13:58 -08:00
Arthur
d47a04208a Update zh-HANT.coffee
Finish the rest of general
2015-02-03 11:50:55 +08:00
Arthur
752e71f74c Update zh-HANT.coffee
update the part of general
2015-02-03 11:36:21 +08:00
Imperadeiro98
837ad8b5a4 Update pt-PT.coffee 2015-02-02 20:20:41 +00:00
Nick Winter
b3db9962bd Propagated i18n. 2015-02-02 11:51:15 -08:00
Imperadeiro98
cd61969475 Small fixes for last PR 2015-02-02 19:48:42 +00:00
Imperadeiro98
3d5ae45565 Merge pull request #2201 from Coderaulic/patch-1
Update ja.coffee
2015-02-02 19:44:55 +00:00
Nick Winter
c8a5712d43 Merge pull request #2197 from purenickery/patch-3
Update en.coffee
2015-02-02 09:24:32 -08:00
Coderaulic
92e779259a Update ja.coffee
Fixed miscellaneous translations from previous.
Updated all of -
game_menu:
inventory:
buy_gems:
choose_hero:
general:
I left in the original English as comments for long translations should there be a need to revisit, unless single words.

Lines 179, 186, 155, 396 all seem to cause 'compiler error'. They begin with key words so not sure how to fix those...maybe senior coder can take a look and fix?
2015-02-01 21:38:38 -08:00
Imperadeiro98
6551395278 A little fix 2015-02-01 19:19:22 +00:00
Imperadeiro98
734a401974 Merge pull request #2199 from nixel2007/master
Update ru.coffee
2015-02-01 19:18:20 +00:00
Imperadeiro98
afe188104b Fixed a typo 2015-02-01 19:16:51 +00:00
nixel2007
f70f1e2896 ru.coffee - teachers block 2015-02-01 21:58:23 +03:00
nixel2007
25190a5dfd Update ru.coffee
Leaderboard block + unlock_help_vidoes
2015-02-01 17:16:12 +03:00
purenickery
b47bbe5704 Update en.coffee 2015-01-31 17:01:57 -07:00
JKniager
99c5d0f604 Added Tips
Added english translations for the tips added to the loading tips.
2015-01-31 16:26:48 -07:00
Imperadeiro98
1b42dceb4f Last merge fix 2015-01-31 22:02:26 +00:00
Coderaulic
bf54331f21 Update ja.coffee
Updated translation in:
nav:
play:
login:
signup:
recover:
items:
units: Note that in Japanese, measurements of time don't have individual or singular form: As in "a year" and "years" is still the same.
play_level:
2015-01-31 13:47:40 -08:00
Ivan Milanov
15939cbc17 Added a few translations 2015-01-31 21:19:23 +01:00
Imperadeiro98
b8214e8b3c Last merge fixes 2015-01-31 19:02:24 +00:00
Jacob
cf76143e60 Update nl-NL.coffee
Worked upwards from the bottom until the section "about". Edited some longer sentences reasonably carefully. Made use of the word email more consistent, by changing most to email. Wiki says the official spelling is e-mail, so perhaps we should revert this, but I think consistency is most important. I suppose we should work together with our Belgian partners, but I have only looked at the NL version. Again, feel free to contact me. I will browse some more in the Dutch version to see if everything looks ok.
2015-01-31 17:28:27 +01:00
Imperadeiro98
06860f4338 Added teachers strings 2015-01-31 14:06:32 +00:00
Imperadeiro98
d99e790df1 Fixed last merge issue 2015-01-31 11:04:11 +00:00
Imperadeiro98
3db3b0790c Merge pull request #2177 from negesti/patch-2
Update de-DE.coffee
2015-01-31 11:03:48 +00:00
Nick Winter
022d31c19a Basic leaderboards are working. 2015-01-30 21:36:48 -08:00
Nick Winter
4efbe0a12f Leaderboard skeletons. 2015-01-30 21:36:47 -08:00
Matt Lott
58f8eb6688 Add support for premium video tutorials 2015-01-30 10:48:49 -08:00
negesti
1eeeb25315 Update de-DE.coffee 2015-01-30 19:32:50 +01:00
Imperadeiro98
ad05ddc221 Fixed merge issues 2015-01-30 15:33:53 +00:00
Imperadeiro98
32dc5fdc34 Merge pull request #2176 from jacobakkerboom/patch-1
Update nl-NL.coffee,
2015-01-30 15:30:32 +00:00
Imperadeiro98
cd7f09e626 Merge pull request #2172 from JulR43/patch-1
Update fr.coffee
2015-01-30 15:29:23 +00:00
Jacob
6e08e5406e Update nl-NL.coffee,
Submitted reasonably many translations. Did not look how the translations looked on my own server, but I did recognise most texts for which I provided a translation (so that for most options I had a good idea what their purpose was). This is my first edit, so I am not well aware of any unwritten rules about translating. 

I tried to be reasonable in using comments. For some things like the translation of subscriber (abonnee), running (uitvoeren o.i.d.) and equipment (uitrusting) some discussion might be nice, in order to have consistency. I have however refrained from using very long comments. I am actually not even aware of what the default action is when no translation is present, which I assume is simply to use the English version. I suppose the main purpose of the Dutch translation is to help children, so this is what I mainly had in mind. Feel free to contact me about subjects like this. I will try to learn more by inspecting previous edits.
2015-01-30 12:42:27 +01:00
Nick Winter
57d12c199e Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet. 2015-01-29 09:07:25 -08:00
JulR43
0c1897bbb3 Update fr.coffee
Several translates
2015-01-29 16:56:37 +00:00
Nick Winter
aab6d17047 Added campaign completion progress indicator. 2015-01-29 08:26:12 -08:00
Imperadeiro98
239b72dd01 Merge pull request #2169 from scenix007/patch-1
add some translation for tips
2015-01-29 16:17:34 +00:00
Jhoon Saravia
8325d522fb Finished translations on tips 2015-01-29 08:57:29 -05:00
Long Shao
14af5c309d add some translation for tips
Update zh-HANS.coffee : add some translation for tips
2015-01-29 18:13:10 +08:00
nixel2007
1ff5832436 fix ru.coffee 2015-01-28 22:07:19 +03:00
nixel2007
d086555fb7 Update ru.coffee 2015-01-28 21:50:16 +03:00
Imperadeiro98
354a7cb71b Merge pull request #2160 from rsiwady29/spanish_translations
Update es-419.coffee
2015-01-28 18:18:35 +00:00
Imperadeiro98
8cf424f7ef Update pt-PT.coffee 2015-01-28 18:16:34 +00:00
Richard Siwady
8d001a6281 Update spanish translations for es-419 2015-01-28 00:12:40 -06:00
Richard Siwady
7cb6791a58 Fixed lua_blurb es-419 translation. 2015-01-27 23:16:08 -06:00
Nick Winter
5f8ec2b21b Propagated i18n. 2015-01-27 20:36:40 -08:00
divyanshu013
cfdbabb576 Added some quotes for #710 2015-01-27 21:53:37 +05:30
Nick Winter
2e09a94736 Asking for feedback when cancelling subscriptions. 2015-01-26 16:48:32 -08:00
Imperadeiro98
19c03952e1 Merge pull request #2129 from chess9876543210/patch-1
Propagated i18n.
2015-01-25 18:34:44 +00:00
jmigual
5e58986e75 Added some translations 2015-01-23 22:12:18 +01:00
Imperadeiro98
0d00917ca0 Fixed order 2015-01-22 19:28:17 +00:00
nixel2007
6b5c69f889 ru.coffee - small fix 2015-01-22 22:16:37 +03:00
nixel2007
44c97428e3 Update ru.coffee 2015-01-22 22:14:56 +03:00
Imperadeiro98
bb0a820638 Update pt-PT.coffee 2015-01-22 19:04:41 +00:00
Nick Winter
9e496fa9d0 Propagated i18n. 2015-01-22 10:45:51 -08:00
Nick Winter
9b1923d943 Merge pull request #2119 from AdnanZahid/patch-2
Added 6 new tips for the loading screen
2015-01-22 10:44:32 -08:00
Nick Winter
ccf4f0180e Resolved ca.coffee merge conflicts. 2015-01-22 10:42:04 -08:00
Imperadeiro98
76906a15fc Uncommented an header 2015-01-22 16:28:27 +00:00
Imperadeiro98
4a45b5290e Merge pull request #2132 from z3t1/patch-1
Translation of several pharses
2015-01-22 16:27:31 +00:00
z3t1
1e5ef588d8 Translation of several pharses 2015-01-21 20:56:13 -05:00
Maks Lyashuk
82bc526bd7 Update Ukrainian l18n
Translated some new lines
2015-01-22 00:17:03 +02:00
chess
a118a7cf75 i18 update
old non abonement text replaced with new version
2015-01-21 21:28:53 +01:00
Imperadeiro98
25f01db701 Merge pull request #2116 from McGiogen/patch-1
Added some simple translations all over the file
2015-01-20 20:40:17 +00:00
tboutefara
1a8f6b5819 Update ar.coffee
First translation session
2015-01-20 00:04:04 +01:00
Imperadeiro98
e00e699e6f Update pt-PT.coffee 2015-01-19 20:50:08 +00:00
Imperadeiro98
7e7945fc04 Activated some translations 2015-01-19 20:30:05 +00:00
Marielle Bannink
41239494e5 Update nl-NL.coffee
Added some translations to the file
2015-01-19 20:33:51 +01:00
Adnan Zahid
f46160fff9 Added 6 new tips for the loading screen (Also written in level_loading.jade)
Added the following tips:

1) play_level.tip_control_destiny
2) play_level.tip_no_code
3) play_level.tip_code_never_lies
4) play_level.tip_reusable_software
5) play_level.tip_optimization_operator
6) play_level.tip_lines_of_code
2015-01-20 00:12:21 +05:00
McGio
6473c7e94a Added some simple translations all over the file 2015-01-18 16:56:35 +01:00
nixel2007
19802cd0c5 Update ru.coffee 2015-01-18 00:44:31 +03:00
Imperadeiro98
c12d10a06b Fixed some issues 2015-01-17 18:54:34 +00:00
Shuyu Zhang
1bc4846c5e Update zh-HANS.coffee 2015-01-17 10:14:45 -08:00
Imperadeiro98
165582a55c Some fixes 2015-01-17 10:19:31 +00:00
Shuyu Zhang
13ad53ee04 Update zh-HANS.coffee 2015-01-17 00:06:04 -08:00
Shuyu Zhang
1039afc85b Update zh-HANS.coffee 2015-01-16 15:03:04 -08:00
Shuyu Zhang
e46c6828b9 Update zh-HANS.coffee 2015-01-16 14:34:24 -08:00
Imperadeiro98
91515ef5a1 Update pt-PT.coffee 2015-01-16 20:58:17 +00:00
Nick Winter
3051dc32fa Propagated i18n. 2015-01-16 12:53:14 -08:00
Imperadeiro98
feae3694f7 Update en.coffee 2015-01-16 20:52:55 +00:00
Imperadeiro98
5981399a43 Update en.coffee 2015-01-16 20:37:32 +00:00
Imperadeiro98
5edc8543e5 Update en.coffee 2015-01-15 20:01:11 +00:00
Imperadeiro98
f403c9d3e6 Update en.coffee 2015-01-15 18:36:16 +00:00
Imperadeiro98
1ab2ea6910 Update pt-PT.coffee 2015-01-15 18:00:00 +00:00
Nick Winter
a329de6d90 Propagated i18n. 2015-01-15 09:37:08 -08:00
Imperadeiro98
e6234b0771 Update en.coffee 2015-01-15 17:34:49 +00:00
Imperadeiro98
12be17ebd6 Update pt-PT.coffee 2015-01-15 17:11:37 +00:00
Nick Winter
e50b6f508c Propagated i18n. 2015-01-15 09:08:13 -08:00
Imperadeiro98
b0d00ce213 Added generate terrain stuff 2015-01-15 17:07:11 +00:00
enricpc
9dc45bdf45 Update ca.coffee 2015-01-15 09:44:27 +01:00
Imperadeiro98
6b46e45526 Merge pull request #2097 from enricpc/patch-4
Update ca.coffee
2015-01-14 17:14:59 +00:00
enricpc
6bb3a77dad Update ca.coffee 2015-01-14 15:46:28 +01:00
RubenDjOn
ddec7b7f5a Added new es-ES translations 2015-01-14 00:53:05 +01:00
Imperadeiro98
7f645ce019 Update pt-PT.coffee 2015-01-13 21:18:22 +00:00
Nick Winter
268f5a5b0d Propagated i18n. 2015-01-13 13:10:39 -08:00
Scott Erickson
22e1318970 Added a rudimentary (aka programmer-designed) hero-type filter for the item store. 2015-01-12 15:30:18 -08:00
RubenDjOn
a8542d8f7f New es.ES translations 2015-01-10 22:32:50 +01:00
Imperadeiro98
b5103aaa49 Merge pull request #2075 from 182mick44/patch-1
File revision.
2015-01-10 11:19:43 +00:00
Ivan Milanov
d8c5ecbbf8 Added new translations 2015-01-09 22:35:00 +01:00
Miguel
f46df1de34 File revision.
There were many errors, attending grammar and ortography. Now everything is more or less correct.
2015-01-09 20:57:19 +01:00
Imperadeiro98
83efcb5113 Some spacing corrections 2015-01-09 15:00:38 +00:00
Imperadeiro98
3ec86b3e14 Merge pull request #2070 from steveshining/master
I hope this commit could be helpful
2015-01-09 14:59:49 +00:00
Imperadeiro98
2563c5b896 Merge pull request #2074 from nixel2007/master
Update ru.coffee
2015-01-09 14:58:29 +00:00
nixel2007
f65c464eb1 small fix 2015-01-09 05:40:11 +03:00
nixel2007
5b089c29d5 Update ru.coffee 2015-01-09 05:37:16 +03:00
RubenDjOn
6dd39dd99b Added es-ES translations 2015-01-09 01:19:28 +01:00
Nick Winter
fbcbfc7368 Merged nl-BE.coffee. 2015-01-08 08:04:15 -08:00
izumi
6a6102fd75 I hope this commit could be helpful
Your guys realy do a great job!
2015-01-08 17:09:33 +08:00
Imperadeiro98
a0a8b2a961 Merge pull request #2064 from Kindleme/patch-2
Update zh-HANS.coffee
2015-01-07 17:14:04 +00:00
Kindleme
ac46e65ec9 Update zh-HANS.coffee 2015-01-07 18:24:50 +08:00
RubenDjOn
ac4925b2da Added es-ES translations. 2015-01-07 01:08:53 +01:00
Imperadeiro98
c0c0ecace7 Update en.coffee 2015-01-06 21:22:13 +00:00
Imperadeiro98
54f8adb1cc Update pt-PT.coffee 2015-01-06 16:58:19 +00:00
Nick Winter
ab82bd972b Propagated i18n. 2015-01-06 08:01:42 -08:00
nixel2007
364e6c8617 Update ru.coffee
Sync to en.
2015-01-06 18:37:29 +03:00
Nick Winter
ac525c53b5 Merge pull request #2056 from Imperadeiro98/patch-1
Trying to i18n
2015-01-05 17:39:46 -08:00
RubenDjOn
0bb220de81 Added es-ES translations 2015-01-05 22:55:07 +01:00
Imperadeiro98
45b553fbcb Update en.coffee 2015-01-05 20:24:49 +00:00
Imperadeiro98
0df9de551c Fixed last commit issues 2015-01-05 19:51:07 +00:00
Imperadeiro98
b7a7bb2c23 Merge pull request #2054 from Apoc-/patch-2
Update de-DE.coffee
2015-01-05 19:48:02 +00:00
Imperadeiro98
4a351e99e6 Uncommented translation 2015-01-05 19:34:56 +00:00
Imperadeiro98
e639a62085 Fixed errors from last commit 2015-01-05 19:26:23 +00:00
Imperadeiro98
97cce946eb Merge pull request #2053 from divaDseidnA/patch-7
Update hu.coffee
2015-01-05 19:25:13 +00:00
Imperadeiro98
0d8834da95 Merge pull request #2047 from Kindleme/patch-1
Update zh-HANS.coffee
2015-01-05 19:22:34 +00:00
Imperadeiro98
a3c624b061 Uncommented translation 2015-01-05 19:19:45 +00:00
Imperadeiro98
d01738755c Merge pull request #2051 from SuperPranx/patch-1
Additions and modifications
2015-01-05 19:19:01 +00:00
Imperadeiro98
7c6115ba9b Merge pull request #2050 from RubenDjOn/master
Added one translation to Spanish (es-ES). Testing github pull request.
2015-01-05 19:15:12 +00:00
Imperadeiro98
f0ffb2d576 Uncommented header 2015-01-05 19:13:15 +00:00
StijnBerendse
dc6995059e Update nl-NL.coffee 2015-01-05 18:33:06 +01:00
Apoc-
25b689f678 Update de-DE.coffee
Finished translation, added some remarks to words / phrases who cannot be translated directly
Fixed some translation errors
2015-01-05 14:22:00 +01:00
David Nagy
13f3f5d3af Update hu.coffee 2015-01-05 12:51:57 +00:00
Ivan Milanov
d75c45baa0 Minor correction 2015-01-05 01:49:42 +01:00
Ivan Milanov
b90d08a64d Additions and modifications
Added new translations and made minor modifications to existing ones where the translation didn't make sense in the context required.
2015-01-05 01:45:36 +01:00
RubenDjOn
a88f991a72 Added one translation to Spanish (es-ES). Testing github pull request. 2015-01-04 23:19:43 +01:00
Omar S.
e117c56f10 Update es-419.coffee
Almost everything is done :D
2015-01-04 11:37:21 -05:00
Imperadeiro98
41deb10a0f Uncommented translations 2015-01-04 16:17:29 +00:00
Kindleme
734b91583b Update zh-HANS.coffee 2015-01-04 22:51:43 +08:00
StijnBerendse
587dfe4c5f Update nl-NL.coffee
Translated the rest of the Home, Login, Signup, and Recover portions.
2015-01-04 14:59:35 +01:00
Omar S.
c68cad1556 Update es-419.coffee 2015-01-02 15:49:10 -05:00
Ivan Milanov
e7b80b0a01 Added new translations and corrected existing ones 2015-01-02 16:03:17 +01:00