From 4ad0c3cd75eac495268b0e158a2fb38554443029 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 23 Apr 2006 15:01:46 +0000 Subject: [PATCH] (svn r4544) Merge two almost identical string (STR_1[08]00_LAND_SLOPED_IN_WRONG_DIRECTION) - one just contains two redundant words --- lang/american.txt | 1 - lang/brazilian_portuguese.txt | 1 - lang/catalan.txt | 1 - lang/czech.txt | 1 - lang/danish.txt | 1 - lang/dutch.txt | 1 - lang/english.txt | 1 - lang/estonian.txt | 1 - lang/finnish.txt | 1 - lang/french.txt | 1 - lang/galician.txt | 1 - lang/german.txt | 1 - lang/hungarian.txt | 1 - lang/icelandic.txt | 1 - lang/italian.txt | 1 - lang/norwegian.txt | 1 - lang/polish.txt | 1 - lang/portuguese.txt | 1 - lang/romanian.txt | 1 - lang/slovak.txt | 1 - lang/spanish.txt | 1 - lang/swedish.txt | 1 - lang/turkish.txt | 1 - lang/unfinished/lithuanian.txt | 1 - road_cmd.c | 2 +- 25 files changed, 1 insertion(+), 25 deletions(-) diff --git a/lang/american.txt b/lang/american.txt index 9fccb15089..65455212f9 100644 --- a/lang/american.txt +++ b/lang/american.txt @@ -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 diff --git a/lang/brazilian_portuguese.txt b/lang/brazilian_portuguese.txt index 49da6b55dd..58d577d1e2 100644 --- a/lang/brazilian_portuguese.txt +++ b/lang/brazilian_portuguese.txt @@ -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 diff --git a/lang/catalan.txt b/lang/catalan.txt index b7644712ea..f79e673ea7 100644 --- a/lang/catalan.txt +++ b/lang/catalan.txt @@ -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 diff --git a/lang/czech.txt b/lang/czech.txt index e7f205d196..95ec8a3c56 100644 --- a/lang/czech.txt +++ b/lang/czech.txt @@ -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 diff --git a/lang/danish.txt b/lang/danish.txt index 181fbcc274..e5ce2be439 100644 --- a/lang/danish.txt +++ b/lang/danish.txt @@ -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 diff --git a/lang/dutch.txt b/lang/dutch.txt index e92fae3589..5a8845e71e 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -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 diff --git a/lang/english.txt b/lang/english.txt index ecd765e64a..ace41dd3e9 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -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 diff --git a/lang/estonian.txt b/lang/estonian.txt index c2e718479e..61997789a6 100644 --- a/lang/estonian.txt +++ b/lang/estonian.txt @@ -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 diff --git a/lang/finnish.txt b/lang/finnish.txt index fc86a4e80d..35ffbc1ffb 100644 --- a/lang/finnish.txt +++ b/lang/finnish.txt @@ -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 diff --git a/lang/french.txt b/lang/french.txt index 34ffb725fc..8b3289b100 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -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 diff --git a/lang/galician.txt b/lang/galician.txt index a63d2fb980..28e4d0282d 100644 --- a/lang/galician.txt +++ b/lang/galician.txt @@ -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 diff --git a/lang/german.txt b/lang/german.txt index 047a5f3a9f..7646ce3175 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -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 diff --git a/lang/hungarian.txt b/lang/hungarian.txt index 2c7f0c350e..470ce1571a 100644 --- a/lang/hungarian.txt +++ b/lang/hungarian.txt @@ -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 diff --git a/lang/icelandic.txt b/lang/icelandic.txt index 4488dbf142..f1ce2d201a 100644 --- a/lang/icelandic.txt +++ b/lang/icelandic.txt @@ -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ú diff --git a/lang/italian.txt b/lang/italian.txt index 2fff2a20c3..732e6c1f29 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -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 diff --git a/lang/norwegian.txt b/lang/norwegian.txt index 72ab441de1..f0734a79d6 100644 --- a/lang/norwegian.txt +++ b/lang/norwegian.txt @@ -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 diff --git a/lang/polish.txt b/lang/polish.txt index d3d3f49c58..e67ef8390f 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -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 diff --git a/lang/portuguese.txt b/lang/portuguese.txt index 45d22e642b..8ce8150841 100644 --- a/lang/portuguese.txt +++ b/lang/portuguese.txt @@ -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 diff --git a/lang/romanian.txt b/lang/romanian.txt index 3bf54c1330..6e3aa1d3aa 100644 --- a/lang/romanian.txt +++ b/lang/romanian.txt @@ -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 diff --git a/lang/slovak.txt b/lang/slovak.txt index e39e5d7fa5..eae64fed64 100644 --- a/lang/slovak.txt +++ b/lang/slovak.txt @@ -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 diff --git a/lang/spanish.txt b/lang/spanish.txt index af83ec2270..1b25c61f2d 100644 --- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -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 diff --git a/lang/swedish.txt b/lang/swedish.txt index d12748e9db..f2149da136 100644 --- a/lang/swedish.txt +++ b/lang/swedish.txt @@ -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 diff --git a/lang/turkish.txt b/lang/turkish.txt index 0405da97cd..32c67ecb07 100644 --- a/lang/turkish.txt +++ b/lang/turkish.txt @@ -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ç diff --git a/lang/unfinished/lithuanian.txt b/lang/unfinished/lithuanian.txt index d0f993d566..5c20755240 100644 --- a/lang/unfinished/lithuanian.txt +++ b/lang/unfinished/lithuanian.txt @@ -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 diff --git a/road_cmd.c b/road_cmd.c index 993a3ca41a..b4bf405784 100644 --- a/road_cmd.c +++ b/road_cmd.c @@ -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; }