summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/group_gui.cpp83
-rw-r--r--src/lang/afrikaans.txt21
-rw-r--r--src/lang/arabic_egypt.txt21
-rw-r--r--src/lang/brazilian_portuguese.txt21
-rw-r--r--src/lang/bulgarian.txt21
-rw-r--r--src/lang/catalan.txt21
-rw-r--r--src/lang/croatian.txt21
-rw-r--r--src/lang/czech.txt21
-rw-r--r--src/lang/danish.txt21
-rw-r--r--src/lang/dutch.txt21
-rw-r--r--src/lang/english.txt41
-rw-r--r--src/lang/english_US.txt21
-rw-r--r--src/lang/esperanto.txt19
-rw-r--r--src/lang/estonian.txt21
-rw-r--r--src/lang/finnish.txt21
-rw-r--r--src/lang/french.txt21
-rw-r--r--src/lang/galician.txt21
-rw-r--r--src/lang/german.txt21
-rw-r--r--src/lang/hebrew.txt21
-rw-r--r--src/lang/hungarian.txt21
-rw-r--r--src/lang/icelandic.txt21
-rw-r--r--src/lang/indonesian.txt21
-rw-r--r--src/lang/italian.txt21
-rw-r--r--src/lang/japanese.txt20
-rw-r--r--src/lang/korean.txt21
-rw-r--r--src/lang/latvian.txt21
-rw-r--r--src/lang/lithuanian.txt18
-rw-r--r--src/lang/luxembourgish.txt21
-rw-r--r--src/lang/norwegian_bokmal.txt21
-rw-r--r--src/lang/norwegian_nynorsk.txt21
-rw-r--r--src/lang/polish.txt21
-rw-r--r--src/lang/portuguese.txt21
-rw-r--r--src/lang/romanian.txt21
-rw-r--r--src/lang/russian.txt21
-rw-r--r--src/lang/serbian.txt9
-rw-r--r--src/lang/simplified_chinese.txt21
-rw-r--r--src/lang/slovak.txt21
-rw-r--r--src/lang/slovenian.txt21
-rw-r--r--src/lang/spanish.txt21
-rw-r--r--src/lang/swedish.txt21
-rw-r--r--src/lang/traditional_chinese.txt21
-rw-r--r--src/lang/turkish.txt21
-rw-r--r--src/lang/ukrainian.txt21
-rw-r--r--src/lang/unfinished/greek.txt1
-rw-r--r--src/lang/unfinished/macedonian.txt2
-rw-r--r--src/lang/unfinished/persian.txt6
-rw-r--r--src/lang/welsh.txt21
-rw-r--r--src/vehicle_gui.cpp83
48 files changed, 217 insertions, 863 deletions
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 4b06ab7d8..7075d94c5 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -379,56 +379,24 @@ public:
WIDGET_LIST_END);
+ this->widget[GRP_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vehicle_type;
+
/* If selected_group == DEFAULT_GROUP || ALL_GROUP, draw the standard caption
- We list all vehicles or ungrouped vehicles */
+ * We list all vehicles or ungrouped vehicles */
if (IsDefaultGroupID(this->group_sel) || IsAllGroupID(this->group_sel)) {
- SetDParam(0, owner);
- SetDParam(1, this->vehicles.Length());
-
- switch (this->vehicle_type) {
- case VEH_TRAIN:
- this->widget[GRP_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_CAPTION;
- this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_TRAIN;
- break;
- case VEH_ROAD:
- this->widget[GRP_WIDGET_CAPTION].data = STR_VEHICLE_LIST_ROAD_CAPTION;
- this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_ROADVEH;
- break;
- case VEH_SHIP:
- this->widget[GRP_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHIP_CAPTION;
- this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_SHIP;
- break;
- case VEH_AIRCRAFT:
- this->widget[GRP_WIDGET_CAPTION].data = STR_VEHICLE_LIST_AIRCRAFT_CAPTION;
- this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_AIRCRAFT;
- break;
- default: NOT_REACHED();
- }
+ SetDParam(0, STR_COMPANY_NAME);
+ SetDParam(1, owner);
+ SetDParam(2, this->vehicles.Length());
+
+ this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_TRAIN; + this->vehicle_type;
} else {
const Group *g = Group::Get(this->group_sel);
- SetDParam(0, g->index);
- SetDParam(1, g->num_vehicle);
-
- switch (this->vehicle_type) {
- case VEH_TRAIN:
- this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_TRAINS_CAPTION;
- this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_TRAIN : SPR_GROUP_REPLACE_OFF_TRAIN;
- break;
- case VEH_ROAD:
- this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_ROADVEH_CAPTION;
- this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_ROADVEH : SPR_GROUP_REPLACE_OFF_ROADVEH;
- break;
- case VEH_SHIP:
- this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_SHIPS_CAPTION;
- this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_SHIP : SPR_GROUP_REPLACE_OFF_SHIP;
- break;
- case VEH_AIRCRAFT:
- this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_AIRCRAFTS_CAPTION;
- this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_AIRCRAFT : SPR_GROUP_REPLACE_OFF_AIRCRAFT;
- break;
- default: NOT_REACHED();
- }
+ SetDParam(0, STR_GROUP_NAME);
+ SetDParam(1, g->index);
+ SetDParam(2, g->num_vehicle);
+
+ this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = ((g->replace_protection) ? SPR_GROUP_REPLACE_ON_TRAIN : SPR_GROUP_REPLACE_OFF_TRAIN) + this->vehicle_type;
}
/* Set text of sort by dropdown */
@@ -438,32 +406,11 @@ public:
/* Draw Matrix Group
* The selected group is drawn in white */
- StringID str_all_veh, str_no_group_veh;
-
- switch (this->vehicle_type) {
- case VEH_TRAIN:
- str_all_veh = STR_GROUP_ALL_TRAINS;
- str_no_group_veh = STR_GROUP_DEFAULT_TRAINS;
- break;
- case VEH_ROAD:
- str_all_veh = STR_GROUP_ALL_ROADS;
- str_no_group_veh = STR_GROUP_DEFAULT_ROADS;
- break;
- case VEH_SHIP:
- str_all_veh = STR_GROUP_ALL_SHIPS;
- str_no_group_veh = STR_GROUP_DEFAULT_SHIPS;
- break;
- case VEH_AIRCRAFT:
- str_all_veh = STR_GROUP_ALL_AIRCRAFTS;
- str_no_group_veh = STR_GROUP_DEFAULT_AIRCRAFTS;
- break;
- default: NOT_REACHED();
- }
- DrawString(this->widget[GRP_WIDGET_LIST_GROUP].left + 10, this->widget[GRP_WIDGET_LIST_GROUP].right, y1, str_all_veh, IsAllGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
+ DrawString(this->widget[GRP_WIDGET_LIST_GROUP].left + 10, this->widget[GRP_WIDGET_LIST_GROUP].right, y1, STR_GROUP_ALL_TRAINS + this->vehicle_type, IsAllGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
y1 += 13;
- DrawString(this->widget[GRP_WIDGET_LIST_GROUP].left + 10, this->widget[GRP_WIDGET_LIST_GROUP].right, y1, str_no_group_veh, IsDefaultGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
+ DrawString(this->widget[GRP_WIDGET_LIST_GROUP].left + 10, this->widget[GRP_WIDGET_LIST_GROUP].right, y1, STR_GROUP_DEFAULT_TRAINS + this->vehicle_type, IsDefaultGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
max = min(this->vscroll2.pos + this->vscroll2.cap, this->groups.Length());
for (i = this->vscroll2.pos ; i < max ; ++i) {
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index 8893fcdef..5be14bd8b 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -1170,7 +1170,6 @@ STR_WAYPOINT :{WHITE}Wegpunt
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Kies wegpunt tipe
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Trein{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Redigeer wegpunt naam
@@ -2670,7 +2669,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nuwe Voe
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Trein te lank
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Treine kan slegs verander word as hulle in die depot gestop is
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Trein{P "" e}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trein{P "" e}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nuwe Spoor Voertuie
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nuwe Elektries Spoor Voertuie
@@ -2801,7 +2800,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Vul die
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Pad voertuig in die pad
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Pad voert{P uig uie}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Pad voert{P uig uie}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Pad Voertuig Depot
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nuwe Voertuie
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nuwe Pad Voertuie
@@ -2863,7 +2862,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Waterwe
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kan nie werf hier bou nie...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Skip Depot
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nuwe Skepe
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Skeep{P "" e}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Skeep{P "" e}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nuwe Skepe
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Bou Skip
STR_CLONE_SHIP :{BLACK}Kloon Skip
@@ -2927,7 +2926,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Dit sal
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nuwe Vliegtuig
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Bou Vliegtuig
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Kan nie vliegtuig bou nie...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Vliegtuie
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Vliegtuie
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan nie vlietuig na hangar stuur nie...
STR_HEADING_FOR_HANGAR :{ORANGE}Op pad na {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Op pad na {STATION} Hangar, {VELOCITY}
@@ -3115,10 +3114,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Trein{P "" e}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Pad Voertui{P g e}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Vliegtuig
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Sk{P ip epe}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Toon alle treine wat hierdie stasie op hul skedule het
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Toon alle pad voertuie wat hierdie stasie op hul skedule het
@@ -3147,10 +3142,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Outoverv
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Outovervang alle skepe in die depot
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Outovervang alle vlietuie in die hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Trein{P "" e}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Pad Voertui{P g e}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Sk{P ip epe}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Vliegtuig
STR_REPLACE_VEHICLES_WHITE :{WHITE}Vervang {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Begin Voertuie Vervang
@@ -3361,10 +3352,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Voeg gedeel voertuie
STR_GROUP_REMOVE_ALL_VEHICLES :Verwyder alle voertuie
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Trein{P "" e}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Pad Voer{P tuig tuie}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Sk{P ip epe}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Vliegtuie
STR_GROUP_RENAME_CAPTION :{BLACK}Hernoem groep
STR_GROUP_CAN_T_CREATE :{WHITE}Kan nie groep skep nie...
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 39945066c..06dd0a331 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE} نقط
STR_WAYPOINT_GRAPHICS_TIP :{BLACK} اختر نوع نقطة العبور
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} قطار
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}عدل اسم نقطة العبور
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}عربا
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}القطار طويل جدا
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}يمكن تعديل القطارعندما يكون متوقف في ورشة الصيانة
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA}قطار
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA}قطار
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}عربات قطار جديدة
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}عربات قطار كهربائية جديدة
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}املأ
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}العربة في الطريق
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA}عربة
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA}عربة
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} ورشة صيانة العربات
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}عربات جديدة
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}عربات جديدة
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}ممرا
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}لا يمكن بناء مرفء هنا ...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN}حوض صيانة السفن
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}سفين جديدة
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} سفينة
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} سفينة
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}سفن جديدة
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}شراء سفينة
STR_CLONE_SHIP :{BLACK}انسخ السفينة
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}هذا
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}طائرة جديدة
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}شراء طائرة
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}لا يمكن شراء الطائرة
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} طائرة
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} طائرة
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}لا يمكن ارسال الطائرة لحظيرةالصيانة
STR_HEADING_FOR_HANGAR :{ORANGE}متوجه لحظيرة {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}تتوجة الى حظيرة {STATION}, {VELOCITY}
@@ -3188,10 +3187,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} قطار
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} عربة
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} طائرة
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} سفينة
STR_SCHEDULED_TRAINS_TIP :{BLACK} عرض جميع القطارات المرتبطة بهذه المحطة
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK} عرض جميع العربات المرتبطة بهذه المحطة
@@ -3220,10 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}بدل
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}بدل جميع السفن في حوض السفن آلياً
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}بدل جميع الطائرات في الحظيرة آلياً
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} قطار
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} عربة
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} سفينة
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} طائرة
STR_REPLACE_VEHICLES_WHITE :{WHITE} تبديل {STRING}
STR_REPLACE_VEHICLES_START :{BLACK} بدأ تبديل العربات
@@ -3439,10 +3430,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :اضافة عربات مشتركة
STR_GROUP_REMOVE_ALL_VEHICLES :أزل جميع المركبات
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA}قطار
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} العربات
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} السفن
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} طائرة
STR_GROUP_RENAME_CAPTION :{BLACK}إعادة تسمية مجموعة
STR_GROUP_CAN_T_CREATE :{WHITE}لايمكن إنشاء مجموعة
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 6b2b8744e..c0b8ddbce 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -1197,7 +1197,6 @@ STR_WAYPOINT :{WHITE}Ponto de
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Selecione um tipo de ponto de controle
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Trem{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Editar nome do ponto de controle
@@ -2718,7 +2717,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Novos Ve
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Trem muito longo
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Os trens só podem ser alterados quando parados num depósito
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Trens
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trens
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Novos Veículos Ferroviários
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nova Locomotiva Elétrica
@@ -2865,7 +2864,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Preenche
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Automóvel no caminho
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Automóve{P l is}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Automóve{P l is}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Garagem
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Novos Veículos
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Novos Automóveis
@@ -2928,7 +2927,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Hidrovia
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Impossível construir doca aqui...
STR_DEPOT_SHIP_CAPTION :{WHITE}Depósito Naval de {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Novas Embarcações
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Embarcaç{P ão ões}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Embarcaç{P ão ões}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Novas Embarcações
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construir Embarcação
STR_CLONE_SHIP :{BLACK}Clonar Embarcação
@@ -2993,7 +2992,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Isso vai
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nova Aeronave
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Construir Aeronave
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Impossível construir aeronave...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Aeronaves
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronaves
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Impossível enviar aeronave para o hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Indo para o hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Indo para o hangar de {STATION}, {VELOCITY}
@@ -3189,10 +3188,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Tre{P m ns}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Automóve{P l is}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aeronave
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Embarcaç{P ão ões}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Exibir todos os trens que possuem esta estação nas ordens de serviço
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Exibir todos os automóveis que possuem esta estação nas ordens de serviço
@@ -3221,10 +3216,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autosubs
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autosubstituir todos as embarcações no depósito naval
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autosubstituir todas as aeronaves no hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tre{P m ns}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Automóve{P l is}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Embarcaç{P ão ões}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Aeronave{P "" s}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Substituir {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Iniciar Substituição
@@ -3440,10 +3431,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Adicionar veículos compartilhados
STR_GROUP_REMOVE_ALL_VEHICLES :Remover todos os veículos
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tre{P m ns}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Automóve{P l is}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Embarcaç{P ão ões}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Aeronave{P "" s}
STR_GROUP_RENAME_CAPTION :{BLACK}Renomear um grupo
STR_GROUP_CAN_T_CREATE :{WHITE}Impossível criar grupo...
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index ac029ed62..e47f95c4c 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -1176,7 +1176,6 @@ STR_WAYPOINT :{WHITE}Пътн
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Избор тип на пътни точки
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Влак{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Редакция името на пътна точка
@@ -2691,7 +2690,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Нови
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Влакът е прекалено дълъг
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Влаковете могат да бъдат променяни само когато са спрени в депото
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Влак{P "" ове}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Влак{P "" ове}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Нови Машини за Двурелсов път
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Нови електрически влакове
@@ -2825,7 +2824,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Запъ
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Кола на пътя
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Кол{P а и}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Кол{P а и}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} гараж за коли
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Ново превозно средство
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Нова кола
@@ -2888,7 +2887,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Воде
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Не може да построиш пристанище тук...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Корабно депо
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Нови Кораби
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Кораб{P "" и}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Кораб{P "" и}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Нови Кораби
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Купи Кораб
STR_CLONE_SHIP :{BLACK}Клониране на кораб
@@ -2953,7 +2952,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Така
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Ново самолет
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Строене на самолет
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Не може да построи самолет...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Самолет
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Самолет
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Не може да изпрати самолета в хангар...
STR_HEADING_FOR_HANGAR :{ORANGE}Отиващ към Хангара на летище {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Отиващ към Хангара на летище {STATION}, {VELOCITY}
@@ -3137,10 +3136,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Влак{P "" ове}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Автомобил{P "" и}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Самолет{P "" и}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Кораб{P "" и}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Показване на всички влакове които минават през гарата
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Показване на всички автомобили които минават през гарата
@@ -3169,10 +3164,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Авто
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Автоматична замяна на всички кораби в депото
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Автоматична замяна на всички самолети в хангара
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Влак{P "" ове}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Автомобил{P "" и}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Кораб{P "" и}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Самолет{P "" и}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Замяна {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Започване замяната
@@ -3385,10 +3376,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Добави споделени превозни средства
STR_GROUP_REMOVE_ALL_VEHICLES :Премахни всички превозни средсва
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Влак{P "" s}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Пътно Превозно Средство{P "" s}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Кораб{P "" s}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Самолет
STR_GROUP_RENAME_CAPTION :{BLACK}Преименовай група
STR_GROUP_CAN_T_CREATE :{WHITE}Групата неможе да бъде създадена...
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index c4bf3aaa6..6ba37773c 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Punt de
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Selecciona tipus de punt de control
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Tren{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Edita nom de punt de control
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nous Veh
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Tren massa llarg
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Els trens només es poden modificar quan estan parats dins d'una cotxera
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Trens
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trens
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nous Trens
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nous Trens de Via Electrificada
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Omple au
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Automòbil en camí
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Vehicles
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vehicles
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Cotxera de Vehicles
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nous Vehicles
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nous Vehicles
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vies d'a
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Aquí no es pot construir un port...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Drassana
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nous Vaixells
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Vaixells
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Vaixells
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nous Vaixells
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construeix Vaixell
STR_CLONE_SHIP :{BLACK}Clona Vaixell
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Fa una c
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nou Avió
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Construeix Avió
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}No es pot construir l'avió...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Avions
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Avions
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}No es pot enviar l'avió a l'hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Cap a l'hangar de {STATION}.
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Cap a l'hangar de {STATION}, a {VELOCITY}
@@ -3188,10 +3187,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Trens
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Vehicles
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Avions
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Vaixells
STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostra tots els trens que tinguin aquesta estació en el seu itinerari
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostra tots els vehicles que tinguin aquesta estació en el seu itinerari
@@ -3220,10 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autosubs
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autosubstitueix tots els vaixells de la drassana
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autosubstitueix tots els avions de l'hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tren{P "" s}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Vehicle{P "" s}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Vaixell{P "" s}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Avió
STR_REPLACE_VEHICLES_WHITE :{WHITE}Substitueix {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Comença a substituir
@@ -3439,10 +3430,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Afegeix vehicles compartits
STR_GROUP_REMOVE_ALL_VEHICLES :Treu tots els vehicles
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tren{P "" s}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Vehicle{P "" s}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Vaixell{P "" s}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Avió
STR_GROUP_RENAME_CAPTION :{BLACK}Canvia de nom el grup
STR_GROUP_CAN_T_CREATE :{WHITE}No puc crear el grup...
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index a9559b620..7ff2b9849 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -1252,7 +1252,6 @@ STR_WAYPOINT :{WHITE}Čvoriš
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Odaberi vrstu čvorišta
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} vlak{P "" a ova}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Promijeni ime čvorišta
@@ -2769,7 +2768,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nova voz
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Predugačak vlak
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Vlakovi mogu biti izmjenjeni jedino kad su zaustavljeni u spremištu
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} vlak{P "" a ova}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} vlak{P "" a ova}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nova željeznička vozila
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nova električna pružna vozila
@@ -2901,7 +2900,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Automats
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Cestovno vozilo na putu
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} cestovn{P o a ih} vozil{P o a a}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} cestovn{P o a ih} vozil{P o a a}
STR_DEPOT_ROAD_CAPTION :{WHITE}Spremište cestovnih vozila grada {TOWN}a
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nova vozila
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nova cestovna vozila
@@ -2964,7 +2963,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Plovni k
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Ovdje nije moguće izgraditi pristanište...
STR_DEPOT_SHIP_CAPTION :{WHITE} Spremište brodova grada {TOWN}a
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Novi brodovi
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} brod{P "" a ova}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} brod{P "" a ova}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Novi brodovi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Izgradi brod
STR_CLONE_SHIP :{BLACK}Kloniraj brod
@@ -3029,7 +3028,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Ovo će
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Novi zrakoplov
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Izgradi zrakoplov
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nije moguće izgraditi zrakoplov...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} zrakoplova
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} zrakoplova
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Nije moguće poslati zrakoplov u hangar
STR_HEADING_FOR_HANGAR :{ORANGE}Putuje prema hangaru {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Putuje prema hangaru {STATION}, {VELOCITY}
@@ -3214,10 +3213,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} vlak{P "" a ova}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} cestovn{P o a ih} vozil{P o a a}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Zrakoplov
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} brod{P "" a ova}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Pokaži sve vlakove koji imaju ovu postaju u svom rasporedu
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Prikaži sva cestovna vozila koja imaju ovu postaju u svom rasporedu
@@ -3246,10 +3241,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Automats
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Automatski zamijeni sve brodove u spremištu
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Automatski zamijeni sve zrakoplove u spremištu
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} vlak{P "" a ova}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} cestovn{P o a ih} vozil{P o a a}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} brod{P "" a ova}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} zrakoplova
STR_REPLACE_VEHICLES_WHITE :{WHITE}Zamijeni {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Počni zamijenjivati vozila
@@ -3464,10 +3455,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Dodaj dijeljena vozila
STR_GROUP_REMOVE_ALL_VEHICLES :Ukloni sva vozila
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} vlak{P "" a ova}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Cestovno vozil{P o a a}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} brod{P "" a ova}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Zrakoplov
STR_GROUP_RENAME_CAPTION :{BLACK}Preimenuj grupu
STR_GROUP_CAN_T_CREATE :{WHITE}Nije moguće kreirati grupu...
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 923b7b660..538b78d1a 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -1264,7 +1264,6 @@ STR_WAYPOINT :{WHITE}Směrov
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vyber typ stavědla
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} vlak{P "" y ů}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Přejmenovat stavědlo
@@ -2791,7 +2790,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nová vo
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Příliš dlouhý vlak
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Vlaky lze měnit, jen když stojí v depu
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} vlak{P "" y ů}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} vlak{P "" y ů}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nové lokomotivy a vagony
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nové elektrické lokomotivy a vagony
@@ -2936,7 +2935,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Automati
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Silniční vozidlo v cestě
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} silniční{P "" "" ch} vozid{P lo la el}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} silniční{P "" "" ch} vozid{P lo la el}
STR_DEPOT_ROAD_CAPTION :{WHITE}Garáže pro silniční vozidla {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nová vozidla
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nová silniční vozidla
@@ -2999,7 +2998,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vodní k
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Zde nelze postavit přístav...
STR_DEPOT_SHIP_CAPTION :{WHITE}Lodní depo {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nové lodě
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} lo{P ď dě dí}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} lo{P ď dě dí}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nové lodě
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Koupit loď
STR_CLONE_SHIP :{BLACK}Klonovat loď
@@ -3064,7 +3063,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Vytvoř
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nové letadlo
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Koupit letadlo
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nelze koupit letadlo...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} letad{P lo la el}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} letad{P lo la el}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Nelze poslat letadlo do hangáru...
STR_HEADING_FOR_HANGAR :{ORANGE}Jedu do hangáru {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Jedu do hangáru {STATION}, {VELOCITY}
@@ -3260,10 +3259,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} vlak{P "" y ů}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} silniční{P "" "" ch} vozid{P lo la el}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} letad{P lo la el}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} lo{P ď dě dí}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Zobrazit všechny vlaky, které mají tuto stanici v jízdním řádu
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Zobrazit všechna silniční vozidla, která mají tuto stanici v jízdním řádu
@@ -3292,10 +3287,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Nechat a
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Nechat automaticky vyměňovat všechny lodě přítomné v depu
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Nechat automaticky vyměňovat všechna letadla a vrtulníky přítomné v hangáru
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} vlak{P "" y ů}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} silniční{P "" "" ch} vozid{P lo la el}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} lo{P ď dě dí}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} letad{P lo la el}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Vyměňování {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Zapnout vyměňování
@@ -3511,10 +3502,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Přidat sdílená vozidla
STR_GROUP_REMOVE_ALL_VEHICLES :Odstranit všechna vozidla
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} vlak{P "" y ů}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} silniční{P "" "" ch} vozid{P lo la el}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} lo{P ď dě dí}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} letad{P lo la el}
STR_GROUP_RENAME_CAPTION :{BLACK}Přejmenovat skupinu
STR_GROUP_CAN_T_CREATE :{WHITE}Nelze vytvořit skupinu...
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 098e46ef9..de868ce3a 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Kontrols
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vælg udseende af kontrolsteder
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} tog{P "" e}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Omdøb kontrolsted
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nye kør
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Toget er for langt
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Tog kan kun ændres når de er stoppet i en remise
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Tog
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tog
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nye jernbanekøretøjer
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nyt elektrisk lokomotiv
@@ -2862,7 +2861,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Udfyld a
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Køretøj i vejen
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Køretøj{P "" er}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Køretøj{P "" er}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} værksted
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nye køretøjer
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nye køretøjer
@@ -2925,7 +2924,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vandveje
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kan ikke bygge en havn her...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} skibsdok
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nye skibe
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Skibe
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Skibe
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nye skibe
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Byg skib
STR_CLONE_SHIP :{BLACK}Klon skib
@@ -2990,7 +2989,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Dette vi
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nyt fly
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Byg et fly
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Kan ikke bygge fly...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Fly
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Fly
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan ikke sende flyet til en hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Flyver til {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Flyver til {STATION} hangar, {VELOCITY}
@@ -3186,10 +3185,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Tog{P "" e}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Køretøj{P "" er}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Fly
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Skib{P "" e}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Vis alle toge, som har denne station i deres ruteplan
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Vis alle køretøjer, som har denne station i deres ruteplan
@@ -3218,10 +3213,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Udskift
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Udskift automatisk alle skibe i dokken
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Udskift automatisk alle fly i hangaren
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tog{P "" e}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Køretøj{P "" er}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Skib{P "" e}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Fly
STR_REPLACE_VEHICLES_WHITE :{WHITE}Udskift {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Start udskiftning
@@ -3437,10 +3428,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Tilføj delte køretøjer
STR_GROUP_REMOVE_ALL_VEHICLES :Fjern alle køretøjer
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tog{P "" e}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Vejkøretøj{P "" er}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Skib{P "" e}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Fly
STR_GROUP_RENAME_CAPTION :{BLACK}Omdøb en gruppe
STR_GROUP_CAN_T_CREATE :{WHITE}Kan ikke oprette gruppe...
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 2134dc213..ed972cf6c 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Controle
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Selecteer controlepost type
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Trein{P "" en}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Naam controlepost aanpassen
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nieuwe v
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Trein te lang
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Treinen kunnen alleen aangepast worden wanneer ze gestopt zijn binnen een depot
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Treinen
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Treinen
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nieuwe spoorvoertuigen
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nieuwe elektrische spoorvoertuigen
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Vul de d
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Wegvoertuig in de weg
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Wegvoertuigen
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Wegvoertuigen
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Bouw wegvoertuigdepot
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nieuwe voertuigen
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nieuwe Wegvoertuigen
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Kanalen
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kan hier geen haven bouwen...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Scheepswerf
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nieuwe schepen
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Schepen
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Schepen
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nieuwe schepen
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Bouw schip
STR_CLONE_SHIP :{BLACK}Kloon Schip
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Hierdoor
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nieuw Vliegtuig
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Bouw Vliegtuig
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Kan vliegtuig niet bouwen...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Vliegtuigen
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Vliegtuigen
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan vliegtuig niet naar hangar sturen...
STR_HEADING_FOR_HANGAR :{ORANGE}Op weg naar {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Op weg naar {STATION} Hangar, {VELOCITY}
@@ -3188,10 +3187,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Trein{P "" en}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Wagen{P "" s}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Vliegtuigen
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Sch{P ip epen}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Geef alle treinen weer die dit station in hun opdrachtenlijst hebben
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Geef alle wagens weer die dit station in hun opdrachtenlijst hebben
@@ -3220,10 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Vervang
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Vervang automatisch alle schepen in het depot
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Vervang automatisch alle vliegtuigen in de hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Trein{P "" en}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Weg Voertuig{P "" en}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Sch{P ip epen}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Vliegtuig
STR_REPLACE_VEHICLES_WHITE :{WHITE}Vervang {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Start het Vervangen
@@ -3439,10 +3430,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Toevoegen gedeelde voertuigen
STR_GROUP_REMOVE_ALL_VEHICLES :Verwijder alle voertuigen
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Trein{P "" en}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Weg Voertuig{P "" en}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Sch{P ip epen}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Vliegtuig
STR_GROUP_RENAME_CAPTION :{BLACK}Hernoem een groep
STR_GROUP_CAN_T_CREATE :{WHITE}Kan groep niet maken...
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 81afc466c..c18d40ad0 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Waypoint
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Select waypoint type
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Train{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Edit waypoint name
@@ -1838,6 +1837,12 @@ STR_CARGO_RATING_EXCELLENT :Excellent
STR_CARGO_RATING_OUTSTANDING :Outstanding
############ range for rating ends
+### station view strings
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Show all trains which have this station on their schedule
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Show all road vehicles which have this station on their schedule
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Show all aircraft which have this station on their schedule
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Show all ships which have this station on their schedule
+
STR_STATION_VIEW_CARGO_RATING :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO :{WHITE}{STATION} no longer accepts {STRING}
STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO :{WHITE}{STATION} no longer accepts {STRING} or {STRING}
@@ -2717,7 +2722,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}New Vehi
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Train too long
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Trains can only be altered when stopped inside a depot
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Train{P "" s}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}New Rail Vehicles
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}New Electric Rail Vehicles
@@ -2775,7 +2779,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Unable t
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Can't stop/start train...
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Servicing interval: {LTBLUE}{COMMA}days{BLACK} Last service: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Servicing interval: {LTBLUE}{COMMA}%{BLACK} Last service: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trains - click on train for information
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trains - click on train for info., drag vehicle to add/remove from train
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Build new train vehicle
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Drag train vehicle to here to sell it
@@ -2864,7 +2867,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Fill the
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Road vehicle in the way
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Road Vehicle{P "" s}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Road Vehicle Depot
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}New Vehicles
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}New Road Vehicles
@@ -2880,7 +2882,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Service
STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Service at {TOWN} Road Depot, {VELOCITY}
STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Can't send vehicle to depot...
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Unable to find local depot
-STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Road vehicles - click on vehicle for information
STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click here to stop/start vehicle
STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP :{BLACK}Show vehicle's orders
STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP :{BLACK}Centre main view on vehicle's location
@@ -2927,7 +2928,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Waterway
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Can't build dock here...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Ship Depot
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}New Ships
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Ship{P "" s}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}New Ships
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Build Ship
STR_CLONE_SHIP :{BLACK}Clone Ship
@@ -2950,7 +2950,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Ships -
STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Build new ship
STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Drag ship to here to sell it
STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centre main view on ship depot location
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Ships - click on ship for information
STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Ship selection list - click on ship for information
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP :{BLACK}Build the highlighted ship
STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Current ship action - click here to stop/start ship
@@ -2992,7 +2991,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}This wil
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}New Aircraft
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Build Aircraft
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Can't build aircraft...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Aircraft
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Can't send aircraft to hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Heading for {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Heading for {STATION} Hangar, {VELOCITY}
@@ -3006,7 +3004,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Aircraft
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Can't sell aircraft...
STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Airport construction
STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP :{BLACK}Build airport
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aircraft - click on aircraft for information
STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aircraft - click on aircraft for information
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Build new aircraft
STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Drag aircraft to here to sell it
@@ -3188,15 +3185,16 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Train{P "" s}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Road Vehicle{P "" s}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aircraft
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Ship{P "" s}
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trains - click on train for information
+STR_VEHICLE_LIST_ROAD_TOOLTIP :{BLACK}Road vehicles - click on vehicle for information
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Ships - click on ship for information
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aircraft - click on aircraft for information
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Show all trains which have this station on their schedule
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Show all road vehicles which have this station on their schedule
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Show all aircraft which have this station on their schedule
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Show all ships which have this station on their schedule
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING1} - {COMMA} Train{P "" s}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING1} - {COMMA} Road Vehicle{P "" s}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING1} - {COMMA} Ship{P "" s}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING1} - {COMMA} Aircraft
STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Shared orders of {COMMA} Vehicle{P "" s}
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Show all vehicles that share this schedule
@@ -3220,11 +3218,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autorepl
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autoreplace all ships in the depot
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autoreplace all aircraft in the hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING1} - {COMMA} Train{P "" s}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING1} - {COMMA} Road Vehicle{P "" s}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING1} - {COMMA} Ship{P "" s}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING1} - {COMMA} Aircraft
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Replace {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Start Replacing Vehicles
STR_REPLACE_VEHICLES_STOP :{BLACK}Stop Replacing Vehicles
@@ -3439,10 +3432,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Add shared vehicles
STR_GROUP_REMOVE_ALL_VEHICLES :Remove all vehicles
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Train{P "" s}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Road Vehicle{P "" s}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Ship{P "" s}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Aircraft
STR_GROUP_RENAME_CAPTION :{BLACK}Rename a group
STR_GROUP_CAN_T_CREATE :{WHITE}Can't create group...
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 6356f4dcc..fa38d4c03 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -1195,7 +1195,6 @@ STR_WAYPOINT :{WHITE}Waypoint
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Select waypoint type
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Train{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Edit waypoint name
@@ -2716,7 +2715,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}New Vehi
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Train too long
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Trains can only be altered when stopped inside a depot
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Train{P "" s}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Train{P "" s}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}New Rail Vehicles
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}New Electric Rail Vehicles
@@ -2861,7 +2860,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Fill the
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Road vehicle in the way
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Road Vehicle{P "" s}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Road Vehicle{P "" s}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Road Vehicle Depot
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}New Vehicles
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}New Road Vehicles
@@ -2924,7 +2923,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Waterway
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Can't build dock here...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Ship Depot
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}New Ships
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Ship{P "" s}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Ship{P "" s}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}New Ships
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Build Ship
STR_CLONE_SHIP :{BLACK}Clone Ship
@@ -2989,7 +2988,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}This wil
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}New Aircraft
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Build Aircraft
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Can't build aircraft...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Aircraft
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aircraft
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Can't send aircraft to hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Heading for {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Heading for {STATION} Hangar, {VELOCITY}
@@ -3185,10 +3184,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Train{P "" s}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Road Vehicle{P "" s}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aircraft
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Ship{P "" s}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Show all trains which have this station on their schedule
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Show all road vehicles which have this station on their schedule
@@ -3217,10 +3212,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autorepl
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autoreplace all ships in the depot
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autoreplace all aircraft in the hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Train{P "" s}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Road Vehicle{P "" s}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Ship{P "" s}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Aircraft
STR_REPLACE_VEHICLES_WHITE :{WHITE}Replace {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Start Replacing Vehicles
@@ -3436,10 +3427,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Add shared vehicles
STR_GROUP_REMOVE_ALL_VEHICLES :Remove all vehicles
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Train{P "" s}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Road Vehicle{P "" s}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Ship{P "" s}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Aircraft
STR_GROUP_RENAME_CAPTION :{BLACK}Rename a group
STR_GROUP_CAN_T_CREATE :{WHITE}Can't create group...
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index e9543d075..96ab23a6c 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -1197,7 +1197,6 @@ STR_WAYPOINT :{WHITE}Trairejo
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Elektu trairejan tipon
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Trajno{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Ŝanĝu trairejan nomon
@@ -2557,7 +2556,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Novaj Ve
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Trajno tro longas
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Trajno nut povas esti adaptataj kiam halte en deponejo
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Trajno{P "" j}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trajno{P "" j}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Novaj Relaj Veturiloj
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Novaj Elektraj Relaj Veturiloj
@@ -2657,7 +2656,7 @@ STR_TIMETABLE_CHANGE_TIME :{BLACK}Ŝanĝu
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vojveturilo okupas la lokon
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Vojveturilo{P "" j}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vojveturilo{P "" j}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Vojveturila Deponejo
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Novaj Veturiloj
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Novaj Vojveturiloj
@@ -2714,7 +2713,7 @@ STR_ROAD_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Elektu p
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Ne povas konstrui havenon ĉi tie...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Ŝipdeponejo
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Novaj Ŝipoj
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Ŝipo{P "" j}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Ŝipo{P "" j}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Novaj Ŝipoj
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Kreu Ŝipon
STR_CLONE_SHIP :{BLACK}Klonu Ŝipon
@@ -2776,7 +2775,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Ĉi tio
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Novaj Aviadiloj
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Kreu Aviadilon
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Ne povas krei aviadilon...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Aviadiloj
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aviadiloj
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Ne povas sendi aviadilon al hangaro...
STR_HEADING_FOR_HANGAR :{ORANGE}Irante al {STATION} Hangaro
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Irante al {STATION} Hangaro, {VELOCITY}
@@ -2932,10 +2931,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Trajno{P "" j}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Vojveturilo{P "" j}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aviadilo{P "" j}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Ŝipo{P "" j}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Montru ĉiujn trajnojn kun ĉi tiu stacio en la plano
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Montru ĉiujnvojveturilojn kun ĉi tiu stacio en la plano
@@ -2963,10 +2958,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Aŭtomat
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Aŭtomate anstataŭu ĉiujn ŝipojn en la deponejo
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Aŭtomate anstataŭu ĉiujn aviadilojn en la hangaro
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Trajno{P "" j}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Vojveturilo{P "" j}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Ŝipo{P "" j}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Aviadilo{P "" j}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Anstataŭu {STRING.n}
STR_REPLACE_VEHICLES_START :{BLACK}Komencu Anstataŭi
@@ -3154,8 +3145,6 @@ STR_GROUP_ALL_TRAINS :Ĉiuj trajnoj
STR_GROUP_ALL_SHIPS :Ĉiuj ŝipoj
STR_GROUP_TINY_NUM :{TINYFONT}{COMMA}
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Trajno{P "" j}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Flugmaŝino
STR_GROUP_RENAME_CAPTION :{BLACK}Renomu grupon
STR_GROUP_CAN_T_CREATE :{WHITE}Ne eblas krei grupon...
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 043085386..d7c1f6a8f 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -1253,7 +1253,6 @@ STR_WAYPOINT :{WHITE}Meldepun
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vali meldepunkti liik
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} rong{P "" id}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Muuda meldepunkti nime
@@ -2774,7 +2773,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Uus rong
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Rong on liiga pikk
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Ainult depoos peatunud ronge saab muuta
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} rong{P "" i}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} rong{P "" i}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Uued rööbassõidukid
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Uus elektriraudteesõiduk
@@ -2919,7 +2918,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Täida l
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Mootorsõiduk takistab teed
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} mootorsõiduk{P "" it}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} mootorsõiduk{P "" it}
STR_DEPOT_ROAD_CAPTION :{WHITE}Linna {TOWN} mootorsõidukidepoo
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Ostmine
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Uued mootorsõidukid
@@ -2982,7 +2981,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Veeteed
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Dokki ei saa siia ehitada...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Laevaremonditehas
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Uus laev
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} laev{P "" a}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} laev{P "" a}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Uued laevad
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Ehita laev
STR_CLONE_SHIP :{BLACK}Klooni laev
@@ -3047,7 +3046,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}See palj
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Uus lennuk
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Ehita lennuk
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Ei saa ehitada lennukit...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} lennuk{P "" it}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} lennuk{P "" it}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Ei saa lennukit angaari saata...
STR_HEADING_FOR_HANGAR :{ORANGE}Suundub {STATION} Angaari
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Suundub {STATION} angaari, {VELOCITY}
@@ -3243,10 +3242,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Rong{P "" i}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} mootorsõiduk{P "" it}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Lennuk{P "" it}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Laev{P "" a}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Näita kõiki ronge, mille sõidugraafik sisaldab seda rongijaama
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Näita kõiki mootorsõidukeid, mille sõidugraafik sisaldab seda jaama
@@ -3275,10 +3270,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Asenda k
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Asenda kõik laevad depoos ise
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Asenda kõik lennumasinad angaaris ise
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Rong{P "" id}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Auto{P "" d}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Laev{P "" ad}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Lennumasin
STR_REPLACE_VEHICLES_WHITE :{WHITE}Asenda {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Alusta veovahendite asendamist
@@ -3494,10 +3485,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Kõik jagatud sõidukid
STR_GROUP_REMOVE_ALL_VEHICLES :Eemalda kõik sõidukid
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Rong{P "" id}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Mootorsõiduk{P "" id}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Laev{P "" ad}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Lennuk{P "" id}
STR_GROUP_RENAME_CAPTION :{BLACK}Rühma nime vahetamine
STR_GROUP_CAN_T_CREATE :{WHITE}Ei saa rühma luua...
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 4b28e890b..15e80bb62 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Reittipi
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Valitse reittipisteen tyyppi
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} juna{P "" a}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Muokkaa reittipisteen nimeä
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Uusia li
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Juna on liian pitkä.
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Junia voi muunnella vain, kun ne ovat pysähdyksissä veturitallilla.
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} junaa
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} junaa
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Uusi juna
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Uusi sähköjuna
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Täytä
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Ajoneuvo tiellä.
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} ajoneuvoa
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} ajoneuvoa
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} huoltoasema
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Uusia ajoneuvoja
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Uusia ajoneuvoja
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vesireit
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Satamaa ei voi rakentaa tähän...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN}, telakka
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Uusia laivoja
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} laivaa
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} laivaa
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Uusia laivoja
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Rakenna laiva
STR_CLONE_SHIP :{BLACK}Kloonaa laiva
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Tämä r
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Uusi lentokone
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Rakenna lentokone
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Lentokonetta ei voi rakentaa...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} lentokonetta
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} lentokonetta
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Lentokonetta ei voi lähettää lentokonehalliin...
STR_HEADING_FOR_HANGAR :{ORANGE}Suuntana lentokonehalli, {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Suuntana lentokonehalli, {STATION}, {VELOCITY}
@@ -3188,10 +3187,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} junaa
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} autoa
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} lentokonetta
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} laivaa
STR_SCHEDULED_TRAINS_TIP :{BLACK}Näytä kaikki junat, joilla on asema aikataulussaan.
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Näytä kaikki autot, joilla on asema aikataulussaan.
@@ -3220,10 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Korvaa k
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Korvaa kaikki telakalla olevat laivat automaattisesti
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Korvaa kaikki hallissa olevat lento-alukset automaattisesti
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} juna{P "" a}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} maa-ajoneuvo{P "" a}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} laiva{P "" a}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} ilma-alus{P "" ta}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Korvaa {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Aloita ajoneuvojen korvaaminen
@@ -3439,10 +3430,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Lisää jaettuja ajoneuvoja
STR_GROUP_REMOVE_ALL_VEHICLES :Poista kaikki ajoneuvot
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Juna{P "" t}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Auto{P "" t}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Laiva{P "" t}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} {P Lentoalus Lentoalukset}
STR_GROUP_RENAME_CAPTION :{BLACK}Nimeä ryhmä
STR_GROUP_CAN_T_CREATE :{WHITE}Ei voi luoda ryhmää.
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 8478b0ce2..833af7823 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -1197,7 +1197,6 @@ STR_WAYPOINT :{WHITE}Point de
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Choisir le type de point de contrôle
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Train{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Modifier nom du point de contrôle
@@ -2718,7 +2717,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nouveaux
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Train trop long
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Les trains peuvent être manipulés qu'une fois stoppés au dépôt
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Train{P "" s}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Train{P "" s}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nouveaux véhicules ferroviaires
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nouveaux véhicules ferroviaires électriques
@@ -2865,7 +2864,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Remplit
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Véhicule Routier présent
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Véhicule{P "" s} routier{P "" s}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Véhicule{P "" s} routier{P "" s}
STR_DEPOT_ROAD_CAPTION :{WHITE}Dépôt routier de {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nouveaux Véhicules
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nouveaux véhicules
@@ -2928,7 +2927,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Voies na
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Impossible de construire port ici...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Dépôt naval
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nouveaux navires
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Navire{P "" s}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Navire{P "" s}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nouveaux navires
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construire navire
STR_CLONE_SHIP :{BLACK}Copier Navire
@@ -2993,7 +2992,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Effectue
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nouvel Aéronef
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Construire aéronef
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Impossible de construire l'aéronef...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Aéronef{P "" s}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aéronef{P "" s}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Impossible d'envoyer l'aéronef au hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}En route pour le hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}En route pour le hangar de {STATION}, {VELOCITY}
@@ -3189,10 +3188,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Train{P "" s}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Véhicule{P "" s} routier{P "" s}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aéronef{P "" s}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Navire{P "" s}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Afficher les trains ayant cette station dans leurs ordres
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Afficher les véhicules routiers ayant cette station dans leurs ordres
@@ -3221,10 +3216,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autoremp
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autoremplacer tous les navires du dépôt
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autoremplacer tous les aéronefs du hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Train{P "" s}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Véhicule{P "" s} Routier{P "" s}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Navire{P "" s}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Aéronef{P "" s}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Remplacer {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Démarrer le remplacement
@@ -3440,10 +3431,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Ajouter des véhicules partagés
STR_GROUP_REMOVE_ALL_VEHICLES :Retirer tous les véhicules
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Train{P "" s}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Véhicule{P "" s} routier{P "" s}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Navire{P "" s}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Aéronef{P "" s}
STR_GROUP_RENAME_CAPTION :{BLACK}Renommer un groupe
STR_GROUP_CAN_T_CREATE :{WHITE}Impossible de créer le groupe...
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 8c12a0a1c..85176b4cb 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -1157,7 +1157,6 @@ STR_WAYPOINT :{WHITE}Punto de
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Selecciona-lo tipo de punto de ruta
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Tren{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Edita-lo nome do punto de control
@@ -2647,7 +2646,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Novos Ve
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}O tren é demasiado longo
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Os trens só se poden alterar cando estean parados nun depósito
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Tren{P "" s}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tren{P "" s}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Novos Vehículos de Ferrocarril
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Novos Vehículos Eléctricos de Raíles
@@ -2793,7 +2792,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Enche-lo
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Haí un vehículo de estrada no camiño
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Vehículo{P "" s} de Estrada
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vehículo{P "" s} de Estrada
STR_DEPOT_ROAD_CAPTION :{WHITE}Depósito de Vehículos de Estrada de {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Novos Vehículos
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Novos Vehículos de Estrada
@@ -2856,7 +2855,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Canais
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Non se pode construí-lo peirao aí...
STR_DEPOT_SHIP_CAPTION :{WHITE}Depósito de Barcos de {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Novos Barcos
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Barco{P "" s}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Barco{P "" s}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Novos Barcos
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construír Barco
STR_CLONE_SHIP :{BLACK}Clonar Barco
@@ -2921,7 +2920,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Esto con
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nova Aeronave
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Construír Aeronave
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Non se pode construí-lo avíon...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Aeronave
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronave
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Non se pode envia-lo avión ó hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Diríxese ó hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Diríxese ó hangar de {STATION}, {VELOCITY}
@@ -3115,10 +3114,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Tren{P "" s}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Camións/Buses
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aeronaves
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Barco{P "" s}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostrar tódolos trens que teñen esta estación nas súas ordes
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostrar tódolos vehículos de estrada que teñen esta estación nas súas ordes
@@ -3147,10 +3142,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autosubs
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autosubstituír tódolos barcos no depósito
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autosubstituír tódolos avións no hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tren{P "" s}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Vehículo{P "" s} de Estrada
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Barco{P "" s}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Aeronave
STR_REPLACE_VEHICLES_WHITE :{WHITE}Substituír {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Comezar a Substituír Vehículos
@@ -3366,10 +3357,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Engadir vehículos compartidos
STR_GROUP_REMOVE_ALL_VEHICLES :Borrar tódolos vehículos
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tren{P "" s}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Vehículo{P "" s} de Estrada
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Barco{P "" s}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Aeronave{P "" s}
STR_GROUP_RENAME_CAPTION :{BLACK}Renomear un grupo
STR_GROUP_CAN_T_CREATE :{WHITE}Non se pode crear o grupo...
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 9c8f4817a..fc8849517 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -1197,7 +1197,6 @@ STR_WAYPOINT :{WHITE}Wegpunkt
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Wegpunkttyp auswählen
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Z{P ug üge}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Namen des Wegpunkts ändern
@@ -2718,7 +2717,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Neue Fah
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Zug zu lang
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Züge können nur verändert werden, wenn sie im Depot halten
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Z{P ug üge}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Z{P ug üge}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Neues Schienenfahrzeug
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Neue E-Loks
@@ -2865,7 +2864,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Zeiten a
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Fahrzeug ist im Weg
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Fahrzeug{P "" e}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Fahrzeug{P "" e}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Fahrzeugdepot
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Neue Fahrzeuge
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Neue Fahrzeuge
@@ -2928,7 +2927,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Wasserwe
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Hafen kann hier nicht gebaut werden...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Werft
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Neue Schiffe
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Schiff{P "" e}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Schiff{P "" e}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Neue Schiffe
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Schiff kaufen
STR_CLONE_SHIP :{BLACK}Schiff kopieren
@@ -2993,7 +2992,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Baut ein
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Neue Flugzeuge
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Flugzeug kaufen
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Flugzeug kann nicht gebaut werden...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Flugzeug{P "" e}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Flugzeug{P "" e}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Flugzeug kann nicht in den Hangar geschickt werden...
STR_HEADING_FOR_HANGAR :{ORANGE}Unterwegs zu {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Unterwegs zu {STATION} Hangar, {VELOCITY}
@@ -3189,10 +3188,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Z{P ug üge}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Straßenfahrzeug{P "" e}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Flugzeug{P "" e}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Schiff{P "" e}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Alle Züge, die diesen Bahnhof anfahren, anzeigen
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Alle Fahrzeuge, die diese Station anfahren, anzeigen
@@ -3221,10 +3216,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Alle Fah
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Alle Schiffe in der Werft automatisch ersetzen
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Alle Flugzeuge im Hangar automatisch ersetzen
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} {P Zug Züge}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Fahrzeug{P "" e}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Schiff{P "" e}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Flugzeug{P "" e}
STR_REPLACE_VEHICLES_WHITE :{WHITE}{STRING} ersetzen
STR_REPLACE_VEHICLES_START :{BLACK}Fahrzeugersetzung an
@@ -3440,10 +3431,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Gemeinsame F. hinzufügen
STR_GROUP_REMOVE_ALL_VEHICLES :Liste leeren
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Z{P ug üge}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Fahrzeug{P "" e}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Schiff{P "" e}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Flugzeug{P "" e}
STR_GROUP_RENAME_CAPTION :{BLACK}Gruppe umbenennen
STR_GROUP_CAN_T_CREATE :{WHITE}Gruppe kann nicht erstellt werden...
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index cafc6fcbb..5e7c3a2ee 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -1177,7 +1177,6 @@ STR_WAYPOINT :{WHITE}נקוד
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}בחר את סוג נקודות הציון
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} רכבת{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}ערוך שם נקודת ציון
@@ -2689,7 +2688,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}כלים
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}רכבת ארוכה מידי
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}ניתן לשנות את הרכבת בעת עצירה במוסך בלבד
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}רכבות{NBSP} {1:COMMA} - {0:COMPANY}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}רכבות{NBSP} {1:COMMA} - {0:STRING}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}רכבות חדשות
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}רכבות חשמליות חדשות
@@ -2821,7 +2820,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK} מלא
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}כלי רכב חוסם את הדרך
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}כלי רכב {NBSP}{1:COMMA} - {0:COMPANY}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}כלי רכב {NBSP}{1:COMMA} - {0:STRING}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} מוסך כלי רכב
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}כלי רכב חדשים
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}כלי רכב חדשים
@@ -2884,7 +2883,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}נתיב
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}...לא ניתן לבנות מזח במשבצת זו
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} מבדוק כלי שייט
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}כלי שייט חדש
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}כלי שייט {NBSP}{1:COMMA} - {0:COMPANY}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}כלי שייט {NBSP}{1:COMMA} - {0:STRING}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}כלי שייט חדשים
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}בנה כלי שייט
STR_CLONE_SHIP :{BLACK}שכפל כלי שייט
@@ -2949,7 +2948,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}פעול
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}כלי טייס חדש
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}בנה כלי טייס
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}לא ניתן לבנות כלי טייס
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION ::{WHITE}כלי טייס {NBSP}{1:COMMA} - {0:COMPANY}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION ::{WHITE}כלי טייס {NBSP}{1:COMMA} - {0:STRING}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}...לא ניתן לשלוח את כלי הטייס לסככת המטוסים
STR_HEADING_FOR_HANGAR :{ORANGE} {STATION} בדרך אל סככת המטוסים ב
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}{1:VELOCITY} מהירות , {NBSP}{0:STATION} בדרך אל סככת המטוסים ב
@@ -3129,10 +3128,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}רכבות {NBSP}{1:COMMA} - {0:STATION}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}רכבים {NBSP}{1:COMMA} - {0:STATION}
-STR_SCHEDULED_AIRCRAFT :{WHITE}כלי טייס {NBSP}{1:COMMA} - {0:STATION}
-STR_SCHEDULED_SHIPS :{WHITE}כלי שייט {NBSP}{1:COMMA} - {0:STATION}
STR_SCHEDULED_TRAINS_TIP :{BLACK}הצג את כל הרכבות העוברות דרך תחנה זו
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}הצג את כל הרכבים העוברים דרך תחנה זו
@@ -3161,10 +3156,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}החלף
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}החלף אוטומטית את כל כלי השייט שבמבדוק
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}החלף אוטומאטית את כל כלי הטייס שבסככה
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}רכבות {NBSP}{1:COMMA} - {0:STRING}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}רכבים {NBSP}{1:COMMA} - {0:STRING}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}כלי שייט {NBSP}{1:COMMA} - {0:STRING}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}כלי טייס {NBSP}{1:COMMA} - {0:STRING}
STR_REPLACE_VEHICLES_WHITE :{WHITE}{STRING} החלף
STR_REPLACE_VEHICLES_START :{BLACK}החל בהחלפת הכלים
@@ -3378,10 +3369,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :הוסף כלים
STR_GROUP_REMOVE_ALL_VEHICLES :הסר את כל הכלים מהקבוצה
-STR_GROUP_TRAINS_CAPTION :{WHITE} רכבות {NBSP}{1:COMMA} - {0:GROUP}
-STR_GROUP_ROADVEH_CAPTION :{WHITE} רכבים {NBSP}{1:COMMA} - {0:GROUP}
-STR_GROUP_SHIPS_CAPTION :{WHITE} כלי שייט {NBSP}{1:COMMA} - {0:GROUP}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE} כלי טייס {NBSP}{1:COMMA} - {0:GROUP}
STR_GROUP_RENAME_CAPTION :{BLACK}שנה שם קבוצה
STR_GROUP_CAN_T_CREATE :{WHITE}... לא ניתן ליצור קבוצה
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 539714635..7a1263cc6 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -1230,7 +1230,6 @@ STR_WAYPOINT :{WHITE}Ellenőr
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Válassz ellenőrző-pont tipust
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Vonat
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Ellenőrző pont nevének módosítása
@@ -2788,7 +2787,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Új jár
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Túl hosszú a vonat
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Csak a járműtelepen álló vonatokat lehet megváltoztatni
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} vonatai - {COMMA}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} vonatai - {COMMA}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Új vasúti járművek
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Új vasúti járművek
@@ -2935,7 +2934,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Menetren
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Közúti jármű van az útban
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} közúti járművei - {COMMA}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} közúti járművei - {COMMA}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN}i garázs
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Új járművek
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Új közúti járművek
@@ -2998,7 +2997,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vízi ut
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Nem építhetsz ide kikötőt...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN}i dokk
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Új hajók
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} hajói - {COMMA}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} hajói - {COMMA}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Új hajók
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Megvesz
STR_CLONE_SHIP :{BLACK}Hajó másolása
@@ -3063,7 +3062,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Ide katt
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Új repülőgépek
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Megvesz
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nem veheted meg a repülőgépet...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} repülőgépei - {COMMA}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} repülőgépei - {COMMA}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Nem küldheted a repülőgépet a hangárba...
STR_HEADING_FOR_HANGAR :{ORANGE}Úton {STATION} hangárjába
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Úton {STATION} hangárjába, {VELOCITY}
@@ -3259,10 +3258,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Vonatok
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Közúti járművek
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Repülőgépek
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Hajók
STR_SCHEDULED_TRAINS_TIP :{BLACK}Kilistázza az összes vonatot, aminek a menetrendjében szerepel ez az állomás
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Kilistázza az összes közúti járművet, aminek a menetrendjében szerepel ez az állomás
@@ -3291,10 +3286,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}A garáz
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}A dokkban lévő összes hajó automatikus cseréje
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}A hangárban lévő összes repülő automatikus cseréje
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} vonat
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} közúti jármű
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} hajó
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} repülőgép
STR_REPLACE_VEHICLES_WHITE :{WHITE}Lecserél {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Járműcsere elkezdése
@@ -3510,10 +3501,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Megosztott jármű hozzáadása
STR_GROUP_REMOVE_ALL_VEHICLES :Összes jármű eltávolítása
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} vonat
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} közúti jármű
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} hajó
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} repülő
STR_GROUP_RENAME_CAPTION :{BLACK}Csoport átnevezése
STR_GROUP_CAN_T_CREATE :{WHITE}Csoport létrehozás sikertelen...
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index df7ce40a4..150cb9729 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -1197,7 +1197,6 @@ STR_WAYPOINT :{WHITE}Leiðarv
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Velja tegund leiðarvísis
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Lest{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Breyta nafni millistöðvar
@@ -2718,7 +2717,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Kaupa le
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Lestin er of löng
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Aðeins er hægt að eiga við lestir þegar þær bíða í skýli
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Lestir
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Lestir
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Lestaúrval
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nýjir rafdrifnir lestarvagnar
@@ -2865,7 +2864,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Bæta á
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Bíll fyrir
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Bílar
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Bílar
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} bifreiðaskýli
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Kaupa bifreið
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Bifreiðaúrval
@@ -2928,7 +2927,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Skipasku
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Get ekki byggt bryggju hér...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} slippur
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Kaupa skip
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Skip
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Skip
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Skipaúrval
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Kaupa skip
STR_CLONE_SHIP :{BLACK}Afrita skip
@@ -2993,7 +2992,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Þetta b
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Flugvélaúrval
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Kaupa flugvél
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Get ekki smíðað flugvél...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Flugvél
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Flugvél
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Get ekki sent flugvél í flugskýli...
STR_HEADING_FOR_HANGAR :{ORANGE}Á leið í {STATION} flugskýli
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Á leið í {STATION} flugskýli, {VELOCITY}
@@ -3189,10 +3188,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Lestir
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Bifreiðir
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Flugvélar
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Skip
STR_SCHEDULED_TRAINS_TIP :{BLACK}Sýna allar lestir sem hafa þessa stöð á áætlun
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Sýna allar bifreiðir sem hafa þessa stöð á áætlun
@@ -3221,10 +3216,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Skipta
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Skipta öllum skipum í slippnum sjálfvirkt út
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Skipta öllum flugvélum í skýlinu sjálfvirkt út
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Lest{P "" ir}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Bifreið{P "" ar}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Skip
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Flugvél{P "" ar}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Endurnýja {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Hefja skipti
@@ -3440,10 +3431,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Bæta við deildu farartæki
STR_GROUP_REMOVE_ALL_VEHICLES :Fjarlægja öll farartæki
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Lest{P "" ir}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Bifreið{P "" ar}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Skip
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Flugvél{P "" ar}
STR_GROUP_RENAME_CAPTION :{BLACK}Endurnefna hóp
STR_GROUP_CAN_T_CREATE :{WHITE}Get ekki búið til hóp...
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index e041afe2d..509820fa5 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Titik Pe
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Pilih jenis titik penunjuk arah
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Kereta Api
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Edit nama titik penunjuk arah
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Buat Ken
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Kereta api terlalu panjang
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Kereta api hanya dapat diubah ketika berhenti di dalam depo
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Kereta Api
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Kereta Api
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Kereta Api Baru
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Kereta listrik baru
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Isi jadw
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Bus/truk sedang berjalan
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Bus/truk
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Bus/truk
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Bengkel Bus/truk
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Kendaraan Baru
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Bus/truk Baru
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Perairan
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Tidak dapat membuat pelabuhan disini...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Galangan Kapal
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Kapal Baru
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Kapal
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Kapal
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Kapal Baru
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Membuat Kapal
STR_CLONE_SHIP :{BLACK}Gandakan
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Untuk me
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Buat Pesawat
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Buat Pesawat
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Tidak dapat membuat pesawat ...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Pesawat
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Pesawat
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Tidak dapat mengirim pesawat ke hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Menuju ke hangar di {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Menuju ke hangar di {STATION}, {VELOCITY}
@@ -3188,10 +3187,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Kereta
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Bus/truk
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Pesawat
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Kapal
STR_SCHEDULED_TRAINS_TIP :{BLACK}Tampilkan semua kereta yang memiliki jadwal menuju stasiun ini.
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Tampilkan semua bus/truk yang memiliki jadwal menuju terminal ini.
@@ -3220,10 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Penggant
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Penggantian secara otomatis semua kapal di dalam galangan
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Penggantian secara otomatis semua Pesawat di dalam hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Kereta
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Bus/truk
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Kapal
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Pesawat
STR_REPLACE_VEHICLES_WHITE :{WHITE}Ganti {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Mulai Mengganti
@@ -3439,10 +3430,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Tambah kendaraan dgn perintah bersama
STR_GROUP_REMOVE_ALL_VEHICLES :Jual semua
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Kereta
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Bus/truk
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Kapal
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Pesawat
STR_GROUP_RENAME_CAPTION :{BLACK}Ubah nama kelompok
STR_GROUP_CAN_T_CREATE :{WHITE}Tidak data membuat kelompok...
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 9e9a2a2e2..e0cc463e5 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -1198,7 +1198,6 @@ STR_WAYPOINT :{WHITE}Waypoint
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Seleziona il tipo di waypoint
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} tren{P o i}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Rinomina il waypoint
@@ -2719,7 +2718,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nuovi ve
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Treno troppo lungo
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Un treno può essere modificato solo quando è fermo in un deposito
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} tren{P 2 o i}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} tren{P 2 o i}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nuovi veicoli ferroviari
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nuovi veicoli ferroviari elettrici
@@ -2866,7 +2865,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Riempie
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Automezzo di mezzo
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} automezz{P 2 o i}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} automezz{P 2 o i}
STR_DEPOT_ROAD_CAPTION :{WHITE}Deposito automezzi di {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nuovi veicoli
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nuovi automezzi
@@ -2929,7 +2928,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Trasport
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Impossibile costruire il molo qui...
STR_DEPOT_SHIP_CAPTION :{WHITE}Deposito navale di {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nuove navi
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} nav{P 2 e i}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} nav{P 2 e i}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nuove navi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Costruisci nave
STR_CLONE_SHIP :{BLACK}Clona nave
@@ -2994,7 +2993,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Costruis
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nuovo aeromobile
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Costruisci aeromobile
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Impossibile costruire l'aeromobile...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} aeromobil{P 2 e i}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} aeromobil{P 2 e i}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Impossibile mandare l'aeromobile all'hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Diretto all'Hangar di {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Diretto all'Hangar di {STATION}, {VELOCITY}
@@ -3190,10 +3189,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} tren{P 2 o i}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} automezz{P 2 o i}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} aeromobil{P 2 e i}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} nav{P 2 e i}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostra tutti i treni che hanno questa stazione pianificata
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostra tutti gli automezzi che hanno questa stazione pianificata
@@ -3222,10 +3217,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Rimpiazz
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Rimpiazza automaticamente tutte le navi nel deposito
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Rimpiazza automaticamente tutti gli aeromobili nell'hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} tren{P 2 o i}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} automezz{P 2 o i}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} nav{P 2 e i}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} aeromobil{P 2 e i}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Rimpiazza {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Inizia rimpiazzamento
@@ -3441,10 +3432,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Aggiungi veicoli condivisi
STR_GROUP_REMOVE_ALL_VEHICLES :Rimuovi tutti i veicoli
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} tren{P o i}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} automezz{P o i}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} nav{P e i}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} aeromobil{P e i}
STR_GROUP_RENAME_CAPTION :{BLACK}Rinomina un gruppo
STR_GROUP_CAN_T_CREATE :{WHITE}Impossibile creare il gruppo...
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 0d9700c72..25ecc6218 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -2680,7 +2680,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}新規
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}列車が長過ぎます
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}列車の変更は鉄道車庫内でのみ行えます
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - 列車{COMMA}本
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - 列車{COMMA}本
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}新規鉄道車両
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}新規電動鉄道車両
@@ -2823,7 +2823,7 @@ STR_TIMETABLE_AUTOFILL :{BLACK}自動
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}道路車両があります
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - 道路車両{COMMA}両
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - 道路車両{COMMA}両
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN}車庫
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}新規車両
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}新規道路車両
@@ -2885,7 +2885,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}水路
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}ここに埠頭を建設できません...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN}造船所
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}新規船舶
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - 船舶{COMMA}隻
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - 船舶{COMMA}隻
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}新規船舶
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}船舶を購入
STR_CLONE_SHIP :{BLACK}船舶をクローン
@@ -2950,7 +2950,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}飛行
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}新規飛行機
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}飛行機を購入
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}飛行機を購入できません...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - 飛行機{COMMA}台
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - 飛行機{COMMA}台
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}飛行機を格納庫へ回送できません...
STR_HEADING_FOR_HANGAR :{ORANGE}{STATION}格納庫へ行く
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}{STATION}格納庫へ行く、{VELOCITY}
@@ -3136,10 +3136,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - 列車{COMMA}本
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - 道路車両{COMMA}両
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - 飛行機{COMMA}台
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - 船舶{COMMA}隻
STR_SCHEDULED_TRAINS_TIP :{BLACK}この駅が指令リストに入っているすべての列車を表示します
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}このバス停/荷役所が指令リストに入っているすべての道路車両を表示します
@@ -3168,10 +3164,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}車庫
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}造船所内のすべての船舶を自動交換します
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}格納庫内のすべての飛行機を自動交換します
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - 列車{COMMA}本
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - 道路車両{COMMA}両
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - 船舶{COMMA}隻
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - 飛行機{COMMA}台
STR_REPLACE_VEHICLES_WHITE :{WHITE}{STRING}を交換
STR_REPLACE_VEHICLES_START :{BLACK}車両の交換を開始
@@ -3385,10 +3377,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :共有車両を追加
STR_GROUP_REMOVE_ALL_VEHICLES :すべての車両を取り除く
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - 列車{COMMA}本
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - 道路車両{COMMA}両
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - 船舶{COMMA}隻
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - 飛行機{COMMA}台
STR_GROUP_RENAME_CAPTION :{BLACK}グループ名を変更
STR_GROUP_CAN_T_CREATE :{WHITE}グループが作成できません...
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index c0159d16c..47e2e5cd7 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -1197,7 +1197,6 @@ STR_WAYPOINT :{WHITE}웨이
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}웨이포인트 종류 설정
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - 열차 {COMMA}대
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}웨이포인트 이름 설정
@@ -2718,7 +2717,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}새 열
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}열차가 너무 깁니다!
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}차량기지 내에서 정지한 경우에만 개조할 수 있습니다
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA}대의 열차
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA}대의 열차
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}새 기차
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}새 전기 기차
@@ -2865,7 +2864,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}다음
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}중간에 자동차가 있습니다.
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA}대의 자동차
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA}대의 자동차
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} 차고
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}새 차량
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}새 자동차
@@ -2928,7 +2927,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}항만
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}여기에 항구를 건설할 수 없습니다...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} 정박소
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}새 선박
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA}대의 선박
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA}대의 선박
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}새 선박
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}선박 만들기
STR_CLONE_SHIP :{BLACK}선박 복제
@@ -2993,7 +2992,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}이 버
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}새 항공기
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}항공기 만들기
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}항공기를 만들 수 없습니다...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA}대의 항공기
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA}대의 항공기
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}항공기를 격납고로 보낼 수 없습니다...
STR_HEADING_FOR_HANGAR :{ORANGE}{STATION}공항 격납고로 가는 중
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}{STATION}공항 격납고로 가는 중 ({VELOCITY})
@@ -3189,10 +3188,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - 열차 {COMMA}대
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - 자동차 {COMMA}대
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - 항공기 {COMMA}대
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - 선박 {COMMA}대
STR_SCHEDULED_TRAINS_TIP :{BLACK}이 역을 거쳐가는 모든 열차를 표시합니다
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}이 역을 거쳐가는 모든 자동차를 표시합니다
@@ -3221,10 +3216,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}이 차
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}이 정박소에 있는 모든 선박을 자동으로 교체합니다.
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}이 격납고에 있는 모든 항공기를 자동으로 교체합니다.
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - 열차 {COMMA}대
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - 자동차 {COMMA}대
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - 선박 {COMMA}대
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - 항공기 {COMMA}대
STR_REPLACE_VEHICLES_WHITE :{WHITE}{STRING} 교체
STR_REPLACE_VEHICLES_START :{BLACK}차량 교체 시작
@@ -3440,10 +3431,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :공유된 차량 추가
STR_GROUP_REMOVE_ALL_VEHICLES :모든 차량 제거
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} 기차
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} 차량
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} 선박
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} 항공기
STR_GROUP_RENAME_CAPTION :{BLACK}그룹 이름 바꾸기
STR_GROUP_CAN_T_CREATE :{WHITE}그룹을 만들 수 없습니다...
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 066da7f32..988bc7122 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -1187,7 +1187,6 @@ STR_WAYPOINT :{WHITE}Kontrolp
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Izvēlaties kontrolpunkta veidu
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Vilcien{P s i ""}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Labot kontrolpunkta nosaukumu
@@ -2703,7 +2702,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Jauni tr
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Vilciens ir pārāk garš
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Vilcienus ir iespējams pārveidot tikai tad, kad tie ir apstādināti depo
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Vilcien{P s i a}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Vilcien{P s i a}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Jauni vilcieni
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Jauni Elektriskā Dzelzceļa Satiksmes Līdzekļi
@@ -2835,7 +2834,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Aizpild
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Ceļu transportl. ceļā
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Ceļu transportlīdzek{P lis ļi ļa}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Ceļu transportlīdzek{P lis ļi ļa}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Autotransporta depo
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Jauni transporta līdzekļi
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Jauni transportl.
@@ -2898,7 +2897,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Ūdensce
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Nevar uzbūvēt ostu šeit
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Kuģu depo
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Jauni kuģi
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Kuģ{P is i u}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Kuģ{P is i u}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Jauni kuģi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Uzbūvēt kuģi
STR_CLONE_SHIP :{BLACK}Klonēt kuģi
@@ -2963,7 +2962,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Šis uzb
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Jauns lidaparāts
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Būvēt lidaparātu
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nevar būvēt lidaparātu...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Lidaparāts
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Lidaparāts
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Lidaparātu nevar aizsūtīt uz angāru...
STR_HEADING_FOR_HANGAR :{ORANGE}Dodas uz {STATION} angāru
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Ietur kursu uz {STATION} Angārs, {VELOCITY}
@@ -3147,10 +3146,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Vilcien{P s i u}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Mašīn{P a as u}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Lidaparāts
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Kuģ{P is i u}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Rādīt vilcienus, kuru rīkojumu sarakstos ir šī stacija
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Rādīt mašīnas, kuru rīkojumu sarakstos ir šī stacija
@@ -3179,10 +3174,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Automāt
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Automātiski nomainīt visus kuģus depo
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Automātiski nomainīt visus lidaparātus angārā
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} vilcien{P s i u}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} ceļa transportlīdzek{P lis ļi ļu}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Kuģ{P is i ""}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Lidaparāt{P s i ""}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Nomainīt {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Sākt transportlīdzekļu nomaiņu
@@ -3397,10 +3388,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Pievienot kopējos transportus
STR_GROUP_REMOVE_ALL_VEHICLES :Izņemt visus transportus
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} vilcien{P s i u}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} ceļa transportlīdzek{P lis ļi ļu}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} kuģ{P is i u}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Lidaparāts
STR_GROUP_RENAME_CAPTION :{BLACK}Pārsaukt grupu
STR_GROUP_CAN_T_CREATE :{WHITE}Nevar izveidot grupu...
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index f6a69c72e..ceaf989e2 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -1208,7 +1208,6 @@ STR_WAYPOINT :{WHITE}Kontrol
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Pasirinkite punkto tipą
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Traukin{P ys iai ių}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Redaguoti punkto vardą
@@ -2706,7 +2705,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Naujos t
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Traukinys per ilgas
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Sukeisti traukinius galima tiktai sustabdytus depe
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} traukiniai
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} traukiniai
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nauji Traukiniai
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nauji Elektriniai Traukiniai
@@ -2833,7 +2832,7 @@ STR_TIMETABLE_AUTOFILL :{BLACK}Auto už
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Automobilis kelyje
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Automobiliai
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Automobiliai
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Automobiliu garazas
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Naujos tr. priemones
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nauji automobiliai
@@ -2895,7 +2894,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Kanalai
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Neimanoma pastatyti uosto cia...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Laivu depas
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Naujas laivas
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Laivai
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Laivai
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nauji laivai
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Nupirkti Laiva
STR_CLONE_SHIP :{BLACK}Kopijuoti laivą
@@ -2960,7 +2959,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Tai paga
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Naujas lektuvas
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Isigyti lektuva
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Negalima isigyti lektuvo...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Lektuvai
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Lektuvai
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Negalima lektuvo nusiusti i angara...
STR_HEADING_FOR_HANGAR :{ORANGE}Kursas: {STATION} angaras
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Kursas: {STATION} angarasangar, {VELOCITY}
@@ -3140,10 +3139,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Traukiniai
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Automobiliai
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Lektuvai
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Laivai
STR_SCHEDULED_TRAINS_TIP :{BLACK}Rodyti visus traukinius, kuriu uzduotuse yra itraukta si stotele
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Rodyti visus automobilius, kuriu uzduotyse yra pamineta si stotele
@@ -3172,10 +3167,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Pakeisti
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Pakeisti visus laivus depe
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Pakeisti visus lėktuvus angare
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} traukin{P ys iai ių}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} automobil{P is iai ių}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} laiv{P as ai ų}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} lėktuv{P as ai ų}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Keisti tr. priemones {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Pradeti tr. priemonių keitimą
@@ -3378,7 +3369,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Įkelti bendras transporto priemones
STR_GROUP_REMOVE_ALL_VEHICLES :Iškelti visas transporto priemones
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Lėktuvas
STR_GROUP_RENAME_CAPTION :{BLACK}Pervadinti grupę
STR_GROUP_CAN_T_CREATE :{WHITE}Neįmanoma sukurti grupę...
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index a62b2ee6f..52645c797 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -1194,7 +1194,6 @@ STR_WAYPOINT :{WHITE}Weepunkt
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Wielt den Weepunktyp
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Z{P uch ich}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Weepunktnumm
@@ -2715,7 +2714,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nei Gefi
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Zuch ze laang
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Zich kënnen nëmmen an engem Depot verännert ginn
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Z{P uch ich}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Z{P uch ich}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nei Zich
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nei Elektrozich
@@ -2860,7 +2859,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Fëll de
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Stroossengefiert am Wee
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Gefier{P t er}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Gefier{P t er}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Stroossendepot
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nei Gefierer
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nei Stroossengefierer
@@ -2923,7 +2922,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Waassers
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kann den Dock hei net bauen...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Schëffdepot
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nei Schëffer
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Schëff{P "" er}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Schëff{P "" er}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nei Schëffer
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Schëff bauen
STR_CLONE_SHIP :{BLACK}Schëff klonen
@@ -2988,7 +2987,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Dëst ba
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Neien Fliger
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Fliger bauen
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Kann den Fliger net bauen...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Fliger
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Fliger
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kann den Fliger net an den Hangar schécken...
STR_HEADING_FOR_HANGAR :{ORANGE}Um Wee fir {STATION} Hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Um Wee fir {STATION} Hangar, {VELOCITY}
@@ -3184,10 +3183,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Z{P uch ich}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Stroossengefiert{P "" er}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Fliger
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Schëff{P "" er}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Weis all Zich déi des Statioun an hierem Zaitplang hun
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Weis all Stroossengefierter déi des Statioun an hierem Zaitplang hun
@@ -3216,10 +3211,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}All Gefi
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}All Schëffer am Depot automatesch ersetzen
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}All Fliger am Hangar automatesch ersetzen
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Zuch{P "" s}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Stroossengefier{P t er}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Schëff{P "" s}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Fliger
STR_REPLACE_VEHICLES_WHITE :{WHITE}Remplacéier{STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Start Gefierterremplacement
@@ -3434,10 +3425,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Gedeelten Gefierer bäisetzen
STR_GROUP_REMOVE_ALL_VEHICLES :All Gefierer wechhuelen
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Z{P uch ich}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Stroossengefier{P t er}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Schëff{P "" er}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Fliger{P "" en}
STR_GROUP_RENAME_CAPTION :{BLACK}Eng Grupp ëmbenennen
STR_GROUP_CAN_T_CREATE :{WHITE}Kann d'Grupp net erstellen...
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 0d3100f74..5263e665f 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Kontroll
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Velg kontrollpunkttype
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Tog{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Endre navn på kontrollpunkt...
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nye tog/
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Toget er for langt
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Tog kan kun endres når det står stille i togstallen
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Tog
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tog
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nye tog/vogner for jernbane
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nytt elektrisk tog
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Fyll ut
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Kjøretøy i veien
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} kjøretøy
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} kjøretøy
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Garasje
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nye kjøretøy
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nye kjøretøy
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Kanal
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kan ikke bygge havn her...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} skipsdepot
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nye skip
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} skip
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} skip
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nye skip
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Bygg skip
STR_CLONE_SHIP :{BLACK}Klon skip
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Dette vi
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nytt fly
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Bygg fly
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Kan ikke bygge fly...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} fly
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} fly
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan ikke sende fly til hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Er på vei til {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Er på vei til {STATION} hangar, {VELOCITY}
@@ -3188,10 +3187,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} tog
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} kjøretøy
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Fly
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} skip
STR_SCHEDULED_TRAINS_TIP :{BLACK}Vis alle tog som har denne stasjonen på deres timeplan
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Vis alle kjøretøy som har denne stasjonen på deres timeplan
@@ -3220,10 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autoerst
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autoerstatt all skip i depotet
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autoerstatt alle fly i hangaren
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} tog
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} kjøretøy
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} skip
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} fly
STR_REPLACE_VEHICLES_WHITE :{WHITE}Erstatte {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Begynn å bytte ut kjøretøy
@@ -3439,10 +3430,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Legg til delte kjøretøy
STR_GROUP_REMOVE_ALL_VEHICLES :Fjern alle kjøretøy
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} tog
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} kjøretøy
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} skip
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Luftfartøy
STR_GROUP_RENAME_CAPTION :{BLACK}Gi nytt navn på gruppen
STR_GROUP_CAN_T_CREATE :{WHITE}Kan ikke opprette gruppe...
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 7f51ae4d6..f488ebf23 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -1187,7 +1187,6 @@ STR_WAYPOINT :{WHITE}Kontroll
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vel kontrollpunkttype
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Tog{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Endre namn på kontrollpunkt
@@ -2704,7 +2703,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nye tog/
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Toget er for langt
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Tog kan berre endrast når dei står stille i togstallen
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} tog
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} tog
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nye tog/vogner for jernbane
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nytt elektrisk tog
@@ -2836,7 +2835,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Fyll tim
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Køyretøy i vegen
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} køyretøy
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} køyretøy
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Garasje
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nye køyretøy
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nye køyretøy
@@ -2899,7 +2898,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Kanalar
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kan ikkje byggje hamn her...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} skipsdepot
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nye skip
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} skip
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} skip
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nye skip
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Bygg skip
STR_CLONE_SHIP :{BLACK}Klon skip
@@ -2964,7 +2963,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Dette vi
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nytt fly
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Bygg fly
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Kan ikkje byggje fly...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} fly
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} fly
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan ikkje sende fly til hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Er på veg til {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Er på veg til {STATION} hangar, {VELOCITY}
@@ -3149,10 +3148,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} tog
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} køyretøy
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Fly
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} skip
STR_SCHEDULED_TRAINS_TIP :{BLACK}Vis alle tog som har denne stasjonen på timeplanen sin
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Vis alle køyretøy som har denne stasjonen på timeplanen sin
@@ -3181,10 +3176,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autoerst
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autoerstatt alle skipa i depotet
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autoerstatt alle flya i hangaren
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} tog
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} køyretøy
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} skip
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} fly
STR_REPLACE_VEHICLES_WHITE :{WHITE}Erstatt {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Byrje utskiftinga av køyretøy
@@ -3399,10 +3390,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Legg til delte køyretøy
STR_GROUP_REMOVE_ALL_VEHICLES :Fjern alle køyretøy
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tog
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Køyretøy
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Skip
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Fly
STR_GROUP_RENAME_CAPTION :{BLACK}Gje nytt namn til ei gruppe
STR_GROUP_CAN_T_CREATE :{WHITE}Kan ikkje lage gruppe...
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 250640fd8..10a893d61 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -1569,7 +1569,6 @@ STR_WAYPOINT :{WHITE}Pkt kont
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Wybierz typ pkt kontrolnego
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Train{P "" i ow}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Edytuj nazwę pkt. kontrolnego
@@ -3131,7 +3130,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nowe poj
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Pociąg jest zbyt długi
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Pociąg może być modyfikowany tylko gdy jest zatrzymany w zajezdni
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Pociąg{P "" i ów}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Pociąg{P "" i ów}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nowe pociągi
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nowe elektryczne pojazdy szynowe
@@ -3278,7 +3277,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Wypełni
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Samochód na drodze
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Samoch{P ód ody odów}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Samoch{P ód ody odów}
STR_DEPOT_ROAD_CAPTION :{WHITE} Zajezdnia samochodowa w {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nowe pojazdy
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nowy pojazd drogowy
@@ -3341,7 +3340,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Kanał w
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Nie można tutaj wybudować portu...
STR_DEPOT_SHIP_CAPTION :{WHITE}Stocznia w {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nowe statki
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Stat{P ek ki ów}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Stat{P ek ki ów}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nowe statki
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Budowa statku
STR_CLONE_SHIP :{BLACK}Klonuj statek
@@ -3406,7 +3405,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Spowoduj
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nowy samolot
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Budowa samolotu
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nie można zbudować samolotu...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Samolot
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Samolot
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Nie można wysłać samolotu do hangaru...
STR_HEADING_FOR_HANGAR :{ORANGE}Zmierza do hangaru w {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Zmierza do hangaru w {STATION}, {VELOCITY}
@@ -3600,10 +3599,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Pociąg{P "" i ów}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Samoch{P ód ody odów}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Samolot{P "" y ów}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Stat{P ek ki ków}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Pokazuje wszystkie pociągi, które mają tę stację w swoim rozkładzie
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Pokazuje wszystkie samochody, ktore mają tę stację w swoim rozkladzie
@@ -3632,10 +3627,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Zamień
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Zamień wszystkie statki w stoczni
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Zamień wszystkie samoloty w hangarze
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Pociąg{P "" i ów}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Samoch{P ód ody odów}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Stat{P ek ki ków}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Samolot{P "" y ów}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Zastąp {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Rozpocznij zastępowanie
@@ -3851,10 +3842,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Dodaj poj. współdzielące
STR_GROUP_REMOVE_ALL_VEHICLES :Usuń wszystkie pojazdy
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Pociąg{P "" i ów}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Samoch{P ód ody odów}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Stat{P ek ki ków}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Samolot{P "" y ów}
STR_GROUP_RENAME_CAPTION :{BLACK}Zmień nazwę grupy
STR_GROUP_CAN_T_CREATE :{WHITE}Nie można stworzyć grupy...
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index c35e1def7..997ab4cd7 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Ponto de
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Seleccione um tipo de ponto de passagem
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Trem{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Editar nome do ponto de passagem
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Novos Ve
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Comboio muito longo
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Os comboios só podem ser alterados quando parados num depósito
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Comboios
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Comboios
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Novos Veículos Ferroviários
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Novos comboios para carris electrificados
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Preenche
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Veículo de estrada no caminho
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Veículos de Estrada
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Veículos de Estrada
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Depósito de Veículos de Estrada
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Novos Veículos
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Novos Veículos de Estrada
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Canais
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Não é possível construir doca aqui...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Depósito Naval
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Novos Barcos
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Barcos
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Barcos
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Novos Barcos
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construir Barco
STR_CLONE_SHIP :{BLACK}Clonar Navio
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Esta ac
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nova Aeronave
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Construir Aeronave
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Não é possível construir aeronave...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Aeronaves
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronaves
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Não é possível mandar aeronave para o hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Dirige-se ao hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Dirige-se ao hangar de {STATION}, {VELOCITY}
@@ -3188,10 +3187,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Comboios
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Veiculos de Estrada
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aviões
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Barcos
STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostrar todos os comboios que têm esta estação nas ordens de serviço
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostrar todos os veículos de estrada que têm esta estação nas ordens de serviço
@@ -3220,10 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Autosubs
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Autosubstituir todos os barcos no depósito
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Autosubstituir todas as aeronaves no depósito
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Comboio{P "" s}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Veículo{P "" s} de Estrada
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Barco{P "" s}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Aeronave{P "" s}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Substituir {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Iniciar Subst. de Veículos
@@ -3439,10 +3430,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Adic. veíc. partilh.
STR_GROUP_REMOVE_ALL_VEHICLES :Remover todos os veículos
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Comboio{P "" s}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Veículo{P "" s} de estrada
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Barco{P "" s}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Avi{P "ão" "ões"}
STR_GROUP_RENAME_CAPTION :{BLACK}Renomear um grupo
STR_GROUP_CAN_T_CREATE :{WHITE}Impossível criar grupo...
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 6d9b69a05..e3516e88b 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Punct de
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Alege tipul de punct de tranzit
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Tren{P "" uri}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Editează numele haltei
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Vehicule
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Tren prea lung
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Trenurile pot fi modificate doar când staţionează într-un depou
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Tren{P "" uri}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tren{P "" uri}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Noi vehicule feroviare
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Noi Vehicule Electrice pe Sine
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Complete
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Autovehicul in cale
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Autovehicule{P "" s}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Autovehicule{P "" s}
STR_DEPOT_ROAD_CAPTION :{WHITE}Autobaza {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Autovehicule noi
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Autovehicule noi
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Rute acv
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Nu pot construi port aici...
STR_DEPOT_SHIP_CAPTION :{WHITE}Şantierul Naval {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nave noi
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Nav{P ă e}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Nav{P ă e}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nave noi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construieşte navă
STR_CLONE_SHIP :{BLACK}Clonare navă
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Acest bu
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Aeronavă nouă
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Cumpără aeronavă
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nu se poate cumpăra aeronava...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Aeronave
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronave
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Nu se poate trimite aeronava la hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}Merge la Hangarul {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Merge la Hangarul {STATION}, {VELOCITY}
@@ -3188,10 +3187,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Trenuri
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Autovehicule
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aeronave
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Nave
STR_SCHEDULED_TRAINS_TIP :{BLACK}Afiseaza toate trenurile care opresc in aceasta statie
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Afiseaza toate autovehiculele care opresc in aceasta statie
@@ -3220,10 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}înlocui
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}înlocuieşte automat toate vasele din depou
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}înlocuieşte automat toate aeronavele din hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tren{P "" s}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Autovehicul{P "" s}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Vas{P "" s}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Aeronava
STR_REPLACE_VEHICLES_WHITE :{WHITE}Înlocuieste {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Incepere inlocuire vehicule
@@ -3439,10 +3430,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Adauga vehiculele partajate
STR_GROUP_REMOVE_ALL_VEHICLES :Elimina toate vehiculele
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tren{P "" uri}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Autovehicul{P "" e}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Nav{P a e}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Aeronav{P a e}
STR_GROUP_RENAME_CAPTION :{BLACK}Redenumeste un grup
STR_GROUP_CAN_T_CREATE :{WHITE}Nu pot crea grup...
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 441076394..7144ceafe 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -1345,7 +1345,6 @@ STR_WAYPOINT :{WHITE}Точк
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Выбор типа точки пути
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Поезд{P "" а ов}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Переименовать точку пути
@@ -2880,7 +2879,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Новы
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Поезд слишком длинный
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Структуру поезда можно менять только в депо
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} поезд{P "" а ов}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} поезд{P "" а ов}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Новый поезд
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Новый электропоезд
@@ -3027,7 +3026,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Запо
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Машина на пути
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} автомобил{P ь я ей}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} автомобил{P ь я ей}
STR_DEPOT_ROAD_CAPTION :{WHITE}Гараж {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Новая машина
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Новая машина
@@ -3090,7 +3089,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Водн
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Здесь невозможно построить пристань...
STR_DEPOT_SHIP_CAPTION :{WHITE}Док {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Новое судно
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} корабл{P ь я ей}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} корабл{P ь я ей}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Покупка кораблей
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Купить
STR_CLONE_SHIP :{BLACK}Копировать
@@ -3155,7 +3154,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Созд
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Новый
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Купить
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Невозможно купить возд. транспорт...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} единиц{P а ы ""} авиатранспорта
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} единиц{P а ы ""} авиатранспорта
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Невозможно отправить его в ангар...
STR_HEADING_FOR_HANGAR :{ORANGE}Летит в Ангар {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Идёт в ангар {STATION}; {VELOCITY}
@@ -3351,10 +3350,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} поезд{P "" а ов}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} автомобил{P ь я ей}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} самолёт{P "" а ов}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} корабл{P ь я ей}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Показать все поезда, в расписании которых есть эта станция
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Показать все автомобили, в расписании которых есть эта станция/остановка
@@ -3383,10 +3378,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Авто
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Автозамена всех судов в доке
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Автозамена всего авиатранспорта в ангаре
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} поезд{P "" а ов}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} автомобил{P ь я ей}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} корабл{P ь я ей}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} ед. авиатранспорта
STR_REPLACE_VEHICLES_WHITE :{WHITE}Замена {STRING.gen}
STR_REPLACE_VEHICLES_START :{BLACK}Начать замену
@@ -3602,10 +3593,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Добавить с общими заданиями
STR_GROUP_REMOVE_ALL_VEHICLES :Удалить всех
-STR_GROUP_TRAINS_CAPTION :{WHITE}Группа «{GROUP}» - {COMMA} поезд{P "" а ов}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}Группа «{GROUP}» - {COMMA} автомобил{P ь я ей}
-STR_GROUP_SHIPS_CAPTION :{WHITE}Группа «{GROUP}» - {COMMA} корабл{P ь я ей}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}Группа «{GROUP}» - {COMMA} единиц{P а ы ""} авиатранспорта
STR_GROUP_RENAME_CAPTION :{BLACK}Переименовать группу
STR_GROUP_CAN_T_CREATE :{WHITE}Не могу создать группу...
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 0c73e8d16..bf70a781c 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -1354,7 +1354,6 @@ STR_WAYPOINT :{WHITE}Čvoriš
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Odaberite izgled čvorišta
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Voz{P "" a ova}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Promena naziva čvorišta
@@ -2730,7 +2729,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nova Voz
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Voz je predugačak
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Vozovi se mogu izmeniti samo kada su zaustavljeni u depou
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Voz{P "" a ova}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Voz{P "" a ova}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nova Železnička Vozila
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nova Železnička Električna Vozila
@@ -2877,7 +2876,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Popunjav
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Drumsko vozilo na putu
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Drumsk{P o a ih} Vozil{P o a a}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Drumsk{P o a ih} Vozil{P o a a}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Depo Drumskih Vozila
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nova Vozila
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nova Drumska Vozila
@@ -2940,7 +2939,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Plovni k
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Izgradnja pristaništa ovde nije moguća...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Depo Plovila
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Novi Brodovi
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Brod{P "" a ova}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Brod{P "" a ova}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Novi Brodovi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Kupi Brod
STR_CLONE_SHIP :{BLACK}Kopiraj Brod
@@ -3005,7 +3004,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Ovim će
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nove Letilice
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Napraviti Letelicu
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Letelice se ne može napraviti
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Leteluca
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Leteluca
STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP :{BLACK}Promenite naziv vrste letilice
STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION :{WHITE}Promena naziva vrste letilice
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index fc8348818..5cc287045 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}路点
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}选择路点类型
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} 列 火车
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}编辑路点名称
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}购买
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}列车过长
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}只有列车停在车库中时才能更改挂车
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} 列 火车
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} 列 火车
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}购买普通列车
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}购买电气化列车
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}根据
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}指定的位置有汽车
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} 辆 汽车
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} 辆 汽车
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} 车库
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}购买汽车
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}购买汽车
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}水运
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}不能在这里新建码头……
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} 船坞
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}购买船只
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} 艘 船只
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} 艘 船只
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}购买船只
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}购买船只
STR_CLONE_SHIP :{BLACK}克隆船只
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK} 复制
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}购买飞机
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}购买
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}不能购买飞机……
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} 架 飞机
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} 架 飞机
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}不能命令飞机返回机库……
STR_HEADING_FOR_HANGAR :{ORANGE}正在前往 {STATION} 的机库
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}正在前往 {STATION} 的机库,{VELOCITY}
@@ -3188,10 +3187,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} 列车
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} 汽车
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} 飞机
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} 船只
STR_SCHEDULED_TRAINS_TIP :{BLACK}显示所有调度计划中含有此车站的列车
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}显示所有调度计划中含有此车站的汽车
@@ -3220,10 +3215,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}自动
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}自动更新船坞中的所有船只
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}自动更新机库中的所有飞机
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} 列 列车
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} 辆 汽车
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} 艘 船只
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} 架 飞机
STR_REPLACE_VEHICLES_WHITE :{WHITE}更新 {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}开始更新
@@ -3439,10 +3430,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :添加共享车辆
STR_GROUP_REMOVE_ALL_VEHICLES :移除所有车辆
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} 列车
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} 公路车辆
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} 船只
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} 飞机
STR_GROUP_RENAME_CAPTION :{BLACK}移除分组
STR_GROUP_CAN_T_CREATE :{WHITE}无法新建分组……
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index acf2cafdb..6f34cc653 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -1263,7 +1263,6 @@ STR_WAYPOINT :{WHITE}Smerovy
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vyber typ kontrolneho bodu
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Vlak{P "" y ov}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Upravit nazvy smerovych bodov
@@ -2784,7 +2783,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nove voz
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Vlak je prilis dlhy
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Vlaky sa daju nahradit len v depe
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Vlak{P "" y ov}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Vlak{P "" y ov}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nove vlaky
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nové elektrické lokomotívy a vagóny
@@ -2930,7 +2929,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Naplň
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Automobil v ceste
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Automobil{P "" y ov}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Automobil{P "" y ov}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Garaz
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nove vozidla
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nove automobily
@@ -2992,7 +2991,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vodné c
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Tu nemozno postavit pristav ...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Lodenica
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nove lode
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Lod{P "" e i}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Lod{P "" e i}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nove lode
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Vyrobit lod
STR_CLONE_SHIP :{BLACK}Klonovat lod
@@ -3057,7 +3056,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Vytvori
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nove Lietadlo
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Vyrobit lietadlo
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Nemozno vyrobit lietadlo...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Lietad{P lo la iel}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Lietad{P lo la iel}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Nemozno poslat lietadlo do hangaru ...
STR_HEADING_FOR_HANGAR :{ORANGE}Smeruje do {STATION} hangaru
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Smeruje do {STATION} hangaru, {VELOCITY}
@@ -3253,10 +3252,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Vlak{P "" y ov}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Aut{P o a ""}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Lietad{P lo la iel}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Lod{P "" e i}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Zobrazit vsetky vlaky, ktore maju tuto stanicu v cestovnom poriadku
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Zobrazit vsetky auta, ktore maju tuto stanicu v cestovnom poriadku
@@ -3285,10 +3280,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Automati
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Automaticky nahradit všetky lode v lodenici
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Automaticky nahradit všetky lietadlá v hangári
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Vlak{P "" y ov}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Vozid{P lo lá iel}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Lod{P "" e í}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Lietad{P lo lá iel}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Vymena {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Zacat vymenu vozidiel
@@ -3504,10 +3495,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Pridat zdielané vozidlá
STR_GROUP_REMOVE_ALL_VEHICLES :Odstránit všetky vozidlá
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Vlak{P "" y ov}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Vozid{P lo lá ied}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Lod{P "" e í}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Lietad{P lo lá iel}
STR_GROUP_RENAME_CAPTION :{BLACK}Premenovat skupinu
STR_GROUP_CAN_T_CREATE :{WHITE}Nie je možné vytvorit skupinu ...
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index ca80834c7..f3166c7ef 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -1238,7 +1238,6 @@ STR_WAYPOINT :{WHITE}Točka p
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Izberi vrsto točke poti
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Vlak{P "" a i ov}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Uredi ime točke poti
@@ -2797,7 +2796,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nova voz
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Vlak je predolg
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Vlaki so lahko spremenjeni šele, ko stojijo v garaži
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Vlak{P "" a i ov}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Vlak{P "" a i ov}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nova železniška vozila
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nova električna tirna vozila
@@ -2942,7 +2941,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Avtomats
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Cestno vozilo na poti
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Cestn{P o i a ih} vozil{P o i a ""}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Cestn{P o i a ih} vozil{P o i a ""}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Garaža za cestna vozila
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nova vozila
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nova cestna vozila
@@ -3005,7 +3004,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Vodne po
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Ni mogoče zgraditi pomola tukaj ...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Ladijska garaža
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nove ladje
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Lad{P ja ji je ij}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Lad{P ja ji je ij}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nove ladje
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Zgradi ladjo
STR_CLONE_SHIP :{BLACK}Kloniraj ladjo
@@ -3070,7 +3069,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}To bo zg
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Novo letalo
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Zgradi letalo
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Ni mogoče zgraditi letala ...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Letal{P o i a ""}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Letal{P o i a ""}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Ni mogoče poslati letala v hangar ...
STR_HEADING_FOR_HANGAR :{ORANGE}Na poti v {STATION} hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Na poti v {STATION} hangar, {VELOCITY}
@@ -3266,10 +3265,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Vlak{P "" a i ov}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} cestn{P o i a ih} vozil{P o i a ""}
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Letal{P o i a ""}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} lad{P ja ji je ij}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Prikaz vsah vlakov, ki imajo to postajo na urniku
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Prikaz vseh cestnih vozil, ki imajo to postajo na urniku
@@ -3298,10 +3293,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Avtomats
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Avtomatsko zamenjaj vse ladje v garaži
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Samozamenjaj vsa letala v hangarju
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} vlak{P "" a i ov}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} cestn{P o i a ih} vozil{P o i a ""}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} lad{P ja ji je ij}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} letal{P o i a ""}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Zamenjaj {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Začni menjavo vozil
@@ -3517,10 +3508,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Vsa izmenljiva vozila
STR_GROUP_REMOVE_ALL_VEHICLES :Odstrani vsa vozila
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Vlak{P "" a i ov}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Cestn{P o i a ih} Vozil{P o i a ""}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Lad{P ja ji je ij}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Letal{P o i a ""}
STR_GROUP_RENAME_CAPTION :{BLACK}Preimenuj eno skupino
STR_GROUP_CAN_T_CREATE :{WHITE}Nemogoče ustvariti skupino...
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index ac5b0280a..363e10c04 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -1197,7 +1197,6 @@ STR_WAYPOINT :{WHITE}Punto de
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Seleccione tipo de punto de paso
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Tren{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Editar nombre del punto de paso
@@ -2718,7 +2717,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nuevos V
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Tren demasiado largo
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Los trenes únicamente puede ser modificados en el interior de los depósitos
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Trenes
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Trenes
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nuevos vehículos de raíl
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nuevo Vehículo Eléctrico de Railes
@@ -2865,7 +2864,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Rellena
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vehículo de carretera en camino
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Vehículos de Carretera
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vehículos de Carretera
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Depósito de vehículos
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nuevos vehículos
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nuevos vehículos
@@ -2928,7 +2927,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Canales
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}No se pueden construir muelles aquí...
STR_DEPOT_SHIP_CAPTION :{WHITE}Astillero de {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nuevos barcos
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Barcos
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Barcos
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nuevos barcos
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Construir barco
STR_CLONE_SHIP :{BLACK}Clonar barco
@@ -2993,7 +2992,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Esto con
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nueva Aeronave
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Construir aeronave
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}No se puede construir aeronave...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Aeronave
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Aeronave
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}No se puede enviar la aeronave al hangar
STR_HEADING_FOR_HANGAR :{ORANGE}Ir al hangar de {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Ir al hangar de {STATION}, {VELOCITY}
@@ -3189,10 +3188,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Trenes
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Vehículos de carretera
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aeronaves
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Barcos
STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostrar todos los trenes que tienen esta estación en su horario
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostrar todos los vehículos de carretera que tienen esta estación en su horario
@@ -3221,10 +3216,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Cambia a
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Cambia automáticamente todos los barcos del depósito
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Cambia automáticamente todas las aeronaves del hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tren{P "" s}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Vehículo Carretera{P "" s}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Barco{P "" s}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Aeronave
STR_REPLACE_VEHICLES_WHITE :{WHITE}Reemplazar {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Empezar a reemplazar vehículos
@@ -3440,10 +3431,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Todos los vehículos compartidos
STR_GROUP_REMOVE_ALL_VEHICLES :Quitar todos los vehículos
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tren{P "" s}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Vehículo de carretera{P "" s}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Barco{P "" s}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Aeronave
STR_GROUP_RENAME_CAPTION :{BLACK}Renombrar un grupo
STR_GROUP_CAN_T_CREATE :{WHITE}No se puede crear grupo...
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 7881e6064..dbfae7e9f 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Kontroll
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Välj kontrollstationstyp
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Tåg{P "" s}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Ändra namn på kontrollstation
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Nytt for
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Tåg för långt
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Tåg kan bara ändras när det står still inuti en depå
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Tåg
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tåg
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Nytt tågfordon
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Nya elektriska järnvägsfordon
@@ -2863,7 +2862,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Fyll i t
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vägfordon i vägen
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Vägfordon
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Vägfordon
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Vägfordon Depå
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Nytt Fordon
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Nytt Vägfordon
@@ -2926,7 +2925,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Farled
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Kan inte bygga hamn här...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} skeppsdepå
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Nytt skepp
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} skepp
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} skepp
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Nytt skepp
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Bygg skepp
STR_CLONE_SHIP :{BLACK}Klona skepp
@@ -2991,7 +2990,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Det här
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Nytt flygplan
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Bygg flygplan
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Kan inte bygga flygplan...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} flygplan
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} flygplan
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Kan inte skicka flygplan till hangar...
STR_HEADING_FOR_HANGAR :{ORANGE}På väg mot {STATION}s hangar
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}På väg mot {STATION}s hangar, {VELOCITY}
@@ -3187,10 +3186,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Tåg
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Vägfordon
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Flygplan
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Skepp
STR_SCHEDULED_TRAINS_TIP :{BLACK}Visa alla tåg där denna station finns med i rutten
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Visa alla vägfordon där denna station finns med i rutten
@@ -3219,10 +3214,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Byt ut a
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Byt ut alla skepp i depån
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Byt ut alla flygplan i hangaren
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tåg
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Vägfordon
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Skepp
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Flygplan
STR_REPLACE_VEHICLES_WHITE :{WHITE}Byt ut {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Börja byta ut fordon
@@ -3438,10 +3429,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Lägg till delade fordon
STR_GROUP_REMOVE_ALL_VEHICLES :Ta bort alla fordon
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tåg{P "" s}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Vägfordon{P "" s}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Skepp{P "" s}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Flygplan
STR_GROUP_RENAME_CAPTION :{BLACK}Döp om en grupp
STR_GROUP_CAN_T_CREATE :{WHITE}Kan inte skapa grupp...
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index c1e72a622..d31bd9e0c 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}號誌
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}顯示號誌站種類
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - 列車 {COMMA} 列
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}編輯號誌站名稱
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}購買
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}列車太長
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}列車只有在停放於機廠內的時候才能變動
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - 列車 {COMMA} 組
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - 列車 {COMMA} 組
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}新購鐵路車輛
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}新電氣化列車
@@ -2864,7 +2863,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}自動
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}前方有汽車
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - 車輛 {COMMA} 部
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - 車輛 {COMMA} 部
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} 車庫
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}購買新車輛
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}購置新車輛
@@ -2927,7 +2926,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}水道
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}無法在此興建碼頭...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} 船塢
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}購買船舶
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - 船舶 {COMMA} 艘
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - 船舶 {COMMA} 艘
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}購買船舶
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}購買船舶
STR_CLONE_SHIP :{BLACK}複製船舶
@@ -2992,7 +2991,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}這會
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}購買飛機
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}購買飛機
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}無法購買飛機...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - 飛機 {COMMA} 架
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - 飛機 {COMMA} 架
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}無法將飛機送回機棚...
STR_HEADING_FOR_HANGAR :{ORANGE}正前往 {STATION} 機棚
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}正前往 {STATION} 機棚,{VELOCITY}
@@ -3186,10 +3185,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - 列車 {COMMA} 列
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - 車輛 {COMMA} 部
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - 飛機 {COMMA} 架
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - 船舶 {COMMA} 艘
STR_SCHEDULED_TRAINS_TIP :{BLACK}顯示所有指令內包含這個車站的列車
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}顯示所有指令内包含這個車站的車輛
@@ -3218,10 +3213,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}自動
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}自動替換所有船塢内船舶
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}自動替換所有機棚内飛機
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - 列車 {COMMA} 列
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - 車輛 {COMMA} 部
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - 船舶 {COMMA} 艘
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - 飛機 {COMMA} 架
STR_REPLACE_VEHICLES_WHITE :{WHITE}替換 {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}開始替換交通工具
@@ -3437,10 +3428,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :加入共享指令的交通工具
STR_GROUP_REMOVE_ALL_VEHICLES :移除所有交通工具
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} 列車
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} 車輛
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} 船舶
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} 飛機
STR_GROUP_RENAME_CAPTION :{BLACK}為群組重新命名
STR_GROUP_CAN_T_CREATE :{WHITE}無法建立群組...
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index aa167dbd8..33b2a6f11 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -1196,7 +1196,6 @@ STR_WAYPOINT :{WHITE}Yerimi
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Yerimi türü seç
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Tren
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Yerimi adını değiştir
@@ -2717,7 +2716,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Yeni Ara
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Tren çok uzun
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Sadece garda durdurulmuş trenler üzerinde işlem yapılabilir
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Tren
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tren
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Yeni Tren
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Yeni Elektrikli Trenler
@@ -2862,7 +2861,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Zaman ta
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Yolda araba var
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Arabalar
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Arabalar
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Araba Garaji
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Yeni Araba
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Yeni Araba
@@ -2925,7 +2924,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Suyolu
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Buraya iskele yapılamaz...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Tersanesi
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Yeni gemi
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Gemi
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Gemi
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Yeni gemi
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Gemi yap
STR_CLONE_SHIP :{BLACK}Gemiyi kopyala
@@ -2990,7 +2989,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Uçağı
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Yeni Uçak
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Uçak Yap
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Uçak alınamaz...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Uçak
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Uçak
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Hangara gönderilemiyor...
STR_HEADING_FOR_HANGAR :{ORANGE}{STATION} Hangarına gidiyor
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}{STATION} Hangarına gidiyor, {VELOCITY}
@@ -3186,10 +3185,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Trenler
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Arabalar
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Uçaklar
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Gemiler
STR_SCHEDULED_TRAINS_TIP :{BLACK}Talimat listesinde bu durak olan trenleri listele
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Talimat listesinde bu durak olan arabaları listele
@@ -3218,10 +3213,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Garajdak
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Tersanedeki tüm gemileri otomatik yenile
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Hangardaki tüm uçakları otomatik yenile
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tren
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Araba
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Gemi
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Uçak
STR_REPLACE_VEHICLES_WHITE :{WHITE}{STRING} Değiştir
STR_REPLACE_VEHICLES_START :{BLACK}Araçları Değiştirmeye Başla
@@ -3437,10 +3428,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Bütün paylaşılan araçlar
STR_GROUP_REMOVE_ALL_VEHICLES :Bütün araçları çıkar
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tren
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Araba
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Gemi
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Uçak
STR_GROUP_RENAME_CAPTION :{BLACK}Grubun ismini değiştir
STR_GROUP_CAN_T_CREATE :{WHITE}Grup oluşturulamıyor...
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 546f7d91b..50f2f6b7d 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -1321,7 +1321,6 @@ STR_WAYPOINT :{WHITE}Точк
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Виберіть тип точки маршруту
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} поїзд{P "" и ів}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Перейменуйте точку маршруту
@@ -2879,7 +2878,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Нови
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Поїзд дуже довгий
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Поїзд можна змінювати тільки тоді, коли зупинений в депо
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} поїзд{P "" и ів}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} поїзд{P "" и ів}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Новий залізничний транспорт
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Новий електрозалізничний транспорт
@@ -3026,7 +3025,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Авто
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}На шляху авто
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} автомобіл{P ь і ів}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} автомобіл{P ь і ів}
STR_DEPOT_ROAD_CAPTION :{WHITE}{TOWN} Гараж
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Новий транспорт
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Нове авто
@@ -3089,7 +3088,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Водн
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Неможливо будувати порт тут...
STR_DEPOT_SHIP_CAPTION :{WHITE}{TOWN} Док
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Нові кораблі
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} кораб{P ель лі лів}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} кораб{P ель лі лів}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Нові кораблі
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Будувати корабель
STR_CLONE_SHIP :{BLACK}Клонувати
@@ -3154,7 +3153,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Буду
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Нові літаки
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Будувати
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Неможливо будувати літак...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} літак{P "" и ів}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} літак{P "" и ів}
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Неможливо направити літак до ангару...
STR_HEADING_FOR_HANGAR :{ORANGE}Летить до {STATION} ангару
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Летить до {STATION} ангару, {VELOCITY}
@@ -3350,10 +3349,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} поїзд{P "" и ів}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} авто
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} літак{P "" и ів}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} кораб{P ель лі лів}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Показати всі поїзди, які заходять на цю станцію
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Показати всі авто, які заходять на цю станцію
@@ -3382,10 +3377,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Онов
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Оновити всі кораблі в депо
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Оновити всі літаки в ангарі
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} поїзд{P "" и ів}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} автомобіл{P ь і ів}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} кораб{P ель лі лів}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} літак {P "" и ів}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Оновити {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Почати оновлення
@@ -3601,10 +3592,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Добавити спільний транспорт
STR_GROUP_REMOVE_ALL_VEHICLES :Позбутися всього транспорту
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} поїзд{P "" и ів}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} автомобіл{P ь і ів}
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} кораб{P ель лі лів}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} літак{P "" и ів}
STR_GROUP_RENAME_CAPTION :{BLACK}Перейменувати групу
STR_GROUP_CAN_T_CREATE :{WHITE}Не можна створити групу...
diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt
index 83ebf2c3f..3bfcfb873 100644
--- a/src/lang/unfinished/greek.txt
+++ b/src/lang/unfinished/greek.txt
@@ -1182,7 +1182,6 @@ STR_WAYPOINT :{WHITE}Σημε
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Επιλογή τύπου σημείου πορείας
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Τραίν{P ο α}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Διαμόρφωση ονόματος σημείου πορείας
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 5540de0eb..254b59c96 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -844,7 +844,7 @@ STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON :{BLACK}Нов
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Нов авион
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Направи авион
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Не може да се направи авионот...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Авион
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Авион
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Не може да се прати авионот во гаража...
STR_ERROR_AIRCRAFT_IN_THE_WAY :{WHITE}Авион на патот
STR_ERROR_CAN_T_STOP_START_AIRCRAFT :{WHITE}Не може да сопре/тргне авионот...
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 19db58085..1c8fb77f9 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -1360,7 +1360,7 @@ STR_VEHICLE_DETAILS_CARGO_FROM :{LTBLUE}{CARGO}
STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}وسیله ی جدید
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}قطار بسیار طولانی شده
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} قطار{P "" s}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} قطار{P "" s}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}قطار جدید
STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION :{WHITE}قطار جدید مونوریل
@@ -1434,7 +1434,7 @@ STR_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}نمی
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}ماشین در جاده است
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} ماشین{P "" s}
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} ماشین{P "" s}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}وسایل نقلیه ی جدید
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}ماشین های جدید
STR_BUILD_VEHICLE_ROAD_BUILD_VEHICLE_BUTTON :{BLACK}ساخت وسیله نقلیه
@@ -1499,7 +1499,7 @@ STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON :{BLACK} هوا
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}هواپیمای جدید
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}ساخت هواپیما
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}نمی توان هواپیما را ساخت
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} هواپیما
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} هواپیما
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}نمیتوان هواپیما را به آشیانه فرستاد. . .
STR_NEWS_AIRCRAFT_IS_WAITING :{WHITE}{VEHICLE}در آشیانه در حال انتظار است
STR_ERROR_AIRCRAFT_IN_THE_WAY :{WHITE}هواپیما در راه است
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index 52f0a8dd3..5b05a80fe 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -1193,7 +1193,6 @@ STR_WAYPOINT :{WHITE}Pwynt Ll
STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Dewiswch math Pwynt Llwybr
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_LIST_TRAIN :{WHITE}{WAYPOINT} - {COMMA} Tr{P ên enau}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
STR_EDIT_WAYPOINT_NAME :{WHITE}Golygu enw Pwynt Llwybr
@@ -2714,7 +2713,7 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON :{BLACK}Cerbyd N
STR_DEPOT_NO_ENGINE :{BLACK}-
STR_ERROR_TRAIN_TOO_LONG :{WHITE}Mae'r Trên yn rhy hir
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}Gellir newid trenau yn unig pan fyddan nhw wedi stopio tu mewn i ddepo
-STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{COMPANY} - {COMMA} Tr{P "ên" au}
+STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} Tr{P "ên" au}
STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION :{WHITE}Cerbydau Rheilffordd Newydd
STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION :{WHITE}Cerbydau Rheilffordd Trydan Newydd
@@ -2854,7 +2853,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Llenwch
##id 0x9000
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Cerbyd ffordd yn y ffordd
-STR_VEHICLE_LIST_ROAD_CAPTION :{WHITE}{COMPANY} - {COMMA} Cerbyd{P "" au} Ffordd
+STR_VEHICLE_LIST_ROADVEH_CAPTION :{WHITE}{STRING} - {COMMA} Cerbyd{P "" au} Ffordd
STR_DEPOT_ROAD_CAPTION :{WHITE}Depo Cerbydau Ffordd {TOWN}
STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON :{BLACK}Cerbyd Newydd
STR_BUILD_VEHICLE_ROAD_CAPTION :{WHITE}Cerbydau Ffordd Newydd
@@ -2917,7 +2916,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Camlesi
STR_ERROR_CAN_T_BUILD_DOCK_HERE :{WHITE}Methu adeiladu doc yma...
STR_DEPOT_SHIP_CAPTION :{WHITE}Depo Llong {TOWN}
STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON :{BLACK}Llong Newydd
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{COMPANY} - {COMMA} Llong{P "" au}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} Llong{P "" au}
STR_BUILD_VEHICLE_SHIP_CAPTION :{WHITE}Llong Newydd
STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON :{BLACK}Adeiladu Llong
STR_CLONE_SHIP :{BLACK}Dyblygu Llong
@@ -2982,7 +2981,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Bydd hyn
STR_BUILD_VEHICLE_AIRCRAFT_CAPTION :{WHITE}Awyrennau Newydd
STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON :{BLACK}Adeiladu Awyrennau
STR_ERROR_CAN_T_BUILD_AIRCRAFT :{WHITE}Methu adeiladu awyren...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{COMPANY} - {COMMA} Awyrennau
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} Awyrennau
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Methu gyrru awyren i awyrendy...
STR_HEADING_FOR_HANGAR :{ORANGE}Mynd am Awyrendy {STATION}
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Mynd am Awyrendy {STATION}, {VELOCITY}
@@ -3167,10 +3166,6 @@ STR_LORRY :{BLACK}{LORRY}
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Tr{P "ên" enau}
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Cerbyd{P "" au} Ffordd
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Awyren(P "" au}
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Llong{P "" au}
STR_SCHEDULED_TRAINS_TIP :{BLACK}Dangos pob trên sydd â'r orsaf hon yn eu hamserlen
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Dangos pob cerbyd ffordd sydd â'r orsaf hon yn eu hamserlen
@@ -3199,10 +3194,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Awtoddis
STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Awtoddisodli pob llong yn y depo
STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Awtoddisodli pob awyren yn yr awyrendy
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tr{P "ên" enau}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Cerbyd{P "" au} Ffordd
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Llong{P "" au}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Awyren
STR_REPLACE_VEHICLES_WHITE :{WHITE}Disodli {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Dechrau Disodli Cerbydau
@@ -3417,10 +3408,6 @@ STR_GROUP_TINY_NUM :{TINYFONT}{COMM
STR_GROUP_ADD_SHARED_VEHICLE :Ychwanegu cerbyd a rennir
STR_GROUP_REMOVE_ALL_VEHICLES :Dileu pob cerbyd
-STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Tr{P ên nau}
-STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Cerbyd{P "" au} Ffordd
-STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Llong{P "" au}
-STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Awyren{P "" au}
STR_GROUP_RENAME_CAPTION :{BLACK}Ailenwi grw^p
STR_GROUP_CAN_T_CREATE :{WHITE}Methu creu grw^p
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 63d877c6a..ea2d15672 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -885,69 +885,13 @@ struct VehicleListWindow : public BaseVehicleListWindow {
this->owner = company;
/* Set up the window widgets */
- switch (this->vehicle_type) {
- case VEH_TRAIN:
- this->widget[VLW_WIDGET_LIST].tooltips = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP;
- this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS;
- break;
-
- case VEH_ROAD:
- this->widget[VLW_WIDGET_LIST].tooltips = STR_VEHICLE_LIST_ROAD_TOOLTIP;
- this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES;
- break;
-
- case VEH_SHIP:
- this->widget[VLW_WIDGET_LIST].tooltips = STR_VEHICLE_LIST_SHIP_TOOLTIP;
- this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS;
- break;
-
- case VEH_AIRCRAFT:
- this->widget[VLW_WIDGET_LIST].tooltips = STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP;
- this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT;
- break;
-
- default: NOT_REACHED();
- }
-
- switch (window_type) {
- case VLW_SHARED_ORDERS:
- this->widget[VLW_WIDGET_CAPTION].data = STR_VEH_WITH_SHARED_ORDERS_LIST;
- break;
-
- case VLW_STANDARD: // Company Name - standard widget setup
- switch (this->vehicle_type) {
- case VEH_TRAIN: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_CAPTION; break;
- case VEH_ROAD: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_ROAD_CAPTION; break;
- case VEH_SHIP: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHIP_CAPTION; break;
- case VEH_AIRCRAFT: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_AIRCRAFT_CAPTION; break;
- default: NOT_REACHED();
- }
- break;
-
- case VLW_WAYPOINT_LIST:
- this->widget[VLW_WIDGET_CAPTION].data = STR_WAYPOINT_VIEWPORT_LIST_TRAIN;
- break;
-
- case VLW_STATION_LIST: // Station Name
- switch (this->vehicle_type) {
- case VEH_TRAIN: this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_TRAINS; break;
- case VEH_ROAD: this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_ROAD_VEHICLES; break;
- case VEH_SHIP: this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_SHIPS; break;
- case VEH_AIRCRAFT: this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_AIRCRAFT; break;
- default: NOT_REACHED();
- }
- break;
+ this->widget[VLW_WIDGET_LIST].tooltips = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP + this->vehicle_type;
+ this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS + this->vehicle_type;
- case VLW_DEPOT_LIST:
- switch (this->vehicle_type) {
- case VEH_TRAIN: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_DEPOT; break;
- case VEH_ROAD: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_ROADVEH_DEPOT; break;
- case VEH_SHIP: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHIP_DEPOT; break;
- case VEH_AIRCRAFT: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_AIRCRAFT_DEPOT; break;
- default: NOT_REACHED();
- }
- break;
- default: NOT_REACHED();
+ if (window_type == VLW_SHARED_ORDERS) {
+ this->widget[VLW_WIDGET_CAPTION].data = STR_VEH_WITH_SHARED_ORDERS_LIST;
+ } else {
+ this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vehicle_type;
}
switch (this->vehicle_type) {
@@ -1018,18 +962,21 @@ struct VehicleListWindow : public BaseVehicleListWindow {
break;
case VLW_STANDARD: // Company Name
- SetDParam(0, owner);
- SetDParam(1, this->vscroll.count);
+ SetDParam(0, STR_COMPANY_NAME);
+ SetDParam(1, owner);
+ SetDParam(2, this->vscroll.count);
break;
case VLW_WAYPOINT_LIST:
- SetDParam(0, index);
- SetDParam(1, this->vscroll.count);
+ SetDParam(0, STR_WAYPOINT_RAW);
+ SetDParam(1, index);
+ SetDParam(2, this->vscroll.count);
break;
case VLW_STATION_LIST: // Station Name
- SetDParam(0, index);
- SetDParam(1, this->vscroll.count);
+ SetDParam(0, STR_STATION);
+ SetDParam(1, index);
+ SetDParam(2, this->vscroll.count);
break;
case VLW_DEPOT_LIST: