summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-11-17 18:15:27 +0000
committerrubidium <rubidium@openttd.org>2010-11-17 18:15:27 +0000
commit418cca075f7df76b40a7e80c3227a48b356e7ca3 (patch)
treed49cdfd269b25ca77909223030913acb9392b8e6
parenta950e9a4a8374aca1028da1ecb2effd75d1936c6 (diff)
downloadopenttd-418cca075f7df76b40a7e80c3227a48b356e7ca3.tar.xz
(svn r21222) -Codechange: unify some string drawing and make it use the proper infrastructure for that...
-rw-r--r--src/lang/afrikaans.txt12
-rw-r--r--src/lang/arabic_egypt.txt12
-rw-r--r--src/lang/belarusian.txt12
-rw-r--r--src/lang/brazilian_portuguese.txt12
-rw-r--r--src/lang/bulgarian.txt12
-rw-r--r--src/lang/catalan.txt12
-rw-r--r--src/lang/croatian.txt12
-rw-r--r--src/lang/czech.txt12
-rw-r--r--src/lang/danish.txt12
-rw-r--r--src/lang/dutch.txt12
-rw-r--r--src/lang/english.txt12
-rw-r--r--src/lang/english_US.txt12
-rw-r--r--src/lang/esperanto.txt12
-rw-r--r--src/lang/estonian.txt12
-rw-r--r--src/lang/finnish.txt12
-rw-r--r--src/lang/french.txt12
-rw-r--r--src/lang/galician.txt12
-rw-r--r--src/lang/german.txt12
-rw-r--r--src/lang/greek.txt12
-rw-r--r--src/lang/hebrew.txt12
-rw-r--r--src/lang/hungarian.txt12
-rw-r--r--src/lang/icelandic.txt12
-rw-r--r--src/lang/indonesian.txt12
-rw-r--r--src/lang/irish.txt12
-rw-r--r--src/lang/italian.txt12
-rw-r--r--src/lang/japanese.txt12
-rw-r--r--src/lang/korean.txt12
-rw-r--r--src/lang/latvian.txt12
-rw-r--r--src/lang/lithuanian.txt12
-rw-r--r--src/lang/luxembourgish.txt12
-rw-r--r--src/lang/malay.txt12
-rw-r--r--src/lang/norwegian_bokmal.txt12
-rw-r--r--src/lang/norwegian_nynorsk.txt12
-rw-r--r--src/lang/polish.txt12
-rw-r--r--src/lang/portuguese.txt12
-rw-r--r--src/lang/romanian.txt12
-rw-r--r--src/lang/russian.txt12
-rw-r--r--src/lang/serbian.txt12
-rw-r--r--src/lang/simplified_chinese.txt12
-rw-r--r--src/lang/slovak.txt12
-rw-r--r--src/lang/slovenian.txt12
-rw-r--r--src/lang/spanish.txt12
-rw-r--r--src/lang/swedish.txt12
-rw-r--r--src/lang/traditional_chinese.txt12
-rw-r--r--src/lang/turkish.txt12
-rw-r--r--src/lang/ukrainian.txt12
-rw-r--r--src/lang/unfinished/basque.txt12
-rw-r--r--src/lang/unfinished/chuvash.txt2
-rw-r--r--src/lang/unfinished/frisian.txt10
-rw-r--r--src/lang/unfinished/ido.txt12
-rw-r--r--src/lang/unfinished/macedonian.txt2
-rw-r--r--src/lang/unfinished/maltese.txt12
-rw-r--r--src/lang/unfinished/marathi.txt2
-rw-r--r--src/lang/unfinished/tamil.txt12
-rw-r--r--src/lang/unfinished/thai.txt12
-rw-r--r--src/lang/unfinished/urdu.txt12
-rw-r--r--src/lang/vietnamese.txt12
-rw-r--r--src/lang/welsh.txt12
-rw-r--r--src/strings.cpp10
59 files changed, 333 insertions, 341 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index ff3024b04..e232affb8 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}NS
STR_ABBREV_ALL :{TINYFONT}ALMAL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passasiers
-STR_BAGS :sakke
-STR_TONS :ton
-STR_LITERS :liters
-STR_ITEMS :items
-STR_CRATES :kratte
+STR_PASSENGERS :{COMMA} passasiers
+STR_BAGS :{COMMA} sakke
+STR_TONS :{COMMA} ton
+STR_LITERS :{COMMA} liters
+STR_ITEMS :{COMMA} items
+STR_CRATES :{COMMA} kratte
STR_GAME_OPTIONS_RESOLUTION_OTHER :ander
# Colours, do not shuffle
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 2687ec963..ac8db5067 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}لا
STR_ABBREV_ALL :{TINYFONT}الكل
# 'Mode' of transport for cargoes
-STR_PASSENGERS :ركاب
-STR_BAGS :صناديق
-STR_TONS :اطنان/طن
-STR_LITERS :لتر
-STR_ITEMS :وحدة
-STR_CRATES :صناديق
+STR_PASSENGERS :{COMMA} ركاب
+STR_BAGS :{COMMA} صناديق
+STR_TONS :{COMMA} اطنان/طن
+STR_LITERS :{COMMA} لتر
+STR_ITEMS :{COMMA} وحدة
+STR_CRATES :{COMMA} صناديق
STR_GAME_OPTIONS_RESOLUTION_OTHER :اخرى
# Colours, do not shuffle
diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt
index ca829916e..289975358 100644
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -478,12 +478,12 @@ STR_ABBREV_NONE :{TINYFONT}НЯ
STR_ABBREV_ALL :{TINYFONT}Усё
# 'Mode' of transport for cargoes
-STR_PASSENGERS :пасажыраў
-STR_BAGS :мяшкоў
-STR_TONS :тон
-STR_LITERS :лiтраў
-STR_ITEMS :штук
-STR_CRATES :скрыняў
+STR_PASSENGERS :{COMMA} пасажыраў
+STR_BAGS :{COMMA} мяшкоў
+STR_TONS :{COMMA} тон
+STR_LITERS :{COMMA} лiтраў
+STR_ITEMS :{COMMA} штук
+STR_CRATES :{COMMA} скрыняў
STR_GAME_OPTIONS_RESOLUTION_OTHER :Iншае
# Colours, do not shuffle
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 4541021cd..39c9443bd 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}NADA
STR_ABBREV_ALL :{TINYFONT}TUDO
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passageiros
-STR_BAGS :sacos
-STR_TONS :toneladas
-STR_LITERS :litros
-STR_ITEMS :itens
-STR_CRATES :caixas
+STR_PASSENGERS :{COMMA} passageiros
+STR_BAGS :{COMMA} sacos
+STR_TONS :{COMMA} toneladas
+STR_LITERS :{COMMA} litros
+STR_ITEMS :{COMMA} itens
+STR_CRATES :{COMMA} caixas
STR_GAME_OPTIONS_RESOLUTION_OTHER :outra
# Colours, do not shuffle
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index a639b5c89..309455907 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -167,12 +167,12 @@ STR_ABBREV_NONE :{TINYFONT}НЩ
STR_ABBREV_ALL :{TINYFONT}ВЧ
# 'Mode' of transport for cargoes
-STR_PASSENGERS :пътници
-STR_BAGS :торби
-STR_TONS :тона
-STR_LITERS :литри
-STR_ITEMS :елемента
-STR_CRATES :кашони
+STR_PASSENGERS :{COMMA} пътници
+STR_BAGS :{COMMA} торби
+STR_TONS :{COMMA} тона
+STR_LITERS :{COMMA} литри
+STR_ITEMS :{COMMA} елемента
+STR_CRATES :{COMMA} кашони
STR_GAME_OPTIONS_RESOLUTION_OTHER :друго
# Colours, do not shuffle
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index c98a38958..c4aec0e8a 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}TOT
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passatgers
-STR_BAGS :sacs
-STR_TONS :tones
-STR_LITERS :litres
-STR_ITEMS :caps
-STR_CRATES :palets
+STR_PASSENGERS :{COMMA} passatgers
+STR_BAGS :{COMMA} sacs
+STR_TONS :{COMMA} tones
+STR_LITERS :{COMMA} litres
+STR_ITEMS :{COMMA} caps
+STR_CRATES :{COMMA} palets
STR_GAME_OPTIONS_RESOLUTION_OTHER :altres
# Colours, do not shuffle
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 090544dcf..3d6ee860f 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -260,13 +260,13 @@ STR_ABBREV_NONE :{TINYFONT}NI
STR_ABBREV_ALL :{TINYFONT}SVE
# 'Mode' of transport for cargoes
-STR_PASSENGERS :putnici
+STR_PASSENGERS :{COMMA} putnici
STR_PASSENGERS.gen :putnika
-STR_BAGS :vreće
-STR_TONS :tone
-STR_LITERS :litre
-STR_ITEMS :jedinice
-STR_CRATES :sanduci
+STR_BAGS :{COMMA} vreće
+STR_TONS :{COMMA} tone
+STR_LITERS :{COMMA} litre
+STR_ITEMS :{COMMA} jedinice
+STR_CRATES :{COMMA} sanduci
STR_GAME_OPTIONS_RESOLUTION_OTHER :ostalo
# Colours, do not shuffle
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index a9de610f8..6396fcda8 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -235,12 +235,12 @@ STR_ABBREV_NONE :{TINYFONT}NIC
STR_ABBREV_ALL :{TINYFONT}VŠE
# 'Mode' of transport for cargoes
-STR_PASSENGERS :cestujících
-STR_BAGS :balíků
-STR_TONS :tun
-STR_LITERS :litrů
-STR_ITEMS :kusů
-STR_CRATES :krabic
+STR_PASSENGERS :{COMMA} cestujících
+STR_BAGS :{COMMA} balíků
+STR_TONS :{COMMA} tun
+STR_LITERS :{COMMA} litrů
+STR_ITEMS :{COMMA} kusů
+STR_CRATES :{COMMA} krabic
STR_GAME_OPTIONS_RESOLUTION_OTHER :jiné
# Colours, do not shuffle
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index eec30546b..d55a1f874 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}INT
STR_ABBREV_ALL :{TINYFONT}ALT
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passagerer
-STR_BAGS :sække
-STR_TONS :tons
-STR_LITERS :liter
-STR_ITEMS :stykker
-STR_CRATES :kasser
+STR_PASSENGERS :{COMMA} passagerer
+STR_BAGS :{COMMA} sække
+STR_TONS :{COMMA} tons
+STR_LITERS :{COMMA} liter
+STR_ITEMS :{COMMA} stykker
+STR_CRATES :{COMMA} kasser
STR_GAME_OPTIONS_RESOLUTION_OTHER :andet
# Colours, do not shuffle
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index aec8a230e..ec3510cdc 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}GEEN
STR_ABBREV_ALL :{TINYFONT}ALLES
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passagiers
-STR_BAGS :zakken
-STR_TONS :ton
-STR_LITERS :liter
-STR_ITEMS :stuks
-STR_CRATES :pallets
+STR_PASSENGERS :{COMMA} passagiers
+STR_BAGS :{COMMA} zakken
+STR_TONS :{COMMA} ton
+STR_LITERS :{COMMA} liter
+STR_ITEMS :{COMMA} stuks
+STR_CRATES :{COMMA} pallets
STR_GAME_OPTIONS_RESOLUTION_OTHER :anders
# Colours, do not shuffle
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 4cf97b01a..7373a36ae 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passengers
-STR_BAGS :bags
-STR_TONS :tonnes
-STR_LITERS :litres
-STR_ITEMS :items
-STR_CRATES :crates
+STR_PASSENGERS :{COMMA} passengers
+STR_BAGS :{COMMA} bags
+STR_TONS :{COMMA} tonnes
+STR_LITERS :{COMMA} litres
+STR_ITEMS :{COMMA} items
+STR_CRATES :{COMMA} crates
# Colours, do not shuffle
STR_COLOUR_DARK_BLUE :Dark Blue
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 808e477eb..34d88a066 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passengers
-STR_BAGS :bags
-STR_TONS :tonnes
-STR_LITERS :liters
-STR_ITEMS :items
-STR_CRATES :crates
+STR_PASSENGERS :{COMMA} passengers
+STR_BAGS :{COMMA} bags
+STR_TONS :{COMMA} tonnes
+STR_LITERS :{COMMA} liters
+STR_ITEMS :{COMMA} items
+STR_CRATES :{COMMA} crates
STR_GAME_OPTIONS_RESOLUTION_OTHER :other
# Colours, do not shuffle
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index cbbbd4104..19e8b5325 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}NENIU
STR_ABBREV_ALL :{TINYFONT}ĈIU
# 'Mode' of transport for cargoes
-STR_PASSENGERS :pasaĝeroj
-STR_BAGS :sakoj
-STR_TONS :tunoj
-STR_LITERS :litroj
-STR_ITEMS :pecoj
-STR_CRATES :kestoj
+STR_PASSENGERS :{COMMA} pasaĝeroj
+STR_BAGS :{COMMA} sakoj
+STR_TONS :{COMMA} tunoj
+STR_LITERS :{COMMA} litroj
+STR_ITEMS :{COMMA} pecoj
+STR_CRATES :{COMMA} kestoj
STR_GAME_OPTIONS_RESOLUTION_OTHER :alia
# Colours, do not shuffle
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 8af782d53..d13f3a87b 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -222,12 +222,12 @@ STR_ABBREV_NONE :{TINYFONT}EI
STR_ABBREV_ALL :{TINYFONT}KÕIK
# 'Mode' of transport for cargoes
-STR_PASSENGERS :reisijad
-STR_BAGS :kotti
-STR_TONS :tonni
-STR_LITERS :liitrit
-STR_ITEMS :ühikut
-STR_CRATES :kasti
+STR_PASSENGERS :{COMMA} reisijad
+STR_BAGS :{COMMA} kotti
+STR_TONS :{COMMA} tonni
+STR_LITERS :{COMMA} liitrit
+STR_ITEMS :{COMMA} ühikut
+STR_CRATES :{COMMA} kasti
STR_GAME_OPTIONS_RESOLUTION_OTHER :muu
# Colours, do not shuffle
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 0c141fa9f..595fac130 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}EI
STR_ABBREV_ALL :{TINYFONT}KAIKKI
# 'Mode' of transport for cargoes
-STR_PASSENGERS :matkustajaa
-STR_BAGS :säkkiä
-STR_TONS :tonnia
-STR_LITERS :litraa
-STR_ITEMS :erää
-STR_CRATES :laatikkoa
+STR_PASSENGERS :{COMMA} matkustajaa
+STR_BAGS :{COMMA} säkkiä
+STR_TONS :{COMMA} tonnia
+STR_LITERS :{COMMA} litraa
+STR_ITEMS :{COMMA} erää
+STR_CRATES :{COMMA} laatikkoa
STR_GAME_OPTIONS_RESOLUTION_OTHER :muu
# Colours, do not shuffle
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 3ce68724e..d69365606 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passagers
-STR_BAGS :sacs
-STR_TONS :tonnes
-STR_LITERS :litres
-STR_ITEMS :unités
-STR_CRATES :caisses
+STR_PASSENGERS :{COMMA} passagers
+STR_BAGS :{COMMA} sacs
+STR_TONS :{COMMA} tonnes
+STR_LITERS :{COMMA} litres
+STR_ITEMS :{COMMA} unités
+STR_CRATES :{COMMA} caisses
STR_GAME_OPTIONS_RESOLUTION_OTHER :autre
# Colours, do not shuffle
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index aac8c2797..742bf4bb1 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}NON
STR_ABBREV_ALL :{TINYFONT}TODO
# 'Mode' of transport for cargoes
-STR_PASSENGERS :pasaxeiros
-STR_BAGS :sacos
-STR_TONS :tons
-STR_LITERS :litros
-STR_ITEMS :ítems
-STR_CRATES :caixóns
+STR_PASSENGERS :{COMMA} pasaxeiros
+STR_BAGS :{COMMA} sacos
+STR_TONS :{COMMA} tons
+STR_LITERS :{COMMA} litros
+STR_ITEMS :{COMMA} ítems
+STR_CRATES :{COMMA} caixóns
STR_GAME_OPTIONS_RESOLUTION_OTHER :outro
# Colours, do not shuffle
diff --git a/src/lang/german.txt b/src/lang/german.txt
index b2ed4f345..f258f0fab 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}KEINE
STR_ABBREV_ALL :{TINYFONT}ALLE
# 'Mode' of transport for cargoes
-STR_PASSENGERS :Passagiere
-STR_BAGS :Säcke
-STR_TONS :Tonnen
-STR_LITERS :Liter
-STR_ITEMS :Stück
-STR_CRATES :Kisten
+STR_PASSENGERS :{COMMA} Passagiere
+STR_BAGS :{COMMA} Säcke
+STR_TONS :{COMMA} Tonnen
+STR_LITERS :{COMMA} Liter
+STR_ITEMS :{COMMA} Stück
+STR_CRATES :{COMMA} Kisten
STR_GAME_OPTIONS_RESOLUTION_OTHER :Andere
# Colours, do not shuffle
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 9d69583fb..4cf5de2b4 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -229,12 +229,12 @@ STR_ABBREV_NONE :{TINYFONT}ΤΠ
STR_ABBREV_ALL :{TINYFONT}ΟΛΑ
# 'Mode' of transport for cargoes
-STR_PASSENGERS :Επιβάτες
-STR_BAGS :Σάκκοι
-STR_TONS :Τόνοι
-STR_LITERS :Λίτρα
-STR_ITEMS :αντικείμενα
-STR_CRATES :Κουτιά
+STR_PASSENGERS :{COMMA} Επιβάτες
+STR_BAGS :{COMMA} Σάκκοι
+STR_TONS :{COMMA} Τόνοι
+STR_LITERS :{COMMA} Λίτρα
+STR_ITEMS :{COMMA} αντικείμενα
+STR_CRATES :{COMMA} Κουτιά
STR_GAME_OPTIONS_RESOLUTION_OTHER :άλλη
# Colours, do not shuffle
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index d69746a3b..08d53dacb 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -179,12 +179,12 @@ STR_ABBREV_NONE :{TINYFONT}כל
STR_ABBREV_ALL :{TINYFONT}הכל
# 'Mode' of transport for cargoes
-STR_PASSENGERS :נוסעים
-STR_BAGS :שקים
-STR_TONS :טונות
-STR_LITERS :ליטרים
-STR_ITEMS :פריטים
-STR_CRATES :ארגזים
+STR_PASSENGERS :{COMMA} נוסעים
+STR_BAGS :{COMMA} שקים
+STR_TONS :{COMMA} טונות
+STR_LITERS :{COMMA} ליטרים
+STR_ITEMS :{COMMA} פריטים
+STR_CRATES :{COMMA} ארגזים
STR_GAME_OPTIONS_RESOLUTION_OTHER :אחר
# Colours, do not shuffle
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index d1e3d5e75..580144d13 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -228,12 +228,12 @@ STR_ABBREV_NONE :{TINYFONT}SÁ
STR_ABBREV_ALL :{TINYFONT}ÖS
# 'Mode' of transport for cargoes
-STR_PASSENGERS :utas
-STR_BAGS :csomag
-STR_TONS :tonna
-STR_LITERS :liter
-STR_ITEMS :darab
-STR_CRATES :láda
+STR_PASSENGERS :{COMMA} utas
+STR_BAGS :{COMMA} csomag
+STR_TONS :{COMMA} tonna
+STR_LITERS :{COMMA} liter
+STR_ITEMS :{COMMA} darab
+STR_CRATES :{COMMA} láda
STR_GAME_OPTIONS_RESOLUTION_OTHER :egyéb
# Colours, do not shuffle
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index f6f2bb633..7ce4509b4 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}EKKER
STR_ABBREV_ALL :{TINYFONT}ALLT
# 'Mode' of transport for cargoes
-STR_PASSENGERS :farþegar
-STR_BAGS :pokar
-STR_TONS :tonn
-STR_LITERS :lítrar
-STR_ITEMS :hlutir
-STR_CRATES :kassar
+STR_PASSENGERS :{COMMA} farþegar
+STR_BAGS :{COMMA} pokar
+STR_TONS :{COMMA} tonn
+STR_LITERS :{COMMA} lítrar
+STR_ITEMS :{COMMA} hlutir
+STR_CRATES :{COMMA} kassar
STR_GAME_OPTIONS_RESOLUTION_OTHER :annað
# Colours, do not shuffle
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 2202a0e1f..6e549ba49 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}TANPA
STR_ABBREV_ALL :{TINYFONT}SMA
# 'Mode' of transport for cargoes
-STR_PASSENGERS :penumpang
-STR_BAGS :kantong
-STR_TONS :ton
-STR_LITERS :liter
-STR_ITEMS :unit
-STR_CRATES :peti
+STR_PASSENGERS :{COMMA} penumpang
+STR_BAGS :{COMMA} kantong
+STR_TONS :{COMMA} ton
+STR_LITERS :{COMMA} liter
+STR_ITEMS :{COMMA} unit
+STR_CRATES :{COMMA} peti
STR_GAME_OPTIONS_RESOLUTION_OTHER :lainnya
# Colours, do not shuffle
diff --git a/src/lang/irish.txt b/src/lang/irish.txt
index c5c9235a8..a80f13df2 100644
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}TD
STR_ABBREV_ALL :{TINYFONT}GACH
# 'Mode' of transport for cargoes
-STR_PASSENGERS :paisinéirí
-STR_BAGS :málaí
-STR_TONS :tonaí
-STR_LITERS :lítear
-STR_ITEMS :míreanna
-STR_CRATES :crátaí
+STR_PASSENGERS :{COMMA} paisinéirí
+STR_BAGS :{COMMA} málaí
+STR_TONS :{COMMA} tonaí
+STR_LITERS :{COMMA} lítear
+STR_ITEMS :{COMMA} míreanna
+STR_CRATES :{COMMA} crátaí
STR_GAME_OPTIONS_RESOLUTION_OTHER :eile
# Colours, do not shuffle
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 481234eb2..b8fb53842 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -167,12 +167,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}TUT
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passeggeri
-STR_BAGS :borse
-STR_TONS :tonnellate
-STR_LITERS :litri
-STR_ITEMS :oggetti
-STR_CRATES :casse
+STR_PASSENGERS :{COMMA} passeggeri
+STR_BAGS :{COMMA} borse
+STR_TONS :{COMMA} tonnellate
+STR_LITERS :{COMMA} litri
+STR_ITEMS :{COMMA} oggetti
+STR_CRATES :{COMMA} casse
STR_GAME_OPTIONS_RESOLUTION_OTHER :Altra
# Colours, do not shuffle
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index fbe8c7d41..7d65d0644 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}無
STR_ABBREV_ALL :{TINYFONT}全
# 'Mode' of transport for cargoes
-STR_PASSENGERS :人の乗客
-STR_BAGS :袋
-STR_TONS :トン
-STR_LITERS :リットル
-STR_ITEMS :件
-STR_CRATES :箱
+STR_PASSENGERS :{COMMA} 人の乗客
+STR_BAGS :{COMMA} 袋
+STR_TONS :{COMMA} トン
+STR_LITERS :{COMMA} リットル
+STR_ITEMS :{COMMA} 件
+STR_CRATES :{COMMA} 箱
STR_GAME_OPTIONS_RESOLUTION_OTHER :その他
# Colours, do not shuffle
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index cda3edd34..9669c84a7 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :{G=m}승객
-STR_BAGS :{G=f}자루
-STR_TONS :{G=m}톤
-STR_LITERS :{G=f}리터
-STR_ITEMS :{G=m}품목
-STR_CRATES :{G=f}상자
+STR_PASSENGERS :{G=m}{COMMA} 승객
+STR_BAGS :{G=f}{COMMA} 자루
+STR_TONS :{G=m}{COMMA} 톤
+STR_LITERS :{G=f}{COMMA} 리터
+STR_ITEMS :{G=m}{COMMA} 품목
+STR_CRATES :{G=f}{COMMA} 상자
STR_GAME_OPTIONS_RESOLUTION_OTHER :{G=f}기타
# Colours, do not shuffle
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 4144b4e33..c3db29ed9 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -167,12 +167,12 @@ STR_ABBREV_NONE :{TINYFONT}NAV
STR_ABBREV_ALL :{TINYFONT}VISI
# 'Mode' of transport for cargoes
-STR_PASSENGERS :pasažieri
-STR_BAGS :maisi
-STR_TONS :tonnu
-STR_LITERS :litri
-STR_ITEMS :lietas
-STR_CRATES :kastes
+STR_PASSENGERS :{COMMA} pasažieri
+STR_BAGS :{COMMA} maisi
+STR_TONS :{COMMA} tonnu
+STR_LITERS :{COMMA} litri
+STR_ITEMS :{COMMA} lietas
+STR_CRATES :{COMMA} kastes
STR_GAME_OPTIONS_RESOLUTION_OTHER :cita
# Colours, do not shuffle
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index d0922e16d..09b7ed058 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -240,12 +240,12 @@ STR_ABBREV_NONE :{TINYFONT}-
STR_ABBREV_ALL :{TINYFONT}VISI
# 'Mode' of transport for cargoes
-STR_PASSENGERS :keleiviai
-STR_BAGS :maišai
-STR_TONS :tonos
-STR_LITERS :litrų
-STR_ITEMS :vienetų
-STR_CRATES :dežių
+STR_PASSENGERS :{COMMA} keleiviai
+STR_BAGS :{COMMA} maišai
+STR_TONS :{COMMA} tonos
+STR_LITERS :{COMMA} litrų
+STR_ITEMS :{COMMA} vienetų
+STR_CRATES :{COMMA} dežių
STR_GAME_OPTIONS_RESOLUTION_OTHER :Kita
# Colours, do not shuffle
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index ce49deaac..f6b4fd297 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :Passagéier
-STR_BAGS :Säck
-STR_TONS :Tonnen
-STR_LITERS :Liter
-STR_ITEMS :Objeten
-STR_CRATES :Këschten
+STR_PASSENGERS :{COMMA} Passagéier
+STR_BAGS :{COMMA} Säck
+STR_TONS :{COMMA} Tonnen
+STR_LITERS :{COMMA} Liter
+STR_ITEMS :{COMMA} Objeten
+STR_CRATES :{COMMA} Këschten
STR_GAME_OPTIONS_RESOLUTION_OTHER :Aaneres
# Colours, do not shuffle
diff --git a/src/lang/malay.txt b/src/lang/malay.txt
index fe51ab254..65c079466 100644
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :penumpang
-STR_BAGS :beg
-STR_TONS :tan
-STR_LITERS :liter
-STR_ITEMS :barangan
-STR_CRATES :kotak
+STR_PASSENGERS :{COMMA} penumpang
+STR_BAGS :{COMMA} beg
+STR_TONS :{COMMA} tan
+STR_LITERS :{COMMA} liter
+STR_ITEMS :{COMMA} barangan
+STR_CRATES :{COMMA} kotak
STR_GAME_OPTIONS_RESOLUTION_OTHER :lain
# Colours, do not shuffle
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index d94ddeb3c..6e72f3251 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -167,12 +167,12 @@ STR_ABBREV_NONE :{TINYFONT}IN
STR_ABBREV_ALL :{TINYFONT}ALLE
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passasjerer
-STR_BAGS :sekker
-STR_TONS :tonn
-STR_LITERS :liter
-STR_ITEMS :enheter
-STR_CRATES :kasser
+STR_PASSENGERS :{COMMA} passasjerer
+STR_BAGS :{COMMA} sekker
+STR_TONS :{COMMA} tonn
+STR_LITERS :{COMMA} liter
+STR_ITEMS :{COMMA} enheter
+STR_CRATES :{COMMA} kasser
STR_GAME_OPTIONS_RESOLUTION_OTHER :annet
# Colours, do not shuffle
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 1f5de65de..21373de9b 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -167,12 +167,12 @@ STR_ABBREV_NONE :{TINYFONT}IN
STR_ABBREV_ALL :{TINYFONT}ALLE
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passasjerar
-STR_BAGS :sekkar
-STR_TONS :tonn
-STR_LITERS :liter
-STR_ITEMS :einingar
-STR_CRATES :kasser
+STR_PASSENGERS :{COMMA} passasjerar
+STR_BAGS :{COMMA} sekkar
+STR_TONS :{COMMA} tonn
+STR_LITERS :{COMMA} liter
+STR_ITEMS :{COMMA} einingar
+STR_CRATES :{COMMA} kasser
STR_GAME_OPTIONS_RESOLUTION_OTHER :anna
# Colours, do not shuffle
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index db77fe801..10338e7b7 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -538,18 +538,18 @@ STR_ABBREV_NONE :{TINYFONT}0
STR_ABBREV_ALL :{TINYFONT}+
# 'Mode' of transport for cargoes
-STR_PASSENGERS :pasażerów
-STR_BAGS :worki
+STR_PASSENGERS :{COMMA} pasażerów
+STR_BAGS :{COMMA} worki
STR_BAGS.d :worków
STR_BAGS.c :workom
STR_BAGS.b :worki
STR_BAGS.n :workami
STR_BAGS.m :workach
STR_BAGS.w :worki
-STR_TONS :ton
-STR_LITERS :litrów
-STR_ITEMS :sztuk
-STR_CRATES :skrzyń
+STR_TONS :{COMMA} ton
+STR_LITERS :{COMMA} litrów
+STR_ITEMS :{COMMA} sztuk
+STR_CRATES :{COMMA} skrzyń
STR_GAME_OPTIONS_RESOLUTION_OTHER :inna
# Colours, do not shuffle
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 923e824ab..d71aaac04 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}NÃO
STR_ABBREV_ALL :{TINYFONT}TUDO
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passageiros
-STR_BAGS :sacos
-STR_TONS :toneladas
-STR_LITERS :litros
-STR_ITEMS :itens
-STR_CRATES :caixas
+STR_PASSENGERS :{COMMA} passageiros
+STR_BAGS :{COMMA} sacos
+STR_TONS :{COMMA} toneladas
+STR_LITERS :{COMMA} litros
+STR_ITEMS :{COMMA} itens
+STR_CRATES :{COMMA} caixas
STR_GAME_OPTIONS_RESOLUTION_OTHER :outros
# Colours, do not shuffle
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 13e744ff0..12bd1a217 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}NU
STR_ABBREV_ALL :{TINYFONT}TOT
# 'Mode' of transport for cargoes
-STR_PASSENGERS :călători
-STR_BAGS :saci
-STR_TONS :tone
-STR_LITERS :litri
-STR_ITEMS :bucăţi
-STR_CRATES :pachete
+STR_PASSENGERS :{COMMA} călători
+STR_BAGS :{COMMA} saci
+STR_TONS :{COMMA} tone
+STR_LITERS :{COMMA} litri
+STR_ITEMS :{COMMA} bucăţi
+STR_CRATES :{COMMA} pachete
STR_GAME_OPTIONS_RESOLUTION_OTHER :(alta/nespecificată)
# Colours, do not shuffle
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index dfec74d77..ac8525c77 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -291,12 +291,12 @@ STR_ABBREV_NONE :{TINYFONT}НЕ
STR_ABBREV_ALL :{TINYFONT}Все
# 'Mode' of transport for cargoes
-STR_PASSENGERS :пассажиров
-STR_BAGS :багажа
-STR_TONS :тонн
-STR_LITERS :литров
-STR_ITEMS :штук
-STR_CRATES :ящиков
+STR_PASSENGERS :{COMMA} пассажиров
+STR_BAGS :{COMMA} багажа
+STR_TONS :{COMMA} тонн
+STR_LITERS :{COMMA} литров
+STR_ITEMS :{COMMA} штук
+STR_CRATES :{COMMA} ящиков
STR_GAME_OPTIONS_RESOLUTION_OTHER :Другое
# Colours, do not shuffle
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 0203eae41..5f686c4cc 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -353,12 +353,12 @@ STR_ABBREV_NONE :{TINYFONT}NŠT
STR_ABBREV_ALL :{TINYFONT}SVE
# 'Mode' of transport for cargoes
-STR_PASSENGERS :putnika
-STR_BAGS :džakova
-STR_TONS :tona
-STR_LITERS :litara
-STR_ITEMS :komada
-STR_CRATES :sanduka
+STR_PASSENGERS :{COMMA} putnika
+STR_BAGS :{COMMA} džakova
+STR_TONS :{COMMA} tona
+STR_LITERS :{COMMA} litara
+STR_ITEMS :{COMMA} komada
+STR_CRATES :{COMMA} sanduka
STR_GAME_OPTIONS_RESOLUTION_OTHER :drugo
# Colours, do not shuffle
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index eff5b23e7..78b59589e 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}无
STR_ABBREV_ALL :{TINYFONT}全
# 'Mode' of transport for cargoes
-STR_PASSENGERS :旅客
-STR_BAGS :邮件
-STR_TONS :英吨
-STR_LITERS :升
-STR_ITEMS :件
-STR_CRATES :件
+STR_PASSENGERS :{COMMA} 旅客
+STR_BAGS :{COMMA} 邮件
+STR_TONS :{COMMA} 英吨
+STR_LITERS :{COMMA} 升
+STR_ITEMS :{COMMA} 件
+STR_CRATES :{COMMA} 件
STR_GAME_OPTIONS_RESOLUTION_OTHER :其他
# Colours, do not shuffle
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index d83faaa8d..84be9c450 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -229,12 +229,12 @@ STR_ABBREV_NONE :{TINYFONT}NIC
STR_ABBREV_ALL :{TINYFONT}VS.
# 'Mode' of transport for cargoes
-STR_PASSENGERS :cestujucich
-STR_BAGS :vriec
-STR_TONS :ton
-STR_LITERS :litrov
-STR_ITEMS :kusov
-STR_CRATES :debien
+STR_PASSENGERS :{COMMA} cestujucich
+STR_BAGS :{COMMA} vriec
+STR_TONS :{COMMA} ton
+STR_LITERS :{COMMA} litrov
+STR_ITEMS :{COMMA} kusov
+STR_CRATES :{COMMA} debien
STR_GAME_OPTIONS_RESOLUTION_OTHER :iné
# Colours, do not shuffle
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 3d809d23a..860eb5b5f 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -207,12 +207,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}VSE
# 'Mode' of transport for cargoes
-STR_PASSENGERS :potniki
-STR_BAGS :vreč
-STR_TONS :ton
-STR_LITERS :litrov
-STR_ITEMS :glav
-STR_CRATES :palet
+STR_PASSENGERS :{COMMA} potniki
+STR_BAGS :{COMMA} vreč
+STR_TONS :{COMMA} ton
+STR_LITERS :{COMMA} litrov
+STR_ITEMS :{COMMA} glav
+STR_CRATES :{COMMA} palet
STR_GAME_OPTIONS_RESOLUTION_OTHER :drugo
# Colours, do not shuffle
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 984b93503..1a78087ca 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}TOD
# 'Mode' of transport for cargoes
-STR_PASSENGERS :pasajeros
-STR_BAGS :bolsas
-STR_TONS :toneladas
-STR_LITERS :litros
-STR_ITEMS :artículos
-STR_CRATES :cajones
+STR_PASSENGERS :{COMMA} pasajeros
+STR_BAGS :{COMMA} bolsas
+STR_TONS :{COMMA} toneladas
+STR_LITERS :{COMMA} litros
+STR_ITEMS :{COMMA} artículos
+STR_CRATES :{COMMA} cajones
STR_GAME_OPTIONS_RESOLUTION_OTHER :Otras
# Colours, do not shuffle
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index d53db630f..14b58d83d 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}NEJ
STR_ABBREV_ALL :{TINYFONT}ALLA
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passagerare
-STR_BAGS :väskor
-STR_TONS :ton
-STR_LITERS :liter
-STR_ITEMS :föremål
-STR_CRATES :lådor
+STR_PASSENGERS :{COMMA} passagerare
+STR_BAGS :{COMMA} väskor
+STR_TONS :{COMMA} ton
+STR_LITERS :{COMMA} liter
+STR_ITEMS :{COMMA} föremål
+STR_CRATES :{COMMA} lådor
STR_GAME_OPTIONS_RESOLUTION_OTHER :annan
# Colours, do not shuffle
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 634762234..b04c5ade7 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}無
STR_ABBREV_ALL :{TINYFONT}全
# 'Mode' of transport for cargoes
-STR_PASSENGERS :乘客
-STR_BAGS :包
-STR_TONS :噸
-STR_LITERS :公升
-STR_ITEMS :件
-STR_CRATES :箱
+STR_PASSENGERS :{COMMA} 乘客
+STR_BAGS :{COMMA} 包
+STR_TONS :{COMMA} 噸
+STR_LITERS :{COMMA} 公升
+STR_ITEMS :{COMMA} 件
+STR_CRATES :{COMMA} 箱
STR_GAME_OPTIONS_RESOLUTION_OTHER :其它
# Colours, do not shuffle
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 6e7613292..abc5bd5d7 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -166,12 +166,12 @@ STR_ABBREV_NONE :{TINYFONT}YOK
STR_ABBREV_ALL :{TINYFONT}HEPSI
# 'Mode' of transport for cargoes
-STR_PASSENGERS :yolcu
-STR_BAGS :çanta
-STR_TONS :ton
-STR_LITERS :litre
-STR_ITEMS :tane
-STR_CRATES :kasa
+STR_PASSENGERS :{COMMA} yolcu
+STR_BAGS :{COMMA} çanta
+STR_TONS :{COMMA} ton
+STR_LITERS :{COMMA} litre
+STR_ITEMS :{COMMA} tane
+STR_CRATES :{COMMA} kasa
STR_GAME_OPTIONS_RESOLUTION_OTHER :diğer
# Colours, do not shuffle
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index d4bfb4a86..11cdb556f 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -290,12 +290,12 @@ STR_ABBREV_NONE :{TINYFONT}Ні
STR_ABBREV_ALL :{TINYFONT}Все
# 'Mode' of transport for cargoes
-STR_PASSENGERS :пасажирів
-STR_BAGS :мішків
-STR_TONS :тони
-STR_LITERS :літрів
-STR_ITEMS :штук
-STR_CRATES :ящики
+STR_PASSENGERS :{COMMA} пасажирів
+STR_BAGS :{COMMA} мішків
+STR_TONS :{COMMA} тони
+STR_LITERS :{COMMA} літрів
+STR_ITEMS :{COMMA} штук
+STR_CRATES :{COMMA} ящики
STR_GAME_OPTIONS_RESOLUTION_OTHER :інша
# Colours, do not shuffle
diff --git a/src/lang/unfinished/basque.txt b/src/lang/unfinished/basque.txt
index 1fb508414..0077b917d 100644
--- a/src/lang/unfinished/basque.txt
+++ b/src/lang/unfinished/basque.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}EZ
STR_ABBREV_ALL :{TINYFONT}DEN
# 'Mode' of transport for cargoes
-STR_PASSENGERS :bidaiariak
-STR_BAGS :zakuak
-STR_TONS :tonak
-STR_LITERS :litroak
-STR_ITEMS :elementuak
-STR_CRATES :kaxak
+STR_PASSENGERS :{COMMA} bidaiariak
+STR_BAGS :{COMMA} zakuak
+STR_TONS :{COMMA} tonak
+STR_LITERS :{COMMA} litroak
+STR_ITEMS :{COMMA} elementuak
+STR_CRATES :{COMMA} kaxak
STR_GAME_OPTIONS_RESOLUTION_OTHER :besteak
# Colours, do not shuffle
diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt
index 1b852e561..7a8bd6446 100644
--- a/src/lang/unfinished/chuvash.txt
+++ b/src/lang/unfinished/chuvash.txt
@@ -134,7 +134,7 @@ STR_ABBREV_NONE :{TINYFONT}ҪУ
STR_ABBREV_ALL :{TINYFONT}ПӖРМАЙ
# 'Mode' of transport for cargoes
-STR_PASSENGERS :пассажирсем
+STR_PASSENGERS :{COMMA} пассажирсем
STR_GAME_OPTIONS_RESOLUTION_OTHER :расна
# Colours, do not shuffle
diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index 6cb3cb0a1..c9236d9ba 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -165,11 +165,11 @@ STR_ABBREV_NONE :{TINYFONT}NE
STR_ABBREV_ALL :{TINYFONT}AL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passazjiers
-STR_BAGS :sekken
-STR_TONS :Ton
-STR_LITERS :liters
-STR_CRATES :kratten
+STR_PASSENGERS :{COMMA} passazjiers
+STR_BAGS :{COMMA} sekken
+STR_TONS :{COMMA} Ton
+STR_LITERS :{COMMA} liters
+STR_CRATES :{COMMA} kratten
STR_GAME_OPTIONS_RESOLUTION_OTHER :oars
# Colours, do not shuffle
diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt
index a865270d0..85728d7b7 100644
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -164,12 +164,12 @@ STR_ABBREV_NONE :{TINYFONT}NL
STR_ABBREV_ALL :{TINYFONT}OMNA
# 'Mode' of transport for cargoes
-STR_PASSENGERS :pasajeri
-STR_BAGS :saki
-STR_TONS :tuni
-STR_LITERS :litri
-STR_ITEMS :artikli
-STR_CRATES :kesti
+STR_PASSENGERS :{COMMA} pasajeri
+STR_BAGS :{COMMA} saki
+STR_TONS :{COMMA} tuni
+STR_LITERS :{COMMA} litri
+STR_ITEMS :{COMMA} artikli
+STR_CRATES :{COMMA} kesti
STR_GAME_OPTIONS_RESOLUTION_OTHER :altra
# Colours, do not shuffle
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index be87c8cda..ed9141a8c 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -163,7 +163,7 @@ STR_ABBREV_NONE :{TINYFONT}НТ
STR_ABBREV_ALL :{TINYFONT}Се`
# 'Mode' of transport for cargoes
-STR_BAGS :вреќи
+STR_BAGS :{COMMA} вреќи
# Colours, do not shuffle
STR_COLOUR_DARK_BLUE :Темоно Сина
diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt
index f4f6000e2..b3f42e4aa 100644
--- a/src/lang/unfinished/maltese.txt
+++ b/src/lang/unfinished/maltese.txt
@@ -117,12 +117,12 @@ STR_QUANTITY_PLASTIC :{VOLUME} ta' pl
# Two letter abbreviation of cargo name
# 'Mode' of transport for cargoes
-STR_PASSENGERS :passiġġieri
-STR_BAGS :boroż
-STR_TONS :tunnellati
-STR_LITERS :litri
-STR_ITEMS :oġġetti
-STR_CRATES :kaxxi
+STR_PASSENGERS :{COMMA} passiġġieri
+STR_BAGS :{COMMA} boroż
+STR_TONS :{COMMA} tunnellati
+STR_LITERS :{COMMA} litri
+STR_ITEMS :{COMMA} oġġetti
+STR_CRATES :{COMMA} kaxxi
STR_GAME_OPTIONS_RESOLUTION_OTHER :oħrajn
# Colours, do not shuffle
diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt
index 93d73c2c0..13ab57a88 100644
--- a/src/lang/unfinished/marathi.txt
+++ b/src/lang/unfinished/marathi.txt
@@ -113,7 +113,7 @@ STR_QUANTITY_N_A :एन. ए.
STR_ABBREV_NOTHING :
# 'Mode' of transport for cargoes
-STR_PASSENGERS :प्रवासी
+STR_PASSENGERS :{COMMA} प्रवासी
# Colours, do not shuffle
STR_COLOUR_YELLOW :पिवळा
diff --git a/src/lang/unfinished/tamil.txt b/src/lang/unfinished/tamil.txt
index f0c959993..b320988c7 100644
--- a/src/lang/unfinished/tamil.txt
+++ b/src/lang/unfinished/tamil.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :பயணிகள்
-STR_BAGS :பைகள்
-STR_TONS :டன்
-STR_LITERS :லிட்டர்
-STR_ITEMS :பொருட்கள்
-STR_CRATES :பேட்டிகள்
+STR_PASSENGERS :{COMMA} பயணிகள்
+STR_BAGS :{COMMA} பைகள்
+STR_TONS :{COMMA} டன்
+STR_LITERS :{COMMA} லிட்டர்
+STR_ITEMS :{COMMA} பொருட்கள்
+STR_CRATES :{COMMA} பேட்டிகள்
STR_GAME_OPTIONS_RESOLUTION_OTHER :மற்றவை
# Colours, do not shuffle
diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt
index 7d8f4023f..bc946cd29 100644
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}ว
STR_ABBREV_ALL :{TINYFONT}ทั้งหมด
# 'Mode' of transport for cargoes
-STR_PASSENGERS :ผู้โดยสาร
-STR_BAGS :ถุง
-STR_TONS :ตัน
-STR_LITERS :ลิตร
-STR_ITEMS :ชิ้น
-STR_CRATES :ลัง
+STR_PASSENGERS :{COMMA} ผู้โดยสาร
+STR_BAGS :{COMMA} ถุง
+STR_TONS :{COMMA} ตัน
+STR_LITERS :{COMMA} ลิตร
+STR_ITEMS :{COMMA} ชิ้น
+STR_CRATES :{COMMA} ลัง
STR_GAME_OPTIONS_RESOLUTION_OTHER :อื่นๆ
# Colours, do not shuffle
diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt
index 3fad0f4c8..dc548fb2c 100644
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -136,12 +136,12 @@ STR_ABBREV_LIVESTOCK :{TINYFONT} م
STR_ABBREV_GOODS :{TINYFONT} س م
# 'Mode' of transport for cargoes
-STR_PASSENGERS :مسافرین
-STR_BAGS :تھیلے
-STR_TONS :من
-STR_LITERS :لیٹر
-STR_ITEMS :اشیاء
-STR_CRATES :کریٹ
+STR_PASSENGERS :{COMMA} مسافرین
+STR_BAGS :{COMMA} تھیلے
+STR_TONS :{COMMA} من
+STR_LITERS :{COMMA} لیٹر
+STR_ITEMS :{COMMA} اشیاء
+STR_CRATES :{COMMA} کریٹ
STR_GAME_OPTIONS_RESOLUTION_OTHER :دیگر
# Colours, do not shuffle
diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt
index 349887772..8e6ec8c9a 100644
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}K0
STR_ABBREV_ALL :{TINYFONT}Tất
# 'Mode' of transport for cargoes
-STR_PASSENGERS :hành khách
-STR_BAGS :túi
-STR_TONS :tấn
-STR_LITERS :lít
-STR_ITEMS :cái
-STR_CRATES :thùng
+STR_PASSENGERS :{COMMA} hành khách
+STR_BAGS :{COMMA} túi
+STR_TONS :{COMMA} tấn
+STR_LITERS :{COMMA} lít
+STR_ITEMS :{COMMA} cái
+STR_CRATES :{COMMA} thùng
STR_GAME_OPTIONS_RESOLUTION_OTHER :khác
# Colours, do not shuffle
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index e7a0b5d58..bff51c305 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -165,12 +165,12 @@ STR_ABBREV_NONE :{TINYFONT}NO
STR_ABBREV_ALL :{TINYFONT}ALL
# 'Mode' of transport for cargoes
-STR_PASSENGERS :teithiwr
-STR_BAGS :bag
-STR_TONS :tunnell
-STR_LITERS :litr
-STR_ITEMS :eitem
-STR_CRATES :crât
+STR_PASSENGERS :{COMMA} teithiwr
+STR_BAGS :{COMMA} bag
+STR_TONS :{COMMA} tunnell
+STR_LITERS :{COMMA} litr
+STR_ITEMS :{COMMA} eitem
+STR_CRATES :{COMMA} crât
STR_GAME_OPTIONS_RESOLUTION_OTHER :arall
# Colours, do not shuffle
diff --git a/src/strings.cpp b/src/strings.cpp
index 63e0df95e..d9535315a 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -675,15 +675,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei,
}
default:
- if (cargo_str >= 0xE000 && cargo_str < 0xF800) {
- /* NewGRF strings from Action 4 use a different format here,
- * of e.g. "x tonnes of coal", so process accordingly. */
- buff = GetStringWithArgs(buff, cargo_str, argv++, last);
- } else {
- buff = FormatCommaNumber(buff, GetInt32(&argv), last);
- buff = strecpy(buff, " ", last);
- buff = strecpy(buff, GetStringPtr(cargo_str), last);
- }
+ buff = GetStringWithArgs(buff, cargo_str, argv++, last);
break;
}
break;