From d9ed2d380f2d86e4dcc6484ce80c70a1dfef9813 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 14 Apr 2009 21:20:03 +0000 Subject: [PATCH] (svn r16061) [0.7] -Backport from trunk: - Fix: Non advanced vehicle list did not handle company switching correctly (r16054) - Fix: Do not warn that crashed vehicles are getting old; upgrading them is impossible [FS#2740] (r16048) - Fix: The currency abbreviation for the Romanian Leu is now RON [FS#774] (r16041) - Fix: Dash was not able to run iconv detection (r16035) - Fix: [NewGRF] Do not give "... Mines" as name to the station of oil rigs, or more general: do not add "... Mines" when the all of the cargoes are part of the liquid, passenger or mail classes [FS#2785] (r16029) --- config.lib | 4 ++-- src/currency.cpp | 4 ++-- 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/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/piglatin.txt | 2 +- src/lang/polish.txt | 2 +- src/lang/portuguese.txt | 2 +- src/lang/romanian.txt | 2 +- src/lang/russian.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/greek.txt | 2 +- src/lang/welsh.txt | 2 +- src/settings.cpp | 2 +- src/station_cmd.cpp | 8 ++++++-- src/vehicle.cpp | 4 ++-- src/vehicle_gui.cpp | 30 ++++++++++++++---------------- 50 files changed, 71 insertions(+), 69 deletions(-) diff --git a/config.lib b/config.lib index 547c47c3a0..fda308f811 100644 --- a/config.lib +++ b/config.lib @@ -2405,7 +2405,7 @@ int main() { } EOF execute="$cxx_host $CFLAGS -c tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1" - eval $execute >&/dev/null + eval $execute > /dev/null ret=$? log 2 "executing $execute" log 2 " exit code $ret" @@ -2426,7 +2426,7 @@ int main() { } EOF execute="$cxx_host $CFLAGS tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1" - eval $execute >&/dev/null + eval $execute > /dev/null ret=$? log 2 "executing $execute" log 2 " exit code $ret" diff --git a/src/currency.cpp b/src/currency.cpp index ee83de1424..25f2614723 100644 --- a/src/currency.cpp +++ b/src/currency.cpp @@ -35,7 +35,7 @@ static const CurrencySpec origin_currency_specs[NUM_CURRENCY] = { { 3, ',', 2002, "NLG ", "", 0, STR_CURR_NLG }, ///< dutch gulden { 12, '.', CF_NOEURO, "", " Kr", 1, STR_CURR_NOK }, ///< norwegian krone { 6, ' ', CF_NOEURO, "", " zl", 1, STR_CURR_PLN }, ///< polish zloty - { 5, '.', CF_NOEURO, "", " Lei", 1, STR_CURR_ROL }, ///< romanian Lei + { 5, '.', CF_NOEURO, "", " Lei", 1, STR_CURR_RON }, ///< romanian Lei { 50, ' ', CF_NOEURO, "", " p", 1, STR_CURR_RUR }, ///< russian rouble { 352, '.', 2007, "", " SIT", 1, STR_CURR_SIT }, ///< slovenian tolar { 13, '.', CF_NOEURO, "", " Kr", 1, STR_CURR_SEK }, ///< swedish krona @@ -76,7 +76,7 @@ enum { CURR_NLG, CURR_NOK, CURR_PLN, - CURR_ROL, + CURR_RON, CURR_RUR, CURR_SIT, CURR_SEK, diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 12c822aaf1..1d8357c640 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -807,7 +807,7 @@ STR_CURR_ITL :Italian Lira (I STR_CURR_NLG :Dutch Guilder (NLG) STR_CURR_NOK :Norwegian Krone (NOK) STR_CURR_PLN :Polish Zloty (PLN) -STR_CURR_ROL :Romanian Leu (ROL) +STR_CURR_RON :Romanian Leu (RON) STR_CURR_RUR :Russian Rubles (RUR) STR_CURR_SIT :Slovenian Tolar (SIT) STR_CURR_SEK :Swedish Krona (SEK) diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 49e7a169c2..60b5a4392c 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :ليرة ايط STR_CURR_NLG :غلدر هولندي (NLG) STR_CURR_NOK :كرونا نرويجية (NOK) STR_CURR_PLN :زلوتي بولندي (PLN) -STR_CURR_ROL :لور يوناني (ROL) +STR_CURR_RON :لور يوناني (RON) STR_CURR_RUR :روبل روسي (RUR) STR_CURR_SIT :تولار سوفاني (SIT) STR_CURR_SEK :كرونا سويدية (SEK) diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index aa0474609e..76b046f0c1 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :Lira Italiana ( STR_CURR_NLG :Guilda Holandesa (NLG) STR_CURR_NOK :Coroa Norueguesa (NOK) STR_CURR_PLN :Zloty Polaco (PLN) -STR_CURR_ROL :Lei Romeno (ROL) +STR_CURR_RON :Lei Romeno (RON) STR_CURR_RUR :Rublo Russo (RUR) STR_CURR_SIT :Tolar Eslovênio (SIT) STR_CURR_SEK :Coroa Sueca (SEK) diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 1c8b921569..55cefb42ec 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :италиан STR_CURR_NLG :холандски гулден (NLG) STR_CURR_NOK :норвежка крона (NOK) STR_CURR_PLN :полска злота (PLN) -STR_CURR_ROL :румънска лея (ROL) +STR_CURR_RON :румънска лея (RON) STR_CURR_RUR :руска рубла (RUR) STR_CURR_SIT :словенски толар (SIT) STR_CURR_SEK :шведска крона (SEK) diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 9376ab7386..ca96ad72f3 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Lires Italianes STR_CURR_NLG :Florins Holandesos (NLG) STR_CURR_NOK :Corones Noruegues (NOK) STR_CURR_PLN :Zloty Polonès (PLN) -STR_CURR_ROL :Leu Romanès (ROL) +STR_CURR_RON :Leu Romanès (RON) STR_CURR_RUR :Rubles Russos (RUR) STR_CURR_SIT :Tòlar Eslovè (SIT) STR_CURR_SEK :Corones Sueques (SEK) diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index e236494291..76ad0bbc52 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -883,7 +883,7 @@ STR_CURR_ITL :Talijanska lira STR_CURR_NLG :Nizozemski gulden (NLG) STR_CURR_NOK :Norveška kruna (NOK) STR_CURR_PLN :Poljski zloti (PLN) -STR_CURR_ROL :Rumunjski lev (ROL) +STR_CURR_RON :Rumunjski lev (RON) STR_CURR_RUR :Ruske rublje (RUR) STR_CURR_SIT :Slovenski tolar (SIT) STR_CURR_SEK :Švedska kruna (SEK) diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 7d12d8b16b..06d9bb33ce 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -886,7 +886,7 @@ STR_CURR_ITL :Italská lira ( STR_CURR_NLG :Holandský gulden (NLG) STR_CURR_NOK :Norská koruna (NOK) STR_CURR_PLN :Polský zlotý (PLN) -STR_CURR_ROL :Rumunský lei (ROL) +STR_CURR_RON :Rumunský lei (RON) STR_CURR_RUR :Ruský rubl (RUR) STR_CURR_SIT :Slovinský tolar (SIT) STR_CURR_SEK :Švédská koruna (SEK) diff --git a/src/lang/danish.txt b/src/lang/danish.txt index ef43fd8764..627a8b570c 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Italienske Lire STR_CURR_NLG :Hollandske Guilder (NLG) STR_CURR_NOK :Norske Kroner (NOK) STR_CURR_PLN :Polske Zloty (PLN) -STR_CURR_ROL :Rumænske Lei (ROL) +STR_CURR_RON :Rumænske Lei (RON) STR_CURR_RUR :Russiske Rubel (RUR) STR_CURR_SIT :Slovenske Tolare (SIT) STR_CURR_SEK :Svenske Kroner (SEK) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index d9abcd23a4..6265b5efed 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Italiaanse Lier STR_CURR_NLG :Nederlandse Gulden (NLG) STR_CURR_NOK :Noorse Kronen (NOK) STR_CURR_PLN :Poolse Zloty (PLN) -STR_CURR_ROL :Roemeense Leu (ROL) +STR_CURR_RON :Roemeense Leu (RON) STR_CURR_RUR :Russische Rubel (RUR) STR_CURR_SIT :Sloveense Tolar (SIT) STR_CURR_SEK :Zweedse Kronen (SEK) diff --git a/src/lang/english.txt b/src/lang/english.txt index e063b1d27b..434b4a4f27 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Italian Lira (I STR_CURR_NLG :Dutch Guilder (NLG) STR_CURR_NOK :Norwegian Krone (NOK) STR_CURR_PLN :Polish Zloty (PLN) -STR_CURR_ROL :Romanian Leu (ROL) +STR_CURR_RON :Romanian Leu (RON) STR_CURR_RUR :Russian Rubles (RUR) STR_CURR_SIT :Slovenian Tolar (SIT) STR_CURR_SEK :Swedish Krona (SEK) diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 137579993a..70d037c826 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Italian Lira (I STR_CURR_NLG :Dutch Guilder (NLG) STR_CURR_NOK :Norwegian Krone (NOK) STR_CURR_PLN :Polish Zloty (PLN) -STR_CURR_ROL :Romanian Leu (ROL) +STR_CURR_RON :Romanian Leu (RON) STR_CURR_RUR :Russian Rubel (RUR) STR_CURR_SIT :Slovenian Tolar (SIT) STR_CURR_SEK :Swedish Krona (SEK) diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 319684f6dc..2fff6c8135 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -793,7 +793,7 @@ STR_CURR_ITL :Italaj Liroj (I STR_CURR_NLG :Nederlandaj Guldenoj (NLG) STR_CURR_NOK :Norvegaj Kronoj (NOK) STR_CURR_PLN :Polaj Zlotoj (PLN) -STR_CURR_ROL :Rumanaj Leŭoj (ROL) +STR_CURR_RON :Rumanaj Leŭoj (RON) STR_CURR_RUR :Rusaj Rubloj (RUR) STR_CURR_SIT :Slovenaj Tolaroj (SIT) STR_CURR_SEK :Svedaj Kronoj (SEK) diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index eae1f02ebe..4f04d75c7a 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -865,7 +865,7 @@ STR_CURR_ITL :Itaalia liir (I STR_CURR_NLG :Hollandi kulden (NLG) STR_CURR_NOK :Norra kroon (NOK) STR_CURR_PLN :Poola Zlott (PLN) -STR_CURR_ROL :Rumeenia Leu (ROL) +STR_CURR_RON :Rumeenia Leu (RON) STR_CURR_RUR :Vene rubla (RUR) STR_CURR_SIT :Sloveenia Talaar (SIT) STR_CURR_SEK :Rootsi kroon (SEK) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 136ae3e16a..ff2d734682 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Italian liira ( STR_CURR_NLG :Hollannin guildeni (NLG) STR_CURR_NOK :Norjan kruunu (NOK) STR_CURR_PLN :Puolan zloty (PLN) -STR_CURR_ROL :Romanian leu (ROL) +STR_CURR_RON :Romanian leu (RON) STR_CURR_RUR :Venjän rupla (RUR) STR_CURR_SIT :Slovenian tolari (SIT) STR_CURR_SEK :Ruotsin kruunu (SEK) diff --git a/src/lang/french.txt b/src/lang/french.txt index b71a8e4286..a051f169f4 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :Lire Italienne STR_CURR_NLG :Florint Hollandais (NLG) STR_CURR_NOK :Courronne Norvégienne (NOK) STR_CURR_PLN :Nouv. Zloty Polonais (PLN) -STR_CURR_ROL :Leu Roumain (ROL) +STR_CURR_RON :Leu Roumain (RON) STR_CURR_RUR :Rouble Russe (RUR) STR_CURR_SIT :Tolar Slovénien (SIT) STR_CURR_SEK :Couronne Suédoise (SEK) diff --git a/src/lang/galician.txt b/src/lang/galician.txt index e2c987667b..9b0efcaf92 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -806,7 +806,7 @@ STR_CURR_ITL :Lira Italiana ( STR_CURR_NLG :Florín Holandés (NLG) STR_CURR_NOK :Corona Norueguesa (NOK) STR_CURR_PLN :Zloty Polaco (PLN) -STR_CURR_ROL :Leu Rumano (ROL) +STR_CURR_RON :Leu Rumano (RON) STR_CURR_RUR :Rublo Ruso (RUR) STR_CURR_SIT :Tolar Esloveno (SIT) STR_CURR_SEK :Corona Sueca (SEK) diff --git a/src/lang/german.txt b/src/lang/german.txt index db0fbe72f3..69aac324f5 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :Italienische Li STR_CURR_NLG :Niederländ. Gulden (NLG) STR_CURR_NOK :Norwegische Kronen (NOK) STR_CURR_PLN :Polnische Zloty (PLN) -STR_CURR_ROL :Rumänische Lei (ROL) +STR_CURR_RON :Rumänische Lei (RON) STR_CURR_RUR :Russische Rubel (RUR) STR_CURR_SIT :Slovenische Taler (SIT) STR_CURR_SEK :Schwedische Kronen (SEK) diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 23fd04ac1b..a8d9e941c2 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -813,7 +813,7 @@ STR_CURR_ITL :(ITL) לירה STR_CURR_NLG :(NLG) גילדן הולנדי STR_CURR_NOK :(NOK) קרונה נורווגית STR_CURR_PLN :(PLN) זלוטי פולני -STR_CURR_ROL :(ROL) ליו רומני +STR_CURR_RON :(RON) ליו רומני STR_CURR_RUR :(RUR) רובל רוסי STR_CURR_SIT :(SIT) טולר סלובני STR_CURR_SEK :(SEK) קרונה שוודית diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 6878acceac..1657502bc5 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -852,7 +852,7 @@ STR_CURR_ITL :Olasz Líra (IT STR_CURR_NLG :Holland Guilder (NLG) STR_CURR_NOK :Norvég Korona (NOK) STR_CURR_PLN :Legyel Zlotyi (PLN) -STR_CURR_ROL :Román Lej (ROL) +STR_CURR_RON :Román Lej (RON) STR_CURR_RUR :Orosz Rubel (RUR) STR_CURR_SIT :Szlovén Tolár (SIT) STR_CURR_SEK :Svéd Korona (SEK) diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index e3473b61bd..97d15d4c99 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :Ítölsk líra STR_CURR_NLG :Hollensk gyllini (NLG) STR_CURR_NOK :Norsk króna (NOK) STR_CURR_PLN :Pólsk zloty (PLN) -STR_CURR_ROL :Rúmensk leu (ROL) +STR_CURR_RON :Rúmensk leu (RON) STR_CURR_RUR :Rússnesk rúbla (RUR) STR_CURR_SIT :Slóvensk tolar (SIT) STR_CURR_SEK :Sænsk króna (SEK) diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index b88ba2660b..b8c88e4918 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Lira Italian (I STR_CURR_NLG :Dutch Guilder (NLG) STR_CURR_NOK :Krone Norwegia (NOK) STR_CURR_PLN :Zloty Polandia (PLN) -STR_CURR_ROL :Leu Romania (ROL) +STR_CURR_RON :Leu Romania (RON) STR_CURR_RUR :Rubles Rusia (RUR) STR_CURR_SIT :Tolar Slovenia (SIT) STR_CURR_SEK :Krona Swedia (SEK) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 850e991943..549978e8b3 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -820,7 +820,7 @@ STR_CURR_ITL :Lira Italiana ( STR_CURR_NLG :Fiorino Olandese (NLG) STR_CURR_NOK :Corona Norvegese (NOK) STR_CURR_PLN :Zloty Polacco (PLN) -STR_CURR_ROL :Leu Rumeno (ROL) +STR_CURR_RON :Leu Rumeno (RON) STR_CURR_RUR :Rublo Russo (RUR) STR_CURR_SIT :Tolar Sloveno (SIT) STR_CURR_SEK :Corona Svedese (SEK) diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 5c840693a2..7ec6291108 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -816,7 +816,7 @@ STR_CURR_ITL :イタリアリ STR_CURR_NLG :オランダギルダー（NLG） STR_CURR_NOK :ノルウェイクローネ（NOK） STR_CURR_PLN :ポーランドズロティ（PLN） -STR_CURR_ROL :ルーマニアレイ（ROL） +STR_CURR_RON :ルーマニアレイ（RON） STR_CURR_RUR :ロシアルーブル（RUR） STR_CURR_SIT :スロベニアトラール（SIT） STR_CURR_SEK :スウェーデンクローナ（SEK） diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 2b0df7d9ea..072d8f50a9 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :이탈리아 STR_CURR_NLG :네덜란드 길더 (NLG) STR_CURR_NOK :노르웨이 크로네 (NOK) STR_CURR_PLN :폴란드 즐로티 (PLN) -STR_CURR_ROL :루마니아 레우 (ROL) +STR_CURR_RON :루마니아 레우 (RON) STR_CURR_RUR :러시아 루블 (RUR) STR_CURR_SIT :슬로바키아 톨라 (SIT) STR_CURR_SEK :스웨덴 크로나 (SEK) diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 3ee867a0f9..2facd0b6c4 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :Itālijas liras STR_CURR_NLG :Nīderlandes guldeņi(NLG) STR_CURR_NOK :Norvēģijas kronas (NOK) STR_CURR_PLN :Polijas zloti (PLN) -STR_CURR_ROL :Rumānijas lejas (ROL) +STR_CURR_RON :Rumānijas lejas (RON) STR_CURR_RUR :Krievijas rubļii (RUR) STR_CURR_SIT :Slovēnijas tolārs (SIT) STR_CURR_SEK :Zviedrijas kronas (SEK) diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index c820539b14..d13ad94ec8 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -852,7 +852,7 @@ STR_CURR_ITL :Italu liros (IT STR_CURR_NLG :Olandijos guldenai (NLG) STR_CURR_NOK :Norvegijos kronos (NOK) STR_CURR_PLN :Lenkijos zlotai (PLN) -STR_CURR_ROL :Rumunijos lejos (ROL) +STR_CURR_RON :Rumunijos lejos (RON) STR_CURR_RUR :Rusijos rubliai (RUR) STR_CURR_SIT :Slovėnijos tolarai (SIT) STR_CURR_SEK :Svedijos kronos (SEK) diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 3039cbe0f4..77977ca3a4 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -812,7 +812,7 @@ STR_CURR_ITL :Italienësch Li STR_CURR_NLG :Holländësch Gulden (NLG) STR_CURR_NOK :Norwegesch Kroun (NOK) STR_CURR_PLN :Polnësch Zloty (PLN) -STR_CURR_ROL :Rumänësch Leu (ROL) +STR_CURR_RON :Rumänësch Leu (RON) STR_CURR_RUR :Russësch Rubl (RUR) STR_CURR_SIT :Slowenëschen Tolar (SIT) STR_CURR_SEK :Schwédësch Kroun (SEK) diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 6382df0f0c..27eb7fd22d 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -816,7 +816,7 @@ STR_CURR_ITL :Italiensk lire STR_CURR_NLG :Hollandsk guilder (NLG) STR_CURR_NOK :Norsk krone (NOK) STR_CURR_PLN :Polsk zloty (PLN) -STR_CURR_ROL :Rumensk leu (ROL) +STR_CURR_RON :Rumensk leu (RON) STR_CURR_RUR :Russisk rubel (RUR) STR_CURR_SIT :Slovensk tolar (SIT) STR_CURR_SEK :Svensk krone (SEK) diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 418b879ae7..52577375ca 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :Italiensk lire STR_CURR_NLG :Hollandsk gylden (NLG) STR_CURR_NOK :Norsk krone (NOK) STR_CURR_PLN :Polsk zloty (PLN) -STR_CURR_ROL :Rumensk lei (ROL) +STR_CURR_RON :Rumensk lei (RON) STR_CURR_RUR :Russisk rubel (RUR) STR_CURR_SIT :Slovensk tolar (SIT) STR_CURR_SEK :Svensk krone (SEK) diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index 6f40ccab24..cd7787da53 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Italianway Iral STR_CURR_NLG :Utchday Uildergay (NLGay) STR_CURR_NOK :Orwegiannay Onekray (OKNay) STR_CURR_PLN :Olishpay Otyzlay (PLNay) -STR_CURR_ROL :Omanianray Eulay (OLRay) +STR_CURR_RON :Omanianray Eulay (OLRay) STR_CURR_RUR :Ussianray Ublesray (URRay) STR_CURR_SIT :Ovenianslay Olartay (ITSay) STR_CURR_SEK :Edishsway Onakray (EKSay) diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 013ac71c1d..8bc0f54e14 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -863,7 +863,7 @@ STR_CURR_ITL :Lira włoska (I STR_CURR_NLG :Gulden holenderski (NLG) STR_CURR_NOK :Korona norweska (NOK) STR_CURR_PLN :Złoty polski (PLN) -STR_CURR_ROL :Lej rumuński (ROL) +STR_CURR_RON :Lej rumuński (RON) STR_CURR_RUR :Rubel rosyjski (RUR) STR_CURR_SIT :Tolar słowenski (SIT) STR_CURR_SEK :Korona szwedzka (SEK) diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 2c0e36b298..021ec7f42b 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Lira Italiana ( STR_CURR_NLG :Guilda Holandesa (NLG) STR_CURR_NOK :Coroa Norueguesa (NOK) STR_CURR_PLN :Zloty Polaco (PLN) -STR_CURR_ROL :Lei Romeno (ROL) +STR_CURR_RON :Lei Romeno (RON) STR_CURR_RUR :Rublo Russo (RUR) STR_CURR_SIT :Tolar Esloveno (SIT) STR_CURR_SEK :Coroa Sueca (SEK) diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index c3e24a62af..d113923881 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Liră italiană STR_CURR_NLG :Gulden olandez (NLG) STR_CURR_NOK :Coroană norvegiană (NOK) STR_CURR_PLN :Zlot polonez (PLN) -STR_CURR_ROL :Leu românesc (ROL) +STR_CURR_RON :Leu românesc (RON) STR_CURR_RUR :Rublă rusească (RUR) STR_CURR_SIT :Tolar Sloven (SIT) STR_CURR_SEK :Coroană suedeză (SEK) diff --git a/src/lang/russian.txt b/src/lang/russian.txt index dab7c2ef27..9f558665b7 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -820,7 +820,7 @@ STR_CURR_ITL :Итальян STR_CURR_NLG :Нидерландский гульден (NLG) STR_CURR_NOK :Норвежская крона (NOK) STR_CURR_PLN :Польский злотый (PLN) -STR_CURR_ROL :Римский лей (ROL) +STR_CURR_RON :Римский лей (RON) STR_CURR_RUR :Российский рубль (RUR) STR_CURR_SIT :Словенский толар (SIT) STR_CURR_SEK :Шведская крона (SEK) diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 60e4bfd406..54fdf65f36 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :意大利里拉 STR_CURR_NLG :荷兰盾 (NLG) STR_CURR_NOK :挪威克郎 (NOK) STR_CURR_PLN :波兰兹罗提 (PLN) -STR_CURR_ROL :罗马尼亚列伊 (ROL) +STR_CURR_RON :罗马尼亚列伊 (RON) STR_CURR_RUR :卢布 (RUR) STR_CURR_SIT :斯洛文尼亚托拉尔 (SIT) STR_CURR_SEK :瑞典克郎 (SEK) diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index a28330b8fe..b1cbb7cf61 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -885,7 +885,7 @@ STR_CURR_ITL :Talianske Liry STR_CURR_NLG :Danske Guldeny (NLG) STR_CURR_NOK :Norske Koruny (NOK) STR_CURR_PLN :Polske Zloty (PLN) -STR_CURR_ROL :Rumunske Lei (ROL) +STR_CURR_RON :Rumunske Lei (RON) STR_CURR_RUR :Ruske Ruble (RUR) STR_CURR_SIT :Slovinske Toliare (SIT) STR_CURR_SEK :Svedske Koruny (SEK) diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 55416e90e7..1c38847f94 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -860,7 +860,7 @@ STR_CURR_ITL :Italijanska Lir STR_CURR_NLG :Nizozemski Gulden (NLG) STR_CURR_NOK :Norveška Krona (NOK) STR_CURR_PLN :Poljski Zlot (PLN) -STR_CURR_ROL :Romunski Lej (ROL) +STR_CURR_RON :Romunski Lej (RON) STR_CURR_RUR :Ruski Rubelj (RUR) STR_CURR_SIT :Slovenski tolar (SIT) STR_CURR_SEK :Švedska Krona (SEK) diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 6dbd728344..34f02d1da0 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :Lira Italiana ( STR_CURR_NLG :Florín Holandés (NLG) STR_CURR_NOK :Corona Noruega(NOK) STR_CURR_PLN :Zloty Polaco (PLN) -STR_CURR_ROL :Leu Rumano (ROL) +STR_CURR_RON :Leu Rumano (RON) STR_CURR_RUR :Rublo Ruso (RUR) STR_CURR_SIT :Tolar Eslovenio (SIT) STR_CURR_SEK :Corona Sueca (SEK) diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index f6b0ad7533..8dc611c181 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Italienska lire STR_CURR_NLG :Holländska guilder (NLG) STR_CURR_NOK :Norska kronor (NOK) STR_CURR_PLN :Polska Zloty (PLN) -STR_CURR_ROL :Rumänsk Leu (ROL) +STR_CURR_RON :Rumänsk Leu (RON) STR_CURR_RUR :Ryska rubel (RUR) STR_CURR_SIT :Slovenska Tolar (SIT) STR_CURR_SEK :Svenska kronor (SEK) diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 928d97a269..8fa0f78e25 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -816,7 +816,7 @@ STR_CURR_ITL :義大利里拉 STR_CURR_NLG :荷蘭盾 (NLG) STR_CURR_NOK :挪威克朗 (NOK) STR_CURR_PLN :波蘭茲羅提 (PLN) -STR_CURR_ROL :羅馬尼亞列伊 (ROL) +STR_CURR_RON :羅馬尼亞列伊 (RON) STR_CURR_RUR :俄羅斯盧布 (RUR) STR_CURR_SIT :斯洛文尼亞托拉 (SIT) STR_CURR_SEK :瑞典克朗 (SEK) diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 638287362e..8590a8ba45 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :İtalyan Lirasi STR_CURR_NLG :Hollanda Guilder (NLG) STR_CURR_NOK :Norweç Krone (NOK) STR_CURR_PLN :Polon Zilotu (PLN) -STR_CURR_ROL :Romanya Leusu (ROL) +STR_CURR_RON :Romanya Leusu (RON) STR_CURR_RUR :Rus Rublesi (RUR) STR_CURR_SIT :Slovenya Toları (SIT) STR_CURR_SEK :İsveç Kronasi (SEK) diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 426989bb2a..26a231404a 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -943,7 +943,7 @@ STR_CURR_ITL :Італійс STR_CURR_NLG :Голландський гульден (NLG) STR_CURR_NOK :Норвезька крона (NOK) STR_CURR_PLN :Польський злотий (PLN) -STR_CURR_ROL :Румунський лей (ROL) +STR_CURR_RON :Румунський лей (RON) STR_CURR_RUR :Російський рубель (RUR) STR_CURR_SIT :Словенський талер (SIT) STR_CURR_SEK :Шведська крона (SEK) diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt index c3c22a4af9..d17fe5d727 100644 --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -819,7 +819,7 @@ STR_CURR_ITL :Ιταλική STR_CURR_NLG :Ολλανδικό Φιορίνι (NLG) STR_CURR_NOK :Νορβηγική Κορώνα (NOK) STR_CURR_PLN :Πολωνικό Zloty (PLN) -STR_CURR_ROL :Ρουμάνικο Λευ (ROL) +STR_CURR_RON :Ρουμάνικο Λευ (RON) STR_CURR_RUR :Ρώσσικες Ρούβλες (RUR) STR_CURR_SIT :Σλοβένικο Tolar (SIT) STR_CURR_SEK :Σουηδική Κορώνα (SEK) diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index d6fa46029a..50bb56891c 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -818,7 +818,7 @@ STR_CURR_ITL :Lira Eidalaidd STR_CURR_NLG :Guilder (NLG) STR_CURR_NOK :Krone Norwyaidd (NOK) STR_CURR_PLN :Zloty Pwylaidd (PLN) -STR_CURR_ROL :Leu Rwmanaidd (ROL) +STR_CURR_RON :Leu Rwmanaidd (RON) STR_CURR_RUR :Rwbl Rwsaidd (RUR) STR_CURR_SIT :Tolar Slofenaidd (SIT) STR_CURR_SEK :Krona Swedaidd (SEK) diff --git a/src/settings.cpp b/src/settings.cpp index bedda8d714..fbee347b1e 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1264,7 +1264,7 @@ uint16 _old_diff_custom[GAME_DIFFICULTY_NUM]; /* Most of these strings are used both for gameopt-backward compatability * and the settings tables. The rest is here for consistency. */ -static const char *_locale_currencies = "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|YTL|SKK|BRL|EEK|custom"; +static const char *_locale_currencies = "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|RON|RUR|SIT|SEK|YTL|SKK|BRL|EEK|custom"; static const char *_locale_units = "imperial|metric|si"; static const char *_town_names = "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss|danish|turkish|italian|catalan"; static const char *_climates = "temperate|arctic|tropic|toyland"; diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 63f17d4e99..e601e57e98 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -148,8 +148,12 @@ static bool CMSAMine(TileIndex tile) if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_EXTRACTIVE) == 0) return false; for (uint i = 0; i < lengthof(ind->produced_cargo); i++) { - /* The industry extracts something non-liquid, i.e. no oil or plastic, so it is a mine */ - if (ind->produced_cargo[i] != CT_INVALID && (GetCargo(ind->produced_cargo[i])->classes & CC_LIQUID) == 0) return true; + /* The industry extracts something non-liquid, i.e. no oil or plastic, so it is a mine. + * Also the production of passengers and mail is ignored. */ + if (ind->produced_cargo[i] != CT_INVALID && + (GetCargo(ind->produced_cargo[i])->classes & (CC_LIQUID | CC_PASSENGERS | CC_MAIL)) == 0) { + return true; + } } return false; diff --git a/src/vehicle.cpp b/src/vehicle.cpp index d567595921..98cb45734f 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -921,8 +921,8 @@ void AgeVehicle(Vehicle *v) InvalidateWindow(WC_VEHICLE_DETAILS, v->index); - /* Don't warn about non-primary or not ours vehicles */ - if (v->Previous() != NULL || v->owner != _local_company) return; + /* Don't warn about non-primary or not ours vehicles or vehicles that are crashed */ + if (v->Previous() != NULL || v->owner != _local_company || (v->vehstatus & VS_CRASHED) != 0) return; /* Don't warn if a renew is active */ if (GetCompany(v->owner)->engine_renew && GetEngine(v->engine_type)->company_avail != 0) return; diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 97d4df34ed..21fc0030a7 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -815,21 +815,6 @@ struct VehicleListWindow : public BaseVehicleListWindow { this->vehicle_type = (VehicleType)GB(this->window_number, 11, 5); this->owner = company; - /* Hide the widgets that we will not use in this window - * Some windows contains actions only fit for the owner */ - if (company == _local_company) { - this->HideWidget(VLW_WIDGET_OTHER_COMPANY_FILLER); - this->SetWidgetDisabledState(VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD); - } else { - this->SetWidgetsHiddenState(true, - VLW_WIDGET_AVAILABLE_VEHICLES, - VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, - VLW_WIDGET_STOP_ALL, - VLW_WIDGET_START_ALL, - VLW_WIDGET_EMPTY_BOTTOM_RIGHT, - WIDGET_LIST_END); - } - /* Set up the window widgets */ switch (this->vehicle_type) { case VEH_TRAIN: @@ -996,11 +981,24 @@ struct VehicleListWindow : public BaseVehicleListWindow { default: NOT_REACHED(); break; } - this->SetWidgetsDisabledState(this->vehicles.Length() == 0, + /* Hide the widgets that we will not use in this window + * Some windows contains actions only fit for the owner */ + this->SetWidgetsHiddenState(this->owner != _local_company, + VLW_WIDGET_AVAILABLE_VEHICLES, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, VLW_WIDGET_STOP_ALL, VLW_WIDGET_START_ALL, + VLW_WIDGET_EMPTY_BOTTOM_RIGHT, WIDGET_LIST_END); + this->SetWidgetHiddenState(VLW_WIDGET_OTHER_COMPANY_FILLER, this->owner == _local_company); + if (this->owner == _local_company) { + this->SetWidgetDisabledState(VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD); + this->SetWidgetsDisabledState(this->vehicles.Length() == 0, + VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, + VLW_WIDGET_STOP_ALL, + VLW_WIDGET_START_ALL, + WIDGET_LIST_END); + } this->DrawWidgets();