(svn r16919) -Codechange: unify some more StringID w.r.t. their naming

45 files changed, 911 insertions, 911 deletions

diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index 60c85fd77..d5f63d2e1 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -1237,11 +1237,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nywerhei
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...te naby aan 'n ander nywerheid
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Herstel trein om 'n ander vrag tipe te ontvoer
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Herstel trein
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kies vrag tipe vir trein te ontvoer
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Herstel trein om verlig vrag tipe te ontvoer
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}kan nie trein herstel nie...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Herstel trein om 'n ander vrag tipe te ontvoer
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Herstel trein
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Kies vrag tipe vir trein te ontvoer
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Herstel trein om verlig vrag tipe te ontvoer
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}kan nie trein herstel nie...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Verander produksie
 
 ############ network gui strings
@@ -2690,7 +2690,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Verander
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Opdrae)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Einde van Opdrae - -
 STR_SERVICE                                                     :{BLACK}Diens
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Kan nie spoorweg voertuig bou nie...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan nie spoorweg voertuig bou nie...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebou: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2804,7 +2804,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Op pad
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Op pad na {TOWN} Pad Depot, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Diens by {TOWN} Pad Depot
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Diens by {TOWN} Pad Depot, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Kan nie voertuig na depot stuur nie...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan nie voertuig na depot stuur nie...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan nie plaaslike depot vind nie
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Pad voertuie - kliek op voertuig vir inligting
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Huidige voertuig aksie - kliek hier om voertuig to stop/aanskakel
@@ -2825,9 +2825,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} voertuig{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Benaam pad voertuig
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Pad voertuig kan nie benaam word nie...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Benaam pad voertuig
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Benaam pad voertuig
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Pad voertuig kan nie benaam word nie...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Benaam pad voertuig
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste bus arriveer by {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste trok arriveer by {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste passasier trein arriveer by {STATION}!
@@ -2835,16 +2835,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Pad Voertuig Botsing!{}Bestuurder sterf in vuurbol na botsing met trein
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Pad voertuig Botsing!{}{COMMA} sterf in vuurbol na botsing met trein
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan nie voertuie van veel deele draai nie
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Hernoem
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Hernoem pad voertuig tipe
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Hernoem pad voertuig tipe
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Pad voertuig tipe kan nie hernoem word nie...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Herpas pad voertuig om 'n ander vrag tipe te ontvoer
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Herpas pad voertuig
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Herpas pad voertuig om beklemtoonde vrat tipe te ontvoer
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan nie pad voertuig herpas nie...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kies vrag tipe vir pad voertuig om te vervoer
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Hernoem
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Hernoem pad voertuig tipe
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Hernoem pad voertuig tipe
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Pad voertuig tipe kan nie hernoem word nie...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Herpas pad voertuig om 'n ander vrag tipe te ontvoer
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Herpas pad voertuig
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Herpas pad voertuig om beklemtoonde vrat tipe te ontvoer
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan nie pad voertuig herpas nie...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Kies vrag tipe vir pad voertuig om te vervoer
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Waterweg konstruksie
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 31f60685b..a0ad815de 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -1264,11 +1264,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}اسما
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}قريب جدا من مصنع آخر
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}اعادة تهيئة القطار لحمل نوع اخر من البضائع
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}تهيئة القطار
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}أختر نوع البضاعة لينقلها القطار
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}اعادة تهيئة القطار لحمل البضائع المختارة
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}لايمكن اعادة تهيئة القطار
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}اعادة تهيئة القطار لحمل نوع اخر من البضائع
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}تهيئة القطار
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}أختر نوع البضاعة لينقلها القطار
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}اعادة تهيئة القطار لحمل البضائع المختارة
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}لايمكن اعادة تهيئة القطار
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}تغيير الانتاج
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :محطة غير
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}فارغ
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} الى {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} من{STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} ينتظر في المستودع
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ينتظر في المستودع
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}عربات جديدة
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}القطار طويل جدا
@@ -2738,7 +2738,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}حول �
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (اوامر)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - نهاية الاوامر - -
 STR_SERVICE                                                     :{BLACK} صيانة
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}لايمكن بناء عربات سكة حديد ...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}لايمكن بناء عربات سكة حديد ...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}بني: {LTBLUE}{NUM}{BLACK} تكلفة: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK} تكلفة: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2868,7 +2868,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}متو�
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}متوجة الى ورشة {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}صيانة في ورشة {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE} صيانة في ورشة {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}لا يمكن ارسال العربة الى ورشة الصيانة
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}لا يمكن ارسال العربة الى ورشة الصيانة
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}لم يتم العثور على ورشة قريبة من العربة
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}العربات - اضغط على العربة لعرض المعلومات
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}حركة العربة الحالية - اضغط هنا لايقاف / تشغيل العربة
@@ -2889,9 +2889,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM}العربات {STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}تسمية العربة
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}لا يمكن تسمية العربة
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}تسمية العربة
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}تسمية العربة
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}لا يمكن تسمية العربة
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}تسمية العربة
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}يحتفل الأهالي ..............{}بوصول اول باص للمحطة ...{STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}الأهالي يحتفلون ......... {}بوصول اول عربة الى .. {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}المواطنون يحتفلون . . .{}بوصول اول عربة ركاب ترام الى {STATION}!
@@ -2899,16 +2899,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}العربة تحطمت !{}السائق توفي في شعلة الحريق بعد الاصطدام بقطار
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}العربة تحطمت !{}{COMMA} توفي في شعلة الحريق بعد الاصطدام بقطار
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE} لا يمكن تغيير اتجاة المركبة الان
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}أعد التسمية
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK} اعادة تسمية العربة
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE} اعادة تسمية العربة
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE} لايمكن اعادة تسمية العربات
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK} هيئ العربة لحمولة أخرى
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}تهيئة نوع حمولة العربة
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK} هيئ العربة لنوع الحمولة المختار
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE} لا يمكن اعادة تهيئة العربة ...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK} اختر نوع حمولة العربة
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}أعد التسمية
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK} اعادة تسمية العربة
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE} اعادة تسمية العربة
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE} لايمكن اعادة تسمية العربات
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK} هيئ العربة لحمولة أخرى
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}تهيئة نوع حمولة العربة
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK} هيئ العربة لنوع الحمولة المختار
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE} لا يمكن اعادة تهيئة العربة ...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK} اختر نوع حمولة العربة
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :بناء ممرات مائيه
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 93483a436..ab4e48083 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -1265,11 +1265,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes da
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Adaptar trem para um tipo de carga diferente
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Adaptar trem
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecionar tipo de carga para o trem
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Adaptar trem para transportar a carga selecionada
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Impossível adaptar o trem...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Adaptar trem para um tipo de carga diferente
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Adaptar trem
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecionar tipo de carga para o trem
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Adaptar trem para transportar a carga selecionada
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Impossível adaptar o trem...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Modificar produção
 
 ############ network gui strings
@@ -2703,7 +2703,7 @@ STR_UNKNOWN_STATION                                             :estação desco
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Vazio
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} de {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} está aguardando no depósito
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} está aguardando no depósito
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Veículos
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Trem muito longo
@@ -2739,7 +2739,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Alternar
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordens)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fim de Ordens - -
 STR_SERVICE                                                     :{BLACK}Manutenção
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Impossível construir veículo ferroviário...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Impossível construir veículo ferroviário...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2869,7 +2869,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Indo pa
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Indo para a garagem de {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Manutenção na garagem de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Manutenção na garagem de {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Impossível enviar o veículo para a garagem...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Impossível enviar o veículo para a garagem...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Incapaz de encontrar a garagem local
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Automóveis - clique num veículo para informações
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Tarefa atual do veículo - clique aqui para iniciar/parar veículo
@@ -2890,9 +2890,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} veículo{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Renomear automóvel
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Impossível renomear automóvel...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Renomear automóvel
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear automóvel
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Impossível renomear automóvel...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear automóvel
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro ônibus chega a {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro caminhão chega a {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de passageiros chega a {STATION}!
@@ -2900,16 +2900,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Acidente Rodoviário!{} Condutor morre numa explosão após a colisão com um trem
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Acidente Rodoviário!{} {COMMA} mortos numa explosão após a colisão com um trem
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Impossível virar o veículo...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Renomear
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Renomear tipo do automóvel
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Renomear tipo do automóvel
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Impossível renomear tipo do automóvel...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Adaptar automóvel para carregar tipo de carga diferente
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Adaptar automóvel
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Adaptar automóvel para carregar o tipo de carga selecionado
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Impossível adaptar automóvel...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecionar tipo de carga para o automóvel
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomear
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomear tipo do automóvel
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomear tipo do automóvel
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Impossível renomear tipo do automóvel...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Adaptar automóvel para carregar tipo de carga diferente
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Adaptar automóvel
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Adaptar automóvel para carregar o tipo de carga selecionado
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Impossível adaptar automóvel...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecionar tipo de carga para o automóvel
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construção de hidrovias
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index f7934c3e8..7613c45cb 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -1243,11 +1243,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Имен
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...прекалено близо до друка индустрия
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Преоборудване на влак да превозва друг товар
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Проборудване
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Избор тип на товар за влак
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Преоборудва влака да превозва избрания тип товар
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Преоборудването на влака е невъзможно...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Преоборудване на влак да превозва друг товар
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Проборудване
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Избор тип на товар за влак
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Преоборудва влака да превозва избрания тип товар
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Преоборудването на влака е невъзможно...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Промяна на производство
 
 ############ network gui strings
@@ -2676,7 +2676,7 @@ STR_UNKNOWN_STATION                                             :неизвес�
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Празен
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} от {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} от {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} чака в депото
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} чака в депото
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Нови ПС
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Влакът е прекалено дълъг
@@ -2712,7 +2712,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Пром
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Заповеди)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Край на Заповедите - -
 STR_SERVICE                                                     :{BLACK}Ремонт
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Не може да купиш ЖП машина...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Не може да купиш ЖП машина...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Купи: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Цена: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2829,7 +2829,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Оти�
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Отиващ към Автодепото на {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}На ремонт в Автодепото на {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}На ремонт в Автодепото на {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Не може да изпрати колата в сервиз...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Не може да изпрати колата в сервиз...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Не може да намери локалния сервиз
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Коли - натиснете върху кола за информация
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Текущо действие - натиснете за спиране/пускане на превозното средство
@@ -2850,9 +2850,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} превозно средство{P о а}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Преименувай МПС-то
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Не може да преименуваш МПС-то...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Преименувай МПС-то
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Преименувай МПС-то
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Не може да преименуваш МПС-то...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Преименувай МПС-то
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първият автобус пристигнал в {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Хората празнуват . . .{}Първи камион пристигна на {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първият пътнически трамвай пристигна на {STATION}!
@@ -2860,16 +2860,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}Шофьор загина на място при екплозия на МПС след сблъсък с влак
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}{COMMA} загинаха на място при екплозия на МПС след сблъсък с влак
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Не може да обърне превозно средство състоящо се от няколко елемента
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Преименувай
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Преименувай МПС-то
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Преименувай МПС-то
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Не може да преименуваш МПС-то...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Преоборудване автомобила за друг товар
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Проборудване на автомобила
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Преоборудване на автомобила за избрания товар
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Преоборудването на автомобила е невъзможно...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Избор тип това за автомобила да превозва
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Преименувай
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Преименувай МПС-то
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Преименувай МПС-то
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Не може да преименуваш МПС-то...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Преоборудване автомобила за друг товар
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Проборудване на автомобила
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Преоборудване на автомобила за избрания товар
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Преоборудването на автомобила е невъзможно...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Избор тип това за автомобила да превозва
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Воднопътен строеж
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 72b4cb0fc..b06d09da2 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -1260,11 +1260,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nom de l
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...massa a prop d'altres indústries
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Remodela un tren per transportar un altre tipus de càrrega
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Remodela tren
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona tipus de càrrega a transportar
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Remodela un tren per transportar el tipus de càrrega seleccionada
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}No es pot remodelar el tren...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Remodela un tren per transportar un altre tipus de càrrega
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Remodela tren
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecciona tipus de càrrega a transportar
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Remodela un tren per transportar el tipus de càrrega seleccionada
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}No es pot remodelar el tren...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Canvi de producció
 
 ############ network gui strings
@@ -2698,7 +2698,7 @@ STR_UNKNOWN_STATION                                             :estació descon
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Buit
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} procedent{P "" s} de {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} des de {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} està esperant a la cotxera
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} està esperant a la cotxera
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nous Vehicles
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Tren massa llarg
@@ -2733,7 +2733,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Commuta
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordres)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fi d'Ordres - -
 STR_SERVICE                                                     :{BLACK}Servei
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}No es pot construir el vehicle...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}No es pot construir el vehicle...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construït: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2861,7 +2861,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Cap a l
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Cap a la cotxera de {TOWN}, a {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Revisió a la cotxera de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}No es pot enviar el vehicle a cotxera...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}No es pot enviar el vehicle a cotxera...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Impossible trobar la cotxera local
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Acció sobre el vehicle actual - clica aquí per parar/arrencar el vehicle
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Mostra les ordres dels vehicles
@@ -2881,9 +2881,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehicle{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Anomena automòbil
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}No es pot anomenar l'automòbil...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Anomena automòbil
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Anomena automòbil
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}No es pot anomenar l'automòbil...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Anomena automòbil
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Celebració popular . . .{}Primer autobús arriba a {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Celebració popular . . .{}Primer camió arriba a {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de passatgers arriba a {STATION}!
@@ -2891,16 +2891,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Accident d'automòbil!{}El conductor mor en una bola de foc després de la col·lisió amb un tren
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Accident d'automòbil!{}{COMMA} moren en una bola de foc després d'una col·lisió amb un tren
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}No s'ha pogut fer girar el vehicle...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Reanomena
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Reanomena tipus d'automòbil
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Reanomena tipus d'automòbil
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}No es pot reanomenar tipus d'automòbil
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Remodela vehicle de carretera per dur un tipus diferent de càrrega
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Remodela vehicle de carretera
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Remodela vehicle de carretera per a dur el tipus de carrega senyalat
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}No es pot remodelar el vehicle de carretera...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona el tipus de càrrega a transportar pel vehicle
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Reanomena
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Reanomena tipus d'automòbil
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Reanomena tipus d'automòbil
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}No es pot reanomenar tipus d'automòbil
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Remodela vehicle de carretera per dur un tipus diferent de càrrega
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Remodela vehicle de carretera
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Remodela vehicle de carretera per a dur el tipus de carrega senyalat
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}No es pot remodelar el vehicle de carretera...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecciona el tipus de càrrega a transportar pel vehicle
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construcció de vies d'aigua
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 03a9b4d83..3fa26d5ce 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -1320,11 +1320,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena in
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...preblizu drugoj industriji
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Prenamijeni vlak  za prijevoz neke druge vrste tereta
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Prenamijeni vlak
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Odaberi vrstu tereta koju će vlak prevoziti
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Prenamijeni vlak za prijevoz označene vrste tereta
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nije moguće prenamijeniti vlak...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Prenamijeni vlak  za prijevoz neke druge vrste tereta
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prenamijeni vlak
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Odaberi vrstu tereta koju će vlak prevoziti
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Prenamijeni vlak za prijevoz označene vrste tereta
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nije moguće prenamijeniti vlak...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Promijeni proizvodnju
 
 ############ network gui strings
