(svn r12660) -Codechange: make the creation of depot order strings a little more modular (instead of causing a string explosion).
authorrubidium
Fri, 11 Apr 2008 14:27:18 +0000
changeset 8893 ab60048eb841
parent 8892 8401e1338665
child 8894 66472a0a6eb2
(svn r12660) -Codechange: make the creation of depot order strings a little more modular (instead of causing a string explosion).
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/lang/unfinished/frisian.txt
src/lang/unfinished/greek.txt
src/lang/unfinished/latvian.txt
src/order_gui.cpp
src/timetable_gui.cpp
--- a/src/lang/afrikaans.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/afrikaans.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2607,10 +2607,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Reis (Nie gerooster nie)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis vir {STRING}
@@ -2819,8 +2815,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Hernoem pad voertuig tipe
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Hernoem pad voertuig tipe
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Pad voertuig tipe kan nie hernoem word nie...
-STR_GO_TO_ROADVEH_DEPOT                                         :Gaan na {TOWN} Pad Voertuig Depot
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Diens by {TOWN} Pad Voertuig Depot
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Herpas pad voertuig om 'n ander vrag tipe te ontvoer
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Herpas pad voertuig
@@ -2896,8 +2890,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuwe kapasiteit: {GOLD}{CARGO}{}{BLACK}Herstelkoste: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Skip kan nie herstel word nie...
 STR_9842_REFITTABLE                                             :(herstelbaar)
-STR_GO_TO_SHIP_DEPOT                                            :Gaan na {TOWN} Skip Depot
-SERVICE_AT_SHIP_DEPOT                                           :Diens by {TOWN} Skip Depot
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Lughawe
@@ -2968,8 +2960,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Kies vrag tipe om te ontvoer:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuwe kapasiteit: {GOLD}{STRING}{}{BLACK}Herstelkoste: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Vliegtuig kan nie herstel word nie...
-STR_GO_TO_AIRPORT_HANGAR                                        :Gaan na {STATION} Hangar
-SERVICE_AT_AIRPORT_HANGAR                                       :Diens by {STATION} Hangar
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Rooster)
 
