Merge branch 'cpp-11' into save_ext

src/table/settings.ini

@@ -2764,6 +2764,18 @@ strhelp  = STR_CONFIG_SETTING_LIVERIES_HELPTEXT
 strval   = STR_CONFIG_SETTING_LIVERIES_NONE
 proc     = InvalidateCompanyLiveryWindow
 
+[SDTC_VAR]
+var      = gui.starting_colour
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = COLOUR_END
+min      = 0
+max      = COLOUR_END
+str      = STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR
+strhelp  = STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT
+strval   = STR_COLOUR_DARK_BLUE
+
 [SDTC_BOOL]
 var      = gui.prefer_teamchat
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC

src/table/townname.h

@@ -643,7 +643,7 @@ static const char * const _name_spanish_real[] = {
 	"Barcelona",
 	"Barinas",
 	"San Crist\xC3\xB3""bal",
-	"San Fransisco",
+	"San Francisco",
 	"San Mart\xC3\xADn",
 	"Guayana",
 	"San Carlos",
@@ -654,19 +654,19 @@ static const char * const _name_spanish_real[] = {
 	"Elorza",
 	"Arismendi",
 	"Trujillo",
-	"Carupano",
+	"Car\xC3\xBApano",
 	"Anaco",
 	"Lima",
 	"Cuzco",
 	"Iquitos",
 	"Callao",
 	"Huacho",
-	"Camana",
+	"Caman\xC3\xA1",
 	"Puerto Chala",
 	"Santa Cruz",
 	"Quito",
 	"Cuenca",
-	"Huacho",
+	"Medell\xC3\xADn",
 	"Tulc\xC3\xA1n",
 	"Esmeraldas",
 	"Ibarra",
@@ -688,12 +688,12 @@ static const char * const _name_spanish_real[] = {
 	"Potos\xC3\xAD",
 	"Tupiza",
 	"La Quiaca",
-	"Yacuiba",
+	"Yacu\xC3\xAD""ba",
 	"San Borja",
-	"Fuerte Olimpio",
+	"Fuerte Olimpo",
 	"Fort\xC3\xADn Esteros",
 	"Campo Grande",
-	"Bogota",
+	"Bogot\xC3\xA1",
 	"El Banco",
 	"Zaragoza",
 	"Neiva",