(svn r16903) -Update from WebTranslator v3.0:

simplified_chinese - 2 changes by Gavin
danish - 5 changes by Bjarni
dutch - 1 changes by habell
finnish - 17 changes by jpx_
hungarian - 1 changes by alyr
italian - 1 changes by lorenzodv
korean - 1 changes by darkttd
russian - 15 changes by Lone_Wolf
serbian - 90 changes by BlueEyedFiend
welsh - 24 changes by welshdragon

1 files changed, 62 insertions, 37 deletions

diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index d0c099d14..8c36d3b57 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Ariannu diwydia
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Ariannu diwydiant newydd
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...gellir ei adeiladu'n unig mewn ardal o goedwigoedd glaw
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...gellir ei adeiladu'n unig mewn ardaloedd o anialwch
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  WEDI'I OEDI  *  *
@@ -855,6 +852,8 @@ STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Dewiswch
 STR_OPTIONS_BASE_GRF                                            :{BLACK}Set Raffeg Sylfaenol
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Dewiswch y set raffeg sylfaenol i'w defnyddio
+STR_OPTIONS_BASE_GRF_STATUS                                     :{RED}{10:NUM} ar goll/corrupted file{P "" iau}
+STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}gwybodaeth ychwanegol am y set sall graffeg
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Methodd yr Awtogadw
 
@@ -961,6 +960,7 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}CaniatĂ
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}Galluogi defnyddio mwy nag un o setiau injian NewGRF: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Nid yw hi'n bosib newid y gosodiadau pan mae cerbydau'n bodoli.
 
+STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE}Maes awyr ddim yn dibennu: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_WARN_LOST_TRAIN                              :{LTBLUE}Rhybuddio os yw'r trĂȘn ar goll: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ORDER_REVIEW                                 :{LTBLUE}Adolygu gorchmynion y cerbyd: {ORANGE}{STRING}
@@ -1194,7 +1194,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Dewiswch
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Golygu enw Pwynt Llwybr
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Does dim modd newid enw Pwynt Llwybr...
@@ -1775,11 +1774,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipi
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :TĆ· Tebot
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Cadwmigei
 
-STR_INDUSTRY_NAME                                               :{INDUSTRY}
-STR_TOWN_NAME                                                   :{TOWN}
-STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
-STR_STATION_NAME                                                :{STATION}
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Tirweddu
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Plannu coed
@@ -1834,6 +1828,12 @@ STR_CARGO_RATING_EXCELLENT                                      :Gwych
 STR_CARGO_RATING_OUTSTANDING                                    :Rhagorol
 ############ range for rating ends
 
+### station view strings
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Dangos pob trĂȘn sydd Ăą'r orsaf hon yn eu hamserlen
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Dangos pob cerbyd ffordd sydd Ăą'r orsaf hon yn eu hamserlen
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Dangos pob awyren sydd Ăą'r orsaf hon yn eu hamserlen
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Dangos pob llong sydd Ăą'r orsaf hon yn eu hamserlen
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}Nid yw {STATION} bellach yn derbyn {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}Nid yw {STATION} bellach yn derbyn {STRING} na {STRING}
@@ -2168,7 +2168,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Gwrthwynebus
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Cwmni {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Gwyneb Newydd
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Cynllun Lliw
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Cynllun Lliw:
@@ -2201,7 +2200,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Cyfanswm
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY}{COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graff Incwm
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graff Elw Gweithredu
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balans Banc
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Benthyciad
@@ -2713,7 +2711,6 @@ STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Cerbyd N
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Mae'r TrĂȘn yn rhy hir
 STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Gellir newid trenau yn unig pan fyddan nhw wedi stopio tu mewn i ddepo
-STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Tr{P "ĂȘn" au}
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Cerbydau Rheilffordd Newydd
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Cerbydau Rheilffordd Trydan Newydd
@@ -2771,7 +2768,6 @@ STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Methu do
 STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Methu cychwyn/stopio trĂȘn...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Bwlch rhwng gwasanaeth: {LTBLUE}{COMMA}days{BLACK}   Gwasanaeth diwethaf: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}bwlch rhwng gwasanaeth: {LTBLUE}{COMMA}%{BLACK}  Gwasanaeth diwethaf: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Trenau - cliciwch ar trĂȘn i gael gwybodaeth
 STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trenau - cliciwch ar y trĂȘn am wybodaeth, llusgwch gerbyd i'w ychwanegu neu i'w dynnu o'r trĂȘn
 STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Adeiladu cerbyd trĂȘn newydd
 STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Llusgwch gerbyd trĂȘn yma i'w werthu
