Mercurial > hg > openttd
changeset 20006:f6947775c809 draft
(svn r24938) -Fix [FS#5447-ish]: Never put a space between cargo name and subtype.
line wrap: on
line diff
--- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -4533,7 +4533,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -4293,7 +4293,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -4618,7 +4618,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -5133,7 +5133,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -4669,7 +4669,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -4660,7 +4660,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -4794,7 +4794,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -4877,7 +4877,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -4638,7 +4638,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{RAW_STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -4659,7 +4659,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -4199,7 +4199,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -4716,7 +4716,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -4662,7 +4662,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -3953,7 +3953,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -4685,7 +4685,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -4650,7 +4650,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -4744,7 +4744,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -4662,7 +4662,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -4605,7 +4605,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -4172,7 +4172,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -4689,7 +4689,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -4217,7 +4217,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -4662,7 +4662,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -4646,7 +4646,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -5175,7 +5175,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -4659,7 +4659,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -4484,7 +4484,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -4372,7 +4372,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -5082,7 +5082,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -4660,7 +4660,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -4630,7 +4630,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -4888,7 +4888,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -4681,7 +4681,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -4659,7 +4659,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -4727,7 +4727,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -4788,7 +4788,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -4603,7 +4603,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -4659,7 +4659,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -4501,7 +4501,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -4821,7 +4821,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -1440,7 +1440,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/faroese.txt +++ b/src/lang/unfinished/faroese.txt @@ -1400,7 +1400,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -3211,7 +3211,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -1309,7 +1309,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -1860,7 +1860,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -1351,7 +1351,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -1563,7 +1563,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -3819,7 +3819,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/tamil.txt +++ b/src/lang/unfinished/tamil.txt @@ -3679,7 +3679,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -3074,7 +3074,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -2862,7 +2862,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -4624,7 +4624,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -4398,7 +4398,7 @@ STR_JUST_DATE_LONG :{DATE_LONG} STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} -STR_JUST_STRING_SPACE_STRING :{STRING} {STRING} +STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{STRING} # Slightly 'raw' stringcodes with colour or size
--- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -342,7 +342,7 @@ /* If the callback succeeded, draw the cargo suffix. */ if (refit.value != CALLBACK_FAILED && refit.value < 0x400) { SetDParam(1, GetGRFStringID(refit.engine->GetGRFID(), 0xD000 + refit.value)); - DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y, STR_JUST_STRING_SPACE_STRING, colour); + DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y, STR_JUST_STRING_STRING, colour); } else { DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y, STR_JUST_STRING, colour); }