@@ -2754,7 +2754,7 @@ STR_UNKNOWN_STATION                                             :nepoznata posta
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prazan
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} iz {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} iz {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} čeka u željezničkom hangaru
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čeka u željezničkom hangaru
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nova vozila
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Predugačak vlak
@@ -2790,7 +2790,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Prebaci
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Naredbe)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Kraj naredbi - -
 STR_SERVICE                                                     :{BLACK}Servis
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Nije moguće izgraditi željezničko vozilo...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nije moguće izgraditi željezničko vozilo...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vrijednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2905,7 +2905,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Kreće
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Kreće se prema cestovnom spremištu grada {TOWN}a, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Nije moguće poslati vozilo u spremište...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nije moguće poslati vozilo u spremište...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ne mogu pronaći lokalno spremište
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Cestovna vozila - klikni na vozilo za informacije
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Trenutna radnja vozila - klikni ovdje kako bi zaustavio/pokrenuo vozilo
@@ -2926,9 +2926,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozil{P o a a}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Imenuj cestovno vozilo
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Nije moguće imenovati cestovno vozilo...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Imenuj cestovno vozilo
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Imenuj cestovno vozilo
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nije moguće imenovati cestovno vozilo...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Imenuj cestovno vozilo
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Građani slave . . .{}Prvi autobus je stigao na postaju {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi kamion je stigao na postaju {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Građani slave . . .{}Prvi putnički tramvaj je stigao na postaju {STATION}!
@@ -2936,16 +2936,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}Vozač poginuo u eksploziji nakon sudara s vlakom
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}{COMMA} poginulih u eksploziji nakon sudara s vlakom
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne mogu okreniti vozila koja se sastoje od više jedinica
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Preimenuj
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Preimenuj vrstu cestovnog vozila
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Preimenuj vrstu cestovnog vozila
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Nije moguće preimenovati vrstu cestovnog vozila...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Prenamijeni cestovno vozilo  za prijevoz neke druge vrste tereta
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Prenamijeni cestovno vozilo
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Prenamijeni cestovno vozilo  za prijevoz označene vrste tereta
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Nije moguće prenamijeniti cestovno vozilo...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Odaberi vrstu tereta koje će cestovno vozilo prevoziti
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Preimenuj
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Preimenuj vrstu cestovnog vozila
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Preimenuj vrstu cestovnog vozila
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nije moguće preimenovati vrstu cestovnog vozila...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prenamijeni cestovno vozilo  za prijevoz neke druge vrste tereta
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prenamijeni cestovno vozilo
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Prenamijeni cestovno vozilo  za prijevoz označene vrste tereta
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nije moguće prenamijeniti cestovno vozilo...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Odaberi vrstu tereta koje će cestovno vozilo prevoziti
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Izgradnja plovnih kanala
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index e88161b9e..b57932cb4 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -1330,11 +1330,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Názvy p
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... příliš blízko k jinému průmyslu
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Přestavět vlak pro převoz jiného typu nákladu
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Přestavět vlak
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Zvolit typ nákladu, na který vlak přestavět
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Přestavět vlak na označený typ nákladu
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nelze přestavět vlak...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Přestavět vlak pro převoz jiného typu nákladu
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Přestavět vlak
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Zvolit typ nákladu, na který vlak přestavět
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Přestavět vlak na označený typ nákladu
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nelze přestavět vlak...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Změnit produkci
 
 ############ network gui strings
@@ -2776,7 +2776,7 @@ STR_UNKNOWN_STATION                                             :neznámá stani
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prázdný
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} z {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} z {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} čeká v depu
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čeká v depu
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nová vozidla
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Příliš dlouhý vlak
@@ -2811,7 +2811,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Přepnou
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Příkazy)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Konec příkazů - -
 STR_SERVICE                                                     :{BLACK}Údržba
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Nemohu koupit vagon nebo lokomotivu...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nemohu koupit vagon nebo lokomotivu...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Koupeno: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2938,7 +2938,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Míří
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Míří do garáže {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Údržba v silničním depu {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Údržba v silničním depu {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Nemohu poslat silniční vozidlo do garáže...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nemohu poslat silniční vozidlo do garáže...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nemohu najít místní garáž
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Současná činnost silničního vozidla - vozidlo se zastaví nebo rozjede, když sem klikneš
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Ukaž příkazy vozidla
@@ -2958,25 +2958,25 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozid{P lo la el}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Přejmenovat silniční vozidlo
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Nelze přejmenovat silniční vozidlo...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Přejmenovat silniční vozidlo
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Přejmenovat silniční vozidlo
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nelze přejmenovat silniční vozidlo...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Přejmenovat silniční vozidlo
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První autobus přijel do {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní vozidlo přijelo do {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První tramvaj pro cestující přijela do {STATION}
 STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní tramvaj přijíždí do {STATION}!
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Dopravní nehoda!{}Řidič zahynul v plamenech při srážce s vlakem
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Dopravní nehoda!{}{COMMA} {P člověk lidé lidí} zahynul{P "" i o} v plamenech při srážce s vlakem
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Přejmenovat
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Přejmenovat typ silničního vozidla
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Přejmenovat typ silničního vozidla
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Nelze přejmenovat typ silničního vozidla...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Přestavět silniční vozidlo, aby mohlo vozit jiný druh nákladu
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Přestavět silniční vozidlo
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Přestavět silniční vozidlo, aby vozilo vybraný druh nákladu
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Nelze přestavet silniční vozidlo...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vyber typ nákladu, který má vozidlo převážet
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Přejmenovat
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Přejmenovat typ silničního vozidla
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Přejmenovat typ silničního vozidla
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nelze přejmenovat typ silničního vozidla...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Přestavět silniční vozidlo, aby mohlo vozit jiný druh nákladu
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Přestavět silniční vozidlo
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Přestavět silniční vozidlo, aby vozilo vybraný druh nákladu
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nelze přestavet silniční vozidlo...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vyber typ nákladu, který má vozidlo převážet
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Výstavba vodních cest
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index a5a520fee..891087ab5 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -1260,11 +1260,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for tæt på en anden industribygning
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Ombyg toget til at køre med en anden lasttype
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Ombyg toget
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg den lasttype toget skal kører med
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Ombyg toget til at køre med den markerede lasttype
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan ikke ombygge toget...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Ombyg toget til at køre med en anden lasttype
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Ombyg toget
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vælg den lasttype toget skal kører med
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Ombyg toget til at køre med den markerede lasttype
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan ikke ombygge toget...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Skift produktion
 
 ############ network gui strings
@@ -2697,7 +2697,7 @@ STR_UNKNOWN_STATION                                             :ukendt station
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tom
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} fra {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} fra {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} venter i remisen
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} venter i remisen
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nye køretøjer
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Toget er for langt
@@ -2732,7 +2732,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Skift ti
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordrer)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slut på ordrer - -
 STR_SERVICE                                                     :{BLACK}Service
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Kan ikke bygge jernbanekøretøj...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan ikke bygge jernbanekøretøj...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Værdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2860,7 +2860,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Kører
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Kører til {TOWN} værksted, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Service på {TOWN} værksted
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Service på {TOWN} værksted, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Kan ikke sende køretøj til værksted...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan ikke sende køretøj til værksted...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan ikke finde lokalt værksted
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Nuværende opførsel - klik her for at stoppe/starte køretøjet
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Vis køretøjets ordrer
@@ -2880,9 +2880,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} køretøj{P "" er}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Giv køretøjet et navn
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Kan ikke give køretøjet et navn...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Giv køretøjet et navn
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Giv køretøjet et navn
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kan ikke give køretøjet et navn...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Giv køretøjet et navn
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første bus ankommer til {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første lastbil ankommer til {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første passager-sporvogn ankommer til {STATION}!
@@ -2890,16 +2890,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Lastbil forulykket!{}Chauffør dør i flammerne efter sammenstød med tog
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Bus forulykket!{}{COMMA} dør i flammerne efter kollision med et tog
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Tillader ikke køretøjer at vende om...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Omdøb
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Omdøb køretøjstypen
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Omdøb køretøjstypen
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Kan ikke omdøbe køretøjstypen...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Ombyg vejkøretøj til at laste en anden type last
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Ombyg lastbil
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Ombyg vejkøretøjet til at laste den markerede type last
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan ikke ombygge vejkøretøj
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg lasttype som lastbilen skal transportere
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Omdøb
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Omdøb køretøjstypen
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Omdøb køretøjstypen
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan ikke omdøbe køretøjstypen...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Ombyg vejkøretøj til at laste en anden type last
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Ombyg lastbil
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Ombyg vejkøretøjet til at laste den markerede type last
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan ikke ombygge vejkøretøj
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vælg lasttype som lastbilen skal transportere
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Bygning af vandveje
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index f5af0f5aa..9e7fad522 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -1262,11 +1262,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...te dicht bij een andere industrie
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Bouw trein om voor een ander ladingtype
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Bouw trein om
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kies type lading om te transporteren
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Bouw trein om voor geselecteerde ladingtype
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan trein niet ombouwen...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Bouw trein om voor een ander ladingtype
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Bouw trein om
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Kies type lading om te transporteren
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Bouw trein om voor geselecteerde ladingtype
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan trein niet ombouwen...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Verander productie
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :onbekend statio
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Leeg
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} van {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} van {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} wacht in depot
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} wacht in depot
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nieuwe voertuigen
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Trein te lang
@@ -2737,7 +2737,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Ga naar
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Orders)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Einde van orders - -
 STR_SERVICE                                                     :{BLACK}Reparatie
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Kan spoorvoertuig niet bouwen...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan spoorvoertuig niet bouwen...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2865,7 +2865,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Op weg
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Op weg naar {TOWN} Weg Depot, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Onderhoud bij {TOWN} Weg Depot
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Onderhoud bij {TOWN} Weg Depot, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Kan voertuig niet naar depot sturen...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan voertuig niet naar depot sturen...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan geen lokaal depot vinden
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Huidige actie van voertuig - klik hier om voertuig te starten of te stoppen
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Laat orders van voertuig zien
@@ -2885,9 +2885,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} voertuig{P "" en}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Hernoem wegvoertuig
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Kan wegvoertuig niet hernoemen...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Benoem wegvoertuig
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Hernoem wegvoertuig
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kan wegvoertuig niet hernoemen...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Benoem wegvoertuig
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Inwoners feesten...{}Eerste bus arriveert in {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Inwoners feesten...{}Eerste vrachtwagen arriveert in {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste passagiers tram arriveert in {STATION}!
@@ -2895,16 +2895,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}Bestuurder verongelukt door treinbotsing
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}{COMMA} verongelukt door treinbotsing
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Kan het voertuig hier niet laten omkeren...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Hernoem
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Hernoem wegvoertuigtype
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Hernoem wegvoertuigtype
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Kan wegvoertuigtype niet hernoemen...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Verbouw het wegvoertuig om een andere lading te vervoeren
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Verbouw wegvoertuig
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Verbouw wegvoertuig om geselecteerd vrachttype te vervoeren
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan wegvoertuig niet verbouwen
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecteer welk type vracht het wagen moet vervoeren
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Hernoem
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Hernoem wegvoertuigtype
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Hernoem wegvoertuigtype
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan wegvoertuigtype niet hernoemen...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Verbouw het wegvoertuig om een andere lading te vervoeren
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Verbouw wegvoertuig
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Verbouw wegvoertuig om geselecteerd vrachttype te vervoeren
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan wegvoertuig niet verbouwen
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecteer welk type vracht het wagen moet vervoeren
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Kanaal constructie
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 76a639c51..725a5ddec 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1262,11 +1262,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industry
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Refit train to carry a different cargo type
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Refit train
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for train to carry
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Refit train to carry highlighted cargo type
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Can't refit train...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Refit train to carry a different cargo type
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Refit train
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Select type of cargo for train to carry
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Refit train to carry highlighted cargo type
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Can't refit train...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Change production
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :unknown station
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Empty
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} from {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} from {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} is waiting in depot
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} is waiting in depot
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}New Vehicles
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Train too long
@@ -2737,7 +2737,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Switch t
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Orders)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - End of Orders - -
 STR_SERVICE                                                     :{BLACK}Service
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Can't build railway vehicle...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Can't build railway vehicle...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Value: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2865,7 +2865,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Heading
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Heading for {TOWN} Road Depot, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Service at {TOWN} Road Depot
 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_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Can't send road vehicle to depot...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Unable to find local depot
 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
@@ -2885,9 +2885,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehicle{P "" s}{RAW_STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Name road vehicle
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Can't name road vehicle...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Name road vehicle
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Name road vehicle
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Can't name road vehicle...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Name road vehicle
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Citizens celebrate . . .{}First bus arrives at {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First truck arrives at {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger tram arrives at {STATION}!
@@ -2895,16 +2895,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Can't make road vehicle turn around...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Rename
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Rename road vehicle type
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Rename road vehicle type
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Can't rename road vehicle type...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Refit road vehicle to carry a different cargo type
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Refit road vehicle
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Refit road vehicle to carry highlighted cargo type
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Can't refit road vehicle...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for road vehicle to carry
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Rename
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Rename road vehicle type
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Rename road vehicle type
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Can't rename road vehicle type...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Refit road vehicle to carry a different cargo type
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Refit road vehicle
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Refit road vehicle to carry highlighted cargo type
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Can't refit road vehicle...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Select type of cargo for road vehicle to carry
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Waterways construction
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 5c8a7c002..567312e52 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -1260,11 +1260,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industry
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Refit train to carry a different cargo type
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Refit train
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for train to carry
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Refit train to carry highlighted cargo type
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Can't refit train...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Refit train to carry a different cargo type
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Refit train
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Select type of cargo for train to carry
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Refit train to carry highlighted cargo type
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Can't refit train...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Change production
 
 ############ network gui strings
@@ -2698,7 +2698,7 @@ STR_UNKNOWN_STATION                                             :unknown station
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Empty
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} from {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} from {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} is waiting in depot
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} is waiting in depot
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}New Vehicles
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Train too long
@@ -2733,7 +2733,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Switch t
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Orders)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - End of Orders - -
 STR_SERVICE                                                     :{BLACK}Service
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Can't build railroad vehicle...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Can't build railroad vehicle...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Value: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2861,7 +2861,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Heading
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Heading for {TOWN} Road Depot, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Service at {TOWN} Road Depot
 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_CAN_T_SEND_ROAD_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_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