@@ -2805,11 +2801,16 @@ STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}CĂŽst: {
 STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}CĂŽst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}, {CARGO}{}CĂŽst Rhedfa: {CURRENCY}/yr
 STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}CĂŽst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}{}Cost Rhedfa: {CURRENCY}/bl
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Oed: {LTBLUE}{STRING}{BLACK}   Cost Rhedfa: {LTBLUE}{CURRENCY}/bl.
+STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}cyflymder uchaf: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Pwys: {LTBLUE}{WEIGHT_S} {BLACK}PƔer: {LTBLUE}{POWER}{BLACK} Cyflym. Max: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Pwys: {LTBLUE}{WEIGHT_S} {BLACK}PƔer: {LTBLUE}{POWER}{BLACK} Cyflym. Max: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
 STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Profit this year: {LTBLUE}{CURRENCY} (last year: {CURRENCY})
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Dibynadwy: {LTBLUE}{COMMA}%  {BLACK}Toriadau es gwasanaeth olaf: {LTBLUE}{COMMA}
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Codi: {LTBLUE}{NUM}{BLACK} Pris: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Cynhwysedd: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING}
+STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Cynhwysedd: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
+STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Cynhwysedd: {LTBLUE}{CARGO}, {CARGO}{STRING}
+STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Torri lawr
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Wedi stopio
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Does dim modd gwneud i drĂȘn basio signal pan fo perygl...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Wedi crashio!
@@ -2819,6 +2820,8 @@ STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Methu en
 STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Enwi trĂȘn
 STR_NEWS_TRAIN_CRASH                                            :{BLACK}{BIGFONT}TrĂȘn wedi crashio!{}Bu {COMMA} farw yn y ddamwain
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Methu gwrthdroi cyfeiriad  trĂȘn...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}ddim yn medru reversio'r cerbyd...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Methu troi cerbydau sy'n meddu ar sawl uned
 STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Ailenwi math y cerbyd trĂȘn
 STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Methu ailenwi math y cerbyd trĂȘn...
 STR_CLEAR_TIME                                                  :{BLACK}Clirio Amser
@@ -2853,7 +2856,6 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Llenwch
 
 ##id 0x9000
 STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Cerbyd ffordd yn y ffordd
-STR_VEHICLE_LIST_ROADVEH_CAPTION                                :{WHITE}{STRING} - {COMMA} Cerbyd{P "" au} Ffordd
 STR_DEPOT_ROAD_CAPTION                                          :{WHITE}Depo Cerbydau Ffordd {TOWN}
 STR_DEPOT_ROAD_NEW_VEHICLES_BUTTON                              :{BLACK}Cerbyd Newydd
 STR_BUILD_VEHICLE_ROAD_CAPTION                                  :{WHITE}Cerbydau Ffordd Newydd
@@ -2869,7 +2871,6 @@ STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Mynd am
 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_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Methu dod o hyd i'r depo lleol
-STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Cerbydau Ffordd - cliciwch ar cerbyd am wybodaeth
 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
 STR_VEHICLE_VIEW_ROAD_LOCATION_TOOLTIP                          :{BLACK}Canoli'r brif olygfa ar leoliad y cerbyd
