Commit graph

1561 commits

Author SHA1 Message Date
Imperadeiro98
4ca342c389 Fixed spacing 2014-12-19 20:46:34 +00:00
Imperadeiro98
560a3aaf44 Merge pull request #1940 from uaMithril/patch-1
Update uk.coffee
2014-12-19 20:45:19 +00:00
David Nagy
0c88f9f39c Update hu.coffee 2014-12-19 20:18:08 +00:00
Nick Winter
d801ed61ce Separating contact emails into premium subscriber support and basic general support. 2014-12-18 20:35:14 -08:00
Matt Lott
9d4c3cc163 A/B Test video tutorial styles 2014-12-17 23:55:11 -08:00
Imperadeiro98
d1e4a98981 Merge pull request #1947 from Martin005/patch-4
Update cs.coffee
2014-12-17 15:42:48 +00:00
Martin005
821f31f02e Update cs.coffee 2014-12-17 12:19:17 +01:00
Fernando H. Crozetta
a248828493 Update pt-BR.coffee 2014-12-17 08:56:31 -02:00
Imperadeiro98
31953660f4 Fixed some commented translations 2014-12-16 20:16:42 +00:00
Martin005
50058147ed Update cs.coffee
Adding some translations again, hopefully will do them all.
2014-12-16 21:05:50 +01:00
Nick Winter
17db7c111c Merged zh-HANS.coffee again. 2014-12-16 10:49:01 -08:00
Nick Winter
79b3d8d1a2 Merged zh-HANS.coffee. 2014-12-16 10:47:48 -08:00
nixel2007
fcc5fb7537 Update ru.coffee
problem_alert_help
2014-12-16 15:28:02 +03:00
Eric Shen
ec00b74c92 Update zh-HANS.coffee - account profile & employer 2014-12-16 15:57:23 +08:00
Matt Lott
f1d7fb5fbd Add help button to problem alert 2014-12-15 15:11:27 -08:00
Mithril
6554800fbd Update uk.coffee
Added some translations
2014-12-16 00:38:55 +02:00
Rubiconline
52853a31b5 Update fr.coffee
Only minor corrections
2014-12-14 21:06:06 +01:00
Igzok
d6642d83d2 Update fr.coffee 2014-12-14 18:48:42 +00:00
Rubiconline
37476e7849 Update fr.coffee 2014-12-14 19:30:44 +01:00
nixel2007
6d480820f3 Update ru.coffee 2014-12-13 17:45:24 +03:00
Nick Winter
dec11d77f5 Uncommented some zh-HANT section headers. 2014-12-13 06:32:59 -08:00
Nick Winter
62ad7a3d10 Merge pull request #1927 from Imperadeiro98/master
Update pt-PT.coffee
2014-12-13 06:30:52 -08:00
jibaigao
77202c9bd7 Update zh-HANT.coffee 2014-12-13 13:13:35 +01:00
Imperadeiro98
2c6756675d Update pt-PT.coffee 2014-12-13 08:58:45 +00:00
Nick Winter
4d347e0d5f Propagated i18n. 2014-12-12 16:13:18 -08:00
Nick Winter
719ca503fb Merge pull request #1925 from jibaigao/patch-1
Update zh-HANT.coffee
2014-12-12 16:12:09 -08:00
Nick Winter
25b91f900d Merge pull request #1926 from Imperadeiro98/master
Internationalized more stuff
2014-12-12 16:11:03 -08:00
Scott Erickson
b0de331a10 Shored up stripe transaction payment defences to try and fix #1906. 2014-12-12 15:27:58 -08:00
Imperadeiro98
a6653501e5 Update en.coffee 2014-12-12 22:35:22 +00:00
jibaigao
023f150b5a Update zh-HANT.coffee 2014-12-12 23:16:30 +01:00
Nick Winter
71ad9248ca Merge pull request #1923 from Imperadeiro98/master
Update pt-PT.coffee
2014-12-12 10:01:31 -08:00
Imperadeiro98
93e8691291 Update pt-PT.coffee 2014-12-12 16:55:08 +00:00
nixel2007
050de32163 Update ru.coffee 2014-12-12 19:51:49 +03:00
Nick Winter
f04bb3d030 Propagated i18n. 2014-12-12 08:40:57 -08:00
Imperadeiro98
091f80daff Update en.coffee 2014-12-12 16:33:16 +00:00
Nick Winter
5d030a96ac Fixed some indentation typos in es-419.coffee. 2014-12-12 06:59:44 -08:00
Nick Winter
d90fb60eb2 Merge pull request #1910 from FedericoTomas/patch-5
Updated..
2014-12-12 06:58:01 -08:00
Nick Winter
ea22264d68 Fixed some indentation typos in de-CH.coffee. 2014-12-12 06:57:13 -08:00
Nick Winter
31ded35a97 Merge pull request #1899 from LetsPlentendo/patch-1
Some more translations made...
2014-12-12 06:55:42 -08:00
Rubiconline
7736ce3f98 Update fr.coffee 2014-12-11 23:26:49 +01:00
FedericoTomas
ae0917511e Updated..
I check it all on Microsoft World, the archive had a lot of wrong translations... i corrected a lot.
Pd: Someone use google translate to edit the archive, and google translate sucks...(at least long sentences)
2014-12-11 19:09:45 -03:00
Nick Winter
2d7ac81221 Merge pull request #1907 from nykkole/patch-2
Update de-DE.coffee
2014-12-11 12:17:51 -08:00
Nick Winter
34bb14935a Merge pull request #1908 from fcrozetta/patch-2
Update pt-BR.coffee
2014-12-11 12:17:21 -08:00
jibaigao
759a0675ad Update zh-HANT.coffee 2014-12-11 21:12:50 +01:00
Fernando H. Crozetta
9c4c320542 Update pt-BR.coffee
More text translated to PT-BR
2014-12-11 17:55:10 -02:00
nykkole
6096a4eef3 Update de-DE.coffee
Translated some sentences.
2014-12-11 11:45:49 -08:00
Imperadeiro98
2a7d9eb934 Update pt-PT.coffee 2014-12-11 15:29:02 +00:00
Nick Winter
1ef58bcfce Propagated i18n. 2014-12-11 07:02:08 -08:00
Nick Winter
0bed8dc460 Merged es-419.coffee. 2014-12-11 06:49:26 -08:00
Nick Winter
d6d9888811 Merged ru.coffee. 2014-12-11 06:41:49 -08:00
Nick Winter
52400c8f18 Merged de-DE.coffee. 2014-12-11 06:37:01 -08:00
Nick Winter
0e5de952e3 Activated a few translations for #1896. 2014-12-11 06:34:54 -08:00
Nick Winter
629fe6188e Merge pull request #1896 from AtaZh/patch-1
Update uk.locale
2014-12-11 06:31:31 -08:00
Nick Winter
01f31f5007 Merge pull request #1894 from Rubiconline/patch-3
Update fr.coffee
2014-12-11 06:30:10 -08:00
Nick Winter
21870a0ce3 Added some indentation for #1903. 2014-12-11 06:29:33 -08:00
Nick Winter
d129f29d05 Merge pull request #1903 from FedericoTomas/patch-3
Update es-419.coffee
2014-12-11 06:27:34 -08:00
Nick Winter
4cfff26b39 Uncommented some hu.coffee section headers for #1891. 2014-12-11 06:25:44 -08:00
Nick Winter
e7bcc61f76 Merge pull request #1891 from divaDseidnA/patch-5
Update hu.coffee
2014-12-11 06:23:54 -08:00
Nick Winter
9f909f28cf Merged de-DE.coffee 2014-12-11 06:22:47 -08:00
Nick Winter
46b2906151 Merge pull request #1887 from nixel2007/master
ru_RU.coffee. account_profile, ladder_prizes, employers, admin, misc
2014-12-11 06:16:22 -08:00
Nick Winter
bfbcdd4be6 Merge pull request #1886 from Imperadeiro98/patch-1
Update pt-PT.coffee
2014-12-11 06:15:44 -08:00
Nick Winter
7b9f4bcbc4 Merged pt-BR.coffee. 2014-12-11 06:15:07 -08:00
Nick Winter
f73bf73344 Merged zh-HANS.coffee. 2014-12-11 06:09:23 -08:00
jmigual
4554514532 Added some translations
Added some translations and fixed spelling errors.
2014-12-11 12:59:08 +01:00
nixel2007
ae1aca8917 update ru.coffee. Line-sync to en, more translation 2014-12-11 13:55:01 +03:00
FedericoTomas
7aae2096de Update es-419.coffee 2014-12-10 19:22:52 -03:00
Scott Erickson
02953d0e6c Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page. 2014-12-10 13:42:12 -08:00
Nick Winter
d51db43823 Added desert campaign. 2014-12-10 10:00:52 -08:00
LetsPlentendo
9fe8e80fba Some more translations made... 2014-12-10 14:12:35 +01:00
kisik21
da843f2d57 Fixed ru.coffee
fixed error: coffeescript_error at line 627
2014-12-10 16:05:04 +03:00
kisik21
6a13c9b0f8 Update ru.coffee
Перевел еще немного. Можете кидаться в меня тапками, но большинство переведенного находится в разделе найма работников. Большая часть остального уже переведена. Вот какой должна быть командная работа!
Translated more things. You can kill me, but big part of this update is in recruiting dashboard. Other things are mostly already translated. That's what the team work should be!
2014-12-10 15:55:34 +03:00
nixel2007
72d81630c4 update ru
employers, admin blocks, misc
2014-12-10 13:15:55 +03:00
nykkole
d9a96c3812 Update de-DE.coffee
Translated some sentences
2014-12-09 17:17:57 -08:00
AtaZh
4a5f2f0630 Update uk.locale
Translated several strings, put some commas, capitalized letter 'в' in a polite form 'Ви' (=You), made some other corrections.
Translated but didn't uncomment some unclear phrases for me.
Hope, I didn't delete smth on the go. Would be glad to be helpful.
2014-12-09 22:07:59 +02:00
jonidimo
d9945c03ba Update es-419.coffee
Add some new lines in spanish
2014-12-09 17:02:58 -03:00
Rubiconline
2c92286e46 Update fr.coffee 2014-12-09 20:20:40 +01:00
David Nagy
aec43c086b Update hu.coffee 2014-12-09 14:46:58 +00:00
fcrozetta
0c890e6f6d Some translation (pt-BR) 2014-12-09 11:35:30 -02:00
nykkole
9f97c3feb9 Update de-DE.coffee
Translated some sentences.
For the lines 378, 379, 610-613 it might be helpful for the translations to get a bit of context.
Thank you!
nykkole
2014-12-09 00:05:10 -08:00
Matt Lott
b69bdfd360 A/B Test quick victory save/continue buttons
Fixing typo in hu.coffee
2014-12-08 14:24:33 -08:00
Nick Winter
499666d7b3 Starting to add first three desert levels. 2014-12-08 13:59:13 -08:00
David Nagy
bbd72c568b Update hu.coffee 2014-12-08 21:55:38 +00:00
PaulaThoelen
b2196feb1c Update nl-BE.coffee 2014-12-08 22:30:07 +01:00
nixel2007
9a302fe3d4 ru. account_profile, ladder_prizes 2014-12-09 00:19:26 +03:00
Imperadeiro98
7e02e636e0 Update pt-PT.coffee 2014-12-08 19:56:41 +00:00
Nick Winter
c42385637f Fixed some typos with propagated i18n. 2014-12-08 11:17:55 -08:00
Nick Winter
f3f078f9e8 Propagated i18n. 2014-12-08 11:13:33 -08:00
Nick Winter
b3b3e250a1 Merge pull request #1877 from felipedelta0/patch-1
Update pt-BR.coffee
2014-12-08 11:10:32 -08:00
Nick Winter
5ccd5d6d24 Got rid of some memory leaks in the InventoryModal. Fixed fr subscribe section header. 2014-12-08 11:09:04 -08:00
Rubiconline
26c46d025b Update fr.coffee
Extra translations
2014-12-08 19:51:49 +01:00
Nick Winter
713645e3a9 Uncommented items section header to realize a section of hu translations. 2014-12-08 10:48:59 -08:00
Nick Winter
0c3c6fb181 Merge pull request #1884 from nixel2007/master
Update ru. lines-sync and small fixes.
2014-12-08 10:46:41 -08:00
Nick Winter
52d55449b5 Merge pull request #1883 from carteluo/patch-1
Update es-419.coffee
2014-12-08 10:46:08 -08:00
nixel2007
fac996e1e2 Update ru. lines-sync and small fixes. 2014-12-08 21:39:26 +03:00
nixel2007
73731339be Merge remote-tracking branch 'upstream/master' 2014-12-08 21:13:40 +03:00
nixel2007
c4cd59f9ae ru 2014-12-08 21:12:56 +03:00
carteluo
5ac0c26b57 Update es-419.coffee
In this context "About" is better translated as "Acerca" instead of "Sobre". (Line 31)
2014-12-08 13:30:46 -04:30
David Nagy
ba2fa04080 Update hu.coffee 2014-12-08 15:23:19 +00:00
Nick Winter
d9b116959f Cleaned up a bit of indentation in hu.coffee. 2014-12-08 06:59:52 -08:00
David Nagy
535b97e19f Update hu.coffee 2014-12-08 14:56:17 +00:00
fcrozetta
a5b053c87a Revert "Update pt-BR.coffee"
This reverts commit 869e27965f.
2014-12-08 12:14:23 -02:00
Nick Winter
3cfa837327 Merge pull request #1873 from Imperadeiro98/patch-1
Update payments-view.jade
2014-12-08 05:57:59 -08:00
Nick Winter
32c75e1617 Merge pull request #1872 from ImmortalJoker/patch-3
Update uk.coffee
2014-12-08 05:57:18 -08:00
Nick Winter
43b9975d74 Merge pull request #1870 from Rarst/patch-1
Translated strings in ladder section to Ukrainian
2014-12-08 05:55:57 -08:00
felipedelta0
d7e055e756 Update pt-BR.coffee 2014-12-08 11:54:36 -02:00
Fernando H. Crozetta
869e27965f Update pt-BR.coffee
Alterações para tradução para PT-BR
2014-12-08 09:49:04 -02:00
Imperadeiro98
9655d6992e Update en.coffee 2014-12-08 08:52:14 +00:00
Krasnov Ehor
6860419352 Update uk.coffee 2014-12-08 10:30:40 +02:00
Eric Shen
7ad855b1b5 Update zh-HANS.coffee
"account_profile" Simplified Chinese translation part 1 - 20141208
2014-12-08 16:12:13 +08:00
Matt Lott
8f5e82c54a Update subscribe copy
To be more inline with free track + subscription practice/bonus levels.
2014-12-07 23:53:04 -08:00
Matt Lott
3deef7f5da Turning off signup title and description A/B tests
These have been on a long time.  Using short title and no description.

