summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-07-31 16:15:37 +0000
committertron <tron@openttd.org>2005-07-31 16:15:37 +0000
commit11a70c5e913a636ed5ec20155742c764e36e9add (patch)
tree82a37a8f35c40cabcd262eafd0c26c70770284d8
parent773dedfd03397c22ccd8436f248aeae9d3d1ea1e (diff)
downloadopenttd-11a70c5e913a636ed5ec20155742c764e36e9add.tar.xz
(svn r2766) Remove string and make use of the plural feature
Diffstat
-rw-r--r--graph_gui.c8
-rw-r--r--lang/american.txt15
-rw-r--r--lang/brazilian_portuguese.txt15
-rw-r--r--lang/catalan.txt15
-rw-r--r--lang/czech.txt15
-rw-r--r--lang/danish.txt15
-rw-r--r--lang/dutch.txt15
-rw-r--r--lang/english.txt15
-rw-r--r--lang/finnish.txt15
-rw-r--r--lang/french.txt15
-rw-r--r--lang/galician.txt15
-rw-r--r--lang/german.txt15
-rw-r--r--lang/hungarian.txt15
-rw-r--r--lang/icelandic.txt15
-rw-r--r--lang/italian.txt15
-rw-r--r--lang/latvian.txt3
-rw-r--r--lang/lithuanian.txt15
-rw-r--r--lang/norwegian.txt15
-rw-r--r--lang/polish.txt15
-rw-r--r--lang/portuguese.txt15
-rw-r--r--lang/romanian.txt15
-rw-r--r--lang/slovak.txt15
-rw-r--r--lang/spanish.txt15
-rw-r--r--lang/swedish.txt15
-rw-r--r--player_gui.c8
25 files changed, 119 insertions, 230 deletions
diff --git a/graph_gui.c b/graph_gui.c
index 9165437d6..48d813aac 100644
--- a/graph_gui.c
+++ b/graph_gui.c
@@ -335,7 +335,7 @@ static void OperatingProfitWndProc(Window *w, WindowEvent *e)
gd.top = 18;
gd.height = 136;
gd.include_neg = true;
- gd.format_str_y_axis = STR_CURRCOMPACT32;
+ gd.format_str_y_axis = STR_CURRCOMPACT;
gd.color_3 = 0x10;
gd.color_2 = 0xD7;
gd.bg_line_color = 0xE;
@@ -409,7 +409,7 @@ static void IncomeGraphWndProc(Window *w, WindowEvent *e)
gd.top = 18;
gd.height = 104;
gd.include_neg = false;
- gd.format_str_y_axis = STR_CURRCOMPACT32;
+ gd.format_str_y_axis = STR_CURRCOMPACT;
gd.color_3 = 0x10;
gd.color_2 = 0xD7;
gd.bg_line_color = 0xE;
@@ -631,7 +631,7 @@ static void CompanyValueGraphWndProc(Window *w, WindowEvent *e)
gd.top = 18;
gd.height = 200;
gd.include_neg = false;
- gd.format_str_y_axis = STR_CURRCOMPACT64;
+ gd.format_str_y_axis = STR_CURRCOMPACT;
gd.color_3 = 0x10;
gd.color_2 = 0xD7;
gd.bg_line_color = 0xE;
@@ -717,7 +717,7 @@ static void CargoPaymentRatesWndProc(Window *w, WindowEvent *e)
gd.top = 24;
gd.height = 104;
gd.include_neg = false;
- gd.format_str_y_axis = STR_CURRCOMPACT32;
+ gd.format_str_y_axis = STR_CURRCOMPACT;
gd.color_3 = 16;
gd.color_2 = 215;
gd.bg_line_color = 14;
diff --git a/lang/american.txt b/lang/american.txt
index da39faffe..4b629ed03 100644
--- a/lang/american.txt
+++ b/lang/american.txt
@@ -1982,8 +1982,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Income Graph
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Operating Profit Graph
STR_7026_BANK_BALANCE :{WHITE}Bank Balance
@@ -2008,14 +2007,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Repay pa
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(President)
STR_7038_INAUGURATED :{GOLD}Inaugurated: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Vehicles:
-STR_703A_TRAIN :{WHITE}{COMMA} train
-STR_703B_TRAINS :{WHITE}{COMMA} trains
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} road vehicle
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} road vehicles
-STR_703E_AIRCRAFT :{WHITE}{COMMA} aircraft
-STR_703F_AIRCRAFT :{WHITE}{COMMA} aircraft
-STR_7040_SHIP :{WHITE}{COMMA} ship
-STR_7041_SHIPS :{WHITE}{COMMA} ships
+STR_TRAINS :{WHITE}{COMMA} train{P "" s}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} road vehicle{P "" s}
+STR_AIRCRAFT :{WHITE}{COMMA} aircraft
+STR_SHIPS :{WHITE}{COMMA} ship{P "" s}
STR_7042_NONE :{WHITE}None
STR_7043_FACE_SELECTION :{WHITE}Face Selection
STR_7044_MALE :{BLACK}Male
diff --git a/lang/brazilian_portuguese.txt b/lang/brazilian_portuguese.txt
index 4af7fe984..ccdc88844 100644
--- a/lang/brazilian_portuguese.txt
+++ b/lang/brazilian_portuguese.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Rendimentos
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Gráfico de Lucros Operacionais
STR_7026_BANK_BALANCE :{WHITE}Balanço Bancário
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Pagar pa
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente)
STR_7038_INAUGURATED :{GOLD}Inaugurado: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Veículos:
-STR_703A_TRAIN :{WHITE}{COMMA} trem
-STR_703B_TRAINS :{WHITE}{COMMA} trens
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} veículo de estrada
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} veículos de estrada
-STR_703E_AIRCRAFT :{WHITE}{COMMA} aeronave
-STR_703F_AIRCRAFT :{WHITE}{COMMA} aeronaves
-STR_7040_SHIP :{WHITE}{COMMA} barco
-STR_7041_SHIPS :{WHITE}{COMMA} barcos
+STR_TRAINS :{WHITE}{COMMA} tre{P m ns}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} veículo{P "" s} de estrada
+STR_AIRCRAFT :{WHITE}{COMMA} aeronave{P "" s}
+STR_SHIPS :{WHITE}{COMMA} barco{P "" s}
STR_7042_NONE :{WHITE}Nenhum
STR_7043_FACE_SELECTION :{WHITE}Seleção de Rosto
STR_7044_MALE :{BLACK}Masculino
diff --git a/lang/catalan.txt b/lang/catalan.txt
index dc416e1a2..39de8f043 100644
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Gràfic d'Ingresos
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Gràfic de Rendiment d'Operacions
STR_7026_BANK_BALANCE :{WHITE}Balanç del Banc
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Amortitz
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(President)
STR_7038_INAUGURATED :{GOLD}Inaugurat: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Vehicles:
-STR_703A_TRAIN :{WHITE}{COMMA} tren
-STR_703B_TRAINS :{WHITE}{COMMA} trens
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} vehicle rodat
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} vehicles rodats
-STR_703E_AIRCRAFT :{WHITE}{COMMA} aeronau
-STR_703F_AIRCRAFT :{WHITE}{COMMA} aeronaus
-STR_7040_SHIP :{WHITE}{COMMA} vaixell
-STR_7041_SHIPS :{WHITE}{COMMA} vaixells
+STR_TRAINS :{WHITE}{COMMA} tren{P "" s}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} vehicle{P "" s} rodat{P "" s}
+STR_AIRCRAFT :{WHITE}{COMMA} aeronau{P "" s}
+STR_SHIPS :{WHITE}{COMMA} vaixell{P "" s}
STR_7042_NONE :{WHITE}Cap
STR_7043_FACE_SELECTION :{WHITE}Selecció de cares
STR_7044_MALE :{BLACK}Home
diff --git a/lang/czech.txt b/lang/czech.txt
index 6d5c1f453..324a58c21 100644
--- a/lang/czech.txt
+++ b/lang/czech.txt
@@ -2049,8 +2049,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Celkem:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Graf prijmu
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Graf provozního zisku
STR_7026_BANK_BALANCE :{WHITE}Stav na uctu
@@ -2075,14 +2074,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Splatit
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Prezident)
STR_7038_INAUGURATED :{GOLD}Zalozeno: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Vozidla:
-STR_703A_TRAIN :{WHITE}{COMMA} vlak{P "" y u}
-STR_703B_TRAINS :{WHITE}{COMMA} vlak{P "" y u}
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} silnicni{P "" "" ch} vozid{P lo la el}
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} silnicni{P "" "" ch} vozid{P lo la el}
-STR_703E_AIRCRAFT :{WHITE}{COMMA} letad{P lo la el}
-STR_703F_AIRCRAFT :{WHITE}{COMMA} letad{P lo la el}
-STR_7040_SHIP :{WHITE}{COMMA} lod{P "" e í}
-STR_7041_SHIPS :{WHITE}{COMMA} lod{P "" e í}
+STR_TRAINS :{WHITE}{COMMA} vlak{P "" y u}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} silnicni{P "" "" ch} vozid{P lo la el}
+STR_AIRCRAFT :{WHITE}{COMMA} letad{P lo la el}
+STR_SHIPS :{WHITE}{COMMA} lod{P "" e í}
STR_7042_NONE :{WHITE}Nic
STR_7043_FACE_SELECTION :{WHITE}Volba tvare
STR_7044_MALE :{BLACK}Muzske
diff --git a/lang/danish.txt b/lang/danish.txt
index 45958f573..6c0e736cc 100644
--- a/lang/danish.txt
+++ b/lang/danish.txt
@@ -1984,8 +1984,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Indkomst Graf
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Profit Garf
STR_7026_BANK_BALANCE :{WHITE}Bank Balance
@@ -2010,14 +2009,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Tilbageb
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Direktør)
STR_7038_INAUGURATED :{GOLD}Inaugurated: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Køretøjer:
-STR_703A_TRAIN :{WHITE}{COMMA} tog
-STR_703B_TRAINS :{WHITE}{COMMA} tog
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} lastbil
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} lastbiler
-STR_703E_AIRCRAFT :{WHITE}{COMMA} fly
-STR_703F_AIRCRAFT :{WHITE}{COMMA} fly
-STR_7040_SHIP :{WHITE}{COMMA} skib
-STR_7041_SHIPS :{WHITE}{COMMA} skibe
+STR_TRAINS :{WHITE}{COMMA} tog
+STR_ROAD_VEHICLES :{WHITE}{COMMA} lastbil{P "" er}
+STR_AIRCRAFT :{WHITE}{COMMA} fly
+STR_SHIPS :{WHITE}{COMMA} skib{P "" e}
STR_7042_NONE :{WHITE}Ingen
STR_7043_FACE_SELECTION :{WHITE}Ansigtsvalg
STR_7044_MALE :{BLACK}Mand
diff --git a/lang/dutch.txt b/lang/dutch.txt
index 6db6f7cbb..2156365cd 100644
--- a/lang/dutch.txt
+++ b/lang/dutch.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Totaal:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Inkomstengrafiek
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Bedrijfswinst Grafiek
STR_7026_BANK_BALANCE :{WHITE}Bank Saldo
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Betaal d
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Directeur)
STR_7038_INAUGURATED :{GOLD}Gesticht: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Voertuigen:
-STR_703A_TRAIN :{WHITE}{COMMA} trein
-STR_703B_TRAINS :{WHITE}{COMMA} treinen
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} wegvoertuig
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} wegvoertuigen
-STR_703E_AIRCRAFT :{WHITE}{COMMA} vliegtuig
-STR_703F_AIRCRAFT :{WHITE}{COMMA} vliegtuigen
-STR_7040_SHIP :{WHITE}{COMMA} schip
-STR_7041_SHIPS :{WHITE}{COMMA} schepen
+STR_TRAINS :{WHITE}{COMMA} trein{P "" en}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} wegvoertuig{P "" en}
+STR_AIRCRAFT :{WHITE}{COMMA} vliegtuig{P "" en}
+STR_SHIPS :{WHITE}{COMMA} sch{P ip epen}
STR_7042_NONE :{WHITE}Geen
STR_7043_FACE_SELECTION :{WHITE}Gezichtsselectie
STR_7044_MALE :{BLACK}Mannelijk
diff --git a/lang/english.txt b/lang/english.txt
index 2f834f1fe..c54eeb9ee 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Income Graph
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Operating Profit Graph
STR_7026_BANK_BALANCE :{WHITE}Bank Balance
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Repay pa
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manager)
STR_7038_INAUGURATED :{GOLD}Inaugurated: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Vehicles:
-STR_703A_TRAIN :{WHITE}{COMMA} train
-STR_703B_TRAINS :{WHITE}{COMMA} trains
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} road vehicle
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} road vehicles
-STR_703E_AIRCRAFT :{WHITE}{COMMA} aircraft
-STR_703F_AIRCRAFT :{WHITE}{COMMA} aircraft
-STR_7040_SHIP :{WHITE}{COMMA} ship
-STR_7041_SHIPS :{WHITE}{COMMA} ships
+STR_TRAINS :{WHITE}{COMMA} train{P "" s}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} road vehicle{P "" s}
+STR_AIRCRAFT :{WHITE}{COMMA} aircraft
+STR_SHIPS :{WHITE}{COMMA} ship{P "" s}
STR_7042_NONE :{WHITE}None
STR_7043_FACE_SELECTION :{WHITE}Face Selection
STR_7044_MALE :{BLACK}Male
diff --git a/lang/finnish.txt b/lang/finnish.txt
index 9c26662ae..548e6e9d0 100644
--- a/lang/finnish.txt
+++ b/lang/finnish.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Yhteensä:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Tulokuvaaja
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Tuottokuvaaja
STR_7026_BANK_BALANCE :{WHITE}Tilin saldo
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Lyhennä
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(pääjohtaja)
STR_7038_INAUGURATED :{GOLD}Avattu: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Liikennevälineet:
-STR_703A_TRAIN :{WHITE}{COMMA} juna
-STR_703B_TRAINS :{WHITE}{COMMA} junaa
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} ajoneuvo
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} ajoneuvoa
-STR_703E_AIRCRAFT :{WHITE}{COMMA} lentokone
-STR_703F_AIRCRAFT :{WHITE}{COMMA} lentokonetta
-STR_7040_SHIP :{WHITE}{COMMA} laiva
-STR_7041_SHIPS :{WHITE}{COMMA} laivaa
+STR_TRAINS :{WHITE}{COMMA} juna{P "" a}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} ajoneuvo{P "" a}
+STR_AIRCRAFT :{WHITE}{COMMA} lentokone{P "" tta}
+STR_SHIPS :{WHITE}{COMMA} laiva{P "" a}
STR_7042_NONE :{WHITE}Ei mitään
STR_7043_FACE_SELECTION :{WHITE}Kasvojen valinta
STR_7044_MALE :{BLACK}Mies
diff --git a/lang/french.txt b/lang/french.txt
index 130dad529..564d548ed 100644
--- a/lang/french.txt
+++ b/lang/french.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Graphique du Revenu
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Graphique du profit d'opération
STR_7026_BANK_BALANCE :{WHITE}Equilibre bancaire
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Rembours
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(President)
STR_7038_INAUGURATED :{GOLD}Inauguré en: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Véhicules:
-STR_703A_TRAIN :{WHITE}{COMMA} train
-STR_703B_TRAINS :{WHITE}{COMMA} trains
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} véhicule
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} véhicules
-STR_703E_AIRCRAFT :{WHITE}{COMMA} aéronef
-STR_703F_AIRCRAFT :{WHITE}{COMMA} aéronefs
-STR_7040_SHIP :{WHITE}{COMMA} navire
-STR_7041_SHIPS :{WHITE}{COMMA} navires
+STR_TRAINS :{WHITE}{COMMA} train{P "" s}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} véhicule{P "" s}
+STR_AIRCRAFT :{WHITE}{COMMA} aéronef{P "" s}
+STR_SHIPS :{WHITE}{COMMA} navire{P "" s}
STR_7042_NONE :{WHITE}Aucun
STR_7043_FACE_SELECTION :{WHITE}Sélection du visage
STR_7044_MALE :{BLACK}Homme
diff --git a/lang/galician.txt b/lang/galician.txt
index bf2d5f168..b13852fca 100644
--- a/lang/galician.txt
+++ b/lang/galician.txt
@@ -1967,8 +1967,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Ingresos
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Gráfica de Beneficios Operativos
STR_7026_BANK_BALANCE :{WHITE}Balance do Banco
@@ -1992,14 +1991,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Pagar pa
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente)
STR_7038_INAUGURATED :{GOLD}Inaugurado: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Vehículos:
-STR_703A_TRAIN :{WHITE}{COMMA} tren
-STR_703B_TRAINS :{WHITE}{COMMA} trens
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} vehículo de estrada
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} vehículos de estrada
-STR_703E_AIRCRAFT :{WHITE}Aeronaves {COMMA}
-STR_703F_AIRCRAFT :{WHITE}Aeronaves {COMMA}
-STR_7040_SHIP :{WHITE}{COMMA} barco
-STR_7041_SHIPS :{WHITE}{COMMA} barcos
+STR_TRAINS :{WHITE}{COMMA} tren{P "" s}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} vehículo{P "" s} de estrada
+STR_AIRCRAFT :{WHITE}Aeronaves {COMMA}
+STR_SHIPS :{WHITE}{COMMA} barco{P "" s}
STR_7042_NONE :{WHITE}Ningún
STR_7043_FACE_SELECTION :{WHITE}Selecció de cara
STR_7044_MALE :{BLACK}Home
diff --git a/lang/german.txt b/lang/german.txt
index c2a0adb4c..63716b8a7 100644
--- a/lang/german.txt
+++ b/lang/german.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Gesamt:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Einkommensdiagramm
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Betriebsgewinndiagramm
STR_7026_BANK_BALANCE :{WHITE}Kontostand
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Kredit a
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manager)
STR_7038_INAUGURATED :{GOLD}Gegründet: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Fahrzeuge:
-STR_703A_TRAIN :{WHITE}{COMMA} Zug
-STR_703B_TRAINS :{WHITE}{COMMA} Züge
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} Fahrzeug
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} Fahrzeuge
-STR_703E_AIRCRAFT :{WHITE}{COMMA} Flugzeug
-STR_703F_AIRCRAFT :{WHITE}{COMMA} Flugzeuge
-STR_7040_SHIP :{WHITE}{COMMA} Schiff
-STR_7041_SHIPS :{WHITE}{COMMA} Schiffe
+STR_TRAINS :{WHITE}{COMMA} Z{P ug üge}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} Fahrzeug{P "" e}
+STR_AIRCRAFT :{WHITE}{COMMA} Flugzeug{P "" e}
+STR_SHIPS :{WHITE}{COMMA} Schiff{P "" e}
STR_7042_NONE :{WHITE}Keine
STR_7043_FACE_SELECTION :{WHITE}Gesicht auswählen
STR_7044_MALE :{BLACK}Männlich
diff --git a/lang/hungarian.txt b/lang/hungarian.txt
index 9b0dd6dd5..e2d2cc79e 100644
--- a/lang/hungarian.txt
+++ b/lang/hungarian.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Összesen:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Jövedelem grafikon
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Mûködési nyereség grafikon
STR_7026_BANK_BALANCE :{WHITE}Banki egyenleg
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}A kölcsö
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Elnök)
STR_7038_INAUGURATED :{GOLD}Alapítás éve: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Jármûvek:
-STR_703A_TRAIN :{WHITE}{COMMA} vonat
-STR_703B_TRAINS :{WHITE}{COMMA} vonat
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} közúti jármû
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} közúti jármû
-STR_703E_AIRCRAFT :{WHITE}{COMMA} repülõgép
-STR_703F_AIRCRAFT :{WHITE}{COMMA} repülõgép
-STR_7040_SHIP :{WHITE}{COMMA} hajó
-STR_7041_SHIPS :{WHITE}{COMMA} hajó
+STR_TRAINS :{WHITE}{COMMA} vonat
+STR_ROAD_VEHICLES :{WHITE}{COMMA} közúti jármû
+STR_AIRCRAFT :{WHITE}{COMMA} repülõgép
+STR_SHIPS :{WHITE}{COMMA} hajó
STR_7042_NONE :{WHITE}Nincs
STR_7043_FACE_SELECTION :{WHITE}Arcválasztás
STR_7044_MALE :{BLACK}Férfi
diff --git a/lang/icelandic.txt b/lang/icelandic.txt
index 302d04771..2c7f874bc 100644
--- a/lang/icelandic.txt
+++ b/lang/icelandic.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Summa:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Tekjulínurit
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Resktrartekju línurit
STR_7026_BANK_BALANCE :{WHITE}Bankainnistæða
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Borga ti
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manager)
STR_7038_INAUGURATED :{GOLD}Hafið: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Farartæki:
-STR_703A_TRAIN :{WHITE}{COMMA} lest
-STR_703B_TRAINS :{WHITE}{COMMA} lestir
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} bíll
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} bílar
-STR_703E_AIRCRAFT :{WHITE}{COMMA} flugvél
-STR_703F_AIRCRAFT :{WHITE}{COMMA} flugvélar
-STR_7040_SHIP :{WHITE}{COMMA} skip
-STR_7041_SHIPS :{WHITE}{COMMA} skip
+STR_TRAINS :{WHITE}{COMMA} lest{P "" ir}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} bíl{P l ar}
+STR_AIRCRAFT :{WHITE}{COMMA} flugvél{P "" ar}
+STR_SHIPS :{WHITE}{COMMA} skip
STR_7042_NONE :{WHITE}Engin
STR_7043_FACE_SELECTION :{WHITE}Andlitsval
STR_7044_MALE :{BLACK}Karlmaður
diff --git a/lang/italian.txt b/lang/italian.txt
index 22fe4a77c..48e96c2f4 100644
--- a/lang/italian.txt
+++ b/lang/italian.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Totale:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Grafico Incassi
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Grafico Profitti Operazionali
STR_7026_BANK_BALANCE :{WHITE}Bilancio Bancario
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Ripaga p
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(President)
STR_7038_INAUGURATED :{GOLD}Inaugurata: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Veicoli:
-STR_703A_TRAIN :{WHITE}{COMMA} treno
-STR_703B_TRAINS :{WHITE}{COMMA} treni
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} Veicolo stradale
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} Veicoli stradali
-STR_703E_AIRCRAFT :{WHITE}{COMMA} aereo
-STR_703F_AIRCRAFT :{WHITE}{COMMA} aerei
-STR_7040_SHIP :{WHITE}{COMMA} nave
-STR_7041_SHIPS :{WHITE}{COMMA} navi
+STR_TRAINS :{WHITE}{COMMA} tren{P o i}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} Veicol{P o i} stradal{P e i}
+STR_AIRCRAFT :{WHITE}{COMMA} aere{P o i}
+STR_SHIPS :{WHITE}{COMMA} nav{P e i}
STR_7042_NONE :{WHITE}Nessuno
STR_7043_FACE_SELECTION :{WHITE}Seleziona Faccia
STR_7044_MALE :{BLACK}Maschio
diff --git a/lang/latvian.txt b/lang/latvian.txt
index 07da6f4b0..a0fe89c07 100644
--- a/lang/latvian.txt
+++ b/lang/latvian.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Income Graph
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Operating Profit Graph
STR_7026_BANK_BALANCE :{WHITE}Bank Balance
diff --git a/lang/lithuanian.txt b/lang/lithuanian.txt
index ef5c0c2b1..788b4df57 100644
--- a/lang/lithuanian.txt
+++ b/lang/lithuanian.txt
@@ -1980,8 +1980,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Viso:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Pajamu diagrama
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Operating Profit Graph
STR_7026_BANK_BALANCE :{WHITE}Saskaitos balansas
@@ -2006,14 +2005,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Grazina
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Direktorius)
STR_7038_INAUGURATED :{GOLD}Eina pareigas nuo: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Transporto priemones:
-STR_703A_TRAIN :{WHITE}{COMMA} traukinys
-STR_703B_TRAINS :{WHITE}{COMMA} traukiniai
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} automobilis
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} automobiliai
-STR_703E_AIRCRAFT :{WHITE}{COMMA} lektuvas
-STR_703F_AIRCRAFT :{WHITE}{COMMA} lektuvai
-STR_7040_SHIP :{WHITE}{COMMA} laivas
-STR_7041_SHIPS :{WHITE}{COMMA} laivai
+STR_TRAINS :{WHITE}{COMMA} traukin{P ys iai}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} automobili{P s ai}
+STR_AIRCRAFT :{WHITE}{COMMA} lektuva{P s i}
+STR_SHIPS :{WHITE}{COMMA} laiva{P s i}
STR_7042_NONE :{WHITE}Neturi
STR_7043_FACE_SELECTION :{WHITE}Veido pasirinkimas
STR_7044_MALE :{BLACK}Vyras
diff --git a/lang/norwegian.txt b/lang/norwegian.txt
index 6601a3577..f42998427 100644
--- a/lang/norwegian.txt
+++ b/lang/norwegian.txt
@@ -1989,8 +1989,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Totalt:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Inntektsgraf
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Overskuddsgraf
STR_7026_BANK_BALANCE :{WHITE}Saldo
@@ -2015,14 +2014,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Betal ti
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Sjef)
STR_7038_INAUGURATED :{GOLD}Grunnlagt: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Kjøretøy:
-STR_703A_TRAIN :{WHITE}{COMMA} tog
-STR_703B_TRAINS :{WHITE}{COMMA} tog
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} kjøretøy
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} kjøretøy
-STR_703E_AIRCRAFT :{WHITE}{COMMA} fly
-STR_703F_AIRCRAFT :{WHITE}{COMMA} fly
-STR_7040_SHIP :{WHITE}{COMMA} skip
-STR_7041_SHIPS :{WHITE}{COMMA} skip
+STR_TRAINS :{WHITE}{COMMA} tog
+STR_ROAD_VEHICLES :{WHITE}{COMMA} kjøretøy
+STR_AIRCRAFT :{WHITE}{COMMA} fly
+STR_SHIPS :{WHITE}{COMMA} skip
STR_7042_NONE :{WHITE}Ingen
STR_7043_FACE_SELECTION :{WHITE}Velg utseende
STR_7044_MALE :{BLACK}Mann
diff --git a/lang/polish.txt b/lang/polish.txt
index d5d6ae5f0..0d0f4e9e8 100644
--- a/lang/polish.txt
+++ b/lang/polish.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Calkowicie:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Wykres przychodow
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Wykres obrotow
STR_7026_BANK_BALANCE :{WHITE}Bilans bankowy
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Zwroc cz
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Prezes)
STR_7038_INAUGURATED :{GOLD}Inauguracja: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Pojazdy:
-STR_703A_TRAIN :{WHITE}{COMMA} pociag
-STR_703B_TRAINS :{WHITE}{COMMA} pociagi(ow)
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} samochod
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} samochody(ow)
-STR_703E_AIRCRAFT :{WHITE}{COMMA} samolot
-STR_703F_AIRCRAFT :{WHITE}{COMMA} samoloty(ow)
-STR_7040_SHIP :{WHITE}{COMMA} statek
-STR_7041_SHIPS :{WHITE}{COMMA} statki(ow)
+STR_TRAINS :{WHITE}{COMMA} pociag{P "" i(ow)}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} samochod{P "" y(ow)}
+STR_AIRCRAFT :{WHITE}{COMMA} samolot{P "" y(ow)}
+STR_SHIPS :{WHITE}{COMMA} statek{P "" i(ow)}
STR_7042_NONE :{WHITE}Brak
STR_7043_FACE_SELECTION :{WHITE}Wybor twarzy
STR_7044_MALE :{BLACK}Mezczyzna
diff --git a/lang/portuguese.txt b/lang/portuguese.txt
index 5093dcb76..2a64d3eb3 100644
--- a/lang/portuguese.txt
+++ b/lang/portuguese.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Rendimentos
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Gráfico de Benefícios Operativos
STR_7026_BANK_BALANCE :{WHITE}Balanço Bancário
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Pagar pa
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente)
STR_7038_INAUGURATED :{GOLD}Inaugurado: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Veículos:
-STR_703A_TRAIN :{WHITE}{COMMA} comboio
-STR_703B_TRAINS :{WHITE}{COMMA} comboios
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} veículo de estrada
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} veículos de estrada
-STR_703E_AIRCRAFT :{WHITE}{COMMA} aeronave
-STR_703F_AIRCRAFT :{WHITE}{COMMA} aeronaves
-STR_7040_SHIP :{WHITE}{COMMA} barco
-STR_7041_SHIPS :{WHITE}{COMMA} barcos
+STR_TRAINS :{WHITE}{COMMA} comboio{P "" s}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} veículo{P "" s} de estrada
+STR_AIRCRAFT :{WHITE}{COMMA} aeronave{P "" s}
+STR_SHIPS :{WHITE}{COMMA} barco{P "" s}
STR_7042_NONE :{WHITE}Nenhum
STR_7043_FACE_SELECTION :{WHITE}Selecção de Cara
STR_7044_MALE :{BLACK}Masculino
diff --git a/lang/romanian.txt b/lang/romanian.txt
index ce681c425..22c597e93 100644
--- a/lang/romanian.txt
+++ b/lang/romanian.txt
@@ -1979,8 +1979,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Graficul veniturilor
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Graficul profitului din operare
STR_7026_BANK_BALANCE :{WHITE}Balantã curentã
@@ -2005,14 +2004,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Plãteste
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presedinte)
STR_7038_INAUGURATED :{GOLD}Anul înfiintãrii: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Vehicule:
-STR_703A_TRAIN :{WHITE}{COMMA} tren
-STR_703B_TRAINS :{WHITE}{COMMA} trenuri
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} autovehicul
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} autovehicule
-STR_703E_AIRCRAFT :{WHITE}{COMMA} aeronavã
-STR_703F_AIRCRAFT :{WHITE}{COMMA} aeronave
-STR_7040_SHIP :{WHITE}{COMMA} navã
-STR_7041_SHIPS :{WHITE}{COMMA} nave
+STR_TRAINS :{WHITE}{COMMA} tren{P "" uri}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} autovehicul{P "" e}
+STR_AIRCRAFT :{WHITE}{COMMA} aeronav{P ã e}
+STR_SHIPS :{WHITE}{COMMA} nav{P ã e}
STR_7042_NONE :{WHITE}Nici unul
STR_7043_FACE_SELECTION :{WHITE}Alegerea fotografiei
STR_7044_MALE :{BLACK}Bãrbat
diff --git a/lang/slovak.txt b/lang/slovak.txt
index 38315333f..8d45a041c 100644
--- a/lang/slovak.txt
+++ b/lang/slovak.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Spolu:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Graf zisku
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Graf prevadzkoveho zisku
STR_7026_BANK_BALANCE :{WHITE}Zostatok v banke
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Vratit c
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Prezident)
STR_7038_INAUGURATED :{GOLD}Zvoleny: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Strojov:
-STR_703A_TRAIN :{WHITE}{COMMA} vlak
-STR_703B_TRAINS :{WHITE}{COMMA} vlakov
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} automobil
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} automobilov
-STR_703E_AIRCRAFT :{WHITE}{COMMA} lietadlo
-STR_703F_AIRCRAFT :{WHITE}{COMMA} lietadiel
-STR_7040_SHIP :{WHITE}{COMMA} lod
-STR_7041_SHIPS :{WHITE}{COMMA} lodi
+STR_TRAINS :{WHITE}{COMMA} vlak{P "" ov}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} automobil{P "" ov}
+STR_AIRCRAFT :{WHITE}{COMMA} lietad{P lo iel}
+STR_SHIPS :{WHITE}{COMMA} lod{P "" i}
STR_7042_NONE :{WHITE}Ziadne
STR_7043_FACE_SELECTION :{WHITE}Vyber tvare
STR_7044_MALE :{BLACK}Muz
diff --git a/lang/spanish.txt b/lang/spanish.txt
index 97303111a..bba98c4b0 100644
--- a/lang/spanish.txt
+++ b/lang/spanish.txt
@@ -1992,8 +1992,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Total:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Gráfico de Ingresos
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Gráfico de Beneficio Operativo
STR_7026_BANK_BALANCE :{WHITE}Saldo en Banco
@@ -2018,14 +2017,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Pagar pa
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente)
STR_7038_INAUGURATED :{GOLD}Inaugurado: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Vehiculos:
-STR_703A_TRAIN :{WHITE}{COMMA} tren
-STR_703B_TRAINS :{WHITE}{COMMA} trenes
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} veh. carretera
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} vehs. carreta
-STR_703E_AIRCRAFT :{WHITE}{COMMA} aeroplano
-STR_703F_AIRCRAFT :{WHITE}{COMMA} aeroplanos
-STR_7040_SHIP :{WHITE}{COMMA} barco
-STR_7041_SHIPS :{WHITE}{COMMA} barcos
+STR_TRAINS :{WHITE}{COMMA} tren{P "" es}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} veh{P "" "s"}. carret{P "er" ""}a
+STR_AIRCRAFT :{WHITE}{COMMA} aeroplano{P "" s}
+STR_SHIPS :{WHITE}{COMMA} barco{P "" s}
STR_7042_NONE :{WHITE}Ninguno
STR_7043_FACE_SELECTION :{WHITE}Selección de cara
STR_7044_MALE :{BLACK}Hombre
diff --git a/lang/swedish.txt b/lang/swedish.txt
index 6c54735a5..8303ff382 100644
--- a/lang/swedish.txt
+++ b/lang/swedish.txt
@@ -1984,8 +1984,7 @@ STR_701F :{BLACK}+{CURREN
STR_7020_TOTAL :{WHITE}Totalt:
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}Graf över inkomster
-STR_CURRCOMPACT32 :{CURRCOMPACT}
-STR_CURRCOMPACT64 :{CURRCOMPACT64}
+STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Graf över vinst
STR_7026_BANK_BALANCE :{WHITE}Banksaldo
@@ -2010,14 +2009,10 @@ STR_7036_REPAY_PART_OF_LOAN :{BLACK}Återbeta
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(President)
STR_7038_INAUGURATED :{GOLD}Etablerades: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Fordon:
-STR_703A_TRAIN :{WHITE}{COMMA} tåg
-STR_703B_TRAINS :{WHITE}{COMMA} tåg
-STR_703C_ROAD_VEHICLE :{WHITE}{COMMA} vägfordon
-STR_703D_ROAD_VEHICLES :{WHITE}{COMMA} vägfordon
-STR_703E_AIRCRAFT :{WHITE}{COMMA} flygplan
-STR_703F_AIRCRAFT :{WHITE}{COMMA} flygplan
-STR_7040_SHIP :{WHITE}{COMMA} skepp
-STR_7041_SHIPS :{WHITE}{COMMA} skepp
+STR_TRAINS :{WHITE}{COMMA} tåg
+STR_ROAD_VEHICLES :{WHITE}{COMMA} vägfordon
+STR_AIRCRAFT :{WHITE}{COMMA} flygplan
+STR_SHIPS :{WHITE}{COMMA} skepp
STR_7042_NONE :{WHITE}Inga
STR_7043_FACE_SELECTION :{WHITE}Välj ansikte
STR_7044_MALE :{BLACK}Man
diff --git a/player_gui.c b/player_gui.c
index b295baad2..650a829c3 100644
--- a/player_gui.c
+++ b/player_gui.c
@@ -447,25 +447,25 @@ static void DrawPlayerVehiclesAmount(int player)
} else {
if (train != 0) {
SetDParam(0, train);
- DrawString(x + 70, y, train==1 ? STR_703A_TRAIN : STR_703B_TRAINS, 0);
+ DrawString(x + 70, y, STR_TRAINS, 0);
y += 10;
}
if (road != 0) {
SetDParam(0, road);
- DrawString(x + 70, y, road==1 ? STR_703C_ROAD_VEHICLE : STR_703D_ROAD_VEHICLES, 0);
+ DrawString(x + 70, y, STR_ROAD_VEHICLES, 0);
y += 10;
}
if (air != 0) {
SetDParam(0, air);
- DrawString(x + 70, y, air==1 ? STR_703E_AIRCRAFT : STR_703F_AIRCRAFT, 0);
+ DrawString(x + 70, y, STR_AIRCRAFT, 0);
y += 10;
}
if (ship != 0) {
SetDParam(0, ship);
- DrawString(x + 70, y, ship==1 ? STR_7040_SHIP : STR_7041_SHIPS, 0);
+ DrawString(x + 70, y, STR_SHIPS, 0);
}
}
}
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-07-07 04:50:05 +0000