From a3382deac7cd98d3b5abab90d9b4100ea26852ab Mon Sep 17 00:00:00 2001 From: yexo Date: Sat, 29 Aug 2009 21:28:36 +0000 Subject: [PATCH] (svn r17311) -Change: rename STR_WHITE_STRINGN to STR_WHITE_STRING --- src/lang/afrikaans.txt | 2 +- src/lang/arabic_egypt.txt | 2 +- src/lang/brazilian_portuguese.txt | 2 +- src/lang/bulgarian.txt | 2 +- src/lang/catalan.txt | 2 +- src/lang/croatian.txt | 2 +- src/lang/czech.txt | 2 +- src/lang/danish.txt | 2 +- src/lang/dutch.txt | 2 +- src/lang/english.txt | 2 +- src/lang/english_US.txt | 2 +- src/lang/esperanto.txt | 2 +- src/lang/estonian.txt | 2 +- src/lang/finnish.txt | 2 +- src/lang/french.txt | 2 +- src/lang/galician.txt | 2 +- src/lang/german.txt | 2 +- src/lang/greek.txt | 2 +- src/lang/hebrew.txt | 2 +- src/lang/hungarian.txt | 2 +- src/lang/icelandic.txt | 2 +- src/lang/indonesian.txt | 2 +- src/lang/italian.txt | 2 +- src/lang/japanese.txt | 2 +- src/lang/korean.txt | 2 +- src/lang/latvian.txt | 2 +- src/lang/lithuanian.txt | 2 +- src/lang/luxembourgish.txt | 2 +- src/lang/norwegian_bokmal.txt | 2 +- src/lang/norwegian_nynorsk.txt | 2 +- src/lang/polish.txt | 2 +- src/lang/portuguese.txt | 2 +- src/lang/romanian.txt | 2 +- src/lang/russian.txt | 2 +- src/lang/serbian.txt | 2 +- src/lang/simplified_chinese.txt | 2 +- src/lang/slovak.txt | 2 +- src/lang/slovenian.txt | 2 +- src/lang/spanish.txt | 2 +- src/lang/swedish.txt | 2 +- src/lang/traditional_chinese.txt | 2 +- src/lang/turkish.txt | 2 +- src/lang/ukrainian.txt | 2 +- src/lang/unfinished/frisian.txt | 2 +- src/lang/unfinished/ido.txt | 2 +- src/lang/unfinished/macedonian.txt | 2 +- src/lang/unfinished/malay.txt | 2 +- src/lang/unfinished/persian.txt | 2 +- src/lang/unfinished/thai.txt | 2 +- src/lang/unfinished/urdu.txt | 2 +- src/lang/unfinished/vietnamese.txt | 2 +- src/lang/welsh.txt | 2 +- src/misc_gui.cpp | 4 ++-- src/osk_gui.cpp | 4 ++-- src/signs_gui.cpp | 4 ++-- 55 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 2fd5a6bc5c..bde373062c 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -3838,7 +3838,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 63cb996302..96cc24ce6c 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -3982,7 +3982,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 926c2ca63e..a1a203c650 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3974,7 +3974,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 101ac20fa8..2b2e752ad5 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -3941,7 +3941,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index e891ae35e0..4164bbe07b 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index abe3505964..2024c20eac 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -4028,7 +4028,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index cf67d6ae2c..f5d916498e 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -4045,7 +4045,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 4676207d90..6557921108 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index d85247dea5..634977e32e 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/english.txt b/src/lang/english.txt index 3a6e9254f6..415fa77a09 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{RAW_STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 5bfaa2d476..be70b48466 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 0a7a2a7ecc..75830c04f8 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -3543,7 +3543,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 7afb8207d5..bc067b6e62 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -4023,7 +4023,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index ff2ee67268..91c971a354 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/french.txt b/src/lang/french.txt index b02ead5217..0b8cb46b5d 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3988,7 +3988,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 0461ffb138..721b03da1e 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -3943,7 +3943,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/german.txt b/src/lang/german.txt index e0eb5d4103..62bb0bda12 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3988,7 +3988,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/greek.txt b/src/lang/greek.txt index c54cf03982..21abbb9970 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -3562,7 +3562,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index e1babfc1cf..4e79a8b2c5 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -3900,7 +3900,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index f167a9aa5a..34a317cf4e 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -4058,7 +4058,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 16fbb5f2c1..ace4335b3e 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -3969,7 +3969,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index d3e4973caa..34c50ede45 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 6f4273839e..d9b1c7c266 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3989,7 +3989,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 160f342298..dc0fcb1aea 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -3906,7 +3906,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 009d465517..e319f90a1f 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -3983,7 +3983,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 7750f84760..5e174a306f 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -3989,7 +3989,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index f807d11b19..a90c87112c 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -3916,7 +3916,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 6670c7d45c..27124b5a94 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -3963,7 +3963,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 0125f4baf8..c15c84092d 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3977,7 +3977,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 71f7e77ba0..fdfcbb0bec 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -3927,7 +3927,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 55887a7e42..0d128fca91 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -4409,7 +4409,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index d9a319ce6b..5f2fc0d621 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 2c9532ad57..5da9263063 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index b5927c888f..943ff961c9 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -4157,7 +4157,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 2da12f57b2..7d6cb8c4f3 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -4182,7 +4182,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index a115b4fe50..009438089c 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3987,7 +3987,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 8e1f6f6d71..3e56d8f101 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -4049,7 +4049,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index dae09ce068..9bbf612350 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -4046,7 +4046,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 7fac2b2f72..6e778c888d 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3988,7 +3988,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 7cdf17788b..2af484bca0 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -3983,7 +3983,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index eca4d6d0d5..19a3270618 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -3972,7 +3972,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 8ec6563f9f..3addbcdc1c 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -3998,7 +3998,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index e6385c713a..373490324f 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -4130,7 +4130,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index ff5df593e8..15de6a14fe 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -2252,7 +2252,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index 4fc897a6b4..2291718557 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -971,7 +971,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 9cea13974c..bda7fb6ada 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -1400,7 +1400,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt index e5159e3d41..497b519790 100644 --- a/src/lang/unfinished/malay.txt +++ b/src/lang/unfinished/malay.txt @@ -1787,7 +1787,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index e76fcc8980..14bf810307 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -2171,7 +2171,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt index 2d09942b33..387d45cf64 100644 --- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -1472,7 +1472,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 828eab7264..13fb166d6d 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -997,7 +997,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/unfinished/vietnamese.txt b/src/lang/unfinished/vietnamese.txt index be2bd9500b..4d8157f2c3 100644 --- a/src/lang/unfinished/vietnamese.txt +++ b/src/lang/unfinished/vietnamese.txt @@ -1284,7 +1284,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 3c6276d55f..4f815404fb 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -3968,7 +3968,7 @@ STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} STR_BLACK_STRING :{BLACK}{STRING} STR_BLACK_RAW_STRING :{BLACK}{STRING} -STR_WHITE_STRINGN :{WHITE}{STRING} +STR_WHITE_STRING :{WHITE}{STRING} STR_TINY_BLACK_VEHICLE :{TINYFONT}{BLACK}{VEHICLE} STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 66a9f0cd0b..1274c854ac 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1320,7 +1320,7 @@ struct QueryStringWindow : public QueryStringBaseWindow static const Widget _query_string_widgets[] = { { WWT_CLOSEBOX, RESIZE_NONE, COLOUR_GREY, 0, 10, 0, 13, STR_BLACK_CROSS, STR_TOOLTIP_CLOSE_WINDOW}, // QUERY_STR_WIDGET_CLOSEBOX -{ WWT_CAPTION, RESIZE_NONE, COLOUR_GREY, 11, 259, 0, 13, STR_WHITE_STRINGN, STR_NULL}, // QUERY_STR_WIDGET_CAPTION +{ WWT_CAPTION, RESIZE_NONE, COLOUR_GREY, 11, 259, 0, 13, STR_WHITE_STRING, STR_NULL}, // QUERY_STR_WIDGET_CAPTION { WWT_PANEL, RESIZE_NONE, COLOUR_GREY, 0, 259, 14, 29, 0x0, STR_NULL}, // QUERY_STR_WIDGET_BACKGROUND { WWT_EDITBOX, RESIZE_NONE, COLOUR_GREY, 2, 257, 16, 27, 0x0, STR_NULL}, // QUERY_STR_WIDGET_TEXT { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 0, 86, 30, 41, STR_BUTTON_DEFAULT, STR_NULL}, // QUERY_STR_WIDGET_DEFAULT @@ -1332,7 +1332,7 @@ static const Widget _query_string_widgets[] = { static const NWidgetPart _nested_query_string_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY, QUERY_STR_WIDGET_CLOSEBOX), - NWidget(WWT_CAPTION, COLOUR_GREY, QUERY_STR_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRINGN, STR_NULL), + NWidget(WWT_CAPTION, COLOUR_GREY, QUERY_STR_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRING, STR_NULL), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, QUERY_STR_WIDGET_BACKGROUND), NWidget(WWT_EDITBOX, COLOUR_GREY, QUERY_STR_WIDGET_TEXT), SetMinimalSize(256, 12), SetPadding(2, 2, 2, 2), diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index 95db2fcef0..7858c7f46d 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -257,7 +257,7 @@ struct OskWindow : public Window { }; static const Widget _osk_widgets[] = { -{ WWT_CAPTION, RESIZE_NONE, COLOUR_GREY, 0, 255, 0, 13, STR_WHITE_STRINGN, STR_NULL}, // OSK_WIDGET_CAPTION +{ WWT_CAPTION, RESIZE_NONE, COLOUR_GREY, 0, 255, 0, 13, STR_WHITE_STRING, STR_NULL}, // OSK_WIDGET_CAPTION { WWT_PANEL, RESIZE_NONE, COLOUR_GREY, 0, 255, 14, 29, 0x0, STR_NULL}, // OSK_WIDGET_TEXT_BACKGROUND { WWT_EDITBOX, RESIZE_NONE, COLOUR_GREY, 2, 253, 16, 27, 0x0, STR_NULL}, // OSK_WIDGET_TEXT @@ -449,7 +449,7 @@ static NWidgetBase *MakeSpacebarKeys(int *biggest_index) static const NWidgetPart _nested_osk_widgets[] = { - NWidget(WWT_CAPTION, COLOUR_GREY, OSK_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRINGN, STR_NULL), + NWidget(WWT_CAPTION, COLOUR_GREY, OSK_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRING, STR_NULL), NWidget(WWT_PANEL, COLOUR_GREY, OSK_WIDGET_TEXT_BACKGROUND), NWidget(WWT_EDITBOX, COLOUR_GREY, OSK_WIDGET_TEXT), SetMinimalSize(252, 12), SetPadding(2, 2, 2, 2), EndContainer(), diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp index 72424affd4..1824a7ee39 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -356,7 +356,7 @@ struct SignWindow : QueryStringBaseWindow, SignList { static const Widget _query_sign_edit_widgets[] = { { WWT_CLOSEBOX, RESIZE_NONE, COLOUR_GREY, 0, 10, 0, 13, STR_BLACK_CROSS, STR_TOOLTIP_CLOSE_WINDOW}, // QUERY_EDIT_SIGN_WIDGET_CLOSEBOX -{ WWT_CAPTION, RESIZE_NONE, COLOUR_GREY, 11, 259, 0, 13, STR_WHITE_STRINGN, STR_NULL }, // QUERY_EDIT_SIGN_WIDGET_CAPTION +{ WWT_CAPTION, RESIZE_NONE, COLOUR_GREY, 11, 259, 0, 13, STR_WHITE_STRING, STR_NULL }, // QUERY_EDIT_SIGN_WIDGET_CAPTION { WWT_PANEL, RESIZE_NONE, COLOUR_GREY, 0, 259, 14, 29, STR_NULL, STR_NULL }, // QUERY_EDIT_SIGN_WIDGET_PANEL { WWT_EDITBOX, RESIZE_NONE, COLOUR_GREY, 2, 257, 16, 27, STR_EDIT_SIGN_SIGN_OSKTITLE, STR_NULL }, // QUERY_EDIT_SIGN_WIDGET_TEXT (Text field) { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 0, 60, 30, 41, STR_BUTTON_OK, STR_NULL }, // QUERY_EDIT_SIGN_WIDGET_OK @@ -371,7 +371,7 @@ static const Widget _query_sign_edit_widgets[] = { static const NWidgetPart _nested_query_sign_edit_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_CLOSEBOX), - NWidget(WWT_CAPTION, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRINGN, STR_NULL), + NWidget(WWT_CAPTION, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRING, STR_NULL), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_PANEL), NWidget(WWT_EDITBOX, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_TEXT), SetMinimalSize(256, 12), SetDataTip(STR_EDIT_SIGN_SIGN_OSKTITLE, STR_NULL), SetPadding(2, 2, 2, 2),