mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r4544) Merge two almost identical string (STR_1[08]00_LAND_SLOPED_IN_WRONG_DIRECTION) - one just contains two redundant words

This commit is contained in:
tron 2006-04-23 15:01:46 +00:00
parent 0347fb2ab6
commit 4ad0c3cd75
25 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/american.txt
View File

@ -1443,7 +1443,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Railroad track
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Land sloped in wrong direction for road
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Must remove road first
STR_1802_ROAD_CONSTRUCTION :{WHITE}Road Construction
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Select Road Bridge

1
lang/brazilian_portuguese.txt
View File

@ -1427,7 +1427,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Ferrovia com si
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Terreno inclinado na direção incorreta para a estrada
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Deverá remover a estrada primeiro
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construir Estradas
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Selecionar Ponte de Estrada

1
lang/catalan.txt
View File

@ -1426,7 +1426,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :V
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Terreny inclinat en direcció incorrecta per la carretera
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}S'ha de treure la carretera primer
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construcció de Carreteres
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Selecciona Pont per Carretera

1
lang/czech.txt
View File

@ -1533,7 +1533,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Zeleznicni trat
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Nesprávný sklon zeme pro silnici
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Musí¨ nejprve odstranit silnici
STR_1802_ROAD_CONSTRUCTION :{WHITE}Výstavba silnic
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Zvolit silnicni most

1
lang/danish.txt
View File

@ -1441,7 +1441,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Togskinner med
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Landet hælder i en forkert retning til byggning af vej
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Det er nødvendigt at fjerne vejen først
STR_1802_ROAD_CONSTRUCTION :{WHITE}Vej Konstruktion
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Vælg vejbro

1
lang/dutch.txt
View File

@ -1474,7 +1474,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Spoor met combi
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Land heeft helling in verkeerde richting voor weg
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Moet weg eerst weghalen
STR_1802_ROAD_CONSTRUCTION :{WHITE}Wegenbouw
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Kies brug

1
lang/english.txt
View File

@ -1481,7 +1481,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Railway track w
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Land sloped in wrong direction for road
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Must remove road first
STR_1802_ROAD_CONSTRUCTION :{WHITE}Road Construction
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Select Road Bridge

1
lang/estonian.txt
View File

@ -1423,7 +1423,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Raudtee kombo-s
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Maapind on tee ehitamiseks sobimatu kaldega
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Enne on vaja tee eemaldada
STR_1802_ROAD_CONSTRUCTION :{WHITE}Tee ehitamine
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Vali sillatüüp

1
lang/finnish.txt
View File

@ -1442,7 +1442,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Rautatie yhdist
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Maa viettää väärään suuntaan.
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Tie pitää siirtää ensin.
STR_1802_ROAD_CONSTRUCTION :{WHITE}Tien rakentaminen
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Valitse maantiesilta

1
lang/french.txt
View File

@ -1455,7 +1455,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Rails avec des
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Terrain en pente dans la mauvaise direction pour des routes
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Doit d'abord retirer la route
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construction routière
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Choisir Pont Routier

1
lang/galician.txt
View File

@ -1412,7 +1412,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Via de ferrocar
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Terreo inclinado na direccion incorrecta para a estrada
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Debes elimina-la estrada primeiro
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construcción de Estradas
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Selecciona a Ponte

1
lang/german.txt
View File

@ -1482,7 +1482,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Gleis mit kombi
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Das Land neigt sich in die falsche Richtung
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Straße muss erst entfernt werden
STR_1802_ROAD_CONSTRUCTION :{WHITE}Straßenbau
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Brücke wählen

1
lang/hungarian.txt
View File

@ -1546,7 +1546,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Vas
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Rossz irányba lejt a föld
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Elõbb le kell rombolnod az utat
STR_1802_ROAD_CONSTRUCTION :{WHITE}Útépítés
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Közúti híd építése

1
lang/icelandic.txt
View File

@ -1427,7 +1427,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Lestarteinn me
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Land hallar í ranga átt fyrir vegagerð
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Verður að fjarlægja veg fyrst
STR_1802_ROAD_CONSTRUCTION :{WHITE}Vegagerð
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Veldu vegabrú

1
lang/italian.txt
View File

@ -1481,7 +1481,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Binario ferrovi
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Terreno inclinato nella direzione errata
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Devi rimuovere la strada prima
STR_1802_ROAD_CONSTRUCTION :{WHITE}Costruzione Strade
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Seleziona ponte stradale

1
lang/norwegian.txt
View File

@ -1471,7 +1471,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Jernbanespor me
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Feltet heller feil vei for veibygging
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Må fjerne vei først
STR_1802_ROAD_CONSTRUCTION :{WHITE}Bygg vei
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Velg brotype

1
lang/polish.txt
View File

@ -1568,7 +1568,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Tory kolejowe z
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Teren pochylony w zla strone
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Trzeba usunac najpierw droge
STR_1802_ROAD_CONSTRUCTION :{WHITE}Tworzenie drog
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Wybierz most drogowy

1
lang/portuguese.txt
View File

@ -1466,7 +1466,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Caminhos-de-fer
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Terreno inclinado na direcção incorrecta para a estrada
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Deverá remover a estrada primeiro
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construir Estradas
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Seleccionar Ponte de Estrada

1
lang/romanian.txt
View File

@ -1427,7 +1427,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Cale ferat
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Terenul are o înclinatie nepotrivită pentru o sosea
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Mai întâi trebuie demolată soseaua
STR_1802_ROAD_CONSTRUCTION :{WHITE}Constructii rutiere
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Alege pod rutier

1
lang/slovak.txt
View File

@ -1434,7 +1434,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Zeleznicne kola
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Teren ma nevhodny sklon pre stavbu cesty
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Cesta musi byt najskor odstranena
STR_1802_ROAD_CONSTRUCTION :{WHITE}Vystavba cesty
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Vyber cestny most

1
lang/spanish.txt
View File

@ -1478,7 +1478,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :V
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Tierra inclinada en dirección errónea para carretera
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Ha de retirar carretera primero
STR_1802_ROAD_CONSTRUCTION :{WHITE}Construcción de carretera
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Elige puente de carretera

1
lang/swedish.txt
View File

@ -1443,7 +1443,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :J
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Marken lutar åt fel håll för väg
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Måste ta bort väg först
STR_1802_ROAD_CONSTRUCTION :{WHITE}Bygg väg
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Välj vägbro

1
lang/turkish.txt
View File

@ -1481,7 +1481,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Arazi yol yapimi için uygun egimli degil
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Önce yol silinmeli
STR_1802_ROAD_CONSTRUCTION :{WHITE}Yol Yapimi
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Köprü Seç

1
lang/unfinished/lithuanian.txt
View File

@ -1379,7 +1379,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Gelezinkelio be
##id 0x1800
STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Langelio nuolydis blogos krypties
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Pirmiausia pasalink kelia
STR_1802_ROAD_CONSTRUCTION :{WHITE}Kelio tiesimas
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Pasirink tilto tipa

2
road_cmd.c
View File

@ -386,7 +386,7 @@ do_clear:;
}
ret = CheckRoadSlope(tileh, &pieces, existing);
if (CmdFailed(ret)) return_cmd_error(STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION);
if (CmdFailed(ret)) return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
if (ret != 0 && (!_patches.build_on_slopes || _is_old_ai_player)) {
return CMD_ERROR;
}