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

1 files changed, 21 insertions, 21 deletions

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