@@ -2881,9 +2881,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehicle{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Name road vehicle
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Can't name road vehicle...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Name road vehicle
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Name road vehicle
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Can't name road vehicle...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Name road vehicle
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Citizens celebrate . . .{}First bus arrives at {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First truck arrives at {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger streetcar arrives at {STATION}!
@@ -2891,16 +2891,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Can't make road vehicle turn around...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Rename
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Rename road vehicle type
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Rename road vehicle type
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Can't rename road vehicle type...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Refit road vehicle to carry a different cargo type
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Refit road vehicle
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Refit road vehicle to carry highlighted cargo type
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Can't refit road vehicle...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for road vehicle to carry
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Rename
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Rename road vehicle type
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Rename road vehicle type
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Can't rename road vehicle type...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Refit road vehicle to carry a different cargo type
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Refit road vehicle
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Refit road vehicle to carry highlighted cargo type
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Can't refit road vehicle...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Select type of cargo for road vehicle to carry
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Waterways construction
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 0c01acbe0..be9dc88a7 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -1261,11 +1261,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...tro proksime al alia industrio
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Transformu trajnon por ke ĝi portu alian ŝarĝon
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Transformu trajnon
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Elektu ŝarĝospecon portotan de la trajno
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Transformu trajnon por porti la elektitan ŝarĝotipon
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Ne povas transformi la trajnon...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Transformu trajnon por ke ĝi portu alian ŝarĝon
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Transformu trajnon
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Elektu ŝarĝospecon portotan de la trajno
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Transformu trajnon por porti la elektitan ŝarĝotipon
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Ne povas transformi la trajnon...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Ŝanĝu produktadon
 
 ############ network gui strings
@@ -2568,7 +2568,7 @@ STR_REFIT_ORDER                                                 :(Transformu al
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordenoj)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fino de Ordenoj - -
 STR_SERVICE                                                     :{BLACK}Prizorgo
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Ne povas krei relan veturilon...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Ne povas krei relan veturilon...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valoro: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2654,7 +2654,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Irante
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Irante al {TOWN} Voja Deponejo, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Ne povas sendi veturilon al deponejo...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ne povas sendi veturilon al deponejo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ne eblas trovi lokan deponejon
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Nuna veturila ago - klaku ĉi tie por haltigi/starti veturilon
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Montru veturilajn ordenojn
@@ -2674,24 +2674,24 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} veturilo{P "" j}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Nomu vojveturilon
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Ne povas nomi vojveturilon...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Nomu vojveturilon
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nomu vojveturilon
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ne povas nomi vojveturilon...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nomu vojveturilon
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua buso alvenas en {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua ŝarĝaŭto alvenas en {STATION}!
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Vojveturila kraŝo!{}Veturanto mortas pro fajro post kolizio kun trajno
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Vojveturila Kraŝo!{}{COMMA} mortas pro fajro post kolizio kun trajno
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Ne povas turnigi vojveturilon...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Renomu
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Renomu vojveturilan tipon
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Renomu vojveturilan tipon
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Ne povas renomi vojveturilan tipon...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Transformu vojveturilon por porti alian ŝarĝon
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Transformu vojveturilon
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Transformu vojveturilon por porti elektitan ŝarĝon
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Ne povas transformi vojveturilon...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Elektu portotan ŝarĝon de la vojveturilo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomu
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomu vojveturilan tipon
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomu vojveturilan tipon
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Ne povas renomi vojveturilan tipon...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Transformu vojveturilon por porti alian ŝarĝon
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Transformu vojveturilon
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Transformu vojveturilon por porti elektitan ŝarĝon
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Ne povas transformi vojveturilon...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Elektu portotan ŝarĝon de la vojveturilo
 
 ##id 0x9800
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Ne povas konstrui havenon ĉi tie...
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 6f896c6d6..4e23c2eb6 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -1321,11 +1321,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Tööstu
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liiga lähedal mõnele teisele tööstusele
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Rongi seadistamine mõne teise laadungi vedamiseks
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Seadista ümber
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali rongi veetav veoseliik
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Rongi ümberseadistamine valitud laadungi vedamiseks
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Ei ole võimalik ümber seadistada...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Rongi seadistamine mõne teise laadungi vedamiseks
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Seadista ümber
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vali rongi veetav veoseliik
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Rongi ümberseadistamine valitud laadungi vedamiseks
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Ei ole võimalik ümber seadistada...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Tootlikuse muutmine
 
 ############ network gui strings
@@ -2759,7 +2759,7 @@ STR_UNKNOWN_STATION                                             :tundmatu jaam
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tühi
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} jaamast {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} jaamast {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} ootab depoos
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ootab depoos
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Uus rong
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Rong on liiga pikk
@@ -2795,7 +2795,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Lülita
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (käsud)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Sihtpunktide lõpp - -
 STR_SERVICE                                                     :{BLACK}Hooldus
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Rööbassõidukit ei saa ehitada...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Rööbassõidukit ei saa ehitada...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Ehitatud: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Väärtus: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2923,7 +2923,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Suundub
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Suundub {TOWN} garaaþi, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Hooldus linna {TOWN} depoos
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Hooldus linna {TOWN} depoos, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Ei saa veokit garaaži saata
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ei saa veokit garaaži saata
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ei leia kohalikku garaaži üles
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Veokid - info saamiseks vajuta veokile
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Transpordivahendi praegune tegevus - selle peatamiseks või startimiseks klõpsa siia
@@ -2944,9 +2944,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} sõiduk{P "" id}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Nimeta mootorsõiduk ümber
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Ei saa maanteveokit ümber nimetada...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Nimeta mootorsõidukit
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nimeta mootorsõiduk ümber
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ei saa maanteveokit ümber nimetada...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nimeta mootorsõidukit
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}{STATION} jaama saabus esimene buss!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{} esimene veok saabus {STATION} jaama!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene reisitramm saabus trammijaama {STATION}!
@@ -2954,16 +2954,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Rongikokkupõrge!{}Juht suri peale õnnetust tules
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Mootorsõiduki kokkupõrge rongiga!{}{COMMA} inimest suri õnnetuses
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Mitmest osast koosnevaid veovahendeid ei saa ümber pöörata
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Nimevahetus
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Muuda mootorsõiduki tüübinime
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Vaheta mootorsõiduki tüübinime
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Mootorsõiduki tüübinime ei saa vahetada...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Seadista mootorsõidukit kandmaks teist tüüpi veost
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Muuda mootorsõiduki seadistust
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Seadista mootorsõidukit kandma valitud veotüüpi
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Mootorsõiduki seadistust ei saa ümber muuta
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali maanteesõiduki veetav veoseliik
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Nimevahetus
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Muuda mootorsõiduki tüübinime
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Vaheta mootorsõiduki tüübinime
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Mootorsõiduki tüübinime ei saa vahetada...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Seadista mootorsõidukit kandmaks teist tüüpi veost
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Muuda mootorsõiduki seadistust
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Seadista mootorsõidukit kandma valitud veotüüpi
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Mootorsõiduki seadistust ei saa ümber muuta
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vali maanteesõiduki veetav veoseliik
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Veeteede ehitamine
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 512986c63..a36c3b4e0 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -1262,11 +1262,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Teollisu
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liian lähellä toista teollisuutta.
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Sovita juna kuljettamaan erityyppistä rahtia.
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Sovita juna
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Valitse junan rahtityyppi
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Sovita juna kuljettamaan valittua rahtityyppiä.
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Junaa ei voi sovittaa...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Sovita juna kuljettamaan erityyppistä rahtia.
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Sovita juna
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Valitse junan rahtityyppi
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Sovita juna kuljettamaan valittua rahtityyppiä.
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Junaa ei voi sovittaa...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Aloita tuotanto
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :tuntematon asem
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tyhjä
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} asemalta {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} asemalta {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} odottaa varikolla
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} odottaa varikolla
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Uusia liikennevälineitä
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Juna on liian pitkä.
@@ -2737,7 +2737,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Vaihda m
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (aikataulu)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - aikataulun loppu - -
 STR_SERVICE                                                     :{BLACK}Huolto
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Yksikköä ei voi rakentaa...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Yksikköä ei voi rakentaa...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Arvo: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2865,7 +2865,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Suuntan
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Suuntana huoltoasema, {TOWN}, {VELOCITY}.
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Huolto {TOWN} Varikko
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Huolto {TOWN} Varikko, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Ajoneuvon lähettäminen huoltoasemalle ei onnistu...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ajoneuvon lähettäminen huoltoasemalle ei onnistu...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Paikallista huoltoasemaa ei löydy.
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Nykyisen ajoneuvon toiminnot - napsauta tässä pysäyttääksesi/laittaaksesi liikkeelle.
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Näytä ajoneuvon aikataulu.
@@ -2885,9 +2885,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} kulkuneuvo{P "" a}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Nimeä ajoneuvo
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Ajoneuvoa ei voi nimetä...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Nimeä ajoneuvo
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nimeä ajoneuvo
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ajoneuvoa ei voi nimetä...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nimeä ajoneuvo
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen linja-auto saapuu asemalle {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen kuorma-auto saapuu asemalle {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen raitiovaunu saapuu asemalle {STATION}!
@@ -2895,16 +2895,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Ajoneuvokolari!{}Kuljettaja kuolee junaan törmäyksen jälkeisessä tulipallossa
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Ajoneuvokolari!{}{COMMA} kuolee junaan törmäyksen jälkeisessä tulipallossa
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Ajoneuvoa ei voida kääntää...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Nimeä
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Nimeä ajoneuvon tyyppi uudelleen
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Nimeä ajoneuvon tyyppi uudelleen
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Ajoneuvotyyppiä ei voi uudelleennimetä...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Muuta ajoneuvo rahtaamaan muuta rahtityyppiä.
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Korjaa ajoneuvo.
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Muuta ajoneuvo rahtaamaan korostettua rahtityyppiä.
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Ajoneuvoa ei voida korjata.
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Valitse ajoneuvolla ajettava rahti
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Nimeä
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Nimeä ajoneuvon tyyppi uudelleen
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Nimeä ajoneuvon tyyppi uudelleen
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Ajoneuvotyyppiä ei voi uudelleennimetä...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Muuta ajoneuvo rahtaamaan muuta rahtityyppiä.
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Korjaa ajoneuvo.
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Muuta ajoneuvo rahtaamaan korostettua rahtityyppiä.
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Ajoneuvoa ei voida korjata.
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Valitse ajoneuvolla ajettava rahti
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Vesireittien rakentaminen
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 0bc6432c5..837ee49eb 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -1261,11 +1261,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Noms des
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...trop proche d'une autre industrie
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Réaménager le train pour transporter une cargaison différente
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Réaménager le train
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Choisir le type de cargaison à transporter
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Réaménager le train pour transporter la cargaison sélectionnée
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Impossible de réaménager le train...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Réaménager le train pour transporter une cargaison différente
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Réaménager le train
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Choisir le type de cargaison à transporter
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Réaménager le train pour transporter la cargaison sélectionnée
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Impossible de réaménager le train...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Changer la production
 
 ############ network gui strings
@@ -2698,7 +2698,7 @@ STR_UNKNOWN_STATION                                             :station inconnu
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Vide
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} de {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} est en attente au dépôt
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} est en attente au dépôt
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nouveaux véhicules
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Train trop long
@@ -2733,7 +2733,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Basculer
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordres)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fin des ordres - -
 STR_SERVICE                                                     :{BLACK}Entretien
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Impossible de construire le véhicule ferroviaire...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Impossible de construire le véhicule ferroviaire...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construit en: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valeur: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2861,7 +2861,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}En rout
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}En route pour le dépôt de {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Entretien au dépôt de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Entretien au dépôt de {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Impossible d'envoyer le véhicule au dépôt...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Impossible d'envoyer le véhicule au dépôt...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Impossible de trouver le dépôt
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Comportement courant du véhicule - cliquer pour le démarrer/l'arrêter
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Afficher les ordres du véhicule routier
@@ -2881,9 +2881,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} véhicule{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Renommer le véhicule
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Impossible de renommer le véhicule...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Renommer le véhicule
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renommer le véhicule
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Impossible de renommer le véhicule...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renommer le véhicule
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier bus arrive à {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier camion arrive à {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
@@ -2891,16 +2891,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Accident routier!{}Un automobiliste meurt brûlé vif lors d'une collision avec un train
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Accident routier!{}{COMMA} mort{P "" s} lors d'une collision avec un train
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Impossible de faire rebrousser chemin au véhicule routier...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Renommer
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Renommer type de véhicule routier
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Renommer type de véhicule routier
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Impossible de renommer type de véhicule routier...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Réaménager le véhicule routier pour transporter une cargaison différente
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Réaménager le véhicule routier
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Réaménager le véhicule routier pour transporter la cargaison sélectionnée
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Impossible de réaménager le véhicule routier...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Choisir le type de cargaison à transporter
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renommer
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renommer type de véhicule routier
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renommer type de véhicule routier
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Impossible de renommer type de véhicule routier...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Réaménager le véhicule routier pour transporter une cargaison différente
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Réaménager le véhicule routier
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Réaménager le véhicule routier pour transporter la cargaison sélectionnée
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Impossible de réaménager le véhicule routier...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Choisir le type de cargaison à transporter
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construction de voies navigables
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 0592e21a9..962a38dda 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -1237,11 +1237,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes da
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cerca doutra industria
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Reaxusta-lo tren para un tipo de carga diferente
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Reaxustar tren
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona o tipo de carga que levará o tren
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Reaxusta-lo tren para o tipo de carga seleccionado
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}No se pode reaxusta-lo tren...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Reaxusta-lo tren para un tipo de carga diferente
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Reaxustar tren
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecciona o tipo de carga que levará o tren
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Reaxusta-lo tren para o tipo de carga seleccionado
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}No se pode reaxusta-lo tren...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambiar producción
 
 ############ network gui strings
@@ -2698,7 +2698,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Cambiar
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordes)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fin das Ordes - -
 STR_SERVICE                                                     :{BLACK}Servizo
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}No se pode construí-lo vehículo de ferrocarril...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}No se pode construí-lo vehículo de ferrocarril...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2825,7 +2825,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Diríxe
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Diríxese o depósito de {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Servizo no Depósito de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Non se pode envia-lo vehículo ó depósito de estrada...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Non se pode envia-lo vehículo ó depósito de estrada...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}No se pode atopar unha ruta ó depósito local
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Tarefa actual do vehículo - pincha aquí para parar/arrancar o vehículo
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Mostra-las ordes do vehículo
@@ -2845,9 +2845,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehículo{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Renomear vehículo de estrada
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Non se pode renomea-lo vehículo de estrada...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Renomear vehículo de estrada
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear vehículo de estrada
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Non se pode renomea-lo vehículo de estrada...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear vehículo de estrada
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro autobús a {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro camión a {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Celebración cidadá . . .{}¡Chega o primeiro tranvía de pasaxeiros a {STATION}!
@@ -2855,16 +2855,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}¡Accidente de Tráfico!{}O conductor morre na explosión producida tra-la colisión cun tren
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}¡Accidente de Tráfico!{}{COMMA} mortos na explosión producida tra-la colisión cun tren
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Non se pode xira-lo vehículo...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Renomear
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Renomea-lo tipo de vehículo de estrada
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Renomea-lo tipo de vehículo de estrada
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Non se pode renomea-lo tipo de vehículo de estrada...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Reaxustar vehículo para levar un tipo diferente de carga
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Reaxustar vehículo
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Reaxustar vehículo para levar o tipo de carga seleccionado
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Non se pode reaxusta-lo vehículo
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona o tipo de carga que levará este vehículo de estrada
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomear
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomea-lo tipo de vehículo de estrada
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomea-lo tipo de vehículo de estrada
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Non se pode renomea-lo tipo de vehículo de estrada...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Reaxustar vehículo para levar un tipo diferente de carga
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Reaxustar vehículo
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Reaxustar vehículo para levar o tipo de carga seleccionado
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Non se pode reaxusta-lo vehículo
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecciona o tipo de carga que levará este vehículo de estrada
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construción de canais
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 6806ae597..549eb0408 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -1263,11 +1263,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zu nah an einer anderen Industrie
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Zug auf eine andere Fracht umrüsten
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Zug umrüsten
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Die Fracht auswählen, die der Zug befördern soll
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Zug auf die ausgewählte Fracht umrüsten
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Zug kann nicht umgerüstet werden...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Zug auf eine andere Fracht umrüsten
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Zug umrüsten
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Die Fracht auswählen, die der Zug befördern soll
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Zug auf die ausgewählte Fracht umrüsten
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Zug kann nicht umgerüstet werden...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Produktion ändern
 
 ############ network gui strings
@@ -2703,7 +2703,7 @@ STR_UNKNOWN_STATION                                             :unbekannte Stat
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Leer
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} von {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} von {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} wartet im Depot
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} wartet im Depot
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Neue Fahrzeuge
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Zug zu lang
@@ -2738,7 +2738,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Zur Auft
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Aufträge)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Ende der Aufträge - -
 STR_SERVICE                                                     :{BLACK}Wartung
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Schienenfahrzeug kann nicht gekauft werden...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Schienenfahrzeug kann nicht gekauft werden...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebaut: {LTBLUE}{NUM}{BLACK}  Wert: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK} Wert: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2866,7 +2866,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Unterwe
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Unterwegs zum Fahrzeugdepot {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Wartung im Fahrzeugdepot {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Wartung im Fahrzeugdepot {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Fahrzeug kann nicht ins Depot geschickt werden...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Fahrzeug kann nicht ins Depot geschickt werden...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Fahrzeugdepot unauffindbar
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Laufende Fahrzeugbewegung - Klick zum Anhalten bzw. Losschicken
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Aufträge für das Fahrzeug anzeigen
@@ -2886,9 +2886,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} Fahrzeug{P "" e}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Name des Fahrzeuges
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Fahrzeug kann nicht benannt werden...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Name des Fahrzeuges
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Name des Fahrzeuges
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Fahrzeug kann nicht benannt werden...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Name des Fahrzeuges
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Der erste Bus erreicht {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Der erste Lkw erreicht {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Die erste Straßenbahn erreicht {STATION}!
@@ -2896,16 +2896,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Fahrzeug verunglückt!{}Fahrer stirbt in Inferno nach Zusammenstoß mit Zug
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Fahrzeug verunglückt!{}{COMMA} {P stirbt sterben} in Inferno nach Zusammenstoß mit Zug
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Das Fahrzeug kann nicht wenden...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Umbenennen
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Fahrzeug umbenennen
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Fahrzeug umbenennen
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Fahrzeug kann nicht umbenannt werden...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Straßenfahrzeug auf eine andere Fracht umrüsten
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Straßenfahrzeug umrüsten
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Straßenfahrzeug auf die ausgewählte Fracht umrüsten
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Straßenfahrzeug kann nicht umgerüstet werden...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Die Fracht auswählen, die das Straßenfahrzeug befördern soll
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Umbenennen
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Fahrzeug umbenennen
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Fahrzeug umbenennen
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Fahrzeug kann nicht umbenannt werden...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Straßenfahrzeug auf eine andere Fracht umrüsten
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Straßenfahrzeug umrüsten
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Straßenfahrzeug auf die ausgewählte Fracht umrüsten
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Straßenfahrzeug kann nicht umgerüstet werden...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Die Fracht auswählen, die das Straßenfahrzeug befördern soll
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Wasserwegebau
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index 6c244667e..779833aaa 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -1244,11 +1244,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}רשימ
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}קרוב מידי לתעשיה אחרת
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}התאם את הרכבת לנשיאת משא שונה
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}התאם רכבת
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}בחר את סוג המשא עבור הרכבת
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}התאם את הרכבת לנשיאת המשא שנבחר
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}...לא ניתן להתאים את הרכבת
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}התאם את הרכבת לנשיאת משא שונה
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}התאם רכבת
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}בחר את סוג המשא עבור הרכבת
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}התאם את הרכבת לנשיאת המשא שנבחר
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}...לא ניתן להתאים את הרכבת
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}שנה תפוקה
 
 ############ network gui strings
