2426 commits

Author	SHA1	Message	Date
Imperadeiro98	d4f1fcaaed	Added i18n	2015-06-28 11:43:56 +01:00
Imperadeiro98	5eed3361f3	Updated i18n	2015-06-27 12:40:48 +01:00
Nikita Gryzlov	2d7e9e88f9	Update ru.coffee. Sync type_in_email ... Sync type_in_email	2015-06-25 23:31:33 +03:00
Nikita Gryzlov	8c5b67d826	Update en.coffee. {change} added.	2015-06-23 10:59:14 +03:00
Imperadeiro98	a9eeb7723b	Update pt-PT.coffee	2015-06-22 20:46:53 +01:00
Nick Winter	aa1150768f	Propagated i18n.	2015-06-22 11:59:28 -07:00
Imperadeiro98	80bb030951	Removed unnecessary i18n	2015-06-22 19:18:47 +01:00
nixel2007	8f3efeb97c	Update ru.coffee. teachers_survey	2015-06-22 20:00:42 +03:00
nixel2007	a3781d887a	Update ru.coffee ... Misc.	2015-06-22 17:56:12 +03:00
NoYzE1	7fcfce5b33	Update de-DE.coffee ... Beim Dialog Abonnieren steht "$9.99/Monate". Es sollte aber "$9.99/Monat" heißen. Dev-tools sagen, dass der Text von subscribe.month stammt, wo "Monate" steht.	2015-06-20 20:59:43 +02:00
Lai Tuan	39fc882303	Require user password for deleting accounts #2842	2015-06-20 23:12:26 +09:00
Nick Winter	8ef4a9ddde	Merge pull request #2830 from arthurnn/master ... i18N press enter on spell view	2015-06-18 18:37:24 -07:00
Nick Winter	339aaa0aee	Uncommented all translations for #2840.	2015-06-18 18:35:26 -07:00
flowabuse	5facc41f82	Update ro.coffee ... Forgot a " on line 10.	2015-06-18 18:38:31 +03:00
flowabuse	1b1482f118	Update ro.coffee ... It had to be done! Sorry it took so long... Life happend...	2015-06-17 03:27:34 +03:00
Imperadeiro98	a8c06652ec	Merge pull request #2839 from Mihbo/patch-4 ... Update uk.coffee	2015-06-16 10:01:50 +01:00
Mihbo	ce73d87f92	Update uk.coffee ... some more strings translated	2015-06-16 10:27:32 +03:00
Ikuyadeu	e8a862b2ce	Update ja.coffee	2015-06-16 11:05:18 +09:00
Matt Lott	535ca8d2ac	Merge pull request #2834 from laituan245/master ... Add Contact section to About page #2822	2015-06-15 11:11:58 -07:00
Imperadeiro98	c35c9eadf1	Merge pull request #2833 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-06-15 11:30:57 +01:00
Lai Tuan	aabae7082e	Add Contact section to About page #2822	2015-06-15 19:11:48 +09:00
Ikuyadeu	fa8d317745	Update ja.coffee	2015-06-15 18:48:04 +09:00
Mihbo	fd5a99b9d0	Update uk.coffee ... translated some more strings	2015-06-15 10:02:24 +03:00
Arthur Neves	6cb673e228	i18N press enter on spell view	2015-06-14 23:20:49 +02:00
Nick Winter	b1680f500b	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-06-14 11:06:48 -07:00
Nick Winter	ac2039c81a	Merged fr.coffee.	2015-06-14 11:06:15 -07:00
Ikuyadeu	3f3f44038e	Update ja.coffee	2015-06-14 17:11:26 +09:00
Kevin Avignon	e263866a3a	Made some update within the spanish file	2015-06-13 23:33:48 -04:00
Kevin Avignon	c806b8865e	Made some changes into the french file	2015-06-13 11:39:25 -04:00
Esben Madsen	db25007765	A bit of Danish translation pt. 2	2015-06-11 00:35:56 +02:00
Esben Madsen	8293c717a1	A bit of Danish translation	2015-06-10 01:05:12 +02:00
Danylo Dubinin	c0f05e7c86	translate few strings	2015-06-09 18:42:20 +03:00
Imperadeiro98	66c126a8df	Update pt-PT.coffee	2015-06-08 23:39:34 +01:00
Danylo Dubinin	fe8c680fb1	Improve translation, add infinite loop ... Better translation of "comment out" phrase and correct translation of "rewind and fast-forward".	2015-06-08 21:45:51 +03:00
Imperadeiro98	fa273d7535	Update pt-PT.coffee	2015-06-08 18:19:27 +01:00
Matt Lott	021ff541e4	Add separate school field for teacher survey	2015-06-08 06:39:30 -07:00
Imperadeiro98	a9f8a7b1be	Fixed some typos	2015-06-08 14:32:55 +01:00
Matt Lott	78004a0a94	Trial requests localization typo ... Adding missing period at end of approved sentence.	2015-06-08 06:27:40 -07:00
Imperadeiro98	6960358850	Update pt-PT.coffee	2015-06-07 22:58:54 +01:00
Imperadeiro98	b9b36d5fea	Update en.coffee	2015-06-07 22:54:39 +01:00
Nikita Gryzlov	730a0f5e36	Propageted i18n	2015-06-07 23:09:03 +03:00
Danylo Dubinin	dd5ac2eda6	'viking' translation, 'fight' mistake fix ... Правильніше "У бій!" за правилами вживання прийменників у/в.	2015-06-07 19:21:15 +03:00
Imperadeiro98	3f23598c60	Update teacher trial copy	2015-06-05 23:44:31 +01:00
Imperadeiro98	7b92bf8c84	Updated i18n in en.coffee	2015-06-05 20:49:08 +01:00
Imperadeiro98	b0c6b50062	Indentation fixes to last merge	2015-06-05 15:03:05 +01:00
Imperadeiro98	445a3f736e	Merge pull request #2805 from lucasangelon/master ... Updated pt-BR.coffee	2015-06-05 15:00:21 +01:00
Matt Lott	d7cddcb136	Teacher trial subscription form ... Add a teacher survey form for applying for a free trial subscription for evaluation purposes. Add an admin trial requests review page, where admins can approve/deny requests.	2015-06-05 06:48:19 -07:00
LucasAngelon	920aed7910	Updated pt-BR.coffee ... Uncommented the remaining translations =].	2015-06-05 12:19:27 +08:00
LucasAngelon	7940857dc6	Updated pt-BR.coffee ... Translated a few things on the file~ I saw the clans and account_invoices section titles commented out and was unsure about what to do with them. Translated the items related to them but left them commented out.	2015-06-04 23:39:04 +08:00
Imperadeiro98	b1e1a1d13c	Some fixes to last merge	2015-06-03 19:56:26 +01:00
Imperadeiro98	b6bcc41a31	Merge pull request #2804 from Kavignon/Translator ... Updated the french file	2015-06-03 19:52:52 +01:00
Kevin Avignon	2d20ae987a	Commited changes in the fr coffee script file	2015-06-03 14:48:01 -04:00
Imperadeiro98	0e7314cf4e	Merge pull request #2799 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-06-02 20:14:38 +01:00
Matt Lott	ad1cf1cd15	Update /teachers copy	2015-06-02 07:25:55 -07:00
Ikuyadeu	336cdc2c7a	Update ja.coffee	2015-06-02 17:50:39 +09:00
Nikita Gryzlov	f590333d77	Update ru.coffee ... tip_scrub_shortcut	2015-05-31 13:45:24 +03:00
Nikita Gryzlov	43e514950e	Propagated i18n	2015-05-31 13:44:43 +03:00
Nikita Gryzlov	8d25d2cba2	Update en.coffee ... Add {change} to last commit	2015-05-31 13:43:25 +03:00
Max Lyashuk	05c1ecd13d	Translate some new strings in uk.coffee	2015-05-30 22:04:28 +03:00
Imperadeiro98	aea4ac9d19	Merge pull request #2794 from aliceinwire/patch-2 ... Update ja.coffee	2015-05-29 14:52:52 +01:00
Imperadeiro98	bc29f7303b	Fixed sv.coffee	2015-05-29 14:48:19 +01:00
Alice Ferrazzi	179af18478	Update ja.coffee	2015-05-29 16:39:31 +09:00
Imperadeiro98	5a272f8bed	Fixed last merge	2015-05-28 21:54:27 +01:00
Imperadeiro98	b9de6dbc9d	Merge pull request #2792 from Lego3/swedish_updates_3 ... Fixes and additions to the Swedish localization	2015-05-28 21:49:24 +01:00
Edvin Linge	ef5bd0368a	Fixes and additions to the Swedish localization	2015-05-28 22:03:29 +02:00
Marco Fras	02c9080838	Translated "contribute" page	2015-05-28 21:55:15 +02:00
Alice Ferrazzi	c8f5871b90	Update ja.coffee	2015-05-28 13:01:43 +09:00
Imperadeiro98	f2fb8610b7	Uncommented headers	2015-05-27 17:23:29 +01:00
Imperadeiro98	35efc6c640	Merge pull request #2787 from KisgadoB/patch-3 ... Update hu.coffee	2015-05-27 17:22:07 +01:00
Imperadeiro98	d175085626	Merge pull request #2781 from KisgadoB/patch-2 ... Update hu.coffee	2015-05-27 17:20:43 +01:00
Nick Winter	c915ff1d94	Merged zh-HANS.coffee. Fixed tab indentations.	2015-05-26 16:59:19 -07:00
KisgadoB	600216aa9e	Update hu.coffee	2015-05-26 09:14:30 +02:00
Nick Winter	9dedf04f56	Added Uzbek (uz) language stub.	2015-05-25 16:01:12 -07:00
Nick Winter	86d7b6c625	Added Uzbek (uz) language stub.	2015-05-25 16:00:32 -07:00
Imperadeiro98	e320bbbed5	Merge pull request #2783 from Atomk/patch-9 ... Update it.coffee	2015-05-23 20:19:46 +01:00
Marco Fras	cfc8147b31	Update it.coffee ... Added a few translations regarding patches.	2015-05-23 10:57:06 +02:00
Marco Fras	536c422185	Small fix in a translated string	2015-05-23 10:42:27 +02:00
Marco Fras	5995f7d6a2	Update it.coffee	2015-05-23 10:38:49 +02:00
KisgadoB	7eeaf3385c	Update hu.coffee	2015-05-22 21:01:45 +02:00
Marco Fras	355efdd78d	Update it.coffee	2015-05-21 23:07:10 +02:00
Imperadeiro98	7f09e8f1f1	Merge pull request #2778 from Atomk/patch-5 ... Fixed a missing "to" in a string	2015-05-21 21:13:29 +01:00
Marco Fras	0f0143925d	Update en.coffee ... I added "use" because it seems more suitable than "click".	2015-05-21 21:38:15 +02:00
Imperadeiro98	8d1fc92f4a	Uncommented translations	2015-05-21 16:56:22 +01:00
Imperadeiro98	506801cdda	Merge pull request #2777 from lynxlynxlynx/patch-1 ... sl.coffee: minor translations	2015-05-21 16:54:59 +01:00
Imperadeiro98	3c203f13ff	Fixed indentation	2015-05-21 14:50:57 +01:00
Marco Fras	0cfb4f5c6b	Update it.coffee	2015-05-21 11:39:27 +02:00
Marco Fras	a3e3bdc125	Fixed a missing "to" in a string	2015-05-21 10:36:25 +02:00
Jaka Kranjc	f8293670b3	sl.coffee: minor translations	2015-05-21 09:19:49 +02:00
Imperadeiro98	8cc13e0829	Fixed indentation	2015-05-20 19:24:26 +01:00
Marco Fras	1f2df9f971	Update it.coffee	2015-05-20 19:51:28 +02:00
Imperadeiro98	bafef886cb	Merge pull request #2773 from Atomk/patch-1 ... Update it.coffee	2015-05-20 15:41:09 +01:00
Imperadeiro98	4721143346	Update pt-PT.coffee	2015-05-20 15:34:06 +01:00
Marco Fras	e9c3b68eb8	Update it.coffee ... Just fixed tons of typos and bad translations, more fixes to come (this file is huge)	2015-05-20 01:25:11 +02:00
Imperadeiro98	21ce4eb8e1	Uncommented an header	2015-05-18 22:59:02 +01:00
Imperadeiro98	e64435e409	Merge pull request #2771 from dedalcom/patch-1 ... Update bg.coffee	2015-05-18 22:58:08 +01:00
dedalcom	724d76ac84	Update bg.coffee	2015-05-18 13:39:28 +03:00
bignova	59b15fcf82	Update zh-HANS.coffee	2015-05-17 23:22:12 -04:00
Nikita Gryzlov	6e62e3deb9	Propagated i18n	2015-05-18 00:05:23 +03:00
Imperadeiro98	ef7281a9bd	Merge pull request #2768 from nixel2007/master ... Update ru.coffee	2015-05-17 20:29:09 +01:00
Nikita Gryzlov	6a66a03998	Update ru.coffee. Clans, misc.	2015-05-17 21:36:17 +03:00
Nikita Gryzlov	b29391b188	ru.coffee. Tips	2015-05-17 21:07:38 +03:00
FedericoTomas	976df82f5e	Update es-419.coffee ... Updated my friends!.	2015-05-17 06:54:53 -03:00
Imperadeiro98	461a7c9c49	Merge pull request #2762 from Imperadeiro98/master ... Updated i18n for clans	2015-05-16 19:36:56 +01:00
Imperadeiro98	a56807bcac	Updated i18n (part 3)	2015-05-16 19:32:00 +01:00
Imperadeiro98	323d5c5c2d	Updated i18n (part 2)	2015-05-16 19:25:07 +01:00
wgsu	81dd640a5c	Update zh-HANS.coffee	2015-05-16 11:52:04 -04:00
wgsu	0155bd02ba	few more translation ... Since I don't how the payment for the server in China work， I don't want to mess up your teacher section.	2015-05-16 11:35:48 -04:00
Imperadeiro98	e88aff1339	Updated i18n (part 1)	2015-05-16 14:46:00 +01:00
Nikita Gryzlov	ff8be31cb5	Propagated i18n.	2015-05-16 00:11:37 +03:00
Imperadeiro98	7a87b59988	Removed blank line	2015-05-14 20:07:07 +01:00
Lokendra Sharma	4abfc088bf	added more quotes for #710	2015-05-14 15:56:59 +05:30
nixel2007	fd8e798034	Update ru.coffee	2015-05-13 17:46:45 +03:00
Edvin Linge	de59c56ec8	Added a bunch of Swedish translations	2015-05-09 22:29:04 +02:00
VicYu	60fb8426c1	improved Chinese localization ... 1.Modify some wording error 2.Translated some items	2015-05-06 17:29:46 +08:00
Matt Lott	901c0ed085	Update managed subscriptions copy ... Add blurb about recipients needing to be existing CodeCombat users	2015-05-05 15:18:35 -07:00
Imperadeiro98	4f43139f9f	Uncommented some headers	2015-05-03 21:21:21 +01:00
Edvin Linge	707c098472	Added some Swedish translation	2015-05-03 18:55:34 +02:00
Amir Off	dcb9df32bd	translated "weapons" into arabic	2015-04-30 20:30:54 +03:00
Imperadeiro98	e11e8a8966	Fixed last merge	2015-04-28 19:44:34 +01:00
YukiUeda	7b05fbf84e	Translate ja.cofee on Achizan	2015-04-28 20:29:40 +09:00
Nicolas Kaiser	2f5cb0c8cd	Fix typos in de-DE.coffee ... line 4: According to [1], "Leid tun" was actually an accepted spelling between 1996 and 2006. line 839: Imperative form [2] [1] http://www.korrekturen.de/wortliste/leidtun.shtml [2] http://www.duden.de/rechtschreibung/beitreten	2015-04-27 14:11:38 +02:00
Nicolas Kaiser	4416332938	Fix typos in en.coffee	2015-04-26 20:16:25 +02:00
Imperadeiro98	5a3f368960	Uncommented some strings from last merge	2015-04-26 16:52:07 +01:00
YrlaCharlotta	ef71b22cab	Update sv.Coffee	2015-04-26 17:19:40 +02:00
Imperadeiro98	0498d125e6	Some fixes to last merge	2015-04-26 14:50:09 +01:00
Imperadeiro98	b6cb601973	Merge pull request #2705 from LikeMyGeek/master ... Traduction en cours	2015-04-26 14:47:26 +01:00
Imperadeiro98	85047ba2e8	Reordered a string	2015-04-26 14:27:12 +01:00
Imperadeiro98	4719123d00	Update pt-PT.coffee	2015-04-26 14:25:01 +01:00
Nick Winter	80af32180c	Fixed #1638: detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error.	2015-04-25 17:29:02 -07:00
LikeMyGeek	bd342c1fef	Traduction en cours	2015-04-25 20:33:41 +02:00
Nick Winter	1c85759df8	Propagated i18n.	2015-04-24 13:50:30 -07:00
Nick Winter	cd837156d4	Now that we're at 146 levels, and each level is much longer, we're just going to do 'some' new levels every week instead of five.	2015-04-24 13:48:19 -07:00
Matt Lott	92332c37f3	Update /teachers copy	2015-04-23 13:34:43 -07:00
Imperadeiro98	c350f457a2	Merge pull request #2682 from sauki8/patch-1 ... Update id.coffe	2015-04-23 19:21:33 +01:00
Imperadeiro98	894a49fce7	Fixed an issue from last merge	2015-04-23 19:20:20 +01:00
Imperadeiro98	fc10c34040	Merge pull request #2698 from YukiUeda/patch-1 ... Translated for artisan	2015-04-23 19:18:52 +01:00
Imperadeiro98	ac15e3d9da	Fixed some errors from last merge	2015-04-23 19:16:08 +01:00
Imperadeiro98	9b92fc1ebe	Merge pull request #2692 from kimaz/patch-1 ... Update de-CH.coffee	2015-04-23 19:10:05 +01:00
kimaz	01b6a1a657	Update de-CH.coffee ... Update 2 @04.22.2015 12:17AM	2015-04-22 12:17:53 +02:00
YukiUeda	3b303fc6f3	Translated for artisan	2015-04-22 18:34:45 +09:00
Matt Lott	5eb65e49fe	Add private clans to /teachers copy	2015-04-21 11:41:48 -07:00
Matt Lott	b918408061	Add private clans to subscribe modal	2015-04-21 11:14:49 -07:00
kimaz	3ab1b6d187	Update de-CH.coffee	2015-04-21 13:25:04 +02:00
brokenelevator	46381cf1df	Update pl.coffee	2015-04-20 19:56:40 +02:00
Imperadeiro98	a859a71e6f	Merge pull request #2684 from nixel2007/ru ... Update ru.coffee	2015-04-19 21:17:53 +01:00
Nick Winter	17ce3fca6b	Merged zh-HANS.coffee.	2015-04-19 08:43:35 -07:00
Nikita Gryzlov	32190a4f0e	Update ru.coffee ... Missed translation	2015-04-19 13:09:24 +03:00
Nikita Gryzlov	c9d84a72c2	Update ru.coffee	2015-04-19 12:57:59 +03:00
Nick Winter	63596aa6b5	Fixed #2450: added i18n for new items in the victory modal.	2015-04-18 21:10:35 -07:00
Nick Winter	a62288045f	Noticed Diplomat modal in sk.coffee wasn't translated.	2015-04-18 19:41:12 -07:00
Nick Winter	7471b14c4d	Fixed #2013: removed autorun code. Fixed preloading to actually happen, but only on short solutions without a ton of statement execution.	2015-04-18 15:52:24 -07:00
wgsu	42c435a19e	Update zh-HANS.coffee	2015-04-18 11:35:32 -04:00
sauki8	fd68208bce	Update id.coffe	2015-04-18 12:38:31 +07:00
Nick Winter	1952a8ea23	Fixed #2305: removed CSS initial keyword usage.	2015-04-17 11:42:38 -07:00
Imperadeiro98	dd04dd88cf	Update pt-PT.coffee	2015-04-17 15:22:08 +01:00
Imperadeiro98	5cc32cb18a	Uncommented some translations	2015-04-17 15:08:13 +01:00
Imperadeiro98	e4391ca034	Merge pull request #2679 from noashess12/patch-5 ... Update ar.coffee	2015-04-17 15:06:09 +01:00
noashess12	83f2723628	Update ar.coffee	2015-04-17 14:30:32 +03:00
nixel2007	e96b1d3f78	Update ru.coffee	2015-04-17 12:37:29 +03:00
Nick Winter	2eb95c32df	Propagated i18n.	2015-04-16 18:35:40 -07:00
Nick Winter	48ba17a34c	Merged hu.coffee.	2015-04-16 14:17:22 -07:00
Imperadeiro98	05e987283c	Fixed couple issues from last merge	2015-04-16 22:12:26 +01:00
brokenelevator	16d970940f	Update pl.coffee	2015-04-16 21:41:15 +02:00
Imperadeiro98	7aff510f3e	Merge pull request #2674 from nixel2007/ru ... Update ru.coffee	2015-04-16 14:23:24 +01:00
nixel2007	2e8f1422da	Update ru.coffee	2015-04-16 11:50:30 +03:00
brokenelevator	8c4181c3e4	Update pl.coffee	2015-04-16 06:35:12 +02:00
brokenelevator	8a1f7a0d20	Update pl.coffee	2015-04-16 06:32:15 +02:00
brokenelevator	0820dd9041	Update pl.coffee	2015-04-16 05:05:33 +02:00
Imperadeiro98	3b9ee13378	Merge pull request #2671 from steog88/patch-1 ... Update it.coffee	2015-04-15 19:25:21 +01:00
steog88	007cddb9f1	Update it.coffee	2015-04-15 15:26:27 +02:00
LuiKang	4f61ebf30d	range translation too wide ... 'range' translation was too wide also	2015-04-15 10:27:54 +02:00
LuiKang	f1065053b2	Update hu.coffee ... 'blocks' translation was too wide so the shield block value was not readable.	2015-04-15 10:11:06 +02:00
Imperadeiro98	198536f592	Uncommented some strings and headers	2015-04-14 18:04:07 +01:00
Imperadeiro98	aa8a4cb010	Merge pull request #2667 from YukiUeda/patch-1 ... translated some sentences	2015-04-14 18:02:07 +01:00
Nick Winter	a7bb97e5f2	Fixed #2649: made leaderboard buttons more obvious.	2015-04-13 16:26:58 -07:00
Nick Winter	a6d1905580	Merged ar.coffee.	2015-04-13 12:46:33 -07:00
Imperadeiro98	e66522ec92	Uncommented some headers	2015-04-13 20:12:58 +01:00
Imperadeiro98	d0b8df797c	Merge pull request #2666 from LuiKang/patch-1 ... Update hu.coffee (magyar fordítás frissítés)	2015-04-13 20:08:01 +01:00
Imperadeiro98	8d035617aa	Uncommented some translations	2015-04-13 20:07:15 +01:00
Imperadeiro98	eb93586f0e	Merge pull request #2645 from noashess12/patch-2 ... Update ar.coffee	2015-04-13 20:00:26 +01:00
YukiUeda	3c55e53b36	translated some sentences	2015-04-13 14:08:01 +09:00
LuiKang	c54373a042	Update hu.coffee ... Pár helyen a meglévő szavakon is pontosítottam, amelyek akár szerepjátékos szemmel, akár programozói szemmel nem tűntek számomra pontosnak.	2015-04-12 23:36:15 +02:00
Nick Winter	e85c53ea42	Programming is good for your childrens's careerses, O dear parents.	2015-04-10 14:35:13 -07:00
noashess12	d925012571	Update ar.coffee	2015-04-10 23:08:59 +03:00
cundamic	64c7dec7a5	Update sk.coffee ... minor changes	2015-04-10 06:51:13 +02:00
noashess12	f03d279f8a	Update ar.coffee	2015-04-10 00:12:01 +03:00
Imperadeiro98	a4c1154fd8	Update pt-PT.coffee	2015-04-09 21:51:43 +01:00
Nick Winter	3b224db839	Propagated i18n.	2015-04-09 11:51:01 -07:00
Matt Lott	adea59054b	Remove bitcoins from sub payments blurb	2015-04-09 09:42:44 -07:00
Imperadeiro98	c6b511749a	Some fixes to last merge	2015-04-09 14:36:12 +01:00
Imperadeiro98	702c3b611f	Merge pull request #2643 from JCesar91/patch-2 ... Update es-419.coffee	2015-04-09 14:34:40 +01:00
Barney	a48800bb84	Update zh-HANT.coffee	2015-04-09 11:09:14 +08:00
Barney	03e2ab6ee7	Merge remote-tracking branch 'upstream/master'	2015-04-09 10:15:17 +08:00
Nick Winter	2eec3e7831	Simplified share progress email to just share with parents, not friends.	2015-04-08 18:31:13 -07:00
JMan	b46283e18a	Update es-419.coffee ... Translated a few more lines, mostly about player subscription benefits.	2015-04-08 19:54:17 -04:00
Imperadeiro98	e923f7a4fc	Moved a string to its correct place	2015-04-08 19:25:59 +01:00
Imperadeiro98	e1aaa9faee	Update pt-PT.coffee	2015-04-08 18:46:02 +01:00
Matt Lott	51e25d8a9c	Update /teachers level counts	2015-04-08 09:42:39 -07:00
cundamic	e1f5a31734	Update sk.coffee ... translation: classes, contribute	2015-04-08 15:43:01 +02:00
Matt Lott	f3c973b945	Add payment methods to subscribe dialog ... And update level counts in subscription breakdown.	2015-04-07 15:54:59 -07:00
Nick Winter	2dec5921e8	Merged sk.coffee.	2015-04-07 13:33:31 -07:00
cundamic	16bb298250	Update sk.coffee ... translation : about II. ladder II	2015-04-07 21:03:53 +02:00
Nick Winter	b388d25435	Hooked up Viking Code School offer for players who beat Lost Viking.	2015-04-07 11:19:22 -07:00
Imperadeiro98	a1dba5886c	Merge pull request #2638 from cundamic/patch-13 ... Update sk.coffee	2015-04-07 18:00:03 +01:00
Imperadeiro98	85ba433857	Merge pull request #2637 from cundamic/patch-12 ... Update sk.coffee	2015-04-07 17:59:33 +01:00
Barney	69ac9974b6	Update zh-HANT.coffee	2015-04-07 23:17:09 +08:00
cundamic	1fe85e8a5c	Update sk.coffee ... translation: ladder	2015-04-07 16:19:03 +02:00
cundamic	3d7f73a773	Update sk.coffee ... translation: about	2015-04-07 14:48:32 +02:00
cundamic	d0cc29899f	Update sk.coffee ... translation community,classes I	2015-04-07 10:14:32 +02:00
cundamic	a8d17843e0	Update sk.coffee ... translation: teachers	2015-04-07 00:19:40 +02:00
Imperadeiro98	8fb6de0d62	Restored some translations	2015-04-06 22:09:35 +01:00
cundamic	2d3b84ccd0	Update sk.coffee ... translation: options	2015-04-06 20:14:45 +02:00
Nick Winter	de48934016	Merge pull request #2629 from cundamic/patch-8 ... Update sk.coffee	2015-04-06 08:00:39 -07:00
Nick Winter	61165df41b	Merge pull request #2627 from lazydogP/master ... Update zh-HANS.coffee	2015-04-06 08:00:05 -07:00
Nick Winter	4ed4c5a07c	Merged sk.coffee.	2015-04-06 07:59:22 -07:00
cundamic	43f4a2c76e	Update sk.coffee ... Translation account_settings	2015-04-06 10:17:56 +02:00
cundamic	8e97b05af7	Update sk.coffee ... line 341 deleted	2015-04-06 03:03:28 +02:00
Imperadeiro98	e1afa33b82	Small fix for last commit	2015-04-05 21:38:37 +01:00
cundamic	5f533abf5d	Update sk.coffee ... translation : suscribe II, choose hero	2015-04-05 21:11:38 +02:00
lazydogP	bd7703d4fe	Update zh-HANS.coffee	2015-04-06 00:02:17 +08:00
cundamic	3d842b56b5	Update sk.coffee ... Translation : share progress, signup, subscribe	2015-04-05 17:00:33 +02:00
Imperadeiro98	19b1cf7f77	Merge pull request #2623 from cundamic/patch-4 ... Update sk.coffee	2015-04-05 11:39:53 +01:00
Imperadeiro98	20b3c8dfc2	Merge pull request #2622 from cundamic/patch-3 ... Update sk.coffee	2015-04-05 11:39:28 +01:00
Imperadeiro98	82f314bd97	Merge pull request #2620 from javatlacati/patch-5 ... Update es-ES.coffee	2015-04-05 11:38:09 +01:00
cundamic	a13d0e713e	Update sk.coffee ... Translation of tips II	2015-04-04 20:07:57 +02:00
cundamic	38f71010ae	Update sk.coffee ... Translated: Leaderboard	2015-04-04 12:22:01 +02:00
cundamic	e05fe0103f	Update sk.coffee ... Translation : choose_hero	2015-04-04 08:32:05 +02:00
javatlacati	7f527360f7	Update es-ES.coffee ... Addeded some translations.	2015-04-03 20:58:20 -06:00
cundamic	04037114bf	Update sk.coffee ... Translaltion of tips	2015-04-04 00:26:14 +02:00
Imperadeiro98	80fe6c283a	Reverted a mistake I did	2015-04-03 19:27:12 +01:00
Imperadeiro98	6f3f6d66ab	Uncommented a string from last merge... ... ... so that it doesn't get lost	2015-04-02 19:58:16 +01:00
javatlacati	6e83de564d	Update es-419.coffee ... translated some phrases	2015-03-31 17:06:11 -06:00
Imperadeiro98	049ad631e3	Uncommented headers from last merge	2015-03-30 22:01:58 +01:00
Imperadeiro98	6be1acdad0	Merge pull request #2601 from Moschti/patch-1 ... Update de-CH.coffee	2015-03-30 21:58:19 +01:00
FedericoTomas	cd86c836b6	Update es-419.coffee ... Up,	2015-03-30 01:07:28 -03:00
Imperadeiro98	352b6d6d45	Uncommented some headers from last merge	2015-03-29 23:11:55 +01:00
javatlacati	a5c94a6277	Update es-ES.coffee ... Addeded some translations.	2015-03-29 15:23:17 -06:00
Moschti	680da7ee79	Update de-CH.coffee	2015-03-29 13:57:27 +02:00
nixel2007	b2c8f3c1f6	Update ru.coffee. Zero_sum.	2015-03-27 17:23:11 +03:00
Imperadeiro98	a7198d5456	Update pt-PT.coffee	2015-03-27 13:57:53 +00:00
jigsaw	57fb8588b6	Translate Archmage page in Japanese	2015-03-27 16:02:04 +09:00
Nick Winter	4d1babb95e	Propagated i18n for Zero Sum tournament.	2015-03-26 22:06:33 -07:00
Nick Winter	3bfc1a88ce	Slight copy update.	2015-03-26 22:05:52 -07:00
Nick Winter	ceb81494a0	Preparing for Zero Sum tournament starting tomorrow morning.	2015-03-26 21:05:46 -07:00
Imperadeiro98	7fa46fac34	Uncommented a translation from last merge	2015-03-26 10:30:19 +00:00
matheod	07a6273c4b	teachers french translation	2015-03-26 01:17:34 +01:00
matheod	713afaf567	add Poll french translation	2015-03-26 00:34:02 +01:00
matheod	1054f2d293	Add plural at Dégât (damage)	2015-03-26 00:30:56 +01:00
matheod	25cacdd842	Even better translation	2015-03-25 23:22:26 +01:00
matheod	a768846e69	Correct action_cooldown translation.	2015-03-25 23:17:43 +01:00