diff options
| author | rubidium <rubidium@openttd.org> | 2010-02-26 10:08:16 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-02-26 10:08:16 +0000 |
| commit | 45f34a42038665db891c27ef697b3a4bd2974f70 (patch) | |
| tree | 7b8b2066013d0bae1c06a9a15fe26d6e250c0f66 | |
| parent | eb220617d555925879a9e81a7911769b8f6c5a9d (diff) | |
| download | openttd-45f34a42038665db891c27ef697b3a4bd2974f70.tar.xz | |
(svn r19265) -Fix [FS#3618]: "Can't build <industry> here... <industry> in the way" showed the to-be-built industry twice, instead of the to-be-built industry and the industry that's in the way
49 files changed, 49 insertions, 49 deletions
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 3149862b6..ec52c15b0 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -477,7 +477,7 @@ static CommandCost ClearTile_Industry(TileIndex tile, DoCommandFlag flags) (_current_company == OWNER_WATER && ((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) || HasBit(GetIndustryTileSpec(GetIndustryGfx(tile))->slopes_refused, 5)))) { - SetDParam(0, indspec->name); + SetDParam(1, indspec->name); return_cmd_error(flags & DC_AUTO ? STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY : INVALID_STRING_ID); } diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 604b9fdb0..8c1e7fda3 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -3334,7 +3334,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...alree STR_ERROR_OWNED_BY :{WHITE}...besit deur {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...gebied is besit deur 'n ander maatskappy STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Naam moet unike wees -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} in die pad +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in die pad # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} plaaslike raad weier om dit te toelaat diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 5065c848a..5b7233bfd 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...تم STR_ERROR_OWNED_BY :{WHITE} مملوكة من قبل ... {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...المنطقة مملوكة لشركة منافسة STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}السم يجب ان يكون فريدا - غير مستخدم -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} على الطريق +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} على الطريق # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}بلدية المدينة ترفض السماح بهذا diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 205d826e1..9b53494de 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3334,7 +3334,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...já c STR_ERROR_OWNED_BY :{WHITE}...propriedade de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...a área é propriedade de outra empresa STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nome deve ser único -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} no caminho +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} no caminho # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}A autoridade local de {TOWN} não autoriza diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 6649e57ce..bfa71274d 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -3305,7 +3305,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...ве STR_ERROR_OWNED_BY :{WHITE}...собственост на {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...земята е притежание на друга компания STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Името трябва да е уникално -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} пречи +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} пречи # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} местните власти отказват да позволят това diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 329dd85c2..dfbd455e3 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -3334,7 +3334,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... ja c STR_ERROR_OWNED_BY :{WHITE}... propietat de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... l'àrea és propietat d'una altra companyia STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}El nom ha de ser únic -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} en el camí +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} en el camí # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Les autoritats locals de {TOWN} no permeten fer això diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 67a50cf4c..190fb431d 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -3429,7 +3429,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...već STR_ERROR_OWNED_BY :{WHITE}...u vlasništvu {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...područje je u vlasništvu druge tvrtke STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Ime mora biti jedinstveno -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} na putu +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} na putu # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} lokalna samouprava odbija to dopustiti diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 0242acf70..c65cf2854 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -3405,7 +3405,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... již STR_ERROR_OWNED_BY :{WHITE}... vlastněno {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... území vlastní jiná společnost STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Jméno musí být jedinečné -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} v cestě +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} v cestě # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Místní správa města {TOWN} odmítla vydat povolení. diff --git a/src/lang/danish.txt b/src/lang/danish.txt index fd3d736a4..7211c787c 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...aller STR_ERROR_OWNED_BY :{WHITE}... ejes af {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... området ejes af et andet selskab STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Navnet skal være unikt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} i vejen +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} i vejen # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} de lokale myndigheder nægter at tillade dette diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 556d916f8..7c01f5952 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... reed STR_ERROR_OWNED_BY :{WHITE}... is eigendom van {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... gebied is van ander bedrijf STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Naam moet uniek zijn -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} in de weg +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in de weg # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}De gemeenteraad van {TOWN} staat dit niet toe diff --git a/src/lang/english.txt b/src/lang/english.txt index 643b518c0..cd1a90a34 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... alre STR_ERROR_OWNED_BY :{WHITE}... owned by {STRING2} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... area is owned by another company STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} in the way +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in the way # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} local authority refuses to allow this diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 9737fddb4..446c45b7b 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... alre STR_ERROR_OWNED_BY :{WHITE}... owned by {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... area is owned by another company STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} in the way +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in the way # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} local authority refuses to allow this diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 48afce236..f44ba2a20 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -3007,7 +3007,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... jam STR_ERROR_OWNED_BY :{WHITE}... posedata de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... regiono estas posedata de alia kompanio STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nomo devas esti ununura -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} okupas la lokon +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} okupas la lokon # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}La loka estraro de {TOWN} rifuzas permesi ĉi tion diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index dec7a0364..7f22b0ff8 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -3367,7 +3367,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...juba STR_ERROR_OWNED_BY :{WHITE}...omanik on {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...ala kuulub teisele ettevõttele STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nime ei tohi korduda -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} on ees +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} on ees # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} kohalik omavalitsus keeldub seda lubamast diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index f4c61ac1c..d1c2e8e68 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...se on STR_ERROR_OWNED_BY :{WHITE}... omistaja: {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... alueen omistaa toinen yhtiö STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nimen täytyy olla uniikki -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} on tiellä. +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} on tiellä. # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}: paikallisviranomaiset kieltäytyvät. diff --git a/src/lang/french.txt b/src/lang/french.txt index 345fac9d0..95b6e34a0 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3334,7 +3334,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... déj STR_ERROR_OWNED_BY :{WHITE}... appartient à {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... appartient à une autre compagnie STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Le nom doit être unique -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} présente +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} présente # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}La municipalité de {TOWN} refuse cette opération diff --git a/src/lang/galician.txt b/src/lang/galician.txt index bbc43e0ac..a122db4d1 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -3271,7 +3271,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...xa es STR_ERROR_OWNED_BY :{WHITE}...é propiedade de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...a área é propiedade doutra compañía STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}O nome debe ser único -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} no camiño +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} no camiño # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}: a autoridade local négase a permitilo diff --git a/src/lang/german.txt b/src/lang/german.txt index 88a8fc934..1a8c2c1a2 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3334,7 +3334,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... ist STR_ERROR_OWNED_BY :{WHITE}... Eigentum von {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... Gelände gehört einer anderen Firma STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Name bereits vergeben -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} im Weg +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} im Weg # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Die Stadtverwaltung von {TOWN} erteilt keine Genehmigung diff --git a/src/lang/greek.txt b/src/lang/greek.txt index ec7adfd49..451138920 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -3428,7 +3428,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... ήδ STR_ERROR_OWNED_BY :{WHITE}... ιδιοκτησία του {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... αυτή η περιοχή είναι ιδιοκτησία άλλης εταιρίας STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Το όνομα πρέπει να είναι μοναδικό -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} στη μέση +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} στη μέση # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Οι τοπικές αρχές της πόλης {TOWN} δεν το επιτρέπουν diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 314ea396f..2b36a62aa 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -3347,7 +3347,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... כב STR_ERROR_OWNED_BY :{WHITE}... בבעלות {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... השטח בבעלותה של חברה אחרת STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}השם חייב להיות ייחודי -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}חוסם את הדרך {STRING} +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}חוסם את הדרך {1:STRING} # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE} הרשות המקומית של {TOWN} מתנגדת לפעולה זו diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 91e38ef4f..1b27abf69 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -3367,7 +3367,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...már STR_ERROR_OWNED_BY :{WHITE}... {STRING} tulajdona STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...a terület más cégé STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}A névnek egyedinek kell lennie -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}...{STRING} van az útban +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}...{1:STRING} van az útban # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} önkormányzata nem engedélyezi diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 0b35de0e0..27d9d0449 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -3217,7 +3217,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...nú STR_ERROR_OWNED_BY :{WHITE}...í eigu {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...svæðið er í eigu annars fyrirtækis STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nafnið verður að vera sérstætt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} er fyrir +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} er fyrir # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} bæjaryfirvöld leyfa þetta ekki diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index af964633a..aeba84d91 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...sudah STR_ERROR_OWNED_BY :{WHITE}...dimiliki oleh {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...area ini dimiliki oleh perusahaan lain STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nama haruslah unik -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :terhalang {WHITE}{STRING} +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :terhalang {WHITE}{1:STRING} # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Pemkot {TOWN} tidak mengijinkan anda melakukan ini diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 21d8badbe..bfeabc0e4 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3335,7 +3335,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... già STR_ERROR_OWNED_BY :{WHITE}... posseduto da {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... l'area appartiene a un'altra compagnia STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Il nome deve essere univoco -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} di mezzo +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} di mezzo # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}L'autorità locale di {TOWN} non lo autorizza diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index de666c3f7..121ee49e9 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -3237,7 +3237,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...す STR_ERROR_OWNED_BY :{WHITE}...所有者は {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...この土地は他の会社に所有されています STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}名前は唯一でなければなりません -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING}があります +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING}があります # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}の町議会が拒否しました。 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index abd5a987c..25d40e3b0 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -3334,7 +3334,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...이 STR_ERROR_OWNED_BY :{WHITE}... {STRING}의 소유입니다. STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...다른 회사의 소유지입니다! STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}이름은 유일해야 합니다 -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}중간에 {STRING}{G 0 "이" "가"} 있습니다. +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}중간에 {1:STRING}{G 1 "이" "가"} 있습니다. # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}에 대한 낮은 성취도로 인해 지역당국이 이 행위를 거절했습니다! diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 4ae6458e2..b2d96c79d 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -3237,7 +3237,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...jau u STR_ERROR_OWNED_BY :{WHITE}... pieder {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... zemes gabals pieder citam uzņēmumam STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Vārdam jābūt unikālam -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} traucē +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} traucē # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} vietējā pašvaldība neatļauj šādu rīcību diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 0134abdd6..1eed15902 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -3401,7 +3401,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... jau STR_ERROR_OWNED_BY :{WHITE}... priklauso {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... ši žemė priklauso kitai įmonei STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Vardas turi būti unikalus -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} kelyje +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} kelyje # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} vietos valdžia neleidžia diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 4a1f33547..424073ca2 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...schon STR_ERROR_OWNED_BY :{WHITE}...am Besëtz vun {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...d'Plaz ass am Besëtz vun enger aanerer Firma STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Numm muss eenzegartëg sinn -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} am Wee +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} am Wee # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} d'Gemeng wëll dat net erlaaben diff --git a/src/lang/malay.txt b/src/lang/malay.txt index f2e7f1da6..b5045dce5 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -3052,7 +3052,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... suda STR_ERROR_OWNED_BY :{WHITE}... dimiliki oleh {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... kawasan dimiliki oleh syarikat lain STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nama mesti unik -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} menghalang +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} menghalang # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} majlis tempatan tidak membenarkannya diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 6a1456062..5e771aba9 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... alle STR_ERROR_OWNED_BY :{WHITE}... eies av {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... området eies av et annet firma STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Navn må være unikt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} er i veien +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} er i veien # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}s bystyre nekter deg å gjøre dette. diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 45bd0b080..bae24782e 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -3334,7 +3334,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... alle STR_ERROR_OWNED_BY :{WHITE}... eigd av {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... feltet er eigd av eit anna firma STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Namnet må vera unikt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} er i vegen +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} er i vegen # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Bystyret i {TOWN} nektar deg å gjere dette diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 51e670746..466a26cda 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3713,7 +3713,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...już STR_ERROR_OWNED_BY :{WHITE}...w posiadaniu {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...teren jest własnością innej firmy STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nazwa nie może się powtarzać -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} na drodze +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} na drodze # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Lokalne władze {TOWN} nie pozwalają na to diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 3a6ccaf23..c34d0fb74 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... já STR_ERROR_OWNED_BY :{WHITE}... propriedade de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... a área é propriedade de outra empresa STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nome deve ser único -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} no caminho +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} no caminho # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}A autoridade local de {TOWN} não autoriza diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index ef02d65e6..5145cb36e 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...deja STR_ERROR_OWNED_BY :{WHITE}...apartine companiei {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...terenul se află în proprietatea altei companii STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Numele trebuie să fie unic -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} în cale +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} în cale # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Autorităţile locale din {TOWN} refuză să permită această acţiune diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 75707c615..2e350f71b 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -3512,7 +3512,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... уж STR_ERROR_OWNED_BY :{WHITE}... принадлежит {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... область принадлежит другой компании STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Имя должно быть уникальным -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} на пути +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} на пути # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}...администрация города {TOWN} запрещает вам это делать diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 9fd5b7282..85a729ca5 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -3528,7 +3528,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...već STR_ERROR_OWNED_BY :{WHITE}...je u vlasništvu igrača {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...zemljište je u vlasništvu drugog preduzeća STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Naziv mora biti jedinstven -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} je na putu +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} je na putu # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} vlast odbija da izda dozvolu diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 43b82e41e..1961ffe4c 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3312,7 +3312,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... 已 STR_ERROR_OWNED_BY :{WHITE} 归 {STRING} 所有 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... 此区域由另一公司所有 STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}名称重复!请重新命名. -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}目标位置有 {STRING} +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}目标位置有 {1:STRING} # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} 地方政府不批准此操作…… diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index af0852cfd..d0ae74154 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -3400,7 +3400,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... uz b STR_ERROR_OWNED_BY :{WHITE}... vlastníkom je {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... oblasť vlastní iná spoločnosť STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Meno musí byt jedinecné -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} v ceste +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} v ceste # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Miestna správa {TOWN} to nedovolí diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index f42383a1c..d9f8edbf0 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -3375,7 +3375,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... že STR_ERROR_OWNED_BY :{WHITE}... v lasti {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... zemljišče je last drugega podjetja STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Ime mora biti edinstveno -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} na poti +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} na poti # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} mestna oblast tega ne dovoli diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index a06b384f6..7c0c89e9a 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3334,7 +3334,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... ya c STR_ERROR_OWNED_BY :{WHITE}... propiedad de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... otra empresa posee esta área STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}El nombre debe ser único -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} en medio +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} en medio # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Las autoridades locales de {TOWN} rechazan esto diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index b9fdb038b..aa5dfd303 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... reda STR_ERROR_OWNED_BY :{WHITE}... ägs av {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... området ägs av ett annat företag STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Namnet måste vara unikt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} i vägen +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} i vägen # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} de lokala myndigheterna tillåter inte detta diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index b2e17412b..4139cfb93 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... 已 STR_ERROR_OWNED_BY :{WHITE}... 所有者是 {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... 此區域屬於其它公司所有 STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}名稱必須是唯一的 -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}被 {STRING} 擋住 +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}被 {1:STRING} 擋住 # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} 地方政府不同意 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index b478379c3..0aabea86d 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -3334,7 +3334,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... zate STR_ERROR_OWNED_BY :{WHITE}... sahibi {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... alan başka bir şirkete ait STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}İsim daha önce kullanılmamış olmalı -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}yolda {STRING} var +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}yolda {1:STRING} var # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} belediyesi buna izin vermiyor diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index d0cd8cad3..ab998e192 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -3454,7 +3454,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... вж STR_ERROR_OWNED_BY :{WHITE}... власність {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... ділянка у власності іншої компанії STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Назва має бути унікальною -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} на шляху +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} на шляху # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Влада міста {TOWN} проти цього diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index fe9df386a..0827d4a3b 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -1791,7 +1791,7 @@ STR_ERROR_SITE_UNSUITABLE :{WHITE}...terre STR_ERROR_ALREADY_BUILT :{WHITE}...is al bout STR_ERROR_OWNED_BY :{WHITE}...is fan {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...gebiet is fan in oar bedriuw -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} yn it paad +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} yn it paad # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} gemiente stiet dit net ta diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 79c5a86e3..f81d64ed9 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -3333,7 +3333,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... đã STR_ERROR_OWNED_BY :{WHITE}... sở hữu bởi {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... vùng này sở hữu bởi công ty khác STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Tên phải không trùng lặp -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} đang có trên đường +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} đang có trên đường # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Chính quyền {TOWN} từ chối bạn làm việc này diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index ff370126f..eccd5fe34 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -3220,7 +3220,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...eisoe STR_ERROR_OWNED_BY :{WHITE}...eiddo {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...mae'r ardal yn eiddo i gwmni arall STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Rhaid i'r enw fod yn unigryw -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} yn y ffordd +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} yn y ffordd # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Nid yw awdurdod lleol {TOWN}yn caniatáu hyn diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 8ca62a8df..40e28e7c4 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -3419,7 +3419,7 @@ CommandCost ClearTile_Station(TileIndex tile, DoCommandFlag flags) case STATION_BUOY: return_cmd_error(STR_ERROR_BUOY_IN_THE_WAY); case STATION_DOCK: return_cmd_error(STR_ERROR_MUST_DEMOLISH_DOCK_FIRST); case STATION_OILRIG: - SetDParam(0, STR_INDUSTRY_NAME_OIL_RIG); + SetDParam(1, STR_INDUSTRY_NAME_OIL_RIG); return_cmd_error(STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY); } } |