@@ -2674,7 +2674,7 @@ STR_UNKNOWN_STATION                                             :תחנה לא �
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}ריקה
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{1:STATION} מ {NBSP}{0:CARGO}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}(x{2:NUM}){1:STATION} מ {NBSP}{0:CARGO}
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}ממתין/ממתינה במוסך {VEHICLE}
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}ממתין/ממתינה במוסך {VEHICLE}
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}כלים חדשים
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}רכבת ארוכה מידי
@@ -2710,7 +2710,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}עבור
 STR_ORDERS_CAPTION                                              :{WHITE} (יעדים) {VEHICLE}
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - סוף רשימת היעדים - -
 STR_SERVICE                                                     :{BLACK}טיפול
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}...לא ניתן לבנות רכבת
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}...לא ניתן לבנות רכבת
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{2:CURRENCY}{BLACK}  :ערך {LTBLUE}{1:NUM}{BLACK}  :נבנה {LTBLUE}{0:ENGINE}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{1:CURRENCY}{BLACK} :שווי {LTBLUE}{0:ENGINE}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2825,7 +2825,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}{TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE} {1:VELOCITY}  במהירות , {NBSP}{0:TOWN} בדרך אל מוסך הרכבים ב
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE} {TOWN} טיפול במוסך ב
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE} {1:VELOCITY}  במהירות ,{NBSP} {0:TOWN} טיפול במוסך הרכבים ב
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}...לא ניתן לשלוח את כלי הרכב למוסך
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}...לא ניתן לשלוח את כלי הרכב למוסך
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}לא ניתן לאתר מוסך כלי רכב מקומי
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}כלי רכב - לחץ על כלי רכב למידע
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}מצב כלי הרכב- לחץ כאן לעצירה/המשך נסיעה
@@ -2846,9 +2846,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{0:ENGIN
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK} {1:STRING} כלים  {NBSP}{0:NUM}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}תן שם לכלי הרכב
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}...לא ניתן לשנות את שם כלי הרכב
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}תן שם לכלי הרכב
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}תן שם לכלי הרכב
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}...לא ניתן לשנות את שם כלי הרכב
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}תן שם לכלי הרכב
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 ::{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}אוטובוס ראשון הגיעה ל
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               ::{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}משאית ראשונה הגיעה ל
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}!{STATION} התושבים חוגגים... {}חשמלית נוסעים ראשונה הגיעה ל
@@ -2856,16 +2856,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}תאונת כלי רכב!{}נהג נהרג לאחר התנגשות ברכבת
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}תאונת כלי רכב!{}{NBSP}נהרגו לאחר התנגשות עם רכבת {COMMA}
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}.לא ניתן לסובב כלי רכב מורכבים
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}שנה שם
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}שנה את שם סוג כלי הרכב
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}שנה את שם סוג כלי הרכב
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}לא ניתן לשנות את שם סוג כלי הרכב
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}התאם כלי רכב לנשיאת מטען חדש
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}התאם כלי רכב
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}התאם את כלי הרכב לנשיאת המטען שנבחר
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}... לא ניתן להתאים את כלי הרכב
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}בחר את סוג המטען לנשיאה
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}שנה שם
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}שנה את שם סוג כלי הרכב
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}שנה את שם סוג כלי הרכב
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}לא ניתן לשנות את שם סוג כלי הרכב
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}התאם כלי רכב לנשיאת מטען חדש
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}התאם כלי רכב
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}התאם את כלי הרכב לנשיאת המטען שנבחר
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}... לא ניתן להתאים את כלי הרכב
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}בחר את סוג המטען לנשיאה
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :בניית נתיבי מים
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 2d2ecad24..072089e33 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -1294,11 +1294,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Gazdasá
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...túl közel egy másik gazdasági épülethez
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}A vonat átalakítása másfajta áru szállítására
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Vonat átalakítása
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Válaszd ki, milyen árut szállítson a vonat
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}A vonat átalakítása a kijelölt áru szállítására
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nem alakíthatod át a vonatot...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}A vonat átalakítása másfajta áru szállítására
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Vonat átalakítása
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Válaszd ki, milyen árut szállítson a vonat
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}A vonat átalakítása a kijelölt áru szállítására
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nem alakíthatod át a vonatot...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Termelés megváltoztatása
 
 ############ network gui strings
@@ -2768,7 +2768,7 @@ STR_UNKNOWN_STATION                                             :ismeretlen áll
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Üres
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} {STATION} állomásról
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} {STATION} állomásról (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} a járműtelepen vár
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} a járműtelepen vár
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Új járművek
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Túl hosszú a vonat
@@ -2803,7 +2803,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Átkapcs
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} menetrendje
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Menetrend vége - -
 STR_SERVICE                                                     :{BLACK}Javítás
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Nem veheted meg a vasúti járművet...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nem veheted meg a vasúti járművet...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK} Vásárlás éve: {LTBLUE}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Érték: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2931,7 +2931,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Úton {
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Úton {TOWN} garázsába, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Javítás {TOWN} garázsában
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Javítás {TOWN} garázsában, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Nem küldheted a járművet a garázsba...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nem küldheted a járművet a garázsba...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nem találom a helyi garázst
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Aktuális járműesemény - kattints ide a jármű elindításához/ megállításához
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}A jármű menetrendjének megmutatása
@@ -2951,9 +2951,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} jármű{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Közúti jármű átnevezése
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Nem nevezheted át a közúti járművet...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Közúti jármű átnevezése
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Közúti jármű átnevezése
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nem nevezheted át a közúti járművet...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Közúti jármű átnevezése
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az első busz {STATION} állomásra!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az első teherautó {STATION} állomásra!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}A lakosság ünnepel . . .{}Első utasszállító villamos megérkezett {STATION} állomásra!
@@ -2961,16 +2961,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Közúti baleset!{}A vezető meghalt a vonattal való ütközéskor
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Közúti baleset!{}{COMMA} ember meghalt a vonattal való ütközéskor
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}A közúti jármű nem tud megfordulni...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Átnevez
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}A közúti jármű márkanevének megváltoztatása
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Márkanév megváltoztatása
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Nem változtathatod meg a márkanevet...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Teherautó átalakítása hogy mást is tudjon szállítani
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Teherautó átalakítása
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Teherautó átalakítása a kijelölt áru szállíthatóságáért
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Nem lehet átalakítani a teherautót...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Válaszd ki a közúti jármű által szállítandó rakományt
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Átnevez
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}A közúti jármű márkanevének megváltoztatása
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Márkanév megváltoztatása
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nem változtathatod meg a márkanevet...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Teherautó átalakítása hogy mást is tudjon szállítani
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Teherautó átalakítása
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Teherautó átalakítása a kijelölt áru szállíthatóságáért
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nem lehet átalakítani a teherautót...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Válaszd ki a közúti jármű által szállítandó rakományt
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Vízi utak építése
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 70d5a4dc1..a6263d8a9 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -1265,11 +1265,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Iðnaða
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...of nálægt öðrum iðnaði
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Breyta lest svo hún flytji annan farm
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Breyta lest
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Veldu hvernig farm lestin á að flytja
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Breyta lest svo hún flytji valinn farm
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Get ekki breytt lest...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Breyta lest svo hún flytji annan farm
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Breyta lest
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Veldu hvernig farm lestin á að flytja
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Breyta lest svo hún flytji valinn farm
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Get ekki breytt lest...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Breyta framleiðslu
 
 ############ network gui strings
@@ -2703,7 +2703,7 @@ STR_UNKNOWN_STATION                                             :óþekkt stöð
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tómt
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} frá {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} frá {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Kaupa lest
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Lestin er of löng
@@ -2739,7 +2739,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Skipta y
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Skipanir)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Endi skipana - -
 STR_SERVICE                                                     :{BLACK}Skoðun
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Get ekki byggt lest...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Get ekki byggt lest...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Framleitt: {LTBLUE}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Virði: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2869,7 +2869,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Á lei�
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Á leið í {TOWN} bifreiðaskýli, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Get ekki sent bifreið í skýli...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Get ekki sent bifreið í skýli...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Finnur ekkert nálægt skýli
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Bifreið - smelltu á bifreið fyrir nánari upplýsingar
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Núverandi aðgerð bifreiðar - smelltu hér til að stöðva/ræsa bifreið
@@ -2890,9 +2890,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} farartæki{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Nefna bifreið
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Get ekki nefnt bifreið...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Nefna bifreið
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nefna bifreið
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Get ekki nefnt bifreið...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nefna bifreið
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti strætisvagn kemur við á {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti vörubíll kemur við á {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti farþegasporvagn kemur við á {STATION}!
@@ -2900,16 +2900,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Bílslys!{}Bílstjóri deyr í sprengingu eftir árekstur við lest
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Bílslys!{}{COMMA} deyja í sprengingu eftir árekstur við lest
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Get ekki snúið bifreiðinni við...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Endurnefna
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Endurnefna tegund bifreiðar
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Endurnefna tegund bifreiðar
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE} Get ekki endurnefnat tegund bifreiðar...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Breyta bifreið svo hún flytji annan farm
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Breyta bifreið
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Breyta bifreið svo hún flytji valinn farm
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Get ekki breytt bifreið...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Veldu tegund farms sem bifreið mun flytja
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Endurnefna
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Endurnefna tegund bifreiðar
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Endurnefna tegund bifreiðar
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE} Get ekki endurnefnat tegund bifreiðar...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Breyta bifreið svo hún flytji annan farm
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Breyta bifreið
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Breyta bifreið svo hún flytji valinn farm
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Get ekki breytt bifreið...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Veldu tegund farms sem bifreið mun flytja
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Vatnaframkvæmdir
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 27a0d5875..c6bf6e0b3 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -1264,11 +1264,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nama ind
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...terlalu dekat dengan industri lain
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Renovasi gerbong untuk membawa tipe kargo lain
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Renovasi gerbong
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Pilih jenis kargo yang akan dibawa kereta
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Ubah kargo lokomotif untuk membawa kargo terpilih
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Tidak dapat mengubah kargo lokomotif...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Renovasi gerbong untuk membawa tipe kargo lain
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Renovasi gerbong
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Pilih jenis kargo yang akan dibawa kereta
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Ubah kargo lokomotif untuk membawa kargo terpilih
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Tidak dapat mengubah kargo lokomotif...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Perubahan produksi
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :stasiun tidak d
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Kosong
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} dari {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} dari {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} sedang menunggu di depo
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} sedang menunggu di depo
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Buat Kendaraan
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Kereta api terlalu panjang
@@ -2738,7 +2738,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Tampilka
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Perintah)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Akhir Perintah - -
 STR_SERVICE                                                     :{BLACK}Perbaikan
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Tidak dapat membuat kendaraan...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Tidak dapat membuat kendaraan...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK} Buatan: {LTBLUE}{NUM}{BLACK} Nilai: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK} Nilai: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2868,7 +2868,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Menuju
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Menuju ke Bengkel {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Servis di Bengkel {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Servis di Bengkel {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Tidak dapat mengirim kendaraan ke garasi...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Tidak dapat mengirim kendaraan ke garasi...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Tidak dapat menemukan garasi terdekat
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Bus/truk - klik pada kendaraan untuk menampilkan informasi
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Kegiatan kendaraan saat ini - klik disini untuk menghentikan / menjalankan kendaraan
@@ -2889,9 +2889,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} kendaraan{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Nama kendaraan
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Tidak dapat menamai kendaraan...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Nama kendaraan
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nama kendaraan
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Tidak dapat menamai kendaraan...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nama kendaraan
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Masyarakat bergembira . . .{}Bus pertama tiba di {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Masyarakat bergembira . . .{}Truk pertama tiba di {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Masyarakat bergembira . . .{}Trem Penumpang pertama tiba di {STATION}!
@@ -2899,16 +2899,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Terjadi tabrakan!{}Seorang sopir meninggal dalam ledakan setelah ditabrak kereta
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Terjadi tabrakan!{}{COMMA} orang meninggal dalam ledakan setelah ditabrak kereta
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Tidak dapat memutar kendaraan...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Ganti Nama
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Ganti nama jenis bus/truk
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Ganti nama jenis bus/truk
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Tidak bisa mengganti nama jenis bus/truk
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Ubah karoseri truk untuk jenis kargo yang lain
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Karoseri truk
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Ubah karoseri truk untuk mengangkut jenis kargo yang terpilih
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Tidak dapat meng-karoseri ulang truk.
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Pilih jenis kargo truk yang akan dibawa
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Ganti Nama
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Ganti nama jenis bus/truk
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Ganti nama jenis bus/truk
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Tidak bisa mengganti nama jenis bus/truk
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Ubah karoseri truk untuk jenis kargo yang lain
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Karoseri truk
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Ubah karoseri truk untuk mengangkut jenis kargo yang terpilih
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Tidak dapat meng-karoseri ulang truk.
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Pilih jenis kargo truk yang akan dibawa
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Konstruksi Perairan.
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 152187854..7ea03039d 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -1262,11 +1262,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomi del
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...troppo vicina ad un'altra industria
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Riadatta il treno per trasportare un carico differente
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Riadatta treno
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selezionare il tipo di carico da far trasportare al treno
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Riadatta il treno per trasportare il tipo di carico selezionato
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Impossibile riadattare il treno...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Riadatta il treno per trasportare un carico differente
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Riadatta treno
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selezionare il tipo di carico da far trasportare al treno
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Riadatta il treno per trasportare il tipo di carico selezionato
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Impossibile riadattare il treno...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambia produzione
 
 ############ network gui strings
@@ -2699,7 +2699,7 @@ STR_UNKNOWN_STATION                                             :stazione sconos
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Vuoto
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} da {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} da {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} ha raggiunto il deposito
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ha raggiunto il deposito
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nuovi veicoli
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Treno troppo lungo
@@ -2734,7 +2734,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Passa al
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordini)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fine degli ordini - -
 STR_SERVICE                                                     :{BLACK}Manutieni
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Impossibile costruire il veicolo ferroviario...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Impossibile costruire il veicolo ferroviario...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valore: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2862,7 +2862,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Diretto
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Manutenzione al Deposito di {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Impossibile mandare l'automezzo al deposito...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Impossibile mandare l'automezzo al deposito...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Impossibile trovare il deposito più vicino
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Azione corrente del veicolo - fare clic qui per fermarlo/avviarlo
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Mostra gli ordini del veicolo
@@ -2882,9 +2882,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} component{P e i}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Rinomina l'automezzo
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Impossibile rinominare l'automezzo...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Rinomina l'automezzo
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Rinomina l'automezzo
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Impossibile rinominare l'automezzo...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Rinomina l'automezzo
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo autobus arriva a {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo camion arriva a {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo tram passeggeri arriva a {STATION}!
@@ -2892,16 +2892,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Incidente stradale!{}Il conducente muore nell'incendio seguito alla collisione con un treno
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Incidente stradale!{}In {COMMA} muoiono nell'incendio seguito alla collisione con un treno
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Impossibile far fare inversione all'automezzo...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Rinomina
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Rinomina il tipo di automezzo
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Rinomina tipo automezzo
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Impossibile rinominare il tipo di automezzo...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Riadatta l'automezzo per trasportare un tipo di carico differente
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Riadatta l'automezzo
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Riadatta l'automezzo per trasportare il tipo di carico selezionato
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Impossibile riadattare l'automezzo...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selezionare il tipo di carico da far trasportare all'automezzo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Rinomina
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Rinomina il tipo di automezzo
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Rinomina tipo automezzo
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Impossibile rinominare il tipo di automezzo...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Riadatta l'automezzo per trasportare un tipo di carico differente
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Riadatta l'automezzo
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Riadatta l'automezzo per trasportare il tipo di carico selezionato
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Impossibile riadattare l'automezzo...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selezionare il tipo di carico da far trasportare all'automezzo
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Costruisci trasporti su acqua
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index d8f3705b0..fbd812637 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -1241,11 +1241,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}産業�
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...他の産業に近すぎます。
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}他の貨物種類を運送するに列車を再装備
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}列車を再装備
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}列車が運送する貨物を選択
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}選択した貨物種類に再装備
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}列車が再装備できません...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}他の貨物種類を運送するに列車を再装備
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}列車を再装備
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}列車が運送する貨物を選択
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}選択した貨物種類に再装備
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}列車が再装備できません...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}生産量を変更
 
 ############ network gui strings
