diff options
| author | frosch <frosch@openttd.org> | 2013-01-23 19:45:47 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2013-01-23 19:45:47 +0000 |
| commit | f563250c0b9fa051d81481d88dbd8767730703d9 (patch) | |
| tree | 4d0a0c5f3de3e722d0ba570fe9f8d6b7fe671166 | |
| parent | 8fa3da44c7fea50d698281946cef54290d8747a8 (diff) | |
| download | openttd-f563250c0b9fa051d81481d88dbd8767730703d9.tar.xz | |
(svn r24938) -Fix [FS#5447-ish]: Never put a space between cargo name and subtype.
62 files changed, 62 insertions, 62 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 95a2a42a4..01b9b9eb5 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -4533,7 +4533,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index da1ae3ea6..d4f6981c5 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -4293,7 +4293,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 5aee9e900..d2f913d9f 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -4618,7 +4618,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 06ee4b506..d24e7a5dc 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -5133,7 +5133,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 9a0abd4bb..bd88b9601 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 50935bf71..320801a28 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -4669,7 +4669,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index b28e75b74..e5939413f 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -4660,7 +4660,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 0dae0cce6..4b097704d 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -4794,7 +4794,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 2802629af..b26a2d0d2 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -4877,7 +4877,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 5fdbeb4c2..cb347f0fa 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -4638,7 +4638,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index e839f5d91..5833f116c 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/english.txt b/src/lang/english.txt index 42c5c07b2..7c0a31f30 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 2b1c9b2b5..30d4c52e7 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -4659,7 +4659,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 92ae97345..e023fb5fb 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 471a0eb53..e41d32588 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -4199,7 +4199,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index d72b211bf..ee32e65bd 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -4716,7 +4716,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index d3c885836..05f693de9 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/french.txt b/src/lang/french.txt index c99b9f92d..9ea6603cc 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -4662,7 +4662,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/galician.txt b/src/lang/galician.txt index efecdf331..60152c2c7 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -3953,7 +3953,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/german.txt b/src/lang/german.txt index 691b19e73..4a4f4cdad 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 870d59da1..68b75affd 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -4685,7 +4685,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 42c0b54c0..0370702bb 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -4650,7 +4650,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 54295acea..faacb1ebe 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -4744,7 +4744,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 46cc4eb57..0314ae77a 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -4662,7 +4662,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index c3055cf7a..ee4cef9e0 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -4605,7 +4605,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 85217333a..7cc41e332 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -4172,7 +4172,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 34d70b7af..440cdfc97 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -4689,7 +4689,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 0f7b22ec5..095401db7 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -4217,7 +4217,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index ca5387d7b..2ad3ccd4a 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -4662,7 +4662,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 415807904..0e9928ee7 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -4646,7 +4646,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index b157badd6..c6c9c29e9 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -5175,7 +5175,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 605b92153..fe11c1d7c 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -4659,7 +4659,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/malay.txt b/src/lang/malay.txt index ff36f7552..0980adcdd 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -4484,7 +4484,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 5e5eca0fa..cba20eba5 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index f234b5ee2..7560aea38 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -4372,7 +4372,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 0ad6e6ed5..acbe6e528 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -5082,7 +5082,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index d58d8afdd..4a9752da2 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -4660,7 +4660,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index a41d500c4..68b09e607 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -4630,7 +4630,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 2ac5fe1a7..2c3add218 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -4888,7 +4888,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index affb337ae..5d416d727 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -4681,7 +4681,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 836700d2c..3dea35df0 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -4659,7 +4659,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 21a59d703..e543193fb 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -4727,7 +4727,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 819126eca..f6ac34239 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -4788,7 +4788,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 0bef3a3df..17684cda2 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -4661,7 +4661,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 0801dd349..e07184e66 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -4603,7 +4603,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 59c2a8b62..5d335ee27 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -4659,7 +4659,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 9ceb51f54..dd2d54a9b 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -4501,7 +4501,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 51a74038d..2b99d24c7 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -4821,7 +4821,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index cd4db0202..900d9078c 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -1440,7 +1440,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/faroese.txt b/src/lang/unfinished/faroese.txt index 5436b055d..8c99f7940 100644 --- a/src/lang/unfinished/faroese.txt +++ b/src/lang/unfinished/faroese.txt @@ -1400,7 +1400,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index a35e152b3..26668eeea 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -3211,7 +3211,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index c566dd225..13fa7b5a7 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -1309,7 +1309,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index c80b74862..0fbddbbdb 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -1860,7 +1860,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt index daf246af9..83cefe61e 100644 --- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -1351,7 +1351,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index cadec27e2..2412c730b 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -1563,7 +1563,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 29032af77..e77ca6008 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -3819,7 +3819,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/tamil.txt b/src/lang/unfinished/tamil.txt index abe0ff2ef..c03d5436e 100644 --- a/src/lang/unfinished/tamil.txt +++ b/src/lang/unfinished/tamil.txt @@ -3679,7 +3679,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt index bf4aeff8c..c24f87da8 100644 --- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -3074,7 +3074,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index d46a0784f..ffa953af2 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -2862,7 +2862,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index e81051aaf..278fceb8f 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -4624,7 +4624,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 81d797a6d..9bf0e1417 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -4398,7 +4398,7 @@ STR_JUST_DATE_SHORT :{DATE_SHORT} 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 diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 970674639..ec523e134 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -342,7 +342,7 @@ static void DrawVehicleRefitWindow(const SubtypeList list[NUM_CARGO], int sel, u /* 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); } |