--- a/src/lang/brazilian_portuguese.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/brazilian_portuguese.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2652,10 +2652,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Viajar (não progamado)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar para {STRING}
@@ -2867,8 +2863,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomear tipo do automóvel
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomear tipo do automóvel
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Impossível renomear tipo do automóvel...
-STR_GO_TO_ROADVEH_DEPOT                                         :Ir para a garagem de {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Manutenção na garagem de {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Adaptar automóvel para carregar tipo de carga diferente
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Adaptar automóvel
@@ -2944,8 +2938,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{CARGO}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Impossível adaptar embarcação...
 STR_9842_REFITTABLE                                             :(adaptável)
-STR_GO_TO_SHIP_DEPOT                                            :Ir para o depósito naval de {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Manutenção no depósito naval de {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Aeroportos
@@ -3016,8 +3008,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecionar tipo de carga:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Impossível adaptar aeronave...
-STR_GO_TO_AIRPORT_HANGAR                                        :Ir para o hangar de {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Manutenção no hangar de {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Timetable)
 
--- a/src/lang/bulgarian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/bulgarian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2652,10 +2652,6 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Хората празнуват . . .{}Първи влак пристигна на {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Подробности)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Влак на пътя
-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_TRAVEL_NOT_TIMETABLED                             :Патувай (без разписание)
 STR_TIMETABLE_TRAVEL_FOR                                        :Патувай за {STRING}
@@ -2867,8 +2863,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Преименувай МПС-то
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Преименувай МПС-то
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Не може да преименуваш МПС-то...
-STR_GO_TO_ROADVEH_DEPOT                                         :Отиди  в {TOWN} МПС-депото
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Ремонт в {TOWN} гараж
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Преоборудване автомобила за друг товар
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Проборудване на автомобила
@@ -2944,8 +2938,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Нов капацитет: {GOLD}{CARGO}{}{BLACK}Цена за преустройство: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Не може да преустрои кораб...
 STR_9842_REFITTABLE                                             :(преустроим)
-STR_GO_TO_SHIP_DEPOT                                            :Отиди до Корабното депо до {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Сервиз на {TOWN} док
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Летища
@@ -3016,8 +3008,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Избор тип товар за превозване:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Нова вместимост: {GOLD}{STRING}{}{BLACK}Цена на преустройството: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Не може да се преустрои самолета...
-STR_GO_TO_AIRPORT_HANGAR                                        :Отиди до Хангара на летище {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Сервиз в {STATION} хангар
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Разписание)
 
--- a/src/lang/catalan.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/catalan.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2651,10 +2651,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Viatge (fora d'horari)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viatge a {STRING}
@@ -2866,8 +2862,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Reanomena tipus d'automòbil
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Reanomena tipus d'automòbil
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}No es pot reanomenar tipus d'automòbil
-STR_GO_TO_ROADVEH_DEPOT                                         :Ves a la cotxera de {TOWN}.
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Manteniment a la cotxera de {TOWN}.
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Remodela vehicle de carretera per dur un tipus diferent de càrrega
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Remodela vehicle de carretera
@@ -2943,8 +2937,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacitat: {GOLD}{CARGO}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}No es pot remodelar el vaixell...
 STR_9842_REFITTABLE                                             :(remodelable)
-STR_GO_TO_SHIP_DEPOT                                            :Ves a la drassana de {TOWN}.
-SERVICE_AT_SHIP_DEPOT                                           :Manteniment a drassana de {TOWN}.
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Aeroports
@@ -3015,8 +3007,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona el tipus de càrrega a transportar:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacitat: {GOLD}{STRING}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}No es pot remodelar l'avió...
-STR_GO_TO_AIRPORT_HANGAR                                        :Ves a l'hangar de {STATION}.
-SERVICE_AT_AIRPORT_HANGAR                                       :Manteniment en l'hangar de {STATION}.
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horari)
 
--- a/src/lang/croatian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/croatian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2621,10 +2621,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Putovanje (bez rasporeda)
 STR_TIMETABLE_TRAVEL_FOR                                        :Putovanje za {STRING}
@@ -2834,8 +2830,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Preimenuj vrstu cestovnog vozila
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Preimenuj vrstu cestovnog vozila
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nije moguće preimenovati vrstu cestovnog vozila...
-STR_GO_TO_ROADVEH_DEPOT                                         :Idi prema spremištu cestovnih vozila grada {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servisiranje u spremištu cestovnih vozila grada {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Prenamijeni cestovno vozilo  za prijevoz neke druge vrste tereta
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Prenamijeni cestovno vozilo
@@ -2911,8 +2905,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova nosivost: {GOLD}{CARGO}{}{BLACK}Cijena prenamjene: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nije moguće prenamijeniti brod...
 STR_9842_REFITTABLE                                             :(prenamjenjiv)
-STR_GO_TO_SHIP_DEPOT                                            :Idi u spremište brodova grada {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Servis u spremištu brodova grada {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Zračne luke
@@ -2983,8 +2975,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Odaberi vrstu tereta za prijevoz:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova nosivost: {GOLD}{STRING}{}{BLACK}Trošak prenamjene: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nije moguće prenamijeniti zrakoplov...
-STR_GO_TO_AIRPORT_HANGAR                                        :Idi u hangar stanice {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Servisiranje u hangaru stanice {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Raspored)
 
--- a/src/lang/czech.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/czech.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2703,10 +2703,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Jet do (mimo jízdní řád)
 STR_TIMETABLE_TRAVEL_FOR                                        :Jet do {STRING}
@@ -2916,8 +2912,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Přejmenovat typ silničního vozidla
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Přejmenovat typ silničního vozidla
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nelze přejmenovat typ silničního vozidla...
-STR_GO_TO_ROADVEH_DEPOT                                         :Jet do garáže {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Údržba v garáži {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Přestavět silniční vozidlo, aby mohlo vozit jiný druh nákladu
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Přestavět silniční vozidlo
@@ -2993,8 +2987,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová kapacita: {GOLD}{CARGO}{}{BLACK}Cena přestavby: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nelze přestavět loď...
 STR_9842_REFITTABLE                                             :(lze přestavět)
-STR_GO_TO_SHIP_DEPOT                                            :Zajet do lodního depa {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Údržba v lodním depu {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Letiště
@@ -3065,8 +3057,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Zvolit typ nákladu pro prevážení:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová kapacita: {GOLD}{STRING}{}{BLACK}Cena přestavby: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nelze přestavět letadlo...
-STR_GO_TO_AIRPORT_HANGAR                                        :Poslat do hangáru {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Údržba v hangáru {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Jízdní řád)
 
--- a/src/lang/danish.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/danish.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2638,10 +2638,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Rejs (ikke iflg. køreplan)
 STR_TIMETABLE_TRAVEL_FOR                                        :Rejs i {STRING}
@@ -2851,8 +2847,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Omdøb køretøjstypen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Omdøb køretøjstypen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan ikke omdøbe køretøjstypen...
-STR_GO_TO_ROADVEH_DEPOT                                         :Gå til {TOWN} værksted
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Service i {TOWN} værksted
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Ombyg vejkøretøj til at laste en anden type last
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Ombyg lastbil
@@ -2928,8 +2922,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{CARGO}{}{BLACK}Pris for ombyggelse: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan ikke ombygge skib...
 STR_9842_REFITTABLE                                             :(kan ombygges)
-STR_GO_TO_SHIP_DEPOT                                            :Sejl til {TOWN} skibsdok
-SERVICE_AT_SHIP_DEPOT                                           :Service i {TOWN} skibsdok
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Lufthavne
@@ -3000,8 +2992,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vælg den type last der skal flyves med:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Ombygningspris: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan ikke ombygge fly...
-STR_GO_TO_AIRPORT_HANGAR                                        :Flyv til {STATION} hangar
-SERVICE_AT_AIRPORT_HANGAR                                       :Service i {STATION} hangar
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Køreplan)
 
--- a/src/lang/dutch.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/dutch.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2651,10 +2651,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Reis (geen dienstregeling)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis naar {STRING}
@@ -2866,8 +2862,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Hernoem wegvoertuigtype
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Hernoem wegvoertuigtype
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan wegvoertuigtype niet hernoemen...
-STR_GO_TO_ROADVEH_DEPOT                                         :Ga naar {TOWN} Wegvoertuig Depot
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Repareren in {TOWN} wagendepot
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Verbouw het wegvoertuig om een andere lading the vervoeren
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Verbouw wegvoertuig
@@ -2943,8 +2937,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan schip niet ombouwen...
 STR_9842_REFITTABLE                                             :(ombouwbaar)
-STR_GO_TO_SHIP_DEPOT                                            :Ga naar {TOWN} Scheepswerf
-SERVICE_AT_SHIP_DEPOT                                           :Reparatie in {TOWN} Scheepswerf
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Vliegvelden
@@ -3015,8 +3007,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecteer goederentype om te vervoeren:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nieuwe capaciteit: {GOLD}{STRING}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan vliegtuig niet ombouwen...
-STR_GO_TO_AIRPORT_HANGAR                                        :Ga naar {STATION} hanger
-SERVICE_AT_AIRPORT_HANGAR                                       :Reparatie bij {STATION} hanger
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Dienstregeling)
 
--- a/src/lang/english.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/english.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2684,10 +2684,14 @@
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Change the loading behaviour of the highlighted order
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Change the unloading behaviour of the highlighted order
 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_ORDER_SERVICE_AT                                            :Service at
+STR_ORDER_SERVICE_NON_STOP_AT                                   :Service non-stop at
+STR_ORDER_TRAIN_DEPOT                                           :Train Depot
+STR_ORDER_ROAD_DEPOT                                            :Road Vehicle Depot
+STR_ORDER_SHIP_DEPOT                                            :Ship Depot
+STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
+STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
 
 STR_TIMETABLE_GO_TO                                             :{STRING3} {STRING2}
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
@@ -2900,8 +2904,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rename road vehicle type
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Rename road vehicle type
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Can't rename road vehicle type...
-STR_GO_TO_ROADVEH_DEPOT                                         :Go to {TOWN} Road Vehicle Depot
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Service at {TOWN} Road Vehicle Depot
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Refit road vehicle to carry a different cargo type
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Refit road vehicle
@@ -2977,8 +2979,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{CARGO}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Can't refit ship...
 STR_9842_REFITTABLE                                             :(refittable)
-STR_GO_TO_SHIP_DEPOT                                            :Go to {TOWN} Ship Depot
-SERVICE_AT_SHIP_DEPOT                                           :Service at {TOWN} Ship Depot
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Airports
@@ -3049,8 +3049,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Can't refit aircraft...
-STR_GO_TO_AIRPORT_HANGAR                                        :Go to {STATION} Hangar
-SERVICE_AT_AIRPORT_HANGAR                                       :Service at {STATION} Hangar
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Timetable)
 
--- a/src/lang/english_US.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/english_US.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2618,10 +2618,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
 STR_TIMETABLE_TRAVEL_FOR                                        :Travel for {STRING}
@@ -2830,8 +2826,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rename road vehicle type
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Rename road vehicle type
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Can't rename road vehicle type...
-STR_GO_TO_ROADVEH_DEPOT                                         :Go to {TOWN} Road Vehicle Depot
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Service at {TOWN} Road Vehicle Depot
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Refit road vehicle to carry a different cargo type
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Refit road vehicle
@@ -2907,8 +2901,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{CARGO}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Can't refit ship...
 STR_9842_REFITTABLE                                             :(refittable)
-STR_GO_TO_SHIP_DEPOT                                            :Go to {TOWN} Ship Depot
-SERVICE_AT_SHIP_DEPOT                                           :Service at {TOWN} Ship Depot
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Airports
@@ -2979,8 +2971,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Can't refit aircraft...
-STR_GO_TO_AIRPORT_HANGAR                                        :Go to {STATION} Hangar
-SERVICE_AT_AIRPORT_HANGAR                                       :Service at {STATION} Hangar
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Timetable)
 
--- a/src/lang/esperanto.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/esperanto.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2490,10 +2490,6 @@
 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_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
-STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT                             :Prizorgo senhalte ĉe {TOWN} Trajndeponejo
 
 STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Irante al {TOWN} Trajndeponejo
 STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Irante al {TOWN} Trajndeponejo, {VELOCITY}
@@ -2666,8 +2662,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomu vojveturilan tipon
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomu vojveturilan tipon
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Ne povas renomi vojveturilan tipon...
-STR_GO_TO_ROADVEH_DEPOT                                         :Iru al {TOWN} Vojveturila Deponejo
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Prizorgo ĉe {TOWN} Vojveturila Deponejo
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Transformu vojveturilon por porti alian ŝarĝon
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Transformu vojveturilon
@@ -2743,8 +2737,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova kapablo: {GOLD}{CARGO}{}{BLACK}Transformkosto: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Ne povas transformi ŝipon...
 STR_9842_REFITTABLE                                             :(transformebla)
-STR_GO_TO_SHIP_DEPOT                                            :Iru al {TOWN} Ŝipdeponejo
-SERVICE_AT_SHIP_DEPOT                                           :Prizorgo en la ŝipdeponejo de {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Flughavenoj
@@ -2815,8 +2807,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Elektu ŝarĝtipon por porti:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova kapablo: {GOLD}{STRING}{}{BLACK}Transformkosto: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Ne povas reformi aviadilon...
-STR_GO_TO_AIRPORT_HANGAR                                        :Iru al {STATION} Hangaro
-SERVICE_AT_AIRPORT_HANGAR                                       :Prizorgo en la hangaro de {STATION}
 
 ##id 0xB000
 STR_B000_ZEPPELIN_DISASTER_AT                                   :{BLACK}{BIGFONT}Zepelina katastrofo en {STATION}!
--- a/src/lang/estonian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/estonian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2738,10 +2738,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Sõitmine (sõiduplaanita)
 STR_TIMETABLE_TRAVEL_FOR                                        :Sõida {STRING}
@@ -2951,8 +2947,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Muuda mootorsõiduki tüübinime
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Muuda mootorsõiduki tüübinime
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Mootorsõiduki tüübinime ei saa muuta...
-STR_GO_TO_ROADVEH_DEPOT                                         :Mine linna {TOWN} garaaži
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Hoolda linna {TOWN} mootorsõidukidepoos
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Seadista mootorsõidukit kandmaks teist tüüpi veost
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Muuda mootorsõiduki seadistust
@@ -3028,8 +3022,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uus kandevõime: {GOLD}{CARGO}{}{BLACK}Laeva ümberseadistamise hind: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Ei saa laeva ümber seadistada...
 STR_9842_REFITTABLE                                             :(ümberseadistatav)
-STR_GO_TO_SHIP_DEPOT                                            :Mine {TOWN} paadikuuri
-SERVICE_AT_SHIP_DEPOT                                           :Hooldus {TOWN} laevaangaaris
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Lennuväljad
@@ -3100,8 +3092,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vali kaubatüüp, mida kanda:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uus kandevõime: {GOLD}{STRING}{}{BLACK}Ümberseadistamise hind: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Ei saa lennukit ümber seadistada...
-STR_GO_TO_AIRPORT_HANGAR                                        :Mine {STATION} angaari
-SERVICE_AT_AIRPORT_HANGAR                                       :Hooldus {STATION} angaaris
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Sõiduplaan)
 
--- a/src/lang/finnish.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/finnish.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2598,10 +2598,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Kiertävä (ei aikataulua)
 STR_TIMETABLE_TRAVEL_FOR                                        :Kulje kohteeseen {STRING}
@@ -2808,8 +2804,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Nimeä ajoneuvon tyyppi uudelleen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Nimeä ajoneuvon tyyppi uudelleen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Ajoneuvotyyppiä ei voi uudelleennimetä...
-STR_GO_TO_ROADVEH_DEPOT                                         :Aseta kohteeksi huoltoasema, {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Huolto, kohteena huoltoasema, {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Muuta ajoneuvo rahtaamaan muuta rahtityyppiä.
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Korjaa ajoneuvo.
@@ -2885,8 +2879,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{CARGO}{}{BLACK}Sovituksen kustannus: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Laivaa ei voi sovittaa...
 STR_9842_REFITTABLE                                             :(sovitettava)
-STR_GO_TO_SHIP_DEPOT                                            :Aseta kohteeksi telakka, {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Huolto, kohteena telakka, {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Lentokentät
@@ -2957,8 +2949,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Valitse kuljetettava rahtityyppi:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{STRING}{}{BLACK}Sovituksen kustannus: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Lentokonetta ei voi sovittaa...
-STR_GO_TO_AIRPORT_HANGAR                                        :Aseta kohteeksi lentokonehalli, {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Huolto, kohteena lentokonehalli, {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Aikataulu)
 
--- a/src/lang/french.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/french.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2652,10 +2652,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Voyager (sans horaires)
 STR_TIMETABLE_TRAVEL_FOR                                        :Voyager pendant {STRING}
@@ -2867,8 +2863,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renommer type de véhicule routier
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renommer type de véhicule routier
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Impossible de renommer type de véhicule routier...
-STR_GO_TO_ROADVEH_DEPOT                                         :Aller à {TOWN} Dépôt Routier
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Entretien au dépôt de {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Réaménager le véhicule routier pour transporter une cargaison différente
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Réaménager le véhicule routier
@@ -2944,8 +2938,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nouvelle capacité: {GOLD}{CARGO}{}{BLACK}Prix du réaménagement: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Impossible de réaménager le navire...
 STR_9842_REFITTABLE                                             :(réaménageable)
-STR_GO_TO_SHIP_DEPOT                                            :Aller au dépôt naval de {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Entretien au dépôt naval de {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Aéroports
@@ -3016,8 +3008,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Choisir le type de cargaison à transporter:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nouvelle capacité: {GOLD}{STRING}{}{BLACK}Prix du réaménagement: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Impossible de réaménager l'aéronef...
-STR_GO_TO_AIRPORT_HANGAR                                        :Aller au hangar {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Entretien au hangar {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horaire)
 
--- a/src/lang/galician.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/galician.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2426,10 +2426,6 @@
 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_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}
-STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT                             :Face-lo servicio sen paradas no Depósito de Trens de {TOWN}
 
 
 STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}En camiño ó Depósito de {TOWN}
@@ -2604,8 +2600,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomea-lo tipo de vehículo de estrada
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomea-lo tipo de vehículo de estrada
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Non se pode renomea-lo tipo de vehículo de estrada...
-STR_GO_TO_ROADVEH_DEPOT                                         :Ir ó Depósito de Vehículos de Estrada de {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servicio no Depósito de Vehículos de Estrada de {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Reaxustar vehículo para levar un tipo diferente de carga
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Reparar vehículo
@@ -2680,8 +2674,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova Capacidade: {GOLD}{CARGO}{}{BLACK}Coste do reaxuste: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Non se pode reaxusta-lo barco...
 STR_9842_REFITTABLE                                             :(reax.)
-STR_GO_TO_SHIP_DEPOT                                            :Ir ó Depósito de Barcos de {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Face-lo servicio no Depósito de Barcos de {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Aeroportos
@@ -2752,8 +2744,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona o tipo de carga a levar:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Cose do reaxuste: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Non se pode reaxusta-la aeronave...
-STR_GO_TO_AIRPORT_HANGAR                                        :Ir ó hangar de {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Face-lo servicio no hangar de {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Táboa de tempo)
 
--- a/src/lang/german.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/german.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2639,10 +2639,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Fahren (ohne Fahrplan)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} lang fahren
@@ -2852,8 +2848,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Fahrzeug umbenennen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Fahrzeug umbenennen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Fahrzeug kann nicht umbenannt werden...
-STR_GO_TO_ROADVEH_DEPOT                                         :Fahre zum Fahrzeugdepot {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Wartung im Fahrzeugdepot {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Straßenfahrzeug für den Transport anderer Güter umrüsten
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Straßenfahrzeug erneuern
@@ -2929,8 +2923,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Neue Kapazität: {GOLD}{CARGO}{}{BLACK}Kosten der Umrüstung: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Schiff kann nicht umgerüstet werden...
 STR_9842_REFITTABLE                                             :(umrüstbar)
-STR_GO_TO_SHIP_DEPOT                                            :Fahre zu {TOWN} Schiffswerft
-SERVICE_AT_SHIP_DEPOT                                           :Wartung in der {TOWN} Schiffswerft
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Flughäfen
@@ -3001,8 +2993,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Wähle Frachtart für Umrüstung aus:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Neue Kapazität: {GOLD}{STRING}{}{BLACK}Kosten der Umrüstung: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Flugzeug kann nicht umgerüstet werden...
-STR_GO_TO_AIRPORT_HANGAR                                        :Flug zum Hangar von {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Wartung im Hangar von {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Fahrplan)
 
--- a/src/lang/hungarian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/hungarian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2753,10 +2753,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Útipont (időzítetlen)
 STR_TIMETABLE_TRAVEL_FOR                                        :Menjen {STRING} állomásra
@@ -2966,8 +2962,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}A közúti jármű márkanevének megváltoztatása
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Márkanév megváltoztatása
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nem változtathatod meg a márkanevet...
-STR_GO_TO_ROADVEH_DEPOT                                         :Menj a  {TOWN}i garázsba
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Javítsd a járművet a {TOWN}i garázsban
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Teherautó átalakítása hogy mást is tudjon szállítani
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Teherautó átalakítása
@@ -3043,8 +3037,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Új kapacitás: {GOLD}{CARGO}{}{BLACK}Átalakítás költsége: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nem alakíthatod át a hajót...
 STR_9842_REFITTABLE                                             :(átalakítható)
-STR_GO_TO_SHIP_DEPOT                                            :Menj a {TOWN}i kikötőbe
-SERVICE_AT_SHIP_DEPOT                                           :Javítás a(z) {TOWN} hajókikötőben
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Repterek
@@ -3115,8 +3107,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Átalakítás, hogy szállíthasson:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Új kapacitás: {GOLD}{STRING}{}{BLACK}Átalakítás költsége: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nem alakíthatod át a repülőgépet...
-STR_GO_TO_AIRPORT_HANGAR                                        :Menj a {STATION} repülőtér hangárjába
-SERVICE_AT_AIRPORT_HANGAR                                       :Javítás a(z) {STATION} hangárban
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Menetrendesítve)
 
--- a/src/lang/icelandic.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/icelandic.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2651,10 +2651,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Ferðalag (ekki sett í áætlun)
 STR_TIMETABLE_TRAVEL_FOR                                        :Ferðast í {STRING}
@@ -2866,8 +2862,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Endurnefna tegund bifreiðar
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Endurnefna tegund bifreiðar
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE} Get ekki endurnefnat tegund bifreiðar...
-STR_GO_TO_ROADVEH_DEPOT                                         :Fara í {TOWN} bifreiðaskýli
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Skoða í  {TOWN} bifreiðaskýli
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Breyta bifreið svo hún flytji annan farm
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Breyta bifreið
@@ -2943,8 +2937,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ný burðargeta: {GOLD}{CARGO}{}{BLACK}Breytingarkostnaður: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Get ekki breytt skipi...
 STR_9842_REFITTABLE                                             :(breytanlegt)
-STR_GO_TO_SHIP_DEPOT                                            :Fara í {TOWN} Skipaskýli
-SERVICE_AT_SHIP_DEPOT                                           :Skoða í {TOWN} Skipaskýli
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Flugvellir
@@ -3015,8 +3007,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Veldu farm sem á að flytja:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ný burðargeta: {GOLD}{STRING}{}{BLACK}Breytingarkostnaður: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Get ekki breytt flugvél...
-STR_GO_TO_AIRPORT_HANGAR                                        :Fara í {STATION} flugskýli
-SERVICE_AT_AIRPORT_HANGAR                                       :Skoða í {STATION} flugskýli
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Áætlun)
 
--- a/src/lang/italian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/italian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2653,10 +2653,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Viaggia senza orario
 STR_TIMETABLE_TRAVEL_FOR                                        :Viaggia per {STRING}
@@ -2868,8 +2864,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rinomina il tipo di automezzo
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Rinomina tipo automezzo
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Impossibile rinominare il tipo di automezzo...
-STR_GO_TO_ROADVEH_DEPOT                                         :Vai al Deposito automezzi di {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Manutenzione al Deposito di {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Riadatta l'automezzo per trasportare un tipo di carico differente
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Riadatta l'automezzo
@@ -2945,8 +2939,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuova capacità: {GOLD}{CARGO}{}{BLACK}Costo riadattamento: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Impossibile riadattare la nave...
 STR_9842_REFITTABLE                                             :(riadattabile)
-STR_GO_TO_SHIP_DEPOT                                            :Vai al Deposito navale di {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Manutenzione al Deposito navale di {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Aeroporti
@@ -3017,8 +3009,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleziona il tipo di carico da trasportare:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuova capacità: {GOLD}{STRING}{}{BLACK}Costo riadattamento: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Impossibile riadattare l'aeromobile...
-STR_GO_TO_AIRPORT_HANGAR                                        :Vai all'Hangar di {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Manutenzione all'Hangar di {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Tabella oraria)
 
--- a/src/lang/japanese.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/japanese.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2636,10 +2636,6 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}町民の祝賀{}初列車が{STATION}駅に到着!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE}(詳細)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}列車があります
-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_TRAVEL_NOT_TIMETABLED                             :運行(未計画)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING}運行
@@ -2849,8 +2845,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}道路車両の名称を変更
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}道路車両の名称を変更
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}道路車両の名称が変更できません...
-STR_GO_TO_ROADVEH_DEPOT                                         :{TOWN}車庫へ回送
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :{TOWN}車庫で修理
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}他の貨物の種類を運送するに道路車両を再装備します
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}道路車両を再装備
@@ -2926,8 +2920,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}再装備後の容量:{GOLD}{CARGO}{}{BLACK}再装備の価格:{GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}船舶が再装備できません...
 STR_9842_REFITTABLE                                             :(再装備可)
-STR_GO_TO_SHIP_DEPOT                                            :{TOWN}造船所へ行く
-SERVICE_AT_SHIP_DEPOT                                           :{TOWN}の造船所でサービスします
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}空港
@@ -2998,8 +2990,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}運送する貨物種類を選択:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}再装備後の容量:{GOLD}{STRING}{}{BLACK}再装備価格:{GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}飛行機が再装備できません...
-STR_GO_TO_AIRPORT_HANGAR                                        :{STATION}格納庫へ行く
-SERVICE_AT_AIRPORT_HANGAR                                       : {STATION}のハンガーでサービスします
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE}(時刻表)
 
--- a/src/lang/korean.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/korean.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2651,10 +2651,6 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}{STATION}에 처음으로 기차가 도착했습니다!{}사람들이 환호성을 지릅니다!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (상세정보)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}중간에 기차가 있습니다
-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_TRAVEL_NOT_TIMETABLED                             :여행 (시간표 없음)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING}로 여행
@@ -2866,8 +2862,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}자동차 타입의 이름 지정
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}자동차 타입의 이름 지정
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}자동차 타입의 이름을 지정할 수 없습니다...
-STR_GO_TO_ROADVEH_DEPOT                                         :{TOWN} 차고로 가는 중
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :{TOWN} 차고로 점검하러 가는 중
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}자동차가 다른 종류의 화물을 싣도록 개조
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}자동차 개조
@@ -2943,8 +2937,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}새 수송량: {GOLD}{CARGO}{}{BLACK}개조 가격: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}선박을 개조할 수 없습니다...
 STR_9842_REFITTABLE                                             :(개조 가능)
