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

2025-08-26 16:09:10 +00:00 · 2006-04-23 15:01:46 +00:00
parent 0347fb2ab6
commit 4ad0c3cd75
25 changed files with 1 additions and 25 deletions
--- 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
--- 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<72><65>o incorreta para a estrada
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Dever<65> 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 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :V


 ##id 0x1800
-STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Terreny inclinat en direcci<63> incorrecta per la carretera
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}S'ha de treure la carretera primer
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construcci<63> de Carreteres
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Selecciona Pont per Carretera
--- 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<70>vn<76> sklon zeme pro silnici
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Mus<75><73> 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 @@ 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
--- 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
--- 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
--- 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<61><74>p
--- 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<74><74> v<><76>r<EFBFBD><72>n suuntaan.
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Tie pit<69><74> siirt<72><74> 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 @@ 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<74>re
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Choisir Pont Routier
--- 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<63>n de Estradas
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Selecciona a Ponte
--- 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<72>e muss erst entfernt werden
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Stra<72>enbau
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Br<42>cke w<>hlen
--- 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<69>nyba lejt a f<>ld
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}El<45>bb le kell rombolnod az utat
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}<7D>t<EFBFBD>p<EFBFBD>t<EFBFBD>s
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}K<>z<EFBFBD>ti h<>d <20>p<EFBFBD>t<EFBFBD>se
--- 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 <20> ranga <20>tt fyrir vegager<65>
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Ver<65>ur a<> fjarl<72>gja veg fyrst
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Vegager<65>
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Veldu vegabr<62>
--- 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
--- 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
--- 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
--- 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<65><63>o incorrecta para a estrada
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Dever<65> 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 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Cale ferat


 ##id 0x1800
-STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Terenul are o <20>nclinatie nepotrivit<69> pentru o sosea
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Mai <20>nt<6E>i trebuie demolat<61> 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 @@ 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
--- 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<63>n err<72>nea para carretera
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Ha de retirar carretera primero
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construcci<63>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 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :J


 ##id 0x1800
-STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Marken lutar <20>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 @@ 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}<7D>nce yol silinmeli
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Yol Yapimi
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}K<>pr<70> Se<53>
--- 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
--- 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;
 	}