Mercurial > hg > openttd

changeset 10114:85931c67ed00 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r14298) -Fix [FS#2214]: "{CARGO} from unknown destination".
author rubidium <rubidium@openttd.org>
date Fri, 12 Sep 2008 17:16:04 +0000
parents 585f9b901236
children 58807491379d
files src/lang/afrikaans.txt src/lang/brazilian_portuguese.txt src/lang/bulgarian.txt src/lang/catalan.txt src/lang/croatian.txt src/lang/czech.txt src/lang/danish.txt src/lang/dutch.txt src/lang/english.txt src/lang/english_US.txt src/lang/esperanto.txt src/lang/estonian.txt src/lang/finnish.txt src/lang/french.txt src/lang/galician.txt src/lang/german.txt src/lang/hungarian.txt src/lang/icelandic.txt src/lang/italian.txt src/lang/japanese.txt src/lang/korean.txt src/lang/lithuanian.txt src/lang/norwegian_bokmal.txt src/lang/norwegian_nynorsk.txt src/lang/piglatin.txt src/lang/polish.txt src/lang/portuguese.txt src/lang/romanian.txt src/lang/russian.txt src/lang/simplified_chinese.txt src/lang/slovak.txt src/lang/slovenian.txt src/lang/spanish.txt src/lang/swedish.txt src/lang/traditional_chinese.txt src/lang/turkish.txt src/lang/ukrainian.txt src/strings.cpp
diffstat 38 files changed, 2 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -2632,7 +2632,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ongeldig Opdrag)
 
-STR_UNKNOWN_DESTINATION                                         :onbekende destinasie
 STR_8812_EMPTY                                                  :{LTBLUE}Leë
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} vanaf {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} van {STATION} (x{NUM})
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -2785,7 +2785,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ordem Inválida)
 
-STR_UNKNOWN_DESTINATION                                         :destino desconhecido
 STR_8812_EMPTY                                                  :{LTBLUE}Vazio
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} de {STATION} (x{NUM})
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -2760,7 +2760,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Невалидна заповед)
 
-STR_UNKNOWN_DESTINATION                                         :неизвестно назначение
 STR_8812_EMPTY                                                  :{LTBLUE}Празен
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} от {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} от {STATION} (x{NUM})
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -2785,7 +2785,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ordre incorrecte)
 
-STR_UNKNOWN_DESTINATION                                         :destí desconegut
 STR_8812_EMPTY                                                  :{LTBLUE}Buit
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} procedent{P "" s} de {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} des de {STATION} (x{NUM})
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -2689,7 +2689,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Neispravna naredba)
 
-STR_UNKNOWN_DESTINATION                                         :nepoznato odredište
 STR_8812_EMPTY                                                  :{LTBLUE}Prazan
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} iz {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} iz {STATION} (x{NUM})
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -2854,7 +2854,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (neplatný příkaz)
 
-STR_UNKNOWN_DESTINATION                                         :neznámý cíl
 STR_8812_EMPTY                                                  :{LTBLUE}Prázdný
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} z {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} z {STATION} (x{NUM})
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -2782,7 +2782,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ugyldig Order)
 
-STR_UNKNOWN_DESTINATION                                         :ukendt destination
 STR_8812_EMPTY                                                  :{LTBLUE}Tom
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} fra {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} fra {STATION} (x{NUM})
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -2791,7 +2791,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ongeldige Order)
 
-STR_UNKNOWN_DESTINATION                                         :onbekende bestemming
 STR_8812_EMPTY                                                  :{LTBLUE}Leeg
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} van {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} van {STATION} (x{NUM})
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -2791,7 +2791,7 @@
 
 STR_INVALID_ORDER                                               :{RED} (Invalid Order)
 
-STR_UNKNOWN_DESTINATION                                         :unknown destination
+STR_UNKNOWN_STATION                                             :unknown station
 STR_8812_EMPTY                                                  :{LTBLUE}Empty
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} from {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} from {STATION} (x{NUM})
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -2626,7 +2626,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Invalid Order)
 