-STR_GO_TO_SHIP_DEPOT                                            :{TOWN} 정박소로 가는 중
-SERVICE_AT_SHIP_DEPOT                                           :{TOWN} 정박소로 점검하러 가는 중
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}공항
@@ -3015,8 +3007,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}수송할 화물 종류 선택:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}새 수송량: {GOLD}{STRING}{}{BLACK}개조 가격: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}항공기를 개조할 수 없습니다...
-STR_GO_TO_AIRPORT_HANGAR                                        :{STATION}공항 격납고로 가는 중
-SERVICE_AT_AIRPORT_HANGAR                                       :{STATION}공항 격납고로 점검하러 가는 중
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (시간표)
 
--- a/src/lang/lithuanian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/lithuanian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2498,10 +2498,6 @@
 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_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ą
-STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT                             :Remontas nestojant {TOWN} traukiniu depe
 
 
 STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kursas i {TOWN} depa
@@ -2674,8 +2670,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Pervardinti automobiliu tipa
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Pervardinti automobiliu tipa
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Negali pervardinti automobliu tipo...
-STR_GO_TO_ROADVEH_DEPOT                                         :Kursas: {TOWN} automobiliu garazas
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Remontas: {TOWN} garaze
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti kitoki krovinio tipa
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Perkomplektuoti
@@ -2751,8 +2745,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nauja talpa: {GOLD}{CARGO}{}{BLACK}Remonto kaina: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Negalima perorientuotilaivo...
 STR_9842_REFITTABLE                                             :(perorientuotinas)