@@ -2666,7 +2666,7 @@ STR_UNKNOWN_STATION                                             :不明な駅
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}空
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO}（原点：{STATION}）
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO}（原点：{STATION}）（x{NUM}）
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} は電車庫内に停車しています
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} は電車庫内に停車しています
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}新規車両
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}列車が長過ぎます
@@ -2701,7 +2701,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}指令�
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE}（指令）
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - 指令終了 - -
 STR_SERVICE                                                     :{BLACK}修理
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}鉄道車両が購入できません...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}鉄道車両が購入できません...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}　購入日付：{LTBLUE}{NUM}{BLACK}　価値：{LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}　価値：{LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2828,7 +2828,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}{TOWN}�
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}{TOWN}車庫へ回送、{VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}{TOWN}車庫で修理
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN}車庫で修理、{VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}車両を車庫へ回送できません...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}車両を車庫へ回送できません...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}付近に車庫が見つかりません
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}道路車両 - クリックして情報を表示します
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}車両の現在の動作 - 開始／停止するにはクリックします
@@ -2848,9 +2848,9 @@ STR_BARE_CARGO                                                  :{CARGO}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}道路車両を名付ける
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}道路車両が名付けません...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}道路車両を名付ける
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}道路車両を名付ける
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}道路車両が名付けません...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}道路車両を名付ける
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}町民の祝賀！{}初バスが{STATION}バス停に到着！
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}町民の祝賀！{}初トラックが{STATION}荷役所に到着！
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}町民の祝賀{}初乗客用路面電車が{STATION}駅に到着！
@@ -2858,16 +2858,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}交通事故！{}列車に衝突、運転者が死亡
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}交通事故！{}列車に衝突、{COMMA}人が死亡
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}多数の部分を含む車両が逆転できません
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}名称変更
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}道路車両の名称を変更
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}道路車両の名称を変更
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}道路車両の名称を変更できません...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}他の貨物の種類を運送するに道路車両を再装備します
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}道路車両を再装備
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}選択した貨物種類を運送するに道路車両を再装備します
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}道路車両が再装備できません...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}運送する貨物種類を選択します
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}名称変更
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}道路車両の名称を変更
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}道路車両の名称を変更
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}道路車両の名称を変更できません...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}他の貨物の種類を運送するに道路車両を再装備します
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}道路車両を再装備
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}選択した貨物種類を運送するに道路車両を再装備します
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}道路車両が再装備できません...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}運送する貨物種類を選択します
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :水路を建設
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 30d7191c5..278d72e7c 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -1261,11 +1261,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}산업�
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...다른 산업시설과 너무 가깝습니다.
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}다른 종류의 화물을 실을 수 있도록 열차를 개조
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}열차 개조
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}열차가 수송할 화물의 종류를 선택하세요
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}선택된 화물을 수송하도록 열차를 개조
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}열차를 개조할 수 없습니다...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}다른 종류의 화물을 실을 수 있도록 열차를 개조
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}열차 개조
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}열차가 수송할 화물의 종류를 선택하세요
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}선택된 화물을 수송하도록 열차를 개조
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}열차를 개조할 수 없습니다...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}생산량 변경
 
 ############ network gui strings
@@ -2698,7 +2698,7 @@ STR_UNKNOWN_STATION                                             :알수없는 �
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}비어있음
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} (출발지: {STATION})
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} (출발지: {STATION}) (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE}{P "이" "가"} 차량기지 안에서 대기 중입니다
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE}{P "이" "가"} 차량기지 안에서 대기 중입니다
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}새 열차
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}열차가 너무 깁니다!
@@ -2733,7 +2733,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}순서 �
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (경로)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - 경로의 끝 - -
 STR_SERVICE                                                     :{BLACK}점검
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}기차를 만들 수 없습니다...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}기차를 만들 수 없습니다...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   가격: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2861,7 +2861,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}{TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}{TOWN} 차고로 가는 중 ({VELOCITY})
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}{TOWN} 차고로 점검하러 가는중
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN} 차고로 점검하러 가는중 ({VELOCITY})
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}차량을 차고로 보낼 수 없습니다...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}차량을 차고로 보낼 수 없습니다...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}인접한 차고를 찾을 수 없습니다
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}현재 차량 행동 - 운행/정지시키려면 클릭하세요
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}차량 경로 보이기
@@ -2881,9 +2881,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} 차량{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}자동차 이름 지정
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}자동차의 이름을 지정할 수 없습니다...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}자동차 이름 지정
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}자동차 이름 지정
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}자동차의 이름을 지정할 수 없습니다...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}자동차 이름 지정
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}첫 버스가 {STATION} 정류장에 도착했습니다!{}시민들이 환호하고 있습니다!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}첫 트럭이 {STATION} 정류장에 도착했습니다!{}시민들이 환호하고 있습니다!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}{STATION}에 처음으로 승객 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
@@ -2891,16 +2891,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}자동차 충돌!{}열차와의 충돌로 운전사가 사망했습니다!
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}자동차 충돌!{}열차와의 충돌로 {COMMA}명이 사망했습니다!
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}자동차를 U턴시킬 수 없습니다...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}이름 지정
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}자동차 타입의 이름 지정
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}자동차 타입의 이름 지정
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}자동차 타입의 이름을 지정할 수 없습니다...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}자동차가 다른 종류의 화물을 싣도록 개조
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}자동차 개조
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}선택한 화물을 싣도록 자동차를 개조
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}자동차를 개조할 수 없습니다...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}자동차가 수송할 화물의 종류를 선택하십시오.
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}이름 지정
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}자동차 타입의 이름 지정
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}자동차 타입의 이름 지정
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}자동차 타입의 이름을 지정할 수 없습니다...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}자동차가 다른 종류의 화물을 싣도록 개조
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}자동차 개조
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}선택한 화물을 싣도록 자동차를 개조
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}자동차를 개조할 수 없습니다...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}자동차가 수송할 화물의 종류를 선택하십시오.
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :항만 건설
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index befcad5b4..22d3f5aee 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -1255,11 +1255,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}IRūpnī
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...pārāk tuvu citai rūpnīcai
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Pielāgot vilcienu citas kravas pārvadāšanai
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Pārbūvēt vilcienu
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Izvēlaties kravas veidu, ko pārvadāt ar vilcienu
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Pārbūvēt vilcienu izceltā kravas veida pārvadāšanai
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nevar pārbūvēt vilcienu...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Pielāgot vilcienu citas kravas pārvadāšanai
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Pārbūvēt vilcienu
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Izvēlaties kravas veidu, ko pārvadāt ar vilcienu
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Pārbūvēt vilcienu izceltā kravas veida pārvadāšanai
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nevar pārbūvēt vilcienu...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Mainīt produkciju
 
 ############ network gui strings
@@ -2688,7 +2688,7 @@ STR_UNKNOWN_STATION                                             :nezināma staci
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tukšs
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} no {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} no {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} gaida depo
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} gaida depo
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Jauni transportlīdzekļi
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Vilciens ir pārāk garš
@@ -2724,7 +2724,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Pārslē
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Rīkojumi)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Rīkojumu beigas - -
 STR_SERVICE                                                     :{BLACK}Serviss
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Vilcienu nevar uzbūvēt...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Vilcienu nevar uzbūvēt...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}  Uzbūvēts: {LTBLUE}{NUM}{BLACK} Vērtība: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vērtība: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2839,7 +2839,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Dodas u
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Dodas uz {TOWN} depo, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Apkope {TOWN} depo
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Apkope {TOWN} depo, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Nevar aizsūtīt uz depo
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nevar aizsūtīt uz depo
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nevar atrast vietējo depo
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Transportlīdzekļi - klik uz tā priekš informācijas
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Transportl. pašreizējā darbība - klik šeit, lai apstādinātu/palaistu to
@@ -2860,9 +2860,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} transportlīdzek{P lis ļi ļu}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Nosaukt transportl.
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Nevar nosaukt transportl. ...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Nosaukt transportl.
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nosaukt transportl.
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nevar nosaukt transportl. ...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nosaukt transportl.
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Pilsētnieki svin . . .{}Pirmais autobuss ierodas {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Pilsētnieki svin . . .{}Pirmā kravas automašīna ierodas {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Pilsoņi līksmo . . .{}Pirmais pasažieru tramvajs ierodas {STATION}!
@@ -2870,16 +2870,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Autotransporta avārija!{}Vadītājs mirst uzreiz pēc sadursmes ar vilcienu.
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Autotransporta avārija!{}{COMMA} mirst pēc sadursmes ar vilcienu
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nevar pagriezt transportlīdzekļus, kas sastāv no vairākām daļām
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Pārsaukt
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Pārsaukt transportl. tipu
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Pārsaukt transportl. tipu
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Nevar pārsaukt transportl. tipu...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Nomainīt ceļu transportlīdzekļa kravas veidu
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Pārbūvēt ceļu transportlīdzekli
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Nomainīt ceļu transportlīdzekļa kravas veidu uz izvēlēto
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Nav iespējams pārbūvēt ceļu transportlīdzekli
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Izvēlies kravas tipu mašīnai
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Pārsaukt
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Pārsaukt transportl. tipu
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Pārsaukt transportl. tipu
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nevar pārsaukt transportl. tipu...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Nomainīt ceļu transportlīdzekļa kravas veidu
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Pārbūvēt ceļu transportlīdzekli
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Nomainīt ceļu transportlīdzekļa kravas veidu uz izvēlēto
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nav iespējams pārbūvēt ceļu transportlīdzekli
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Izvēlies kravas tipu mašīnai
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Ūdensceļu celtniecība
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index 6a31b957f..e1542b39d 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -1275,11 +1275,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Pramonė
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...per arti kitos gamyklos
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Įsteigti traukinį, kuris rūpinsis prioritetiniais kroviniais
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Įsteigti traukinį
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Pasirink prioritetinį krovinio tipą, kuriuo rūpinsis traukinys
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Įsteigti traukinį prioritetinių krovinių pervežimui
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Negalima įsteigti traukinio...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Įsteigti traukinį, kuris rūpinsis prioritetiniais kroviniais
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Įsteigti traukinį
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Pasirink prioritetinį krovinio tipą, kuriuo rūpinsis traukinys
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Įsteigti traukinį prioritetinių krovinių pervežimui
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Negalima įsteigti traukinio...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Keisti produkciją
 
 ############ network gui strings
@@ -2691,7 +2691,7 @@ STR_UNKNOWN_STATION                                             :Nežinoma stoti
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tuscias
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} is {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} iš {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} laukia depe
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} laukia depe
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Naujos tr. priemones
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Traukinys per ilgas
@@ -2726,7 +2726,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Pereiti
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Uzduotys)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Uzduociu pabaiga- -
 STR_SERVICE                                                     :{BLACK}Remontas
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Gelezinkelio transporto priemones nupirkti negalima...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Gelezinkelio transporto priemones nupirkti negalima...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Pastatyta: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Verte: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2837,7 +2837,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Uzduoti
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Uzduotis: {TOWN} garazas, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Servisas{TOWN} Masinu Depe
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisas {TOWN} Masinu Depe, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Negalima rasti automobilio garazo...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Negalima rasti automobilio garazo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Negalima rasti garazo
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Automobiliai - paspausk ant automobilio, jei nori detalesnes informacijos
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Automobilio uzduotis - spustelk cia, jei nori sustabdyti/paleisti automobili
@@ -2857,9 +2857,9 @@ STR_BARE_CARGO                                                  :{CARGO}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Pavadinti automobili
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Automobilio pavadinti nepavyko...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Pavadinti automobili
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Pavadinti automobili
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Automobilio pavadinti nepavyko...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Pavadinti automobili
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Gyventojai džiūgauja. . .{}Pirmas autobusas atvyko į {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Gyventojai džiūgauja. . .{}Pirmas sunkvežimis atvyko į {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Miestelėnai švenčia . . .{}Pirmas Tramvajus atvyko į {STATION}!
@@ -2867,16 +2867,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Automobilio avarija!{}Automobilio vairuotojas zuvo po susidurimo su traukiniu
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Automobilio avarija!{}Žuvo {COMMA} keleiv(P is iai ių) automobiliui susidūrus su traukiniu
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}negalima pajudinti automobiliu sudarytu is keliu vienetu
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Pervardinti
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Pervardinti automobiliu tipa
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Pervardinti automobiliu tipa
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Negali pervardinti automobliu tipo...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti kitoki krovinio tipa
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Perkomplektuoti
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti pazymeta krovinio tipa
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Neimanoma perkomplektuoti...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Nurodykite šios transporto priemonės pervežamą krovinių tipą
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Pervardinti
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Pervardinti automobiliu tipa
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Pervardinti automobiliu tipa
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Negali pervardinti automobliu tipo...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti kitoki krovinio tipa
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Perkomplektuoti
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti pazymeta krovinio tipa
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Neimanoma perkomplektuoti...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Nurodykite šios transporto priemonės pervežamą krovinių tipą
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Kanalų konstrukcija
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 49f15e3d9..eddc1b87d 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -1262,11 +1262,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Fabriken
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...ze Noo bei enger aanerer Fabrik
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Den Zuch upassen fir aaner Luedungen ze transportéieren
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Zuch upassen
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selectéiert d'Luedung déi transportéiert soll ginn
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Passt den Zuch un fir den ugewielten Luedungstyp
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kann den Zuch net unpassen...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Den Zuch upassen fir aaner Luedungen ze transportéieren
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Zuch upassen
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selectéiert d'Luedung déi transportéiert soll ginn
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Passt den Zuch un fir den ugewielten Luedungstyp
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kann den Zuch net unpassen...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}D'Produktioun änneren
 
 ############ network gui strings
