Jonathan G Rennison ac69b746ab Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp

2017-03-12 20:37:26 +00:00

..

unfinished

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

afrikaans.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

arabic_egypt.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

basque.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

belarusian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

brazilian_portuguese.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

bulgarian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

catalan.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

croatian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

czech.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

danish.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

dutch.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

english_AU.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

english_US.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

english.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

esperanto.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

estonian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

faroese.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

finnish.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

french.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

gaelic.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

galician.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

german.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

greek.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

hebrew.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

hungarian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

icelandic.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

indonesian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

irish.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

italian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

japanese.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

korean.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

latin.txt

Merge branch 'send_money_company' into jgrpp

2017-03-03 22:42:07 +00:00

latvian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

lithuanian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

luxembourgish.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

malay.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

norwegian_bokmal.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

norwegian_nynorsk.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

polish.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

portuguese.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

romanian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

russian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

serbian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

simplified_chinese.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

slovak.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

slovenian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

spanish_MX.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

spanish.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

swedish.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

tamil.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

thai.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

traditional_chinese.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

turkish.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

ukrainian.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

vietnamese.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00

welsh.txt

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00