-STR_UNKNOWN_DESTINATION                                         :unknown destination
 STR_8812_EMPTY                                                  :{LTBLUE}Empty
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} from {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} from {STATION} (x{NUM})
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -2492,7 +2492,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Nevalida Ordeno)
 
-STR_UNKNOWN_DESTINATION                                         :nekonata destino
 STR_8812_EMPTY                                                  :{LTBLUE}Malplena
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} de {STATION} (x{NUM})
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -2840,7 +2840,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ebasobiv järjekord)
 
-STR_UNKNOWN_DESTINATION                                         :tundmatu sihtpunkt
 STR_8812_EMPTY                                                  :{LTBLUE}Tühi
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} jaamast {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} jaamast {STATION} (x{NUM})
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -2685,7 +2685,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (virheellinen käsky)
 
-STR_UNKNOWN_DESTINATION                                         :tuntematon päämäärä
 STR_8812_EMPTY                                                  :{LTBLUE}Tyhjä
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} asemalta {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} asemalta {STATION} (x{NUM})
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -2792,7 +2792,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ordre invalide)
 
-STR_UNKNOWN_DESTINATION                                         :destination inconnue
 STR_8812_EMPTY                                                  :{LTBLUE}Vide
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} de {STATION} (x{NUM})
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -2627,7 +2627,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Orde Inválida)
 
-STR_UNKNOWN_DESTINATION                                         :destino descoñecido
 STR_8812_EMPTY                                                  :{LTBLUE}Valeiro
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} desde {STATION} (x{NUM})
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -2785,7 +2785,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ungültiger Auftrag)
 
-STR_UNKNOWN_DESTINATION                                         :unbekanntes Ziel
 STR_8812_EMPTY                                                  :{LTBLUE}Leer
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} von {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} von {STATION} (x{NUM})
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -2761,7 +2761,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Hibás menetrend)
 
-STR_UNKNOWN_DESTINATION                                         :ismeretlen célpont
 STR_8812_EMPTY                                                  :{LTBLUE}Üres
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} {STATION} állomásról
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} {STATION} állomásról (x{NUM})
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -2731,7 +2731,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ógild Skipun)
 
-STR_UNKNOWN_DESTINATION                                         :óþekktur áfangastaður
 STR_8812_EMPTY                                                  :{LTBLUE}Tómt
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} frá {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} frá {STATION} (x{NUM})
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -2788,7 +2788,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ordine non valido)
 
-STR_UNKNOWN_DESTINATION                                         :destinazione sconosciuta
 STR_8812_EMPTY                                                  :{LTBLUE}Vuoto
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} da {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} da {STATION} (x{NUM})
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -2639,7 +2639,6 @@
 
 STR_INVALID_ORDER                                               :{RED}（不正な指令）
 
-STR_UNKNOWN_DESTINATION                                         :行き先不明
 STR_8812_EMPTY                                                  :{LTBLUE}空
 STR_8813_FROM                                                   :{LTBLUE}{CARGO}（原点：{STATION}）
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO}（原点：{STATION}）（x{NUM}）
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -2785,7 +2785,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (잘못된 경로)
 
-STR_UNKNOWN_DESTINATION                                         :알 수 없는 목적지
 STR_8812_EMPTY                                                  :{LTBLUE}비어있음
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} (출발지: {STATION})
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} (출발지: {STATION}) (x{NUM})
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -2502,7 +2502,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Neteisinga tvarka)
 
-STR_UNKNOWN_DESTINATION                                         :nezinomas tikslas
 STR_8812_EMPTY                                                  :{LTBLUE}Tuscias
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} is {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} iš {STATION} (x{NUM})
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -2628,7 +2628,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ugyldig ordre)
 
-STR_UNKNOWN_DESTINATION                                         :ukjent destinasjon
 STR_8812_EMPTY                                                  :{LTBLUE}Tom
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} fra {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} fra {STATION} (x{NUM})
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -2627,7 +2627,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ugyldig ordre)
 
-STR_UNKNOWN_DESTINATION                                         :ukjend destinasjon
 STR_8812_EMPTY                                                  :{LTBLUE}Tom
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} frå {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} frå {STATION} (x{NUM})
--- a/src/lang/piglatin.txt
+++ b/src/lang/piglatin.txt
@@ -2652,7 +2652,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Invalidway Orderway)
 