-STR_GO_TO_SHIP_DEPOT                                            :Uzduotis: laivu depas {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Remontas {TOWN} miesto laivų depe
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Oro uostai
@@ -2823,8 +2815,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Pasirink nauja kroviniu tipa:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nauja talpa: {GOLD}{STRING}{}{BLACK}Pakeitimo kaina: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Negalima pakeisti krovinio tipo...
-STR_GO_TO_AIRPORT_HANGAR                                        :Kursas: {STATION} angaras
-SERVICE_AT_AIRPORT_HANGAR                                       :Remontas {STATION} angare
 
 
 ##id 0xB000
--- a/src/lang/norwegian_bokmal.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/norwegian_bokmal.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2620,10 +2620,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Reise (uten tidstabell)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reise for {STRING}
@@ -2833,8 +2829,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Endre navnet til kjøretøytypen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Endre navnet til kjøretøytypen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan ikke endre navnet til kjøretøytypen...
-STR_GO_TO_ROADVEH_DEPOT                                         :Kjør til {TOWN} garasje
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Vedlikehold ved {TOWN} garasje
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om kjøretøyet til å ta en annen type last
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Bygg om bil
@@ -2910,8 +2904,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapasitet: {GOLD}{CARGO}{}{BLACK}Kostnad for ombygging: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan ikke bygge om skip...
 STR_9842_REFITTABLE                                             :(ombyggbart)
-STR_GO_TO_SHIP_DEPOT                                            :Seil til {TOWN} skipsdepot
-SERVICE_AT_SHIP_DEPOT                                           :Vedlikehold ved {TOWN} skipsdepot
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Flyplasser
@@ -2982,8 +2974,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Velg varetype:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapasitet: {GOLD}{STRING}{}{BLACK}Kostnad for ombygging: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan ikke bygge om flyet...
-STR_GO_TO_AIRPORT_HANGAR                                        :Fly til {STATION} hangar
-SERVICE_AT_AIRPORT_HANGAR                                       :Vedlikehold ved {STATION} hangar
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Tidstabell)
 