@@ -2700,7 +2700,7 @@ STR_UNKNOWN_STATION                                             :onbekannt Stati
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Eidel
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} vun {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} vun {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} waart am Depot
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} waart am Depot
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nei Gefierer
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Zuch ze laang
@@ -2736,7 +2736,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Wiesselt
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Opträg)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Enn vun den Opträg - -
 STR_SERVICE                                                     :{BLACK}Revisioun
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Kann den Zuch net bauen...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kann den Zuch net bauen...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebaut: {LTBLUE}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Wert: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2864,7 +2864,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Um Wee
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Um Wee fir {TOWN} Stroossendepot, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Revisioun am {TOWN} Stroossendepot
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisioun am {TOWN} Stroossendepot, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Kann d'Gefiert net an den Depot schécken...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kann d'Gefiert net an den Depot schécken...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kann den Depot net fannen
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Stroossengefierer - klickt op en Gefiert fir Informatiounen
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Momentan Aktioun - klickt hei fir d'Gefiert ze stoppen/starten
@@ -2885,9 +2885,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} Gefier{P t er}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Stroossengefiert benennen
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Kann d'Stroossengefiert net benennen...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Stroossengefiert benennen
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Stroossengefiert benennen
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kann d'Stroossengefiert net benennen...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Stroossengefiert benennen
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Biirger feieren . . .{}Éischten Bus kënnt bei {STATION} un!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Biirger feieren . . .{}Eischten Camion kënnt bei {STATION} un!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Biirger feieren . . .{}Eischten Tram kënnt bei  {STATION} un!
@@ -2895,16 +2895,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Stroossengefiert onfall!{}Fuerer stieft an der Explosioun no Onfall mam Zuch
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Stroossengefiertaccident!{}{COMMA} stiewen an der Explosioun no Onfall mam Zuch
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kann keng Gefierer aus e puer Unitéiten emdréinen
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Ëmbenennen
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Gefierttyp ëmbenennen
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Gefiertentyp ëmbenennen
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Kann den Gefierttyp net ëmbenennen...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Stroossengefiert ëmbauen fir eng aner Wuer ze transportéiren
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Stroossengefiert ëmbauen
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Stroosengefiert embauen fir gewielten Wuer ze transportéiren
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kann Stroossengefiert net ëmbauen...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wielt den Typ vun Wueren fir Stroossengefiert
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Ëmbenennen
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Gefierttyp ëmbenennen
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Gefiertentyp ëmbenennen
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kann den Gefierttyp net ëmbenennen...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Stroossengefiert ëmbauen fir eng aner Wuer ze transportéiren
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Stroossengefiert ëmbauen
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Stroosengefiert embauen fir gewielten Wuer ze transportéiren
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kann Stroossengefiert net ëmbauen...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Wielt den Typ vun Wueren fir Stroossengefiert
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Waasserstroossen bauen
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 2458791c3..1937662f1 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -1262,11 +1262,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for nært en annen industri
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om lokomotivet til å frakte en annen varetype
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Bygg om lokomotivet
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Velg hvilken vare lokomotivet skal frakte
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Bygg om lokomotivet til å frakte den valgte varetypen
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan ikke bygge om lokomotiv...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Bygg om lokomotivet til å frakte en annen varetype
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Bygg om lokomotivet
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Velg hvilken vare lokomotivet skal frakte
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Bygg om lokomotivet til å frakte den valgte varetypen
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan ikke bygge om lokomotiv...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Endre produksjon
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :ukjent stasjon
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tom
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} fra {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} fra {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} venter i togstallen
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} venter i togstallen
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nye tog/vogner
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Toget er for langt
@@ -2737,7 +2737,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Bytt til
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordre)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slutt på ordre - -
 STR_SERVICE                                                     :{BLACK}Vedlikehold
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Kan ikke bygge jernbanekjøretøy...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan ikke bygge jernbanekjøretøy...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2865,7 +2865,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Er på
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Er på vei til {TOWN} garasje, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Vedlikehold ved {TOWN} garasje
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Vedlikehold ved {TOWN} garasje, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Kan ikke sende kjøretøy til garasje...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan ikke sende kjøretøy til garasje...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan ikke finne en garasje i nærheten
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Gjeldende kjøretøystatus - trykk her for å stoppe/starte kjøretøy
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Vis kjøretøyets ordreliste
@@ -2885,9 +2885,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} kjøretøy{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Navngi kjøretøy
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Kan ikke navngi kjøretøy...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Navngi kjøretøy
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Navngi kjøretøy
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kan ikke navngi kjøretøy...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Navngi kjøretøy
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første buss ankommer {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første lastebil ankommer {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første passasjertrikk ankommer {STATION}!
@@ -2895,16 +2895,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Kollisjon!{}Sjåfør dør etter kollisjon med tog
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Kollisjon!{}{COMMA} dør etter kollisjon med tog
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Kan ikke snu kjøretøy...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Endre navn
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Endre navnet til kjøretøytypen
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Endre navnet til kjøretøytypen
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Kan ikke endre navnet til kjøretøytypen...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om kjøretøyet til å ta en annen type last
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Bygg om bil
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Bygg om kjøretøyet til å ta den valgte lasten
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan ikke bygge om bil...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Velg en type varer som kjøretøyet skal lastes med
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Endre navn
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Endre navnet til kjøretøytypen
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Endre navnet til kjøretøytypen
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan ikke endre navnet til kjøretøytypen...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Bygg om kjøretøyet til å ta en annen type last
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Bygg om bil
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Bygg om kjøretøyet til å ta den valgte lasten
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan ikke bygge om bil...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Velg en type varer som kjøretøyet skal lastes med
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Kanal konstruksjon
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 289fa72ed..50f8f3730 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -1255,11 +1255,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for nær ein annan industri
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om eit lokomotiv til å ta ein annan type last
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Bygg om lokomotivet
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vel kva type last lokomotivet skal ta
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Bygg om lokomotivet til å frakte den valde varetypen
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan ikkje byggje om lokomotiv...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Bygg om eit lokomotiv til å ta ein annan type last
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Bygg om lokomotivet
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vel kva type last lokomotivet skal ta
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Bygg om lokomotivet til å frakte den valde varetypen
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan ikkje byggje om lokomotiv...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Endre produksjon
 
 ############ network gui strings
@@ -2689,7 +2689,7 @@ STR_UNKNOWN_STATION                                             :ukjend stasjon
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tom
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} frå {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} frå {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} ventar i depoet
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ventar i depoet
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nye tog/vogner
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Toget er for langt
@@ -2725,7 +2725,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Bytt til
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordre)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slutt på ordre - -
 STR_SERVICE                                                     :{BLACK}Vedlikehald
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Kan ikkje byggje jernbanekøyretøy...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan ikkje byggje jernbanekøyretøy...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2840,7 +2840,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Er på
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Er på veg til {TOWN} garasje, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Vedlikehald ved {TOWN} garasje
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Vedlikehald ved {TOWN} garasje, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Kan ikkje sende køyretøy til garasje...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan ikkje sende køyretøy til garasje...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan ikkje finne ein garasje i nærleiken
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Køyretøy - trykk på køyretøy for informasjon
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Gjeldande køyretøystatus - trykk her for å stoppa/starta køyretøy
@@ -2861,9 +2861,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} kjøretøy{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Namngje køyretøy
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Kan ikkje namngje køyretøy...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Namngje køyretøy
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Namngje køyretøy
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kan ikkje namngje køyretøy...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Namngje køyretøy
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første buss kjem til {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første lastebil kjem til {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første passasjertrikk kjem til{STATION}!
@@ -2871,16 +2871,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Kollisjon!{}Sjåfør døyr etter kollisjon med tog
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Kollisjon!{}{COMMA} døyr etter kollisjon med tog
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikkje snu køyretøy som er samansette av fleire delar
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Endre namn
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Endre namnet til køyretøytypen
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Endre namnet til køyretøytypen
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Kan ikkje endre namnet til køyretøytypen...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om køyretøyet til å ta ein annan type last
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Bygg om bil
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Bygg om køyretøyet til å ta den valde lasta
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan ikkje byggje om bil...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vel ein type varer som køyretøyet skal lastast med
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Endre namn
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Endre namnet til køyretøytypen
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Endre namnet til køyretøytypen
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan ikkje endre namnet til køyretøytypen...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Bygg om køyretøyet til å ta ein annan type last
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Bygg om bil
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Bygg om køyretøyet til å ta den valde lasta
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan ikkje byggje om bil...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vel ein type varer som køyretøyet skal lastast med
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Konstruksjon av kanalar
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index fd7b8bbf8..526726be6 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -1637,11 +1637,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nazwy za
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zbyt blisko innego przedsiębiorstwa
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Przebudowa pociągu do przewozu innego typu ładunku
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Przebudowa pociągu
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wybierz jaki ładunek ma przewozić pociąg
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Przebuduj pociąg do przewozu zaznaczonego typu ładunku
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nie można przebudować pociągu...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Przebudowa pociągu do przewozu innego typu ładunku
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Przebudowa pociągu
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Wybierz jaki ładunek ma przewozić pociąg
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Przebuduj pociąg do przewozu zaznaczonego typu ładunku
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nie można przebudować pociągu...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmiana produkcji
 
 ############ network gui strings
@@ -3116,7 +3116,7 @@ STR_UNKNOWN_STATION                                             :Nieznana stacja
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Pusty
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} z {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} z {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} czeka w zajezdni
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} czeka w zajezdni
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nowe pojazdy
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Pociąg jest zbyt długi
@@ -3152,7 +3152,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Przełą
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Polecenia)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Koniec poleceń - -
 STR_SERVICE                                                     :{BLACK}Serwis
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Nie można wybudować lokomotywy...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nie można wybudować lokomotywy...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Budowa: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Wartość: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3282,7 +3282,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Zmierza
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Zmierza do zajezdni sam. w {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Serwisuj w Zajezdni w {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Serwisuj w Zajezdni w {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Nie można wysłać samochodu do zajezdni...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nie można wysłać samochodu do zajezdni...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nie można znaleźć zajezdni
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Samochody - klik na pojeździe po więcej informacji
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Obecny stan pojazdu - klik tutaj aby zatrzymać/ruszyć pojazd
@@ -3303,9 +3303,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} pojazd{P "" y ów}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Nazwij samochód
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Nie można nazwać samochodu...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Nazwij samochód
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nazwij samochód
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nie można nazwać samochodu...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nazwij samochód
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy autobus przybył do {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwsza ciężarówka przybyła do {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj pasażerski przybył do {STATION}!
@@ -3313,16 +3313,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Wypadek samochodowy!{}Kierowca zginął w zderzeniu z pociągiem
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Wypadek samochodowy!{}{COMMA} ofiar{P a y ""} zderzenia z pociągiem
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Nie można zawrócić pojazdu...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Zmień nazwę
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Zmień nazwę typu samochodu
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Zmień nazwę typu samochodu
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Nie można zmienić nazwy typu samochodu...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Przebudowa samochodu do przewozu innego typu ładunku
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Przebudowa samochodu
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Przebuduj samochód do przewozu zaznaczonego typu ładunku
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Nie można przebudować samochodu...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wybierz ładunek jaki ma przewozić ten samochód
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Zmień nazwę
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Zmień nazwę typu samochodu
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Zmień nazwę typu samochodu
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nie można zmienić nazwy typu samochodu...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Przebudowa samochodu do przewozu innego typu ładunku
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Przebudowa samochodu
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Przebuduj samochód do przewozu zaznaczonego typu ładunku
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nie można przebudować samochodu...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Wybierz ładunek jaki ma przewozić ten samochód
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Konstrukcja kanału wodnego
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index d9a2cabbb..f3c2643fc 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -1264,11 +1264,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes de
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Converter comboio para um tipo de carga diferente
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Converter comboio
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga do comboio
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Converter comboio para transportar a carga seleccionada
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Não é possível converter comboio...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Converter comboio para um tipo de carga diferente
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Converter comboio
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Seleccionar tipo de carga do comboio
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Converter comboio para transportar a carga seleccionada
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Não é possível converter comboio...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Modificar produção
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :estação desco
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Vazio
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} de {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} está a aguardar no depósito
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} está a aguardar no depósito
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Veículos
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Comboio muito longo
@@ -2738,7 +2738,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Mudar pa
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordens)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fim de Ordens - -
 STR_SERVICE                                                     :{BLACK}Manutenção
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Não é possível construir veículo ferroviário...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Não é possível construir veículo ferroviário...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2868,7 +2868,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Dirige-
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Serviço no depósito de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Não é possível mandar o veículo para o depósito...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Não é possível mandar o veículo para o depósito...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Não é possível encontrar o depósito local
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Veículos de estrada - clique num veículo para informações
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Tarefa actual do veículo - clique aqui para iniciar/parar veículo
@@ -2889,9 +2889,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} veículo{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Renomear veículo de estrada
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Não é possível renomear veículo de estrada...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Renomear veículo de estrada
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear veículo de estrada
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Não é possível renomear veículo de estrada...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear veículo de estrada
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro autocarro chega a {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro camião chega a {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de passageiros chega a {STATION}!
@@ -2899,16 +2899,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}Condutor morre na explosão após a colisão com um comboio
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}{COMMA} morrem na explosão após a colisão com um comboio
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Impossível fazer o veículo dar a volta...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Renomear
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Renomear tipo de veículo de estrada
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Renomear tipo de veículo de estrada
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Não é possível renomear tipo de veículo de estrada...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Reconverter veículo para transportar outro tipo de carga
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Reconverter veículo
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Reconverter veículo para transportar o tipo de carga seleccionado
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Não é possível reconverter veículo
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccione o tipo de carga para o veículo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renomear
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renomear tipo de veículo de estrada
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomear tipo de veículo de estrada
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Não é possível renomear tipo de veículo de estrada...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Reconverter veículo para transportar outro tipo de carga
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Reconverter veículo
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Reconverter veículo para transportar o tipo de carga seleccionado
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Não é possível reconverter veículo
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Seleccione o tipo de carga para o veículo
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construção de canais
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 1e64f565b..fc23f0ca4 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -1260,11 +1260,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Numele i
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prea aproape de altă industrie
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Schimba tipul încãrcãturii cãratã de acest tren
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Modificã încãrcãturã
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de marfă transportat de tren
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Modificã trenul pentru a transporta marfa aleasã
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nu pot modifica trenul...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Schimba tipul încãrcãturii cãratã de acest tren
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Modificã încãrcãturã
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Alege tipul de marfă transportat de tren
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Modificã trenul pentru a transporta marfa aleasã
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nu pot modifica trenul...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Schimba productia
 
 ############ network gui strings
@@ -2698,7 +2698,7 @@ STR_UNKNOWN_STATION                                             :statie necunosc
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Gol
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de la {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} de la {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} aşteaptă în depou
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} aşteaptă în depou
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Vehicule noi
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Tren prea lung
@@ -2733,7 +2733,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Schimba
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Comenzi)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Sfârşitul comenzilor - -
 STR_SERVICE                                                     :{BLACK}Service
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Nu se poate construi vehiculul...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nu se poate construi vehiculul...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Cumpărat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valoare: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2861,7 +2861,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Merge l
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Merge la Autobaza {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Service la Autobaza {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Service la Autobaza {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Nu pot trimite autovehiculul la autobază...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nu pot trimite autovehiculul la autobază...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nu pot găsi o autobază apropiată
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Comanda curentă a autovehiculului - clic aici pentru a opri/porni autovehiculul
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Afişează comenzile autovehiculului
@@ -2881,9 +2881,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehicul{P "" e}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Numele autovehiculului
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Nu se poate denumi autovehiculul...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Numele autovehiculului
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Numele autovehiculului
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nu se poate denumi autovehiculul...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Numele autovehiculului
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Cetăţenii sărbătoresc{}Sosirea primului autobuz la {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Cetăţenii sărbătoresc{}Sosirea primului camion la {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru călători la {STATION}!
@@ -2891,16 +2891,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Accident rutier!{}Şoferul decedat în urma coliziunii cu un tren
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Accident rutier!{}{COMMA} victime în urma coliziunii cu un tren
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Vehicolul nu poate întoarce la 180 de grade...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Nume nou
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Redenumeşte modelul de autovehicul
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Redenumeşte modelul de autovehicul
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Nu pot redenumi modelul de autovehicul...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Adapteaza autovehiculul pentru o incarcatura diferita
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Adaptare autovehicul
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Adapteaza autovehiculul pentru transportul incarcaturii evidentiate
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Nu pot adapta autovehiculul...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de marfă pe care o transportă autovehiculul
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Nume nou
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Redenumeşte modelul de autovehicul
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Redenumeşte modelul de autovehicul
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nu pot redenumi modelul de autovehicul...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Adapteaza autovehiculul pentru o incarcatura diferita
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Adaptare autovehicul
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Adapteaza autovehiculul pentru transportul incarcaturii evidentiate
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nu pot adapta autovehiculul...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Alege tipul de marfă pe care o transportă autovehiculul
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Constructie rute acvatice
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 05ab982fc..ee0120002 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -1411,11 +1411,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Назв
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...слишком близко к другому предприятию
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Переоборудование поезда для иного типа груза
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Переоборудовать поезда
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Выбор типа груза для перевозки
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Переоборудование поезда под выбранный тип груза
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Невозможно переоборудовать поезд...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Переоборудование поезда для иного типа груза
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Переоборудовать поезда
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Выбор типа груза для перевозки
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Переоборудование поезда под выбранный тип груза
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Невозможно переоборудовать поезд...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Изменить производительность
 
 ############ network gui strings
@@ -2865,7 +2865,7 @@ STR_UNKNOWN_STATION                                             :неизвес�
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Пусто
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} из {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} из {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} ждёт в депо
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ждёт в депо
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Новый транспорт
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Поезд слишком длинный
@@ -2900,7 +2900,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Пере
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Задания)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Конец заданий - -
 STR_SERVICE                                                     :{BLACK}Обслуж.
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Невозможно купить ж/д транспорт...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Невозможно купить ж/д транспорт...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}  Построен в {LTBLUE}{NUM} г.{BLACK} Стоимость: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Стоимость: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3028,7 +3028,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Идё�
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Идёт в гараж {TOWN}; {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Обслуж. в гараже {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Обслуж. в гараже {TOWN}; {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Невозможно отправить машину в гараж...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Невозможно отправить машину в гараж...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Невозможно найти гараж
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Текущее действие автомобиля; кликните для его остановки/запуска
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Показать задания
@@ -3048,9 +3048,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} единиц{P а "" ""}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Назвать автотранспорт
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Невозможно переименовать автомобиль...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Назвать автотранспорт
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Назвать автотранспорт
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Невозможно переименовать автомобиль...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Назвать автотранспорт
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Жители празднуют!{}Первый автобус прибыл на остановку {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Жители празднуют!{}Первый грузовик прибыл на станцию {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Жители празднуют . . .{}Первый трамвай прибыл на {STATION}!
@@ -3058,16 +3058,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}АВАРИЯ!{}Водитель погиб при столкновении с поездом
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}АВАРИЯ!{}{COMMA} человек{P "" а ""} погиб{P "" ло ло} при столкновении с поездом!
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Нельзя развернуть машину...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Переимен.
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Переименовать автомобиль
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Переименовать автомобиль
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Невозможно переименовать...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Переоборуд. авто для доставки разных видов грузов.
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Переоборуд. авто
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Переоборуд авто для перевозки доступных видов грузов
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Невозможно переоборудовать автомобиль...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Выберите тип грузов для перевозки
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Переимен.
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Переименовать автомобиль
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Переименовать автомобиль
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Невозможно переименовать...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Переоборуд. авто для доставки разных видов грузов.
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Переоборуд. авто
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Переоборуд авто для перевозки доступных видов грузов
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Невозможно переоборудовать автомобиль...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Выберите тип грузов для перевозки
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Строительство водных путей
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 4271c1188..3d06a1679 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -1452,11 +1452,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena fa
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...previše blizu druge fabrike
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Prepravlja voz kako bi prevozio drugu vrstu tereta
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Prepavi voz
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Označite vrstu tovara za prepravljanje voza
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Prepravlja voz za prevoz označene vrste tovara
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Voz se ne može prepraviti...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Prepravlja voz kako bi prevozio drugu vrstu tereta
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prepavi voz
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Označite vrstu tovara za prepravljanje voza
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Prepravlja voz za prevoz označene vrste tovara
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Voz se ne može prepraviti...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Promena proizvodnje
 
 ############ network gui strings
@@ -2741,7 +2741,7 @@ STR_UNKNOWN_STATION                                             :nepoznata stani
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prazno
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} sa {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} sa {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} čeka u depou
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čeka u depou
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nova Vozila
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Voz je predugačak
@@ -2776,7 +2776,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Prelazi
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Naredbe)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Kraj Naredbi - -
 STR_SERVICE                                                     :{BLACK}Servis
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Nemoguća kupovina šinskog vozila...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nemoguća kupovina šinskog vozila...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Kupljen: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2904,7 +2904,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Ide ka
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Ide ka {TOWN} Drumskom Depou, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Vozilo ne može da ode u depo...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Vozilo ne može da ode u depo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Neuspešan pronalazak lokalnog depoa
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Trenutno stanje vozila - kliknite ovde za zaustavljanje/pokretanje vozila
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Prikazuje naredbe vozilu
@@ -2924,9 +2924,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozil{P o a a}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Naziv drumskog vozila
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Ne može se promeniti naziv vozila...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Naziv drumskog vozila
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Naziv drumskog vozila
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ne može se promeniti naziv vozila...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Naziv drumskog vozila
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Narod slavi . . .{}Prvi autobus stiže na stanicu {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Narod slavi . . .{}Prvi kamion stiže na stanicu {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Narod slavi . . .{}Prvi tramvaj stiže na stanicu {STATION}!
@@ -2934,16 +2934,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Saobraćajna nesreća!{}Vozač je poginuo u eksploziji nakon sudara sa vozom
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Saobraćajna nesreća!{}{COMMA} {P "" je su} poginu{P o la lo} u eksploziji nakon sudara sa vozom
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Drumsko vozilo ne može da se okrene...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Promena naziva
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Promenite naziv vrste drumskog vozila
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Naziv vrste drumskog vozila
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Nemoguća promena naziva vrste drumskog vozila...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Prepravite drumsko vozilo kako bi prevozio drugu vrstu tovara
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Prepravi drumsko vozilo
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Prepravlja drumsko vozilo za prevoz označene vrste tovara
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Nemoguće prepravljanje drumskog vozila...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Označite vrstu tovara za prepravljanje drumskog vozila
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Promena naziva
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Promenite naziv vrste drumskog vozila
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Naziv vrste drumskog vozila
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nemoguća promena naziva vrste drumskog vozila...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prepravite drumsko vozilo kako bi prevozio drugu vrstu tovara
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prepravi drumsko vozilo
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Prepravlja drumsko vozilo za prevoz označene vrste tovara
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Nemoguće prepravljanje drumskog vozila...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Označite vrstu tovara za prepravljanje drumskog vozila
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Izgradnja plovnih kanala
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 2ea8d514f..28d1bfe87 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -1260,11 +1260,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}工业�
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}距离另一工业设施过近……
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}改装列车以装载另一类型的货物
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}改装列车
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}选择希望列车装载的货物类型
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}让列车装载高亮选定的货物
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}不能改造列车……
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}改装列车以装载另一类型的货物
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}改装列车
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}选择希望列车装载的货物类型
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}让列车装载高亮选定的货物
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}不能改造列车……
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}改变产量
 
 ############ network gui strings