Data from Mixpanel:
Description on:
no 42.09
yes 41.91
Title length:
short 42.26
long 41.74
2014-12-07 21:32:09 -08:00
Nick Winter
9054f70052 Implemented new victory modal design. 2014-12-07 14:03:11 -08:00
Andrey Savchenko
f767d82af7 Translated strings in ladder section to Ukrainian 2014-12-07 21:41:07 +02:00
Maks Lyashuk
e583964d4d Ukrainian translation update 2014-12-07 19:54:28 +02:00
Nick Winter
7bc38ef513 Merge pull request #1865 from richard-ma/master
add some ZH-HANS translations
2014-12-07 08:08:49 -08:00
Richard Ma
9a4bce337d add some ZH-HANS translations 2014-12-07 23:29:32 +08:00
nykkole
a8bcfd0cf5 Update de-DE.coffee 2014-12-07 03:57:40 -08:00
Nick Winter
d2d21db08b Merge pull request #1862 from dmreinoso/patch-2
Update es-ES.coffee
2014-12-06 18:11:16 -08:00
Nick Winter
fbd0585379 Merge pull request #1861 from Imperadeiro98/master
Removed more wizard i18n stuff
2014-12-06 18:10:15 -08:00
Nick Winter
9bde375dcc Implemented new AuthModal design (sans green button for signup/login). 2014-12-06 17:27:02 -08:00
Diego Reinoso
01b11027d6 Update es-ES.coffee 2014-12-06 17:49:20 -05:00
Imperadeiro98
9813e7584f Removed more wizard i18n stuff
I am not sure about line 278.
2014-12-06 20:41:01 +00:00
Maks Lyashuk
bc4acde60f Update and fix Ukrainian translation 2014-12-06 22:03:29 +02:00
Nick Winter
4348450a88 Removed old wizard_settings i18n keys. Propagated i18n. 2014-12-06 11:07:28 -08:00
Nick Winter
f189eafe0c Activated a few more Czech translations. 2014-12-06 09:51:05 -08:00
Nick Winter
dd0d58dcb5 Merge pull request #1855 from Martin005/patch-1
Update cs.coffee
2014-12-06 09:49:53 -08:00
dmreinoso
30d6db8ca4 Update es-ES.coffee 2014-12-06 10:31:00 -05:00
Nick Winter
061e52e181 Merge pull request #1858 from Imperadeiro98/master
Update pt-PT.coffee
2014-12-06 07:21:08 -08:00
Nick Winter
560a8c7b72 Merge pull request #1856 from Lirai/patch-3
Update de-DE.coffee
2014-12-06 07:20:21 -08:00
Imperadeiro98
1a8bf81258 Update pt-PT.coffee 2014-12-06 12:55:07 +00:00
Anders Bernard
ac9d173201 Update de-DE.coffee 2014-12-06 12:35:44 +01:00
Anders Bernard
dbaffde2a0 Update de-DE.coffee 2014-12-06 12:16:10 +01:00
Martin005
56e243a656 Update cs.coffee 2014-12-06 12:07:23 +01:00
nixel2007
8619f43801 Update ru.
Sync lines to en.coffee a bit
2014-12-06 13:16:58 +03:00
nixel2007
2e6ada0935 Update ru.
Today subscription update and small fixes.
2014-12-06 13:07:25 +03:00
Nick Winter
6344b0c1a3 Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only. 2014-12-05 15:46:15 -08:00
Anders Bernard
3304fedb16 Update de-DE.coffee 2014-12-05 22:16:48 +01:00
Nick Winter
fd88056123 Merge pull request #1849 from Imperadeiro98/master
Update pt-PT.coffee
2014-12-05 12:54:38 -08:00
Imperadeiro98
074c16733b Update pt-PT.coffee 2014-12-05 20:23:06 +00:00
Imperadeiro98
7a89d30bb6 Update pt-PT.coffee 2014-12-05 20:21:13 +00:00
nixel2007
9a2bc14bad merge remote 2014-12-05 20:15:59 +03:00
nixel2007
793fbfcd18 Merge remote-tracking branch 'upstream/master' 2014-12-05 20:08:29 +03:00
Nick Winter
fb4646b1dd Propagated i18n. 2014-12-05 09:08:26 -08:00
nixel2007
171d862fcf ru
community block, skill_docs done, small fixes
2014-12-05 20:07:50 +03:00
Nick Winter
723209642c Merge pull request #1845 from Imperadeiro98/patch-1
Fixed some i18n
2014-12-05 08:56:11 -08:00
Imperadeiro98
f089531aac Update en.coffee 2014-12-05 15:43:54 +00:00
Imperadeiro98
afbc669742 Update en.coffee 2014-12-05 15:41:31 +00:00
Imperadeiro98
203b407b4b Update en.coffee 2014-12-05 15:38:41 +00:00
Imperadeiro98
ecc94b411c Update en.coffee 2014-12-05 15:29:18 +00:00
nixel2007
ef20e26484 ru
subscribe block and strings above.
2014-12-05 18:00:14 +03:00
nixel2007
5703e3eb94 ru
Play block
2014-12-05 17:42:19 +03:00
Lirai
e4120ceadf Update de-DE.coffee
some translations
2014-12-05 10:43:41 +01:00
Nick Winter
b5b38d042a Added i18n for extrapolation tip. 2014-12-04 15:35:31 -08:00
Nick Winter
b253eb9be8 Merged something. 2014-12-04 14:34:35 -08:00
Nick Winter
bae90024b5 Merge pull request #1840 from nixel2007/master
Update ru.coffee
2014-12-04 14:20:14 -08:00
Nick Winter
24c3f6aa3a Merge pull request #1829 from jkohlin/patch-1
Update sv.coffee
2014-12-04 14:09:53 -08:00
Nick Winter
b895db3da2 Merge pull request #1831 from Rubiconline/patch-1
Update fr.coffee
2014-12-04 14:09:28 -08:00
nixel2007
7179236caa Update ru.coffee
G+ commands, skill_docs, about - team blocks, thangs and small fixes.
2014-12-05 01:00:50 +03:00
Lirai
324a749149 Update de-DE.coffee
uncommented...
2014-12-04 20:28:56 +01:00
Lirai
bde08dd24b Update de-DE.coffee
Checked for errors and better translations.
2014-12-04 19:34:28 +01:00
Matt Lott
7537817081 Update subscribe parent copy 2014-12-04 09:57:01 -08:00
Nick Winter
f48468c474 Merge pull request #1834 from ebirkenes/translation
Bunch of norwegian translations
2014-12-04 07:40:10 -08:00
Maks Lyashuk
22fe41fd70 Fix another indent 2014-12-04 14:19:37 +02:00
Maks Lyashuk
8479f94ecb Fix indent 2014-12-04 14:13:46 +02:00
Maks Lyashuk
f12d9b5598 New translation in uk.coffee 2014-12-04 13:14:19 +02:00
Nick Winter
a8ce1bbfb2 Added unsubscribe button and subscription status on payments screen. 2014-12-03 16:11:46 -08:00
Erlend Birkenes
4c4c263bb8 Fixed indentation error 2014-12-03 22:43:45 +01:00
Nick Winter
6e57cbfb66 LevelLoadingView now handling when a subscription is required (although it can't be, yet, since LevelLoader doesn't tell it). 2014-12-03 12:04:12 -08:00
Nick Winter
0ac9b3758b Fixed bug with subscriptions not working. Added subscription status text to the world map. 2014-12-03 11:19:10 -08:00
Erlend Birkenes
861cb64fec More norwegian translations 2014-12-03 20:01:00 +01:00
Matt Lott
898b22723e Update subscribe copy 2014-12-03 11:00:45 -08:00
Nick Winter
f82ccfc4cb The sky darkened. 2014-12-03 10:04:50 -08:00
Nick Winter
65dde043c7 SubscribeModal is in. 2014-12-03 09:14:14 -08:00
Erlend Birkenes
5d4d631ae6 More norwegian translations.
Conflicts:
	app/locale/nb.coffee