@@ -2897,7 +2898,7 @@ STR_NEWS_FIRST_ROAD_PASSENGER_TRAM_ARRIVAL                      :{BLACK}{BIGFONT
 STR_NEWS_FIRST_ROAD_CARGO_TRAM_ARRIVAL                          :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{} Mae'r tram nwyddau cyntaf wedi cyrraedd {STATION}!
 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_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Methu troi cerbydau sy'n meddu ar sawl uned
+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
@@ -2916,7 +2917,6 @@ STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Camlesi
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Methu adeiladu doc yma...
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Depo Llong {TOWN}
 STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Llong Newydd
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Llong{P "" au}
 STR_BUILD_VEHICLE_SHIP_CAPTION                                  :{WHITE}Llong  Newydd
 STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_BUTTON                     :{BLACK}Adeiladu Llong
 STR_CLONE_SHIP                                                  :{BLACK}Dyblygu Llong
@@ -2939,7 +2939,6 @@ STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Llongau
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Adeiladu llong newydd
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Llusgwch long yma i'w gwerthu
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Canoli'r brif olygfa ar leoliad depo'r llong
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Llongau - cliciwch ar long am wybodaeth
 STR_BUILD_VEHICLE_SHIP_LIST_TOOLTIP                             :{BLACK}Rhestr ddewis llongau - cliciwch ar long am wybodaeth
 STR_BUILD_VEHICLE_SHIP_BUILD_VEHICLE_TOOLTIP                    :{BLACK}Adeiladu'r llong sydd wedi'i hamlygu
 STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Gweithred y llong gyfredol - cliciwch yma i gychwyn/stopio llong
@@ -2981,7 +2980,6 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Bydd hyn
 STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Awyrennau Newydd
 STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Adeiladu Awyrennau
 STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Methu adeiladu awyren...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Awyrennau
 STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Methu gyrru awyren i awyrendy...
 STR_HEADING_FOR_HANGAR                                          :{ORANGE}Mynd am Awyrendy {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Mynd am Awyrendy {STATION}, {VELOCITY}
@@ -2995,7 +2993,6 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Rhaid i
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}methu gwerthu awyren...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Adeiladu Maes Awyr
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Adeiladu maes awyr
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Awyrennau - cliciwch ar awyren am wybodaeth
 STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Awyrennau - cliciwch ar awyren am wybodaeth
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Adeiladu awyren newydd
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Llusgwch awyren yma i'w gwerthu
@@ -3147,6 +3144,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Mae gan
 
 STR_NEWGRF_BUGGY                                                :{WHITE}Mae NewGRF '{0:STRING}' yn darparu gwybodaeth anghywir.
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Mae'r wybodaeth cargo/ailffitio ar gyfer '{1:ENGINE}' yn wahanol i'r rhestr brynu wedi'r adeiladu. Gall hyn beri i awtoadnewyddy/-ddisodli fethu ag ailfitio'n gywir.
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' creu lwp anorffen yn y production callback.
 
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Cafodd y gĂȘm ei gadw mewn fersiwn heb dram. Cafodd y tramiau eu dileu.
 
@@ -3159,6 +3157,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Newid i
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Newid i'r Ewro: {ORANGE}byth
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Rhagolwg: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Newid paramedrau arian cyfaddas
+STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Llehad yr swm o eich arian cyfred am un Punt (ÂŁ)
+STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}amlhau yr swm o eich arian cyfred am un Punt (ÂŁ)
+STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}newid y raddfa gyfnewid o eich arian cyfred i un Punt (ÂŁ)
+STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Creu yr ysgar i eich arian Cyfred
+STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Creu yr rhagddodiad i eich arian Cyfred
+STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Creu yr olddodiad i eich arian Cyfred
+STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Newid i'r Ewro yn gynnar.
+STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Newid i'r Ewro yn hwyrach
+STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Set yr blwyddyn i newid i'r Ewro
+STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Punt (ÂŁ) yn eich arian cyfaddas
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3166,11 +3174,16 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Trenau - cliciwch ar trĂȘn i gael gwybodaeth
+STR_VEHICLE_LIST_ROAD_TOOLTIP                                   :{BLACK}Cerbydau Ffordd - cliciwch ar cerbyd am wybodaeth
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Llongau - cliciwch ar long am wybodaeth
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Awyrennau - cliciwch ar awyren am wybodaeth
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Dangos pob trĂȘn sydd Ăą'r orsaf hon yn eu hamserlen
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Dangos pob cerbyd ffordd sydd Ăą'r orsaf hon yn eu hamserlen
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Dangos pob awyren sydd Ăą'r orsaf hon yn eu hamserlen
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Dangos pob llong sydd Ăą'r orsaf hon yn eu hamserlen
+STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Tr{P "ĂȘn" au}
+STR_VEHICLE_LIST_ROADVEH_CAPTION                                :{WHITE}{STRING} - {COMMA} Cerbyd{P "" au} Ffordd
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Llong{P "" au}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Awyrennau
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Rhestr wedi'i rhannu {COMMA} Cerbyd{P "" au}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Dangos pob cerbydau sy'n rhannu'r amserlen hon
@@ -3194,7 +3207,6 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}Awtoddis
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Awtoddisodli pob llong yn y depo
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Awtoddisodli pob awyren yn yr awyrendy
 
