diff options
| author | rubidium <rubidium@openttd.org> | 2008-04-09 22:01:23 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-04-09 22:01:23 +0000 |
| commit | c9e9e6005bed8e6143fdc571cfebdc993d334dbd (patch) | |
| tree | a618ec500e29326d18b5b8410e43ffb4992c7603 | |
| parent | e075ade119bbab7f87eb0ca897e3a9ea0f55817b (diff) | |
| download | openttd-c9e9e6005bed8e6143fdc571cfebdc993d334dbd.tar.xz | |
(svn r12643) -Codechange: be more explicit about the orders a vehicle has (non stop and full load are ambiguous and depend on some patch settings).
41 files changed, 50 insertions, 586 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index e1632899a..2d0b78375 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -2608,26 +2608,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} T STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste trein arriveer by {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Aanwyse) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Trein in die weg -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Gaan na {STATION} -STR_GO_TO_TRANSFER :Gaan na {STATION} (Oordrag en vat vrag) -STR_8807_GO_TO_UNLOAD :Gaan na {STATION} (Aflaai) -STR_GO_TO_TRANSFER_UNLOAD :Gaan na {STATION} (Oordrag en verlaat leeg) -STR_8808_GO_TO_LOAD :Gaan na {STATION} (Laai) -STR_GO_TO_TRANSFER_LOAD :Gaan na {STATION} (Oordrag en wag vir volle lading) -STR_880A_GO_NON_STOP_TO :Gaan deurgaande na {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Gaan deurgaande na {STATION} (Oordra en neem vrag) -STR_880B_GO_NON_STOP_TO_UNLOAD :Gaan deurgaande na {STATION} (Aflaai) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Gaan deurgaande na {STATION} (Oordra en verlaat leë) -STR_880C_GO_NON_STOP_TO_LOAD :Gaan deurgaande na {STATION} (Laai) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Gaan deurgaande na {STATION} (Oordra en wag vir volle lading) STR_GO_TO_TRAIN_DEPOT :Gaan na {TOWN} Trein Depot STR_SERVICE_AT_TRAIN_DEPOT :Diens by {TOWN} Trein Depot STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Gaan deurgaande na {TOWN} Trein Depot STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Diens deurgaande by {TOWN} Trein Depot -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Reis (Nie gerooster nie) STR_TIMETABLE_TRAVEL_FOR :Reis vir {STRING} STR_TIMETABLE_STAY_FOR :en bly vir {STRING} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 016a5e65f..95d1b4ed5 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -2653,26 +2653,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}Depósit STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro trem chega a {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detalhes) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Trem no caminho -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Ir para {STATION} -STR_GO_TO_TRANSFER :Ir para {STATION} (Transferir e carregar) -STR_8807_GO_TO_UNLOAD :Ir para {STATION} (Descarregar) -STR_GO_TO_TRANSFER_UNLOAD :Ir para {STATION} (Transferir e deixar vazio) -STR_8808_GO_TO_LOAD :Ir para {STATION} (Carregar) -STR_GO_TO_TRANSFER_LOAD :Ir para {STATION} (Trasferir e aguardar carga total) -STR_880A_GO_NON_STOP_TO :Ir sem parar para {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Ir sem parar para {STATION} (Transferir e carregar) -STR_880B_GO_NON_STOP_TO_UNLOAD :Ir sem parar para {STATION} (Descarregar) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sem parar para {STATION} (Transferir e deixar vazio) -STR_880C_GO_NON_STOP_TO_LOAD :Ir sem parar para {STATION} (Carregar) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sem parar para {STATION} (Trasferir e aguardar carga total) STR_GO_TO_TRAIN_DEPOT :Ir para o depósito de {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Manutenção no depósito de {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ir sem parar para o depósito de {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Manutenção no depósito de {TOWN} sem parar -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viajar (não progamado) STR_TIMETABLE_TRAVEL_FOR :Viajar para {STRING} STR_TIMETABLE_STAY_FOR :e ficar durante {STRING} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index af1056eef..ce2393feb 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2653,26 +2653,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Хората празнуват . . .{}Първи влак пристигна на {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Подробности) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Влак на пътя -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Отиди на {STATION} -STR_GO_TO_TRANSFER :Отиди на {STATION} (Обмени и вземи товар) -STR_8807_GO_TO_UNLOAD :Отиди на {STATION} (Разтовари) -STR_GO_TO_TRANSFER_UNLOAD :Отиди на {STATION} (Обмени и не взимай нов товар) -STR_8808_GO_TO_LOAD :Отиди на {STATION} (Товари) -STR_GO_TO_TRANSFER_LOAD :Отиди на {STATION} (Обмени и изчакай до пълен товар) -STR_880A_GO_NON_STOP_TO :Отиди без да спираш на {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Отиди без да спираш на {STATION} (Обмени и вземи товар) -STR_880B_GO_NON_STOP_TO_UNLOAD :отиди без да спираш на {STATION} (Разтовари) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Отиди без да спираш на {STATION} (Обмени и не товари) -STR_880C_GO_NON_STOP_TO_LOAD :Отиди без да спираш на {STATION} (Товари) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Отиди без да спираш на {STATION} (Обмени и изчакай до пълен товар) STR_GO_TO_TRAIN_DEPOT :Отиди до Влаковото депо на {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Ремонт в {TOWN} влаково депо STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Отиди без да спираш на {TOWN} Влаково депо STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Ремонт без спиране в {TOWN} влаково депо -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Патувай (без разписание) STR_TIMETABLE_TRAVEL_FOR :Патувай за {STRING} STR_TIMETABLE_STAY_FOR :и остани за {STRING} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 6e1cf81c1..8fd111304 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -2652,26 +2652,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} C STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Celebració popular . . .{} Arribada del 1er. tren a {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detalls) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tren en el camí -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Ves a {STATION} -STR_GO_TO_TRANSFER :Ves a {STATION} (Transfereix i agafa càrrega) -STR_8807_GO_TO_UNLOAD :Ves a {STATION} (Descarrega) -STR_GO_TO_TRANSFER_UNLOAD :Ves a {STATION} (Transfereix i deixa buit) -STR_8808_GO_TO_LOAD :Ves a {STATION} (Carrega) -STR_GO_TO_TRANSFER_LOAD :Ves a {STATION} (Transfereix i espera càrrega completa) -STR_880A_GO_NON_STOP_TO :Ves sense parar a {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Ves sense parar a {STATION} (Transfereix i agafa càrrega) -STR_880B_GO_NON_STOP_TO_UNLOAD :Ves sense parar a {STATION} (Descarrega) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ves sense parar a {STATION} (Transfereix i deixa buit) -STR_880C_GO_NON_STOP_TO_LOAD :Ves sense parar a {STATION} (Carrega) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ves sense parar a {STATION} (Transfereix i espera càrrega completa) STR_GO_TO_TRAIN_DEPOT :Ves al Diposit {TOWN} de Tren STR_SERVICE_AT_TRAIN_DEPOT :Manteniment a cotxeres de {TOWN}. STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ves sense parar a les cotxeres de {TOWN}. STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Manteniment sense parades a cotxeres de {TOWN}. -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viatge (fora d'horari) STR_TIMETABLE_TRAVEL_FOR :Viatge a {STRING} STR_TIMETABLE_STAY_FOR :i estigues {STRING} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index b0970ab86..9985ae71a 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2622,26 +2622,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}Spremiš STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Građani slave . . .{}Prvi vlak je stigao na {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detalji) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Vlak na putu -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Idi do {STATION} -STR_GO_TO_TRANSFER :Idi do {STATION} (Transferiraj i preuzmi teret) -STR_8807_GO_TO_UNLOAD :Idi do {STATION} (Istovar) -STR_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transferiraj i otiđi prazan) -STR_8808_GO_TO_LOAD :Idi do{STATION} (Utovar) -STR_GO_TO_TRANSFER_LOAD :Idi do {STATION} (Transferiraj i pričekaj puni utovar) -STR_880A_GO_NON_STOP_TO :Idi neprekidno do {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Idi neprekidno do {STATION} (Transferiraj i preuzmi teret) -STR_880B_GO_NON_STOP_TO_UNLOAD :Idi neprekidno do {STATION} (Istovar) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Idi neprekidno do {STATION} (Transferiraj i otiđi prazan) -STR_880C_GO_NON_STOP_TO_LOAD :Idi neprekidno do {STATION} (Utovar) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Idi neprekidno do {STATION} (Transferiraj i pričekaj puni utovar) STR_GO_TO_TRAIN_DEPOT :Idi u spremište vlakova grada {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Servisiranje u spremištu vlakova grada {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Idi neprekidno do spremišta vlakova grada {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Servisiraj neprekidno u spremištu vlakova grada {TOWN} -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Putovanje (bez rasporeda) STR_TIMETABLE_TRAVEL_FOR :Putovanje za {STRING} STR_TIMETABLE_STAY_FOR :i boravak za {STRING} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 64ec9d338..06f9a102b 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2704,26 +2704,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}Železni STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První vlak dorazil do {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaily) STR_8803_TRAIN_IN_THE_WAY :{WHITE}V cestě je vlak -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Jet do {STATION} -STR_GO_TO_TRANSFER :Jet do {STATION} (přeložit a naložit jiný náklad) -STR_8807_GO_TO_UNLOAD :Jet do {STATION} (vyložit) -STR_GO_TO_TRANSFER_UNLOAD :Jet do {STATION} (přeložit a nenakládat) -STR_8808_GO_TO_LOAD :Jet do {STATION} (naložit) -STR_GO_TO_TRANSFER_LOAD :Jet do {STATION} (přeložit a plně naložit jiný náklad) -STR_880A_GO_NON_STOP_TO :Jet bez zastavení do {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Jet bez zastavení do {STATION} (přeložit a naložit jiný náklad) -STR_880B_GO_NON_STOP_TO_UNLOAD :Jet bez zastavení do {STATION} (vyložit) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Jet bez zastavení do {STATION} (přeložit a nenakládat) -STR_880C_GO_NON_STOP_TO_LOAD :Jet bez zastavení do {STATION} (naložit) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Jet bez zastavení do {STATION} (přeložit a plně naložit jiný náklad) STR_GO_TO_TRAIN_DEPOT :Jet do železničního depa v {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Údržba v železničním depu {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Jet bez zastavení do železničního depa {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Údržba bez zastavení v železničním depu {TOWN} -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Jet do (mimo jízdní řád) STR_TIMETABLE_TRAVEL_FOR :Jet do {STRING} STR_TIMETABLE_STAY_FOR :a zůstat {STRING} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 75b3c8e3b..bab359764 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -2639,26 +2639,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} r STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første tog ankommer til {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaljer) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tog i vejen -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Gå til {STATION} -STR_GO_TO_TRANSFER :Gå til {STATION} (Overfør og tag gods) -STR_8807_GO_TO_UNLOAD :Gå til {STATION} (Aflæs) -STR_GO_TO_TRANSFER_UNLOAD :Gå til {STATION} (Overfør og efterlad tom) -STR_8808_GO_TO_LOAD :Gå til {STATION} (Fuld last) -STR_GO_TO_TRANSFER_LOAD :Gå til {STATION} (Overfør og vent på fuld last) -STR_880A_GO_NON_STOP_TO :Gå uden stop til {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Gå uden stop til {STATION} (Overfør og tag gods) -STR_880B_GO_NON_STOP_TO_UNLOAD :Gå uden stop til {STATION} (Aflæs) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Gå uden stop til {STATION} (Overfør og efterlad tom) -STR_880C_GO_NON_STOP_TO_LOAD :Gå uden stop til {STATION} (Fuld last) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Gå uden stop til {STATION} (Overfør og vent på fuld last) STR_GO_TO_TRAIN_DEPOT :Gå til {TOWN} remise STR_SERVICE_AT_TRAIN_DEPOT :Service i {TOWN} remise STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Gå uden stop til {TOWN} remise STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Service uden stop i {TOWN} remise -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Rejs (ikke iflg. køreplan) STR_TIMETABLE_TRAVEL_FOR :Rejs i {STRING} STR_TIMETABLE_STAY_FOR :og vent i {STRING} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 6ed351893..c05cea237 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -2652,26 +2652,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} T STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Inwoners feesten... {}Eerste trein arriveert in {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Details) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Trein in de weg -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Ga naar {STATION} -STR_GO_TO_TRANSFER :Ga naar {STATION} (Overladen en neem goederen) -STR_8807_GO_TO_UNLOAD :Ga naar {STATION} (Uit laden) -STR_GO_TO_TRANSFER_UNLOAD :Ga naar {STATION} (Overladen en leeg laten) -STR_8808_GO_TO_LOAD :Ga naar {STATION} (Laden) -STR_GO_TO_TRANSFER_LOAD :Ga naar {STATION} (Overladen en wacht tot vol geladen) -STR_880A_GO_NON_STOP_TO :Ga non-stop naar {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Ga non-stop naar {STATION} (Overladen en neem goederen) -STR_880B_GO_NON_STOP_TO_UNLOAD :Ga non-stop naar {STATION} (Uitladen) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ga non-stop naar {STATION} (Overladen en leeg laten) -STR_880C_GO_NON_STOP_TO_LOAD :Ga non-stop naar {STATION} (Laden) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ga non-stop naar {STATION} (Overladen en wacht tot vol geladen) STR_GO_TO_TRAIN_DEPOT :Ga naar {TOWN} Trein Depot STR_SERVICE_AT_TRAIN_DEPOT :Reparatie in {TOWN} treindepot STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ga zonder tussenstop naar {TOWN} Treindepot STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Reparatie zonder tussentop in {TOWN} treindepot -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Reis (geen dienstregeling) STR_TIMETABLE_TRAVEL_FOR :Reis naar {STRING} STR_TIMETABLE_STAY_FOR :en blijf voor {STRING} diff --git a/src/lang/english.txt b/src/lang/english.txt index ed5ea5f75..e6c1c4d14 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2653,26 +2653,30 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} T STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Details) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Train in the way -STR_8804 :{SETX 10}{COMMA}: {STRING1} {STRING1} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1} {STRING1} -STR_8806_GO_TO :Go to {STATION} -STR_GO_TO_TRANSFER :Go to {STATION} (Transfer and take cargo) -STR_8807_GO_TO_UNLOAD :Go to {STATION} (Unload) -STR_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transfer and leave empty) -STR_8808_GO_TO_LOAD :Go to {STATION} (Load) -STR_GO_TO_TRANSFER_LOAD :Go to {STATION} (Transfer and wait for full load) -STR_880A_GO_NON_STOP_TO :Go non-stop to {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Go non-stop to {STATION} (Transfer and take cargo) -STR_880B_GO_NON_STOP_TO_UNLOAD :Go non-stop to {STATION} (Unload) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Go non-stop to {STATION} (Transfer and leave empty) -STR_880C_GO_NON_STOP_TO_LOAD :Go non-stop to {STATION} (Load) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Go non-stop to {STATION} (Transfer and wait for full load) +STR_8804 :{SETX 10}{COMMA}: {STRING3} +STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING3} +STR_ORDER_GO_TO :Go to +STR_ORDER_GO_NON_STOP_TO :Go non-stop to +STR_ORDER_GO_VIA :Go via +STR_ORDER_GO_NON_STOP_VIA :Go non-stop via +STR_ORDER_UNLOAD :(Unload) +STR_ORDER_FULL_LOAD :(Full load) +STR_ORDER_FULL_LOAD_ANY :(Full load any cargo) +STR_ORDER_NO_LOAD :(No loading) +STR_ORDER_TRANSFER :(Transfer and take cargo) +STR_ORDER_TRANSFER_UNLOAD :(Transfer and leave empty) +STR_ORDER_TRANSFER_FULL_LOAD :(Transfer and wait for full load) +STR_ORDER_TRANSFER_FULL_LOAD_ANY :(Transfer and wait for any full load) +STR_ORDER_NO_UNLOAD :(No unload and take cargo) +STR_ORDER_NO_UNLOAD_FULL_LOAD :(No unload and wait for full load) +STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(No unload and wait for any full load) +STR_GO_TO_STATION :{STRING} {STATION} {STRING} STR_GO_TO_TRAIN_DEPOT :Go to {TOWN} Train Depot STR_SERVICE_AT_TRAIN_DEPOT :Service at {TOWN} Train Depot STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Go non-stop to {TOWN} Train Depot STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Service non-stop at {TOWN} Train Depot -STR_TIMETABLE_GO_TO :{STRING1} {STRING2} +STR_TIMETABLE_GO_TO :{STRING3} {STRING2} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Travel (not timetabled) STR_TIMETABLE_TRAVEL_FOR :Travel for {STRING1} STR_TIMETABLE_STAY_FOR :and stay for {STRING1} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 7deaa29e3..6371c0887 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -2619,26 +2619,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} T STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Details) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Train in the way -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Go to {STATION} -STR_GO_TO_TRANSFER :Go to {STATION} (Transfer and take cargo) -STR_8807_GO_TO_UNLOAD :Go to {STATION} (Unload) -STR_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transfer and leave empty) -STR_8808_GO_TO_LOAD :Go to {STATION} (Load) -STR_GO_TO_TRANSFER_LOAD :Go to {STATION} (Transfer and wait for full load) -STR_880A_GO_NON_STOP_TO :Go non-stop to {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Go non-stop to {STATION} (Transfer and take cargo) -STR_880B_GO_NON_STOP_TO_UNLOAD :Go non-stop to {STATION} (Unload) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Go non-stop to {STATION} (Transfer and leave empty) -STR_880C_GO_NON_STOP_TO_LOAD :Go non-stop to {STATION} (Load) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Go non-stop to {STATION} (Transfer and wait for full load) STR_GO_TO_TRAIN_DEPOT :Go to {TOWN} Train Depot STR_SERVICE_AT_TRAIN_DEPOT :Service at {TOWN} Train Depot STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Go non-stop to {TOWN} Train Depot STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Service non-stop at {TOWN} Train Depot -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Travel (not timetabled) STR_TIMETABLE_TRAVEL_FOR :Travel for {STRING} STR_TIMETABLE_STAY_FOR :and stay for {STRING} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 76b53aa8c..86e85902b 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2491,20 +2491,6 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} T STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua trajno alvenas ĉe {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaloj) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Trajno okupas la lokon -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Iru al {STATION} -STR_GO_TO_TRANSFER :Iru al {STATION} (Transigu kaj prenu ŝarĝon) -STR_8807_GO_TO_UNLOAD :Iru al {STATION} (Deŝarĝu) -STR_GO_TO_TRANSFER_UNLOAD :Iru al {STATION} (Transigu kaj lasu malplena) -STR_8808_GO_TO_LOAD :Iru al {STATION} (Ŝarĝu) -STR_GO_TO_TRANSFER_LOAD :Iru al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo) -STR_880A_GO_NON_STOP_TO :Iru senhalte al {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Iru senhalte al {STATION} (Transigu kaj prenu ŝarĝon) -STR_880B_GO_NON_STOP_TO_UNLOAD :Iru senhalte al {STATION} (Deŝarĝu) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Iru senhalte al {STATION} (Transigu kaj lasu malplena) -STR_880C_GO_NON_STOP_TO_LOAD :Iru senhalte al {STATION} (Ŝarĝu) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Iru senhalte al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo) STR_GO_TO_TRAIN_DEPOT :Iru al {TOWN} Trajndeponejo STR_SERVICE_AT_TRAIN_DEPOT :Prizorgo ĉe {TOWN} Trajndeponejo STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Iru senhalte al {TOWN} Trajndeponejo diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 5fe6ada17..9b7caafa9 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -2739,26 +2739,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}Linna {T STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab. . .{}{STATION} jaama saabus esimene rong! STR_8802_DETAILS :{WHITE}{VEHICLE} (üksikasjad) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Rong on ees -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Mine {STATION} -STR_GO_TO_TRANSFER :Mine {STATION} (laadi ümber ja võta laadung peale) -STR_8807_GO_TO_UNLOAD :Mine {STATION} (laadi maha) -STR_GO_TO_TRANSFER_UNLOAD :Mine {STATION} (laadi ümber ja jäta tühjaks) -STR_8808_GO_TO_LOAD :Mine {STATION} (laadi) -STR_GO_TO_TRANSFER_LOAD :Mine {STATION} (laadi ümber ja oota täislaadungit) -STR_880A_GO_NON_STOP_TO :Sõida läbi {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Sõida läbi {STATION} (laadi ümber ja oota täislaadungit) -STR_880B_GO_NON_STOP_TO_UNLOAD :Sõida läbi {STATION} (laadi maha) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Sõida läbi {STATION} (laadi ümber ja jäta tühjaks) -STR_880C_GO_NON_STOP_TO_LOAD :Sõida läbi {STATION} (laadi) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Sõida läbi {STATION} (laadi ümber ja oota täislaadungit) STR_GO_TO_TRAIN_DEPOT :Mine linna {TOWN} rongidepoosse STR_SERVICE_AT_TRAIN_DEPOT :Hoolda linna {TOWN} rongidepoos STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Sõida läbi linna {TOWN} rongidepoo STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Hooldus linna {TOWN} rongidepoost läbisõidul -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Sõitmine (sõiduplaanita) STR_TIMETABLE_TRAVEL_FOR :Sõida {STRING} STR_TIMETABLE_STAY_FOR :ja oota {STRING} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 241d6e317..33c07eab8 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2599,26 +2599,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN}: STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen juna saapuu asemalle ({STATION})! STR_8802_DETAILS :{WHITE}{VEHICLE} (yksityiskohdat) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Juna on tiellä. -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Asemalle {STATION} -STR_GO_TO_TRANSFER :Mene asemalle {STATION} (Siirrä ja ota rahti) -STR_8807_GO_TO_UNLOAD :Mene asemalle {STATION} (Pura rahti) -STR_GO_TO_TRANSFER_UNLOAD :Mene asemalle {STATION} (Siirrä ja jätä tyhjäksi) -STR_8808_GO_TO_LOAD :Mene asemalle {STATION} (Lastaa) -STR_GO_TO_TRANSFER_LOAD :Mene asemalle {STATION} (Siirrä ja odota täyttä rahtia) -STR_880A_GO_NON_STOP_TO :Mene tauotta asemalle {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Mene tauotta asemalle {STATION} (Siirrä ja ota rahti) -STR_880B_GO_NON_STOP_TO_UNLOAD :Mene tauotta asemalle {STATION} (Pura rahti) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Mene tauotta asemalle {STATION} (Siirrä ja jätä tyhjäksi) -STR_880C_GO_NON_STOP_TO_LOAD :Mene tauotta asemalle {STATION} (Lastaa) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Mene tauotta asemalle {STATION} (Siirrä ja odota täyttä rahtia) STR_GO_TO_TRAIN_DEPOT :Mene kaupungin {TOWN} veturitalliin STR_SERVICE_AT_TRAIN_DEPOT :Huolto veturitallilla ({TOWN}) STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Mene pysähtymättä veturitalliin ({TOWN}) STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Huolto pysähtymättä veturitallilla ({TOWN}) -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Kiertävä (ei aikataulua) STR_TIMETABLE_TRAVEL_FOR :Kulje kohteeseen {STRING} STR_TIMETABLE_STAY_FOR :ja odota {STRING} diff --git a/src/lang/french.txt b/src/lang/french.txt index 5d541379e..d4ed5e5be 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -2653,26 +2653,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} D STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Les habitants célèbrent{}l'arrivée du premier train à {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Détails) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Train présent -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Aller à {STATION} -STR_GO_TO_TRANSFER :Aller à {STATION} (Transférer et charger) -STR_8807_GO_TO_UNLOAD :Aller à {STATION} (Décharger) -STR_GO_TO_TRANSFER_UNLOAD :Aller à {STATION} (Transférer et laisser vide) -STR_8808_GO_TO_LOAD :Aller à {STATION} (Charger) -STR_GO_TO_TRANSFER_LOAD :Aller à {STATION} (Transférer et attendre pleine charge) -STR_880A_GO_NON_STOP_TO :Aller sans s'arrêter à {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Aller sans s'arrêter à {STATION} (Transférer et charger) -STR_880B_GO_NON_STOP_TO_UNLOAD :Aller sans s'arrêter à {STATION} (Décharger) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Aller sans s'arrêter à {STATION} (Transférer et laisser vide) -STR_880C_GO_NON_STOP_TO_LOAD :Aller sans s'arrêter à {STATION} (Charger) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Aller sans s'arrêter à {STATION} (Transférer et attendre pleine charge) STR_GO_TO_TRAIN_DEPOT :Aller au dépot de {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Entretien au dépôt de {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Aller sans s'arrêter au dépôt de {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Aller faire l'entretien sans s'arrêter au dépôt de {TOWN} -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Voyager (sans horaires) STR_TIMETABLE_TRAVEL_FOR :Voyager pendant {STRING} STR_TIMETABLE_STAY_FOR :et rester pendant {STRING} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 1c750aaed..14aa20275 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2427,20 +2427,6 @@ STR_8800_TRAIN_DEPOT :{WHITE}Depósit STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Celebración cidadá . . .{}Chega o primeiro tren a {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detalles) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Hai un tren no camiño -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Ir a {STATION} -STR_GO_TO_TRANSFER :Ir a {STATION} (Transferir e coller carga) -STR_8807_GO_TO_UNLOAD :Ir a {STATION} (Descargar) -STR_GO_TO_TRANSFER_UNLOAD :Ir a {STATION} (Transferir e sair valeiro) -STR_8808_GO_TO_LOAD :Ir a {STATION} (Cargar) -STR_GO_TO_TRANSFER_LOAD :Ir a {STATION} (Transferir e esperar a cargar) -STR_880A_GO_NON_STOP_TO :Ir sen parar a {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Ir sen parar a {STATION} (Transferir e coller carga) -STR_880B_GO_NON_STOP_TO_UNLOAD :Ir sen parar a {STATION} (Descargar) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sen parar a {STATION} (Descargar e saír baleiro) -STR_880C_GO_NON_STOP_TO_LOAD :Ir sen parar a {STATION} (Cargar) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sen parar a {STATION} (Transferir e esperar a cargar) STR_GO_TO_TRAIN_DEPOT :Ir o Depósito De Trens de {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Face-lo servicio no Depósito de Trens de {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ir sen paradas o Depósito de Trens de {TOWN} diff --git a/src/lang/german.txt b/src/lang/german.txt index d68564743..e290b1e05 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -2640,26 +2640,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Z STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Der erste Zug erreicht {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Details) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Zug ist im Weg -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Fahre nach {STATION} -STR_GO_TO_TRANSFER :Fahre nach {STATION} (Umladen und beladen) -STR_8807_GO_TO_UNLOAD :Fahre nach {STATION} (Entladen) -STR_GO_TO_TRANSFER_UNLOAD :Fahre nach {STATION} (Umladen und leer verlassen) -STR_8808_GO_TO_LOAD :Fahre nach {STATION} (Beladen) -STR_GO_TO_TRANSFER_LOAD :Fahre nach {STATION} (Umladen und voll beladen) -STR_880A_GO_NON_STOP_TO :Fahre ohne Halt nach {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Fahre ohne Halt nach {STATION} (Umladen und beladen) -STR_880B_GO_NON_STOP_TO_UNLOAD :Fahre ohne Halt nach {STATION} (Entladen) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Fahre nach {STATION} (Umladen und leer verlassen) -STR_880C_GO_NON_STOP_TO_LOAD :Fahre ohne Halt nach {STATION} (Beladen) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Fahre ohne Halt nach {STATION} (Umladen und voll beladen) STR_GO_TO_TRAIN_DEPOT :Fahre zum {TOWN} Zugdepot STR_SERVICE_AT_TRAIN_DEPOT :Wartung bei {TOWN} Zugdepot STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Fahre ohne Halt zu {TOWN} Zugdepot STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Wartung (ohne Halt) bei {TOWN} Zugdepot -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Fahren (ohne Fahrplan) STR_TIMETABLE_TRAVEL_FOR :{STRING} lang fahren STR_TIMETABLE_STAY_FOR :und {STRING} lang bleiben diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index d8ddf3141..87428881c 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2754,26 +2754,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN}i STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az első vonat {STATION} állomásra! STR_8802_DETAILS :{WHITE}{VEHICLE} adatai STR_8803_TRAIN_IN_THE_WAY :{WHITE}Vonat van az útban -STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING} -STR_8806_GO_TO :Menj {STATION} állomásra -STR_GO_TO_TRANSFER :Menj {STATION} (odaszállít és felvesz rakományt) -STR_8807_GO_TO_UNLOAD :Menj {STATION} (lepakol) -STR_GO_TO_TRANSFER_UNLOAD :Menj {STATION} (odaszállít és üresen továbbmegy) -STR_8808_GO_TO_LOAD :Menj {STATION} (felpakol) -STR_GO_TO_TRANSFER_LOAD :Menj {STATION} (odaszállít és teljes rakományra vár) -STR_880A_GO_NON_STOP_TO :Megállás nélkül menj {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Megállás nélkül menj {STATION} (odaszállít és felvesz rakományt) -STR_880B_GO_NON_STOP_TO_UNLOAD :Megállás nélkül menj {STATION} (lepakol) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Megállás nélkül menj {STATION} (odaszállít és üresen távozik) -STR_880C_GO_NON_STOP_TO_LOAD :Megállás nélkül menj {STATION} (felpakol) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Megállás nélkül menj {STATION} (odaszállít és teljes rakományra vár) STR_GO_TO_TRAIN_DEPOT :Menj {TOWN} jármütelepre STR_SERVICE_AT_TRAIN_DEPOT :Javítsd a vonatot a {TOWN}i járműtelepen STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Menj megállás nélkül {TOWN}i járműtelepre STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Mindig javítsd a vonatot a {TOWN}i járműtelepen -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Útipont (időzítetlen) STR_TIMETABLE_TRAVEL_FOR :Menjen {STRING} állomásra STR_TIMETABLE_STAY_FOR :és maradjon {STRING.t} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 1df544d28..b2b883226 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2652,26 +2652,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} L STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsta lest kemur við á {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Upplýsingar) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Lest fyrir -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Fer til {STATION} -STR_GO_TO_TRANSFER :Fer til {STATION} (Yfirfæra og ferma) -STR_8807_GO_TO_UNLOAD :Fer til {STATION} (Afferma) -STR_GO_TO_TRANSFER_UNLOAD :Fer til {STATION} (Yfirfæra og yfirgefa tóm) -STR_8808_GO_TO_LOAD :Fer til {STATION} (Fullferma) -STR_GO_TO_TRANSFER_LOAD :Fer til {STATION} (Yfirfæra og fullferma) -STR_880A_GO_NON_STOP_TO :Fer viðstöðulaust til {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Fer viðstöðulaust til {STATION} (Yfirfæra og ferma) -STR_880B_GO_NON_STOP_TO_UNLOAD :Fer viðstöðulaust til {STATION} (Afferma) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Fer viðstöðulaust til {STATION} (Yfirfæra og yfirgefa tóm) -STR_880C_GO_NON_STOP_TO_LOAD :Fer viðstöðulaust til {STATION} (Fullferma) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Fer viðstöðulaust til {STATION} (Yfirfæra og fullferma) STR_GO_TO_TRAIN_DEPOT :Fer til {TOWN} Lestaskýli STR_SERVICE_AT_TRAIN_DEPOT :Viðgerð í {TOWN} Lestar Byggingu STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Fer viðstöðulaust til {TOWN} Lestar Byggingar STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Viðgerð viðstöðulaust í {TOWN} Lestar Byggingu -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Ferðalag (ekki sett í áætlun) STR_TIMETABLE_TRAVEL_FOR :Ferðast í {STRING} STR_TIMETABLE_STAY_FOR :og bíða í {STRING} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 97fd4598b..68ed3a6d8 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2654,26 +2654,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}Deposito STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo treno arriva a {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Dettagli) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Treno di mezzo -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Vai a {STATION} -STR_GO_TO_TRANSFER :Vai a {STATION} (Trasferisci e carica merce) -STR_8807_GO_TO_UNLOAD :Vai a {STATION} (Scarica) -STR_GO_TO_TRANSFER_UNLOAD :Vai a {STATION} (Trasferisci e parti vuoto) -STR_8808_GO_TO_LOAD :Vai a {STATION} (Carica) -STR_GO_TO_TRANSFER_LOAD :Vai a {STATION} (Trasferisci e aspetta carico completo) -STR_880A_GO_NON_STOP_TO :Vai non-stop a {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Vai non-stop a {STATION} (Trasferisci e carica merce) -STR_880B_GO_NON_STOP_TO_UNLOAD :Vai non-stop a {STATION} (Scarica) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Vai non-stop a {STATION} (Trasferisci e parti vuoto) -STR_880C_GO_NON_STOP_TO_LOAD :Vai non-stop a {STATION} (Carica) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Vai non-stop a {STATION} (Trasferisci e aspetta carico completo) STR_GO_TO_TRAIN_DEPOT :Vai al Deposito ferroviario di {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Manutenzione al Deposito di {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Vai non-stop al Deposito ferroviario di {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Manutenzione non-stop al Deposito di {TOWN} -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viaggia senza orario STR_TIMETABLE_TRAVEL_FOR :Viaggia per {STRING} STR_TIMETABLE_STAY_FOR :e sosta per {STRING} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 82512c1f4..cf1563133 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -2637,26 +2637,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}町民の祝賀{}初列車が{STATION}駅に到着！ STR_8802_DETAILS :{WHITE}{VEHICLE}（詳細） STR_8803_TRAIN_IN_THE_WAY :{WHITE}列車があります -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :{STATION}へ行く -STR_GO_TO_TRANSFER :{STATION}へ行く（運搬して貨物を積む） -STR_8807_GO_TO_UNLOAD :{STATION}へ行く（貨物を降ろす） -STR_GO_TO_TRANSFER_UNLOAD :{STATION}へ行く（運搬して空そのまま次へ行く） -STR_8808_GO_TO_LOAD :{STATION}へ行く（全負荷） -STR_GO_TO_TRANSFER_LOAD :{STATION}へ行く（運搬して全負荷まで待つ） -STR_880A_GO_NON_STOP_TO :{STATION}へ直行で行く -STR_GO_TO_NON_STOP_TRANSFER :{STATION}へ直行で行く（運搬して貨物を積む） -STR_880B_GO_NON_STOP_TO_UNLOAD :{STATION}へ直行で行く（貨物を降ろす） -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :{STATION}へ直行で行く（運搬して空そのまま次へ行く） -STR_880C_GO_NON_STOP_TO_LOAD :{STATION}へ直行で行く（全負荷） -STR_GO_TO_NON_STOP_TRANSFER_LOAD :{STATION}へ直行で行く（運搬して全負荷まで待つ） STR_GO_TO_TRAIN_DEPOT :{TOWN}電車庫へ回送 STR_SERVICE_AT_TRAIN_DEPOT :{TOWN}電車庫で修理 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :{TOWN}電車庫へ直行で回送 STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :{TOWN}電車庫へ直行で回送して修理 -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :運行（未計画） STR_TIMETABLE_TRAVEL_FOR :{STRING}運行 STR_TIMETABLE_STAY_FOR :{STRING}停車 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 212e4b2f0..6470d663b 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2652,26 +2652,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}{STATION}에 처음으로 기차가 도착했습니다!{}사람들이 환호성을 지릅니다! STR_8802_DETAILS :{WHITE}{VEHICLE} (상세정보) STR_8803_TRAIN_IN_THE_WAY :{WHITE}중간에 기차가 있습니다 -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :{STATION} 행 -STR_GO_TO_TRANSFER :{STATION} 행 (환승시키고 화물 싣기) -STR_8807_GO_TO_UNLOAD :{STATION} 행 (모두 내림) -STR_GO_TO_TRANSFER_UNLOAD :{STATION} 행 (환승시키고 화물을 모두 내림) -STR_8808_GO_TO_LOAD :{STATION} 행 (모두 싣기) -STR_GO_TO_TRANSFER_LOAD :{STATION} 행 (환승시키고 화물을 가득 실음) -STR_880A_GO_NON_STOP_TO :{STATION} 급행 -STR_GO_TO_NON_STOP_TRANSFER :{STATION} 급행 (환승시키고 화물 싣기) -STR_880B_GO_NON_STOP_TO_UNLOAD :{STATION} 급행 (모두 내림) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :{STATION} 급행 (환승시키고 화물을 모두 내림) -STR_880C_GO_NON_STOP_TO_LOAD :{STATION} 급행 (모두 싣기) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :{STATION} 급행 (환승시키고 화물을 가득 실음) STR_GO_TO_TRAIN_DEPOT :{TOWN} 차량기지행 STR_SERVICE_AT_TRAIN_DEPOT :{TOWN} 차량기지행 (점검) STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :{TOWN} 차량기지 급행 STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :{TOWN} 차량기지 급행 (점검) -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :여행 (시간표 없음) STR_TIMETABLE_TRAVEL_FOR :{STRING}로 여행 STR_TIMETABLE_STAY_FOR :그리고 {STRING}에 머무름 diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 1a68ccabc..e4da5dceb 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2499,20 +2499,6 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} T STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Gyventojai džiūgauja. . .{}Pirmas traukinys atvažiavo į {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detales) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Traukinys kelyje -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Vaziuoja i {STATION} -STR_GO_TO_TRANSFER :Vykti i {STATION} (Perkelti ir pakrauti krovinius) -STR_8807_GO_TO_UNLOAD :Vykti i {STATION} (Issikrauti) -STR_GO_TO_TRANSFER_UNLOAD :Vykti i {STATION} (Perkrauti ir palikti tuscia) -STR_8808_GO_TO_LOAD :Vykti i {STATION} (Pasikrauti) -STR_GO_TO_TRANSFER_LOAD :Vykti i {STATION} (Perkrauti ir palaukti pilno pakrovimo) -STR_880A_GO_NON_STOP_TO :Vykti be sustojimo i {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Vykti be sustojimo i {STATION} (Perkrauti ir paimti krovini) -STR_880B_GO_NON_STOP_TO_UNLOAD :Vykti be sustojimo i {STATION} (Issikrauti) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Vykti be sustojimo i {STATION} (Perkrauti ir palikti tuscia) -STR_880C_GO_NON_STOP_TO_LOAD :Vykti be sustojimo i {STATION} (Pasikrauti) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Vykti be sustojimo i {STATION} (Perkrauti ir palaukti pilno pakrovimo) STR_GO_TO_TRAIN_DEPOT :Vaziuoti i {TOWN} Traukinio Depa STR_SERVICE_AT_TRAIN_DEPOT :Remontas {TOWN} traukiniu depe STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Važiuoti nestojant į {TOWN} traukinių depą diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 7b9f48c1b..57b94f483 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -2621,26 +2621,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} t STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første tog ankommer {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaljer) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tog i veien -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Kjør til {STATION} -STR_GO_TO_TRANSFER :Gå til {STATION} (overfør og ta last) -STR_8807_GO_TO_UNLOAD :Gå til {STATION} (last av) -STR_GO_TO_TRANSFER_UNLOAD :Gå til {STATION} (overfør og forlat som tom) -STR_8808_GO_TO_LOAD :Gå til {STATION} (last) -STR_GO_TO_TRANSFER_LOAD :Gå til {STATION} (overfør og vent på full last) -STR_880A_GO_NON_STOP_TO :Gå uten stopp til {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Gå uten stopp til {STATION} (overfør og ta last) -STR_880B_GO_NON_STOP_TO_UNLOAD :Gå uten stopp til {STATION} (last av) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Gå uten stopp {STATION} (overfør og forlat som tom) -STR_880C_GO_NON_STOP_TO_LOAD :Gå uten stopp til {STATION} (last) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Gå uten stopp til {STATION} (overfør og vent på full last) STR_GO_TO_TRAIN_DEPOT :Gå til {TOWN} togdepot STR_SERVICE_AT_TRAIN_DEPOT :Velikehold ved {TOWN} togstall STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Kjør uten å stoppe til {TOWN} togstall STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Vedlikehold (uten å stoppe) ved {TOWN} togstall -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Reise (uten tidstabell) STR_TIMETABLE_TRAVEL_FOR :Reise for {STRING} STR_TIMETABLE_STAY_FOR :og bli værende i {STRING} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index efbca3a3b..c8c220f69 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2620,26 +2620,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} t STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første tog kjem til {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaljar) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tog i vegen -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Køyr til {STATION} -STR_GO_TO_TRANSFER :Køyr til {STATION} (overfør og ta last) -STR_8807_GO_TO_UNLOAD :Køyr til {STATION} (last av) -STR_GO_TO_TRANSFER_UNLOAD :Køyr til {STATION} (overfør og forlat som tom) -STR_8808_GO_TO_LOAD :Køyr til {STATION} (last) -STR_GO_TO_TRANSFER_LOAD :Køyr til {STATION} (overfør og vent på full last) -STR_880A_GO_NON_STOP_TO :Køyr utan stopp til {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Køyr utan stopp til {STATION} (overfør og ta last) -STR_880B_GO_NON_STOP_TO_UNLOAD :Køyr utan stopp til {STATION} (last av) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Køyr utan stopp til {STATION} (overfør og forlat som tom) -STR_880C_GO_NON_STOP_TO_LOAD :Køyr utan stopp til {STATION} (last) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Køyr utan stopp til {STATION} (overfør og vent på full last) STR_GO_TO_TRAIN_DEPOT :Køyr til {TOWN} togstall STR_SERVICE_AT_TRAIN_DEPOT :Velikehald ved {TOWN} togstall STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Køyr utan stopp til togstallen i {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Vedlikehald (utan å stoppe) ved {TOWN} togstall -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Reis (ikke på rutetabell) STR_TIMETABLE_TRAVEL_FOR :Reis i {STRING} STR_TIMETABLE_STAY_FOR :stå i {STRING} diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index 35ab46e92..969a8dc44 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -2610,26 +2610,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} A STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay aintray arrivesway atway {STATION}!
STR_8802_DETAILS :{WHITE}{VEHICLE} (Etailsday)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Aintray inway ethay ayway
-STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
-STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
-STR_8806_GO_TO :Ogay otay {STATION}
-STR_GO_TO_TRANSFER :Ogay otay {STATION} (Ansfertray andway aketay argocay)
-STR_8807_GO_TO_UNLOAD :Ogay otay {STATION} (Unloadway)
-STR_GO_TO_TRANSFER_UNLOAD :Ogay otay {STATION} (Ansfertray andway eavelay emptyway)
-STR_8808_GO_TO_LOAD :Ogay otay {STATION} (Oadlay)
-STR_GO_TO_TRANSFER_LOAD :Ogay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
-STR_880A_GO_NON_STOP_TO :Ogay onnay-opstay otay {STATION}
-STR_GO_TO_NON_STOP_TRANSFER :Ogay onnay-opstay otay {STATION} (Ansfertray andway aketay argocay)
-STR_880B_GO_NON_STOP_TO_UNLOAD :Ogay onnay-opstay otay {STATION} (Unloadway)
-STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ogay onnay-opstay otay {STATION} (Ansfertray andway eavelay emptyway)
-STR_880C_GO_NON_STOP_TO_LOAD :Ogay onnay-opstay otay {STATION} (Oadlay)
-STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ogay onnay-opstay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
STR_GO_TO_TRAIN_DEPOT :Ogay otay {TOWN} Aintray Epotday
STR_SERVICE_AT_TRAIN_DEPOT :Ervicesay atway {TOWN} Aintray Epotday
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ogay onnay-opstay otay {TOWN} Aintray Epotday
STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Ervicesay onnay-opstay atway {TOWN} Aintray Epotday
-STR_TIMETABLE_GO_TO :{STRING} {STRING}
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Aveltray (otnay imetabledtay)
STR_TIMETABLE_TRAVEL_FOR :Aveltray orfay {STRING}
STR_TIMETABLE_STAY_FOR :andway aystay orfay {STRING}
diff --git a/src/lang/polish.txt b/src/lang/polish.txt index d7715ce65..87be054b2 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2748,26 +2748,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}Zajezdni STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy pociąg przybył do {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Szczegóły) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Pociąg na drodze -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Idź do {STATION} -STR_GO_TO_TRANSFER :Idź do {STATION} (Przewieź i weź ładunek) -STR_8807_GO_TO_UNLOAD :Idź do {STATION} (Wyładunek) -STR_GO_TO_TRANSFER_UNLOAD :Idź do {STATION} (Przewieź i nie bierz ładunku) -STR_8808_GO_TO_LOAD :Idź do {STATION} (Załadunek) -STR_GO_TO_TRANSFER_LOAD :Idź do {STATION} (Przewieź i czekaj na pełen załadunek) -STR_880A_GO_NON_STOP_TO :Idź bez zatrzymywania do {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Idź bez zatrzymywania do {STATION} (Przewieź i weź ładunek) -STR_880B_GO_NON_STOP_TO_UNLOAD :Idź bez zatrzymywania do {STATION} (Wyładunek) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Idź bez zatrzymywania do {STATION} (Przewieź i nie bierz ładunku) -STR_880C_GO_NON_STOP_TO_LOAD :Idź bez zatrzymywania do {STATION} (Załadunek) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Idź bez zatrzymywania do {STATION} (Przewieź i czekaj na pełen załadunek) STR_GO_TO_TRAIN_DEPOT :Idź do zajezdni w {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Serwisuj w zajezdni w {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Idź bez zatrzymywania do zajezdni w {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Idź bez zatrzymywania do serwisu w zajezdni w {TOWN} -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Przejazd (bez ustalonego czasu) STR_TIMETABLE_TRAVEL_FOR :Przejazd przez {STRING} STR_TIMETABLE_STAY_FOR :i zostań tam przez {STRING} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 26a2e8dc4..46cf9ce46 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -2639,26 +2639,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} D STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro comboio chega a {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detalhes) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Comboio no caminho -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Ir para {STATION} -STR_GO_TO_TRANSFER :Ir para {STATION} (Transferir e levar carga) -STR_8807_GO_TO_UNLOAD :Ir para {STATION} (Descarregar) -STR_GO_TO_TRANSFER_UNLOAD :Ir para {STATION} (Transferir e deixar vazio) -STR_8808_GO_TO_LOAD :Ir para {STATION} (Carregar) -STR_GO_TO_TRANSFER_LOAD :Ir para {STATION} (Transferir e aguardar carga completa) -STR_880A_GO_NON_STOP_TO :Ir sem parar para {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Ir sem parar para {STATION} (Transfer ir e levar carga) -STR_880B_GO_NON_STOP_TO_UNLOAD :Ir sem parar para {STATION} (Descarregar) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sem parar para {STATION} (Transferir e deixar vazio) -STR_880C_GO_NON_STOP_TO_LOAD :Ir sem parar para {STATION} (Carregar) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sem parar para {STATION} (Transferir e aguardar carga completa) STR_GO_TO_TRAIN_DEPOT :Ir para o depósito de {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Manutenção no depósito de {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ir sem parar para o depósito de {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Manutenção no depósito de {TOWN} sem parar -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viagem (sem programação) STR_TIMETABLE_TRAVEL_FOR :Viajar durante {STRING} STR_TIMETABLE_STAY_FOR :e ficar durante {STRING} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 290e0d722..c7aa40776 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -2620,26 +2620,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}Depoul { STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Cetăţenii sărbătoresc {}sosirea primului tren la {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detalii) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tren în drum -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Mergi la {STATION} -STR_GO_TO_TRANSFER :Mergi la {STATION} (Preia încărcătura pentru transfer) -STR_8807_GO_TO_UNLOAD :Mergi la {STATION} (Descarcă) -STR_GO_TO_TRANSFER_UNLOAD :Mergi la {STATION} (Descarcă încărcătura pentru transfer) -STR_8808_GO_TO_LOAD :Mergi la {STATION} (Încarcă) -STR_GO_TO_TRANSFER_LOAD :Mergi la {STATION} (Aşteaptă 100% încărcătură pentru transfer) -STR_880A_GO_NON_STOP_TO :Mergi fără oprire la {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Mergi fără oprire la {STATION} (Preia încărcătura pentru transfer) -STR_880B_GO_NON_STOP_TO_UNLOAD :Mergi fără oprire la {STATION} (Descarcă) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Mergi fără oprire la {STATION} (Descarcă încărcătura pentru transfer) -STR_880C_GO_NON_STOP_TO_LOAD :Mergi fără oprire la {STATION} (Încarcă) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Mergi fără oprire la {STATION} (Aşteaptă 100% încărcătură pentru transfer) STR_GO_TO_TRAIN_DEPOT :Mergi la depoul {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Service la Depoul {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Mergi fără oprire la Depoul {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Non-stop pt. service la Depoul {TOWN} -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Calatorie (fara orar) STR_TIMETABLE_TRAVEL_FOR :Calatorii pentru {STRING} STR_TIMETABLE_STAY_FOR :si opriri pentru {STRING} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 69b122991..5b96340b3 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2660,26 +2660,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}Депо STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Жители празднуют!{}Первый поезд прибыл на станцию {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Детали) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Поезд мешает -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Ехать к ст. {STATION} -STR_GO_TO_TRANSFER :Ехать к ст. {STATION} (Трансфер) -STR_8807_GO_TO_UNLOAD :Ехать к ст. {STATION} (Не грузиться) -STR_GO_TO_TRANSFER_UNLOAD :Ехать к ст. {STATION} (Трансфер и не грузиться) -STR_8808_GO_TO_LOAD :Ехать к ст. {STATION} (Полная загрузка) -STR_GO_TO_TRANSFER_LOAD :Ехать к ст. {STATION} (Трансфер и полная загрузка) -STR_880A_GO_NON_STOP_TO :Ехать к ст. {STATION} без остановки -STR_GO_TO_NON_STOP_TRANSFER :Ехать к ст. {STATION} без остановки (Трансфер) -STR_880B_GO_NON_STOP_TO_UNLOAD :Ехать к ст. {STATION} без остановки (Не грузиться) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ехать к ст. {STATION} без остановки (Трансфер и не грузиться) -STR_880C_GO_NON_STOP_TO_LOAD :Ехать к ст. {STATION} без остановки (Полная загрузка) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ехать к ст. {STATION} без остановки (Трансфер и полная загрузка) STR_GO_TO_TRAIN_DEPOT :Ехать в депо {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Обслужиться в депо {TOWN} STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ехать в депо {TOWN} без остановки STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Обслужиться в депо {TOWN} без остановки -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Путешествует (не учитывается) STR_TIMETABLE_TRAVEL_FOR :Идти до {STRING} STR_TIMETABLE_STAY_FOR :и ждать {STRING} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 7cfb8f3a2..42b486ba8 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -2479,26 +2479,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一列火车抵达 {STATION}！ STR_8802_DETAILS :{WHITE}{VEHICLE} (详细信息) STR_8803_TRAIN_IN_THE_WAY :{WHITE}指定位置有列车 -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :前往 {STATION} -STR_GO_TO_TRANSFER :前往 {STATION} (转运并装货) -STR_8807_GO_TO_UNLOAD :前往 {STATION} (全部卸货) -STR_GO_TO_TRANSFER_UNLOAD :前往 {STATION} (转运且不装货) -STR_8808_GO_TO_LOAD :前往 {STATION} (等待装满) -STR_GO_TO_TRANSFER_LOAD :前往 {STATION} (转运并等待装满) -STR_880A_GO_NON_STOP_TO :前往(不停) {STATION} -STR_GO_TO_NON_STOP_TRANSFER :前往(不停) {STATION} (转运并装货) -STR_880B_GO_NON_STOP_TO_UNLOAD :前往(不停) {STATION} (全部卸货) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :前往(不停) {STATION} (转运且不装货) -STR_880C_GO_NON_STOP_TO_LOAD :前往(不停) {STATION} (等待装满) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :前往(不停) {STATION} (转运并等待装满) STR_GO_TO_TRAIN_DEPOT :前往 {TOWN} 车库 STR_SERVICE_AT_TRAIN_DEPOT :在 {TOWN} 车库保养 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :前往(不停) {TOWN} 车库 STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :在 {TOWN} 车库保养(不停) -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :旅行 (无时间表) STR_TIMETABLE_TRAVEL_FOR :前往 {STRING} 旅行 STR_TIMETABLE_STAY_FOR :并且在 {STRING} 停留 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 7abc93572..f25b91645 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2715,26 +2715,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} D STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy vlak dorazil do stanice {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaily) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Vlak v ceste -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Chod do {STATION} -STR_GO_TO_TRANSFER :Chod do {STATION} (prelozit a nalozit iny naklad) -STR_8807_GO_TO_UNLOAD :Chod do {STATION} (vylozit) -STR_GO_TO_TRANSFER_UNLOAD :Chod do {STATION} (prelozit a nechat prazdne) -STR_8808_GO_TO_LOAD :Chod do {STATION} (nalozit) -STR_GO_TO_TRANSFER_LOAD :Chod do {STATION} (prelozit a plne nalozit) -STR_880A_GO_NON_STOP_TO :Chod bez zastavenia do {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Chod bez zastavenia do {STATION} (prelozit a nalozit iny naklad) -STR_880B_GO_NON_STOP_TO_UNLOAD :Chod bez zastavenia do {STATION} (vylozit) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Chod bez zastavenia do {STATION} (prelozit a nechat prazdne) -STR_880C_GO_NON_STOP_TO_LOAD :Chod bez zastavenia do {STATION} (nalozit) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Chod bez zastavenia do {STATION} (prelozit a plne nalozit) STR_GO_TO_TRAIN_DEPOT :Chod do depa {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Opravit v {TOWN} Vlakovom Depe STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Chod bez zastavenia do depa {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Opravovat bez zastavenia v depe {TOWN} -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Cesta (neurcený cas) STR_TIMETABLE_TRAVEL_FOR :Cesta do {STRING} STR_TIMETABLE_STAY_FOR :prestávka {STRING} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index c2ccd5fc7..53ec4a21a 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2732,26 +2732,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prvi vlak je slovesno pripeljal{}na postajo {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Podrobnosti) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Vlak v napoto -STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING} -STR_8806_GO_TO :Pojdi do {STATION} -STR_GO_TO_TRANSFER :Pojdi do {STATION} (Pretovori in vzemi tovor) -STR_8807_GO_TO_UNLOAD :Pojdi do {STATION} (Raztovori) -STR_GO_TO_TRANSFER_UNLOAD :Pojdi do {STATION} (Pretovori in pusti prazno) -STR_8808_GO_TO_LOAD :Pojdi do {STATION} (Naloži) -STR_GO_TO_TRANSFER_LOAD :Pojdi do {STATION} (Prenesi in počakaj na polno breme) -STR_880A_GO_NON_STOP_TO :Pojdi brez postanka do {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Pojdi brez postanka do {STATION} (Prenesi in vzemi tovor) -STR_880B_GO_NON_STOP_TO_UNLOAD :Pojdi brez postanka do {STATION} (Raztovori) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Pojdi brez postanka do {STATION} (Pretovori in pusti prazno) -STR_880C_GO_NON_STOP_TO_LOAD :Pojdi brez postanka do {STATION} (Naloži) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Pojdi brez postanka do {STATION} (Prenesi in počakaj na polno breme) STR_GO_TO_TRAIN_DEPOT :Pojdi v {TOWN} železniško garažo STR_SERVICE_AT_TRAIN_DEPOT :Na servis v {TOWN} železniško garažo STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Pojdi brez postanka do garaže {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Non stop na servis v {TOWN} železniško garažo -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Potovanje (brez časovnih tabel) STR_TIMETABLE_TRAVEL_FOR :Potuj za {STRING} STR_TIMETABLE_STAY_FOR :in ostani za {STRING} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 2ff35e003..5b173d2f6 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2640,26 +2640,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN}, STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer tren llega a {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detalles) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tren en camino -STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING} -STR_8806_GO_TO :Ir a {STATION} -STR_GO_TO_TRANSFER :Ir a {STATION} (Transferir y cargar) -STR_8807_GO_TO_UNLOAD :Ir a {STATION} (Descargar) -STR_GO_TO_TRANSFER_UNLOAD :Ir a {STATION} (Transferir y dejar vacío) -STR_8808_GO_TO_LOAD :Ir a {STATION} (Cargar) -STR_GO_TO_TRANSFER_LOAD :Ir a {STATION} (Transferir y esperar a carga completa) -STR_880A_GO_NON_STOP_TO :Ir sin paradas a {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Ir sin paradas a {STATION} (Transferir y cargar) -STR_880B_GO_NON_STOP_TO_UNLOAD :Ir sin paradas a {STATION} (Descargar) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Ir sin paradas a {STATION} (Transferir y dejar vacío) -STR_880C_GO_NON_STOP_TO_LOAD :Ir sin paradas a {STATION} (Cargar) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Ir sin paradas a {STATION} (Transferir y esperar a carga completa) STR_GO_TO_TRAIN_DEPOT :Ir al depósito del tren de {TOWN} STR_SERVICE_AT_TRAIN_DEPOT :Ir al depósito de {TOWN} para mantenimiento STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Ir sin parar al depósito de {TOWN} STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Ir sin parar al depósito de {TOWN} para mantenimiento -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viaje (sin horarios) STR_TIMETABLE_TRAVEL_FOR :Viaje para {STRING} STR_TIMETABLE_STAY_FOR :y estancia en {STRING} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index ad17321d4..3f5c62ba1 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -2651,26 +2651,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} t STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Invånarna firar . . .{}Första tåget ankommer till {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Details) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Tåg i vägen -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Åk till {STATION} -STR_GO_TO_TRANSFER :Åk till {STATION} (Lasta om och på) -STR_8807_GO_TO_UNLOAD :Åk till {STATION} (Lasta av) -STR_GO_TO_TRANSFER_UNLOAD :Åk till {STATION} (Lasta om men inte på) -STR_8808_GO_TO_LOAD :Åk till {STATION} (Lasta på) -STR_GO_TO_TRANSFER_LOAD :Åk till {STATION} (Lasta om och vänta på full last) -STR_880A_GO_NON_STOP_TO :Åk nonstop till {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Åk nonstop till {STATION} (Lasta om och på) -STR_880B_GO_NON_STOP_TO_UNLOAD :Åk nonstop till {STATION} (Lasta av) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Åk nonstop till {STATION} (Lasta om men inte på) -STR_880C_GO_NON_STOP_TO_LOAD :Åk nonstop till {STATION} (Lasta på) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Åk nonstop till {STATION} (Lasta om och vänta på full last) STR_GO_TO_TRAIN_DEPOT :Åk till {TOWN}s tågdepå STR_SERVICE_AT_TRAIN_DEPOT :Servning vid {TOWN} tågdepå STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Åk non-stop till {TOWN}s tågdepå STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Servning non-stop {TOWN} tågdepå -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Avres (Inte tillagd i tidtabell) STR_TIMETABLE_TRAVEL_FOR :Res till {STRING} STR_TIMETABLE_STAY_FOR :och stanna i {STRING} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index b550f1dde..bfcc146b7 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2616,26 +2616,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛列車抵達 {STATION}！ STR_8802_DETAILS :{WHITE}{VEHICLE} (詳細資料) STR_8803_TRAIN_IN_THE_WAY :{WHITE}前方有列車 -STR_8804 :{SETX 10}{COMMA}：{STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}：{STRING} {STRING} -STR_8806_GO_TO :前往 {STATION} -STR_GO_TO_TRANSFER :前往 {STATION} (轉運，僅載不卸) -STR_8807_GO_TO_UNLOAD :前往 {STATION} (卸客貨) -STR_GO_TO_TRANSFER_UNLOAD :前往 {STATION} (轉運，卸客貨清空離站) -STR_8808_GO_TO_LOAD :前往 {STATION} (滿載) -STR_GO_TO_TRANSFER_LOAD :前往 {STATION} (轉運，等待滿載) -STR_880A_GO_NON_STOP_TO :前往 {STATION} 不停靠/中途不停 -STR_GO_TO_NON_STOP_TRANSFER :前往 {STATION} (轉運 [僅載不卸]) 中途不停 -STR_880B_GO_NON_STOP_TO_UNLOAD :前往 {STATION} (卸載) 中途不停 -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :前往 {STATION} (轉運 [卸載清空離站]) 中途不停 -STR_880C_GO_NON_STOP_TO_LOAD :前往 {STATION} (滿載) 中途不停 -STR_GO_TO_NON_STOP_TRANSFER_LOAD :前往 {STATION} (轉運 [等待滿載]) 中途不停 STR_GO_TO_TRAIN_DEPOT :前往 {TOWN} 機廠 STR_SERVICE_AT_TRAIN_DEPOT :在 {TOWN} 機廠維護 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :前往 {TOWN} 機廠 中途不停 STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :在 {TOWN} 機廠維護 中途不停 -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :漫遊 (無時刻表) STR_TIMETABLE_TRAVEL_FOR :通行於 {STRING} STR_TIMETABLE_STAY_FOR :並等待 {STRING} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 6aa702273..fd818ba63 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -2650,26 +2650,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} T STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Kutlama Yapıldı . . .{} {STATION} istasyonuna ilk kez tren geldi! STR_8802_DETAILS :{WHITE}{VEHICLE} (Detaylar) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Yolda tren var -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_8806_GO_TO :Git: {STATION} -STR_GO_TO_TRANSFER :Aktar: {STATION} (Kargoyu al) -STR_8807_GO_TO_UNLOAD :Git: {STATION} (Boşalt) -STR_GO_TO_TRANSFER_UNLOAD :Aktar: {STATION} (Boş dön) -STR_8808_GO_TO_LOAD :Git: {STATION} (Doldur) -STR_GO_TO_TRANSFER_LOAD :Aktar: {STATION} (Tam doldur) -STR_880A_GO_NON_STOP_TO :Durmadan git: {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Durmadan aktar: {STATION} (Kargoyu al) -STR_880B_GO_NON_STOP_TO_UNLOAD :Durmadan git: {STATION} (Boşalt) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Durmadan aktar: {STATION} (Boş dön) -STR_880C_GO_NON_STOP_TO_LOAD :Durmadan git: {STATION} (Doldur) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Durmadan aktar: {STATION} (Tam doldur) STR_GO_TO_TRAIN_DEPOT :Git: {TOWN} Tren Garı STR_SERVICE_AT_TRAIN_DEPOT :Bakıma git: {TOWN} Tren Garı STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Durmadan git: {TOWN} Tren Garı STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Durmadan bakıma git: {TOWN} Tren Garı -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Gezi (zamanlı değil) STR_TIMETABLE_TRAVEL_FOR :{STRING} için gezi STR_TIMETABLE_STAY_FOR :{STRING} için bekle diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index b02e34874..6f9011680 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2813,26 +2813,11 @@ STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший поїзд з'явився на {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Детально) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Поїзд на шляху -STR_8804 :{SETX 10}{COMMA}: {STRING}{STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING} -STR_8806_GO_TO :Прямувати до {STATION} -STR_GO_TO_TRANSFER :Прямувати до {STATION} (Пересадити і забрати вантаж) -STR_8807_GO_TO_UNLOAD :Прямувати до {STATION} (розвантажитися) -STR_GO_TO_TRANSFER_UNLOAD :Прямувати до {STATION} (Пересадити і залишити вантаж) -STR_8808_GO_TO_LOAD :Прямувати до {STATION} (Завантажитися) -STR_GO_TO_TRANSFER_LOAD :Прямувати до {STATION} (Пересадити і завантажити повністю) -STR_880A_GO_NON_STOP_TO :Прямувати без зупинок до {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Прямувати без зупинок до {STATION} (Пересадити і забрати вантаж) -STR_880B_GO_NON_STOP_TO_UNLOAD :Прямувати без зупинок до {STATION} (розвантажитися) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Прямувати без зупинок до {STATION} (Пересадити і залишити вантаж) -STR_880C_GO_NON_STOP_TO_LOAD :Прямувати без зупинок до {STATION} (Завантажити) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Прямувати без зупинок до {STATION} (Пересадити і завантажити повністю) STR_GO_TO_TRAIN_DEPOT :Прямувати до {TOWN} депо STR_SERVICE_AT_TRAIN_DEPOT :Ремонтуватись в {TOWN} депо STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Прямувати без зупинок до {TOWN} депо STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Ремонтуватись без зупинок в {TOWN} депо -STR_TIMETABLE_GO_TO :{STRING} {STRING} STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Прямує (не за розкладом) STR_TIMETABLE_TRAVEL_FOR :Прямує до {STRING} STR_TIMETABLE_STAY_FOR :і стояти {STRING} diff --git a/src/lang/unfinished/latvian.txt b/src/lang/unfinished/latvian.txt index e38b15aef..d5ee82561 100644 --- a/src/lang/unfinished/latvian.txt +++ b/src/lang/unfinished/latvian.txt @@ -1773,19 +1773,6 @@ STR_80FF_POWERNAUT_HELICOPTER :Powernaut Helic STR_8104_AIRCRAFT :lidmaðîna ##id 0x8800 -STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING} -STR_GO_TO_TRANSFER :Uz {STATION} (Pa'rvest un pan'emt kravu) -STR_8807_GO_TO_UNLOAD :Uz {STATION} (Nokraut) -STR_GO_TO_TRANSFER_UNLOAD :Uz {STATION} (Pa'rvest un atsta't tuks'u) -STR_8808_GO_TO_LOAD :Uz {STATION} (Piekraut) -STR_GO_TO_TRANSFER_LOAD :Go to {STATION} (Pa'rvest un gaidi't pilnu kravu) -STR_880A_GO_NON_STOP_TO :Bez pieturam uz {STATION} -STR_GO_TO_NON_STOP_TRANSFER :Bez pieturam uz {STATION} (Pa'rvest un pan'emt kravu) -STR_880B_GO_NON_STOP_TO_UNLOAD :Bez pieturam uz {STATION} (Nokraut) -STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Bez pieturam uz {STATION} (Pa'rvest un atsta't tuks'u) -STR_880C_GO_NON_STOP_TO_LOAD :Bez pieturam uz {STATION} (Piekraut) -STR_GO_TO_NON_STOP_TRANSFER_LOAD :Bez pieturam uz {STATION} (Pa'rvest un gaidi't pilnu kravu) STR_GO_TO_TRAIN_DEPOT :Uz {TOWN} Vilcienu Depo diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 3a59f818c..de1e6dd3f 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -92,21 +92,20 @@ static int GetOrderFromOrderWndPt(Window *w, int y, const Vehicle *v) return (sel <= v->num_orders && sel >= 0) ? sel : INVALID_ORDER; } -static StringID _station_order_strings[][7] = { +/** Order load types that could be given to station orders. */ +static const StringID _station_load_types[][5] = { { - STR_8806_GO_TO, - STR_GO_TO_TRANSFER, - STR_8807_GO_TO_UNLOAD, - STR_GO_TO_TRANSFER_UNLOAD, - STR_8808_GO_TO_LOAD, - STR_GO_TO_TRANSFER_LOAD + STR_EMPTY, + STR_ORDER_UNLOAD, + STR_ORDER_FULL_LOAD, + STR_ORDER_FULL_LOAD_ANY, + STR_ORDER_NO_LOAD, }, { - STR_880A_GO_NON_STOP_TO, - STR_GO_TO_NON_STOP_TRANSFER, - STR_880B_GO_NON_STOP_TO_UNLOAD, - STR_GO_TO_NON_STOP_TRANSFER_UNLOAD, - STR_880C_GO_NON_STOP_TO_LOAD, - STR_GO_TO_NON_STOP_TRANSFER_LOAD + STR_ORDER_TRANSFER, + STR_ORDER_TRANSFER_UNLOAD, + STR_ORDER_TRANSFER_FULL_LOAD, + STR_ORDER_TRANSFER_FULL_LOAD_ANY, + INVALID_STRING_ID, } }; @@ -197,10 +196,16 @@ static void DrawOrdersWindow(Window *w) SetDParam(2, order->GetDestination()); break; - case OT_GOTO_STATION: - SetDParam(1, _station_order_strings[!(order->GetNonStopType() == (_patches.new_nonstop ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE))][(order->GetLoadType() & OLFB_FULL_LOAD) | order->GetUnloadType()]); - SetDParam(2, order->GetDestination()); - break; + case OT_GOTO_STATION: { + OrderLoadFlags load = order->GetLoadType(); + OrderUnloadFlags unload = order->GetUnloadType(); + + SetDParam(1, STR_GO_TO_STATION); + SetDParam(2, STR_ORDER_GO_TO + (v->type == VEH_TRAIN ? order->GetNonStopType() : 0)); + SetDParam(3, order->GetDestination()); + /* Yes, this is ugly, but... once the savegame bump is done, it'll look a lot better! */ + SetDParam(4, _station_load_types[unload & OUFB_TRANSFER][((load & 1) | (load >> 1)) + ((unload & ~(OUFB_NO_UNLOAD | OUFB_TRANSFER)) >> 1)]); + } break; case OT_GOTO_DEPOT: { StringID s = STR_NULL; diff --git a/src/order_type.h b/src/order_type.h index 7e2548a08..415fcb9b4 100644 --- a/src/order_type.h +++ b/src/order_type.h @@ -43,6 +43,7 @@ enum OrderUnloadFlags { OUF_UNLOAD_IF_POSSIBLE = 0, ///< Unload all cargo that the station accepts. OUFB_TRANSFER = 1 << 0, ///< Transfer all cargo onto the platform. OUFB_UNLOAD = 1 << 1, ///< Force unloading all cargo onto the platform, possibly not getting paid. + OUFB_NO_UNLOAD = 1 << 2, ///< Totally no unloading will be done. }; /** diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index 914eb7e2d..d7f7d70ca 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -119,12 +119,16 @@ static void DrawTimetableWindow(Window *w) break; case OT_GOTO_STATION: - SetDParam(0, (order->GetNonStopType() != ONSF_STOP_EVERYWHERE) ? STR_880A_GO_NON_STOP_TO : STR_8806_GO_TO); - SetDParam(1, order->GetDestination()); + SetDParam(0, STR_GO_TO_STATION); + SetDParam(1, STR_ORDER_GO_TO + order->GetNonStopType()); + SetDParam(2, order->GetDestination()); + SetDParam(3, STR_EMPTY); if (order->wait_time > 0) { - SetDParam(2, STR_TIMETABLE_STAY_FOR); - SetTimetableParams(3, 4, order->wait_time); + SetDParam(4, STR_TIMETABLE_STAY_FOR); + SetTimetableParams(5, 6, order->wait_time); + } else { + SetDParam(4, STR_EMPTY); } break; |