--- a/src/lang/norwegian_nynorsk.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/norwegian_nynorsk.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2619,10 +2619,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Reis (ikke på rutetabell)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis i  {STRING}
@@ -2831,8 +2827,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Endre namnet til køyretøytypen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Endre namnet til køyretøytypen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan ikkje endre namnet til køyretøytypen...
-STR_GO_TO_ROADVEH_DEPOT                                         :Køyr til {TOWN} garasje
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Vedlikehald ved {TOWN} garasje
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om køyretøyet til å ta ein annan type last
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Bygg om bil
@@ -2908,8 +2902,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapasitet: {GOLD}{CARGO}{}{BLACK}Ombyggingskostnader: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan ikkje bygge om skip...
 STR_9842_REFITTABLE                                             :(ombyggbart)
-STR_GO_TO_SHIP_DEPOT                                            :Seil til {TOWN} skipsdepot
-SERVICE_AT_SHIP_DEPOT                                           :Vedlikehald ved {TOWN} Skipsdepot
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Flyplassar
@@ -2980,8 +2972,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vel varetype:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapasitet: {GOLD}{STRING}{}{BLACK}Ombyggingskostnader: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan ikkje byggje om flyet...
-STR_GO_TO_AIRPORT_HANGAR                                        :Fly til {STATION} hangar
-SERVICE_AT_AIRPORT_HANGAR                                       :Service ved {STATION} Hangar.
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Rutetabell)
 
--- a/src/lang/piglatin.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/piglatin.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2609,10 +2609,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Aveltray (otnay imetabledtay)
 STR_TIMETABLE_TRAVEL_FOR                                        :Aveltray orfay {STRING}
@@ -2822,8 +2818,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Enameray oadray ehiclevay ypetay
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Enameray oadray ehiclevay ypetay
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}An'tcay enameray oadray ehiclevay ypetay...
-STR_GO_TO_ROADVEH_DEPOT                                         :Ogay otay {TOWN} Oadray Ehiclevay Epotday
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Ervicesay atway {TOWN} Oadray Ehiclevay Epotday
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Efitray oadray ehiclevay otay arrycay away ifferentday argocay ypetay
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Efitray oadray ehiclevay
@@ -2899,8 +2893,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ewnay apacitycay: {GOLD}{CARGO}{}{BLACK}Ostcay ofway efitray: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}An'tcay efitray ipshay...
 STR_9842_REFITTABLE                                             :(efittableray)
-STR_GO_TO_SHIP_DEPOT                                            :Ogay otay {TOWN} Ipshay Epotday
-SERVICE_AT_SHIP_DEPOT                                           :Ervicesay atway {TOWN} Ipshay Epotday
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Airportsway
@@ -2971,8 +2963,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Electsay argocay ypetay otay arrycay:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ewnay apacitycay: {GOLD}{STRING}{}{BLACK}Ostcay ofway efitray: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}An'tcay efitray aircraftway...
-STR_GO_TO_AIRPORT_HANGAR                                        :Ogay otay {STATION} Angarhay
-SERVICE_AT_AIRPORT_HANGAR                                       :Ervicesay atway {STATION} Angarhay
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Imetabletay)
 
--- a/src/lang/polish.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/polish.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2747,10 +2747,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Przejazd (bez ustalonego czasu)
 STR_TIMETABLE_TRAVEL_FOR                                        :Przejazd przez {STRING}