-STR_UNKNOWN_DESTINATION                                         :unknownway estinationday
 STR_8812_EMPTY                                                  :{LTBLUE}Emptyway
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} omfray {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} omfray {STATION} (xay{NUM})
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -2788,7 +2788,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Błędne polecenie)
 
-STR_UNKNOWN_DESTINATION                                         :nieznany cel
 STR_8812_EMPTY                                                  :{LTBLUE}Pusty
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} z {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} z {STATION} (x{NUM})
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -2708,7 +2708,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ordem Inválida)
 
-STR_UNKNOWN_DESTINATION                                         :destino desconhecido
 STR_8812_EMPTY                                                  :{LTBLUE}Vazio
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} de {STATION} (x{NUM})
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -2773,7 +2773,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Comenzi eronate)
 
-STR_UNKNOWN_DESTINATION                                         :destinatie necunoscutã
 STR_8812_EMPTY                                                  :{LTBLUE}Gol
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de la {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} de la {STATION} (x{NUM})
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -2799,7 +2799,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Неверный Маршрут)
 
-STR_UNKNOWN_DESTINATION                                         :неизвестно назначение
 STR_8812_EMPTY                                                  :{LTBLUE}Пусто
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} из {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} из {STATION} (x{NUM})
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -2647,7 +2647,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (非法的调度计划)
 
-STR_UNKNOWN_DESTINATION                                         :未知的目的地
 STR_8812_EMPTY                                                  :{LTBLUE}空
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} (来自 {STATION})
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} (来自 {STATION} (x{NUM}))
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -2826,7 +2826,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Neplatny prikaz)
 
-STR_UNKNOWN_DESTINATION                                         :neznamy ciel
 STR_8812_EMPTY                                                  :{LTBLUE}Prazdny
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} z {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} z {STATION} (x{NUM})
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -2866,7 +2866,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Neveljaven ukaz)
 
-STR_UNKNOWN_DESTINATION                                         :neznan cilj
 STR_8812_EMPTY                                                  :{LTBLUE}Prazen
 STR_8813_FROM                                                   :Tovor {LTBLUE}{CARGO} iz postaje {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} iz {STATION} (x{NUM})
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -2792,7 +2792,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Orden inválida)
 
-STR_UNKNOWN_DESTINATION                                         :destino desconocido
 STR_8812_EMPTY                                                  :{LTBLUE}Vacío
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} desde {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} desde {STATION} (x{NUM})
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -2744,7 +2744,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Ogiltig order)
 
-STR_UNKNOWN_DESTINATION                                         :okänd destination
 STR_8812_EMPTY                                                  :{LTBLUE}Tom
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} från {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} från {STATION} (x{NUM})
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -2729,7 +2729,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (指令不對)
 
-STR_UNKNOWN_DESTINATION                                         :目的地不明
 STR_8812_EMPTY                                                  :{LTBLUE}空
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} 來自 {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} 來自 {STATION} (x{NUM})
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -2700,7 +2700,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Hatalı talimat)
 
-STR_UNKNOWN_DESTINATION                                         :bilinmeyen hedef
 STR_8812_EMPTY                                                  :{LTBLUE}Boş
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} - {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} geldiği yer: {STATION} (x{NUM})
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -2953,7 +2953,6 @@
 
 STR_INVALID_ORDER                                               :{RED} (Невірний наказ)
 
-STR_UNKNOWN_DESTINATION                                         :невідоме місце призначення
 STR_8812_EMPTY                                                  :{LTBLUE}порожній
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} з {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} з {STATION} (x{NUM})
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -844,7 +844,7 @@
 					/* The station doesn't exist anymore. The only place where we might
 					 * be "drawing" an invalid station is in the case of cargo that is
 					 * in transit. */
-					buff = GetStringWithArgs(buff, STR_UNKNOWN_DESTINATION, NULL, last);
+					buff = GetStringWithArgs(buff, STR_UNKNOWN_STATION, NULL, last);
 					break;
 				}