From a950e9a4a8374aca1028da1ecb2effd75d1936c6 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 17 Nov 2010 18:04:11 +0000 Subject: (svn r21221) -Fix (r11429): short cargo units names for some cargo types/strings are not properly mapped to the strings that we use for the default industries --- src/lang/afrikaans.txt | 1 - src/lang/arabic_egypt.txt | 1 - src/lang/belarusian.txt | 1 - src/lang/brazilian_portuguese.txt | 1 - src/lang/bulgarian.txt | 1 - src/lang/catalan.txt | 1 - src/lang/croatian.txt | 1 - src/lang/czech.txt | 1 - src/lang/danish.txt | 1 - src/lang/dutch.txt | 1 - src/lang/english.txt | 1 - src/lang/english_US.txt | 1 - src/lang/esperanto.txt | 1 - src/lang/estonian.txt | 1 - src/lang/finnish.txt | 1 - src/lang/french.txt | 1 - src/lang/galician.txt | 1 - src/lang/german.txt | 1 - src/lang/greek.txt | 1 - src/lang/hebrew.txt | 1 - src/lang/hungarian.txt | 1 - src/lang/icelandic.txt | 1 - src/lang/indonesian.txt | 1 - src/lang/irish.txt | 1 - src/lang/italian.txt | 1 - src/lang/japanese.txt | 1 - src/lang/korean.txt | 1 - src/lang/latvian.txt | 1 - src/lang/lithuanian.txt | 1 - src/lang/luxembourgish.txt | 1 - src/lang/malay.txt | 1 - src/lang/norwegian_bokmal.txt | 1 - src/lang/norwegian_nynorsk.txt | 1 - src/lang/polish.txt | 1 - src/lang/portuguese.txt | 1 - src/lang/romanian.txt | 1 - src/lang/russian.txt | 1 - src/lang/serbian.txt | 1 - src/lang/simplified_chinese.txt | 1 - src/lang/slovak.txt | 1 - src/lang/slovenian.txt | 1 - src/lang/spanish.txt | 1 - src/lang/swedish.txt | 1 - src/lang/traditional_chinese.txt | 1 - src/lang/turkish.txt | 1 - src/lang/ukrainian.txt | 1 - src/lang/unfinished/basque.txt | 1 - src/lang/unfinished/chuvash.txt | 1 - src/lang/unfinished/frisian.txt | 1 - src/lang/unfinished/ido.txt | 1 - src/lang/unfinished/maltese.txt | 1 - src/lang/unfinished/marathi.txt | 1 - src/lang/unfinished/tamil.txt | 1 - src/lang/unfinished/thai.txt | 1 - src/lang/unfinished/urdu.txt | 1 - src/lang/vietnamese.txt | 1 - src/lang/welsh.txt | 1 - src/newgrf_text.cpp | 8 ++++---- 58 files changed, 4 insertions(+), 61 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 027f0f75d..ff3024b04 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -173,7 +173,6 @@ STR_LITERS :liters STR_ITEMS :items STR_CRATES :kratte STR_GAME_OPTIONS_RESOLUTION_OTHER :ander -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Donker Blou diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 6a7c86566..2687ec963 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -172,7 +172,6 @@ STR_LITERS :لتر STR_ITEMS :وحدة STR_CRATES :صناديق STR_GAME_OPTIONS_RESOLUTION_OTHER :اخرى -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :ازرق غامق diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 56c4b95ec..ca829916e 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -485,7 +485,6 @@ STR_LITERS :лiтраў STR_ITEMS :штук STR_CRATES :скрыняў STR_GAME_OPTIONS_RESOLUTION_OTHER :Iншае -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Цёмна-сiнi diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 7005fc511..4541021cd 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -173,7 +173,6 @@ STR_LITERS :litros STR_ITEMS :itens STR_CRATES :caixas STR_GAME_OPTIONS_RESOLUTION_OTHER :outra -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Azul Escuro diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 688a39029..a639b5c89 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -174,7 +174,6 @@ STR_LITERS :литри STR_ITEMS :елемента STR_CRATES :кашони STR_GAME_OPTIONS_RESOLUTION_OTHER :друго -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Тъмно синьо diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index b3c1a82ac..c98a38958 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -173,7 +173,6 @@ STR_LITERS :litres STR_ITEMS :caps STR_CRATES :palets STR_GAME_OPTIONS_RESOLUTION_OTHER :altres -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Blau Fosc diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index d3408b6d0..090544dcf 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -268,7 +268,6 @@ STR_LITERS :litre STR_ITEMS :jedinice STR_CRATES :sanduci STR_GAME_OPTIONS_RESOLUTION_OTHER :ostalo -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Tamnoplava diff --git a/src/lang/czech.txt b/src/lang/czech.txt index c36209129..a9de610f8 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -242,7 +242,6 @@ STR_LITERS :litrů STR_ITEMS :kusů STR_CRATES :krabic STR_GAME_OPTIONS_RESOLUTION_OTHER :jiné -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Tmavomodrá diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 8f591ce91..eec30546b 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -172,7 +172,6 @@ STR_LITERS :liter STR_ITEMS :stykker STR_CRATES :kasser STR_GAME_OPTIONS_RESOLUTION_OTHER :andet -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Mørkeblå diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 5da576faa..aec8a230e 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -172,7 +172,6 @@ STR_LITERS :liter STR_ITEMS :stuks STR_CRATES :pallets STR_GAME_OPTIONS_RESOLUTION_OTHER :anders -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Donkerblauw diff --git a/src/lang/english.txt b/src/lang/english.txt index 6d0ea73e5..4cf97b01a 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -171,7 +171,6 @@ STR_TONS :tonnes STR_LITERS :litres STR_ITEMS :items STR_CRATES :crates -STR_NOTHING : # 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 631efc6d8..808e477eb 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -172,7 +172,6 @@ STR_LITERS :liters STR_ITEMS :items STR_CRATES :crates STR_GAME_OPTIONS_RESOLUTION_OTHER :other -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Dark Blue diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index e51ec2331..cbbbd4104 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -173,7 +173,6 @@ STR_LITERS :litroj STR_ITEMS :pecoj STR_CRATES :kestoj STR_GAME_OPTIONS_RESOLUTION_OTHER :alia -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Malhelblua diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 210286a14..8af782d53 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -229,7 +229,6 @@ STR_LITERS :liitrit STR_ITEMS :ühikut STR_CRATES :kasti STR_GAME_OPTIONS_RESOLUTION_OTHER :muu -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Tumesinine diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 94e6964d4..0c141fa9f 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -172,7 +172,6 @@ STR_LITERS :litraa STR_ITEMS :erää STR_CRATES :laatikkoa STR_GAME_OPTIONS_RESOLUTION_OTHER :muu -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Tummansininen diff --git a/src/lang/french.txt b/src/lang/french.txt index 8c49cc2f2..3ce68724e 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -173,7 +173,6 @@ STR_LITERS :litres STR_ITEMS :unités STR_CRATES :caisses STR_GAME_OPTIONS_RESOLUTION_OTHER :autre -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Bleu foncé diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 0b9a13aac..aac8c2797 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -173,7 +173,6 @@ STR_LITERS :litros STR_ITEMS :ítems STR_CRATES :caixóns STR_GAME_OPTIONS_RESOLUTION_OTHER :outro -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Azul Escuro diff --git a/src/lang/german.txt b/src/lang/german.txt index 66b067c30..b2ed4f345 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -173,7 +173,6 @@ STR_LITERS :Liter STR_ITEMS :Stück STR_CRATES :Kisten STR_GAME_OPTIONS_RESOLUTION_OTHER :Andere -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Dunkelblau diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 6f7624072..9d69583fb 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -236,7 +236,6 @@ STR_LITERS :Λίτρα STR_ITEMS :αντικείμενα STR_CRATES :Κουτιά STR_GAME_OPTIONS_RESOLUTION_OTHER :άλλη -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Σκούρο Μπλε diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 3756e2fca..d69746a3b 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -186,7 +186,6 @@ STR_LITERS :ליטרים STR_ITEMS :פריטים STR_CRATES :ארגזים STR_GAME_OPTIONS_RESOLUTION_OTHER :אחר -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :כחול כהה diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index beb609df8..d1e3d5e75 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -235,7 +235,6 @@ STR_LITERS :liter STR_ITEMS :darab STR_CRATES :láda STR_GAME_OPTIONS_RESOLUTION_OTHER :egyéb -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Sötétkék diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index e881ac7a2..f6f2bb633 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -173,7 +173,6 @@ STR_LITERS :lítrar STR_ITEMS :hlutir STR_CRATES :kassar STR_GAME_OPTIONS_RESOLUTION_OTHER :annað -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Dökkblár diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index f540c3ebe..2202a0e1f 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -172,7 +172,6 @@ STR_LITERS :liter STR_ITEMS :unit STR_CRATES :peti STR_GAME_OPTIONS_RESOLUTION_OTHER :lainnya -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Biru tua diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 386d6fa09..c5c9235a8 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -172,7 +172,6 @@ STR_LITERS :lítear STR_ITEMS :míreanna STR_CRATES :crátaí STR_GAME_OPTIONS_RESOLUTION_OTHER :eile -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Gorm Dorcha diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 8863e2bfe..481234eb2 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -174,7 +174,6 @@ STR_LITERS :litri STR_ITEMS :oggetti STR_CRATES :casse STR_GAME_OPTIONS_RESOLUTION_OTHER :Altra -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Blu scuro diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 0fe344d32..fbe8c7d41 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -172,7 +172,6 @@ STR_LITERS :リットル STR_ITEMS :件 STR_CRATES :箱 STR_GAME_OPTIONS_RESOLUTION_OTHER :その他 -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :紺青色 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index efa8cd75e..cda3edd34 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -173,7 +173,6 @@ STR_LITERS :{G=f}리터 STR_ITEMS :{G=m}품목 STR_CRATES :{G=f}상자 STR_GAME_OPTIONS_RESOLUTION_OTHER :{G=f}기타 -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :짙은 파랑 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 6e1730437..4144b4e33 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -174,7 +174,6 @@ STR_LITERS :litri STR_ITEMS :lietas STR_CRATES :kastes STR_GAME_OPTIONS_RESOLUTION_OTHER :cita -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Tumši zils diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 88f9aa3a2..d0922e16d 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -247,7 +247,6 @@ STR_LITERS :litrų STR_ITEMS :vienetų STR_CRATES :dežių STR_GAME_OPTIONS_RESOLUTION_OTHER :Kita -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Tamsiai mėlyna diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 92c08a36b..ce49deaac 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -172,7 +172,6 @@ STR_LITERS :Liter STR_ITEMS :Objeten STR_CRATES :Këschten STR_GAME_OPTIONS_RESOLUTION_OTHER :Aaneres -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Donkelblo diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 43fdfc5fa..fe51ab254 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -172,7 +172,6 @@ STR_LITERS :liter STR_ITEMS :barangan STR_CRATES :kotak STR_GAME_OPTIONS_RESOLUTION_OTHER :lain -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Biru Gelap diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index f98945496..d94ddeb3c 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -174,7 +174,6 @@ STR_LITERS :liter STR_ITEMS :enheter STR_CRATES :kasser STR_GAME_OPTIONS_RESOLUTION_OTHER :annet -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Mørkeblå diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index e151725f0..1f5de65de 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -174,7 +174,6 @@ STR_LITERS :liter STR_ITEMS :einingar STR_CRATES :kasser STR_GAME_OPTIONS_RESOLUTION_OTHER :anna -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Mørkeblå diff --git a/src/lang/polish.txt b/src/lang/polish.txt index d60665d9c..db77fe801 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -551,7 +551,6 @@ STR_LITERS :litrów STR_ITEMS :sztuk STR_CRATES :skrzyń STR_GAME_OPTIONS_RESOLUTION_OTHER :inna -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Ciemnoniebieski diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 3f75be6e6..923e824ab 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -172,7 +172,6 @@ STR_LITERS :litros STR_ITEMS :itens STR_CRATES :caixas STR_GAME_OPTIONS_RESOLUTION_OTHER :outros -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Azul Escuro diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 4eac511d9..13e744ff0 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -172,7 +172,6 @@ STR_LITERS :litri STR_ITEMS :bucăţi STR_CRATES :pachete STR_GAME_OPTIONS_RESOLUTION_OTHER :(alta/nespecificată) -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Albastru închis diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 2f7a3da04..dfec74d77 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -298,7 +298,6 @@ STR_LITERS :литров STR_ITEMS :штук STR_CRATES :ящиков STR_GAME_OPTIONS_RESOLUTION_OTHER :Другое -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Тёмно-синий diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 2512ea567..0203eae41 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -360,7 +360,6 @@ STR_LITERS :litara STR_ITEMS :komada STR_CRATES :sanduka STR_GAME_OPTIONS_RESOLUTION_OTHER :drugo -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Tamno plava diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 9c580d8b3..eff5b23e7 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -172,7 +172,6 @@ STR_LITERS :升 STR_ITEMS :件 STR_CRATES :件 STR_GAME_OPTIONS_RESOLUTION_OTHER :其他 -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :深蓝色 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 704ee879a..d83faaa8d 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -236,7 +236,6 @@ STR_LITERS :litrov STR_ITEMS :kusov STR_CRATES :debien STR_GAME_OPTIONS_RESOLUTION_OTHER :iné -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Tmavomodrá diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 1e1acc3d6..3d809d23a 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -214,7 +214,6 @@ STR_LITERS :litrov STR_ITEMS :glav STR_CRATES :palet STR_GAME_OPTIONS_RESOLUTION_OTHER :drugo -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Temno modra diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 9712ac446..984b93503 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -173,7 +173,6 @@ STR_LITERS :litros STR_ITEMS :artículos STR_CRATES :cajones STR_GAME_OPTIONS_RESOLUTION_OTHER :Otras -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Azul oscuro diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 5d6008537..d53db630f 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -172,7 +172,6 @@ STR_LITERS :liter STR_ITEMS :föremål STR_CRATES :lådor STR_GAME_OPTIONS_RESOLUTION_OTHER :annan -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Mörkblå diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index f48a1e19f..634762234 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -172,7 +172,6 @@ STR_LITERS :公升 STR_ITEMS :件 STR_CRATES :箱 STR_GAME_OPTIONS_RESOLUTION_OTHER :其它 -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :暗藍 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 012440cba..6e7613292 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -173,7 +173,6 @@ STR_LITERS :litre STR_ITEMS :tane STR_CRATES :kasa STR_GAME_OPTIONS_RESOLUTION_OTHER :diğer -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Koyu Mavi diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index d3ed038aa..d4bfb4a86 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -297,7 +297,6 @@ STR_LITERS :літрів STR_ITEMS :штук STR_CRATES :ящики STR_GAME_OPTIONS_RESOLUTION_OTHER :інша -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Темно-синій diff --git a/src/lang/unfinished/basque.txt b/src/lang/unfinished/basque.txt index b984f96fe..1fb508414 100644 --- a/src/lang/unfinished/basque.txt +++ b/src/lang/unfinished/basque.txt @@ -172,7 +172,6 @@ STR_LITERS :litroak STR_ITEMS :elementuak STR_CRATES :kaxak STR_GAME_OPTIONS_RESOLUTION_OTHER :besteak -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Urdin Iluna diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index cdff651bd..1b852e561 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -136,7 +136,6 @@ STR_ABBREV_ALL :{TINYFONT}ПӖ # 'Mode' of transport for cargoes STR_PASSENGERS :пассажирсем STR_GAME_OPTIONS_RESOLUTION_OTHER :расна -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_PINK :Кӗрен diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index d31d0f195..6cb3cb0a1 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -171,7 +171,6 @@ STR_TONS :Ton STR_LITERS :liters STR_CRATES :kratten STR_GAME_OPTIONS_RESOLUTION_OTHER :oars -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Tsjuster Blauw diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index 5f6cd5091..a865270d0 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -171,7 +171,6 @@ STR_LITERS :litri STR_ITEMS :artikli STR_CRATES :kesti STR_GAME_OPTIONS_RESOLUTION_OTHER :altra -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Obskur-blua diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt index 82c69b260..f4f6000e2 100644 --- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -124,7 +124,6 @@ STR_LITERS :litri STR_ITEMS :oġġetti STR_CRATES :kaxxi STR_GAME_OPTIONS_RESOLUTION_OTHER :oħrajn -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Blu Skur diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index faee1eaf5..93d73c2c0 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -114,7 +114,6 @@ STR_ABBREV_NOTHING : # 'Mode' of transport for cargoes STR_PASSENGERS :प्रवासी -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_YELLOW :पिवळा diff --git a/src/lang/unfinished/tamil.txt b/src/lang/unfinished/tamil.txt index a599bf4ec..f0c959993 100644 --- a/src/lang/unfinished/tamil.txt +++ b/src/lang/unfinished/tamil.txt @@ -172,7 +172,6 @@ STR_LITERS :லிட்ட STR_ITEMS :பொருட்கள் STR_CRATES :பேட்டிகள் STR_GAME_OPTIONS_RESOLUTION_OTHER :மற்றவை -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :கருநீலம் diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt index 8524195ca..7d8f4023f 100644 --- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -172,7 +172,6 @@ STR_LITERS :ลิตร STR_ITEMS :ชิ้น STR_CRATES :ลัง STR_GAME_OPTIONS_RESOLUTION_OTHER :อื่นๆ -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :สีกรมท่า diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 78b90f11b..3fad0f4c8 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -143,7 +143,6 @@ STR_LITERS :لیٹر STR_ITEMS :اشیاء STR_CRATES :کریٹ STR_GAME_OPTIONS_RESOLUTION_OTHER :دیگر -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :گہرا نیلا diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index c8b6a9bb6..349887772 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -172,7 +172,6 @@ STR_LITERS :lít STR_ITEMS :cái STR_CRATES :thùng STR_GAME_OPTIONS_RESOLUTION_OTHER :khác -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Xanh da trời đậm diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 4166df958..e7a0b5d58 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -172,7 +172,6 @@ STR_LITERS :litr STR_ITEMS :eitem STR_CRATES :crât STR_GAME_OPTIONS_RESOLUTION_OTHER :arall -STR_NOTHING : # Colours, do not shuffle STR_COLOUR_DARK_BLUE :Glas Tywyll diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp index a1045056f..9cd0d62a5 100644 --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -46,14 +46,14 @@ StringID TTDPStringIDToOTTDStringIDMapping(StringID str) { /* StringID table for TextIDs 0x4E->0x6D */ static const StringID units_volume[] = { - STR_NOTHING, STR_PASSENGERS, STR_TONS, STR_BAGS, + STR_ITEMS, STR_PASSENGERS, STR_TONS, STR_BAGS, STR_LITERS, STR_ITEMS, STR_CRATES, STR_TONS, STR_TONS, STR_TONS, STR_TONS, STR_BAGS, STR_TONS, STR_TONS, STR_TONS, STR_BAGS, STR_TONS, STR_TONS, STR_BAGS, STR_LITERS, - STR_TONS, STR_LITERS, STR_TONS, STR_NOTHING, - STR_BAGS, STR_LITERS, STR_TONS, STR_NOTHING, - STR_TONS, STR_NOTHING, STR_LITERS, STR_NOTHING + STR_TONS, STR_LITERS, STR_TONS, STR_ITEMS, + STR_BAGS, STR_LITERS, STR_TONS, STR_ITEMS, + STR_TONS, STR_ITEMS, STR_LITERS, STR_ITEMS }; /* A string straight from a NewGRF; no need to remap this as it's already mapped. */ -- cgit v1.2.3-54-g00ecf