@@ -2697,7 +2697,7 @@ STR_UNKNOWN_STATION                                             :未知车站（
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}空
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} (来自 {STATION})
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} (来自 {STATION} (x{NUM}))
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} 正在车库待命
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} 正在车库待命
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}购买列车
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}列车过长
@@ -2732,7 +2732,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}切换�
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (调度计划)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}-- 调度计划结束 --
 STR_SERVICE                                                     :{BLACK}保养
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}不能购买列车……
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}不能购买列车……
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   建造年份：{LTBLUE}{NUM}{BLACK} 价值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   价值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2860,7 +2860,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}正在�
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}正在前往 {TOWN} 车库，{VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}正在 {TOWN} 车库保养
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}正在 {TOWN} 车库保养，{VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}不能命令该汽车前往车库...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}不能命令该汽车前往车库...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}在附近找不到车库
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}当前车辆的状态{}单击这里可以 停止/启动 车辆
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}显示车辆的调度指令
@@ -2880,9 +2880,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} 车辆{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}命名汽车
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}不能命名汽车……
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}命名汽车
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}命名汽车
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}不能命名汽车……
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}命名汽车
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一辆巴士抵达 {STATION}！
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一辆货车抵达 {STATION}！
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}市民欢庆~. . .{}首辆客运电车抵达 {STATION}!
@@ -2890,16 +2890,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}汽车事故！{}汽车与火车相撞，司机在事故中丧生！
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}汽车事故！{}汽车与火车相撞，{COMMA} 人在事故中丧生！
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}车辆无法调头...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}重命名
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}重命名汽车型号
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}重命名汽车型号
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}不能重命名汽车型号……
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}改装汽车以运载其他货物
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}改装汽车
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}改装汽车以运输选择的货物类型
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}不能改装汽车……
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}选择要运输的货物类型：
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}重命名
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}重命名汽车型号
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}重命名汽车型号
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}不能重命名汽车型号……
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}改装汽车以运载其他货物
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}改装汽车
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}改装汽车以运输选择的货物类型
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}不能改装汽车……
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}选择要运输的货物类型：
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :水运建设
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 53e44e119..d8a96a747 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -1331,11 +1331,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Názvy p
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... prilis blizko ineho priemyslu
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Prestavat vlak na prepravu ineho nakladu
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Prestavat vlak
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vybrat typ prepravovaneho nakladu
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Prestavat vlak na prepravu vybraneho nakladu
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nemozno prestavat vlak ...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Prestavat vlak na prepravu ineho nakladu
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prestavat vlak
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vybrat typ prepravovaneho nakladu
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Prestavat vlak na prepravu vybraneho nakladu
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nemozno prestavat vlak ...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmenit produkciu
 
 ############ network gui strings
@@ -2769,7 +2769,7 @@ STR_UNKNOWN_STATION                                             :neznáma stanic
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prazdny
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} z {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} z {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} čaká v depe
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čaká v depe
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nove vozidla
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Vlak je prilis dlhy
@@ -2805,7 +2805,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Prepnút
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Prikazy)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Koniec prikazov - -
 STR_SERVICE                                                     :{BLACK}Oprava
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Nemozno kupit vlak...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Nemozno kupit vlak...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2934,7 +2934,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Smeruje
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}smeruje do {TOWN} garaze, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Servis v garazi {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Servis v garazi {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Nemozno poslat automobil do garaze ...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nemozno poslat automobil do garaze ...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nemozno najst miestnu garaz
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Automobily - kliknut pre detaily
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Aktualna cinnost vozidla - kliknut pre zastavenie/spustenie
@@ -2955,25 +2955,25 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozid{P lo lá iel}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Pomenovat automobil
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Nemozno pomenovat automobil ...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Pomenovat automobil
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Pomenovat automobil
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nemozno pomenovat automobil ...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Pomenovat automobil
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy autobus dorazil do {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy automobil dorazil do {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá elektricka dorazila do stanice {STATION}!
 STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá nákladná elektricka dorazila do stanice {STATION}!
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Dopravna nehoda!{}Vodic zahynul po kolizii s vlakom
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Dopravna nehoda!{}{COMMA} mrtvych po kolizii s vlakom
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Premenovat
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Premenovat typ automobilu
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Premenovat typ automobilu
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Nemozno premenovat typ automobilu ...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Prestavat vozidlo na prepravu ineho druhu nakladu
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Prestavat vozidlo
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Prestavat vozidlo na prepravu vyznaceneho druhu nakladu
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Prestavba vozidla nie je mozna ...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vyberte požadovaný typ nákladu pre cestné vozidlo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Premenovat
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Premenovat typ automobilu
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Premenovat typ automobilu
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nemozno premenovat typ automobilu ...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prestavat vozidlo na prepravu ineho druhu nakladu
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prestavat vozidlo
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Prestavat vozidlo na prepravu vyznaceneho druhu nakladu
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Prestavba vozidla nie je mozna ...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vyberte požadovaný typ nákladu pre cestné vozidlo
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Waterways construction
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index babb6636a..efa0c746e 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -1306,11 +1306,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena in
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...preblizu drugi industriji
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Predelaj vlak za tovor druge vrste
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Predelaj vlak
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Izberi predelavo za tip tovora
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Predelaj vlak za označen tip tovora
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nemogoča predelava vlaka...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Predelaj vlak za tovor druge vrste
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Predelaj vlak
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Izberi predelavo za tip tovora
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Predelaj vlak za označen tip tovora
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Nemogoča predelava vlaka...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Spremeni proizvodnjo
 
 ############ network gui strings
@@ -2782,7 +2782,7 @@ STR_UNKNOWN_STATION                                             :neznana postaja
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prazen
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :Tovor {LTBLUE}{CARGO} iz postaje {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} iz {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} čaka v garaži
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} čaka v garaži
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nova vozila
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Vlak je predolg
@@ -2818,7 +2818,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Preklop
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ukazi)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Konec ukazov - -
 STR_SERVICE                                                     :{BLACK}Servis
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Ni mogoče kupiti vozila ...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Ni mogoče kupiti vozila ...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Zgrajeno: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2946,7 +2946,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Pelje v
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Pelje v {TOWN} cestno garažo, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Na servisiranje v {TOWN} cestno garažo
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Na servisiranje v {TOWN} cestno garažo, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Ni mogoče poslati vozila v garažo...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Ni mogoče poslati vozila v garažo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ni mogoče najti najbližje garaže
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Cestna vozila - kliknite na vozilo za informacije
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Dejanja trenutnega vozila - kliknite za ustavitev/zagon vozila
@@ -2967,9 +2967,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozil{P o i a ""}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Poimenuj cestno vozilo
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Ni mogoče poimenovati cestnega vozila ...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Poimenuj cestno vozilo
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Poimenuj cestno vozilo
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Ni mogoče poimenovati cestnega vozila ...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Poimenuj cestno vozilo
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prihod prvega avtobusa na postajo {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prihod prvega tovornjaka na postajo {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Meščani proslavljajo . . .{}Prvi potniški tramvaj je prispel na postajo {STATION}!
@@ -2977,16 +2977,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Prometna nesreča!{}Voznik umrl v plamenih po trku z vlakom.
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Prometna nesreča!{}{COMMA} mrt{P ev va vi vih} v plamenih ob trku z vlakom.
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ni moč obrniti vozil, sestavljenih iz večih enot
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Preimenuj
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Preimenuj cestno vozilo
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Preimenuj cestno vozilo
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Ni mogoče preimenovati cestnega vozila ...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Predelaj vozilo za prevoz druge vrste tovora
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Predelaj cestno vozilo
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Predelaj cestno vozilo za prevoz označenega tipa tovora
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Ni možna predelava cestnega vozila
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Izberi tip tovora, ki ga bo vozilo prevažalo
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Preimenuj
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Preimenuj cestno vozilo
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Preimenuj cestno vozilo
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Ni mogoče preimenovati cestnega vozila ...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Predelaj vozilo za prevoz druge vrste tovora
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Predelaj cestno vozilo
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Predelaj cestno vozilo za prevoz označenega tipa tovora
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Ni možna predelava cestnega vozila
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Izberi tip tovora, ki ga bo vozilo prevažalo
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Gradnja vodnih poti
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 4d81cb065..3de3dd3d5 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -1263,11 +1263,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nombre d
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cercano a otra industria
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Reformar tren para transportar otro tipo de carga
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Reformar tren
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Elegir tipo de carga para que el tren lleve
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Reformar tren para transportar mercancía resaltada
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}No se puede reformar tren...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Reformar tren para transportar otro tipo de carga
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Reformar tren
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Elegir tipo de carga para que el tren lleve
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Reformar tren para transportar mercancía resaltada
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}No se puede reformar tren...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambiar producción
 
 ############ network gui strings
@@ -2703,7 +2703,7 @@ STR_UNKNOWN_STATION                                             :estación desco
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Vacío
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} desde {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} desde {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} está esperando en el depósito
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} está esperando en el depósito
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nuevos Vehículos
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Tren demasiado largo
@@ -2738,7 +2738,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Cambiar
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Órdenes)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fin de pedidos - -
 STR_SERVICE                                                     :{BLACK}Servicio
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}No se puede construir vehículo...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}No se puede construir vehículo...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construido: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2866,7 +2866,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Hacia e
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Hacia el depósito de {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Dirigiendose al Depósito de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Servicio en el depósito de  {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}No se puede enviar vehículo al depósito...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}No se puede enviar vehículo al depósito...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}No se puede encontrar ruta al depósito
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Acción actual del vehículo - click aquí para detener/arrancar vehículo
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Ver órdenes del vehículo
@@ -2886,9 +2886,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehículo {P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Nombrar vehículo
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}No se puede nombrar vehículo...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Nombrar vehículo
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nombrar vehículo
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}No se puede nombrar vehículo...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Nombrar vehículo
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer autobús llega a {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer camión llega a {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Ciudadanos celebran . . .{}Llega primer tranvía de pasajeros a {STATION}!
@@ -2896,16 +2896,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}¡Accidente de tráfico!{}El conductor fallece en la explosión tras la colisión con el tren
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Accidente de tráfico!{}{COMMA} fallecidos en la explosión tras la colisión con el tren
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}No se puede girar vehículo de carretera...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Renombrar
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Renombrar tipo de vehículo
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Renombrar tipo de vehículo
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}No se puede renombrar tipo de vehículo....
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Reformar vehículo de carretera para transportar otro tipo de cargas
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Reformar vehículo de carretera
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Reformar vehículo de carretera para transportar la carga seleccionada
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}No se puede reformar vehículo de carretera...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona tipo de carga que transportará el vehículo de carretera
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Renombrar
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Renombrar tipo de vehículo
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renombrar tipo de vehículo
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}No se puede renombrar tipo de vehículo....
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Reformar vehículo de carretera para transportar otro tipo de cargas
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Reformar vehículo de carretera
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Reformar vehículo de carretera para transportar la carga seleccionada
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}No se puede reformar vehículo de carretera...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecciona tipo de carga que transportará el vehículo de carretera
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construcción de canales
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 4676e2f49..52d3cdeb3 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -1264,11 +1264,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... för nära en annan industri
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Anpassa tåg för att bära annan godstyp
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Anpassa tåg
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Välj godstyp för tåget att bära
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Anpassa tåg för att bära vald godstyp
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan ej anpassa tåg...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Anpassa tåg för att bära annan godstyp
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Anpassa tåg
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Välj godstyp för tåget att bära
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Anpassa tåg för att bära vald godstyp
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Kan ej anpassa tåg...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Ändra produktion
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :okänd station
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tom
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} från {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} från {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} väntar i depån
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} väntar i depån
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nytt fordon
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Tåg för långt
@@ -2738,7 +2738,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Byt till
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Order)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slut på order - -
 STR_SERVICE                                                     :{BLACK}Servning
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Kan inte bygga järnvägfordon...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Kan inte bygga järnvägfordon...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Värde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2867,7 +2867,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}På vä
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}På väg mot {TOWN}s vägdepå i {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Service vid {TOWN}s vägdepå
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Service vid {TOWN}s vägdepå i {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Kan inte skicka fordon till depå...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Kan inte skicka fordon till depå...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan inte hitta till lokal depå
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Vägfordon - klicka på fordon för information
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Nuvarande fordonsaktivitet - Klicka här till stoppa/starta fordon
@@ -2888,9 +2888,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} fordon{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Byt namn på vägfordon
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Kan inte byta namn på vägfordon...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Byt namn på vägfordon
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Byt namn på vägfordon
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Kan inte byta namn på vägfordon...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Byt namn på vägfordon
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Invånarna firar . . .{}Första bussen ankommer till {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Invånarna firar . . .{}Första lastbilen ankommer till {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Invånarna firar . . .{}Första passagerar-spårvagnen anländer på {STATION}!
@@ -2898,16 +2898,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Vägfordonskrash!{}förare dör i eldklot efter kollision med tåg
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Vägfordonskrash!{}{COMMA} dör i eldklot efter kollision med tåg
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Fordon kan inte vända...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Byt namn på
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Byt namn på vägfordon typ
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Byt namn på vägfordon typ
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Kan inte byta namn på vägfordon typ...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Anpassa vägfordon till att bära en annan sorts last
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Anpassa Vägfordon
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Anpassa vägfordon till att bära markerad last
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan inte anpassa vägfordon...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Välj lasttyp för fordon
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Byt namn på
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Byt namn på vägfordon typ
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Byt namn på vägfordon typ
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Kan inte byta namn på vägfordon typ...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Anpassa vägfordon till att bära en annan sorts last
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Anpassa Vägfordon
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Anpassa vägfordon till att bära markerad last
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kan inte anpassa vägfordon...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Välj lasttyp för fordon
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Farledskonstruktion
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 11eeab26d..192eb1c8e 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -1264,11 +1264,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}工業�
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...太接近另一個工業
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}改造列車以運輸不同的貨物種類
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}改造列車
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}選擇要運輸的貨物種類
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}改造列車以運輸選定的貨物種類
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}無法改造列車...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}改造列車以運輸不同的貨物種類
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}改造列車
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}選擇要運輸的貨物種類
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}改造列車以運輸選定的貨物種類
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}無法改造列車...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}修改產量
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :未知車站
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}空
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} 來自 {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} 來自 {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} 在車庫等待中
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} 在車庫等待中
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}購買新交通工具
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}列車太長
@@ -2738,7 +2738,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}切到�
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (指令)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - 指令結束 - -
 STR_SERVICE                                                     :{BLACK}維護
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}無法購買鐵道車輛...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}無法購買鐵道車輛...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   購於：{LTBLUE}{NUM}{BLACK} 價值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   價值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2868,7 +2868,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}正前�
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}正前往 {TOWN} 車庫，{VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}在 {TOWN} 車庫維護中
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}在 {TOWN} 車庫維護中，{VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}無法將車輛送至車庫...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}無法將車輛送至車庫...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}找不到附近的車庫
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}車輛 - 點選車輛檢視詳細資料
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}目前車輛動作 - 點選這裡可停止／起動車輛
@@ -2889,9 +2889,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}車輛 {NUM} 部 {STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}為車輛命名
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}無法為車輛命名...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}為車輛命名
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}為車輛命名
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}無法為車輛命名...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}為車輛命名
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛公車抵達 {STATION}！
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛貨車抵達 {STATION}！
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛載客電車抵達 {STATION}！
@@ -2899,16 +2899,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}車禍！{}駕駛在與列車對撞後罹難
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}車禍！{}車輛在與列車對撞後，造成 {COMMA} 人罹難
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}無法讓車輛轉向...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}更名
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}為車輛類型更名
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}為車輛類型更名
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}無法為車輛類型更名...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}改裝車輛以運送不同的貨物種類
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}改裝車輛
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}改裝車輛以運送指定的貨物種類
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}無法改裝車輛...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}選擇車輛要運送的貨物種類
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}更名
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}為車輛類型更名
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}為車輛類型更名
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}無法為車輛類型更名...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}改裝車輛以運送不同的貨物種類
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}改裝車輛
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}改裝車輛以運送指定的貨物種類
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}無法改裝車輛...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}選擇車輛要運送的貨物種類
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :興建水道
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 6a582a16b..f4c454ad9 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -1264,11 +1264,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Fabrika
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...başka bir fabrikaya çok yakın
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Treni başka bir kargo taşıması için modifiye et
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Modifiye
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Trenin taşıyacağı kargo türünü seçin
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Treni seçilen kargoyu taşıyacak şekilde modifiye et
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Modifiye edilemiyor...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Treni başka bir kargo taşıması için modifiye et
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Modifiye
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trenin taşıyacağı kargo türünü seçin
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Treni seçilen kargoyu taşıyacak şekilde modifiye et
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Modifiye edilemiyor...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Üretimi değiştir
 
 ############ network gui strings
