Jonathan G Rennison 072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp ...

# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h

2017-02-05 20:43:56 +00:00

..

unfinished

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

afrikaans.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

arabic_egypt.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

basque.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

belarusian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

brazilian_portuguese.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

bulgarian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

catalan.txt

(svn r27735) -Update from Eints:

2017-01-15 18:45:39 +00:00

croatian.txt

(svn r27738) -Update from Eints:

2017-01-20 18:45:37 +00:00

czech.txt

(svn r27737) -Update from Eints:

2017-01-18 18:45:37 +00:00

danish.txt

Merge branch 'master' into jgrpp

2017-01-17 19:11:09 +00:00

dutch.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

english_AU.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

english_US.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

english.txt

Merge branch 'custom_bridgeheads' into jgrpp

2017-02-05 20:43:56 +00:00

esperanto.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

estonian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

faroese.txt

(svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints.

2016-12-09 21:26:37 +00:00

finnish.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

french.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

gaelic.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

galician.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

german.txt

Merge branch 'master' into jgrpp

2017-01-17 19:11:09 +00:00

greek.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

hebrew.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

hungarian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

icelandic.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

indonesian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

irish.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

italian.txt

(svn r27736) -Update from Eints:

2017-01-16 18:45:36 +00:00

japanese.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

korean.txt

Merge branch 'house_placing' into jgrpp

2017-02-05 19:05:09 +00:00

latin.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

latvian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

lithuanian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

luxembourgish.txt

(svn r27741) -Update from Eints:

2017-01-26 18:45:36 +00:00

malay.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

norwegian_bokmal.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

norwegian_nynorsk.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

polish.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

portuguese.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

romanian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

russian.txt

Merge branch 'house_placing' into jgrpp

2017-02-05 19:05:09 +00:00

serbian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

simplified_chinese.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

slovak.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

slovenian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

spanish_MX.txt

(svn r27742) -Update from Eints:

2017-02-03 18:45:39 +00:00

spanish.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

swedish.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

tamil.txt

(svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints.

2016-12-09 21:26:37 +00:00

thai.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

traditional_chinese.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

turkish.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

ukrainian.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

vietnamese.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00

welsh.txt

(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.

2017-01-14 18:30:26 +00:00