-
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Disodli {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Dechrau Disodli Cerbydau
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Dechrau Disodli Cerbydau
@@ -3257,6 +3269,7 @@ STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Dibynadw
 STR_PURCHASE_INFO_COST                                          :{BLACK}CĂŽst: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Pwysau: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}CĂŽst: {GOLD}{CURRENCY}{BLACK} Cyflymder: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Gallu cludo: {GOLD}{CARGO}, {CARGO}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Pwered Wagons: {GOLD}+{POWER}{BLACK} Pwysau: {GOLD}+{WEIGHT_S}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Modd ei ailffitio i: {GOLD}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Pob math o lwyth
@@ -3359,17 +3372,6 @@ STR_MEASURE_AREA                                                :{BLACK}Ardal: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Hyd: {NUM}{}Gwahaniaeth uchder: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Ardal: {NUM} x {NUM}{}Gwahaniaeth uchder: {NUM} m
 
-############ Date formatting
-STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
-STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
-STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
-STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
-
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
-########
-
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Credydau Trosi: {LTBLUE}{CURRENCY}
 STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...mae'r ffordd hon yn eiddo i dref
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...mae'r ffordd yn gorwedd yn y cyfeiriad anghywir
@@ -3394,7 +3396,6 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_FORMAT_GROUP_NAME                                           :Grw^p {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Pob trĂȘn
 STR_GROUP_ALL_ROADS                                             :Pob cerbyd ffordd
@@ -3423,12 +3424,35 @@ STR_GROUP_DELETE_TIP                                            :{BLACK}Dileu'r
 STR_GROUP_RENAME_TIP                                            :{BLACK}Ailenwi'r grw^p a ddewiswyd
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Cliciwch i amddiffyn y grw^p rhag awtoddisodli gĂȘm-eang
 
+#### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
+STR_STATION_NAME                                                :{STATION}
+STR_TOWN_NAME                                                   :{TOWN}
 STR_VEHICLE_NAME                                                :{VEHICLE}
+STR_WAYPOINT_NAME                                               :{WAYPOINT}
+
+STR_JUST_COMMA                                                  :{COMMA}
+STR_JUST_INT                                                    :{NUM}
+STR_JUST_DATE_TINY                                              :{DATE_TINY}
+STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
+STR_JUST_DATE_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
+
+STR_FORMAT_COMPANY_NUM                                          :(Cwmni {COMMA})
+STR_FORMAT_GROUP_NAME                                           :Grw^p {COMMA}
+STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
 
 STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Rhaid i'r enw fod yn unigryw
 
@@ -3545,6 +3569,7 @@ STR_AI_RANDOM_AI                                                :AI ar hap
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Paramedrau AI
 STR_AI_AUTHOR                                                   :{BLACK}Awdur: {STRING}
 STR_AI_VERSION                                                  :{BLACK}Fersiwn: {NUM}
+STR_AI_URL                                                      :{BLACK}URL: {STRING}
 STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Mae un o'r AIau a oedd yn rhedeg wedi crashio. Gyrrwch adroddiad am hyn i awdur yr AI ynghyd ĂĄ llun sgrin o'r Ffenestr Ddadfygio.
 ########