Merge branch 'save_ext' into day_length

# Conflicts: # src/saveload/saveload.cpp
2016-09-07 21:49:28 +01:00
parent cce270d780 a3d0fc5817
commit c8942219bd
259 changed files with 16793 additions and 3726 deletions
--- a/2
+++ b/2
@@ -195,7 +195,7 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE FINAL=
+PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU_SORT WITH_ICU_LAYOUT UNICODE _UNICODE _GNU_SOURCE FINAL=
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -84,7 +84,7 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
+	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | LC_ALL=C $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)
@@ -172,6 +172,7 @@ install: bundle
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/game"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
@@ -182,6 +183,7 @@ else
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/game/"* "$(INSTALL_DATA_DIR)/game"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/baseset/"* "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
 ifndef DO_NOT_INSTALL_DOCS
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -210,7 +210,7 @@ endif
 	{                                   \
 		print $$0                         \
 	}                                   \
-	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
+	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | LC_ALL=C $(SORT) > Makefile.dep
 	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak
--- a/bin/ai/compat_1.6.nut
+++ b/bin/ai/compat_1.6.nut
@@ -6,3 +6,5 @@
 * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 */
 AILog.Info("1.6 API compatibility in effect.");
--- a/bin/ai/compat_1.7.nut
+++ b/bin/ai/compat_1.7.nut
@@ -0,0 +1,8 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 */
--- a/bin/ai/regression/regression_info.nut
+++ b/bin/ai/regression/regression_info.nut
@@ -6,7 +6,7 @@ class Regression extends AIInfo {
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on some commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.6"; }
+	function GetAPIVersion()  { return "1.7"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }
--- a/bin/baseset/no_music.obm
+++ b/bin/baseset/no_music.obm
@@ -12,7 +12,7 @@ description.af_ZA = 'n Musiek stel sonder enige musiek.
 description.ar_EG = مجموعة موسيقى بدون موسيقى
 description.be_BY = "Пусты" набор музычнага афармлення, які не зьмяшчае ніякай музыкі.
 description.bg_BG = Празен музикален пакет.
-description.ca_ES = Un joc de música sense cap música.
+description.ca_ES = Una llista de música sense cap peça.
 description.cs_CZ = Prázná hudební sada.
 description.cy_GB = Pecyn cerddoriaeth heb unrhyw gerddoriaeth ynddo.
 description.da_DK = En musikpakke uden musik.
@@ -21,13 +21,15 @@ description.el_GR = Ένα πάκετο μουσικής χωρίς πραγμα
 description.en_AU = A music pack without actual music.
 description.en_US = A music pack without actual music.
 description.es_ES = Un conjunto de música vacío.
 description.es_MX = Paquete de música vacío
 description.et_EE = Muusikakogu ilma muusikata.
 description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia.
 description.fr_FR = Un pack de musiques sans musiques.
 description.ga_IE = Pacáiste ceoil gan aon cheol iarbhír ann.
 description.gd_GB = Pacaid ciùil anns nach eil fonn sam bith.
 description.gl_ES = Un conxunto de músicas sen ningunha música.
-description.hr_HR = Muzički paket bez ikakve muzike.
+description.he_IL = אוסף מנגינות ללא מנגינות.
 description.hr_HR = Glazbeni paket bez ikakve glazbe.
 description.hu_HU = Zenei alapcsomag zene nélkül.
 description.id_ID = Paket musik tanpa musik sungguhan.
 description.is_IS = Tónlistarpakki sem er í raun án tónlistar.
--- a/bin/baseset/no_sound.obs
+++ b/bin/baseset/no_sound.obs
@@ -12,7 +12,7 @@ description.af_ZA = 'n Klank stel sonder enige klanke.
 description.ar_EG = مجموعة صوت بدوت اصوات مضافة
 description.be_BY = "Пусты" набор гукавога афармленьня, які не зьмяшчае ніякіх гукаў.
 description.bg_BG = Празен звуков пакет.
-description.ca_ES = Un joc de sons sense cap so.
+description.ca_ES = Una llista de sons buida.
 description.cs_CZ = Prázdná sada zvuků.
 description.cy_GB = Pecyn sain heb unrhyw effeithiau sain ynddo.
 description.da_DK = En lydpakke uden lyde.
@@ -21,6 +21,7 @@ description.el_GR = Ένα πάκετο ήχων χώρις ήχους.
 description.en_AU = A sound pack without any sounds.
 description.en_US = A sound pack without any sounds.
 description.es_ES = Un conjunto de sonidos vacío.
 description.es_MX = Paquete de sonidos vacío
 description.et_EE = Helikogu ilma helideta.
 description.eu_ES = Soinurik gabeko soinu pakete bat
 description.fi_FI = Äänipaketti, jossa ei ole ääniä.
@@ -28,6 +29,7 @@ description.fr_FR = Un pack de sons sans sons.
 description.ga_IE = Pacáiste fuaimeanna gan aon fhuaimeanna ann.
 description.gd_GB = Pacaid fhuaimean anns nach eil fuaim sam bith.
 description.gl_ES = Un conxunto de sons sen ningún son
 description.he_IL = אוסף צלילים ללא צלילים.
 description.hr_HR = Zvučni paket bez ikakvih zvukova.
 description.hu_HU = Hang alapcsomag hangok nélkül.
 description.id_ID = Paket efek suara tanpa suara apapun.
@@ -38,6 +40,7 @@ description.ko_KR = 아무런 효과음도 없는 효과음 팩입니다.
 description.la_VA = Sarcina sonorum sine ullis sonis.
 description.lb_LU = E Soundpack ouni iergendee Sound.
 description.lt_LT = Garsų pakas be jokių garsų.
 description.lv_LV = Skaņu kopa bez skaņas.
 description.nb_NO = En lydpakke uten noen lyder.
 description.nl_NL = Een geluidset zonder geluid.
 description.nn_NO = Ei lydpakke utan nokon lydar.
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -13,7 +13,7 @@ description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe grafieke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة الدوس
 description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS.
-description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS.
+description.ca_ES = Gràfics originals del Transport Tycoon Deluxe pel DOS.
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro DOS).
 description.cy_GB = Graffeg gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
 description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS-version.
@@ -22,12 +22,14 @@ description.el_GR = Αρχικά γραφικά από το Transport Tycoon Del
 description.en_AU = Original Transport Tycoon Deluxe DOS edition graphics.
 description.en_US = Original Transport Tycoon Deluxe DOS edition graphics.
 description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS.
 description.es_MX = Gráficos originales de Transport Tycoon Deluxe para DOS.
 description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni graafika.
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS).
 description.ga_IE = Grafaicí bunaidhTransport Tycoon Deluxe, eagrán DOS.
 description.gd_GB = Grafaigeachd aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
 description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para DOS.
 description.he_IL = גרפיקות Transport Tycoon Deluxe המקורי בגרסת DOS.
 description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS.
@@ -38,6 +40,8 @@ description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에
 description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe DOS.
 description.lb_LU = Original Transport Tycoon Deluxe DOS Editioun Grafik.
 description.lt_LT = Originali Transport Tycoon Deluxe DOS leidimo grafika.
 description.lv_LV = Oriģinālā Transport Tycoon Deluxe DOS izdevuma grafika.
 description.ms_MY = Grafik asal Transport Tycoon Deluxe DOS edition.
 description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS.
 description.nl_NL = Originele graphics van de Transport Tycoon Deluxe DOS-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS.
--- a/bin/baseset/orig_dos.obs
+++ b/bin/baseset/orig_dos.obs
@@ -12,7 +12,7 @@ description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS uitgawe klanke.
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة الدوس
 description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за DOS.
-description.ca_ES = Sons originals de Transport Tycoon Deluxe per a DOS.
+description.ca_ES = Sons originals del Transport Tycoon Deluxe pel DOS.
 description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro DOS).
 description.cy_GB = Effeithiau sain gwreiddiol fersiwn DOS o Transport Tycoon Deluxe.
 description.da_DK = Originallyd fra Transport Tycoon Deluxe DOS-version.
@@ -21,12 +21,14 @@ description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe
 description.en_AU = Original Transport Tycoon Deluxe DOS edition sounds.
 description.en_US = Original Transport Tycoon Deluxe DOS edition sounds.
 description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión DOS.
 description.es_MX = Sonidos originales de Transport Tycoon Deluxe para DOS.
 description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni helid.
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version äänet.
 description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version DOS).
 description.ga_IE = Fuaimeanna bunaidh Transport Tycoon Deluxe, eagrán DOS.
 description.gd_GB = Fuaimean aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
 description.gl_ES = Sons da edición orixinal de Transport Tycoon Deluxe para DOS.
 description.he_IL = צלילי Transport Tycoon Deluxe המקורי בגרסת DOS.
 description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe DOS izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának hangjai.
 description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi DOS.
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -13,7 +13,7 @@ description.af_ZA = Oorspronklike Transport Tycoon Deluxe DOS (German) uitgawe g
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الالمانية نسخة الدوس
 description.be_BY = Арыґінальная ґрафіка зь нямецкай версіі Transport Tycoon Deluxe для DOS.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за DOS (немски) .
-description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a DOS (Alemany).
+description.ca_ES = Gràfics originals del Transport Tycoon Deluxe (alemany) pel DOS.
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (německá verze pro DOS).
 description.cy_GB = Graffeg gwreiddiol fersiwn DOS (Almaenig) o Transport Tycoon Deluxe.
 description.da_DK = Originalgrafik fra Transport Tycoon Deluxe DOS (Tysk) version.
@@ -22,12 +22,14 @@ description.el_GR = Αρχικά γραφικά από το Transport Tycoon Del
 description.en_AU = Original Transport Tycoon Deluxe DOS (German) edition graphics.
 description.en_US = Original Transport Tycoon Deluxe DOS (German) edition graphics.
 description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión DOS (Alemán).
 description.es_MX = Gráficos originales de Transport Tycoon Deluxe para DOS (en alemán).
 description.et_EE = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafika.
 description.fi_FI = Alkuperäiset Saksassa julkaistun Transport Tycoon Deluxen DOS-version grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS allemande).
 description.ga_IE = Grafaicí bunaidhTransport Tycoon Deluxe, eagrán DOS (Gearmánach).
 description.gd_GB = Grafaigeachd aig an deasachadh DOS (Gearmailteach) tùsail aig Transport Tycoon Deluxe.
 description.gl_ES = Graficos da edición orixinal (alemá) de Transport Tycoon Deluxe para DOS.
 description.he_IL = גרפיקות Transport Tycoon Deluxe המקורי בגרסת DOS (גרמנית).
 description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS (Njemački) izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS (német) verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS (Jerman).
@@ -38,6 +40,7 @@ description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에
 description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe DOS (Germanica).
 description.lb_LU = Original Transport Tycoon Deluxe DOS (Däitsch) Editioun Grafik.
 description.lt_LT = Originali Transport Tycoon Deluxe DOS (Vokiečių) leidimo grafika.
 description.lv_LV = Oriģinālā Transport Tycoon Deluxe DOS (vācu) izdevuma grafika.
 description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS (tysk).
 description.nl_NL = Originele graphics van de Duitse Transport Tycoon Deluxe DOS-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS (tysk).
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -13,7 +13,7 @@ description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe grafie
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الرسومية نسخة وندوز
 description.be_BY = Арыґінальная ґрафіка з Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинални графики на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Gràfics originals de Transport Tycoon Deluxe per a Windows.
+description.ca_ES = Gràfics originals del Transport Tycoon Deluxe pel Windows.
 description.cs_CZ = Původní sada grafik Transport Tycoon Deluxe (verze pro Windows).
 description.cy_GB = Graffeg gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
 description.da_DK = Originalgrafik fra Transport Tycoon Deluxe Windows-version.
@@ -22,12 +22,14 @@ description.el_GR = Αρχικά γραφικά από το Transport Tycoon Del
 description.en_AU = Original Transport Tycoon Deluxe Windows edition graphics.
 description.en_US = Original Transport Tycoon Deluxe Windows edition graphics.
 description.es_ES = Gráficos originales de Transport Tycoon Deluxe versión Windows.
 description.es_MX = Gráficos originales de Transport Tycoon Deluxe para Windows.
 description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni graafika.
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version Windows).
 description.ga_IE = Grafaicí bunaidhTransport Tycoon Deluxe, eagrán Windows.
 description.gd_GB = Grafaigeachd aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
 description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para Windows.
 description.he_IL = גרפיקות Transport Tycoon Deluxe המקורי בגרסת Windows.
 description.hr_HR = Originalna grafika za Transport Tycoon Deluxe Windows izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi Windows.
@@ -38,6 +40,8 @@ description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에
 description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe Windows.
 description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Grafik.
 description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo grafika.
 description.lv_LV = Oriģinālā Transport Tycoon Deluxe Windows izdevuma grafika.
 description.ms_MY = Grafik asal Transport Tycoon Deluxe edisi Windows.
 description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for Windows.
 description.nl_NL = Originele graphics van de Transport Tycoon Deluxe Windows-versie.
 description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for Windows.
--- a/bin/baseset/orig_win.obm
+++ b/bin/baseset/orig_win.obm
@@ -12,7 +12,7 @@ description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe musiek
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الموسيقية نسخة وندوز
 description.be_BY = Арыґінальны набор музычнага афармленьня з гульні Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинална музика на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Música Original de Transport Tycoon Deluxe per a Windows.
+description.ca_ES = Música original del Transport Tycoon Deluxe pel Windows.
 description.cs_CZ = Původní hudba Transport Tycoon Deluxe (verze pro Windows).
 description.cy_GB = Cerddoriaeth gwreiddiol fersion Windows o Transport Tycoon Deluxe.
 description.da_DK = Originalmusik fra Transport Tycoon Deluxe Windows-version.
@@ -21,13 +21,15 @@ description.el_GR = Αρχική μουσική από το Transport Tycoon Del
 description.en_AU = Original Transport Tycoon Deluxe Windows edition music.
 description.en_US = Original Transport Tycoon Deluxe Windows edition music.
 description.es_ES = Música original de Transport Tycoon Deluxe versión Windows.
 description.es_MX = Música original de Transport Tycoon Deluxe para Windows.
 description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
 description.fi_FI = Alkuperäinen Transport Tycoon Deluxen Windows-version musiikki.
 description.fr_FR = Musiques originales de Transport Tycoon Deluxe (version Windows).
 description.ga_IE = Ceol bunaidh Transport Tycoon Deluxe, eagrán Windows.
 description.gd_GB = Ceòl aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
 description.gl_ES = Música da edición orixinal de Transport Tycoon Deluxe para Windows.
-description.hr_HR = Originalna muzika za Transport Tycoon Deluxe Windows izdanje.
+description.he_IL = מנגינות Transport Tycoon Deluxe המקורי בגרסת Windows.
 description.hr_HR = Originalna glazba za Transport Tycoon Deluxe Windows izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának zenéje.
 description.id_ID = Musik pengiring orisinil Transport Tycoon Deluxe versi Windows.
 description.is_IS = Upprunalega tónlistin úr Transport Tycoon Deluxe Windows útgáfunni.
--- a/bin/baseset/orig_win.obs
+++ b/bin/baseset/orig_win.obs
@@ -12,7 +12,7 @@ description.af_ZA = Oorspronklike Transport Tycoon Deluxe Windows uitgawe klanke
 description.ar_EG = النسخة الاصلية من ترانسبورت تايكون ديلوكس الصوتية نسخة وندوز
 description.be_BY = Арыґінальны набор гукавога афармленьня з гульні Transport Tycoon Deluxe для Windows.
 description.bg_BG = Оригинални звуци на Transport Tycoon Deluxe за Windows.
-description.ca_ES = Sons originals de Transport Tycoon Deluxe per a Windows.
+description.ca_ES = Sons originals del Transport Tycoon Deluxe pel Windows.
 description.cs_CZ = Původní sada zvuků Transport Tycoon Deluxe (verze pro Windows).
 description.cy_GB = Effeithiau sain gwreiddiol fersiwn Windows o Transport Tycoon Deluxe.
 description.da_DK = Originallyd fra Transport Tycoon Deluxe Windows-version.
@@ -21,12 +21,14 @@ description.el_GR = Αρχικοί ήχοι από το Transport Tycoon Deluxe
 description.en_AU = Original Transport Tycoon Deluxe Windows edition sounds.
 description.en_US = Original Transport Tycoon Deluxe Windows edition sounds.
 description.es_ES = Sonidos originales de Transport Tycoon Deluxe versión Windows.
 description.es_MX = Sonidos originales de Transport Tycoon Deluxe para Windows.
 description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni helid.
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version äänet.
 description.fr_FR = Sons originaux de Transport Tycoon Deluxe (version Windows).
 description.ga_IE = Fuaimeanna bunaidh Transport Tycoon Deluxe, eagrán Windows.
 description.gd_GB = Fuaimean aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
 description.gl_ES = Sons da edición orixinal de Transport Tycoon Deluxe para Windows.
 description.he_IL = צלילי Transport Tycoon Deluxe המקורי בגרסת Windows.
 description.hr_HR = Originalni zvukovi za Transport Tycoon Deluxe Windows izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának hangjai.
 description.id_ID = Efek suara orisinil Transport Tycoon Deluxe versi Windows.
--- a/bin/game/compat_1.6.nut
+++ b/bin/game/compat_1.6.nut
@@ -6,3 +6,5 @@
 * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 */
 GSLog.Info("1.6 API compatibility in effect.");