@@ -2960,8 +2956,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Zmień nazwę typu samochodu
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Zmień nazwę typu samochodu
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nie można zmienić nazwy typu samochodu...
-STR_GO_TO_ROADVEH_DEPOT                                         :Idź do zajezdni sam. w {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Serwisuj w zajezdni sam. w {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Przebudowa samochodu do przewozu innego typu ładunku
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Przebudowa samochodu
@@ -3037,8 +3031,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nowa pojemność: {GOLD}{CARGO}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nie można przebudować statku...
 STR_9842_REFITTABLE                                             :(przebudowalny)
-STR_GO_TO_SHIP_DEPOT                                            :Idź do stoczni w {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Serwisuj w stoczni w {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Lotniska
@@ -3109,8 +3101,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Wybierz typ ładunku do przewozu:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nowa pojemność: {GOLD}{STRING}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nie można przebudować samolotu...
-STR_GO_TO_AIRPORT_HANGAR                                        :Idź do hangaru na {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Serwisuj w hangarze na {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Rozkład jazdy)
 
--- a/src/lang/portuguese.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/portuguese.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2638,10 +2638,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Viagem (sem programação)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar durante {STRING}
@@ -2851,8 +2847,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomear tipo de veículo de estrada
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomear tipo de veículo de estrada
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Não é possível renomear tipo de veículo de estrada...
-STR_GO_TO_ROADVEH_DEPOT                                         :Ir para o depósito de {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Manutenção no depósito de {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Reconverter veículo para transportar outro tipo de carga
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Reconverter veículo
@@ -2928,8 +2922,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{CARGO}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Não é possível adaptar barco...
 STR_9842_REFITTABLE                                             :(adaptável)
-STR_GO_TO_SHIP_DEPOT                                            :Ir para o depósito naval de {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Manutenção no estaleiro de {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Aeroportos
@@ -3000,8 +2992,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da conversão: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Não é possível converter aeronave...
-STR_GO_TO_AIRPORT_HANGAR                                        :Ir para o hangar de {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Manutenção no hangar de {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horário)
 
--- a/src/lang/romanian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/romanian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2619,10 +2619,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Calatorie (fara orar)
 STR_TIMETABLE_TRAVEL_FOR                                        :Calatorii pentru {STRING}
@@ -2832,8 +2828,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Redenumeste modelul de autovehicul
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Redenumeste modelul autovehiculului
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nu pot redenumi modelul acestui autovehicul...
-STR_GO_TO_ROADVEH_DEPOT                                         :Mergi la Autobaza {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Service la Autobaza {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Adapteaza autovehiculul pentru o incarcatura diferita
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Adaptare autovehicul
@@ -2909,8 +2903,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{CARGO}{}{BLACK}Costul transformãrii: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nu pot schimba tipul navei...
 STR_9842_REFITTABLE                                             :(suportã alte mãrfuri)
-STR_GO_TO_SHIP_DEPOT                                            :Mergi la Santierul Naval {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Întreţinere la şantierul naval {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Airoporturi
@@ -2981,8 +2973,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege marfa de transportat:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{STRING}{}{BLACK}Costul transformãrii: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nu pot schimba tipul de încãrcãturã...
-STR_GO_TO_AIRPORT_HANGAR                                        :Mergi la Hangarul {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Întreţinere la hangarul {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Orar)
 
--- a/src/lang/russian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/russian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2659,10 +2659,6 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Жители празднуют!{}Первый поезд прибыл на станцию {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Детали)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Поезд мешает
-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_TRAVEL_NOT_TIMETABLED                             :Путешествует (не учитывается)
 STR_TIMETABLE_TRAVEL_FOR                                        :Идти до {STRING}
@@ -2872,8 +2868,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Переименовать автомобиль
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Переименовать автомобиль
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Невозможно переименовать автомобиль...
-STR_GO_TO_ROADVEH_DEPOT                                         :Ехать в гараж {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Обслуж. в гараже {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Переоборуд. авто для доставки разных видов грузов.
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Переоборуд. авто
@@ -2949,8 +2943,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Новая емкость: {GOLD}{CARGO}{}{BLACK}Стоимость переоборудования: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Не могу переоборудовать корабль......
 STR_9842_REFITTABLE                                             :(переоб.)
-STR_GO_TO_SHIP_DEPOT                                            :Плыть в Док {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Обслуживание в доке {TOWN}
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Аэропорты
@@ -3021,8 +3013,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Выберите тип груза для перевозки:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Новая емкость: {GOLD}{STRING}{}{BLACK}Стоимость переоборуд.: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Невозможно переоборудовать...
-STR_GO_TO_AIRPORT_HANGAR                                        :Лететь в Ангар {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Сервис в ангаре {STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Расписание)
 
--- a/src/lang/simplified_chinese.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/simplified_chinese.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2478,10 +2478,6 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一列火车抵达 {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (详细信息)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}指定位置有列车
-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_TRAVEL_NOT_TIMETABLED                             :旅行 (无时间表)
 STR_TIMETABLE_TRAVEL_FOR                                        :前往 {STRING} 旅行
@@ -2685,8 +2681,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}重命名汽车型号
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}重命名汽车型号
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}不能重命名汽车型号……
-STR_GO_TO_ROADVEH_DEPOT                                         :前往 {TOWN} 车库
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :在 {TOWN} 车库进行保养
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}改装汽车以装载其他货物
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}改装汽车
@@ -2762,8 +2756,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}新的装载能力:{GOLD}{CARGO}{}{BLACK}改装费用:{GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}不能改装船只……
 STR_9842_REFITTABLE                                             :(可改装)
-STR_GO_TO_SHIP_DEPOT                                            :前往 {TOWN} 船坞
-SERVICE_AT_SHIP_DEPOT                                           :在 {TOWN} 船坞保养
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}机场
@@ -2834,8 +2826,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}选择要运输的货物类型:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}新的装载能力:{GOLD}{STRING}{}{BLACK}改装费用:{GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}不能改装飞机……
-STR_GO_TO_AIRPORT_HANGAR                                        :前往 {STATION} 机库
-SERVICE_AT_AIRPORT_HANGAR                                       :在 {STATION} 机库保养
 
 
 ##id 0xB000
--- a/src/lang/slovak.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/slovak.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2714,10 +2714,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Cesta (neurcený cas)
 STR_TIMETABLE_TRAVEL_FOR                                        :Cesta do {STRING}
@@ -2929,8 +2925,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Premenovat typ automobilu
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Premenovat typ automobilu
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nemozno premenovat typ automobilu ...
-STR_GO_TO_ROADVEH_DEPOT                                         :Chod do {TOWN} garaze
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Opravit v {TOWN} garazi
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Prestavat vozidlo na prepravu ineho druhu nakladu
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Prestavat vozidlo
@@ -3006,8 +3000,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová kapacita: {GOLD}{CARGO}{}{BLACK}Cena prestavby: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nemozno prestavat lod...
 STR_9842_REFITTABLE                                             :(mozna prestavba)
-STR_GO_TO_SHIP_DEPOT                                            :Chod do {TOWN} Lodenice
-SERVICE_AT_SHIP_DEPOT                                           :Opravit v {TOWN} lodenici
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Letiska
@@ -3078,8 +3070,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vybrat typ noveho nakladu:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nová kapacita: {GOLD}{STRING}{}{BLACK}Náklady na prestavbu: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nie je mozne prestavat na novy typ nakladu ...
-STR_GO_TO_AIRPORT_HANGAR                                        :Chod do {STATION} Hangaru
-SERVICE_AT_AIRPORT_HANGAR                                       :Opravit v {STATION} hangári
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Cestovný poriadok)
 
--- a/src/lang/slovenian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/slovenian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2731,10 +2731,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Potovanje (brez časovnih tabel)
 STR_TIMETABLE_TRAVEL_FOR                                        :Potuj za {STRING}
@@ -2946,8 +2942,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Preimenuj cestno vozilo
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Preimenuj cestno vozilo
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Ni mogoče preimenovati cestnega vozila ...
-STR_GO_TO_ROADVEH_DEPOT                                         :Pojdi v garažo v mestu {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Na servis v {TOWN} cestno garažo
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Predelaj vozilo za prevoz druge vrste tovora
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Predelaj cestno vozilo
@@ -3023,8 +3017,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova zmogljivost: {GOLD}{CARGO}{}{BLACK}Cena predelave: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Ni mogoče preurediti ladje ...
 STR_9842_REFITTABLE                                             :(spremenljivo)
-STR_GO_TO_SHIP_DEPOT                                            :Pojdi v {TOWN} ladijsko garažo
-SERVICE_AT_SHIP_DEPOT                                           :Na servis v {TOWN} dok
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Letališča
@@ -3095,8 +3087,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Izberi tip tovora:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova zmogljivost: {GOLD}{STRING}{}{BLACK}Cena predelave: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Ni mogoča predelava letala ...
-STR_GO_TO_AIRPORT_HANGAR                                        :Pojdi v {STATION} hangar
-SERVICE_AT_AIRPORT_HANGAR                                       :Na servisiranje v {STATION} Hangar
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Časovna tabela)
 
--- a/src/lang/spanish.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/spanish.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2639,10 +2639,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Viaje (sin horarios)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viaje para {STRING}
@@ -2852,8 +2848,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renombrar tipo de vehículo
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renombrar tipo de vehículo
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}No se puede renombrar tipo de vehículo....
-STR_GO_TO_ROADVEH_DEPOT                                         :Ir al depósito de {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Ir al depósito de {TOWN} para mantenimiento
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Reparar vehículo de carretera para transportar otro tipo de cargas
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Reparar vehículo de carretera
@@ -2929,8 +2923,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nueva capacidad: {GOLD}{CARGO}{}{BLACK}Coste de reforma: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}No se puede reformar barco...
 STR_9842_REFITTABLE                                             :(reformable)
-STR_GO_TO_SHIP_DEPOT                                            :Ir al astillero de {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Ir al astillero de {TOWN} para mantenimiento
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Aeropuertos
@@ -3001,8 +2993,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Elige tipo de carga para llevar:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nueva capacidad: {GOLD}{STRING}{}{BLACK}Coste de reforma: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}No se puede reformar aeronave...
-STR_GO_TO_AIRPORT_HANGAR                                        :Ir al hangar de {STATION}
-SERVICE_AT_AIRPORT_HANGAR                                       :Ir al hangar de {STATION} para mantenimiento
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horarios)
 
--- a/src/lang/swedish.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/swedish.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2650,10 +2650,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Avres (Inte tillagd i tidtabell)
 STR_TIMETABLE_TRAVEL_FOR                                        :Res till {STRING}
@@ -2865,8 +2861,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Byt namn på vägfordon typ
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Byt namn på vägfordon typ
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan inte byta namn på vägfordon typ...
-STR_GO_TO_ROADVEH_DEPOT                                         :Gå till {TOWN} vägfordonsdepå
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servning vid {TOWN} vägfordonsdepå Depot
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Anpassa vägfordon till att bära en annan sorts last
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Anpassa Vägfordon
@@ -2942,8 +2936,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{CARGO}{}{BLACK}Anpassningens kostnad: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan inte anpassa skepp...
 STR_9842_REFITTABLE                                             :(anpassningsbart)
-STR_GO_TO_SHIP_DEPOT                                            :Åk till {TOWN}s båtdepå
-SERVICE_AT_SHIP_DEPOT                                           :Service vid {TOWN} båtdepå
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Flygplatser
@@ -3014,8 +3006,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Välj godstyp att frakta:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Kostnad av anpassning: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan inte anpassa flygplan...
-STR_GO_TO_AIRPORT_HANGAR                                        :Gå till {STATION}s hangar
-SERVICE_AT_AIRPORT_HANGAR                                       :Service vid {STATION} hangar
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Tidtabell)
 
--- a/src/lang/traditional_chinese.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/traditional_chinese.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2615,10 +2615,6 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛列車抵達 {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (詳細資料)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}前方有列車
-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_TRAVEL_NOT_TIMETABLED                             :漫遊 (無時刻表)
 STR_TIMETABLE_TRAVEL_FOR                                        :通行於 {STRING}
@@ -2827,8 +2823,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}為車輛類型更名
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}為車輛類型更名
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}無法為車輛類型更名...
-STR_GO_TO_ROADVEH_DEPOT                                         :前往 {TOWN} 車庫
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :在 {TOWN} 車庫維護
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}改裝車輛以運送不同的酬載
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}改裝車輛
@@ -2904,8 +2898,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}新容量:{GOLD}{CARGO}{}{BLACK}改裝費用:{GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}無法改裝船舶...
 STR_9842_REFITTABLE                                             :(可改裝)
