Mercurial > hg > openttd
changeset 3637:a8c73fd8a834 draft
(svn r4544) Merge two almost identical string (STR_1[08]00_LAND_SLOPED_IN_WRONG_DIRECTION) - one just contains two redundant words
| author | tron <tron@openttd.org> |
|---|---|
| date | Sun, 23 Apr 2006 15:01:46 +0000 |
| parents | 5e564dc2f774 |
| children | bcf3d5966548 |
| files | lang/american.txt lang/brazilian_portuguese.txt lang/catalan.txt lang/czech.txt lang/danish.txt lang/dutch.txt lang/english.txt lang/estonian.txt lang/finnish.txt lang/french.txt lang/galician.txt lang/german.txt lang/hungarian.txt lang/icelandic.txt lang/italian.txt lang/norwegian.txt lang/polish.txt lang/portuguese.txt lang/romanian.txt lang/slovak.txt lang/spanish.txt lang/swedish.txt lang/turkish.txt lang/unfinished/lithuanian.txt road_cmd.c |
| diffstat | 25 files changed, 1 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/lang/american.txt +++ b/lang/american.txt @@ -1443,7 +1443,6 @@ ##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
--- a/lang/brazilian_portuguese.txt +++ b/lang/brazilian_portuguese.txt @@ -1427,7 +1427,6 @@ ##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
--- a/lang/catalan.txt +++ b/lang/catalan.txt @@ -1426,7 +1426,6 @@ ##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
--- a/lang/czech.txt +++ b/lang/czech.txt @@ -1533,7 +1533,6 @@ ##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
--- a/lang/danish.txt +++ b/lang/danish.txt @@ -1441,7 +1441,6 @@ ##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
--- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1474,7 +1474,6 @@ ##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
--- a/lang/english.txt +++ b/lang/english.txt @@ -1481,7 +1481,6 @@ ##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
--- a/lang/estonian.txt +++ b/lang/estonian.txt @@ -1423,7 +1423,6 @@ ##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
--- a/lang/finnish.txt +++ b/lang/finnish.txt @@ -1442,7 +1442,6 @@ ##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
--- a/lang/french.txt +++ b/lang/french.txt @@ -1455,7 +1455,6 @@ ##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
--- a/lang/galician.txt +++ b/lang/galician.txt @@ -1412,7 +1412,6 @@ ##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
--- a/lang/german.txt +++ b/lang/german.txt @@ -1482,7 +1482,6 @@ ##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
--- a/lang/hungarian.txt +++ b/lang/hungarian.txt @@ -1546,7 +1546,6 @@ ##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
--- a/lang/icelandic.txt +++ b/lang/icelandic.txt @@ -1427,7 +1427,6 @@ ##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ú
--- a/lang/italian.txt +++ b/lang/italian.txt @@ -1481,7 +1481,6 @@ ##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
--- a/lang/norwegian.txt +++ b/lang/norwegian.txt @@ -1471,7 +1471,6 @@ ##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
--- a/lang/polish.txt +++ b/lang/polish.txt @@ -1568,7 +1568,6 @@ ##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
--- a/lang/portuguese.txt +++ b/lang/portuguese.txt @@ -1466,7 +1466,6 @@ ##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
--- a/lang/romanian.txt +++ b/lang/romanian.txt @@ -1427,7 +1427,6 @@ ##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
--- a/lang/slovak.txt +++ b/lang/slovak.txt @@ -1434,7 +1434,6 @@ ##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
--- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -1478,7 +1478,6 @@ ##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
--- a/lang/swedish.txt +++ b/lang/swedish.txt @@ -1443,7 +1443,6 @@ ##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
--- a/lang/turkish.txt +++ b/lang/turkish.txt @@ -1481,7 +1481,6 @@ ##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ç
--- a/lang/unfinished/lithuanian.txt +++ b/lang/unfinished/lithuanian.txt @@ -1379,7 +1379,6 @@ ##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
--- a/road_cmd.c +++ b/road_cmd.c @@ -386,7 +386,7 @@ } 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; }