Commit graph

5722 commits

Author SHA1 Message Date
Nick Winter
53621f0d5d Merge pull request #2294 from mogsie/i18n-norwegian
i18n norwegian
2015-02-11 14:10:07 -08:00
Nick Winter
85ad3f5960 Fixed #2293. 2015-02-11 14:09:00 -08:00
Erik Mogensen (@mogsie)
fc46075b35 Merge remote-tracking branch 'upstream/master' into i18n-norwegian 2015-02-11 23:03:20 +01:00
Erik Mogensen (@mogsie)
102bb50870 i18n/nb: wording, punctuation. 2015-02-11 23:02:59 +01:00
Nick Winter
2a9bb0292d Don't dispatch simulations to old ladders, just new hero-ladder levels. Fixed typo in last cache commit. 2015-02-11 14:01:38 -08:00
Erik Mogensen (@mogsie)
71ff84538e i18n/nb: capitalization, wording. 2015-02-11 22:17:33 +01:00
Nick Winter
d09636306c Toggling all plausibly-buggy AJAX requests to cache: false for better IE behavior. Look out for bugs! 2015-02-11 13:12:54 -08: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
Imperadeiro98
c84d744d82 Merge pull request #2290 from laituan245/master
Update vi.coffee
2015-02-11 18:55:06 +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
Matt Lott
af343bfd82 🐛Fix share progress modal i18n 2015-02-11 10:15:03 -08:00
Nick Winter
6ff39ba48a Not showing particles in IE. 2015-02-11 09:34:27 -08: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
Imperadeiro98
c35b925cb1 Update pt-PT.coffee 2015-02-10 22:32:52 +00:00
Matt Lott
9bda187f90 Add terrain to loaded world map event 2015-02-10 14:20:18 -08: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
Nick Winter
106ba5acda Fixed #2280. 2015-02-10 12:49:28 -08:00
Nick Winter
afe94afd08 Merge pull request #2278 from laituan245/master
Added more names for #53
2015-02-10 12:47:11 -08:00
Nick Winter
86fa8dd59d Merge pull request #2281 from divyanshu013/master
Fixed the issue with the Leaderboard view to fit properly for #2254
2015-02-10 12:45:54 -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
Nick Winter
4c716eb12a Merge pull request #2276 from AnirudhGP/patch-2
Added some quotes for #710
2015-02-10 12:43:44 -08:00
Nick Winter
3a80fffa15 Merge pull request #2275 from AnirudhGP/patch-1
Added more names for #53
2015-02-10 12:43:04 -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
Imperadeiro98
8264048f31 Merge pull request #2271 from jhoon/translations-es-419
Translating share_progress_modal section
2015-02-10 18:58:32 +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
divyanshu013
2b090a9841 Fixed the issue with the Leaderboard view to fit properly for #2254
The leaderboard view fits properly while scrolling down.
2015-02-10 23:27:23 +05:30
Barney
2546082eaf Update zh-HANT.coffee 2015-02-11 01:02:37 +08:00
laituan245
70ec7996c2 Added more names for #53 2015-02-10 23:26:02 +09:00
Anirudh GP
b422508f2d Added some quotes for #710 2015-02-10 14:41:04 +05:30
Anirudh GP
ada239b50d Added some quotes for #710 2015-02-10 14:41:03 +05:30
Anirudh GP
9184588969 Added more names for #53 2015-02-10 14:32:02 +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
Matt Lott
c4620a7b2d Refactor analytics event logging
Clean up property slimming.
Save explicit identity traits in properties.
2015-02-09 15:03:04 -08:00
Martin005
44fb8281bf Update cs.coffee
Finally done all translations :)
2015-02-09 23:22:04 +01:00
Nick Winter
abbab26d80 Using i18n for achievement descriptions in HeroVictoryModal. 2015-02-09 13:06:00 -08:00
Imperadeiro98
92531e366b Update en.coffee 2015-02-09 20:01:51 +00:00
Imperadeiro98
8718cd280f Added i18n 2015-02-09 20:00:52 +00:00
Imperadeiro98
f062f446d3 Fixed i18n 2015-02-09 19:57:28 +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
5decf7ae36 Workaround for #2259, although I haven't been able to reproduce when it happens. 2015-02-09 11:11:52 -08:00
Nick Winter
7b34f90230 Added rough draft of subscribe button in gem shop. 2015-02-09 09:22:18 -08:00
Nick Winter
c2a4700aa2 Mergy merge merge... moved the latest quote to the .rare, since it doesn't fit too well. 2015-02-09 08:42:24 -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
Nick Winter
b2dc80b467 Merged those loading tips. 2015-02-09 08:34:13 -08:00
Nick Winter
7ee7269d39 Merge pull request #2191 from JKniager/patch-1
Added More Names
2015-02-09 08:32:32 -08:00
Nick Winter
0cee873157 Moved new buy gems background from compiled output to input dir. 2015-02-09 08:31:06 -08:00
Nick Winter
22c2c7df63 Fixed bug with incompletely added levels jamming the campaign editor. 2015-02-09 08:19:59 -08:00
TJ Ledwith
292e679cc6 Update level_loading.jade 2015-02-09 07:08:33 -05:00
Nick Winter
38c6d6f531 Merge pull request #2263 from divyanshu013/master
Improved upon the Buy Gems Window for #2238
2015-02-08 21:44:57 -08:00
divyanshu013
4269f6a652 Improved upon the Buy Gems Window for #2238
Added the header and close button for the Buy Gems Window.
2015-02-09 02:31:03 +05:30
Imperadeiro98
983d8c761a Merge pull request #2262 from ArthurLu/master
Update zh-HANT.coffee
2015-02-08 19:55:00 +00:00
Imperadeiro98
2bca3e1733 Merge pull request #2255 from tutosfaciles48/patch-1
Update fr.coffee
2015-02-08 19:47:43 +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
Imperadeiro98
d876c81c97 Made #back-button a button 2015-02-07 22:33:48 +00:00