-STR_GO_TO_SHIP_DEPOT                                            :前往 {TOWN} 船塢
-SERVICE_AT_SHIP_DEPOT                                           :在{TOWN}船塢進行維修
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}機場
@@ -2976,8 +2968,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}選擇要運送的酬載種類:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}新容量:{GOLD}{STRING}{}{BLACK}改裝費用:{GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}無法改裝飛機...
-STR_GO_TO_AIRPORT_HANGAR                                        :前往 {STATION} 機棚
-SERVICE_AT_AIRPORT_HANGAR                                       :在{STATION}機棚進行檢修
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (時刻表)
 
--- a/src/lang/turkish.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/turkish.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2649,10 +2649,6 @@
 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_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_TRAVEL_NOT_TIMETABLED                             :Gezi (zamanlı değil)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} için gezi
@@ -2862,8 +2858,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Araç türünü yeniden adlandır
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Araç türünü yeniden adlandır
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Araç türü yeniden adlandırılamıyor...
-STR_GO_TO_ROADVEH_DEPOT                                         :Garaja git: {TOWN}
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servise git: {TOWN} Garaji
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Kamyonu başka türde kargo taşıyabilmesi için modifiye et
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Kamyonu modifiye et
@@ -2939,8 +2933,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Yeni kapasite: {GOLD}{CARGO}{}{BLACK}Modifiye fiyatı: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Modifiye edilemez...
 STR_9842_REFITTABLE                                             :(modifiyeli)
-STR_GO_TO_SHIP_DEPOT                                            :Git: {TOWN} Tersanesi
-SERVICE_AT_SHIP_DEPOT                                           :Servis: {TOWN} Tersanesi
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Havalimanları
@@ -3011,8 +3003,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Tasinacak kargoyu seçin:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Yeni kapasite: {GOLD}{STRING}{}{BLACK}Modifiye fiyatı: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Modifiye edilemez...
-STR_GO_TO_AIRPORT_HANGAR                                        :{STATION} Hangarına git
-SERVICE_AT_AIRPORT_HANGAR                                       :Servis: {STATION} Hangarı
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Zaman çizelgesi)
 
--- a/src/lang/ukrainian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/ukrainian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -2812,10 +2812,6 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший поїзд з'явився на {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Детально)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Поїзд на шляху
-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_TRAVEL_NOT_TIMETABLED                             :Прямує (не за розкладом)
 STR_TIMETABLE_TRAVEL_FOR                                        :Прямує до {STRING}
@@ -3027,8 +3023,6 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Перейменувати тип авто
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Перейменувати тип авто
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Неможливо перейменувати тип авто...
-STR_GO_TO_ROADVEH_DEPOT                                         :Їхати в {TOWN} депо
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Ремонтуватись в {TOWN} депо
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Переобладнати авто для перевезення інших вантажів
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Переобладнати авто
@@ -3104,8 +3098,6 @@
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Нова місткість: {GOLD}{CARGO}{}{BLACK}Вартість переобладнання: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Неможливо переобладнати корабель...
 STR_9842_REFITTABLE                                             :(змінюється)
-STR_GO_TO_SHIP_DEPOT                                            :Пливти в {TOWN} депо
-SERVICE_AT_SHIP_DEPOT                                           :Ремонтуватись в {TOWN} депо
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Аеропорти
@@ -3176,8 +3168,6 @@
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Виберіть вид вантажу для перевезення:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Нова місткість: {GOLD}{STRING}{}{BLACK}Вартість переобладнання: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Неможливо переобладнати літак...
-STR_GO_TO_AIRPORT_HANGAR                                        :Летіти в {STATION} ангар
-SERVICE_AT_AIRPORT_HANGAR                                       :Ремонтуватись в {STATION} ангарі
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (розклад)
 