2014-12-03 16:36:04 +01:00
Nick Winter
15d7ac876a Starting SubscribeModal. 2014-12-02 20:01:53 -08:00
Rubiconline
e1326f1698 Update fr.coffee 2014-12-02 21:25:58 +01:00
Johan
06dcb8c48b Update sv.coffee 2014-12-02 17:03:33 +01:00
Imperadeiro98
6036d2bd74 Update pt-PT.coffee 2014-12-01 20:45:29 +00:00
Imperadeiro98
1e4d6b3bd5 Update pt-PT.coffee 2014-12-01 20:27:52 +00:00
Björn Kimminich
4d1130a9c6 Update de-DE.coffee 2014-12-01 14:00:36 +01:00
Nick Winter
88849d6dfb Propagated i18n. 2014-11-30 18:13:30 -08:00
Björn Kimminich
5432be27f5 added some german translations 2014-12-01 03:11:28 +01:00
Nick Winter
77a4cea387 Improvements for mobile layouts and mobile and iPad browser detection. 2014-11-30 12:27:34 -08:00
Nick Winter
ad913024c0 Merge pull request #1817 from Imperadeiro98/master
Update pt-PT.coffee
2014-11-29 15:57:59 -08:00
Dmitry
52311bd256 update RU translation 2014-11-30 01:24:19 +03:00
Imperadeiro98
abf75281ca Update pt-PT.coffee 2014-11-29 21:25:46 +00:00
Imperadeiro98
8d9c7cf0be Update pt-PT.coffee 2014-11-29 21:22:06 +00:00
Nick Winter
98199ac72e Propagated i18n. 2014-11-29 10:38:55 -08:00
ewertonorg
4b7fc0322c Update pt-BR.coffee 2014-11-29 11:53:27 -02:00
Scott Erickson
b698745e05 Set up the site to load its logic and templates piecemeal rather than in one giant app.js file. 2014-11-28 16:38:56 -08:00
Erlend Birkenes
6efb03ec40 Translated the Legal page to norwegian. Plus some other stuff and cleaned up a little. 2014-11-28 19:30:41 +01:00
Erlend Birkenes
5f7f1c2b65 Translated the entire contributing page plus some other stuff to norwegian. 2014-11-27 20:17:33 +01:00
Erlend Birkenes
37601efa17 More norwegian translations.
Conflicts:
	app/locale/nb.coffee
2014-11-27 16:11:13 +01:00
Nick Winter
4e51289de8 Merge pull request #1800 from ShadowTrainer/patch-2
Update tr.coffee
2014-11-26 19:20:10 -08:00
Nick Winter
12253fc472 Resolved nb.coffee merge conflicts. 2014-11-26 19:19:30 -08:00
Nick Winter
167595789d Merged tr.coffee. 2014-11-26 19:09:39 -08:00
Nick Winter
7a7d82e8e4 Merge pull request #1792 from ccdarkness/patch-1
Update zh-HANS.coffee
2014-11-26 16:51:07 -08:00
Nick Winter
6e7e11a884 Merge pull request #1791 from nadian/patch-1
Update id.coffee
2014-11-26 16:50:50 -08:00
Erlend Birkenes
c8a34e78e8 Lots of translations to norwegian bokmål 2014-11-27 01:00:02 +01:00
Nick Winter
2c0bf2fef1 Requiring certain heroes for certain levels, and showing the choose hero view when they go to play a level where the hero has changed. 2014-11-26 08:53:06 -08:00