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

# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt

2017-04-07 18:31:06 +01:00

..

unfinished

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

afrikaans.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

arabic_egypt.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

basque.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

belarusian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

brazilian_portuguese.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

bulgarian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

catalan.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

croatian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

czech.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

danish.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

dutch.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

english_AU.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

english_US.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

english.txt

Merge branch 'tracerestrict-sx' into jgrpp

2017-04-05 19:00:24 +01:00

esperanto.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

estonian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

faroese.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

finnish.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

french.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

gaelic.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

galician.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

german.txt

Merge branch 'master' into jgrpp

2017-04-07 18:31:06 +01:00

greek.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

hebrew.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

hungarian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

icelandic.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

indonesian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

irish.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

italian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

japanese.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

korean.txt

Merge branch 'master' into jgrpp

2017-04-07 18:31:06 +01:00

latin.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

latvian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

lithuanian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

luxembourgish.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

malay.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

norwegian_bokmal.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

norwegian_nynorsk.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

polish.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

portuguese.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

romanian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

russian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

serbian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

simplified_chinese.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

slovak.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

slovenian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

spanish_MX.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

spanish.txt

Merge branch 'master' into jgrpp

2017-04-07 18:31:06 +01:00

swedish.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

tamil.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

thai.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

traditional_chinese.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

turkish.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

ukrainian.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

vietnamese.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

welsh.txt

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00