--- a/src/lang/unfinished/frisian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/unfinished/frisian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -1229,11 +1229,9 @@
 
 ##id 0x9800
 
-SERVICE_AT_SHIP_DEPOT                                           :Underhâld yn {TOWN} Skipswerf
 
 ##id 0xA000
 
-SERVICE_AT_AIRPORT_HANGAR                                       :Underhâld yn {STATION} Hangar
 
 ##id 0xB000
 
--- a/src/lang/unfinished/greek.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/unfinished/greek.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -1942,11 +1942,9 @@
 
 ##id 0x9800
 
-SERVICE_AT_SHIP_DEPOT                                           :Επισκευή στη Λιμεναποθήκη της πόλης {TOWN}
 
 ##id 0xA000
 
-SERVICE_AT_AIRPORT_HANGAR                                       :Επισκευή στο υπόστεγο {STATION}
 
 ##id 0xB000
 
--- a/src/lang/unfinished/latvian.txt	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/lang/unfinished/latvian.txt	Fri Apr 11 14:27:18 2008 +0000
@@ -1772,7 +1772,6 @@
 STR_8104_AIRCRAFT                                               :lidmaðîna
 
 ##id 0x8800
-STR_GO_TO_TRAIN_DEPOT                                           :Uz {TOWN} Vilcienu Depo
 
 
 
@@ -1799,7 +1798,6 @@
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Atrums: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
 
 STR_9034_RENAME                                                 :{BLACK}Pârsaukt
-STR_GO_TO_ROADVEH_DEPOT                                         :Dodas uz {TOWN} ceļa mašīnu depo
 
 
 ##id 0x9800
@@ -1821,7 +1819,6 @@
 STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Uzbûvet jauno kuìi
 
 STR_9836_RENAME                                                 :{BLACK}Pârsaukt
-SERVICE_AT_SHIP_DEPOT                                           :Apkalpošana {TOWN} kuģubūvētavā
 
 ##id 0xA000
 STR_A00A                                                        :{WHITE}{VEHICLE}
@@ -1829,8 +1826,6 @@
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lidmaðînas avârija!{}Lidmaðînai pietrûka degviela, {COMMA} nogalinâti!
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Pârsaukt
-STR_GO_TO_AIRPORT_HANGAR                                        :Uz {STATION} Angâru
-SERVICE_AT_AIRPORT_HANGAR                                       :Apkalpošana {STATION} angārā
 
 
 ##id 0xB000
--- a/src/order_gui.cpp	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/order_gui.cpp	Fri Apr 11 14:27:18 2008 +0000
@@ -234,8 +234,6 @@
 		SetDParam(5, STR_EMPTY);
 
 		if (i - w->vscroll.pos < w->vscroll.cap) {
-			SetDParam(1, 6);
-
 			switch (order->GetType()) {
 				case OT_DUMMY:
 					SetDParam(1, STR_INVALID_ORDER);
@@ -252,39 +250,40 @@
 					SetDParam(4, (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) ? STR_EMPTY : _station_load_types[unload][load]);
 				} break;
 
-				case OT_GOTO_DEPOT: {
-					StringID s = STR_NULL;
-
+				case OT_GOTO_DEPOT:
 					if (v->type == VEH_AIRCRAFT) {
-						s = STR_GO_TO_AIRPORT_HANGAR;
-						SetDParam(2, order->GetDestination());
+						SetDParam(1, STR_GO_TO_HANGAR);
+						SetDParam(3, order->GetDestination());
 					} else {
-						SetDParam(2, GetDepot(order->GetDestination())->town_index);
+						SetDParam(1, STR_GO_TO_DEPOT);
+						SetDParam(3, GetDepot(order->GetDestination())->town_index);
 
 						switch (v->type) {
-							case VEH_TRAIN: s = (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break;
-							case VEH_ROAD:  s = STR_GO_TO_ROADVEH_DEPOT; break;
-							case VEH_SHIP:  s = STR_GO_TO_SHIP_DEPOT; break;
-							default: break;
+							case VEH_TRAIN: SetDParam(4, STR_ORDER_TRAIN_DEPOT); break;
+							case VEH_ROAD:  SetDParam(4, STR_ORDER_ROAD_DEPOT); break;
+							case VEH_SHIP:  SetDParam(4, STR_ORDER_SHIP_DEPOT); break;
+							default: NOT_REACHED();
 						}
 					}
 
-					if (order->GetDepotOrderType() & ODTFB_SERVICE) s++; // service at
+					if (order->GetDepotOrderType() & ODTFB_SERVICE) {
+						SetDParam(2, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_SERVICE_NON_STOP_AT : STR_ORDER_SERVICE_AT);
+					} else {
+						SetDParam(2, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_GO_NON_STOP_TO : STR_ORDER_GO_TO);
+					}
 
-					SetDParam(1, s);
 					if (order->IsRefit()) {
 						SetDParam(5, STR_REFIT_ORDER);
 						SetDParam(6, GetCargo(order->GetRefitCargo())->name);
 					}
 					break;
-				}
 
 				case OT_GOTO_WAYPOINT:
 					SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);
 					SetDParam(2, order->GetDestination());
 					break;
 
-				default: break;
+				default: NOT_REACHED();
 			}
 
 			SetDParam(0, i + 1);
--- a/src/timetable_gui.cpp	Fri Apr 11 13:19:44 2008 +0000
+++ b/src/timetable_gui.cpp	Fri Apr 11 14:27:18 2008 +0000
@@ -133,27 +133,28 @@
 
 					break;
 
-				case OT_GOTO_DEPOT: {
-					StringID string = STR_EMPTY;
-
+				case OT_GOTO_DEPOT:
 					if (v->type == VEH_AIRCRAFT) {
-						string = STR_GO_TO_AIRPORT_HANGAR;
-						SetDParam(1, order->GetDestination());
+						SetDParam(0, STR_GO_TO_HANGAR);
+						SetDParam(2, order->GetDestination());
 					} else {
-						SetDParam(1, GetDepot(order->GetDestination())->town_index);
+						SetDParam(0, STR_GO_TO_DEPOT);
+						SetDParam(2, GetDepot(order->GetDestination())->town_index);
 
 						switch (v->type) {
-							case VEH_TRAIN: string = (order->GetNonStopType() != ONSF_STOP_EVERYWHERE) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break;
-							case VEH_ROAD:  string = STR_GO_TO_ROADVEH_DEPOT; break;
-							case VEH_SHIP:  string = STR_GO_TO_SHIP_DEPOT; break;
-							default: break;
+							case VEH_TRAIN: SetDParam(3, STR_ORDER_TRAIN_DEPOT); break;
+							case VEH_ROAD:  SetDParam(3, STR_ORDER_ROAD_DEPOT); break;
+							case VEH_SHIP:  SetDParam(3, STR_ORDER_SHIP_DEPOT); break;
+							default: NOT_REACHED();
 						}
 					}
 
-					if (order->GetDepotOrderType() & ODTFB_SERVICE) string++; /* service at */
-
-					SetDParam(0, string);
-				} break;
+					if (order->GetDepotOrderType() & ODTFB_SERVICE) {
+						SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_SERVICE_NON_STOP_AT : STR_ORDER_SERVICE_AT);
+					} else {
+						SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_GO_NON_STOP_TO : STR_ORDER_GO_TO);
+					}
+					break;
 
 				case OT_GOTO_WAYPOINT:
 					SetDParam(0, (order->GetNonStopType() != ONSF_STOP_EVERYWHERE) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);