@@ -2702,7 +2702,7 @@ STR_UNKNOWN_STATION                                             :bilinmeyen ista
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Boş
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} - {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} geldiği yer: {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} garajda bekliyor
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} garajda bekliyor
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Yeni Araç
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Tren çok uzun
@@ -2738,7 +2738,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Emir gö
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Talimatlar)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Talimatların Sonu - -
 STR_SERVICE                                                     :{BLACK}Bakım
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Tren satın alınamaz...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Tren satın alınamaz...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Tarih: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Değeri: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2866,7 +2866,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}{TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}{TOWN} Garajina gidiyor, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}{TOWN} Garajinda Bakıma Gir
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN} Garajinda Bakım, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Araç garaja gidemiyor...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Araç garaja gidemiyor...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Yerel garaj bulunamadı
 STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Arabalar - bilgi için arabaya tıklayın
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Aracın durumu - durdurmak/başlatmak için tıklayın
@@ -2887,9 +2887,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} araç{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Arabayı adlandır
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Araba adlandırılamıyor...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Arabayı adlandır
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Arabayı adlandır
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Araba adlandırılamıyor...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Arabayı adlandır
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}Şuraya ilk kez otobüs geldi: {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}Şuraya ilk kez kamyon geldi: {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}{STATION} istasyonuna ilk kez yolcu tramvayı geldi!
@@ -2897,16 +2897,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Trafik kazasi!{}Trenle çarpisan aracın soförü feci şekilde can verdi
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Trafik kazasi!{}{COMMA} kişi patlamadan kurtulamadı
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Birden fazla birimden oluşan araçlar çevrilemez
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}İsim
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Araç türünü yeniden adlandır
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Araç türünü yeniden adlandır
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Araç türü yeniden adlandırılamıyor...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Kamyonu başka türde kargo taşıyabilmesi için modifiye et
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Kamyonu modifiye et
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Kamyonu seçili kargoyu taşıyabilmesi için modifiye et
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kamyon modifiye edilemiyor...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kamyonun taşıyacağı kargo türünü seçin
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}İsim
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Araç türünü yeniden adlandır
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Araç türünü yeniden adlandır
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Araç türü yeniden adlandırılamıyor...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Kamyonu başka türde kargo taşıyabilmesi için modifiye et
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Kamyonu modifiye et
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Kamyonu seçili kargoyu taşıyabilmesi için modifiye et
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Kamyon modifiye edilemiyor...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Kamyonun taşıyacağı kargo türünü seçin
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Suyolu inşaatı
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 9acb9a64e..405b81150 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -1385,11 +1385,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Назв
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...дуже близько до іншої промисловості
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Переобладнати поїзд для перевезення іншого виду вантажу
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Переобладнати
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Виберіть вид вантажу для перевезення
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Переобладнати поїзд для перевезення вибраного виду вантажу
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Неможливо переобладнати поїзд...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Переобладнати поїзд для перевезення іншого виду вантажу
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Переобладнати
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Виберіть вид вантажу для перевезення
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Переобладнати поїзд для перевезення вибраного виду вантажу
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Неможливо переобладнати поїзд...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Змінити виробництво
 
 ############ network gui strings
@@ -2860,7 +2860,7 @@ STR_UNKNOWN_STATION                                             :невідом�
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}порожній
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} з {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} з {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}{VEHICLE} чакає в депо
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} чакає в депо
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Новий транспорт
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Поїзд дуже довгий
@@ -2895,7 +2895,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Пере
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Накази)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Кінець наказів - -
 STR_SERVICE                                                     :{BLACK}Техогляд
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Неможливо збудувати поїзд...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Неможливо збудувати поїзд...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Ціна: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3023,7 +3023,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Пря�
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Прямує до {TOWN} дорожного депо, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Техогляд в  {TOWN} дорожному депо
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Техогляд в  {TOWN} дорожному депо, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Неможливо направити авто в депо...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Неможливо направити авто в депо...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Неможливо знайти місцеве депо
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Показує, яку дію виконує авто - натисніть для руху/зупинки авто
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Показати накази авто
@@ -3043,9 +3043,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} транспорт{P "" и ів}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Назвати авто
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Неможливо назвати авто...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Назвати авто
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Назвати авто
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Неможливо назвати авто...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Назвати авто
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший автобус з'явився на {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Жителі святкують . . .{}Перша вантажівка з'явилася на {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший пасажирський трамвай прибув на {STATION}!
@@ -3053,16 +3053,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Аварія!{}Водій загинув при зіткненні авто з поїздом
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Аварія!{}{COMMA} загинуло при зіткненні авто з поїздом
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Неможливо розвернути машину...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Зміна назви
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Перейменувати тип авто
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Перейменувати тип авто
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Неможливо перейменувати тип авто...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Переобладнати авто для перевезення інших вантажів
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Переобладнати авто
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Переобладнати авто для перевезення вибраного вантажу
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Неможливо переобладнати авто
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Оберіть тип вантажу для перевезення
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Зміна назви
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Перейменувати тип авто
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Перейменувати тип авто
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Неможливо перейменувати тип авто...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Переобладнати авто для перевезення інших вантажів
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Переобладнати авто
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Переобладнати авто для перевезення вибраного вантажу
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Неможливо переобладнати авто
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Оберіть тип вантажу для перевезення
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Будівництво водних шляхів
diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt
index 5cfa5f8bf..69627c1ee 100644
--- a/src/lang/unfinished/greek.txt
+++ b/src/lang/unfinished/greek.txt
@@ -1245,11 +1245,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Ονόμ
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...πολύ κοντά σε άλλη βιομηχανία
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Αναπροσαρμογή τρένου για μεταφορά διαφορετικού φορτίου
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Αναπροσαρμογή τρένου
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Επιλογή τύπου φορτίου για να μεταφέρει το τρένο
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Διασκευή του τρένου ώστε να μεταφέρει το επιλεγμένο φορτίο
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Δεν γίνεται να αναπροσαρμοστεί το τρένο...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Αναπροσαρμογή τρένου για μεταφορά διαφορετικού φορτίου
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Αναπροσαρμογή τρένου
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Επιλογή τύπου φορτίου για να μεταφέρει το τρένο
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Διασκευή του τρένου ώστε να μεταφέρει το επιλεγμένο φορτίο
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Δεν γίνεται να αναπροσαρμοστεί το τρένο...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Αλλαγή παραγωγής
 
 ############ network gui strings
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index f8de01b18..9a8ddeaa2 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -1426,7 +1426,7 @@ STR_ORDERS_DELETE_BUTTON                                        :{BLACK}پاک �
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}برو به
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (دستورات)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - پایان دستورات - -
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}نمیشود قطار  ساخت ...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}نمیشود قطار  ساخت ...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   مدل: {LTBLUE}{NUM}{BLACK} قیمت: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}  قیمت: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -1492,15 +1492,15 @@ STR_BUILD_VEHICLE_ROAD_BUILD_VEHICLE_BUTTON                     :{BLACK}ساخت
 STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE                              :{WHITE}نمی شود ماشین ساخت...
 STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}نمیشود ماشین را فروخت...
 
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}نام گذاری ماشین
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}نام گذاری ماشین
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}شهروندان ورود اولین اتوبوس را به . . .{}{STATION} تبریک گفتند!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}شهروندان ورود اولین کامیون را به . . .{}{STATION} تبریک گفتند!
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}تصادف ماشین!{}راننده پس از تصادف با قطار در آتش سوخت
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}تصادف ماشین!{}راننده پس از تصادف با قطار{COMMA} در آتش سوخت
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}تغییر نام
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}تغییر نام انواع ماشین ها
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}تغییر نام انواع ماشین ها
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}نمی شود انواع ماشین ها را تغییر نام داد...
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}تغییر نام
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}تغییر نام انواع ماشین ها
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}تغییر نام انواع ماشین ها
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}نمی شود انواع ماشین ها را تغییر نام داد...
 
 
 ##id 0x9800
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index be61a749c..477eee8eb 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -1260,11 +1260,11 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Enwau di
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...rhy agos i ddiwydiant arall
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Ailffitio trên i gario llwyth o fath gwahanol
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Ailffitio trên
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Dewiswch fath o lwyth i'r trên ei gario
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Ailffitio'r trên i gario'r math o llwyth sydd wedi'i ddewis
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Methu ailffitio trên...
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Ailffitio trên i gario llwyth o fath gwahanol
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Ailffitio trên
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Dewiswch fath o lwyth i'r trên ei gario
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Ailffitio'r trên i gario'r math o llwyth sydd wedi'i ddewis
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Methu ailffitio trên...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Newid cynnyrch
 
 ############ network gui strings
@@ -2697,7 +2697,7 @@ STR_UNKNOWN_STATION                                             :gorsaf anhysbys
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Gwag
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} o {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO} o {STATION} (x{NUM})
-STR_VEHICLE_STATUS_WAITING_IN_DEPOT                             :{WHITE}Mae {VEHICLE} yn aros yn y depo
+STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}Mae {VEHICLE} yn aros yn y depo
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Cerbyd Newydd
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Mae'r Trên yn rhy hir
@@ -2732,7 +2732,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Newid i'
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Gorchmynion)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Diwedd Gorchmynion - -
 STR_SERVICE                                                     :{BLACK}Gwasanaeth
-STR_ERROR_CAN_T_BUILD_RAILROAD_VEHICLE                          :{WHITE}Methu adeiladu cerbyd rheilffordd...
+STR_ERROR_CAN_T_BUILD_TRAIN                                     :{WHITE}Methu adeiladu cerbyd rheilffordd...
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Adeiladwyd: {LTBLUE}{NUM}{BLACK} Gwerth: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Gwerth: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2860,7 +2860,7 @@ STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Mynd am
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Mynd am Ddepo Ffordd {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Mynd am wasanaeth Ddepo Ffordd {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Mynd am wasanaeth i Ddepo Ffordd {TOWN}, {VELOCITY}
-STR_ERROR_CAN_T_SEND_VEHICLE_TO_DEPOT                           :{WHITE}Methu gyrru cerbyd i'r depo...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Methu gyrru cerbyd i'r depo...
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Methu dod o hyd i'r depo lleol
 STR_VEHICLE_VIEW_ROAD_STATE_START_STOP_TOOLTIP                  :{BLACK}Gweithred gyfredol y cerbyd - cliciwch yma i gychwyn/stopio'r cerbyd
 STR_VEHICLE_VIEW_ROAD_ORDERS_TOOLTIP                            :{BLACK}Dangos gorchmynion cerbyd
@@ -2880,9 +2880,9 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} cerbyd{P "" au}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
-STR_QUERY_ROAD_RENAME                                           :{WHITE}Enwi cerbyd ffordd
-STR_ERROR_CAN_T_RENAME_ROAD                                     :{WHITE}Methu enwi cerbyd ffordd...
-STR_QUERY_RENAME_ROAD_CAPTION                                   :{BLACK}Enwi cerbyd ffordd
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Enwi cerbyd ffordd
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Methu enwi cerbyd ffordd...
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Enwi cerbyd ffordd
 STR_NEWS_FIRST_ROAD_BUS_ARRIVAL                                 :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{}Mae'r bws cyntaf wedi cyrraedd {STATION}!
 STR_NEWS_FIRST_ROAD_TRUCK_ARRIVAL                               :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{}Mae'r lori gyntaf wedi cyrraedd {STATION}!
 STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{} Mae'r tram teithwyr cyntaf wedi cyrraedd {STATION}!
@@ -2890,16 +2890,16 @@ STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT
 STR_NEWS_ROAD_CRASH_DRIVER                                      :{BLACK}{BIGFONT}Damwain Cerbyd Ffordd!{}Bu gyrrwr farw mewn damwain â thrên
 STR_NEWS_ROAD_CRASH                                             :{BLACK}{BIGFONT}Damwain Cerbyd Ffordd!{}Bu farw {COMMA} mewn damwain â thrên
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}ddim yn methu troi'r cerbyd...
-STR_BUILD_VEHICLE_ROAD_RENAME_BUTTON                            :{BLACK}Ailenwi
-STR_BUILD_VEHICLE_ROAD_RENAME_TOOLTIP                           :{BLACK}Ailenwi'r math cerbyd ffordd
-STR_QUERY_RENAME_ROAD_TYPE_CAPTION                              :{WHITE}Ailenwi'r math cerbyd ffordd
-STR_ERROR_CAN_T_RENAME_ROAD_TYPE                                :{WHITE}Methu ailenwi cerbyd ffordd...
-
-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Ailffitio cerbyd ffordd i gario llwyth o fath gwahanol
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Ailffitio cerbyd ffordd
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Ailffitio cerbyd ffordd i gario'r llwyth sydd wedi'i amlygu
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Methu ailffitio cerbyd ffordd...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Dewiswch y math o lwyth i'r cerbyd ffordd gario
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                    :{BLACK}Ailenwi
+STR_BUILD_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                   :{BLACK}Ailenwi'r math cerbyd ffordd
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Ailenwi'r math cerbyd ffordd
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Methu ailenwi cerbyd ffordd...
+
+STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Ailffitio cerbyd ffordd i gario llwyth o fath gwahanol
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Ailffitio cerbyd ffordd
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Ailffitio cerbyd ffordd i gario'r llwyth sydd wedi'i amlygu
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Methu ailffitio cerbyd ffordd...
+STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Dewiswch y math o lwyth i'r cerbyd ffordd gario
 
 ##id 0x9800
 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Adeiladu camlesi