IntelOrca bed7d0aacf Merge branch 'master' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-master ...

Conflicts:
	data/language/dutch.txt

2014-08-15 19:14:07 +01:00

..

dutch.txt

Extra translated strings, some fixed typos

2014-08-15 11:11:22 +02:00

english_uk.txt

Merge branch 'load_custom_text' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-load_custom_text

2014-08-14 23:56:38 +01:00

english_us.txt

Merge branch 'load_custom_text' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-load_custom_text

2014-08-14 23:56:38 +01:00

french.txt

add french language

2014-08-15 00:13:08 +01:00