diff options
| author | rubidium <rubidium@openttd.org> | 2007-10-05 22:10:15 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-10-05 22:10:15 +0000 |
| commit | af5399fa4142b86347599712927dcb373480eccc (patch) | |
| tree | ce797ef9cd52f9b32b8bef66a4d8d84b137aece9 | |
| parent | d92dbbb029036c6fc9ac921e541399abee4ffabd (diff) | |
| download | openttd-af5399fa4142b86347599712927dcb373480eccc.tar.xz | |
(svn r11213) -Fix [FS#1298]: confusing messages when trying to build a bridge.
39 files changed, 4 insertions, 40 deletions
diff --git a/src/lang/american.txt b/src/lang/american.txt index bcafa7292..96161d9c4 100644 --- a/src/lang/american.txt +++ b/src/lang/american.txt @@ -2017,7 +2017,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Unable t STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Must demolish tunnel first STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Must demolish bridge first STR_5008_CANNOT_START_AND_END_ON :{WHITE}Cannot start and end on same position -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Level land or water required under bridge STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Start and end must be in line STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Site unsuitable for tunnel entrance STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 64e3b95c9..7e0f3b817 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -2021,7 +2021,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Incapaz STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Necessário demolir o túnel primeiro STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Necessário demolir a ponte primeiro STR_5008_CANNOT_START_AND_END_ON :{WHITE}Impossível iniciar e terminar no mesmo ponto -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Debaixo da ponte é necessário um terreno plano ou água STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Inicio e fim necessitam estar alinhados STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}O local não é adequado para a entrada do túnel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 05d401e0a..22f374a2d 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2008,7 +2008,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Не м STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Първо разрушете тунела STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Първо трябва да разрушите моста STR_5008_CANNOT_START_AND_END_ON :{WHITE}Не може да започва и да свърша на едно и също място -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Равна земя или вода е необходима под моста STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Началото и краят трябва да са на една линия STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Мястото е неподходящо за вход на тунел STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index e8cbbfb26..0c0b77c3f 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -2017,7 +2017,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Impossib STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Primer has d'enderrocar el túnel STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Primer has d'enderrocar el pont STR_5008_CANNOT_START_AND_END_ON :{WHITE}No es pot començar i acabar a la mateixa posició -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Es necessita una certa elevació sobre el terreny o aigua sota el pont STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Inici i final han d'estar en línia recta STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Lloc inadequat per l'entrada del túnel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 59e6c28c2..f06a93154 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2019,7 +2019,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Ne mogu STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Najprije moraš srušiti tunel STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Najprije moraš srušiti most STR_5008_CANNOT_START_AND_END_ON :{WHITE}Početak i kraj ne mogu biti na istom mjestu -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Ispod mosta mora biti ravna zemlja ili voda STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Početak i kraj moraju biti u ravnini STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Neprikladan teren za ulaz u tunel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 5132afcbf..f07a22429 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2075,7 +2075,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Nemohu v STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Nutno nejprve zničit tunel STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Nutno nejprve zničit most STR_5008_CANNOT_START_AND_END_ON :{WHITE}Nelze začít a skončit na stejném místě -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Pod mostem je nutná rovná země nebo voda STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Začátek a konec musí být ve stejné výšce STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Místo nevhodné pro vjezd do tunelu STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index d36d922fb..2b5382cb1 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -2017,7 +2017,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Det er u STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Det er nødvendigt at rive tunnelen ned først STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Det er nødvendigt at rive broen ned først STR_5008_CANNOT_START_AND_END_ON :{WHITE}Kan ikke starte og slutte på samme position -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Der skal være fladt land eller vand under broen STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Start- og slutposition skal være på linje STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Dette sted er ikke brugbart til starten af en tunnel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 76b59055e..d9563ff22 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -2017,7 +2017,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Kan geen STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Tunnel moet eerst afgebroken worden STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Brug moet eerst afgebroken worden STR_5008_CANNOT_START_AND_END_ON :{WHITE}Kan niet beginnen en eindigen op dezelfde plaats -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Vlak land of water vereist onder brug STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Begin en einde moeten op een lijn staan STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Locatie ongeschikt voor ingang tunnel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/english.txt b/src/lang/english.txt index 9809dfa2d..1f8aa3d33 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2020,7 +2020,8 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Unable t STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Must demolish tunnel first STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Must demolish bridge first STR_5008_CANNOT_START_AND_END_ON :{WHITE}Cannot start and end in the same spot -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Level land or water required under bridge +STR_BRIDGEHEADS_NOT_SAME_HEIGHT :{WHITE}Bridge heads not at the same level +STR_BRIDGE_TOO_LOW_FOR_TERRAIN :{WHITE}Bridge is too low for the terrain STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Start and end must be in line STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Site unsuitable for tunnel entrance STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 0e124b0d0..d598ee9ce 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1910,7 +1910,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Ne eblas STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Antaŭe forigu tunelon STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Antaŭe forigu ponton STR_5008_CANNOT_START_AND_END_ON :{WHITE}Ne povas komenci kaj fini en la sama loko -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Ebena lando aŭ akvo necesas sub la ponto STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Komenco kaj fino devas esti samliniaj STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Nekonvena loko por tunelkomenco STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index acc978964..dacf9548e 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -2117,7 +2117,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Ei saa t STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Enne tuleb tunnel hävitada STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Enne tuleb sild hävitada STR_5008_CANNOT_START_AND_END_ON :{WHITE}Ei saa alata ja lõppeda samas kohas -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Silla otsade kõrgus peab sama olema STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Algus ja lõpp peavad samal joonel olema STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Koht ei sobi tunneli sissekäiguks STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 42f67795e..e361cdd27 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2016,7 +2016,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Maata ei STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Tunneli pitää tuhota ensin. STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Silta pitää tuhota ensin. STR_5008_CANNOT_START_AND_END_ON :{WHITE}Ei voi aloittaa ja lopettaa samasta paikkasta. -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Sillan alla pitää olla tasaista maata tai vettä. STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Alku- ja päätepisteen pitää olla linjassa. STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Tontti on sopimaton tunnelinsuulle. STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/french.txt b/src/lang/french.txt index f4160ba22..28a6d45de 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -2018,7 +2018,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Impossib STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Vous devez d'abord démolir le tunnel STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Vous devez d'abord démolir le pont STR_5008_CANNOT_START_AND_END_ON :{WHITE}Impossible de commencer et de terminer au même endroit -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Crevasse ou eau requise sous le pont STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Le début et la fin doivent être alignés STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Le site pour l'entrée du tunnel ne convient pas STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index c9cb7426b..8535a70f6 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1856,7 +1856,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Non se p STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Debes demole-lo túnel primeiro STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Debes demole-la ponte primeiro STR_5008_CANNOT_START_AND_END_ON :{WHITE}Non pode empezar e rematar na mesma posición -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Necesítase terreo nivelado ou auga baixo a ponte STR_500A_START_AND_END_MUST_BE_IN :{WHITE}O inicio e o final deben estar aliñados STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Emprazamento inadecuado para a entrada do túnel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/german.txt b/src/lang/german.txt index 2dbbf62e2..138485f17 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -2017,7 +2017,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Land kan STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Der Tunnel muss zuerst abgerissen werden STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Die Brücke muss erst abgerissen werden STR_5008_CANNOT_START_AND_END_ON :{WHITE}Anfang und Ende können nicht im selben Feld liegen -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Unter der Brücke ist ebenes Land oder Wasser erforderlich STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Anfang und Ende müssen auf einer Ebene liegen STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Platz ist nicht für einen Tunnel geeignet STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 403c0081f..4c4dd5d68 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2120,7 +2120,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Nem lehe STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Előbb le kell rombolnod az alagutat STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Előbb le kell rombolnod a hidat STR_5008_CANNOT_START_AND_END_ON :{WHITE}Nem kezdődhet és végződhet ugyanott -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Sima talaj vagy víz kell, hogy legyen a híd alatt STR_500A_START_AND_END_MUST_BE_IN :{WHITE}A kezdetének és a végének egy vonalban kell lennie STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Nem alkalmas a hely alagút bejáratának STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 037a5601f..bb0598099 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1877,7 +1877,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Get ekki STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Verður að eyða göngum fyrst STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Verður að eyða brú fyrst STR_5008_CANNOT_START_AND_END_ON :{WHITE}Getur ekki byrjað og endað á sama stað -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Sléttlendi eða vatn nauðsynlegt undir brú STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Verður að byrja og enda í sömu línu STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Óhentug staðsetning fyrir enda gangnanna STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 916001131..d05678544 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2019,7 +2019,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Impossib STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Bisogna demolire il tunnel prima STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Bisogna demolire il ponte prima STR_5008_CANNOT_START_AND_END_ON :{WHITE}Impossibile partire e finire nello stesso punto -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Sotto un ponte è richiesto terreno livellato o acqua STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Inizio e fine devono essere allineati STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Sito inadatto per l'entrata del tunnel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 5d144b272..3b9ab6306 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -2016,7 +2016,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}向こ STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}先にトンネルを破壊しなければなりません STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}先に橋を破壊しなければなりません STR_5008_CANNOT_START_AND_END_ON :{WHITE}開始点と終了点が同じ位置に建設できません -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}橋下に平地もしくは水がなければなりません STR_500A_START_AND_END_MUST_BE_IN :{WHITE}一直線の橋しか建設できません STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}この土地はトンネルの入り口に不適当です STR_500D :{GOLD}{STRING}、{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index e30b3c53c..8e8c11d18 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2011,7 +2011,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}지형 STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}터널을 먼저 제거하십시오 STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}다리를 먼저 제거하십시오 STR_5008_CANNOT_START_AND_END_ON :{WHITE}같은 위치에서 시작하고 끝낼 수 없습니다 -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}다리 아래에는 평평한 땅이나 물이 있어야 합니다! STR_500A_START_AND_END_MUST_BE_IN :{WHITE}시작과 끝은 한 줄 위에 있어야 합니다 STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}터널 입구에 알맞지 않은 장소입니다 STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 613e97c78..054e0e732 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1907,7 +1907,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Nepavyko STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Pirmiau reikia pasalinti tuneli STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Pirmiau reikia pasalinti tilta STR_5008_CANNOT_START_AND_END_ON :{WHITE}Negalima pradeti ir baigti tuo paciu metu -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Po tiltu turi buti lygi zeme arba vanduo STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Pradzia ir pabaiga turi buti vienoje linijoje STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Vieta netinkama įvaziavimui į tunelį STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index f4d13ccfc..3afdca15d 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1931,7 +1931,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Kan ikke STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Må rive tunnel først STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Må rive bro først STR_5008_CANNOT_START_AND_END_ON :{WHITE}Kan ikke starte og slutte på samme felt -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Flatt land eller vann trengs under broen STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Start og slutt må være på linje STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Feltet er upassende for tunnelinngang STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 64eaa14e5..35610c668 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2017,7 +2017,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Kan ikkj STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Må rive tunnel først STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Må rive bru først STR_5008_CANNOT_START_AND_END_ON :{WHITE}Kan ikkje starte og slutte på same felt -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Flatt land eller vatn trengst under brua STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Start og slutt må vere på linje STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Feltet er uhøveleg for tunnelinngang STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index fa8fef290..cdaaf0f15 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -2016,7 +2016,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Unablewa STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Ustmay emolishday unneltay irstfay STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Ustmay emolishday idgebray irstfay STR_5008_CANNOT_START_AND_END_ON :{WHITE}Annotcay artstay andway endway inway ethay amesay otspay -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Evellay andlay orway aterway equiredray underway idgebray STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Artstay andway endway ustmay ebay inway inelay STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Itesay unsuitableway orfay unneltay entranceway STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 6ef074cfa..f9a7033b8 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2127,7 +2127,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Nie moż STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Należy najpierw usunąć tunel STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Należy najpierw usunąć most STR_5008_CANNOT_START_AND_END_ON :{WHITE}Nie można zaczynać i kończyć w tym samym miejscu -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Wymagany równy ląd lub woda pod mostem STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Początek i koniec muszą być w jednej linii STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Nieodpowiednie miejsce na wejście tunelu STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index b9b817c0c..935ff5fd1 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1999,7 +1999,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Não é STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Deverá demolir o túnel primeiro STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Deverá demolir a ponte primeiro STR_5008_CANNOT_START_AND_END_ON :{WHITE}Não é posível iniciar e finalizar no mesmo ponto -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Debaixo da ponte é necessário terreno plano ou água STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Inicio e fim devem estar alinhados STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}O sítio não é adequado para a entrada do túnel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 3b1cc0cc5..80439d6ca 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -2017,7 +2017,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Terenul STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Mai întâi trebuie demolat tunelul STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Mai întâi trebuie demolat podul STR_5008_CANNOT_START_AND_END_ON :{WHITE}Cele două capete nu se pot situa în acelaşi loc -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Sub pod trebuie să existe teren plat sau apă STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Cele două capete trebuie să se situeze în linie STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Loc nepotrivit pentru intrarea într-un tunel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 9743de9b8..3b5a1af93 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2018,7 +2018,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Нево STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Сначала удалите туннель STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Сначала удалите мост STR_5008_CANNOT_START_AND_END_ON :{WHITE}Не может начинаться и заканчиваться в той же точке -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Более низкий уровень земли или воды должен быть под мостом STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Начало и конец должны быть на одной линии STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Неподходящее место для строительства туннеля STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index a6058390c..4b245f645 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1900,7 +1900,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}隧道 STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}必须先拆除隧道 STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}必须先拆除桥梁 STR_5008_CANNOT_START_AND_END_ON :{WHITE}起止点不能相同 -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}桥下必须有不平整的地面或水面 STR_500A_START_AND_END_MUST_BE_IN :{WHITE}起止两端必须在一条线上 STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}此处不适合作为隧道入口 STR_500D :{GOLD}{STRING}，{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index bc885f7a0..9ae53ca44 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2081,7 +2081,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Nemozno STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Tunel musi byt najskor zburany STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Most musi byt najskor zburany STR_5008_CANNOT_START_AND_END_ON :{WHITE}Nemozno zacat a skoncit na tom istom mieste -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Pod mostom je potrebná voda alebo údolie STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Zaciatok a koniec musi byt v rovine STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}To miesto je nepouzitelne ako vstup do tunela STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 4bb92d140..b25e8995f 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2097,7 +2097,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Nemogoč STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Najprej moraš porušiti predor STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Najprej moraš porušiti most STR_5008_CANNOT_START_AND_END_ON :{WHITE}Ni mogoče začeti in končati v isti točki -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Raven teren ali vodovje zahtevano pod mostom STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Začetek in konec morata biti na isti višini STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Lokacija neprimerna za vhod v predor STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 9f8411bd1..1b752e295 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2018,7 +2018,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}No se pu STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Primero debe demolerse el túnel STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Primero debe demolerse el puente STR_5008_CANNOT_START_AND_END_ON :{WHITE}No se puede comenzar y acabar en la misma posición -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Se requiere tierra a nivel o agua bajo el puente STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Comienzo y final deben estar en línea STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Lugar inapropiado para entrada de túnel STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 5d60f2ef9..63fbff229 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -2016,7 +2016,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Kan inte STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Måste riva tunnel först STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Måste riva bro först STR_5008_CANNOT_START_AND_END_ON :{WHITE}Kan inte börja och sluta på samma plats -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Platt land eller vatten krävs under bro STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Start- och slutpunkt måste ligga i linje STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Platsen passar inte för tunnelentré STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index f041114ec..023baaf6c 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2017,7 +2017,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}無法 STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}必須先摧毀隧道 STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}必須先摧毀橋樑 STR_5008_CANNOT_START_AND_END_ON :{WHITE}不能結束在開始地點 -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}橋樑下需要平地或水面 STR_500A_START_AND_END_MUST_BE_IN :{WHITE}開始與結束地點必須位在同一直線 STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}隧道入口地點不適合 STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 06380fa11..edd2e0039 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -2012,7 +2012,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Tünelin STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Önce tünel yıkılmalı STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Önce köprü yıkılmalı STR_5008_CANNOT_START_AND_END_ON :{WHITE}Aynı noktada başlayıp bitemez -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Köprü altınin düz olması gerekiyor STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Başlangıç ve bitiş aynı çizgi üzerinde olmalı STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Yer tünel girişi için uygun değil STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 525284124..c087cb93e 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2178,7 +2178,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Немо STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Спочатку зруйнуйте тунель STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Спочатку зруйнуйте міст STR_5008_CANNOT_START_AND_END_ON :{WHITE}Початок та кінець не можуть бути в одному місці -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Рівна земля чи вода має бути під мостом STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Початок та кінець мають бути на одній лінії STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Невідповідне місце для початку тунеля STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/unfinished/afrikaans.txt b/src/lang/unfinished/afrikaans.txt index c7d95a837..0d6342f7a 100644 --- a/src/lang/unfinished/afrikaans.txt +++ b/src/lang/unfinished/afrikaans.txt @@ -1808,7 +1808,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Kan nie STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Moet eers tonnel afbreek STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Moet eers brug afbreek STR_5008_CANNOT_START_AND_END_ON :{WHITE}Kan nie in die selfde plek begin en eindig nie -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Platte land of water benooding onder brug STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Begin en einde moet in lyn wees STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Plek ongeskik vir tonnel ingang STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt index 314b5b957..be04cf620 100644 --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -1640,7 +1640,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Αδύν STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Πρέπει πρώτα να καταστραφεί το τούνελ STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Πρέπει πρώτα να καταστραφεί η γέφυρα STR_5008_CANNOT_START_AND_END_ON :{WHITE}Δεν γίνεται να ξεκινάει και να τελειώνει στο ίδιο σημείο -STR_5009_LEVEL_LAND_OR_WATER_REQUIRED :{WHITE}Απαιτείται επίπεδο έδαφος ή νερό κάτω από τη γέφυρα STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Η αρχή και το τέλος πρέπει να είναι σε ευθεία STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Ακατάλληλη τοποθεσία για είσοδο τούνελ STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY} diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 020d8b360..bfde141c4 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -256,7 +256,7 @@ CommandCost CmdBuildBridge(TileIndex end_tile, uint32 flags, uint32 p1, uint32 p if (IsSteepSlope(tileh_end)) z_end += TILE_HEIGHT; if (HASBIT(BRIDGE_FULL_LEVELED_FOUNDATION, tileh_end)) z_end += TILE_HEIGHT; - if (z_start != z_end) return_cmd_error(STR_5009_LEVEL_LAND_OR_WATER_REQUIRED); + if (z_start != z_end) return_cmd_error(STR_BRIDGEHEADS_NOT_SAME_HEIGHT); /* Towns are not allowed to use bridges on slopes. */ allow_on_slopes = (!_is_old_ai_player @@ -367,7 +367,7 @@ CommandCost CmdBuildBridge(TileIndex end_tile, uint32 flags, uint32 p1, uint32 p for (tile = tile_start + delta; tile != tile_end; tile += delta) { uint z; - if (GetTileSlope(tile, &z) != SLOPE_FLAT && z >= z_start) return_cmd_error(STR_5009_LEVEL_LAND_OR_WATER_REQUIRED); + if (GetTileSlope(tile, &z) != SLOPE_FLAT && z >= z_start) return_cmd_error(STR_BRIDGE_TOO_LOW_FOR_TERRAIN); if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile) && !replace_bridge) { /* Disallow crossing bridges for the time being */ |