--- a/bin/game/compat_1.7.nut
+++ b/bin/game/compat_1.7.nut
@@ -0,0 +1,8 @@
 /* $Id$ */
 /*
 * This file is part of OpenTTD.
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 */
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,30 +1,120 @@
 1.5.3 (2015-12-01)
 ------------------------------------------------------------------------
 (None)
 1.5.3-RC1 (2015-11-01)
 ------------------------------------------------------------------------
 - Fix: When selecting a refit cargo for orders, do not check whether the vehicle is in a depot or station, and do not ask whether the vehicle currently allows station-refitting. Also hide the refit cost for orders, it is not predictable (r27428)
 - Fix: Use the NewGRF railtype sorting order in the infrastructure window (r27427)
 - Fix: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows [FS#5842] (r27425)
 - Fix: Towns did not connect roads to existing roads, unless they had only a single roadbit. Otoh, towns also tried to connect to single roadbit tiles such as tunnels and depots, even though they were not connectable in the direction of interest [FS#6374] (r27424)
 - Fix: When towns expanded single-bit roadtiles using a grid-layout, they used the layout position of the neighbouring tile (r27423)
 - Fix: Aircraft picked the wrong airport entry point, if airports were rotated by 180 degree [FS#6341] (r27422)
 - Fix: Consider text and icon sizes when drawing the client list [FS#6265] (r27421)
 - Fix: GrowTownAtRoad sometimes returned false, even when a house was built [FS#6362] (r27420)
 - Fix: CmdSellRailWagon did not revert all actions properly when no orderlist could be allocated [FS#6369] (r27419)
 - Fix: Desync due to incorrect storage of segments with different railtype in the YAPF cache [FS#6329] [FS#6379] (r27418)
 - Fix: When a dedicated server was paused with no clients, the master server advertisement interval was slowed, causing deadvertisement of the server [FS#6368] (r27400)
 - Fix: [Makefile] Game script directory and compat*.nut were never installed on *nix (r27399)
 - Fix: There are two different availability conditions for fdatasync in the manpage. Use them both, since at least on some MinGW versions one is not enough (r27389)
 - Fix: win32 sound driver failed to report errors (r27383)
 - Fix: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font [FS#6358] (r27366)
 - Fix: Center settings filter warning also vertically, and also in case of multiple lines (r27365)
 1.5.2 (2015-09-01)
 ------------------------------------------------------------------------
 (None)
 1.5.2-RC1 (2015-08-01)
 ------------------------------------------------------------------------
 - Change: Auto-complete partial roads when building level-crossings [FS#6283] (r27309)
 - Fix: Do not rerandomise the town name when only cost-estimating the founding [FS#6332] (r27341)
 - Fix: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight() [FS#6335] (r27331, r27330, r27329, r27328)
 - Fix: Remove corner-case optimisation for line drawing, which failed for dashed lines  (r27324)
 - Fix: Clipping of inclined lines did not account for the 'horizontal width' being bigger than the 'real width' (r27323, r27322)
 - Fix: Incorrect owner assignment when adding/removing road/tram to/from bridges [FS#6317] (r27313, r27312)
 - Fix: Mark infrastructure window dirty in more cases (r27311)
 - Fix: Prevent breaking of tram-reversal points by adding more road pieces [FS#6283] (r27308)
 - Fix: Error message window with manager face failed with GUI zoom [FS#6259] (r27307)
 - Fix: Account for road-bridges and drive-through-stops in CanFollowRoad [FS#6320] (r27306, r27305)
 - Fix: Password window layout with GUI zoom [FS#6321] (r27304, r27303)
 - Fix: Speed-only timetables got assigned times in stations [FS#6313] (r27302, r27301)
 - Fix: Enforce the company's default service intervals when purchasing another company [FS#6254] (r27282, r27281)
 - Fix: Cloning/autoreplace/autorenew did not copy custom service intervals (r27280)
 1.5.1 (2015-06-01)
 ------------------------------------------------------------------------
 (None)
 1.5.1-RC1 (2015-05-08)
 ------------------------------------------------------------------------
 - Fix: Do not consider road junctions with trivial dead ends as branch points during town growth [FS#6245] (r27260, r27259, r27244)
 - Fix: ScriptList::RemoveList failed to remove a list from itself [FS#6287] (r27258)
 - Fix: Combined button+dropdown widgets in order and autoreplace GUI had incorrect hitbox when using GUI zoom [FS#6270] (r27255)
 - Fix: When building a lock on DC_AUTO-removable water-based objects, the water class was always set to canal [FS#6264] (r27254)
 - Fix: When crossing tram tracks with railroads, cost of extra roads was not being counted [FS#6282] (r27253)
 - Fix: Invalid infrastructure counting when crossing tram tracks with railroads [FS#6281] (r27252)
 - Fix: Broken error message in configure [FS#6286] (r27250)
 - Fix: In some cases town growth failure was considered as success [FS#6240] (r27249, r27247)
 - Fix: Town labels on smallmap and zoomed-out viewports were not centered [FS#6257] (r27248)
 - Fix: Removing a rail waypoint used the remove-rail-station cost [FS#6251] (r27245)
 - Fix: Duplicate frees due to pool item classes not having copy constructors [FS#6285] (r27243)
 - Fix: Crash when no AIs were installed due to improper handling of non-ASCII characters by the string pointer lexer [FS#6272] (r27233)
 - Fix: Compilation on DragonflyBSD [FS#6274] (r27224, r27223)
 - Fix: Use the current maximum speed as limited by bridges, orders etc. for all vehicle types alike when considering increased smoke emissions of vehicles [FS#6278] (r27222)
 - Fix: Multi-value keys in the desktop entry shall end with a trailing separator (r27221)
 - Fix: Draw path reservation on the whole bridge, not only on the bridge heads (r27209)
 - Fix: Draw correct overlay sprites for path reservations on bridges and tunnels (r27208)
 1.5.0 (2015-04-01)
 ------------------------------------------------------------------------
 - Fix: [NewGRF] Add Misc. GRF Feature Flag 6 to enable the second rocky tile set [FS#6260] (r27200)
 1.5.0-RC1 (2015-03-18)
 ------------------------------------------------------------------------
 - Feature: [NewGRF] Display relative offset changes in the sprite aligner [FS#6236] (r27174)
 - Fix: Original road vehicle acceleration crashed for vehicles taking over [FS#6255] (r27190)
 - Fix: GCC 5 compilation (r27185, r27183)
 - Fix: Data race due to lazy initialisation of objects [FS#5969] (r27178)
 - Fix: Compilation with MinGW64 (r27176)
 - Fix: Use the regular clipping functions in the sprite aligner instead of some magic [FS#6237] (r27173)
 - Fix: Windows randomly drops SetCursorPos calls, breaking the RMB-scrolling [FS#6238] (r27172)
 1.5.0-beta2 (2015-02-24)
 ------------------------------------------------------------------------
- Feature: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news. (r27164)
+- Feature: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news (r27164)
- Feature: Allow changing max heightlevel in scenario editor. (r27151)
+- Feature: Allow changing max heightlevel in scenario editor (r27151)
- Feature: Make use of both rocky tile sets from the base graphics. (r27117)
+- Feature: Make use of both rocky tile sets from the base graphics (r27117)
- Change: Scale (non-custom) default window sizes according to GUI zoom. (r27147)
+- Change: Scale (non-custom) default window sizes according to GUI zoom (r27147)
- Change: Make statusbar and chat-entry window use the same width as the toolbar. (r27146)
+- Change: Make statusbar and chat-entry window use the same width as the toolbar (r27146)
- Change: The chatbox-width setting now uses percent of screen width instead of pixels. (r27144)
+- Change: The chatbox-width setting now uses percent of screen width instead of pixels (r27144)
- Change: [NewGRF] Interpret negative positions in industry layouts depending on GRF version. (r27138)
+- Change: [NewGRF] Interpret negative positions in industry layouts depending on GRF version (r27138)
- Fix: [SDL, Windows] Right-mouse-button scrolling scrolled/jumped too far, when OpenTTD lagged during mouse event processing. (r27167)
+- Fix: [SDL, Windows] Right-mouse-button scrolling scrolled/jumped too far, when OpenTTD lagged during mouse event processing (r27167)
- Fix: Toolbars were not invalidated when changing max-vehicles settings. [FS#6204] (r27163)
+- Fix: Toolbars were not invalidated when changing max-vehicles settings [FS#6204] (r27163)
- Fix: Tile selection was drawn outside of map in some cases. [FS#6208] (r27162)
+- Fix: Tile selection was drawn outside of map in some cases [FS#6208] (r27162)
- Fix: Reimplement the viewport drawing algorithm. [FS#6156] [FS#6206] (r27161)
+- Fix: Reimplement the viewport drawing algorithm [FS#6156] [FS#6206] (r27161)
- Fix: Issues with smallmap and viewport coordinates and transformations. (r27160, r27159, r27158)
+- Fix: Issues with smallmap and viewport coordinates and transformations (r27160, r27159, r27158)
- Fix: Mark bridge middle tiles dirty when building/removing/changing bridges. (r27157)
+- Fix: Mark bridge middle tiles dirty when building/removing/changing bridges (r27157)
- Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty. (r27148)
+- Fix: Rounding and unit-conversion inconsistencies in calls to MarkAllViewportsDirty (r27148)
- Fix: Oilrig empty-tile checks were incorrect due to wrong TileIndexDiff->TileIndexDiffC conversion. (r27137)
+- Fix: Oilrig empty-tile checks were incorrect due to wrong TileIndexDiff->TileIndexDiffC conversion (r27137)
- Fix: Misalignment in generate world window in case of small fonts. (r27135)
+- Fix: Misalignment in generate world window in case of small fonts (r27135)
- Fix: Dragging of free wagons in depot failed with GUI zoom. (r27133)
+- Fix: Dragging of free wagons in depot failed with GUI zoom (r27133)
- Fix: Reduce memory footprint of map array by shuffling its members. [FS#6218] (r27132, r27126)
+- Fix: Reduce memory footprint of map array by shuffling its members [FS#6218] (r27132, r27126)
- Fix: Dropdown- and tooltip-windows should not steal the focus. (r27131)
+- Fix: Dropdown- and tooltip-windows should not steal the focus (r27131)
- Fix: [NewGRF] Action 7/9 condition 0A failed for present, but disabled, NewGRF. (r27119)
+- Fix: [NewGRF] Action 7/9 condition 0A failed for present, but disabled, NewGRF (r27119)
- Fix: Road vehicles could not reverse to be sent to depots when the following tile has the right type to run on, but could not be entered. [FS#6183] (r27107)
+- Fix: Road vehicles could not reverse to be sent to depots when the following tile has the right type to run on, but could not be entered [FS#6183] (r27107)
- Fix: Use the actual max speed of the vehicle in front when determining if a RV can overtake. [FS#6176] (r27106)
+- Fix: Use the actual max speed of the vehicle in front when determining if a RV can overtake [FS#6176] (r27106)
- Fix: grow_counter was not properly bounded by growth_rate, but by some other value used to calculate growth_rate. [FS#6195] (r27105)
+- Fix: grow_counter was not properly bounded by growth_rate, but by some other value used to calculate growth_rate [FS#6195] (r27105)
- Fix: [Script] Support 64 bits integers in ScriptLists. [FS#6194] (r27104)
+- Fix: [Script] Support 64 bits integers in ScriptLists [FS#6194] (r27104)
- Fix: [Script] Money values would end up wrong in strings when outside the bounds of a 32 bits integer. [FS#6194] (r27102)
+- Fix: [Script] Money values would end up wrong in strings when outside the bounds of a 32 bits integer [FS#6194] (r27102)
 1.5.0-beta1 (2014-12-24)
--- a/config.lib
+++ b/config.lib
@@ -85,7 +85,8 @@ set_default() {
 	with_libtimidity="1"
 	with_freetype="1"
 	with_fontconfig="1"
-	with_icu="1"
+	with_icu_layout="1"
 	with_icu_sort="1"
 	static_icu="0"
 	with_psp_config="1"
 	with_threads="1"
@@ -161,7 +162,8 @@ set_default() {
 		with_libtimidity
 		with_freetype
 		with_fontconfig
-		with_icu
+		with_icu_layout
 		with_icu_sort
 		static_icu
 		with_psp_config
 		with_threads
@@ -387,12 +389,18 @@ detect_params() {
 			--without-libfontconfig)      with_fontconfig="0";;
 			--with-libfontconfig=*)       with_fontconfig="$optarg";;
-			--with-icu)                   with_icu="2";;
+			--with-icu)                   with_icu_layout="2";with_icu_sort="2";;
-			--without-icu)                with_icu="0";;
+			--without-icu)                with_icu_layout="0";with_icu_sort="0";;
-			--with-icu=*)                 with_icu="$optarg";;
+			--with-icu=*)                 with_icu_layout="$optarg";with_icu_sort="$optarg";;
-			--with-libicu)                with_icu="2";;
+			--with-libicu)                with_icu_layout="2";with_icu_sort="2";;
-			--without-libicu)             with_icu="0";;
+			--without-libicu)             with_icu_layout="0";with_icu_sort="0";;
-			--with-libicu=*)              with_icu="$optarg";;
+			--with-libicu=*)              with_icu_layout="$optarg";with_icu_sort="$optarg";;
 			--with-icu-layout)            with_icu_layout="2";;
 			--without-icu-layout)         with_icu_layout="0";;
 			--with-icu-layout=*)          with_icu_layout="$optarg";;
 			--with-icu-sort)              with_icu_sort="2";;
 			--without-icu-sort)           with_icu_sort="0";;
 			--with-icu-sort=*)            with_icu_sort="$optarg";;
 			--static-icu)                 static_icu="1";;
 			--static-icu=*)               static_icu="$optarg";;
 			--static-libicu)              static_icu="1";;
@@ -791,7 +799,7 @@ check_params() {
 	pre_detect_with_zlib=$with_zlib
 	detect_zlib
-	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
+	if [ "$with_zlib" = "0" ] || [ -z "$zlib-config" ]; then
 		log 1 "WARNING: zlib was not detected or disabled"
 		log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean that many features"
 		log 1 "WARNING: (like loading most old savegames/scenarios, loading heightmaps,"
@@ -842,7 +850,8 @@ check_params() {
 	detect_png
 	detect_freetype
 	detect_fontconfig
-	detect_icu
+	detect_icu_layout
 	detect_icu_sort
 	detect_pspconfig
 	detect_libtimidity
@@ -1256,7 +1265,12 @@ make_compiler_cflags() {
 			# remark #2259: non-pointer conversion from ... to ... may lose significant bits
 			flags="$flags -wd2259"
 			# Use c++0x mode so static_assert() is available
-			cxxflags="$cxxflags -std=c++0x"
+			cxxflags="$cxxflags -std=c++11"
 		fi
 		if [ $cc_version -lt 140 ]; then
 			log 1 "configure: error: ICC version is too old: `$1 -dumpversion`, minumum: 14.0"
 			exit 1
 		fi
 		if [ "$enable_lto" != "0" ]; then
@@ -1276,7 +1290,7 @@ make_compiler_cflags() {
 		# -W alone doesn't enable all warnings enabled by -Wall; on the other hand,
 		# -Weverything enables too many useless warnings that can't be disabled (as of 3.0)
-		flags="$flags -Wall -W"
+		flags="$flags -Wall -W -Wextra"
 		# warning: unused parameter '...'
 		flags="$flags -Wno-unused-parameter"
@@ -1317,13 +1331,23 @@ make_compiler_cflags() {
 			flags="$flags -Wno-unused-variable"
 		fi
 		if [ "$cc_version" -ge "33" ]; then
 			# clang completed C++11 support in version 3.3
 			flags="$flags -std=c++11"
 		else
 			log 1 "configure: error: clang version is too old: `$1 -v 2>&1 | head -n 1`, minumum: 3.3"
 			exit 1
 		fi
 		# rdynamic is used to get useful stack traces from crash reports.
 		ldflags="$ldflags -rdynamic"
 	else
 		# Enable some things only for certain GCC versions
-		cc_version=`$1 -dumpversion | cut -c 1,3`
+		# cc_version = major_version * 100 + minor_version
 		# For example: "3.3" -> 303, "4.9.2" -> 409, "6" -> 600, "23.5" -> 2305
 		cc_version=`$1 -dumpversion | $awk -F . '{printf "%d%02d", $1, $2}'`
-		if [ $cc_version -lt 33 ]; then
+		if [ $cc_version -lt 303 ]; then
 			log 1 "configure: error: gcc older than 3.3 can't compile OpenTTD because of its poor template support"
 			exit 1
 		fi
@@ -1336,20 +1360,20 @@ make_compiler_cflags() {
 		if [ $enable_assert -eq 0 ]; then
 			# Do not warn about unused variables when building without asserts
 			flags="$flags -Wno-unused-variable"
-			if [ $cc_version -ge 46 ]; then
+			if [ $cc_version -ge 406 ]; then
 				# GCC 4.6 gives more warnings, disable them too
 				flags="$flags -Wno-unused-but-set-variable"
 				flags="$flags -Wno-unused-but-set-parameter"
 			fi
 		fi
-		if [ $cc_version -ge 34 ]; then
+		if [ $cc_version -ge 304 ]; then
 			# Warn when a variable is used to initialise itself:
 			# int a = a;
 			flags="$flags -Winit-self"
 		fi
-		if [ $cc_version -ge 40 ]; then
+		if [ $cc_version -ge 400 ]; then
 			# GCC 4.0+ complains about that we break strict-aliasing.
 			#  On most places we don't see how to fix it, and it doesn't
 			#  break anything. So disable strict-aliasing to make the
@@ -1360,7 +1384,7 @@ make_compiler_cflags() {
 			flags="$flags -Wcast-qual"
 		fi
-		if [ $cc_version -ge 42 ]; then
+		if [ $cc_version -ge 402 ]; then
 			# GCC 4.2+ automatically assumes that signed overflows do
 			# not occur in signed arithmetics, whereas we are not
 			# sure that they will not happen. It furthermore complains
@@ -1371,25 +1395,34 @@ make_compiler_cflags() {
 			flags="$flags -Wnon-virtual-dtor"
 		fi
-		if [ $cc_version -ge 43 ]; then
+		if [ $cc_version -ge 403 ] && [ $cc_version -lt 600 ]; then
 			# Use gnu++0x mode so static_assert() is available.
 			# Don't use c++0x, it breaks mingw (with gcc 4.4.0).
-			cxxflags="$cxxflags -std=gnu++0x"
+			cxxflags="$cxxflags -std=gnu++11"
 		fi
-		if [ $cc_version -eq 45 ]; then
+		if [ $cc_version -eq 405 ]; then
 			# Prevent optimisation supposing enums are in a range specified by the standard
 			# For details, see http://gcc.gnu.org/PR43680
 			flags="$flags -fno-tree-vrp"
 		fi
-		if [ $cc_version -ge 47 ]; then
+		if [ $cc_version -ge 407 ]; then
 			# Disable -Wnarrowing which gives many warnings, such as:
 			# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
 			# They are valid according to the C++ standard, but useless.
 			cxxflags="$cxxflags -Wno-narrowing"
 			# Disable bogus 'attempt to free a non-heap object' warning
 			flags="$flags -Wno-free-nonheap-object"
 		else
 			log 1 "configure: error: GCC version is too old: `$1 -dumpversion`, minumum: 4.7"
 			exit 1
 		fi
 		if [ $cc_version -ge 600 ]; then
 			# -flifetime-dse=2 (default since GCC 6) doesn't play
 			# well with our custom pool item allocator
 			cxxflags="$cxxflags -flifetime-dse=1 -std=gnu++14"
 		fi
 		if [ "$enable_lto" != "0" ]; then
@@ -1397,7 +1430,7 @@ make_compiler_cflags() {
 			has_lto=`$1 -dumpspecs | grep '\%{flto'`
 			if [ -n "$has_lto" ]; then
 				# Use LTO only if we see LTO exists and is requested
-				if [ $cc_version -lt 46 ]; then
+				if [ $cc_version -lt 406 ]; then
 					flags="$flags -flto"
 				else
 					flags="$flags -flto=jobserver"
@@ -1481,7 +1514,7 @@ make_cflags_and_ldflags() {
 	fi
 	if [ $enable_debug -le 2 ]; then
-		cc_host_is_gcc=`basename "$cc_host" | grep "gcc" &>/dev/null`
+		cc_host_is_gcc=`basename "$cc_host" | grep "gcc" 2>/dev/null`
 		if [ -n "$cc_host_is_gcc" ]; then
 			# Define only when compiling with GCC. Some GLIBC versions use GNU
 			# extensions in a way that breaks build with at least ICC.
@@ -1489,14 +1522,14 @@ make_cflags_and_ldflags() {
 			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
 		fi
-		cc_build_is_gcc=`basename "$cc_build" | grep "gcc" &>/dev/null`
+		cc_build_is_gcc=`basename "$cc_build" | grep "gcc" 2>/dev/null`
 		if [ -n "$cc_build_is_gcc" ]; then
 			# Just add -O1 to the tools needed for building.
 			CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2 -O1"
 		fi
 	fi
-	if [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
+	if [ "$os" = "OSX" ] && [ $cc_version -eq 400 ]; then
 		# Apple's GCC 4.0 has a compiler bug for x86_64 with (higher) optimization,
 		# wrongly optimizing ^= in loops. This disables the failing optimisation.
 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
@@ -1520,7 +1553,7 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$LDFLAGS -mwin32"
 		fi
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
-			if [ $cc_version -lt 46 ]; then
+			if [ $cc_version -lt 406 ]; then
 				flags="$flags -mno-cygwin"
 				LDFLAGS="$LDFLAGS -mno-cygwin"
 			fi
@@ -1533,10 +1566,10 @@ make_cflags_and_ldflags() {
 			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32 -limm32"
-			if [ $cc_version -ge 44 ]; then
+			if [ $cc_version -ge 404 ]; then
 				LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++"
 			fi
-			if [ $cc_version -ge 47 ]; then
+			if [ $cc_version -ge 407 ]; then
 				CFLAGS="$CFLAGS -mno-ms-bitfields"
 			fi
 		fi
@@ -1587,7 +1620,7 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
 		fi
-		if [ "$enable_universal" = "0" ] && [ $cc_version -gt 40 ]; then
+		if [ "$enable_universal" = "0" ] && [ $cc_version -gt 400 ]; then
 			# Only set the min version when not doing an universal build.
 			# Universal builds set the version elsewhere.
 			if [ "$cpu_type" = "64" ]; then
@@ -1657,12 +1690,13 @@ make_cflags_and_ldflags() {
 	fi
 	if [ "$with_zlib" != "0" ]; then
 		if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
 			LIBS="$LIBS $zlib"
 		else
 			LIBS="$LIBS -lz"
 		fi
 		CFLAGS="$CFLAGS -DWITH_ZLIB"
 		CFLAGS="$CFLAGS `$zlib_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
 			LIBS="$LIBS `$zlib_config --libs --static | tr '\n\r' '  '`"
 		else
 			LIBS="$LIBS `$zlib_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
 	if [ -n "$lzma_config" ]; then
@@ -1708,13 +1742,7 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS `$png_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
 			if [ "$os" = "OSX" ]; then
 				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
 				# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
 				LIBS="$LIBS `$png_config --variable=prefix`/lib/libpng.a `$png_config --libs --static | sed s@-lpng[0-9]*@@`"
 			else
 			LIBS="$LIBS `$png_config --libs --static | tr '\n\r' '  '`"
 			fi
 		else
 			LIBS="$LIBS `$png_config --libs | tr '\n\r' '  '`"
 		fi
@@ -1725,13 +1753,7 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
 			if [ "$os" = "OSX" ]; then
 				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
 				# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
 				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s@-lfontconfig@@`"
 			else
 			LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
 			fi
 		else
 			LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' '  '`"
 		fi
@@ -1742,26 +1764,31 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
-			if [ "$os" = "OSX" ]; then
+			LIBS="$LIBS `$freetype_config --libs --static | tr '\n\r' '  '`"
 				LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a"
 			else
 				# Is it possible to do static with freetype, if so: how?
 				LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
 			fi
 		else
 			LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
-	if [ -n "$icu_config" ]; then
+	if [ -n "$icu_layout_config" ]; then
-		CFLAGS="$CFLAGS -DWITH_ICU"
+		CFLAGS="$CFLAGS -DWITH_ICU_LAYOUT"
-		CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' '  '`"
+		CFLAGS="$CFLAGS `$icu_layout_config --cflags | tr '\n\r' '  '`"
 		# Some icu-configs have the 'feature' of not adding a space where others do add the space
 		if [ "$static_icu" != "0" ]; then
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
+			LIBS="$LIBS `$icu_layout_config --libs --static | tr '\n\r' '  ' | sed s/-licu/-lsicu/g`"
 		else
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' '  '`"
+			LIBS="$LIBS `$icu_layout_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
 	if [ -n "$icu_sort_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_ICU_SORT"
 		CFLAGS="$CFLAGS `$icu_sort_config --cflags | tr '\n\r' '  '`"
 		if [ "$static_icu" != "0" ]; then
 			LIBS="$LIBS `$icu_sort_config --libs --static | tr '\n\r' '  ' | sed s/-licu/-lsicu/g`"
 		else
 			LIBS="$LIBS `$icu_sort_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
@@ -1771,18 +1798,20 @@ make_cflags_and_ldflags() {
 		# GCC 4.0+ doesn't like the DirectX includes (gives tons of
 		#  warnings on it we won't be able to fix). For now just
 		#  suppress those warnings.
-		if [ $cc_version -ge 40 ]; then
+		if [ $cc_version -ge 400 ]; then
 			CFLAGS="$CFLAGS -Wno-non-virtual-dtor"
 		fi
 	fi
-	if [ -n "$libtimidity" ]; then
+	if [ -n "$libtimidity_config" ]; then
 		if [ "$enable_static" != "0" ]; then
 			LIBS="$LIBS $libtimidity"
 		else
 			LIBS="$LIBS -ltimidity"
 		fi
 		CFLAGS="$CFLAGS -DLIBTIMIDITY"
 		CFLAGS="$CFLAGS `$libtimidity_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
 			LIBS="$LIBS `$libtimidity_config --libs --static | tr '\n\r' '  '`"
 		else
 			LIBS="$LIBS `$libtimidity_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
 	if [ "$with_iconv" != "0" ]; then
@@ -2370,7 +2399,7 @@ detect_allegro() {
 		return 0
 	fi
-	# By default on OSX we don't use SDL. The rest is auto-detect
+	# By default on OSX we don't use Allegro. The rest is auto-detect
 	if [ "$with_allegro" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]; then
 		log 1 "checking Allegro... OSX, skipping"
@@ -2378,33 +2407,7 @@ detect_allegro() {
 		return 0
 	fi
-	if [ "$with_allegro" = "1" ] || [ "$with_allegro" = "" ] || [ "$with_allegro" = "2" ]; then
+	detect_pkg_config "$with_allegro" "allegro" "allegro_config" "4.4"
 		allegro_config="allegro-config"
 	else
 		allegro_config="$with_allegro"
 	fi
 	version=`$allegro_config --version 2>/dev/null`
 	ret=$?
 	log 2 "executing $allegro_config --version"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 	if [ -z "$version" ] || [ "$ret" != "0" ]; then
 		log 1 "checking Allegro... not found"
 		# It was forced, so it should be found.
 		if [ "$with_allegro" != "1" ]; then
 			log 1 "configure: error: allegro-config couldn't be found"
 			log 1 "configure: error: you supplied '$with_allegro', but it seems invalid"
 			exit 1
 		fi
 		allegro_config=""
 		return 0
 	fi
 	log 1 "checking Allegro... found"
 }
@@ -2450,33 +2453,7 @@ detect_sdl() {
 		sleep 5
 	fi
-	if [ "$with_sdl" = "1" ] || [ "$with_sdl" = "" ] || [ "$with_sdl" = "2" ]; then
+	detect_pkg_config "$with_sdl" "sdl" "sdl_config" "1.2"
 		sdl_config="sdl-config"
 	else
 		sdl_config="$with_sdl"
 	fi
 	version=`$sdl_config --version 2>/dev/null`
 	ret=$?
 	log 2 "executing $sdl_config --version"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 	if [ -z "$version" ] || [ "$ret" != "0" ]; then
 		log 1 "checking SDL... not found"
 		# It was forced, so it should be found.
 		if [ "$with_sdl" != "1" ]; then
 			log 1 "configure: error: sdl-config couldn't be found"
 			log 1 "configure: error: you supplied '$with_sdl', but it seems invalid"
 			exit 1
 		fi
 		sdl_config=""
 		return 0
 	fi
 	log 1 "checking SDL... found"
 }
 detect_osx_sdk() {
@@ -2657,10 +2634,13 @@ detect_library() {
 			fi
 		fi
 		if [ -z "$res" ] && [ "$os" = "HAIKU" ]; then
-			eval "$2=`ls -1 /boot/common/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+			if [ -z "$includeDir" ]; then
 				includeDir=`finddir B_SYSTEM_HEADERS_DIRECTORY`
 			fi
 			eval "$2=`ls -1 $includeDir/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 			eval "res=\$$2"
 			if [ -z "$res" ]; then
-				log 2 "  trying /boot/common/include/$4$5... no"
+				log 2 "  trying $includeDir/$4$5... no"
 			fi
 		fi
@@ -2729,7 +2709,7 @@ detect_library() {
 }
 detect_zlib() {
-	detect_library "$with_zlib" "zlib" "libz.a" "" "zlib.h"
+	detect_pkg_config "$with_zlib" "zlib" "zlib_config" "1.2"
 }
 detect_lzo2() {
@@ -2737,7 +2717,7 @@ detect_lzo2() {
 }
 detect_libtimidity() {
-	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h"
+	detect_pkg_config "$with_libtimidity" "libtimidity" "libtimidity_config" "0.1" "1"
 }
 detect_pkg_config() {
@@ -2745,6 +2725,7 @@ detect_pkg_config() {
 	# $2 - package name ('liblzma')
 	# $3 - config name ('lzma_config', sets $lzma_config)
 	# $4 - minimum module version ('2.3')
 	# $5 - check for dedicated, 1 is "skif if dedicated"
 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$1" = "0" ]; then
@@ -2754,6 +2735,13 @@ detect_pkg_config() {
 		return 0
 	fi
 	if [ "$5" = "1" ] && [ "$1" = "1" ] && [ "$enable_dedicated" != "0" ]; then
 		log 1 "checking $2... dedicated server, skipping"
 		eval "$3=\"\""
 		return 0
 	fi
 	log 2 "detecting $2"
 	if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then
@@ -2801,89 +2789,11 @@ detect_xdg_basedir() {
 }
 detect_png() {
 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$with_png" = "0" ]; then
 		log 1 "checking libpng... disabled"
 		png_config=""
 		return 0
 	fi
 	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
 		if [ "$with_png" != "1" ]; then
 			log 1 "checking libpng... no zlib"
 			log 1 "ERROR: libpng was forced, but zlib was not detected / disabled."
 			log 1 "ERROR: libpng depends on zlib."
 			exit 1
 		fi
 		log 1 "checking libpng... no zlib, skipping"
 		png_config=""
 		return 0
 	fi
 	detect_pkg_config "$with_png" "libpng" "png_config" "1.2"
 }
 detect_freetype() {
-	# 0 means no, 1 is auto-detect, 2 is force
+	detect_pkg_config "$with_freetype" "freetype2" "freetype_config" "2.2" "1"
 	if [ "$with_freetype" = "0" ]; then
 		log 1 "checking libfreetype... disabled"
 		freetype_config=""
 		return 0
 	fi
 	if [ "$with_freetype" = "1" ] && [ "$enable_dedicated" != "0" ]; then
 		log 1 "checking libfreetype... dedicated server, skipping"
 		freetype_config=""
 		return 0
 	fi
 	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
 		if [ "$with_freetype" != "1" ]; then
 			log 1 "checking libfreetype... no zlib"
 			log 1 "ERROR: libfreetype was forced, but zlib was not detected / disabled."
 			log 1 "ERROR: libfreetype depends on zlib."
 			exit 1
 		fi
 		log 1 "checking libfreetype... no zlib, skipping"
 		freetype_config=""
 		return 0
 	fi
 	if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then
 		freetype_config="freetype-config"
 	else
 		freetype_config="$with_freetype"
 	fi
 	version=`$freetype_config --version 2>/dev/null`
 	ret=$?
 	log 2 "executing freetype_config --version"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 	if [ -z "$version" ] || [ "$ret" != "0" ]; then
 		log 1 "checking libfreetype... not found"
 		# It was forced, so it should be found.
 		if [ "$with_freetype" != "1" ]; then
 			log 1 "configure: error: freetype-config couldn't be found"
 			log 1 "configure: error: you supplied '$with_freetype', but it seems invalid"
 			exit 1
 		fi
 		freetype_config=""
 		return 0
 	fi
 	log 1 "checking libfreetype... found"
 }
 detect_fontconfig() {
@@ -2894,19 +2804,6 @@ detect_fontconfig() {
 		fontconfig_config=""
 		return 0
 	fi
 	if [ "$with_fontconfig" = "1" ] && [ "$enable_dedicated" != "0" ]; then
 		log 1 "checking libfontconfig... dedicated server, skipping"
 		fontconfig_config=""
 		return 0
 	fi
 	if [ "$with_fontconfig" != "2" ] && [ -z "$freetype_config" ]; then
 		log 1 "checking libfontconfig... no freetype, skipping"
 		fontconfig_config=""
 		return 0
 	fi
 	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
 		log 1 "checking libfontconfig... WIN32, skipping"
 		fontconfig_config=""
@@ -2919,57 +2816,15 @@ detect_fontconfig() {
 		return 0
 	fi
-	detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3"
+	detect_pkg_config "$with_fontconfig" "fontconfig" "fontconfig_config" "2.3" "1"
 }
-detect_icu() {
+detect_icu_layout() {
-	# 0 means no, 1 is auto-detect, 2 is force
+	detect_pkg_config "$with_icu_layout" "icu-lx" "icu_layout_config" "4.8" "1"
-	if [ "$with_icu" = "0" ]; then
+}
 		log 1 "checking libicu... disabled"
-		icu_config=""
+detect_icu_sort() {
-		return 0
+	detect_pkg_config "$with_icu_sort" "icu-i18n" "icu_sort_config" "4.8" "1"
 	fi
 	if [ "$with_icu" = "1" ] && [ "$enable_dedicated" != "0" ]; then
 		log 1 "checking libicu... dedicated server, skipping"
 		icu_config=""
 		return 0
 	fi
 	if [ "$with_icu" = "1" ] || [ "$with_icu" = "" ] || [ "$with_icu" = "2" ]; then
 		icu_config="icu-config"
 	else
 		icu_config="$with_icu"
 	fi
 	version=`$icu_config --version 2>/dev/null`
 	ret=$?
 	check_version '3.6' "$version"
 	version_ok=$?
 	log 2 "executing $icu_config --version"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
 		if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
 			log 1 "checking libicu... needs at least version 3.6.0, icu NOT enabled"
 		else
 			log 1 "checking libicu... not found"
 		fi
 		# It was forced, so it should be found.
 		if [ "$with_icu" != "1" ]; then
 			log 1 "configure: error: icu-config couldn't be found"
 			log 1 "configure: error: you supplied '$with_icu', but it seems invalid"
 			exit 1
 		fi
 		icu_config=""
 		return 0
 	fi
 	log 1 "checking libicu... found"
 }
 detect_pspconfig() {
@@ -3684,23 +3539,30 @@ showhelp() {
 	echo "  --with-midi=midi               define which midi-player to use"
 	echo "  --with-midi-arg=arg            define which args to use for the"
 	echo "                                 midi-player"
-	echo "  --with-libtimidity             enables libtimidity support"
+	echo "  --with-libtimidity[=\"pkg-config libtimidity\"]"
-	echo "  --with-allegro[=allegro-config]"
+	echo "                                 enables libtimidity support"
 	echo "  --with-allegro[=\"pkg-config allegro\"]"
 	echo "                                 enables Allegro video driver support"
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
-	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
+	echo "  --with-sdl[=\"pkg-config sdl\"]  enables SDL video driver support"
-	echo "  --with-zlib[=zlib.a]           enables zlib support"
+	echo "  --with-zlib[=\"pkg-config zlib\"]"
 	echo "                                 enables zlib support"
 	echo "  --with-liblzma[=\"pkg-config liblzma\"]"
 	echo "                                 enables liblzma support"
 	echo "  --with-liblzo2[=liblzo2.a]     enables liblzo2 support"
-	echo "  --with-png[=libpng-config]     enables libpng support"
+	echo "  --with-png[=\"pkg-config libpng\"]"
-	echo "  --with-freetype[=freetype-config]"
+	echo "                                 enables libpng support"
 	echo "  --with-freetype[=\"pkg-config freetype2\"]"
 	echo "                                 enables libfreetype support"
 	echo "  --with-fontconfig[=\"pkg-config fontconfig\"]"
 	echo "                                 enables fontconfig support"
 	echo "  --with-xdg-basedir[=\"pkg-config libxdg-basedir\"]"
 	echo "                                 enables XDG base directory support"
-	echo "  --with-icu[=icu-config]        enables icu (used for right-to-left support)"
+	echo "  --with-icu                     enables icu components for layout and sorting"
 	echo "  --with-icu-layout[=\"pkg-config icu-lx\"]"
 	echo "                                 enables icu components for layouting (right-to-left support)"
 	echo "  --with-icu-sort[=\"pkg-config icu-i18n\"]"
 	echo "                                 enables icu components for locale specific string sorting"
 	echo "  --static-icu                   try to link statically (libsicu instead of"
 	echo "                                 libicu; can fail as the new name is guessed)"
 	echo "  --with-iconv[=iconv-path]      enables iconv support"
--- a/2
+++ b/2
@@ -149,7 +149,7 @@ AWKCOMMAND='
 # Read the source.list and process it
 # Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
-SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | $PIPE_SORT`"
+SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | LC_ALL=C $PIPE_SORT`"
 OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", $0); print $0; }'`"
 OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.cpp$/ { gsub(\".cpp$\", \".o\", $0); print $0; }'`"
--- a/findversion.sh
+++ b/findversion.sh
@@ -99,7 +99,7 @@ elif [ -d "$ROOT_DIR/.git" ]; then
 		# No rev? Maybe it is a custom git-svn clone
 		REV_NR=`LC_ALL=C git log --pretty=format:%b --grep="git-svn-id:.*@[0-9]*" -1 | sed "s@.*\@\([0-9]*\).*@\1@"`
 	fi
-	TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@'`"
+	TAG="`git describe --tags 2>/dev/null`"
 	if [ -n "$TAG" ]; then
 		BRANCH=""
 		REV="$TAG"
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,51 @@
 openttd (1.5.3-0) unstable; urgency=low
  * New upstream release 1.5.3
 -- OpenTTD <info@openttd.org>  Tue, 01 Dec 2015 21:00:00 +0100
 openttd (1.5.3~RC1-0) unstable; urgency=low
  * New upstream release 1.5.3-RC1
 -- OpenTTD <info@openttd.org>  Sun, 01 Nov 2015 14:00:00 +0100
 openttd (1.5.2-0) unstable; urgency=low
  * New upstream release 1.5.2
 -- OpenTTD <info@openttd.org>  Tue, 01 Sep 2015 21:00:00 +0200
 openttd (1.5.2~RC1-0) unstable; urgency=low
  * New upstream release 1.5.2-RC1
 -- OpenTTD <info@openttd.org>  Sat, 01 Aug 2015 13:00:00 +0200
 openttd (1.5.1-0) unstable; urgency=low
  * New upstream release 1.5.1
 -- OpenTTD <info@openttd.org>  Mon, 01 Jun 2015 21:00:00 +0200
 openttd (1.5.1~RC1-0) unstable; urgency=low
  * New upstream release 1.5.1-RC1
 -- OpenTTD <info@openttd.org>  Fri, 08 May 2015 21:00:00 +0200
 openttd (1.5.0-0) unstable; urgency=low
  * New upstream release 1.5.0
 -- OpenTTD <info@openttd.org>  Wed, 01 Apr 2015 21:00:00 +0200
 openttd (1.5.0~RC1-0) unstable; urgency=low
  * New upstream release 1.5.0-RC1
 -- OpenTTD <info@openttd.org>  Wed, 18 Mar 2015 21:00:00 +0100
 openttd (1.5.0~beta2-0) unstable; urgency=low
  * New upstream release 1.5.0-beta2
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
@echo off
-set OPENTTD_VERSION=1.6.0
+set OPENTTD_VERSION=1.7.0
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -17,9 +17,9 @@
 #
 Name:           openttd
-Version:        1.6.beta1
+Version:        1.7.beta1
 Release:        0
-%define srcver  1.6.0-beta1
+%define srcver  1.7.0-beta1
 Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
 License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -1,6 +1,6 @@
 # Version numbers to update
 !define APPV_MAJOR 1
-!define APPV_MINOR 6
+!define APPV_MINOR 7
 !define APPV_MAINT 0
 !define APPV_BUILD 0
 !define APPV_EXTRA "-beta1"
--- a/projects/generate
+++ b/projects/generate
@@ -22,6 +22,15 @@ then
 	exit 1
 fi
 # openttd_vs140.sln             is for MSVC 2015
 # openttd_vs140.vcxproj         is for MSVC 2015
 # openttd_vs140.vcxproj.filters is for MSVC 2015
 # langs_vs140.vcxproj           is for MSVC 2015
 # strgen_vs140.vcxproj          is for MSVC 2015
 # strgen_vs140.vcxproj.filters  is for MSVC 2015
 # generate_vs140.vcxproj        is for MSVC 2015
 # version_vs140.vcxproj         is for MSVC 2015
 # openttd_vs100.sln             is for MSVC 2010
 # openttd_vs100.vcxproj         is for MSVC 2010
 # openttd_vs100.vcxproj.filters is for MSVC 2010
@@ -306,11 +315,17 @@ generate "$openttd" "openttd_vs80.vcproj"
 generate "$openttd" "openttd_vs90.vcproj"
 generate "$openttdvcxproj" "openttd_vs100.vcxproj"
 generate "$openttdfiles" "openttd_vs100.vcxproj.filters" "$openttdfilters"
 generate "$openttdvcxproj" "openttd_vs140.vcxproj"
 generate "$openttdfiles" "openttd_vs140.vcxproj.filters" "$openttdfilters"
 generate "$lang" "langs_vs80.vcproj"
 generate "$lang" "langs_vs90.vcproj"
 generate "$langvcxproj" "langs_vs100.vcxproj"
 generate "$langfiles" "langs_vs100.vcxproj.filters"
 generate "$langvcxproj" "langs_vs140.vcxproj"
 generate "$langfiles" "langs_vs140.vcxproj.filters"
 generate "$settings" "settings_vs80.vcproj" "$settingscommand"
 generate "$settings" "settings_vs90.vcproj" "$settingscommand"
 generate "$settingsvcxproj" "settings_vs100.vcxproj" "$settingscommand"
 generate "$settingsfiles" "settings_vs100.vcxproj.filters"
 generate "$settingsvcxproj" "settings_vs140.vcxproj" "$settingscommand"
 generate "$settingsfiles" "settings_vs140.vcxproj.filters"
--- a/projects/generate.vbs
+++ b/projects/generate.vbs
@@ -10,6 +10,15 @@ Option Explicit
 Dim FSO
 Set FSO = CreateObject("Scripting.FileSystemObject")
 ' openttd_vs140.sln             is for MSVC 2015
 ' openttd_vs140.vcxproj         is for MSVC 2015
 ' openttd_vs140.vcxproj.filters is for MSVC 2015
 ' langs_vs140.vcxproj           is for MSVC 2015
 ' strgen_vs140.vcxproj          is for MSVC 2015
 ' strgen_vs140.vcxproj.filters  is for MSVC 2015
 ' generate_vs140.vcxproj        is for MSVC 2015
 ' version_vs140.vcxproj         is for MSVC 2015
 ' openttd_vs100.sln             is for MSVC 2010
 ' openttd_vs100.vcxproj         is for MSVC 2010
 ' openttd_vs100.vcxproj.filters is for MSVC 2010
@@ -369,6 +378,8 @@ generate openttd, ROOT_DIR & "/projects/openttd_vs80.vcproj", Null
 generate openttd, ROOT_DIR & "/projects/openttd_vs90.vcproj", Null
 generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs100.vcxproj", Null
 generate openttdfiles, ROOT_DIR & "/projects/openttd_vs100.vcxproj.filters", openttdfilters
 generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs140.vcxproj", Null
 generate openttdfiles, ROOT_DIR & "/projects/openttd_vs140.vcxproj.filters", openttdfilters
 Dim lang, langvcxproj, langfiles
 lang = load_lang_data(ROOT_DIR & "/src/lang", langvcxproj, langfiles)
@@ -376,6 +387,8 @@ generate lang, ROOT_DIR & "/projects/langs_vs80.vcproj", Null
 generate lang, ROOT_DIR & "/projects/langs_vs90.vcproj", Null
 generate langvcxproj, ROOT_DIR & "/projects/langs_vs100.vcxproj", Null
 generate langfiles, ROOT_DIR & "/projects/langs_vs100.vcxproj.filters", Null
 generate langvcxproj, ROOT_DIR & "/projects/langs_vs140.vcxproj", Null
 generate langfiles, ROOT_DIR & "/projects/langs_vs140.vcxproj.filters", Null
 Dim settings, settingsvcxproj, settingscommand, settingsfiles
 settings = load_settings_data(ROOT_DIR & "/src/table", settingsvcxproj, settingscommand, settingsfiles)
@@ -383,3 +396,5 @@ generate settings, ROOT_DIR & "/projects/settings_vs80.vcproj", settingscommand
 generate settings, ROOT_DIR & "/projects/settings_vs90.vcproj", settingscommand
 generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs100.vcxproj", settingscommand
 generate settingsfiles, ROOT_DIR & "/projects/settings_vs100.vcxproj.filters", Null
 generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs140.vcxproj", settingscommand
 generate settingsfiles, ROOT_DIR & "/projects/settings_vs140.vcxproj.filters", Null
--- a/projects/generate_vs140.vcxproj
+++ b/projects/generate_vs140.vcxproj
@@ -0,0 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>generate</ProjectName>
    <ProjectGuid>{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}</ProjectGuid>
    <RootNamespace>generate</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Utility</ConfigurationType>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <ItemDefinitionGroup>
  </ItemDefinitionGroup>
  <ItemGroup>
    <CustomBuild Include="..\source.list">
      <FileType>Document</FileType>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Running %27generate.vbs%27 ...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)generate.vbs"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)openttd_vs80.vcproj;$(SolutionDir)openttd_vs90.vcproj;$(SolutionDir)openttd_vs100.vcxproj;$(SolutionDir)openttd_vs100.vcxproj.filters;$(SolutionDir)langs_vs80.vcproj;$(SolutionDir)langs_vs90.vcproj;$(SolutionDir)langs_vs100.vcxproj;%(Outputs)</Outputs>
    </CustomBuild>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/langs_vs100.vcxproj
+++ b/projects/langs_vs100.vcxproj
@@ -317,6 +317,12 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
--- a/projects/langs_vs100.vcxproj.filters
+++ b/projects/langs_vs100.vcxproj.filters
@@ -142,6 +142,9 @@
    <CustomBuild Include="..\src\lang\slovenian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
--- a/projects/langs_vs140.vcxproj
+++ b/projects/langs_vs140.vcxproj
@@ -0,0 +1,390 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>langs</ProjectName>
    <ProjectGuid>{0F066B23-18DF-4284-8265-F4A5E7E3B966}</ProjectGuid>
    <RootNamespace>langs</RootNamespace>
    <Keyword>MakeFileProj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Utility</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\langs\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <PreBuildEvent>
      <Message>Generating strings.h</Message>
      <Command>..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table</Command>
    </PreBuildEvent>
    <Midl>
      <TypeLibraryName>./langs.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
  </ItemDefinitionGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\lang\english.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\afrikaans.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating afrikaans language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\afrikaans.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\arabic_egypt.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating arabic_egypt language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\arabic_egypt.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\basque.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating basque language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\basque.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\belarusian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating belarusian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\belarusian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\brazilian_portuguese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating brazilian_portuguese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\brazilian_portuguese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\bulgarian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating bulgarian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\bulgarian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\catalan.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating catalan language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\catalan.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\croatian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating croatian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\croatian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\czech.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating czech language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\czech.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\danish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating danish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\danish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\dutch.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating dutch language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\dutch.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_AU.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_AU language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english_AU.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_US.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_US language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english_US.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\esperanto.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating esperanto language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\esperanto.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\estonian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating estonian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\estonian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\faroese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating faroese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\faroese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\finnish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating finnish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\finnish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\french.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating french language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\french.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\gaelic.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gaelic language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\gaelic.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\galician.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating galician language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\galician.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\german.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating german language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\german.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\greek.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating greek language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\greek.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\hebrew.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating hebrew language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\hebrew.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\hungarian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating hungarian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\hungarian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\icelandic.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating icelandic language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\icelandic.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\indonesian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating indonesian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\indonesian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\irish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating irish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\irish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\italian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating italian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\italian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\japanese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating japanese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\japanese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\korean.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating korean language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\korean.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\latin.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latin language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\latin.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\latvian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latvian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\latvian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\lithuanian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating lithuanian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\lithuanian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\luxembourgish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating luxembourgish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\luxembourgish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\malay.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating malay language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\malay.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\norwegian_bokmal.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating norwegian_bokmal language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\norwegian_bokmal.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\norwegian_nynorsk.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating norwegian_nynorsk language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\norwegian_nynorsk.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\polish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating polish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\polish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\portuguese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating portuguese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\portuguese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\romanian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating romanian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\romanian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\russian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating russian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\russian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\serbian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating serbian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\serbian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\simplified_chinese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating simplified_chinese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\simplified_chinese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\slovak.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating slovak language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovak.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\slovenian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating slovenian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\swedish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating swedish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\swedish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\tamil.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating tamil language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\tamil.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\thai.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating thai language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\thai.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\traditional_chinese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating traditional_chinese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\traditional_chinese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\turkish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating turkish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\turkish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\ukrainian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating ukrainian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\ukrainian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\vietnamese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating vietnamese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\vietnamese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\welsh.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating welsh language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\welsh.lng;%(Outputs)</Outputs>
    </CustomBuild>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="strgen_vs100.vcxproj">
      <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/langs_vs140.vcxproj.filters
+++ b/projects/langs_vs140.vcxproj.filters
@@ -0,0 +1,176 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Translations">
      <UniqueIdentifier>{2a164580-9033-4a01-974b-b21da507efda}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\lang\english.txt" />
    <CustomBuild Include="..\src\lang\afrikaans.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\arabic_egypt.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\basque.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\belarusian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\brazilian_portuguese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\bulgarian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\catalan.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\croatian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\czech.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\danish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\dutch.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_AU.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_US.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\esperanto.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\estonian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\faroese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\finnish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\french.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\gaelic.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\galician.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\german.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\greek.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\hebrew.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\hungarian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\icelandic.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\indonesian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\irish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\italian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\japanese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\korean.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\latin.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\latvian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\lithuanian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\luxembourgish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\malay.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\norwegian_bokmal.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\norwegian_nynorsk.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\polish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\portuguese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\romanian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\russian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\serbian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\simplified_chinese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\slovak.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\slovenian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\swedish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\tamil.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\thai.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\traditional_chinese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\turkish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\ukrainian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\vietnamese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\welsh.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
  </ItemGroup>
 </Project>
--- a/projects/langs_vs140.vcxproj.filters.in
+++ b/projects/langs_vs140.vcxproj.filters.in
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Translations">
      <UniqueIdentifier>{2a164580-9033-4a01-974b-b21da507efda}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\lang\english.txt" />
 !!FILES!!
  </ItemGroup>
 </Project>
--- a/projects/langs_vs140.vcxproj.in
+++ b/projects/langs_vs140.vcxproj.in
@@ -0,0 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>langs</ProjectName>
    <ProjectGuid>{0F066B23-18DF-4284-8265-F4A5E7E3B966}</ProjectGuid>
    <RootNamespace>langs</RootNamespace>
    <Keyword>MakeFileProj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Utility</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\langs\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <PreBuildEvent>
      <Message>Generating strings.h</Message>
      <Command>..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table</Command>
    </PreBuildEvent>
    <Midl>
      <TypeLibraryName>./langs.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
  </ItemDefinitionGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\lang\english.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english.lng;%(Outputs)</Outputs>
    </CustomBuild>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="strgen_vs100.vcxproj">
      <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/langs_vs80.vcproj
+++ b/projects/langs_vs80.vcproj
@@ -738,6 +738,21 @@
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\spanish_MX.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating spanish_MX language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\spanish_MX.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\spanish.txt"
 				>
--- a/projects/langs_vs90.vcproj
+++ b/projects/langs_vs90.vcproj
@@ -739,6 +739,21 @@
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\spanish_MX.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating spanish_MX language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\spanish_MX.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\spanish.txt"
 				>
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -102,7 +102,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -156,7 +156,7 @@
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -204,7 +204,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -256,7 +256,7 @@
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -571,6 +571,7 @@
    <ClInclude Include="..\src\roadstop_base.h" />
    <ClInclude Include="..\src\roadveh.h" />
    <ClInclude Include="..\src\safeguards.h" />
    <ClInclude Include="..\src\scope.h" />
    <ClInclude Include="..\src\screenshot.h" />
    <ClInclude Include="..\src\sdl.h" />
    <ClInclude Include="..\src\sound\sdl_s.h" />
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -942,6 +942,9 @@
    <ClInclude Include="..\src\safeguards.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\scope.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\screenshot.h">
      <Filter>Header Files</Filter>
    </ClInclude>
--- a/projects/openttd_vs100.vcxproj.in
+++ b/projects/openttd_vs100.vcxproj.in
@@ -102,7 +102,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -156,7 +156,7 @@
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -204,7 +204,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -256,7 +256,7 @@
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
--- a/projects/openttd_vs140.sln
+++ b/projects/openttd_vs140.sln
@@ -0,0 +1,94 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs140.vcxproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0817F629-589E-4A3B-B81A-8647BC571E35} = {0817F629-589E-4A3B-B81A-8647BC571E35}
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs140.vcxproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs140.vcxproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs140.vcxproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate", "generate_vs140.vcxproj", "{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs140.vcxproj", "{0817F629-589E-4A3B-B81A-8647BC571E35}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_vs140.vcxproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.Build.0 = Debug|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.Build.0 = Release|x64
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|x64.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|Win32.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
 	EndGlobalSection
 EndGlobal
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
--- a/projects/openttd_vs140.vcxproj.filters.in
+++ b/projects/openttd_vs140.vcxproj.filters.in
@@ -0,0 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
 !!FILTERS!!
  </ItemGroup>
  <ItemGroup>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <None Include="..\media\openttd.ico" />
    <None Include="..\readme.txt" />
  </ItemGroup>
 </Project>
--- a/projects/openttd_vs140.vcxproj.in
+++ b/projects/openttd_vs140.vcxproj.in
@@ -0,0 +1,332 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|x64">
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|x64">
      <Configuration>Release</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>openttd</ProjectName>
    <ProjectGuid>{668328A0-B40E-4CDB-BD72-D0064424414A}</ProjectGuid>
    <RootNamespace>openttd</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\bin</LocalDebuggerWorkingDirectory>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Midl>
      <TypeLibraryName>.\Release/openttd.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Full</Optimization>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <StructMemberAlignment>4Bytes</StructMemberAlignment>
      <BufferSecurityCheck>false</BufferSecurityCheck>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <PrecompiledHeaderOutputFile>
      </PrecompiledHeaderOutputFile>
      <AssemblerOutput>All</AssemblerOutput>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>false</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CallingConvention>FastCall</CallingConvention>
      <CompileAs>Default</CompileAs>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <StackReserveSize>1048576</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
      <OptimizeReferences>true</OptimizeReferences>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Midl>
      <TypeLibraryName>.\Debug/openttd.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>false</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CallingConvention>FastCall</CallingConvention>
      <CompileAs>Default</CompileAs>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <StackReserveSize>1048576</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Midl>
      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\Release/openttd.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Full</Optimization>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <StructMemberAlignment>Default</StructMemberAlignment>
      <BufferSecurityCheck>false</BufferSecurityCheck>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <PrecompiledHeaderOutputFile>
      </PrecompiledHeaderOutputFile>
      <AssemblerOutput>All</AssemblerOutput>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>false</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CallingConvention>FastCall</CallingConvention>
      <CompileAs>Default</CompileAs>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <StackReserveSize>1048576</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
      <OptimizeReferences>true</OptimizeReferences>
      <TargetMachine>MachineX64</TargetMachine>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Midl>
      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\Debug/openttd.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/J /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <PrecompiledHeaderOutputFile>
      </PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>false</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CallingConvention>Cdecl</CallingConvention>
      <CompileAs>Default</CompileAs>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <StackReserveSize>1048576</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
      <TargetMachine>MachineX64</TargetMachine>
      <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <None Include="..\media\openttd.ico" />
    <None Include="..\readme.txt" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="langs_vs100.vcxproj">
      <Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
    <ProjectReference Include="strgen_vs100.vcxproj">
      <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
    <ProjectReference Include="version_vs100.vcxproj">
      <Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -156,7 +156,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -362,7 +362,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -1558,6 +1558,10 @@
 				RelativePath=".\..\src\safeguards.h"
 				>
 			</File>
 			<File
 				RelativePath=".\..\src\scope.h"
 				>
 			</File>
 			<File
 				RelativePath=".\..\src\screenshot.h"
 				>
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -156,7 +156,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -257,7 +257,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -362,7 +362,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -155,7 +155,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -359,7 +359,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -1555,6 +1555,10 @@
 				RelativePath=".\..\src\safeguards.h"
 				>
 			</File>
 			<File
 				RelativePath=".\..\src\scope.h"
 				>
 			</File>
 			<File
 				RelativePath=".\..\src\screenshot.h"
 				>
--- a/projects/openttd_vs90.vcproj.in
+++ b/projects/openttd_vs90.vcproj.in
@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -155,7 +155,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -255,7 +255,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -359,7 +359,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
--- a/projects/settings_vs140.vcxproj
+++ b/projects/settings_vs140.vcxproj
@@ -0,0 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>settings</ProjectName>
    <ProjectGuid>{0817F629-589E-4A3B-B81A-8647BC571E35}</ProjectGuid>
    <RootNamespace>settings</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <SettingsCommandLine>
 ..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini ..\src\table\window_settings.ini
    </SettingsCommandLine>
  </PropertyGroup>
  <PropertyGroup>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir>
    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeReBuildCommandLine>
    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\objs\settings\table\settings.h</NMakeCleanCommandLine>
    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\settings.h</NMakeOutput>
  </PropertyGroup>
  <ItemGroup>
    <None Include="..\src\table\company_settings.ini" />
    <None Include="..\src\table\currency_settings.ini" />
    <None Include="..\src\table\gameopt_settings.ini" />
    <None Include="..\src\table\misc_settings.ini" />
    <None Include="..\src\table\settings.ini" />
    <None Include="..\src\table\win32_settings.ini" />
    <None Include="..\src\table\window_settings.ini" />
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
    <None Include="..\src\table\settings.h.preamble" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/settings_vs140.vcxproj.filters
+++ b/projects/settings_vs140.vcxproj.filters
@@ -0,0 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="INI">
      <UniqueIdentifier>{21deca6c-8df4-4f34-9dad-17d7781cd5a0}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\company_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\currency_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\gameopt_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\misc_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\win32_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\window_settings.ini">
      <Filter>INI</Filter>
    </None>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
    <None Include="..\src\table\settings.h.preamble" />
  </ItemGroup>
 </Project>
--- a/projects/settings_vs140.vcxproj.filters.in
+++ b/projects/settings_vs140.vcxproj.filters.in
@@ -0,0 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="INI">
      <UniqueIdentifier>{21deca6c-8df4-4f34-9dad-17d7781cd5a0}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
    <None Include="..\src\table\settings.h.preamble" />
  </ItemGroup>
 </Project>
--- a/projects/settings_vs140.vcxproj.in
+++ b/projects/settings_vs140.vcxproj.in
@@ -0,0 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>settings</ProjectName>
    <ProjectGuid>{0817F629-589E-4A3B-B81A-8647BC571E35}</ProjectGuid>
    <RootNamespace>settings</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <SettingsCommandLine>
 !!FILTERS!!
    </SettingsCommandLine>
  </PropertyGroup>
  <PropertyGroup>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir>
    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeReBuildCommandLine>
    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\objs\settings\table\settings.h</NMakeCleanCommandLine>
    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\settings.h</NMakeOutput>
  </PropertyGroup>
  <ItemGroup>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
    <None Include="..\src\table\settings.h.preamble" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/settingsgen_vs140.vcxproj
+++ b/projects/settingsgen_vs140.vcxproj
@@ -0,0 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>settingsgen</ProjectName>
    <ProjectGuid>{E9548DE9-F089-49B7-93A6-30BE2CC311C7}</ProjectGuid>
    <RootNamespace>settings</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</IntDir>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">settings_gen</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <PreBuildEvent>
      <Command>
      </Command>
    </PreBuildEvent>
    <CustomBuildStep>
      <Inputs>%(Inputs)</Inputs>
    </CustomBuildStep>
    <ClCompile>
      <Optimization>MinSpace</Optimization>
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <PreprocessorDefinitions>SETTINGSGEN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AssemblerOutput>All</AssemblerOutput>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <OutputFile>$(OutDir)settings_gen.exe</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <SubSystem>Console</SubSystem>
      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
    </Link>
    <PostBuildEvent>
      <Command>
      </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\core\alloc_func.cpp" />
    <ClCompile Include="..\src\misc\getoptdata.cpp" />
    <ClCompile Include="..\src\ini_load.cpp" />
    <ClCompile Include="..\src\settingsgen\settingsgen.cpp" />
    <ClCompile Include="..\src\string.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\misc\getoptdata.h" />
    <ClInclude Include="..\src\ini_type.h" />
    <ClInclude Include="..\src\core\smallvec_type.hpp" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\strings_type.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/settingsgen_vs140.vcxproj.filters
+++ b/projects/settingsgen_vs140.vcxproj.filters
@@ -0,0 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
      <UniqueIdentifier>{a4678737-b3b3-4be5-9db1-fa6ccd164c59}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\core\alloc_func.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\misc\getoptdata.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\ini_load.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\settingsgen\settingsgen.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\string.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\misc\getoptdata.h" />
    <ClInclude Include="..\src\ini_type.h" />
    <ClInclude Include="..\src\core\smallvec_type.hpp" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\strings_type.h" />
  </ItemGroup>
 </Project>
--- a/projects/strgen_vs140.vcxproj
+++ b/projects/strgen_vs140.vcxproj
@@ -0,0 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>strgen</ProjectName>
    <ProjectGuid>{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}</ProjectGuid>
    <RootNamespace>strgen</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\strgen\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\strgen\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Midl>
      <TypeLibraryName>.\Debug/strgen.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MinSpace</Optimization>
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <PreprocessorDefinitions>STRGEN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeaderOutputFile>
      </PrecompiledHeaderOutputFile>
      <AssemblerOutput>All</AssemblerOutput>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x041d</Culture>
    </ResourceCompile>
    <Link>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(IntDir)strgen.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\core\alloc_func.cpp" />
    <ClCompile Include="..\src\strgen\strgen_base.cpp" />
    <ClCompile Include="..\src\strgen\strgen.cpp" />
    <ClCompile Include="..\src\string.cpp" />
    <ClCompile Include="..\src\misc\getoptdata.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\core\alloc_func.hpp" />
    <ClInclude Include="..\src\table\control_codes.h" />
    <ClInclude Include="..\src\debug.h" />
    <ClInclude Include="..\src\core\endian_func.hpp" />
    <ClInclude Include="..\src\stdafx.h" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\misc\getoptdata.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/strgen_vs140.vcxproj.filters
+++ b/projects/strgen_vs140.vcxproj.filters
@@ -0,0 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
      <UniqueIdentifier>{5894294c-d4dc-41f0-be31-e56cff4e0405}</UniqueIdentifier>
      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\core\alloc_func.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\strgen\strgen_base.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\strgen\strgen.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\string.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\misc\getoptdata.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\core\alloc_func.hpp" />
    <ClInclude Include="..\src\table\control_codes.h" />
    <ClInclude Include="..\src\debug.h" />
    <ClInclude Include="..\src\core\endian_func.hpp" />
    <ClInclude Include="..\src\stdafx.h" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\misc\getoptdata.h" />
  </ItemGroup>
 </Project>
--- a/projects/version_vs140.vcxproj
+++ b/projects/version_vs140.vcxproj
@@ -0,0 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>version</ProjectName>
    <ProjectGuid>{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}</ProjectGuid>
    <RootNamespace>version</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\version\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\version\</IntDir>
    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)/determineversion.vbs"</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)/determineversion.vbs"</NMakeReBuildCommandLine>
    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\rev.cpp</NMakeOutput>
    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\src\rev.cpp</NMakeCleanCommandLine>
  </PropertyGroup>
  <ItemGroup>
    <None Include="..\src\os\windows\ottdres.rc.in" />
    <None Include="..\src\rev.cpp.in" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/source.list
+++ b/source.list
@@ -310,6 +310,7 @@ road_type.h
 roadstop_base.h
 roadveh.h
 safeguards.h
 scope.h
 screenshot.h
 sdl.h
 sound/sdl_s.h
--- a/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp
+++ b/src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp
@@ -119,10 +119,10 @@ static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
 		const SQChar *sErr = 0;
 		if(sq_gettop(v)>=1) {
 			if(SQ_SUCCEEDED(sq_getstring(v,2,&sErr)))	{
-				pf(v,"\nAN ERROR HAS OCCURED [%s]\n",sErr);
+				pf(v,"\nAN ERROR HAS OCCURRED [%s]\n",sErr);
 			}
 			else{
-				pf(v,"\nAN ERROR HAS OCCURED [unknown]\n");
+				pf(v,"\nAN ERROR HAS OCCURRED [unknown]\n");
 			}
 			sqstd_printcallstack(v);
 		}
--- a/src/3rdparty/squirrel/squirrel/sqapi.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqapi.cpp
@@ -798,7 +798,8 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx)
 	switch(type) {
 	case OT_TABLE:
 		if(type(mt) == OT_TABLE) {
-			if(!_table(self)->SetDelegate(_table(mt))) return sq_throwerror(v, "delagate cycle"); v->Pop();}
+			if(!_table(self)->SetDelegate(_table(mt))) return sq_throwerror(v, "delagate cycle");
 			v->Pop();}
 		else if(type(mt)==OT_NULL) {
 			_table(self)->SetDelegate(NULL); v->Pop(); }
 		else return sq_aux_invalidtype(v,type);
--- a/src/3rdparty/squirrel/squirrel/sqdebug.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqdebug.cpp
@@ -105,7 +105,7 @@ void SQVM::Raise_IdxError(const SQObject &o)
 void SQVM::Raise_CompareError(const SQObject &o1, const SQObject &o2)
 {
 	SQObjectPtr oval1 = PrintObjVal(o1), oval2 = PrintObjVal(o2);
-	Raise_Error("comparsion between '%.50s' and '%.50s'", _stringval(oval1), _stringval(oval2));
+	Raise_Error("comparison between '%.50s' and '%.50s'", _stringval(oval1), _stringval(oval2));
 }
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -28,6 +28,7 @@
 #include "../widgets/dropdown_type.h"
 #include "../widgets/dropdown_func.h"
 #include "../hotkeys.h"
 #include "../core/geometry_func.hpp"
 #include "ai.hpp"
 #include "ai_gui.hpp"
@@ -766,6 +767,22 @@ struct AIConfigWindow : public Window {
 				this->line_height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
 				size->height = 8 * this->line_height;
 				break;
 			case WID_AIC_CHANGE: {
 				SetDParam(0, STR_AI_CONFIG_CHANGE_GAMESCRIPT);
 				Dimension dim = GetStringBoundingBox(STR_AI_CONFIG_CHANGE);
 				SetDParam(0, STR_AI_CONFIG_CHANGE_NONE);
 				dim = maxdim(dim, GetStringBoundingBox(STR_AI_CONFIG_CHANGE));
 				SetDParam(0, STR_AI_CONFIG_CHANGE_AI);
 				dim = maxdim(dim, GetStringBoundingBox(STR_AI_CONFIG_CHANGE));
 				dim.width += padding.width;
 				dim.height += padding.height;
 				*size = maxdim(*size, dim);
 				break;
 			}
 		}
 	}
@@ -901,8 +918,7 @@ struct AIConfigWindow : public Window {
 					ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
 				} else {
 #if defined(ENABLE_NETWORK)
-					ShowNetworkContentListWindow(NULL, CONTENT_TYPE_AI);
+					ShowNetworkContentListWindow(NULL, CONTENT_TYPE_AI, CONTENT_TYPE_GAME);
 					_network_content_client.RequestContentList(CONTENT_TYPE_GAME);
 #endif
 				}
 				break;
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -28,7 +28,7 @@ static bool CheckAPIVersion(const char *api_version)
 {
 	return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "1.0") == 0 || strcmp(api_version, "1.1") == 0 ||
 			strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0 || strcmp(api_version, "1.4") == 0 ||
-			strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0;
+			strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0;
 }
 #if defined(WIN32)
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -809,7 +809,7 @@ static byte AircraftGetEntryPoint(const Aircraft *v, const AirportFTAClass *apc,
 		/* We are northwest or southeast of the airport */
 		dir = delta_y < 0 ? DIAGDIR_NW : DIAGDIR_SE;
 	}
-	dir = ChangeDiagDir(dir, (DiagDirDiff)ReverseDiagDir(DirToDiagDir(rotation)));
+	dir = ChangeDiagDir(dir, DiagDirDifference(DIAGDIR_NE, DirToDiagDir(rotation)));
 	return apc->entry_points[dir];
 }
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -433,6 +433,7 @@ void AddArticulatedParts(Vehicle *first)
 		v->x_pos = first->x_pos;
 		v->y_pos = first->y_pos;
 		v->z_pos = first->z_pos;
 		v->date_of_last_service = first->date_of_last_service;
 		v->build_year = first->build_year;
 		v->vehstatus = first->vehstatus & ~VS_STOPPED;
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -20,6 +20,11 @@
 /** Instantiation of the 32bpp with animation blitter factory. */
 static FBlitter_32bppAnim iFBlitter_32bppAnim;
 Blitter_32bppAnim::~Blitter_32bppAnim()
 {
 	free(this->anim_buf);
 }
 template <BlitterMode mode>
 inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom)
 {
--- a/src/blitter/32bpp_anim.hpp
+++ b/src/blitter/32bpp_anim.hpp
@@ -29,6 +29,8 @@ public:
 		anim_buf_height(0)
 	{}
 	~Blitter_32bppAnim();
 	/* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
 	/* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal);
 	/* virtual */ void SetPixel(void *video, int x, int y, uint8 colour);
--- a/src/command_func.h
+++ b/src/command_func.h
@@ -81,7 +81,7 @@ CommandCallback CcBuildBridge;
 /* dock_gui.cpp */
 CommandCallback CcBuildDocks;
-CommandCallback CcBuildCanal;
+CommandCallback CcPlaySound_SPLAT_WATER;
 /* depot_gui.cpp */
 CommandCallback CcCloneVehicle;
@@ -97,19 +97,19 @@ CommandCallback CcAddVehicleNewGroup;
 CommandCallback CcBuildIndustry;
 /* main_gui.cpp */
-CommandCallback CcPlaySound10;
+CommandCallback CcPlaySound_EXPLOSION;
 CommandCallback CcPlaceSign;
 CommandCallback CcTerraform;
 CommandCallback CcGiveMoney;
 /* rail_gui.cpp */
-CommandCallback CcPlaySound1E;
+CommandCallback CcPlaySound_SPLAT_RAIL;
 CommandCallback CcRailDepot;
 CommandCallback CcStation;
 CommandCallback CcBuildRailTunnel;
 /* road_gui.cpp */
-CommandCallback CcPlaySound1D;
+CommandCallback CcPlaySound_SPLAT_OTHER;
 CommandCallback CcBuildRoadTunnel;
 CommandCallback CcRoadDepot;
 CommandCallback CcRoadStop;
--- a/src/company_base.h
+++ b/src/company_base.h
@@ -45,7 +45,7 @@ struct CompanyInfrastructure {
 	}
 };
-typedef Pool<Company, CompanyByte, 1, MAX_COMPANIES> CompanyPool;
+typedef Pool<Company, CompanyID, 1, MAX_COMPANIES> CompanyPool;
 extern CompanyPool _company_pool;
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -1764,7 +1764,8 @@ struct CompanyInfrastructureWindow : Window
 				if (this->railtypes != RAILTYPES_NONE) {
 					/* Draw name of each valid railtype. */
-					for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
+					RailType rt;
 					FOR_ALL_SORTED_RAILTYPES(rt) {
 						if (HasBit(this->railtypes, rt)) {
 							SetDParam(0, GetRailTypeInfo(rt)->strings.name);
 							DrawString(r.left + offs_left, r.right - offs_right, y += FONT_HEIGHT_NORMAL, STR_WHITE_STRING);
@@ -1781,7 +1782,8 @@ struct CompanyInfrastructureWindow : Window
 			case WID_CI_RAIL_COUNT: {
 				/* Draw infrastructure count for each valid railtype. */
 				uint32 rail_total = c->infrastructure.GetRailTotal();
-				for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
+				RailType rt;
 				FOR_ALL_SORTED_RAILTYPES(rt) {
 					if (HasBit(this->railtypes, rt)) {
 						this->DrawCountLine(r, y, c->infrastructure.rail[rt], RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total));
 					}
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -45,6 +45,38 @@
 /* scriptfile handling */
 static bool _script_running; ///< Script is running (used to abort execution when #ConReturn is encountered).
 /** File list storage for the console, for caching the last 'ls' command. */
 class ConsoleFileList : public FileList {
 public:
 	ConsoleFileList() : FileList()
 	{
 		this->file_list_valid = false;
 	}
 	/** Declare the file storage cache as being invalid, also clears all stored files. */
 	void InvalidateFileList()
 	{
 		this->Clear();
 		this->file_list_valid = false;
 	}
 	/**
 	 * (Re-)validate the file storage cache. Only makes a change if the storage was invalid, or if \a force_reload.
 	 * @param Always reload the file storage cache.
 	 */
 	void ValidateFileList(bool force_reload = false)
 	{
 		if (force_reload || !this->file_list_valid) {
 			this->BuildFileList(FT_SAVEGAME, SLO_LOAD);
 			this->file_list_valid = true;
 		}
 	}
 	bool file_list_valid; ///< If set, the file list is valid.
 };
 static ConsoleFileList _console_file_list; ///< File storage cache for the console.
 /* console command defines */
 #define DEF_CONSOLE_CMD(function) static bool function(byte argc, char *argv[])
 #define DEF_CONSOLE_HOOK(function) static ConsoleHookResult function(bool echo)
@@ -286,7 +318,7 @@ DEF_CONSOLE_CMD(ConSave)
 		char *filename = str_fmt("%s.sav", argv[1]);
 		IConsolePrint(CC_DEFAULT, "Saving map...");
-		if (SaveOrLoad(filename, SL_SAVE, SAVE_DIR) != SL_OK) {
+		if (SaveOrLoad(filename, SLO_SAVE, DFT_GAME_FILE, SAVE_DIR) != SL_OK) {
 			IConsolePrint(CC_ERROR, "Saving map failed");
 		} else {
 			IConsolePrintF(CC_DEFAULT, "Map successfully saved to %s", filename);
@@ -315,42 +347,6 @@ DEF_CONSOLE_CMD(ConSaveConfig)
 	return true;
 }
 /**
 * Get savegame file informations.
 * @param file The savegame filename to return information about. Can be the actual name
 *             or a numbered entry into the filename list.
 * @return FiosItem The information on the file.
 */
 static const FiosItem *GetFiosItem(const char *file)
 {
 	_saveload_mode = SLD_LOAD_GAME;
 	BuildFileList();
 	for (const FiosItem *item = _fios_items.Begin(); item != _fios_items.End(); item++) {
 		if (strcmp(file, item->name) == 0) return item;
 		if (strcmp(file, item->title) == 0) return item;
 	}
 	/* If no name matches, try to parse it as number */
 	char *endptr;
 	int i = strtol(file, &endptr, 10);
 	if (file == endptr || *endptr != '\0') i = -1;
 	if (IsInsideMM(i, 0, _fios_items.Length())) return _fios_items.Get(i);
 	/* As a last effort assume it is an OpenTTD savegame and
 	 * that the ".sav" part was not given. */
 	char long_file[MAX_PATH];
 	seprintf(long_file, lastof(long_file), "%s.sav", file);
 	for (const FiosItem *item = _fios_items.Begin(); item != _fios_items.End(); item++) {
 		if (strcmp(long_file, item->name) == 0) return item;
 		if (strcmp(long_file, item->title) == 0) return item;
 	}
 	return NULL;
 }
 DEF_CONSOLE_CMD(ConLoad)
 {
 	if (argc == 0) {
@@ -361,24 +357,21 @@ DEF_CONSOLE_CMD(ConLoad)
 	if (argc != 2) return false;
 	const char *file = argv[1];
-	const FiosItem *item = GetFiosItem(file);
+	_console_file_list.ValidateFileList();
 	const FiosItem *item = _console_file_list.FindItem(file);
 	if (item != NULL) {
-		switch (item->type) {
+		if (GetAbstractFileType(item->type) == FT_SAVEGAME) {
 			case FIOS_TYPE_FILE: case FIOS_TYPE_OLDFILE: {
 			_switch_mode = SM_LOAD_GAME;
-				SetFiosType(item->type);
+			_file_to_saveload.SetMode(item->type);
-
+			_file_to_saveload.SetName(FiosBrowseTo(item));
-				strecpy(_file_to_saveload.name, FiosBrowseTo(item), lastof(_file_to_saveload.name));
+			_file_to_saveload.SetTitle(item->title);
-				strecpy(_file_to_saveload.title, item->title, lastof(_file_to_saveload.title));
+		} else {
-				break;
+			IConsolePrintF(CC_ERROR, "%s: Not a savegame.", file);
 			}
 			default: IConsolePrintF(CC_ERROR, "%s: Not a savegame.", file);
 		}
 	} else {
 		IConsolePrintF(CC_ERROR, "%s: No such file or directory.", file);
 	}
 	FiosFreeSavegameList();
 	return true;
 }
@@ -393,7 +386,8 @@ DEF_CONSOLE_CMD(ConRemove)
 	if (argc != 2) return false;
 	const char *file = argv[1];
-	const FiosItem *item = GetFiosItem(file);
+	_console_file_list.ValidateFileList();
 	const FiosItem *item = _console_file_list.FindItem(file);
 	if (item != NULL) {
 		if (!FiosDelete(item->name)) {
 			IConsolePrintF(CC_ERROR, "%s: Failed to delete file", file);
@@ -402,7 +396,7 @@ DEF_CONSOLE_CMD(ConRemove)
 		IConsolePrintF(CC_ERROR, "%s: No such file or directory.", file);
 	}
-	FiosFreeSavegameList();
+	_console_file_list.InvalidateFileList();
 	return true;
 }
@@ -415,13 +409,11 @@ DEF_CONSOLE_CMD(ConListFiles)
 		return true;
 	}
-	BuildFileList();
+	_console_file_list.ValidateFileList(true);
-
+	for (uint i = 0; i < _console_file_list.Length(); i++) {
-	for (uint i = 0; i < _fios_items.Length(); i++) {
+		IConsolePrintF(CC_DEFAULT, "%d) %s", i, _console_file_list[i].title);
 		IConsolePrintF(CC_DEFAULT, "%d) %s", i, _fios_items[i].title);
 	}
 	FiosFreeSavegameList();
 	return true;
 }
@@ -436,7 +428,8 @@ DEF_CONSOLE_CMD(ConChangeDirectory)
 	if (argc != 2) return false;
 	const char *file = argv[1];
-	const FiosItem *item = GetFiosItem(file);
+	_console_file_list.ValidateFileList(true);
 	const FiosItem *item = _console_file_list.FindItem(file);
 	if (item != NULL) {
 		switch (item->type) {
 			case FIOS_TYPE_DIR: case FIOS_TYPE_DRIVE: case FIOS_TYPE_PARENT:
@@ -448,7 +441,7 @@ DEF_CONSOLE_CMD(ConChangeDirectory)
 		IConsolePrintF(CC_ERROR, "%s: No such file or directory.", file);
 	}
-	FiosFreeSavegameList();
+	_console_file_list.InvalidateFileList();
 	return true;
 }
@@ -462,8 +455,8 @@ DEF_CONSOLE_CMD(ConPrintWorkingDirectory)
 	}
 	/* XXX - Workaround for broken file handling */
-	FiosGetSavegameList(SLD_LOAD_GAME);
+	_console_file_list.ValidateFileList(true);
-	FiosFreeSavegameList();
+	_console_file_list.InvalidateFileList();
 	FiosGetDescText(&path, NULL);
 	IConsolePrint(CC_DEFAULT, path);
--- a/src/core/pool_func.hpp
+++ b/src/core/pool_func.hpp
@@ -121,7 +121,7 @@ DEFINE_POOL_METHOD(inline void *)::AllocateItem(size_t size, size_t index)
 		item = (Titem *)MallocT<byte>(size);
 	}
 	this->data[index] = item;
-	item->index = (uint)index;
+	item->index = (Tindex)(uint)index;
 	return item;
 }
--- a/src/core/smallvec_type.hpp
+++ b/src/core/smallvec_type.hpp
@@ -256,6 +256,8 @@ public:
 	/**
 	 * Get the number of items in the list.
 	 *
 	 * @return The number of items in the list.
 	 */
 	inline uint Length() const
 	{
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -36,6 +36,38 @@
 #include <time.h>
 #ifdef WITH_ALLEGRO
 #	include <allegro.h>
 #endif /* WITH_ALLEGRO */
 #ifdef WITH_FONTCONFIG
 #	include <fontconfig/fontconfig.h>
 #endif /* WITH_FONTCONFIG */
 #ifdef WITH_PNG
 	/* pngconf.h, included by png.h doesn't like something in the
 	 * freetype headers. As such it's not alphabetically sorted. */
 #	include <png.h>
 #endif /* WITH_PNG */
 #ifdef WITH_FREETYPE
 #	include <ft2build.h>
 #	include FT_FREETYPE_H
 #endif /* WITH_FREETYPE */
 #if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT)
 #	include <unicode/uversion.h>
 #endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */
 #ifdef WITH_LZMA
 #	include <lzma.h>
 #endif
 #ifdef WITH_LZO
 #include <lzo/lzo1x.h>
 #endif
 #ifdef WITH_SDL
 #	include "sdl.h"
 #	include <SDL.h>
 #endif /* WITH_SDL */
 #ifdef WITH_ZLIB
 # include <zlib.h>
 #endif
 #include "safeguards.h"
 /* static */ const char *CrashLog::message = NULL;
@@ -180,39 +212,6 @@ char *CrashLog::LogConfiguration(char *buffer, const char *last) const
 	return buffer;
 }
 /* Include these here so it's close to where it's actually used. */
 #ifdef WITH_ALLEGRO
 #	include <allegro.h>
 #endif /* WITH_ALLEGRO */
 #ifdef WITH_FONTCONFIG
 #	include <fontconfig/fontconfig.h>
 #endif /* WITH_FONTCONFIG */
 #ifdef WITH_PNG
 	/* pngconf.h, included by png.h doesn't like something in the
 	 * freetype headers. As such it's not alphabetically sorted. */
 #	include <png.h>
 #endif /* WITH_PNG */
 #ifdef WITH_FREETYPE
 #	include <ft2build.h>
 #	include FT_FREETYPE_H
 #endif /* WITH_FREETYPE */
 #ifdef WITH_ICU
 #	include <unicode/uversion.h>
 #endif /* WITH_ICU */
 #ifdef WITH_LZMA
 #	include <lzma.h>
 #endif
 #ifdef WITH_LZO
 #include <lzo/lzo1x.h>
 #endif
 #ifdef WITH_SDL
 #	include "sdl.h"
 #	include <SDL.h>
 #endif /* WITH_SDL */
 #ifdef WITH_ZLIB
 # include <zlib.h>
 #endif
 /**
 * Writes information (versions) of the used libraries.
 * @param buffer The begin where to write at.
@@ -241,14 +240,19 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const
 	buffer += seprintf(buffer, last, " FreeType:   %d.%d.%d\n", major, minor, patch);
 #endif /* WITH_FREETYPE */
-#ifdef WITH_ICU
+#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT)
 	/* 4 times 0-255, separated by dots (.) and a trailing '\0' */
 	char buf[4 * 3 + 3 + 1];
 	UVersionInfo ver;
 	u_getVersion(ver);
 	u_versionToString(ver, buf);
-	buffer += seprintf(buffer, last, " ICU:        %s\n", buf);
+#ifdef WITH_ICU_SORT
-#endif /* WITH_ICU */
+	buffer += seprintf(buffer, last, " ICU i18n:   %s\n", buf);
 #endif
 #ifdef WITH_ICU_LAYOUT
 	buffer += seprintf(buffer, last, " ICU lx:     %s\n", buf);
 #endif
 #endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */
 #ifdef WITH_LZMA
 	buffer += seprintf(buffer, last, " LZMA:       %s\n", lzma_version_string());
@@ -384,7 +388,7 @@ bool CrashLog::WriteSavegame(char *filename, const char *filename_last) const
 		seprintf(filename, filename_last, "%scrash.sav", _personal_dir);
 		/* Don't do a threaded saveload. */
-		return SaveOrLoad(filename, SL_SAVE, NO_DIRECTORY, false) == SL_OK;
+		return SaveOrLoad(filename, SLO_SAVE, DFT_GAME_FILE, NO_DIRECTORY, false) == SL_OK;
 	} catch (...) {
 		return false;
 	}
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -229,6 +229,7 @@ struct DepotWindow : Window {
 	VehicleID vehicle_over; ///< Rail vehicle over which another one is dragged, \c INVALID_VEHICLE if none.
 	VehicleType type;
 	bool generate_list;
 	int hovered_widget; ///< Index of the widget being hovered during drag/drop. -1 if no drag is in progress.
 	VehicleList vehicle_list;
 	VehicleList wagon_list;
 	uint unitnumber_digits;
@@ -243,6 +244,7 @@ struct DepotWindow : Window {
 		this->sel = INVALID_VEHICLE;
 		this->vehicle_over = INVALID_VEHICLE;
 		this->generate_list = true;
 		this->hovered_widget = -1;
 		this->type = type;
 		this->num_columns = 1; // for non-trains this gets set in FinishInitNested()
 		this->unitnumber_digits = 2;
@@ -503,15 +505,12 @@ struct DepotWindow : Window {
 					this->sel = INVALID_VEHICLE;
 					TrainDepotMoveVehicle(v, sel, gdvp.head);
 				} else if (v != NULL) {
-					bool rtl = _current_text_dir == TD_RTL;
+					SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
-					int image = v->GetImage(rtl ? DIR_E : DIR_W, EIT_IN_DEPOT);
+					SetMouseCursorVehicle(v, EIT_IN_DEPOT);
-					SetObjectToPlaceWnd(image, GetVehiclePalette(v), HT_DRAG, this);
+					_cursor.vehchain = _ctrl_pressed;
 					this->sel = v->index;
 					this->SetDirty();
 					_cursor.short_vehicle_offset = v->IsGroundVehicle() ? (16 - v->GetGroundVehicleCache()->cached_veh_length * 2) * (rtl ? -1 : 1) : 0;
 					_cursor.vehchain = _ctrl_pressed;
 				}
 				break;
 			}
@@ -661,7 +660,8 @@ struct DepotWindow : Window {
 			DepotSortList(&this->vehicle_list);
 			uint new_unitnumber_digits = GetUnitNumberDigits(this->vehicle_list);
-			if (this->unitnumber_digits != new_unitnumber_digits) {
+			/* Only increase the size; do not decrease to prevent constant changes */
 			if (this->unitnumber_digits < new_unitnumber_digits) {
 				this->unitnumber_digits = new_unitnumber_digits;
 				this->ReInit();
 			}
@@ -867,11 +867,29 @@ struct DepotWindow : Window {
 		this->sel = INVALID_VEHICLE;
 		this->vehicle_over = INVALID_VEHICLE;
 		this->SetWidgetDirty(WID_D_MATRIX);
 		if (this->hovered_widget != -1) {
 			this->SetWidgetLoweredState(this->hovered_widget, false);
 			this->SetWidgetDirty(this->hovered_widget);
 			this->hovered_widget = -1;
 		}
 	}
 	virtual void OnMouseDrag(Point pt, int widget)
 	{
-		if (this->type != VEH_TRAIN || this->sel == INVALID_VEHICLE) return;
+		if (this->sel == INVALID_VEHICLE) return;
 		if (widget != this->hovered_widget) {
 			if (this->hovered_widget == WID_D_SELL || this->hovered_widget == WID_D_SELL_CHAIN) {
 				this->SetWidgetLoweredState(this->hovered_widget, false);
 				this->SetWidgetDirty(this->hovered_widget);
 			}
 			this->hovered_widget = widget;
 			if (this->hovered_widget == WID_D_SELL || this->hovered_widget == WID_D_SELL_CHAIN) {
 				this->SetWidgetLoweredState(this->hovered_widget, true);
 				this->SetWidgetDirty(this->hovered_widget);
 			}
 		}
 		if (this->type != VEH_TRAIN) return;
 		/* A rail vehicle is dragged.. */
 		if (widget != WID_D_MATRIX) { // ..outside of the depot matrix.
@@ -958,7 +976,9 @@ struct DepotWindow : Window {
 			default:
 				this->sel = INVALID_VEHICLE;
 				this->SetDirty();
 				break;
 		}
 		this->hovered_widget = -1;
 		_cursor.vehchain = false;
 	}
--- a/src/direction_func.h
+++ b/src/direction_func.h
@@ -61,11 +61,11 @@ static inline Direction ReverseDir(Direction d)
 /**
- * Calculate the difference between to directions
+ * Calculate the difference between two directions
 *
 * @param d0 The first direction as the base
 * @param d1 The second direction as the offset from the base
- * @return The difference how the second directions drifts of the first one.
+ * @return The difference how the second direction drifts of the first one.
 */
 static inline DirDiff DirDifference(Direction d0, Direction d1)
 {
@@ -79,7 +79,7 @@ static inline DirDiff DirDifference(Direction d0, Direction d1)
 /**
 * Applies two differences together
 *
- * This function adds two differences together and return the resulting
+ * This function adds two differences together and returns the resulting
 * difference. So adding two DIRDIFF_REVERSE together results in the
 * DIRDIFF_SAME difference.
 *
@@ -123,6 +123,20 @@ static inline DiagDirection ReverseDiagDir(DiagDirection d)
 	return (DiagDirection)(2 ^ d);
 }
 /**
 * Calculate the difference between two DiagDirection values
 *
 * @param d0 The first direction as the base
 * @param d1 The second direction as the offset from the base
 * @return The difference how the second direction drifts of the first one.
 */
 static inline DiagDirDiff DiagDirDifference(DiagDirection d0, DiagDirection d1)
 {
 	assert(IsValidDiagDirection(d0));
 	assert(IsValidDiagDirection(d1));
 	/* Cast to uint so compiler can use bitmask. Result can never be negative. */
 	return (DiagDirDiff)((uint)(d0 - d1) % 4);
 }
 /**
 * Applies a difference on a DiagDirection
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -48,7 +48,7 @@ void CcBuildDocks(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p
 	if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
 }
-void CcBuildCanal(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcPlaySound_SPLAT_WATER(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
 {
 	if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_02_SPLAT_WATER, tile);
 }
@@ -235,10 +235,10 @@ struct BuildDocksToolbarWindow : Window {
 					GUIPlaceProcDragXY(select_proc, start_tile, end_tile);
 					break;
 				case DDSP_CREATE_WATER:
-					DoCommandP(end_tile, start_tile, (_game_mode == GM_EDITOR && _ctrl_pressed) ? WATER_CLASS_SEA : WATER_CLASS_CANAL, CMD_BUILD_CANAL | CMD_MSG(STR_ERROR_CAN_T_BUILD_CANALS), CcBuildCanal);
+					DoCommandP(end_tile, start_tile, (_game_mode == GM_EDITOR && _ctrl_pressed) ? WATER_CLASS_SEA : WATER_CLASS_CANAL, CMD_BUILD_CANAL | CMD_MSG(STR_ERROR_CAN_T_BUILD_CANALS), CcPlaySound_SPLAT_WATER);
 					break;
 				case DDSP_CREATE_RIVER:
-					DoCommandP(end_tile, start_tile, WATER_CLASS_RIVER, CMD_BUILD_CANAL | CMD_MSG(STR_ERROR_CAN_T_PLACE_RIVERS), CcBuildCanal);
+					DoCommandP(end_tile, start_tile, WATER_CLASS_RIVER, CMD_BUILD_CANAL | CMD_MSG(STR_ERROR_CAN_T_PLACE_RIVERS), CcPlaySound_SPLAT_WATER);
 					break;
 				default: break;
@@ -433,7 +433,7 @@ public:
 		 * Never make the window smaller to avoid oscillating if the size change affects the acceptance.
 		 * (This is the case, if making the window bigger moves the mouse into the window.) */
 		if (top > bottom) {
-			ResizeWindow(this, 0, top - bottom);
+			ResizeWindow(this, 0, top - bottom, false);
 		}
 	}
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1317,7 +1317,8 @@ static uint GetLoadAmount(Vehicle *v)
 	/* Scale load amount the same as capacity */
 	if (HasBit(e->info.misc_flags, EF_NO_DEFAULT_CARGO_MULTIPLIER) && !air_mail) load_amount = CeilDiv(load_amount * CargoSpec::Get(v->cargo_type)->multiplier, 0x100);
-	return load_amount;
+	/* Zero load amount breaks a lot of things. */
 	return max(1u, load_amount);
 }
 /**
@@ -1651,6 +1652,7 @@ static void LoadUnloadVehicle(Vehicle *front)
 			uint amount_unloaded = _settings_game.order.gradual_loading ? min(cargo_count, load_amount) : cargo_count;
 			bool remaining = false; // Are there cargo entities in this vehicle that can still be unloaded here?
 			assert(payment != NULL);
 			payment->SetCargo(v->cargo_type);
 			if (!HasBit(ge->status, GoodsEntry::GES_ACCEPTANCE) && v->cargo.ActionCount(VehicleCargoList::MTA_DELIVER) > 0) {
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -85,6 +85,7 @@ Engine::Engine(VehicleType type, EngineID base)
 	this->type = type;
 	this->grf_prop.local_id = base;
 	this->list_position = base;
 	this->preview_company = INVALID_COMPANY;
 	/* Check if this base engine is within the original engine data range */
 	if (base >= _engine_counts[type]) {
@@ -879,7 +880,7 @@ CommandCost CmdSetVehicleVisibility(TileIndex tile, DoCommandFlag flags, uint32
 {
 	Engine *e = Engine::GetIfValid(GB(p2, 0, 31));
 	if (e == NULL || _current_company >= MAX_COMPANIES) return CMD_ERROR;
-	if ((e->flags & ENGINE_AVAILABLE) == 0 || !HasBit(e->company_avail, _current_company)) return CMD_ERROR;
+	if (!IsEngineBuildable(e->index, e->type, _current_company)) return CMD_ERROR;
 	if ((flags & DC_EXEC) != 0) {
 		SB(e->company_hidden, _current_company, 1, GB(p2, 31, 1));
@@ -902,7 +903,7 @@ CommandCost CmdSetVehicleVisibility(TileIndex tile, DoCommandFlag flags, uint32
 CommandCost CmdWantEnginePreview(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
 	Engine *e = Engine::GetIfValid(p1);
-	if (e == NULL || e->preview_company != _current_company) return CMD_ERROR;
+	if (e == NULL || !(e->flags & ENGINE_EXCLUSIVE_PREVIEW) || e->preview_company != _current_company) return CMD_ERROR;
 	if (flags & DC_EXEC) AcceptEnginePreview(p1, _current_company);
--- a/src/fileio_type.h
+++ b/src/fileio_type.h
@@ -14,6 +14,96 @@
 #include "core/enum_type.hpp"
 /** The different abstract types of files that the system knows about. */
 enum AbstractFileType {
 	FT_NONE,      ///< nothing to do
 	FT_SAVEGAME,  ///< old or new savegame
 	FT_SCENARIO,  ///< old or new scenario
 	FT_HEIGHTMAP, ///< heightmap file
 	FT_INVALID = 7, ///< Invalid or unknown file type.
 	FT_NUMBITS = 3, ///< Number of bits required for storing a #AbstractFileType value.
 	FT_MASK = (1 << FT_NUMBITS) - 1, ///< Bitmask for extracting an abstract file type.
 };
 /** Kinds of files in each #AbstractFileType. */
 enum DetailedFileType {
 	/* Save game and scenario files. */
 	DFT_OLD_GAME_FILE, ///< Old save game or scenario file.
 	DFT_GAME_FILE,     ///< Save game or scenario file.
 	/* Heightmap files. */
 	DFT_HEIGHTMAP_BMP, ///< BMP file.
 	DFT_HEIGHTMAP_PNG, ///< PNG file.
 	/* fios 'files' */
 	DFT_FIOS_DRIVE,  ///< A drive (letter) entry.
 	DFT_FIOS_PARENT, ///< A parent directory entry.
 	DFT_FIOS_DIR,    ///< A directory entry.
 	DFT_FIOS_DIRECT, ///< Direct filename.
 	DFT_INVALID = 255, ///< Unknown or invalid file.
 };
 /** Operation performed on the file. */
 enum SaveLoadOperation {
 	SLO_CHECK,   ///< Load file for checking and/or preview.
 	SLO_LOAD,    ///< File is being loaded.
 	SLO_SAVE,    ///< File is being saved.
 	SLO_INVALID, ///< Unknown file operation.
 };
 /**
 * Construct an enum value for #FiosType as a combination of an abstract and a detailed file type.
 * @param abstract Abstract file type (one of #AbstractFileType).
 * @param detailed Detailed file type (one of #DetailedFileType).
 */
 #define MAKE_FIOS_TYPE(abstract, detailed) ((abstract) | ((detailed) << FT_NUMBITS))
 /**
 * Elements of a file system that are recognized.
 * Values are a combination of #AbstractFileType and #DetailedFileType.
 * @see GetAbstractFileType GetDetailedFileType
 */
 enum FiosType {
 	FIOS_TYPE_DRIVE  = MAKE_FIOS_TYPE(FT_NONE, DFT_FIOS_DRIVE),
 	FIOS_TYPE_PARENT = MAKE_FIOS_TYPE(FT_NONE, DFT_FIOS_PARENT),
 	FIOS_TYPE_DIR    = MAKE_FIOS_TYPE(FT_NONE, DFT_FIOS_DIR),
 	FIOS_TYPE_DIRECT = MAKE_FIOS_TYPE(FT_NONE, DFT_FIOS_DIRECT),
 	FIOS_TYPE_FILE         = MAKE_FIOS_TYPE(FT_SAVEGAME, DFT_GAME_FILE),
 	FIOS_TYPE_OLDFILE      = MAKE_FIOS_TYPE(FT_SAVEGAME, DFT_OLD_GAME_FILE),
 	FIOS_TYPE_SCENARIO     = MAKE_FIOS_TYPE(FT_SCENARIO, DFT_GAME_FILE),
 	FIOS_TYPE_OLD_SCENARIO = MAKE_FIOS_TYPE(FT_SCENARIO, DFT_OLD_GAME_FILE),
 	FIOS_TYPE_PNG          = MAKE_FIOS_TYPE(FT_HEIGHTMAP, DFT_HEIGHTMAP_PNG),
 	FIOS_TYPE_BMP          = MAKE_FIOS_TYPE(FT_HEIGHTMAP, DFT_HEIGHTMAP_BMP),
 	FIOS_TYPE_INVALID = MAKE_FIOS_TYPE(FT_INVALID, DFT_INVALID),
 };
 #undef MAKE_FIOS_TYPE
 /**
 * Extract the abstract file type from a #FiosType.
 * @param fios_type Type to query.
 * @return The Abstract file type of the \a fios_type.
 */
 inline AbstractFileType GetAbstractFileType(FiosType fios_type)
 {
 	return static_cast<AbstractFileType>(fios_type & FT_MASK);
 }
 /**
 * Extract the detailed file type from a #FiosType.
 * @param fios_type Type to query.
 * @return The Detailed file type of the \a fios_type.
 */
 inline DetailedFileType GetDetailedFileType(FiosType fios_type)
 {
 	return static_cast<DetailedFileType>(fios_type >> FT_NUMBITS);
 }
 /**
 * The different kinds of subdirectories OpenTTD uses
 */
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -29,17 +29,15 @@
 #include "safeguards.h"
 /* Variables to display file lists */
 SmallVector<FiosItem, 32> _fios_items;
 static char *_fios_path;
 static const char *_fios_path_last;
 SmallFiosItem _file_to_saveload;
 SortingBits _savegame_sort_order = SORT_BY_DATE | SORT_DESCENDING;
 /* OS-specific functions are taken from their respective files (win32/unix/os2 .c) */
 extern bool FiosIsRoot(const char *path);
 extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb);
 extern bool FiosIsHiddenFile(const struct dirent *ent);
-extern void FiosGetDrives();
+extern void FiosGetDrives(FileList &file_list);
 extern bool FiosGetDiskFreeSpace(const char *path, uint64 *tot);
 /* get the name of an oldstyle savegame */
@@ -65,11 +63,72 @@ int CDECL CompareFiosItems(const FiosItem *da, const FiosItem *db)
 	return r;
 }
-/** Free the list of savegames. */
+FileList::~FileList()
 void FiosFreeSavegameList()
 {
-	_fios_items.Clear();
+	this->Clear();
-	_fios_items.Compact();
+}
 /**
 * Construct a file list with the given kind of files, for the stated purpose.
 * @param abstract_filetype Kind of files to collect.
 * @param fop Purpose of the collection, either #SLO_LOAD or #SLO_SAVE.
 */
 void FileList::BuildFileList(AbstractFileType abstract_filetype, SaveLoadOperation fop)
 {
 	this->Clear();
 	assert(fop == SLO_LOAD || SLO_SAVE);
 	switch (abstract_filetype) {
 		case FT_NONE:
 			break;
 		case FT_SAVEGAME:
 			FiosGetSavegameList(fop, *this);
 			break;
 		case FT_SCENARIO:
 			FiosGetScenarioList(fop, *this);
 			break;
 		case FT_HEIGHTMAP:
 			FiosGetHeightmapList(fop, *this);
 			break;
 		default:
 			NOT_REACHED();
 	}
 }
 /**
 * Find file information of a file by its name from the file list.
 * @param file The filename to return information about. Can be the actual name
 *             or a numbered entry into the filename list.
 * @return The information on the file, or \c NULL if the file is not available.
 */
 const FiosItem *FileList::FindItem(const char *file)
 {
 	for (const FiosItem *item = this->Begin(); item != this->End(); item++) {
 		if (strcmp(file, item->name) == 0) return item;
 		if (strcmp(file, item->title) == 0) return item;
 	}
 	/* If no name matches, try to parse it as number */
 	char *endptr;
 	int i = strtol(file, &endptr, 10);
 	if (file == endptr || *endptr != '\0') i = -1;
 	if (IsInsideMM(i, 0, this->Length())) return this->Get(i);
 	/* As a last effort assume it is an OpenTTD savegame and
 	 * that the ".sav" part was not given. */
 	char long_file[MAX_PATH];
 	seprintf(long_file, lastof(long_file), "%s.sav", file);
 	for (const FiosItem *item = this->Begin(); item != this->End(); item++) {
 		if (strcmp(long_file, item->name) == 0) return item;
 		if (strcmp(long_file, item->title) == 0) return item;
 	}
 	return NULL;
 }
 /**
@@ -215,23 +274,24 @@ bool FiosDelete(const char *name)
 	return unlink(filename) == 0;
 }
-typedef FiosType fios_getlist_callback_proc(SaveLoadDialogMode mode, const char *filename, const char *ext, char *title, const char *last);
+typedef FiosType fios_getlist_callback_proc(SaveLoadOperation fop, const char *filename, const char *ext, char *title, const char *last);
 /**
 * Scanner to scan for a particular type of FIOS file.
 */
 class FiosFileScanner : public FileScanner {
-	SaveLoadDialogMode mode; ///< The mode we want to search for
+	SaveLoadOperation fop;   ///< The kind of file we are looking for.
 	fios_getlist_callback_proc *callback_proc; ///< Callback to check whether the file may be added
 	FileList &file_list;     ///< Destination of the found files.
 public:
 	/**
 	 * Create the scanner
-	 *  @param mode The mode we are in. Some modes don't allow 'parent'.
+	 * @param fop Purpose of collecting the list.
 	 * @param callback_proc The function that is called where you need to do the filtering.
 	 * @param file_list Destination of the found files.
 	 */
-	FiosFileScanner(SaveLoadDialogMode mode, fios_getlist_callback_proc *callback_proc) :
+	FiosFileScanner(SaveLoadOperation fop, fios_getlist_callback_proc *callback_proc, FileList &file_list) :
-		mode(mode),
+			fop(fop), callback_proc(callback_proc), file_list(file_list)
 		callback_proc(callback_proc)
 	{}
 	/* virtual */ bool AddFile(const char *filename, size_t basepath_length, const char *tar_filename);
@@ -251,14 +311,14 @@ bool FiosFileScanner::AddFile(const char *filename, size_t basepath_length, cons
 	char fios_title[64];
 	fios_title[0] = '\0'; // reset the title;
-	FiosType type = this->callback_proc(this->mode, filename, ext, fios_title, lastof(fios_title));
+	FiosType type = this->callback_proc(this->fop, filename, ext, fios_title, lastof(fios_title));
 	if (type == FIOS_TYPE_INVALID) return false;
-	for (const FiosItem *fios = _fios_items.Begin(); fios != _fios_items.End(); fios++) {
+	for (const FiosItem *fios = file_list.Begin(); fios != file_list.End(); fios++) {
 		if (strcmp(fios->name, filename) == 0) return false;
 	}
-	FiosItem *fios = _fios_items.Append();
+	FiosItem *fios = file_list.Append();
 #ifdef WIN32
 	struct _stat sb;
 	if (_tstat(OTTD2FS(filename), &sb) == 0) {
@@ -289,11 +349,12 @@ bool FiosFileScanner::AddFile(const char *filename, size_t basepath_length, cons
 /**
 * Fill the list of the files in a directory, according to some arbitrary rule.
- *  @param mode The mode we are in. Some modes don't allow 'parent'.
+ * @param fop Purpose of collecting the list.
 * @param callback_proc The function that is called where you need to do the filtering.
 * @param subdir The directory from where to start (global) searching.
 * @param file_list Destination of the found files.
 */
-static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc *callback_proc, Subdirectory subdir)
+static void FiosGetFileList(SaveLoadOperation fop, fios_getlist_callback_proc *callback_proc, Subdirectory subdir, FileList &file_list)
 {
 	struct stat sb;
 	struct dirent *dirent;
@@ -302,11 +363,11 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
 	int sort_start;
 	char d_name[sizeof(fios->name)];
-	_fios_items.Clear();
+	file_list.Clear();
 	/* A parent directory link exists if we are not in the root directory */
 	if (!FiosIsRoot(_fios_path)) {
-		fios = _fios_items.Append();
+		fios = file_list.Append();
 		fios->type = FIOS_TYPE_PARENT;
 		fios->mtime = 0;
 		strecpy(fios->name, "..", lastof(fios->name));
@@ -322,7 +383,7 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
 			if (FiosIsValidFile(_fios_path, dirent, &sb) && S_ISDIR(sb.st_mode) &&
 					(!FiosIsHiddenFile(dirent) || strncasecmp(d_name, PERSONAL_DIR, strlen(d_name)) == 0) &&
 					strcmp(d_name, ".") != 0 && strcmp(d_name, "..") != 0) {
-				fios = _fios_items.Append();
+				fios = file_list.Append();
 				fios->type = FIOS_TYPE_DIR;
 				fios->mtime = 0;
 				strecpy(fios->name, d_name, lastof(fios->name));
@@ -337,27 +398,27 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
 	{
 		SortingBits order = _savegame_sort_order;
 		_savegame_sort_order = SORT_BY_NAME | SORT_ASCENDING;
-		QSortT(_fios_items.Begin(), _fios_items.Length(), CompareFiosItems);
+		QSortT(file_list.files.Begin(), file_list.files.Length(), CompareFiosItems);
 		_savegame_sort_order = order;
 	}
 	/* This is where to start sorting for the filenames */
-	sort_start = _fios_items.Length();
+	sort_start = file_list.Length();
 	/* Show files */
-	FiosFileScanner scanner(mode, callback_proc);
+	FiosFileScanner scanner(fop, callback_proc, file_list);
 	if (subdir == NO_DIRECTORY) {
 		scanner.Scan(NULL, _fios_path, false);
 	} else {
 		scanner.Scan(NULL, subdir, true, true);
 	}
-	QSortT(_fios_items.Get(sort_start), _fios_items.Length() - sort_start, CompareFiosItems);
+	QSortT(file_list.Get(sort_start), file_list.Length() - sort_start, CompareFiosItems);
 	/* Show drives */
-	FiosGetDrives();
+	FiosGetDrives(file_list);
-	_fios_items.Compact();
+	file_list.Compact();
 }
 /**
@@ -386,7 +447,7 @@ static void GetFileTitle(const char *file, char *title, const char *last, Subdir
 /**
 * Callback for FiosGetFileList. It tells if a file is a savegame or not.
- * @param mode Save/load mode.
+ * @param fop Purpose of collecting the list.
 * @param file Name of the file to check.
 * @param ext A pointer to the extension identifier inside file
 * @param title Buffer if a callback wants to lookup the title of the file; NULL to skip the lookup
@@ -395,7 +456,7 @@ static void GetFileTitle(const char *file, char *title, const char *last, Subdir
 * @see FiosGetFileList
 * @see FiosGetSavegameList
 */
-FiosType FiosGetSavegameListCallback(SaveLoadDialogMode mode, const char *file, const char *ext, char *title, const char *last)
+FiosType FiosGetSavegameListCallback(SaveLoadOperation fop, const char *file, const char *ext, char *title, const char *last)
 {
 	/* Show savegame files
 	 * .SAV OpenTTD saved game
@@ -411,7 +472,7 @@ FiosType FiosGetSavegameListCallback(SaveLoadDialogMode mode, const char *file,
 		return FIOS_TYPE_FILE;
 	}
-	if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO) {
+	if (fop == SLO_LOAD) {
 		if (strcasecmp(ext, ".ss1") == 0 || strcasecmp(ext, ".sv1") == 0 ||
 				strcasecmp(ext, ".sv2") == 0) {
 			if (title != NULL) GetOldSaveGameName(file, title, last);
@@ -424,10 +485,11 @@ FiosType FiosGetSavegameListCallback(SaveLoadDialogMode mode, const char *file,
 /**
 * Get a list of savegames.
- * @param mode Save/load mode.
+ * @param fop Purpose of collecting the list.
 * @param file_list Destination of the found files.
 * @see FiosGetFileList
 */
-void FiosGetSavegameList(SaveLoadDialogMode mode)
+void FiosGetSavegameList(SaveLoadOperation fop, FileList &file_list)
 {
 	static char *fios_save_path = NULL;
 	static char *fios_save_path_last = NULL;
@@ -441,12 +503,12 @@ void FiosGetSavegameList(SaveLoadDialogMode mode)
 	_fios_path = fios_save_path;
 	_fios_path_last = fios_save_path_last;
-	FiosGetFileList(mode, &FiosGetSavegameListCallback, NO_DIRECTORY);
+	FiosGetFileList(fop, &FiosGetSavegameListCallback, NO_DIRECTORY, file_list);
 }
 /**
 * Callback for FiosGetFileList. It tells if a file is a scenario or not.
- * @param mode Save/load mode.
+ * @param fop Purpose of collecting the list.
 * @param file Name of the file to check.
 * @param ext A pointer to the extension identifier inside file
 * @param title Buffer if a callback wants to lookup the title of the file
@@ -455,7 +517,7 @@ void FiosGetSavegameList(SaveLoadDialogMode mode)
 * @see FiosGetFileList
 * @see FiosGetScenarioList
 */
-static FiosType FiosGetScenarioListCallback(SaveLoadDialogMode mode, const char *file, const char *ext, char *title, const char *last)
+static FiosType FiosGetScenarioListCallback(SaveLoadOperation fop, const char *file, const char *ext, char *title, const char *last)
 {
 	/* Show scenario files
 	 * .SCN OpenTTD style scenario file
@@ -466,7 +528,7 @@ static FiosType FiosGetScenarioListCallback(SaveLoadDialogMode mode, const char
 		return FIOS_TYPE_SCENARIO;
 	}
-	if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO) {
+	if (fop == SLO_LOAD) {
 		if (strcasecmp(ext, ".sv0") == 0 || strcasecmp(ext, ".ss0") == 0 ) {
 			GetOldSaveGameName(file, title, last);
 			return FIOS_TYPE_OLD_SCENARIO;
@@ -478,10 +540,11 @@ static FiosType FiosGetScenarioListCallback(SaveLoadDialogMode mode, const char
 /**
 * Get a list of scenarios.
- * @param mode Save/load mode.
+ * @param fop Purpose of collecting the list.
 * @param file_list Destination of the found files.
 * @see FiosGetFileList
 */
-void FiosGetScenarioList(SaveLoadDialogMode mode)
+void FiosGetScenarioList(SaveLoadOperation fop, FileList &file_list)
 {
 	static char *fios_scn_path = NULL;
 	static char *fios_scn_path_last = NULL;
@@ -499,10 +562,11 @@ void FiosGetScenarioList(SaveLoadDialogMode mode)
 	char base_path[MAX_PATH];
 	FioGetDirectory(base_path, lastof(base_path), SCENARIO_DIR);
-	FiosGetFileList(mode, &FiosGetScenarioListCallback, (mode == SLD_LOAD_SCENARIO && strcmp(base_path, _fios_path) == 0) ? SCENARIO_DIR : NO_DIRECTORY);
+	Subdirectory subdir = (fop == SLO_LOAD && strcmp(base_path, _fios_path) == 0) ? SCENARIO_DIR : NO_DIRECTORY;
 	FiosGetFileList(fop, &FiosGetScenarioListCallback, subdir, file_list);
 }
-static FiosType FiosGetHeightmapListCallback(SaveLoadDialogMode mode, const char *file, const char *ext, char *title, const char *last)
+static FiosType FiosGetHeightmapListCallback(SaveLoadOperation fop, const char *file, const char *ext, char *title, const char *last)
 {
 	/* Show heightmap files
 	 * .PNG PNG Based heightmap files
@@ -548,9 +612,10 @@ static FiosType FiosGetHeightmapListCallback(SaveLoadDialogMode mode, const char
 /**
 * Get a list of heightmaps.
- * @param mode Save/load mode.
+ * @param fop Purpose of collecting the list.
 * @param file_list Destination of the found files.
 */
-void FiosGetHeightmapList(SaveLoadDialogMode mode)
+void FiosGetHeightmapList(SaveLoadOperation fop, FileList &file_list)
 {
 	static char *fios_hmap_path = NULL;
 	static char *fios_hmap_path_last = NULL;
@@ -567,7 +632,8 @@ void FiosGetHeightmapList(SaveLoadDialogMode mode)
 	char base_path[MAX_PATH];
 	FioGetDirectory(base_path, lastof(base_path), HEIGHTMAP_DIR);
-	FiosGetFileList(mode, &FiosGetHeightmapListCallback, strcmp(base_path, _fios_path) == 0 ? HEIGHTMAP_DIR : NO_DIRECTORY);
+	Subdirectory subdir = strcmp(base_path, _fios_path) == 0 ? HEIGHTMAP_DIR : NO_DIRECTORY;
 	FiosGetFileList(fop, &FiosGetHeightmapListCallback, subdir, file_list);
 }
 /**
--- a/src/fios.h
+++ b/src/fios.h
@@ -97,38 +97,6 @@ enum FileSlots {
 	MAX_FILE_SLOTS = 64
 };
 /** Mode of the file dialogue window. */
 enum SaveLoadDialogMode {
 	SLD_LOAD_GAME,      ///< Load a game.
 	SLD_LOAD_SCENARIO,  ///< Load a scenario.
 	SLD_SAVE_GAME,      ///< Save a game.
 	SLD_SAVE_SCENARIO,  ///< Save a scenario.
 	SLD_LOAD_HEIGHTMAP, ///< Load a heightmap.
 	SLD_SAVE_HEIGHTMAP, ///< Save a heightmap.
 };
 /** The different types of files that the system knows about. */
 enum FileType {
 	FT_NONE,      ///< nothing to do
 	FT_SAVEGAME,  ///< old or new savegame
 	FT_SCENARIO,  ///< old or new scenario
 	FT_HEIGHTMAP, ///< heightmap file
 };
 enum FiosType {
 	FIOS_TYPE_DRIVE,
 	FIOS_TYPE_PARENT,
 	FIOS_TYPE_DIR,
 	FIOS_TYPE_FILE,
 	FIOS_TYPE_OLDFILE,
 	FIOS_TYPE_SCENARIO,
 	FIOS_TYPE_OLD_SCENARIO,
 	FIOS_TYPE_DIRECT,
 	FIOS_TYPE_PNG,
 	FIOS_TYPE_BMP,
 	FIOS_TYPE_INVALID = 255,
 };
 /** Deals with finding savegames */
 struct FiosItem {
 	FiosType type;
@@ -137,12 +105,95 @@ struct FiosItem {
 	char name[MAX_PATH];
 };
-/** Deals with the type of the savegame, independent of extension */
+/** List of file information. */
-struct SmallFiosItem {
+class FileList {
-	int mode;             ///< savegame/scenario type (old, new)
+public:
-	FileType filetype;    ///< what type of file are we dealing with
+	~FileList();
-	char name[MAX_PATH];  ///< name
+
-	char title[255];      ///< internal name of the game
+	/**
 	 * Construct a new entry in the file list.
 	 * @return Pointer to the new items to be initialized.
 	 */
 	inline FiosItem *Append()
 	{
 		return this->files.Append();
 	}
 	/**
 	 * Get the number of files in the list.
 	 * @return The number of files stored in the list.
 	 */
 	inline uint Length() const
 	{
 		return this->files.Length();
 	}
 	/**
 	 * Get a pointer to the first file information.
 	 * @return Address of the first file information.
 	 */
 	inline const FiosItem *Begin() const
 	{
 		return this->files.Begin();
 	}
 	/**
 	 * Get a pointer behind the last file information.
 	 * @return Address behind the last file information.
 	 */
 	inline const FiosItem *End() const
 	{
 		return this->files.End();
 	}
 	/**
 	 * Get a pointer to the indicated file information. File information must exist.
 	 * @return Address of the indicated existing file information.
 	 */
 	inline const FiosItem *Get(uint index) const
 	{
 		return this->files.Get(index);
 	}
 	/**
 	 * Get a pointer to the indicated file information. File information must exist.
 	 * @return Address of the indicated existing file information.
 	 */
 	inline FiosItem *Get(uint index)
 	{
 		return this->files.Get(index);
 	}
 	inline const FiosItem &operator[](uint index) const
 	{
 		return this->files[index];
 	}
 	/**
 	 * Get a reference to the indicated file information. File information must exist.
 	 * @return The requested file information.
 	 */
 	inline FiosItem &operator[](uint index)
 	{
 		return this->files[index];
 	}
 	/** Remove all items from the list. */
 	inline void Clear()
 	{
 		this->files.Clear();
 	}
 	/** Compact the list down to the smallest block size boundary. */
 	inline void Compact()
 	{
 		this->files.Compact();
 	}
 	void BuildFileList(AbstractFileType abstract_filetype, SaveLoadOperation fop);
 	const FiosItem *FindItem(const char *file);
 	SmallVector<FiosItem, 32> files; ///< The list of files.
 };
 enum SortingBits {
@@ -154,18 +205,14 @@ enum SortingBits {
 DECLARE_ENUM_AS_BIT_SET(SortingBits)
 /* Variables to display file lists */
 extern SmallVector<FiosItem, 32> _fios_items;
 extern SmallFiosItem _file_to_saveload;
 extern SaveLoadDialogMode _saveload_mode;
 extern SortingBits _savegame_sort_order;
-void ShowSaveLoadDialog(SaveLoadDialogMode mode);
+void ShowSaveLoadDialog(AbstractFileType abstract_filetype, SaveLoadOperation fop);
-void FiosGetSavegameList(SaveLoadDialogMode mode);
+void FiosGetSavegameList(SaveLoadOperation fop, FileList &file_list);
-void FiosGetScenarioList(SaveLoadDialogMode mode);
+void FiosGetScenarioList(SaveLoadOperation fop, FileList &file_list);
-void FiosGetHeightmapList(SaveLoadDialogMode mode);
+void FiosGetHeightmapList(SaveLoadOperation fop, FileList &file_list);
 void FiosFreeSavegameList();
 const char *FiosBrowseTo(const FiosItem *item);
 StringID FiosGetDescText(const char **path, uint64 *total_free);
@@ -173,13 +220,8 @@ bool FiosDelete(const char *name);
 void FiosMakeHeightmapName(char *buf, const char *name, const char *last);
 void FiosMakeSavegameName(char *buf, const char *name, const char *last);
-FiosType FiosGetSavegameListCallback(SaveLoadDialogMode mode, const char *file, const char *ext, char *title, const char *last);
+FiosType FiosGetSavegameListCallback(SaveLoadOperation fop, const char *file, const char *ext, char *title, const char *last);
 int CDECL CompareFiosItems(const FiosItem *a, const FiosItem *b);
 extern const TextColour _fios_colours[];
 void BuildFileList();
 void SetFiosType(const byte fiostype);
 #endif /* FIOS_H */
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -36,7 +36,6 @@
 #include "safeguards.h"
 SaveLoadDialogMode _saveload_mode;
 LoadCheckData _load_check_data;    ///< Data loaded from save during SL_LOAD_CHECK.
 static bool _fios_path_changed;
@@ -187,33 +186,24 @@ static const NWidgetPart _nested_save_dialog_widgets[] = {
 	EndContainer(),
 };
-/** Colours for fios types, indexed by #FiosType. */
+/** Text colours of #DetailedFileType fios entries in the window. */
-const TextColour _fios_colours[] = {
+static const TextColour _fios_colours[] = {
-	TC_LIGHT_BLUE, TC_DARK_GREEN,  TC_DARK_GREEN, TC_ORANGE, TC_LIGHT_BROWN,
+	TC_LIGHT_BROWN,  // DFT_OLD_GAME_FILE
-	TC_ORANGE,     TC_LIGHT_BROWN, TC_ORANGE,     TC_ORANGE, TC_YELLOW
+	TC_ORANGE,       // DFT_GAME_FILE
 	TC_YELLOW,       // DFT_HEIGHTMAP_BMP
 	TC_ORANGE,       // DFT_HEIGHTMAP_PNG
 	TC_LIGHT_BLUE,   // DFT_FIOS_DRIVE
 	TC_DARK_GREEN,   // DFT_FIOS_PARENT
 	TC_DARK_GREEN,   // DFT_FIOS_DIR
 	TC_ORANGE,       // DFT_FIOS_DIRECT
 };
 void BuildFileList()
 {
 	_fios_path_changed = true;
 	FiosFreeSavegameList();
-	switch (_saveload_mode) {
+/**
-		case SLD_LOAD_SCENARIO:
+ * Sort the collected list save games prior to displaying it in the save/load gui.
-		case SLD_SAVE_SCENARIO:
+ * @param [inout] file_list List of save game files found in the directory.
-			FiosGetScenarioList(_saveload_mode); break;
+ */
-		case SLD_SAVE_HEIGHTMAP:
+static void SortSaveGameList(FileList &file_list)
 		case SLD_LOAD_HEIGHTMAP:
 			FiosGetHeightmapList(_saveload_mode); break;
 		default: FiosGetSavegameList(_saveload_mode); break;
 	}
 	/* Invalidate saveload window */
 	InvalidateWindowData(WC_SAVELOAD, 0, 2, true);
 }
 static void MakeSortedSaveGameList()
 {
 	uint sort_start = 0;
 	uint sort_end = 0;
@@ -222,7 +212,7 @@ static void MakeSortedSaveGameList()
 	 * Drives (A:\ (windows only) are always under the files (FIOS_TYPE_DRIVE)
 	 * Only sort savegames/scenarios, not directories
 	 */
-	for (const FiosItem *item = _fios_items.Begin(); item != _fios_items.End(); item++) {
+	for (const FiosItem *item = file_list.Begin(); item != file_list.End(); item++) {
 		switch (item->type) {
 			case FIOS_TYPE_DIR:    sort_start++; break;
 			case FIOS_TYPE_PARENT: sort_start++; break;
@@ -231,15 +221,18 @@ static void MakeSortedSaveGameList()
 		}
 	}
-	uint s_amount = _fios_items.Length() - sort_start - sort_end;
+	uint s_amount = file_list.Length() - sort_start - sort_end;
-	QSortT(_fios_items.Get(sort_start), s_amount, CompareFiosItems);
+	QSortT(file_list.Get(sort_start), s_amount, CompareFiosItems);
 }
 struct SaveLoadWindow : public Window {
 private:
 	QueryString filename_editbox; ///< Filename editbox.
 	AbstractFileType abstract_filetype; /// Type of file to select.
 	SaveLoadOperation fop;        ///< File operation to perform.
 	FileList fios_items;          ///< Save game list.
 	FiosItem o_dir;
-	const FiosItem *selected;
+	const FiosItem *selected;     ///< Selected game in #fios_items, or \c NULL.
 	Scrollbar *vscroll;
 public:
@@ -250,35 +243,56 @@ public:
 		this->filename_editbox.text.UpdateSize();
 	}
-	SaveLoadWindow(WindowDesc *desc, SaveLoadDialogMode mode) : Window(desc), filename_editbox(64)
+	SaveLoadWindow(WindowDesc *desc, AbstractFileType abstract_filetype, SaveLoadOperation fop)
 			: Window(desc), filename_editbox(64), abstract_filetype(abstract_filetype), fop(fop)
 	{
-		static const StringID saveload_captions[] = {
+		assert(this->fop == SLO_SAVE || this->fop == SLO_LOAD);
 			STR_SAVELOAD_LOAD_CAPTION,
 			STR_SAVELOAD_LOAD_SCENARIO,
 			STR_SAVELOAD_SAVE_CAPTION,
 			STR_SAVELOAD_SAVE_SCENARIO,
 			STR_SAVELOAD_LOAD_HEIGHTMAP,
 			STR_SAVELOAD_SAVE_HEIGHTMAP,
 		};
 		assert((uint)mode < lengthof(saveload_captions));
-		/* Use an array to define what will be the current file type being handled
+		/* For saving, construct an initial file name. */
-		 * by current file mode */
+		if (this->fop == SLO_SAVE) {
-		switch (mode) {
+			switch (this->abstract_filetype) {
-			case SLD_SAVE_GAME:     this->GenerateFileName(); break;
+				case FT_SAVEGAME:
-			case SLD_SAVE_HEIGHTMAP:
+					this->GenerateFileName();
-			case SLD_SAVE_SCENARIO: this->filename_editbox.text.Assign("UNNAMED"); break;
+					break;
-			default:                break;
+
 				case FT_SCENARIO:
 				case FT_HEIGHTMAP:
 					this->filename_editbox.text.Assign("UNNAMED");
 					break;
 				default:
 					NOT_REACHED();
 			}
 		}
 		this->querystrings[WID_SL_SAVE_OSK_TITLE] = &this->filename_editbox;
 		this->filename_editbox.ok_button = WID_SL_SAVE_GAME;
 		this->CreateNestedTree(true);
-		if (mode == SLD_LOAD_GAME) this->GetWidget<NWidgetStacked>(WID_SL_CONTENT_DOWNLOAD_SEL)->SetDisplayedPlane(SZSP_HORIZONTAL);
+		if (this->fop == SLO_LOAD && this->abstract_filetype == FT_SAVEGAME) {
-		this->GetWidget<NWidgetCore>(WID_SL_CAPTION)->widget_data = saveload_captions[mode];
+			this->GetWidget<NWidgetStacked>(WID_SL_CONTENT_DOWNLOAD_SEL)->SetDisplayedPlane(SZSP_HORIZONTAL);
-		this->vscroll = this->GetScrollbar(WID_SL_SCROLLBAR);
+		}
 		/* Select caption string of the window. */
 		StringID caption_string;
 		switch (this->abstract_filetype) {
 			case FT_SAVEGAME:
 				caption_string = (this->fop == SLO_SAVE) ? STR_SAVELOAD_SAVE_CAPTION : STR_SAVELOAD_LOAD_CAPTION;
 				break;
 			case FT_SCENARIO:
 				caption_string = (this->fop == SLO_SAVE) ? STR_SAVELOAD_SAVE_SCENARIO : STR_SAVELOAD_LOAD_SCENARIO;
 				break;
 			case FT_HEIGHTMAP:
 				caption_string = (this->fop == SLO_SAVE) ? STR_SAVELOAD_SAVE_HEIGHTMAP : STR_SAVELOAD_LOAD_HEIGHTMAP;
 				break;
 			default:
 				NOT_REACHED();
 		}
 		this->GetWidget<NWidgetCore>(WID_SL_CAPTION)->widget_data = caption_string;
 		this->vscroll = this->GetScrollbar(WID_SL_SCROLLBAR);
 		this->FinishInitNested(0);
 		this->LowerWidget(WID_SL_DRIVES_DIRECTORIES_LIST);
@@ -294,20 +308,18 @@ public:
 		ResetObjectToPlace();
 		/* Select the initial directory. */
 		o_dir.type = FIOS_TYPE_DIRECT;
-		switch (_saveload_mode) {
+		switch (this->abstract_filetype) {
-			case SLD_SAVE_GAME:
+			case FT_SAVEGAME:
 			case SLD_LOAD_GAME:
 				FioGetDirectory(o_dir.name, lastof(o_dir.name), SAVE_DIR);
 				break;
-			case SLD_SAVE_SCENARIO:
+			case FT_SCENARIO:
 			case SLD_LOAD_SCENARIO:
 				FioGetDirectory(o_dir.name, lastof(o_dir.name), SCENARIO_DIR);
 				break;
-			case SLD_SAVE_HEIGHTMAP:
+			case FT_HEIGHTMAP:
 			case SLD_LOAD_HEIGHTMAP:
 				FioGetDirectory(o_dir.name, lastof(o_dir.name), HEIGHTMAP_DIR);
 				break;
@@ -316,9 +328,7 @@ public:
 		}
 		/* Focus the edit box by default in the save windows */
-		if (_saveload_mode == SLD_SAVE_GAME || _saveload_mode == SLD_SAVE_SCENARIO || _saveload_mode == SLD_SAVE_HEIGHTMAP) {
+		if (this->fop == SLO_SAVE) this->SetFocusedWidget(WID_SL_SAVE_OSK_TITLE);
 			this->SetFocusedWidget(WID_SL_SAVE_OSK_TITLE);
 		}
 	}
 	virtual ~SaveLoadWindow()
@@ -327,7 +337,6 @@ public:
 		if (!_networking && _game_mode != GM_EDITOR && _game_mode != GM_MENU) {
 			DoCommandP(0, PM_PAUSED_SAVELOAD, 0, CMD_PAUSE);
 		}
 		FiosFreeSavegameList();
 	}
 	virtual void DrawWidget(const Rect &r, int widget) const
@@ -360,13 +369,13 @@ public:
 				GfxFillRect(r.left + 1, r.top + 1, r.right, r.bottom, PC_BLACK);
 				uint y = r.top + WD_FRAMERECT_TOP;
-				for (uint pos = this->vscroll->GetPosition(); pos < _fios_items.Length(); pos++) {
+				for (uint pos = this->vscroll->GetPosition(); pos < this->fios_items.Length(); pos++) {
-					const FiosItem *item = _fios_items.Get(pos);
+					const FiosItem *item = this->fios_items.Get(pos);
 					if (item == this->selected) {
 						GfxFillRect(r.left + 1, y, r.right, y + this->resize.step_height, PC_DARK_BLUE);
 					}
-					DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, item->title, _fios_colours[item->type]);
+					DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, item->title, _fios_colours[GetDetailedFileType(item->type)]);
 					y += this->resize.step_height;
 					if (y >= this->vscroll->GetCapacity() * this->resize.step_height + r.top + WD_FRAMERECT_TOP) break;
 				}
@@ -421,7 +430,7 @@ public:
 					if (y > y_max) break;
 					/* Hide current date for scenarios */
-					if (_saveload_mode != SLD_LOAD_SCENARIO && _saveload_mode != SLD_SAVE_SCENARIO) {
+					if (this->abstract_filetype != FT_SCENARIO) {
 						/* Current date */
 						SetDParam(0, _load_check_data.current_date);
 						DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_CURRENT_DATE);
@@ -429,7 +438,7 @@ public:
 					}
 					/* Hide the NewGRF stuff when saving. We also hide the button. */
-					if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) {
+					if (this->fop == SLO_LOAD && (this->abstract_filetype == FT_SAVEGAME || this->abstract_filetype == FT_SCENARIO)) {
 						y += WD_PAR_VSEP_NORMAL;
 						if (y > y_max) break;
@@ -442,7 +451,7 @@ public:
 					if (y > y_max) break;
 					/* Hide the company stuff for scenarios */
-					if (_saveload_mode != SLD_LOAD_SCENARIO && _saveload_mode != SLD_SAVE_SCENARIO) {
+					if (this->abstract_filetype != FT_SCENARIO) {
 						y += FONT_HEIGHT_NORMAL;
 						if (y > y_max) break;
@@ -495,10 +504,10 @@ public:
 	{
 		if (_savegame_sort_dirty) {
 			_savegame_sort_dirty = false;
-			MakeSortedSaveGameList();
+			SortSaveGameList(this->fios_items);
 		}
-		this->vscroll->SetCount(_fios_items.Length());
+		this->vscroll->SetCount(this->fios_items.Length());
 		this->DrawWidgets();
 	}
@@ -527,14 +536,14 @@ public:
 			case WID_SL_LOAD_BUTTON:
 				if (this->selected != NULL && !_load_check_data.HasErrors()) {
 					const char *name = FiosBrowseTo(this->selected);
-					SetFiosType(this->selected->type);
+					_file_to_saveload.SetMode(this->selected->type);
 					_file_to_saveload.SetName(name);
 					_file_to_saveload.SetTitle(this->selected->title);
-					strecpy(_file_to_saveload.name, name, lastof(_file_to_saveload.name));
+					if (this->abstract_filetype == FT_HEIGHTMAP) {
 					strecpy(_file_to_saveload.title, this->selected->title, lastof(_file_to_saveload.title));
 					if (_saveload_mode == SLD_LOAD_HEIGHTMAP) {
 						delete this;
 						ShowHeightmapLoad();
 					} else if (!_load_check_data.HasNewGrfs() || _load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs()) {
 						_switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_SCENARIO : SM_LOAD_GAME;
 						ClearErrorMessages();
@@ -563,7 +572,7 @@ public:
 				int y = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_SL_DRIVES_DIRECTORIES_LIST, WD_FRAMERECT_TOP);
 				if (y == INT_MAX) return;
-				const FiosItem *file = _fios_items.Get(y);
+				const FiosItem *file = this->fios_items.Get(y);
 				const char *name = FiosBrowseTo(file);
 				if (name != NULL) {
@@ -572,30 +581,34 @@ public:
 							this->selected = file;
 							_load_check_data.Clear();
-							if (file->type == FIOS_TYPE_FILE || file->type == FIOS_TYPE_SCENARIO) {
+							if (GetDetailedFileType(file->type) == DFT_GAME_FILE) {
-								SaveOrLoad(name, SL_LOAD_CHECK, NO_DIRECTORY, false);
+								/* Other detailed file types cannot be checked before. */
 								SaveOrLoad(name, SLO_CHECK, DFT_GAME_FILE, NO_DIRECTORY, false);
 							}
 							this->InvalidateData(1);
 						}
-						if (_saveload_mode == SLD_SAVE_GAME || _saveload_mode == SLD_SAVE_SCENARIO || _saveload_mode == SLD_SAVE_HEIGHTMAP) {
+						if (this->fop == SLO_SAVE) {
 							/* Copy clicked name to editbox */
 							this->filename_editbox.text.Assign(file->title);
 							this->SetWidgetDirty(WID_SL_SAVE_OSK_TITLE);
 						}
 					} else if (!_load_check_data.HasErrors()) {
 						this->selected = file;
-						if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) {
+						if (this->fop == SLO_LOAD) {
 							if (this->abstract_filetype == FT_SAVEGAME || this->abstract_filetype == FT_SCENARIO) {
 								this->OnClick(pt, WID_SL_LOAD_BUTTON, 1);
-						} else if (_saveload_mode == SLD_LOAD_HEIGHTMAP) {
+							} else {
-							SetFiosType(file->type);
+								assert(this->abstract_filetype == FT_HEIGHTMAP);
-							strecpy(_file_to_saveload.name, name, lastof(_file_to_saveload.name));
+								_file_to_saveload.SetMode(file->type);
-							strecpy(_file_to_saveload.title, file->title, lastof(_file_to_saveload.title));
+								_file_to_saveload.SetName(name);
 								_file_to_saveload.SetTitle(file->title);
 								delete this;
 								ShowHeightmapLoad();
 							}
 						}
 					}
 				} else {
 					/* Changed directory, need refresh. */
 					this->InvalidateData();
@@ -608,10 +621,11 @@ public:
 					ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
 				} else {
 #if defined(ENABLE_NETWORK)
-					switch (_saveload_mode) {
+					assert(this->fop == SLO_LOAD);
 					switch (this->abstract_filetype) {
 						default: NOT_REACHED();
-						case SLD_LOAD_SCENARIO:  ShowNetworkContentListWindow(NULL, CONTENT_TYPE_SCENARIO);  break;
+						case FT_SCENARIO:  ShowNetworkContentListWindow(NULL, CONTENT_TYPE_SCENARIO);  break;
-						case SLD_LOAD_HEIGHTMAP: ShowNetworkContentListWindow(NULL, CONTENT_TYPE_HEIGHTMAP); break;
+						case FT_HEIGHTMAP: ShowNetworkContentListWindow(NULL, CONTENT_TYPE_HEIGHTMAP); break;
 					}
 #endif
 				}
@@ -639,9 +653,8 @@ public:
 	virtual void OnTimeout()
 	{
-		/* This test protects against using widgets 11 and 12 which are only available
+		/* Widgets WID_SL_DELETE_SELECTION and WID_SL_SAVE_GAME only exist when saving to a file. */
-		 * in those saveload modes. */
+		if (this->fop != SLO_SAVE) return;
 		if (!(_saveload_mode == SLD_SAVE_GAME || _saveload_mode == SLD_SAVE_SCENARIO || _saveload_mode == SLD_SAVE_HEIGHTMAP)) return;
 		if (this->IsWidgetLowered(WID_SL_DELETE_SELECTION)) { // Delete button clicked
 			if (!FiosDelete(this->filename_editbox.text.buf)) {
@@ -649,10 +662,10 @@ public:
 			} else {
 				this->InvalidateData();
 				/* Reset file name to current date on successful delete */
-				if (_saveload_mode == SLD_SAVE_GAME) GenerateFileName();
+				if (this->abstract_filetype == FT_SAVEGAME) GenerateFileName();
 			}
 		} else if (this->IsWidgetLowered(WID_SL_SAVE_GAME)) { // Save button clicked
-			if (_saveload_mode  == SLD_SAVE_GAME || _saveload_mode == SLD_SAVE_SCENARIO) {
+			if (this->abstract_filetype == FT_SAVEGAME || this->abstract_filetype == FT_SCENARIO) {
 				_switch_mode = SM_SAVE_GAME;
 				FiosMakeSavegameName(_file_to_saveload.name, this->filename_editbox.text.buf, lastof(_file_to_saveload.name));
 			} else {
@@ -683,28 +696,40 @@ public:
 				this->selected = NULL;
 				_load_check_data.Clear();
 				if (!gui_scope) break;
-				BuildFileList();
+
 				_fios_path_changed = true;
 				this->fios_items.BuildFileList(this->abstract_filetype, this->fop);
 				this->vscroll->SetCount(this->fios_items.Length());
 				this->selected = NULL;
 				_load_check_data.Clear();
 				/* FALL THROUGH */
 			case 1:
 				/* Selection changes */
 				if (!gui_scope) break;
-				if (_saveload_mode == SLD_LOAD_HEIGHTMAP) {
+
 				if (this->fop != SLO_LOAD) break;
 				switch (this->abstract_filetype) {
 					case FT_HEIGHTMAP:
 						this->SetWidgetDisabledState(WID_SL_LOAD_BUTTON, this->selected == NULL || _load_check_data.HasErrors());
 						break;
 					case FT_SAVEGAME:
 					case FT_SCENARIO: {
 						bool disabled = this->selected == NULL || _load_check_data.HasErrors();
 						if (!_settings_client.gui.UserIsAllowedToChangeNewGRFs()) {
 							disabled |= _load_check_data.HasNewGrfs() && _load_check_data.grf_compatibility == GLC_NOT_FOUND;
 						}
-				if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) {
+						this->SetWidgetDisabledState(WID_SL_LOAD_BUTTON, disabled);
-					this->SetWidgetDisabledState(WID_SL_LOAD_BUTTON,
+						this->SetWidgetDisabledState(WID_SL_NEWGRF_INFO, !_load_check_data.HasNewGrfs());
 							this->selected == NULL || _load_check_data.HasErrors() || !(!_load_check_data.HasNewGrfs() || _load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs()));
 					this->SetWidgetDisabledState(WID_SL_NEWGRF_INFO,
 							!_load_check_data.HasNewGrfs());
 						this->SetWidgetDisabledState(WID_SL_MISSING_NEWGRFS,
 								!_load_check_data.HasNewGrfs() || _load_check_data.grf_compatibility == GLC_ALL_GOOD);
 				}
 						break;
-			case 2:
+					}
-				/* _fios_items changed */
+
-				this->vscroll->SetCount(_fios_items.Length());
+					default:
-				this->selected = NULL;
+						NOT_REACHED();
-				_load_check_data.Clear();
+				}
 				break;
 		}
 	}
@@ -734,70 +759,24 @@ static WindowDesc _save_dialog_desc(
 	_nested_save_dialog_widgets, lengthof(_nested_save_dialog_widgets)
 );
 /**
 * These values are used to convert the file/operations mode into a corresponding file type.
 * So each entry, as expressed by the related comment, is based on the enum
 */
 static const FileType _file_modetotype[] = {
 	FT_SAVEGAME,  // used for SLD_LOAD_GAME
 	FT_SCENARIO,  // used for SLD_LOAD_SCENARIO
 	FT_SAVEGAME,  // used for SLD_SAVE_GAME
 	FT_SCENARIO,  // used for SLD_SAVE_SCENARIO
 	FT_HEIGHTMAP, // used for SLD_LOAD_HEIGHTMAP
 	FT_HEIGHTMAP, // used for SLD_SAVE_HEIGHTMAP
 };
 /**
 * Launch save/load dialog in the given mode.
- * @param mode Save/load mode.
+ * @param abstract_filetype Kind of file to handle.
 * @param fop File operation to perform (load or save).
 */
-void ShowSaveLoadDialog(SaveLoadDialogMode mode)
+void ShowSaveLoadDialog(AbstractFileType abstract_filetype, SaveLoadOperation fop)
 {
 	DeleteWindowById(WC_SAVELOAD, 0);
 	WindowDesc *sld;
-	switch (mode) {
+	if (fop == SLO_SAVE) {
-		case SLD_SAVE_GAME:
+		sld = &_save_dialog_desc;
-		case SLD_SAVE_SCENARIO:
+	} else {
-		case SLD_SAVE_HEIGHTMAP:
+		/* Dialogue for loading a file. */
-			sld = &_save_dialog_desc; break;
+		sld = (abstract_filetype == FT_HEIGHTMAP) ? &_load_heightmap_dialog_desc : &_load_dialog_desc;
 		case SLD_LOAD_HEIGHTMAP:
 			sld = &_load_heightmap_dialog_desc; break;
 		default:
 			sld = &_load_dialog_desc; break;
 	}
-	_saveload_mode = mode;
+	_file_to_saveload.abstract_ftype = abstract_filetype;
 	_file_to_saveload.filetype = _file_modetotype[mode];
-	new SaveLoadWindow(sld, mode);
+	new SaveLoadWindow(sld, abstract_filetype, fop);
 }
 void SetFiosType(const byte fiostype)
 {
 	switch (fiostype) {
 		case FIOS_TYPE_FILE:
 		case FIOS_TYPE_SCENARIO:
 			_file_to_saveload.mode = SL_LOAD;
 			break;
 		case FIOS_TYPE_OLDFILE:
 		case FIOS_TYPE_OLD_SCENARIO:
 			_file_to_saveload.mode = SL_OLD_LOAD;
 			break;
 #ifdef WITH_PNG
 		case FIOS_TYPE_PNG:
 			_file_to_saveload.mode = SL_PNG;
 			break;
 #endif /* WITH_PNG */
 		case FIOS_TYPE_BMP:
 			_file_to_saveload.mode = SL_BMP;
 			break;
 		default:
 			_file_to_saveload.mode = SL_INVALID;
 			break;
 	}
 }
--- a/src/game/game_info.cpp
+++ b/src/game/game_info.cpp
@@ -25,7 +25,7 @@
 static bool CheckAPIVersion(const char *api_version)
 {
 	return strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0 || strcmp(api_version, "1.4") == 0 ||
-			strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0;
+			strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0;
 }
 #if defined(WIN32)
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -77,7 +77,7 @@ static void CleanupGeneration()
 {
 	_generating_world = false;
-	if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE);
+	SetMouseCursorBusy(false);
 	/* Show all vital windows again, because we have hidden them */
 	if (_gw.threaded && _game_mode != GM_MENU) ShowVitalWindows();
 	SetModalProgress(false);
@@ -204,7 +204,7 @@ static void _GenerateWorld(void *)
 		if (_debug_desync_level > 0) {
 			char name[MAX_PATH];
 			seprintf(name, lastof(name), "dmp_cmds_%08x_%08x.sav", _settings_game.game_creation.generation_seed, _date);
-			SaveOrLoad(name, SL_SAVE, AUTOSAVE_DIR, false);
+			SaveOrLoad(name, SLO_SAVE, DFT_GAME_FILE, AUTOSAVE_DIR, false);
 		}
 	} catch (...) {
 		BasePersistentStorageArray::SwitchMode(PSM_LEAVE_GAMELOOP, true);
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -26,6 +26,7 @@
 #include "town.h"
 #include "core/geometry_func.hpp"
 #include "core/random_func.hpp"
 #include "saveload/saveload.h"
 #include "progress.h"
 #include "error.h"
@@ -832,7 +833,7 @@ static void _ShowGenerateLandscape(GenerateLandscapeWindowMode mode)
 	if (mode == GLWM_HEIGHTMAP) {
 		/* If the function returns negative, it means there was a problem loading the heightmap */
-		if (!GetHeightmapDimensions(_file_to_saveload.name, &x, &y)) return;
+		if (!GetHeightmapDimensions(_file_to_saveload.detail_ftype, _file_to_saveload.name, &x, &y)) return;
 	}
 	WindowDesc *desc = (mode == GLWM_HEIGHTMAP) ? &_heightmap_load_desc : &_generate_landscape_desc;
@@ -1190,7 +1191,7 @@ struct GenerateProgressWindow : public Window {
 	{
 		switch (widget) {
 			case WID_GP_ABORT:
-				if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE);
+				SetMouseCursorBusy(false);
 				ShowQuery(
 					STR_GENERATION_ABORT_CAPTION,
 					STR_GENERATION_ABORT_MESSAGE,
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -186,7 +186,7 @@ static inline void GfxDoDrawLine(void *video, int x, int y, int x2, int y2, int
 	int grade_x = x2 - x;
 	/* Clipping rectangle. Slightly extended so we can ignore the width of the line. */
-	uint extra = CeilDiv(3 * width, 4); // not less then "width * sqrt(2) / 2"
+	int extra = (int)CeilDiv(3 * width, 4); // not less then "width * sqrt(2) / 2"
 	Rect clip = { -extra, -extra, screen_width - 1 + extra, screen_height - 1 + extra };
 	/* prevent integer overflows. */
@@ -586,7 +586,7 @@ int GetStringLineCount(StringID str, int maxw)
 */
 Dimension GetStringMultiLineBoundingBox(StringID str, const Dimension &suggestion)
 {
-	Dimension box = {suggestion.width, GetStringHeight(str, suggestion.width)};
+	Dimension box = {suggestion.width, (uint)GetStringHeight(str, suggestion.width)};
 	return box;
 }
@@ -598,7 +598,7 @@ Dimension GetStringMultiLineBoundingBox(StringID str, const Dimension &suggestio
 */
 Dimension GetStringMultiLineBoundingBox(const char *str, const Dimension &suggestion)
 {
-	Dimension box = {suggestion.width, GetStringHeight(str, suggestion.width)};
+	Dimension box = {suggestion.width, (uint)GetStringHeight(str, suggestion.width)};
 	return box;
 }
@@ -1223,10 +1223,6 @@ void DrawMouseCursor()
 	if (_screen.dst_ptr == NULL) return;
 	Blitter *blitter = BlitterFactory::GetCurrentBlitter();
 	int x;
 	int y;
 	int w;
 	int h;
 	/* Redraw mouse cursor but only when it's inside the window */
 	if (!_cursor.in_window) return;
@@ -1237,36 +1233,44 @@ void DrawMouseCursor()
 		UndrawMouseCursor();
 	}
-	w = _cursor.size.x;
+	/* Determine visible area */
-	x = _cursor.pos.x + _cursor.offs.x + _cursor.short_vehicle_offset;
+	int left = _cursor.pos.x + _cursor.total_offs.x;
-	if (x < 0) {
+	int width = _cursor.total_size.x;
-		w += x;
+	if (left < 0) {
-		x = 0;
+		width += left;
 		left = 0;
 	}
-	if (w > _screen.width - x) w = _screen.width - x;
+	if (left + width > _screen.width) {
-	if (w <= 0) return;
+		width = _screen.width - left;
 	_cursor.draw_pos.x = x;
 	_cursor.draw_size.x = w;
 	h = _cursor.size.y;
 	y = _cursor.pos.y + _cursor.offs.y;
 	if (y < 0) {
 		h += y;
 		y = 0;
 	}
-	if (h > _screen.height - y) h = _screen.height - y;
+	if (width <= 0) return;
 	if (h <= 0) return;
 	_cursor.draw_pos.y = y;
 	_cursor.draw_size.y = h;
-	uint8 *buffer = _cursor_backup.Allocate(blitter->BufferSize(w, h));
+	int top = _cursor.pos.y + _cursor.total_offs.y;
 	int height = _cursor.total_size.y;
 	if (top < 0) {
 		height += top;
 		top = 0;
 	}
 	if (top + height > _screen.height) {
 		height = _screen.height - top;
 	}
 	if (height <= 0) return;
 	_cursor.draw_pos.x = left;
 	_cursor.draw_pos.y = top;
 	_cursor.draw_size.x = width;
 	_cursor.draw_size.y = height;
 	uint8 *buffer = _cursor_backup.Allocate(blitter->BufferSize(_cursor.draw_size.x, _cursor.draw_size.y));
 	/* Make backup of stuff below cursor */
 	blitter->CopyToBuffer(blitter->MoveTo(_screen.dst_ptr, _cursor.draw_pos.x, _cursor.draw_pos.y), buffer, _cursor.draw_size.x, _cursor.draw_size.y);
 	/* Draw cursor on screen */
 	_cur_dpi = &_screen;
-	DrawSprite(_cursor.sprite, _cursor.pal, _cursor.pos.x + _cursor.short_vehicle_offset, _cursor.pos.y);
+	for (uint i = 0; i < _cursor.sprite_count; ++i) {
 		DrawSprite(_cursor.sprite_seq[i].sprite, _cursor.sprite_seq[i].pal, _cursor.pos.x + _cursor.sprite_pos[i].x, _cursor.pos.y + _cursor.sprite_pos[i].y);
 	}
 	VideoDriver::GetInstance()->MakeDirty(_cursor.draw_pos.x, _cursor.draw_pos.y, _cursor.draw_size.x, _cursor.draw_size.y);
@@ -1525,15 +1529,33 @@ bool FillDrawPixelInfo(DrawPixelInfo *n, int left, int top, int width, int heigh
 */
 void UpdateCursorSize()
 {
-	CursorVars *cv = &_cursor;
+	/* Ignore setting any cursor before the sprites are loaded. */
-	const Sprite *p = GetSprite(GB(cv->sprite, 0, SPRITE_WIDTH), ST_NORMAL);
+	if (GetMaxSpriteID() == 0) return;
-	cv->size.y = UnScaleGUI(p->height);
+	assert_compile(lengthof(_cursor.sprite_seq) == lengthof(_cursor.sprite_pos));
-	cv->size.x = UnScaleGUI(p->width);
+	assert(_cursor.sprite_count <= lengthof(_cursor.sprite_seq));
-	cv->offs.x = UnScaleGUI(p->x_offs);
+	for (uint i = 0; i < _cursor.sprite_count; ++i) {
-	cv->offs.y = UnScaleGUI(p->y_offs);
+		const Sprite *p = GetSprite(GB(_cursor.sprite_seq[i].sprite, 0, SPRITE_WIDTH), ST_NORMAL);
 		Point offs, size;
 		offs.x = UnScaleGUI(p->x_offs) + _cursor.sprite_pos[i].x;
 		offs.y = UnScaleGUI(p->y_offs) + _cursor.sprite_pos[i].y;
 		size.x = UnScaleGUI(p->width);
 		size.y = UnScaleGUI(p->height);
-	cv->dirty = true;
+		if (i == 0) {
 			_cursor.total_offs = offs;
 			_cursor.total_size = size;
 		} else {
 			int right  = max(_cursor.total_offs.x + _cursor.total_size.x, offs.x + size.x);
 			int bottom = max(_cursor.total_offs.y + _cursor.total_size.y, offs.y + size.y);
 			if (offs.x < _cursor.total_offs.x) _cursor.total_offs.x = offs.x;
 			if (offs.y < _cursor.total_offs.y) _cursor.total_offs.y = offs.y;
 			_cursor.total_size.x = right  - _cursor.total_offs.x;
 			_cursor.total_size.y = bottom - _cursor.total_offs.y;
 		}
 	}
 	_cursor.dirty = true;
 }
 /**
@@ -1543,14 +1565,15 @@ void UpdateCursorSize()
 */
 static void SetCursorSprite(CursorID cursor, PaletteID pal)
 {
-	CursorVars *cv = &_cursor;
+	if (_cursor.sprite_count == 1 && _cursor.sprite_seq[0].sprite == cursor && _cursor.sprite_seq[0].pal == pal) return;
-	if (cv->sprite == cursor) return;
+
 	_cursor.sprite_count = 1;
 	_cursor.sprite_seq[0].sprite = cursor;
 	_cursor.sprite_seq[0].pal = pal;
 	_cursor.sprite_pos[0].x = 0;
 	_cursor.sprite_pos[0].y = 0;
 	cv->sprite = cursor;
 	cv->pal    = pal;
 	UpdateCursorSize();
 	cv->short_vehicle_offset = 0;
 }
 static void SwitchAnimatedCursor()
@@ -1559,7 +1582,7 @@ static void SwitchAnimatedCursor()
 	if (cur == NULL || cur->sprite == AnimCursor::LAST) cur = _cursor.animate_list;
-	SetCursorSprite(cur->sprite, _cursor.pal);
+	SetCursorSprite(cur->sprite, _cursor.sprite_seq[0].pal);
 	_cursor.animate_timeout = cur->display_time;
 	_cursor.animate_cur     = cur + 1;
@@ -1572,6 +1595,19 @@ void CursorTick()
 	}
 }
 /**
 * Set or unset the ZZZ cursor.
 * @param busy Whether to show the ZZZ cursor.
 */
 void SetMouseCursorBusy(bool busy)
 {
 	if (busy) {
 		if (_cursor.sprite_seq[0].sprite == SPR_CURSOR_MOUSE) SetMouseCursor(SPR_CURSOR_ZZZ, PAL_NONE);
 	} else {
 		if (_cursor.sprite_seq[0].sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE);
 	}
 }
 /**
 * Assign a single non-animated sprite to the cursor.
 * @param sprite Sprite to draw for the cursor.
@@ -1595,7 +1631,7 @@ void SetAnimatedMouseCursor(const AnimCursor *table)
 {
 	_cursor.animate_list = table;
 	_cursor.animate_cur = NULL;
-	_cursor.pal = PAL_NONE;
+	_cursor.sprite_seq[0].pal = PAL_NONE;
 	SwitchAnimatedCursor();
 }
--- a/src/gfx_func.h
+++ b/src/gfx_func.h
@@ -145,6 +145,7 @@ bool FillDrawPixelInfo(DrawPixelInfo *n, int left, int top, int width, int heigh
 /* window.cpp */
 void DrawOverlappedWindowForAll(int left, int top, int right, int bottom);
 void SetMouseCursorBusy(bool busy);
 void SetMouseCursor(CursorID cursor, PaletteID pal);
 void SetAnimatedMouseCursor(const AnimCursor *table);
 void CursorTick();
--- a/src/gfx_layout.cpp
+++ b/src/gfx_layout.cpp
@@ -17,9 +17,9 @@
 #include "table/control_codes.h"
-#ifdef WITH_ICU
+#ifdef WITH_ICU_LAYOUT
 #include <unicode/ustring.h>
-#endif /* WITH_ICU */
+#endif /* WITH_ICU_LAYOUT */
 #include "safeguards.h"
@@ -42,7 +42,7 @@ Font::Font(FontSize size, TextColour colour) :
 	assert(size < FS_END);
 }
-#ifdef WITH_ICU
+#ifdef WITH_ICU_LAYOUT
 /* Implementation details of LEFontInstance */
 le_int32 Font::getUnitsPerEM() const
@@ -213,7 +213,7 @@ static ParagraphLayouter *GetParagraphLayout(UChar *buff, UChar *buff_end, FontM
 	return new ICUParagraphLayout(p);
 }
-#endif /* WITH_ICU */
+#endif /* WITH_ICU_LAYOUT */
 /*** Paragraph layout ***/
 /**
@@ -654,7 +654,7 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi
 			line.layout->Reflow();
 		} else {
 			/* Line is new, layout it */
-#ifdef WITH_ICU
+#ifdef WITH_ICU_LAYOUT
 			FontState old_state = state;
 			const char *old_str = str;
--- a/src/gfx_layout.h
+++ b/src/gfx_layout.h
@@ -19,12 +19,12 @@
 #include <map>
 #include <string>
-#ifdef WITH_ICU
+#ifdef WITH_ICU_LAYOUT
 #include "layout/ParagraphLayout.h"
 #define ICU_FONTINSTANCE : public LEFontInstance
-#else /* WITH_ICU */
+#else /* WITH_ICU_LAYOUT */
 #define ICU_FONTINSTANCE
-#endif /* WITH_ICU */
+#endif /* WITH_ICU_LAYOUT */
 /**
 * Text drawing parameters, which can change while drawing a line, but are kept between multiple parts
@@ -75,7 +75,7 @@ public:
 	Font(FontSize size, TextColour colour);
-#ifdef WITH_ICU
+#ifdef WITH_ICU_LAYOUT
 	/* Implementation details of LEFontInstance */
 	le_int32 getUnitsPerEM() const;
@@ -91,7 +91,7 @@ public:
 	LEGlyphID mapCharToGlyph(LEUnicode32 ch) const;
 	void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const;
 	le_bool getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const;
-#endif /* WITH_ICU */
+#endif /* WITH_ICU_LAYOUT */
 };
 /** Mapping from index to font. */
--- a/src/gfx_type.h
+++ b/src/gfx_type.h
@@ -115,28 +115,34 @@ struct AnimCursor {
 /** Collection of variables for cursor-display and -animation */
 struct CursorVars {
-	Point pos, size, offs, delta; ///< position, size, offset from top-left, and movement
+	/* Logical mouse position */
-	Point draw_pos, draw_size;    ///< position and size bounding-box for drawing
+	Point pos;                    ///< logical mouse position
-	int short_vehicle_offset;     ///< offset of the X for short vehicles
+	Point delta;                  ///< relative mouse movement in this tick
 	CursorID sprite; ///< current image of cursor
 	PaletteID pal;
 	int wheel;                    ///< mouse wheel movement
 	bool fix_at;                  ///< mouse is moving, but cursor is not (used for scrolling)
 	/* We need two different vars to keep track of how far the scrollwheel moved.
 	 * OSX uses this for scrolling around the map. */
 	int v_wheel;
 	int h_wheel;
 	/* Mouse appearance */
 	PalSpriteID sprite_seq[16];   ///< current image of cursor
 	Point sprite_pos[16];         ///< relative position of individual sprites
 	uint sprite_count;            ///< number of sprites to draw
 	Point total_offs, total_size; ///< union of sprite properties
 	Point draw_pos, draw_size;    ///< position and size bounding-box for drawing
 	const AnimCursor *animate_list; ///< in case of animated cursor, list of frames
 	const AnimCursor *animate_cur;  ///< in case of animated cursor, current frame
 	uint animate_timeout;           ///< in case of animated cursor, number of ticks to show the current cursor
 	bool visible;                 ///< cursor is visible
 	bool dirty;                   ///< the rect occupied by the mouse is dirty (redraw)
 	bool fix_at;     ///< mouse is moving, but cursor is not (used for scrolling)
 	bool in_window;               ///< mouse inside this window, determines drawing logic
 	/* Drag data */
 	bool vehchain;                ///< vehicle chain is dragged
 	bool UpdateCursorPosition(int x, int y, bool queued_warp);
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -627,8 +627,8 @@ public:
 				this->vehicle_sel = v->index;
-				int image = v->GetImage(_current_text_dir == TD_RTL ? DIR_E : DIR_W, EIT_IN_LIST);
+				SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
-				SetObjectToPlaceWnd(image, GetVehiclePalette(v), HT_DRAG, this);
+				SetMouseCursorVehicle(v, EIT_IN_LIST);
 				_cursor.vehchain = true;
 				this->SetDirty();
--- a/src/heightmap.cpp
+++ b/src/heightmap.cpp
@@ -102,7 +102,7 @@ static void ReadHeightmapPNGImageData(byte *map, png_structp png_ptr, png_infop
 * If map == NULL only the size of the PNG is read, otherwise a map
 * with grayscale pixels is allocated and assigned to *map.
 */
-static bool ReadHeightmapPNG(char *filename, uint *x, uint *y, byte **map)
+static bool ReadHeightmapPNG(const char *filename, uint *x, uint *y, byte **map)
 {
 	FILE *fp;
 	png_structp png_ptr = NULL;
@@ -232,7 +232,7 @@ static void ReadHeightmapBMPImageData(byte *map, BmpInfo *info, BmpData *data)
 * If map == NULL only the size of the BMP is read, otherwise a map
 * with grayscale pixels is allocated and assigned to *map.
 */
-static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map)
+static bool ReadHeightmapBMP(const char *filename, uint *x, uint *y, byte **map)
 {
 	FILE *f;
 	BmpInfo info;
@@ -444,45 +444,56 @@ void FixSlopes()
 }
 /**
- * Reads the heightmap with the correct file reader
+ * Reads the heightmap with the correct file reader.
 * @param dft Type of image file.
 * @param filename Name of the file to load.
 * @param [out] x Length of the image.
 * @param [out] y Height of the image.
 * @param [inout] map If not \c NULL, destination to store the loaded block of image data.
 * @return Whether loading was successful.
 */
-static bool ReadHeightMap(char *filename, uint *x, uint *y, byte **map)
+static bool ReadHeightMap(DetailedFileType dft, const char *filename, uint *x, uint *y, byte **map)
 {
-	switch (_file_to_saveload.mode) {
+	switch (dft) {
-		default: NOT_REACHED();
+		default:
 			NOT_REACHED();
 #ifdef WITH_PNG
-		case SL_PNG:
+		case DFT_HEIGHTMAP_PNG:
 			return ReadHeightmapPNG(filename, x, y, map);
 #endif /* WITH_PNG */
-		case SL_BMP:
+
 		case DFT_HEIGHTMAP_BMP:
 			return ReadHeightmapBMP(filename, x, y, map);
 	}
 }
 /**
 * Get the dimensions of a heightmap.
 * @param dft Type of image file.
 * @param filename to query
 * @param x dimension x
 * @param y dimension y
 * @return Returns false if loading of the image failed.
 */
-bool GetHeightmapDimensions(char *filename, uint *x, uint *y)
+bool GetHeightmapDimensions(DetailedFileType dft, const char *filename, uint *x, uint *y)
 {
-	return ReadHeightMap(filename, x, y, NULL);
+	return ReadHeightMap(dft, filename, x, y, NULL);
 }
 /**
 * Load a heightmap from file and change the map in his current dimensions
 *  to a landscape representing the heightmap.
 * It converts pixels to height. The brighter, the higher.
 * @param dft Type of image file.
 * @param filename of the heightmap file to be imported
 */
-void LoadHeightmap(char *filename)
+void LoadHeightmap(DetailedFileType dft, const char *filename)
 {
 	uint x, y;
 	byte *map = NULL;
-	if (!ReadHeightMap(filename, &x, &y, &map)) {
+	if (!ReadHeightMap(dft, filename, &x, &y, &map)) {
 		free(map);
 		return;
 	}
--- a/src/heightmap.h
+++ b/src/heightmap.h
@@ -12,6 +12,8 @@
 #ifndef HEIGHTMAP_H
 #define HEIGHTMAP_H
 #include "fileio_type.h"
 /**
 * Order of these enums has to be the same as in lang/english.txt
 * Otherwise you will get inconsistent behaviour.
@@ -21,8 +23,8 @@ enum HeightmapRotation {
 	HM_CLOCKWISE,         ///< Rotate the map clockwise 45 degrees
 };
-bool GetHeightmapDimensions(char *filename, uint *x, uint *y);
+bool GetHeightmapDimensions(DetailedFileType dft, const char *filename, uint *x, uint *y);
-void LoadHeightmap(char *filename);
+void LoadHeightmap(DetailedFileType dft, const char *filename);
 void FlatEmptyWorld(byte tile_height);
 void FixSlopes();
--- a/src/ini.cpp
+++ b/src/ini.cpp
@@ -16,7 +16,6 @@
 #include "fileio_func.h"
 #if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 500)
 # define WITH_FDATASYNC
 # include <unistd.h>
 #endif
@@ -80,7 +79,7 @@ bool IniFile::SaveToDisk(const char *filename)
 * APIs to do so. We only need to flush the data as the metadata itself
 * (modification date etc.) is not important to us; only the real data is.
 */
-#ifdef WITH_FDATASYNC
+#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0
 	int ret = fdatasync(fileno(f));
 	fclose(f);
 	if (ret != 0) return false;
--- a/src/intro_gui.cpp
+++ b/src/intro_gui.cpp
@@ -111,9 +111,9 @@ struct SelectGameWindow : public Window {
 				}
 				break;
-			case WID_SGI_LOAD_GAME:      ShowSaveLoadDialog(SLD_LOAD_GAME); break;
+			case WID_SGI_LOAD_GAME:      ShowSaveLoadDialog(FT_SAVEGAME, SLO_LOAD); break;
-			case WID_SGI_PLAY_SCENARIO:  ShowSaveLoadDialog(SLD_LOAD_SCENARIO); break;
+			case WID_SGI_PLAY_SCENARIO:  ShowSaveLoadDialog(FT_SCENARIO, SLO_LOAD); break;
-			case WID_SGI_PLAY_HEIGHTMAP: ShowSaveLoadDialog(SLD_LOAD_HEIGHTMAP); break;
+			case WID_SGI_PLAY_HEIGHTMAP: ShowSaveLoadDialog(FT_HEIGHTMAP,SLO_LOAD); break;
 			case WID_SGI_EDIT_SCENARIO:  StartScenarioEditor(); break;
 			case WID_SGI_PLAY_NETWORK:
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -31,6 +31,7 @@
 #include "object_base.h"
 #include "company_func.h"
 #include "pathfinder/npf/aystar.h"
 #include "saveload/saveload.h"
 #include <list>
 #include <set>
@@ -1221,7 +1222,7 @@ void GenerateLandscape(byte mode)
 	if (mode == GWM_HEIGHTMAP) {
 		SetGeneratingWorldProgress(GWP_LANDSCAPE, steps + GLS_HEIGHTMAP);
-		LoadHeightmap(_file_to_saveload.name);
+		LoadHeightmap(_file_to_saveload.detail_ftype, _file_to_saveload.name);
 		IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
 	} else if (_settings_game.game_creation.land_generator == LG_TERRAGENESIS) {
 		SetGeneratingWorldProgress(GWP_LANDSCAPE, steps + GLS_TERRAGENESIS);
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -2688,7 +2688,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND                   :Maatskappy-besi
 STR_ABOUT_OPENTTD                                               :{WHITE}Oor OpenTTD
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Oorspronklike kopiereg {COPYRIGHT} 1995 Chris Sawyer, Alle regte voorbehou
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD uitgawe {REV}
-STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2015 Die OpenTTD span
+STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2016 Die OpenTTD span
 # Save/load game/scenario
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Spaar Spel
@@ -2875,7 +2875,7 @@ STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Gaan na
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Vorige sprite
 STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Gaan na vorige normale sprite, en ignoreer enige pseudo/her-kleur/font sprite en spring terug na die einde
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Voorstelling van geselekteerde sprite. Die belyning word geignoreer waneer sprite geteken word
-STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Beweeg die sprite rond, verander die X en Y afwyking
+STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Beweeg die sprite rond, verander die X en Y afwyking. Ctrl-klik om die sprite agt lengtes rond te beweeg op 'n slag
 STR_SPRITE_ALIGNER_RESET_BUTTON                                 :{BLACK}Relatiewe herstel
 STR_SPRITE_ALIGNER_RESET_TOOLTIP                                :{BLACK}Herstel die huidige relatiewe verplasing
 STR_SPRITE_ALIGNER_OFFSETS_ABS                                  :{BLACK}X verplasing: {NUM}, Y verplasing: {NUM} (Werklik)
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -41,7 +41,7 @@ STR_CARGO_PLURAL_VALUABLES                                      :مقتنيات
 STR_CARGO_PLURAL_COPPER_ORE                                     :منجم نحاس
 STR_CARGO_PLURAL_MAIZE                                          :ذرة
 STR_CARGO_PLURAL_FRUIT                                          :فواكة
-STR_CARGO_PLURAL_DIAMONDS                                       :جواهر
+STR_CARGO_PLURAL_DIAMONDS                                       :ألماس
 STR_CARGO_PLURAL_FOOD                                           :طعام
 STR_CARGO_PLURAL_PAPER                                          :ورق
 STR_CARGO_PLURAL_GOLD                                           :ذهب
@@ -97,10 +97,10 @@ STR_CARGO_SINGULAR_FIZZY_DRINK                                  :مشروب غا
 STR_QUANTITY_NOTHING                                            :
 STR_QUANTITY_PASSENGERS                                         :{COMMA} راكب
 STR_QUANTITY_COAL                                               :{WEIGHT_LONG} من الفحم
-STR_QUANTITY_MAIL                                               :{COMMA} صندوق من البريد
+STR_QUANTITY_MAIL                                               :{COMMA}{NBSP} كيس بريد
 STR_QUANTITY_OIL                                                :{VOLUME_LONG} من النفط
-STR_QUANTITY_LIVESTOCK                                          :{COMMA}راس من الماشية
+STR_QUANTITY_LIVESTOCK                                          :{COMMA}{NBSP}رأس ماشية
-STR_QUANTITY_GOODS                                              :{COMMA} قفص من البضائع
+STR_QUANTITY_GOODS                                              :{COMMA}{NBSP} صندوق بضائع
 STR_QUANTITY_GRAIN                                              :{WEIGHT_LONG} من الحبوب
 STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} من الخشب
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT_LONG} من خام الحديد
@@ -109,16 +109,16 @@ STR_QUANTITY_VALUABLES                                          :{COMMA}صندو
 STR_QUANTITY_COPPER_ORE                                         :{WEIGHT_LONG} من خام النحاس
 STR_QUANTITY_MAIZE                                              :{WEIGHT_LONG} من الذرة
 STR_QUANTITY_FRUIT                                              :{WEIGHT_LONG} من الفواكة
-STR_QUANTITY_DIAMONDS                                           :{COMMA}كيس من الجواهر
+STR_QUANTITY_DIAMONDS                                           :{COMMA}{NBSP}كيس ألماس
 STR_QUANTITY_FOOD                                               :{WEIGHT_LONG} من الطعام
 STR_QUANTITY_PAPER                                              :{WEIGHT_LONG} من الورق
-STR_QUANTITY_GOLD                                               :{COMMA}كيس من الذهب
+STR_QUANTITY_GOLD                                               :{COMMA}{NBSP} كيس ذهب
 STR_QUANTITY_WATER                                              :{VOLUME_LONG} من المياة
 STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} من القمح
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} من المطاط
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} من السكر
-STR_QUANTITY_TOYS                                               :{COMMA}الالعاب
+STR_QUANTITY_TOYS                                               :{COMMA}{NBSP} لعبة
-STR_QUANTITY_SWEETS                                             :{COMMA} كيس من الحلويات
+STR_QUANTITY_SWEETS                                             :{COMMA}{NBSP} كيس حلويات
 STR_QUANTITY_COLA                                               :{VOLUME_LONG} من الكولا
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} من الحلاوة القطنية
 STR_QUANTITY_BUBBLES                                            :{COMMA}فقاعات
@@ -165,12 +165,12 @@ STR_ABBREV_NONE                                                 :{TINY_FONT}لا
 STR_ABBREV_ALL                                                  :{TINY_FONT}الكل
 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :{COMMA} ركاب
+STR_PASSENGERS                                                  :{COMMA}{NBSP} راكب
-STR_BAGS                                                        :{COMMA} صناديق
+STR_BAGS                                                        :{COMMA}{NBSP} كيس
-STR_TONS                                                        :{COMMA} اطنان/طن
+STR_TONS                                                        :{COMMA}{NBSP} طن
-STR_LITERS                                                      :{COMMA} لتر
+STR_LITERS                                                      :{COMMA}{NBSP} لتر
 STR_ITEMS                                                       :{COMMA} وحدة
-STR_CRATES                                                      :{COMMA} صناديق
+STR_CRATES                                                      :{COMMA}{NBSP} صندوق
 # Colours, do not shuffle
 STR_COLOUR_DARK_BLUE                                            :ازرق غامق
@@ -191,32 +191,32 @@ STR_COLOUR_GREY                                                 :رمادي
 STR_COLOUR_WHITE                                                :ابيض
 # Units used in OpenTTD
-STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}ميل/س
+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}ميل/س
-STR_UNITS_VELOCITY_METRIC                                       :{COMMA}كم/س
+STR_UNITS_VELOCITY_METRIC                                       :{COMMA}{NBSP}كم/س
-STR_UNITS_VELOCITY_SI                                           :{COMMA}م/ث
+STR_UNITS_VELOCITY_SI                                           :{COMMA}{NBSP}م/ث
-STR_UNITS_POWER_IMPERIAL                                        :{COMMA}حصان
+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}{NBSP}حصان
-STR_UNITS_POWER_METRIC                                          :{COMMA}حصان
+STR_UNITS_POWER_METRIC                                          :{COMMA}{NBSP}حصان
-STR_UNITS_POWER_SI                                              :{COMMA}ك واط
+STR_UNITS_POWER_SI                                              :{COMMA}{NBSP}ك واط
-STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}ت
+STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}{NBSP} طن
-STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}طن
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}{NBSP}طن
-STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}كجم
+STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}{NBSP}كجم
-STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} طن
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA}{NBSP} طن
-STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA}كجم
+STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA}{NBSP}كجم
-STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}غال
+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}{NBSP}غال
-STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}ل
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}{NBSP}ل
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}م3
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}{NBSP}م3
-STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} لتر
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA}{NBSP} لتر
-STR_UNITS_VOLUME_LONG_SI                                        :{COMMA}م3
+STR_UNITS_VOLUME_LONG_SI                                        :{COMMA}{NBSP}م3
-STR_UNITS_FORCE_SI                                              :{COMMA} كيلو نيوتن
+STR_UNITS_FORCE_SI                                              :{COMMA}{NBSP} كيلو نيوتن
-STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA} قدم
+STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA}{NBSP} قدم
-STR_UNITS_HEIGHT_SI                                             :{COMMA} متر
+STR_UNITS_HEIGHT_SI                                             :{COMMA}{NBSP} متر
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK} ادخل فلتر
@@ -286,7 +286,7 @@ STR_SORT_BY_ENGINE_ID                                           :نوع المح
 STR_SORT_BY_COST                                                :التكلفة
 STR_SORT_BY_POWER                                               :الطاقة
 STR_SORT_BY_TRACTIVE_EFFORT                                     :قوة الجذب
-STR_SORT_BY_INTRO_DATE                                          :بداية التشغيل
+STR_SORT_BY_INTRO_DATE                                          :بداية الإنتاج
 STR_SORT_BY_RUNNING_COST                                        :تكلفة التشغيل
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :القوة/تكلفة التشغيل
 STR_SORT_BY_CARGO_CAPACITY                                      :سعة الشحن
@@ -351,6 +351,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :انهاء
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :إعدادات اللعبه
 STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :الإعدادات
 STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :الذكاء الصناعي/ اعدادات اللعبة
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :إعدادات اﻹضافات
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :خيارات الشفافية
@@ -941,7 +942,12 @@ STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}دقة
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}اختر دقة الشاشة
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :اخرى
 STR_GAME_OPTIONS_GUI_ZOOM_FRAME                                 :حجم اللوحة
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP                      :حدد العنصر المطلوب
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :تقريب عادي
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :تقريب ×2
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :تقريب ×4
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK} الواجهة الرسومية الاساسية
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK} اختر مجموعة الواجهة الرسومية
@@ -1036,6 +1042,7 @@ STR_TERRAIN_TYPE_VERY_FLAT                                      :مسطح تما
 STR_TERRAIN_TYPE_FLAT                                           :مسطح
 STR_TERRAIN_TYPE_HILLY                                          :مرتفعات - هضاب
 STR_TERRAIN_TYPE_MOUNTAINOUS                                    :جبال
 STR_TERRAIN_TYPE_ALPINIST                                       :شاهق
 STR_CITY_APPROVAL_PERMISSIVE                                    :متساهل
 STR_CITY_APPROVAL_TOLERANT                                      :متقبل
@@ -1044,6 +1051,7 @@ STR_CITY_APPROVAL_HOSTILE                                       :معاد
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}لايوجد ذكاء اصطناعي متاح ...{}تستطيع تجميل العديد من الذكاء الاصطناعي عن طريق اللانترنت
 # Settings tree window
 STR_CONFIG_SETTING_TREE_CAPTION                                 :الإعدادات
 STR_CONFIG_SETTING_EXPAND_ALL                                   :مدد الكل
 STR_CONFIG_SETTING_COLLAPSE_ALL                                 :إسحب الكل
@@ -1053,11 +1061,11 @@ STR_CONFIG_SETTING_RESTRICT_BASIC                               :اﻹعدادا
 STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT                       :{BLACK}احصر القائمة على انواع اعدادات محددة
 STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL                            :كل الاعدادات
-STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT                         :اعدادات العميل (غير مخزن في المحفوظات, يؤثر على كل الالعاب)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT                         :اعدادات العميل (لا يخزن في الحفظ ؛ يطبق على كل الالعاب)
-STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU                      :اعدادات اللعبة (مخزن في المحفوظات, يؤثر على الالعاب الجديدة فقط)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU                      :اعدادات اللعبة (يخزن في الحفظ ؛ يطبق على الالعاب الجديدة فقط)
-STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME                    :اعدادات اللعبة (مخزن في المحفوظات, يؤثر على اللعبة الحالية فقط)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME                    :اعدادات اللعبة (يخزن في الحفظ ؛ يطبق على اللعبة الحالية فقط)
-STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU                   :اعدادات الشركة (مخزن في المحفوظات, يؤثر على الالعاب الجديدة فقط)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU                   :اعدادات الشركة (يخزن في الحفظ ؛ يطبق على الالعاب الجديدة فقط)
-STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :اعدادات الشركة (مخزن في المحفوظات: يؤثر على الشركة الحالية فقط)
+STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :اعدادات الشركة (يخزن في الحفظ ؛ يطبق على الشركة الحالية فقط)
 STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}عرض جميع النتائج بالنسبة للإعداد{}{SILVER} الفئة {BLACK} إلى {WHITE}{STRING} {BLACK}و{SILVER}نوع {BLACK} إلى{WHITE} جميع انواع الإعدادات
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE} - بدون -
@@ -1078,7 +1086,7 @@ STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER                        :متوسط
 STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT                         :يمين
-STR_CONFIG_SETTING_AUTOSLOPE                                    :السماح باعادة بناء التلال تحت المباني, الطرق, الخ .-الانحدار الذاتي- {STRING}
+STR_CONFIG_SETTING_AUTOSLOPE                                    :السماح بتحريك الأرض تحت المباني, الطرق, الخ : {STRING}
 STR_CONFIG_SETTING_CATCHMENT                                    :السماح بحدود اكثر واقعية للمحطات بحسب الحجم: {STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :السماح بحذف اكثر من الطرق المملوكة للمدينة و الجسور و غيرها: {STRING}
 STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :كمية دخان/شرار القطارات:{STRING}
@@ -1204,7 +1212,7 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :لا تصرف
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION     :الكل ما عدا عمليات البناء
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING      :الكل ما عدا خيارات تعديل الخريطة
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :كل تصرف
-STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :استخدام قائمة العربات المطورة: {STRING}
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :استخدام المجموعات في قائمة العربات : {STRING}
 STR_CONFIG_SETTING_LOADING_INDICATORS                           :تفعيل مؤشر التحميل: {STRING}
 STR_CONFIG_SETTING_TIMETABLE_IN_TICKS                           :عرض جدولة الأعمال بالمهام بدلا من الأيام: {STRING}
 STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE             :عرض الوصول و المغادرة في جدولة الاعمال: {STRING}
@@ -1400,6 +1408,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}لعب
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}إعدادات اللعبه
 STR_INTRO_HIGHSCORE                                             :{BLACK}قائمه المتفوقين
 STR_INTRO_CONFIG_SETTINGS_TREE                                  :الاعدادات
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK} اعدادات NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK} إبحث عن المحتوى عبر الشبكه العنكبوتيه
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}إعدادات الذكاء الصناعى
@@ -1418,6 +1427,7 @@ STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE                        :{BLACK}اختي
 STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}اختيار نمط الألعاب
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}عرض خيارات اللعبة
 STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :إعدادات العرض
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}عرض إعدادات اﻹضافات
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK} ابحث عن محتوى جديد او تحديث
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}اغلاق'OpenTTD'
@@ -2310,7 +2320,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND                   :ارض مملو
 STR_ABOUT_OPENTTD                                               :{WHITE}حول النسخة المفتوحة
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}الحقوق الاصلية {COPYRIGHT} كريس سوير 1995 , جميع الحقوق محفوظة
 STR_ABOUT_VERSION                                               :{BLACK}النسخة المفتوحة رقم {REV}
-STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2015 فريق النسخة المفتوحة
+STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2016 فريق النسخة المفتوحة
 # Save/load game/scenario
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}حفظ اللعبة
@@ -2373,6 +2383,7 @@ STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}اسم
 STR_MAPGEN_HEIGHTMAP_SIZE_LABEL                                 :{BLACK}الحجم:
 STR_MAPGEN_HEIGHTMAP_SIZE                                       :{ORANGE}{NUM} * {NUM}
 STR_MAPGEN_MAX_HEIGHTLEVEL_QUERY_CAPT                           :تغيير أعلى ارتفاع للخريطة
 STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}غير مستوى خط الثلج
 STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}غير سنة البداية
@@ -2592,8 +2603,8 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} تم توصيلة
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (مازال مطلوب)
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (تم توصيلة)
-STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}المدينة تنمو كل {ORANGE}{COMMA}{BLACK} يوم
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}المدينة تنمو كل {ORANGE}{COMMA}{BLACK}{NBSP} يوم
-STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}المدينة تنمو كل {ORANGE}{COMMA}{BLACK} يوم{} (مول)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}المدينة تنمو كل {ORANGE}{COMMA}{BLACK}{NBSP} يوم (ممول)
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}المدينة {RED}لا{BLACK} تنمو
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}حدود الضوضاء داخل المدن: {ORANGE}{COMMA}{BLACK} القصوى: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}وسط الشاشة الاساسية على موقع المدينة
@@ -2863,7 +2874,7 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :لاتنتمي
 STR_GROUP_DEFAULT_SHIPS                                         :مركبة لاتنتمي لأي مجموعة
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :طائرة لاتنتمي لأي مجموعة
-STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}المجموعات: اضغط على اي مجموعة لعرض المركبات التابعة لها
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}المجموعات: اضغط على اي مجموعة لعرض مركباتها . اسحب للترتيب .
 STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}أضغط لإنشاء مجموعة
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}أحذف المجموعة المختارة
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}أعد تسمية المجموعة المختارة
@@ -3158,7 +3169,7 @@ STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK} الس
 STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}مقدار التحويل: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}فترات الصيانة: {LTBLUE}{COMMA} يوم {BLACK} اخر صيانة: {LTBLUE}{DATE_LONG}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}فترات الصيانة: {LTBLUE}{COMMA}{NBSP} يوم {BLACK} اخر صيانة: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}فترات الصيانة: {LTBLUE}{COMMA}% {BLACK}    الصيانة الأخيرة: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}زيادة فترات الصيانة بقدر 10. ومع مفتاح كنترول بمقدار 5.
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK} انقاص فترات الصيانة بمعدل 10. Ctrl+ الضغط الانقاص بمعدل 5.
@@ -3250,8 +3261,8 @@ STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}غير
 STR_ORDER_REFIT                                                 :{BLACK}اعادة تهيئة
 STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}اختر نوع البضائع المنقولة لتهيئة العربات في هذا الامر. اضغط كنترول لازالة تعليمات التهيئة.
-STR_ORDER_REFIT_AUTO                                            :{BLACK}ملائمة ذاتية
+STR_ORDER_REFIT_AUTO                                            :{BLACK}ملائمة في محطة
-STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}اختر اي نوع من الحملة تريد ملائمتها ذاتيا.
+STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}اختر اي نوع من الحمولة تريد ملائمتها . اضغط مع ctrl لإزالة الملائمة . الملائمة في المحطات لن تكون ما لم تقبل العربة ذلك .
 STR_ORDER_DROP_REFIT_AUTO                                       :شحنة ثابتة
 STR_ORDER_DROP_REFIT_AUTO_ANY                                   :البضائع المتاحة
@@ -3342,13 +3353,13 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(عدم انز
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :-عدم انزال الشحنة و الانتظار للحمولة القصوى لاي شحنة-
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(لا تفريغ و لا تحميل)
-STR_ORDER_AUTO_REFIT                                            :(ملائمة ذاتية ل {STRING})
+STR_ORDER_AUTO_REFIT                                            :(ملائمة لـ {STRING})
-STR_ORDER_FULL_LOAD_REFIT                                       :(تحميل كلي مع الملائمة الذاتية لـ {STRING})
+STR_ORDER_FULL_LOAD_REFIT                                       :(تحميل كلي مع الملائمة لـ {STRING})
-STR_ORDER_FULL_LOAD_ANY_REFIT                                   :(تحميل كلي لاي بضاعة مع الملائمة الذاتية لـ {STRING})
+STR_ORDER_FULL_LOAD_ANY_REFIT                                   :(تحميل كلي لأي بضاعة مع الملائمة لـ {STRING})
-STR_ORDER_UNLOAD_REFIT                                          :(تفريغ الحمولة و شحن البضائع مع الملائمة الذاتية لـ {STRING})
+STR_ORDER_UNLOAD_REFIT                                          :(تفريغ الحمولة و شحن البضائع مع الملائمة لـ {STRING})
 STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :(تفرغ الحمولة و الانتظار للتحميل الكلي مع الملائمة لـ {STRING})
-STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(التفريغ و الانتظار للتحميل الكلي لاي بضاعة مع الملائمة الذاتية لـ {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(التفريغ و الانتظار للتحميل الكلي لأي بضاعة مع الملائمة لـ {STRING})
-STR_ORDER_TRANSFER_REFIT                                        :(تحويل البضاعة و اخذ البضاعة مع الملائمة الذاتية لـ {STRING})
+STR_ORDER_TRANSFER_REFIT                                        :(تحويل البضاعة و أخذ البضاعة مع الملائمة لـ {STRING})
 STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :(تحويل البضاعة و الانتظار للحمولة القصوى مع الملائمة الذاتية لـ {STRING})
 STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :(تحويل البضاعة و الانتظار لاي حمولة كاملة مع الملائمة الذاتية لـ {STRING})
 STR_ORDER_NO_UNLOAD_REFIT                                       :(عدم التفريغ و تحميل البضائع مع الملائمة الذاتية لـ {STRING})
@@ -3620,7 +3631,7 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... قر
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... قريبة جدا من مدينة أخرى
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... المدن كثيرة جدا
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... لا يوجد فراغ في الخريطة
-STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}لن تبني البلدية طرق جديدة. بامكانك تمكين البلدية من بناء الطرق الجديدة عن طريق الاعدادات المتقدمة --> الاقتصاد --> المدن
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}لن تبني البلدية طرق جديدة. بإمكانك تمكين بناء الطرق الجديدة عن طريق الاعدادات --> البيئة--> المدن
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}اعمال الطرق قيد التنفيذ
 STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}لا يمكن ازالة هذه المدينة{}محطة او ورشة مرتبطة بالمدينة او هناك مربع مملوك للمدينة لا يمكن لزالته
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... لا يوجد مكان مناسب للمجسم بداخل هذة المدينة/البلدة
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -215,6 +215,8 @@ STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA}{NBSP}ga
 STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA}{NBSP}litro{P "" ak}
 STR_UNITS_VOLUME_LONG_SI                                        :{COMMA}{NBSP}m³
 STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}{NBSP}lbf
 STR_UNITS_FORCE_METRIC                                          :{COMMA}{NBSP}kgf
 STR_UNITS_FORCE_SI                                              :{COMMA}{NBSP}kN
 STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA}{NBSP}ft
@@ -238,7 +240,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Lehioa i
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Leiho izena - Arrastatu hau leihoa mugitzeko
 STR_TOOLTIP_SHADE                                               :{BLACK}Itzal leihoa - titulu barra bakarrik ikusten da
 STR_TOOLTIP_DEBUG                                               :{BLACK}NewGRF garbiketa informazioa ikusi
-STR_TOOLTIP_STICKY                                              :{BLACK}Markatu leiho hau itxiezina bezala 'Zarratu Leiho Guztiak' gakoarekin
+STR_TOOLTIP_STICKY                                              :{BLACK}Markatu leiho hau itxiezina bezala 'Itxi Leiho Guztiak' gakoarekin. Ctrl+Klik hau beti gertatzeko
 STR_TOOLTIP_RESIZE                                              :{BLACK}Klik eta arrastatu leiho honi tamaina aldatzeko
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Aldatu handia/txikia leihoaren tamaina
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra mugitu - zerrendan gora/behera mugitzeko
@@ -246,7 +248,12 @@ STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra mu
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Eraikinak etab. edo lur karratu bat eraistea. Ctrl area diagonalki aukeratzen du. Mayus eraikinaren kostu estimatua erakusten du.
 # Show engines button
 STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN                           :{BLACK}Ezkutuak erakutsi
 STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE                    :{BLACK}Ezkutuak erakutsi
 STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP                            :{BLACK}Ezkutuak erakutsi
 STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT                        :{BLACK}Ezkutuak erakutsi
 STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN_TOOLTIP                   :{BLACK}Botoi hau gaituz, ezkutuak dauden trenak erakusten dira
 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}Lehenetsia
@@ -285,6 +292,8 @@ STR_SORT_BY_LENGTH                                              :Luzera
 STR_SORT_BY_LIFE_TIME                                           :Geratzen zaion bizitza denbora
 STR_SORT_BY_TIMETABLE_DELAY                                     :Ordutegiko atzerapena
 STR_SORT_BY_FACILITY                                            :Geltoki mota
 STR_SORT_BY_WAITING_TOTAL                                       :Itxaroten dagoen zama totala
 STR_SORT_BY_WAITING_AVAILABLE                                   :Itxaroten dagoen zama eskuragarria
 STR_SORT_BY_RATING_MAX                                          :Zama balorazio handiena
 STR_SORT_BY_RATING_MIN                                          :Zama balorazio txikiena
 STR_SORT_BY_ENGINE_ID                                           :MotoreID (ordenatze klasikoa)
@@ -357,6 +366,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Irten
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Jokoaren aukerak
 STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Ezarpenak
 STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :IA/Jokoaren scriptaren ezaugarriak
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF ezarpenak
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Transparentzia ezarpenak
@@ -902,6 +912,8 @@ STR_GAME_OPTIONS_CURRENCY_LTL                                   :Lituaniako Lita
 STR_GAME_OPTIONS_CURRENCY_KRW                                   :Hego koreako Won-a (KRW)
 STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Hego Afrikako Rand-a (ZAR)
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Pertsonalizatua...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Georgiarra (GEL)
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniarra (IRR)
 ############ end of currency region
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Errepideko garraioak
@@ -958,6 +970,9 @@ STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pantaila
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :besteak
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normala
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Tamaina doblea
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Tamaina laukoitza
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafiko basea markatu
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Aukeratu erabili beharreko grafiko paketea
@@ -1051,6 +1066,7 @@ STR_TERRAIN_TYPE_VERY_FLAT                                      :Oso laua
 STR_TERRAIN_TYPE_FLAT                                           :Laua
 STR_TERRAIN_TYPE_HILLY                                          :Mendixkekin
 STR_TERRAIN_TYPE_MOUNTAINOUS                                    :Menditsua
 STR_TERRAIN_TYPE_ALPINIST                                       :Alpinista
 STR_CITY_APPROVAL_PERMISSIVE                                    :Jasankorra
 STR_CITY_APPROVAL_TOLERANT                                      :Jasanbera
@@ -1059,6 +1075,7 @@ STR_CITY_APPROVAL_HOSTILE                                       :Kontrakoa
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Ez dago IA egokirik aukeratzeko..{}IA asko jaitsi ditzakezu 'Online edukiera' sistemaren bidez
 # Settings tree window
 STR_CONFIG_SETTING_TREE_CAPTION                                 :{WHITE}Ezarpenak
 STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Lokarri iragazkia:
 STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Guztia haunditu
 STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Guztia kolapsatu
@@ -1115,13 +1132,13 @@ STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT                  :Erosketa eta er
 STR_CONFIG_SETTING_RECESSIONS                                   :Atzerapen ekonomikoak: {STRING}
 STR_CONFIG_SETTING_RECESSIONS_HELPTEXT                          :Gaitua dagoenean, atzeratze ekonomikoa urte gutxika gertatuko da. Atzeratze ekonomikoan, ekoizpen orokorra dexente gutxituko da (Aurreko balioetara bueltatuko da atzerapena amaitzerakoan)
 STR_CONFIG_SETTING_TRAIN_REVERSING                              :Trenak geltokietan buelta eman ahal izatea: {STRING}
-STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT                     :Gaitua dagoenean, trenak ezingo dute geltokietan (trebidea bertan bukatzen ez denean) buelta eman, nahiz eta biderik motzena izan helmugara iristeko
+STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT                     :Gaitua dagoenean, trenak ezingo dute geltoki ez-finaletan buelta eman, nahiz eta biderik motzena izan helmugara iristeko
 STR_CONFIG_SETTING_DISASTERS                                    :Hondamendiak: {STRING}
 STR_CONFIG_SETTING_DISASTERS_HELPTEXT                           :Azpiegiturak eta ibilgailuak suntsitu edo blokeatu ditzaketen hondamendiak txandakatu
 STR_CONFIG_SETTING_CITY_APPROVAL                                :Udaletxearen jarrera bere lurrak berregituratzeko: {STRING}
 STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT                       :Aukeratu zenbateraino eragingo dion konpainia bati herri batean zarata sortzea eta ingurumena kaltetzea, herrian duen balorazioa txartuz eta eraikin berriak egiteko baimena mugatuz
-STR_CONFIG_SETTING_AUTOSLOPE                                    :Eraikinen, trenbideen etabarren azpian paisaia aldatzea baimendu. (autoaldapak): {STRING}
+STR_CONFIG_SETTING_AUTOSLOPE                                    :Eraikinen, trenbideen etabarren azpian paisaia aldatzea baimendu.: {STRING}
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Eraikin eta bideen azpian paisaia aldatzea baimendu hauek kendu gabe
 STR_CONFIG_SETTING_CATCHMENT                                    :Geltokien irismen eremu hedapena errealagoa egitea baimendu: {STRING}
 STR_CONFIG_SETTING_CATCHMENT_HELPTEXT                           :Tamaina ezberdinetako jasotze eremuak izan mota ezberdinetako geltoki eta aireportuentzat
@@ -1235,7 +1252,7 @@ STR_CONFIG_SETTING_ERRMSG_DURATION_HELPTEXT                     :Lehio gorrian a
 STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE                        :{COMMA} segundu
 STR_CONFIG_SETTING_HOVER_DELAY                                  :Erakutsi argibideak: {STRING}
 STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT                         :Sagua, interfazeko elementu batzuen gainean jartzerakoan, argibideak bistaratu aurretik pasa beharko den denbora. Elementu batzuetan saguko eskuineko botoia sakatu beharko da
-STR_CONFIG_SETTING_HOVER_DELAY_VALUE                            :Sagua gainean mantendu {COMMA} segunduz
+STR_CONFIG_SETTING_HOVER_DELAY_VALUE                            :Sagua gainean mantendu milisegundu {COMMA}
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :Klikatu eskuineko botoiarekin
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Herriaren bistanleria herriaren izen kartelan ikusgai izan: {STRING}
 STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Herriaren bistanleria herriaren izen kartelan ikusgai izan
@@ -1245,6 +1262,7 @@ STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT                :Grafikoen marre
 STR_CONFIG_SETTING_LAND_GENERATOR                               :Lur sortzailea: {STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Jatorrizkoa
 STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
 STR_CONFIG_SETTING_INDUSTRY_DENSITY                             :Industria dentsitatea: {STRING}
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :Petroleo findegietatik maparen ertzera dagoen gehienezko distantzia: {STRING}
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT               :Petroleo findegiak bakarrik maparen ertzatik hurbil eraiki daitezke, kostan irla mapetan
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :Elur garaiera: {STRING}
@@ -1253,10 +1271,13 @@ STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Oso Leuna
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Leuna
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH                   :Zakarra
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :Oso Zakarra
 STR_CONFIG_SETTING_VARIETY                                      :Barietateen distribuzioa: {STRING}
 STR_CONFIG_SETTING_RIVER_AMOUNT                                 :Ibai kantitatea: {STRING}
 STR_CONFIG_SETTING_TREE_PLACER                                  :Zuhaitz kokatzeko algoritmoa: {STRING}
 STR_CONFIG_SETTING_TREE_PLACER_NONE                             :Ezer ez
 STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL                         :Jatorrizkoa
 STR_CONFIG_SETTING_TREE_PLACER_IMPROVED                         :Hobetua
 STR_CONFIG_SETTING_ROAD_SIDE                                    :Errepideko garraioak: {STRING}
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :Garaiera maparen norabidea: {STRING}
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Erlojuko orratzen kontrara
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Erlojuko orratzen erara
@@ -1311,6 +1332,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Itzalita
 STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :Saguaren ezkerreko botoiarekin mapan zehar mugitzea: {STRING}
 STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT            :Gaitu mapatik zehar mugitzea saguaren ezkerreko botoia mapan arrastratzerakoan. Oso erabilgarria da ukipen pantailak erabiltzerakoan
 STR_CONFIG_SETTING_AUTOSAVE                                     :Auto-gordea: {STRING}
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :Gordetako jokoen izenetan {STRING} data fomatua erabili
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT           :Gordetako fitxeroen dataren formatoa
@@ -1326,7 +1348,7 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :Ekintzarik ez
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION     :Eraikitzeko ez diren ekintza guztiak
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING      :Guztia paisaia eraldatzeko ekintzak ezik
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :Ekintza guztiak
-STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :Hobetutako ibilgailu zerrendak erabili: {STRING}
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :Taldeak erabili ibilgailu zerrendan: {STRING}
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT              :Gaitu ibilgailu zerrenda aurreratuak erabiltzea ibilgailu taldeentzako
 STR_CONFIG_SETTING_LOADING_INDICATORS                           :Zama adierazleak erabili: {STRING}
 STR_CONFIG_SETTING_LOADING_INDICATORS_HELPTEXT                  :Aukeratu ibilgailuen zama lanen adierazlea ikusgai dagoen ibilgailuen gainean
@@ -1348,6 +1370,11 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT            :Mantendu zubi,
 STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :Talde gastuak konpainiaren finantza leihoan: {STRING}
 STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT                     :Konpainiako gastuen lehioaren diseinua
 STR_CONFIG_SETTING_SOUND_NEWS                                   :Periodikoa: {STRING}
 STR_CONFIG_SETTING_SOUND_NEW_YEAR                               :Amaiera urtea: {STRING}
 STR_CONFIG_SETTING_SOUND_CONFIRM                                :Eraikuntza: {STRING}
 STR_CONFIG_SETTING_SOUND_DISASTER                               :Desastreak/istripuak: {STRING}
 STR_CONFIG_SETTING_SOUND_VEHICLE                                :Garraioak: {STRING}
 STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :Azpiturak eraikitzea debekatu ibilgailu egokiak ez daudenean eskuragarri: {STRING}
 STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT         :Gaitua dagoenean, ezingo da azpiegiturarik eraiki azpiegitura horren ibilgailuak ez badaude eskuragarri, denbora eta dirua aurreztuz
@@ -1512,6 +1539,8 @@ STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :Joko hasieran h
 STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :eskuz egin
 STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :asimetrikoa
 STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC                       :simetrikoa
 STR_CONFIG_SETTING_DISTRIBUTION_PAX                             :Bidaiariek banaketa modua: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL                            :Korreoaren banaketa modua: {STRING}
 STR_CONFIG_SETTING_LINKGRAPH_ACCURACY                           :Banaketen zehaztasuna: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY                  :Abiadura unitateak: {STRING}
@@ -1525,6 +1554,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :Metrikoa (zp)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_SI                  :SI (kW)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT                    :Pisu unitateak: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_IMPERIAL           :Imperial (ton/tona)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_METRIC             :Metrikoa (t/tona)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_SI                 :SI (kg)
@@ -1533,6 +1563,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL           :Inperiala (galo
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_METRIC             :Metrikoa (l)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_SI                 :SI (m³)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_IMPERIAL            :Imperiala (libra)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_METRIC              :Metrikoa (kgf)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_SI                  :SI (kN)
@@ -1546,6 +1577,7 @@ STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Grafiko
 STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Soinua
 STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Interfazea
 STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Orokorra
 STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Leihoak
 STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Eraikuntza
 STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Konpainia
 STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Ibilgailuak
@@ -1608,6 +1640,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Multijok
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Jokoaren Aukerak
 STR_INTRO_HIGHSCORE                                             :{BLACK}Puntuazio taula
 STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Ezarpenak
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-ren Ezarpenak
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Edukiak Online Kontsultatu
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}IA/Joko Scripten Ezarpenak
@@ -1627,6 +1660,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Aukeratu
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Jokoaren aukerak erakutsi
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Puntuazioen taula erakutsi
 STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Ezarpenak erakutsi
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF ezarpenak erakutsi
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Bilatu eduki berria eta eguneratua deskargatzeko
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}IA/Joko Scripten Ezarpenak
@@ -2067,7 +2101,7 @@ STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Edukien
 STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Lerroan sakatu ezaugarriak ikusteko{}Laukitxoan sakatu aukeratzeko
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Guztia aukeratu
 STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Markatu deskargatuak izango diren edukiak
-STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Bertsio berriak haukeratu
+STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Eguneraketak Aukeratu
 STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Haukeratu dituzun edukiak berrituko dituzten edukiak deskargatuak izateko
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Guztia desmarkatu
 STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Dekargatuak izango ez diren eduki guztiak markatu
@@ -2548,7 +2582,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND                   :Konpainia jabe
 STR_ABOUT_OPENTTD                                               :{WHITE}OpenTTD-ri buruz
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD bertsioa {REV}
-STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2015 The OpenTTD team
+STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2016 The OpenTTD team
 # Save/load game/scenario
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Gordetako jokoa
@@ -2720,7 +2754,11 @@ STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Emandako
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Aldez aurreko "sprit"-a
 STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Aurreko grafiko arruntera joan, pseudo/birkoloretu/grafiko tipoak desgaituz
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Orain aukeratutako grafikoaren aurkezpena. Alineazioa ez da kontua hartzen grafiko hau egiterakoan
-STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}"Sprit"-a mugitu inguruan, X eta Y-ren desplazamenduak aldatuz
+STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Sprite-a mugitu ingurunean, X eta Y-ren desplazamenduak aldatuz. Ctrl+Klik sprite-a zortzi unitatero mugitzeko
 STR_SPRITE_ALIGNER_RESET_BUTTON                                 :{BLACK}Erlatiboa berezarri
 STR_SPRITE_ALIGNER_RESET_TOOLTIP                                :{BLACK}Momentuan dauden desplazamendu erlatiboak erreseteatu
 STR_SPRITE_ALIGNER_OFFSETS_ABS                                  :{BLACK}X desplazamendua: {NUM}, Y desplazamendua: {NUM} (Absolutua)
 STR_SPRITE_ALIGNER_OFFSETS_REL                                  :{BLACK}X desplazamendua: {NUM}, Y desplazamendua: {NUM} (Erlatiboa)
 STR_SPRITE_ALIGNER_PICKER_BUTTON                                :{BLACK}"Sprit"-a aukeratu
 STR_SPRITE_ALIGNER_PICKER_TOOLTIP                               :{BLACK}Pantaillako edozein lekutatik aukeratu "sprite" bat
@@ -2749,6 +2787,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Action 8 sarrera asko ditu (sprite {3:NUM})
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Pseudo spritea baino hurrunago irakurri (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Aukeratuta daukazun oinarrizko grafiko paketean "sprite" batzuk falta dira.{}Mesedez eguneratu oinarrizko grafiko paketea
 STR_NEWGRF_ERROR_MISSING_SPRITES_UNSTABLE                       :{WHITE}Erabiltzen ari den grafiko baseari sprite batzuk falta zaizkio.{}Mesedez zure grafiko basea eguneratu ezazu.{}OpenTTD-ren {YELLOW}garapen bertsio bat erabiltzen ari zarenez{WHITE}, grafiko basearen {YELLOW}garapen bertsio bat behar izango duzu{WHITE}
 STR_NEWGRF_ERROR_GRM_FAILED                                     :Eskatutako GRFa ez dago eskuragarri (sprite {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} desgaitua izan da {STRING}(en)gatik
 STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Grafiko deseinu formatu ezezaguna/baliogabea (sprite {3:NUM})
@@ -2759,6 +2798,7 @@ STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Abiaraz
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ezin artxiboa gehitu: GRF ID bikoiztua
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Bat datorren artxiboa ez da aurkitu (GRF bateragarria kargatua)
 STR_NEWGRF_TOO_MANY_NEWGRFS                                     :{WHITE}Ezin da artxiboa gehitu: NewGRF-ren artxibo limitera iritsia
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Falta diren artxiboentzako GRF bateragarria deskargatua
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Falta de GRF artxiboa desgaitua izan da
@@ -2878,6 +2918,7 @@ STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Helburu
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Helburu orokorrak:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Ezer ez -
 STR_GOALS_SPECTATOR_NONE                                        :{ORANGE}- Ez aplikagarria -
 STR_GOALS_PROGRESS                                              :{ORANGE}{STRING}
 STR_GOALS_PROGRESS_COMPLETE                                     :{GREEN}{STRING}
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Konpainiaren helburuak:
@@ -2920,6 +2961,8 @@ STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING
 STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klikatu garraio zerbitzuan ikuspegi nagusia industria/herrian zentratzeko. Ktrl+Klik ikuspegi lehio berria irekiko du indutri/herriaren kokapenean
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Istorio Liburua
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Istorio Liburu Globala
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Orrialdea {NUM}
 STR_STORY_BOOK_PREV_PAGE                                        :{BLACK}Aurrekoa
@@ -2955,6 +2998,7 @@ STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Zama bal
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Geltokiaren zama balorazioak erakutsi
 STR_STATION_VIEW_CARGO_SUPPLY_RATING                            :{WHITE}{STRING}: {YELLOW}{COMMA} / {STRING} ({COMMA}%)
 STR_STATION_VIEW_GROUP                                          :{BLACK}Taldekatu
 STR_STATION_VIEW_WAITING_STATION                                :Geltokia: Itxaroten
 STR_STATION_VIEW_WAITING_AMOUNT                                 :Kopurua: Itxoiten
 STR_STATION_VIEW_FROM                                           :{YELLOW}{CARGO_SHORT} {STATION}-tik
@@ -3185,6 +3229,7 @@ STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Aukeratu
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Aukeratutako taldea berrizendatu
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klikatu taldean ordezkatze orokorretik babesteko
 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Taldea Ezabatu
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Geheitu konpartituako ibilgailuak
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Ibilgailu guztiak ezabatu
@@ -3248,7 +3293,15 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                     :{BLACK}Errepide
 STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP                             :{BLACK}Itsasontzia berrizendatu
 STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                         :{BLACK}Hegazkina berrizendatu
 STR_BUY_VEHICLE_TRAIN_HIDE_TOGGLE_BUTTON                        :{BLACK}Ezkutatu
 STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_TOGGLE_BUTTON                 :{BLACK}Ezkutatu
 STR_BUY_VEHICLE_SHIP_HIDE_TOGGLE_BUTTON                         :{BLACK}Ezkutatu
 STR_BUY_VEHICLE_AIRCRAFT_HIDE_TOGGLE_BUTTON                     :{BLACK}Ezkutatu
 STR_BUY_VEHICLE_TRAIN_SHOW_TOGGLE_BUTTON                        :{BLACK}Erakutsi
 STR_BUY_VEHICLE_ROAD_VEHICLE_SHOW_TOGGLE_BUTTON                 :{BLACK}Erakutsi
 STR_BUY_VEHICLE_SHIP_SHOW_TOGGLE_BUTTON                         :{BLACK}Erakutsi
 STR_BUY_VEHICLE_AIRCRAFT_SHOW_TOGGLE_BUTTON                     :{BLACK}Erakutsi
 STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Tren ibilgailua berrizendatu
@@ -3355,6 +3408,8 @@ STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Errepide ibilga
 STR_REPLACE_VEHICLE_SHIP                                        :Itsasontzia
 STR_REPLACE_VEHICLE_AIRCRAFT                                    :Hegazkina
 STR_REPLACE_VEHICLE_VEHICLES_IN_USE                             :{YELLOW}Erabilitako garraioak
 STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES                          :{YELLOW}Garraio eskuragarriak
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Aukeratu aldatu beharreko motore mota
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK} Aukeratu motore mota zaharra ordezkatuko duen motore berria
@@ -4690,6 +4745,7 @@ STR_COMPANY_NAME                                                :{COMPANY}
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANY_NUM}
 STR_DEPOT_NAME                                                  :{DEPOT}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_HIDDEN_ENGINE_NAME                                          :{ENGINE} (ezkutua)
 STR_GROUP_NAME                                                  :{GROUP}
 STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENT_NAME}
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -3020,7 +3020,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND                   :Зямля на
 STR_ABOUT_OPENTTD                                               :{WHITE}Аб OpenTTD
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Арыґінальныя аўтарскія правы {COPYRIGHT} 1995 Chris Sawyer. Усе правы абароненыя.
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD вэрсія {REV}
-STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002–2015 Каманда распрацоўнікаў OpenTTD
+STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002–2016 Каманда распрацоўнікаў OpenTTD
 # Save/load game/scenario
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Захаваць гульню
@@ -3207,7 +3207,7 @@ STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Пера
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Папярэдні спрайт
 STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Перайсьці да папярэдняга звычайнага спрайта, прапускаючы змяняючыя колер, шрыфтавыя, псэўдаспрайты. Пераход з пачатку сьпісу да апошняга спрайта.
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Прадстаўленьне выбранага спрайта. Выраўноўваньне не ўлічваецца пры прарысоўцы гэтага спрайта.
-STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Рухайце спрайт, зьмяняючы зрушэньне па X і па Y
+STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Рухайце спрайт, зьмяняючы зрушэньне па X і па Y. Ctrl+пстрычка, каб зрушыць спрайт на восем адзінак за раз
 STR_SPRITE_ALIGNER_RESET_BUTTON                                 :{BLACK}Скід зрушэння
 STR_SPRITE_ALIGNER_RESET_TOOLTIP                                :{BLACK}Скінуць значэнні адноснага зрушэння
 STR_SPRITE_ALIGNER_OFFSETS_ABS                                  :{BLACK}Зрушэнне X: {NUM}; зрушэнне Y: {NUM} (абсалютнае)
--- a/Show More
+++ b/Show More