summaryrefslogtreecommitdiff
path: root/src/lang
diff options
context:
space:
mode:
authortranslators <translators@openttd.org>2011-09-13 17:45:46 +0000
committertranslators <translators@openttd.org>2011-09-13 17:45:46 +0000
commit8959824f010bb2c146b0f5c69ccfbe1a620eeec5 (patch)
tree6f5206aa910cc3c950ec0804d027781407e72d73 /src/lang
parent640115fc9225ee304c26cd80dcdcef93c350e494 (diff)
downloadopenttd-8959824f010bb2c146b0f5c69ccfbe1a620eeec5.tar.xz
(svn r22930) -Update from WebTranslator v3.0:
estonian - 32 changes by notAbot hungarian - 6 changes by IPG luxembourgish - 17 changes by Phreeze slovak - 67 changes by klingacik turkish - 4 changes by niw3 welsh - 142 changes by kazzie
Diffstat (limited to 'src/lang')
-rw-r--r--src/lang/estonian.txt46
-rw-r--r--src/lang/hungarian.txt4
-rw-r--r--src/lang/luxembourgish.txt26
-rw-r--r--src/lang/slovak.txt134
-rw-r--r--src/lang/turkish.txt8
-rw-r--r--src/lang/welsh.txt250
6 files changed, 286 insertions, 182 deletions
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index fcfc28fbe..d8b746424 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -395,6 +395,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Paigalda
############ range for SE file menu starts
STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO :Salvesta kaart
STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO :Laadi kaart
+STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP :Salvesta kõrguskaart
STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP :Lae kõrguskaart
STR_SCENEDIT_FILE_MENU_QUIT_EDITOR :Lahku redaktorist
STR_SCENEDIT_FILE_MENU_SEPARATOR :
@@ -412,6 +413,7 @@ STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED :Näidatavad lin
STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED :Näidatavad jaamanimed
STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :Näidatavad meldepunktid
STR_SETTINGS_MENU_SIGNS_DISPLAYED :Näidatavad sildid
+STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS :Konkurentide nimesid ja silte kuvatakse
STR_SETTINGS_MENU_FULL_ANIMATION :Täielik animeerimine
STR_SETTINGS_MENU_FULL_DETAIL :Kõik täpsustused
STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Läbipaistvad hooned
@@ -504,6 +506,7 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Suumitud ekraan
STR_ABOUT_MENU_GIANT_SCREENSHOT :Terve kaardi ekraanitõmmis
STR_ABOUT_MENU_ABOUT_OPENTTD :'OpenTTD' kohta
STR_ABOUT_MENU_SPRITE_ALIGNER :Sprite aligner
+STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Kontuuride kuvamine
############ range ends here
############ range for days starts (also used for the place in the highscore window)
@@ -915,19 +918,19 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valuuta
STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Valuuta valimine
############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP :Naelad (£)
-STR_GAME_OPTIONS_CURRENCY_USD :Dollarid ($)
-STR_GAME_OPTIONS_CURRENCY_EUR :Euro (€)
-STR_GAME_OPTIONS_CURRENCY_JPY :Jeen (¥)
+STR_GAME_OPTIONS_CURRENCY_GBP :Suurbritannia nael (GBP)
+STR_GAME_OPTIONS_CURRENCY_USD :USA dollar (USD)
+STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_JPY :Jaapani jeen (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Austria ðilling (ATS)
STR_GAME_OPTIONS_CURRENCY_BEF :Belgia frank (BEF)
STR_GAME_OPTIONS_CURRENCY_CHF :Sveitði frank (CHF)
STR_GAME_OPTIONS_CURRENCY_CZK :Tðehhi kroon (CZK)
STR_GAME_OPTIONS_CURRENCY_DEM :Saksamargad (DEM)
STR_GAME_OPTIONS_CURRENCY_DKK :Taani kroon (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP :Peseeta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP :Hispaania peseeta (ESP)
STR_GAME_OPTIONS_CURRENCY_FIM :Soome mark (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF :Frank (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF :Prantsuse frank (FRF)
STR_GAME_OPTIONS_CURRENCY_GRD :Kreeka drahm (GRD)
STR_GAME_OPTIONS_CURRENCY_HUF :Ungari Forint (HUF)
STR_GAME_OPTIONS_CURRENCY_ISK :Islandi kroon (ISK)
@@ -1113,6 +1116,11 @@ STR_SEA_LEVEL_HIGH :Kõrge
STR_SEA_LEVEL_CUSTOM :Kohandatud
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Kohandatud ({NUM}%)
+STR_RIVERS_NONE :Mitte ühtegi
+STR_RIVERS_FEW :Vähe
+STR_RIVERS_MODERATE :Keskmiselt
+STR_RIVERS_LOT :Palju
+
STR_DISASTER_NONE :Puudub
STR_DISASTER_REDUCED :Vähendatud
STR_DISASTER_NORMAL :Harilik
@@ -1450,6 +1458,8 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Otsi all
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Näita tehismõistuse seadeid
STR_INTRO_TOOLTIP_QUIT :{BLACK}Välju 'OpenTTD'st
+STR_INTRO_TRANSLATION :{BLACK}Sellel tõlkel on puudu {NUM} string{P "" i}. Palun aita teha OpenTTD veel paremaks ning registreeru tõlkijaks. Täpsem info asub failis readme.txt.
+
# Quit window
STR_QUIT_CAPTION :{WHITE}Mängust väljumine
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Kas soovite OpenTTD sulgeda ja minna tagasi süsteemi {STRING}?
@@ -2335,6 +2345,7 @@ STR_SAVELOAD_LOAD_CAPTION :{WHITE}Laadi m
STR_SAVELOAD_SAVE_SCENARIO :{WHITE}Salvesta stsenaarium
STR_SAVELOAD_LOAD_SCENARIO :{WHITE}Laadi stsenaariumit
STR_SAVELOAD_LOAD_HEIGHTMAP :{WHITE}Laadi kõrguskaart
+STR_SAVELOAD_SAVE_HEIGHTMAP :{WHITE}Salvesta kõrguskaart
STR_SAVELOAD_HOME_BUTTON :{BLACK}Vajuta siia, et minna praegusesse vaikimisi valitud salvestamise/laadimise kausta
STR_SAVELOAD_BYTES_FREE :{BLACK}{BYTES} vaba
STR_SAVELOAD_LIST_TOOLTIP :{BLACK}Nimekiri ketastest, kataloogidest ja salvestatud mängudest
@@ -2370,6 +2381,7 @@ STR_MAPGEN_LAND_GENERATOR :{BLACK}Maa gene
STR_MAPGEN_TREE_PLACER :{BLACK}Puude algoritm:
STR_MAPGEN_TERRAIN_TYPE :{BLACK}Maapinna tüüp:
STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Merepinna tase:
+STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Jõed:
STR_MAPGEN_SMOOTHNESS :{BLACK}Tasapinnalisus:
STR_MAPGEN_VARIETY :{BLACK}Varieeruvuse jaotamine:
STR_MAPGEN_GENERATE :{WHITE}Tekita
@@ -2414,6 +2426,7 @@ STR_GENERATION_ABORT_MESSAGE :{YELLOW}Kas sa
STR_GENERATION_PROGRESS :{WHITE}{NUM}% valmis
STR_GENERATION_PROGRESS_NUM :{BLACK}{NUM} / {NUM}
STR_GENERATION_WORLD_GENERATION :{BLACK}Maailma genereerimine
+STR_GENERATION_RIVER_GENERATION :{BLACK}Jõgede genereerimine
STR_GENERATION_TREE_GENERATION :{BLACK}Puude genereerimine
STR_GENERATION_OBJECT_GENERATION :{BLACK}Liigutamatu tekitamine
STR_GENERATION_CLEARING_TILES :{BLACK}Mägise ja kivise maaala tegemine
@@ -2530,6 +2543,7 @@ STR_NEWGRF_ERROR_READ_BOUNDS :Loeti pseudo-sp
STR_NEWGRF_ERROR_MISSING_SPRITES :{WHITE}Hetkel kasutatavast alus graafikapaketist puuduvad mõned spraidid.{}Palun uuenda alus graafikapaketti
STR_NEWGRF_ERROR_GRM_FAILED :Soovitud GRF ressurss ei ole saadaval
STR_NEWGRF_ERROR_FORCEFULLY_DISABLED :{2:STRING} blokeeriti {4:STRING} poolt
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT :Vigane/tundmatu spriidi asetuse formaat
# NewGRF related 'general' warnings
STR_NEWGRF_POPUP_CAUTION_CAPTION :{WHITE}Ettevaatust!
@@ -2566,6 +2580,12 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} <vale v
STR_NEWGRF_INVALID_ENGINE :<sobimatu mootorimudel>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<vigane tööstus>
+# NewGRF scanning window
+STR_NEWGRF_SCAN_CAPTION :{WHITE}NewGRF-ide skanneerimine
+STR_NEWGRF_SCAN_MESSAGE :{BLACK}NewGRF-de skanneerimine. Olenevalt failide arvust võib selleks kuluda mõni aeg...
+STR_NEWGRF_SCAN_STATUS :{BLACK}Skanneeritud {NUM} NewGRF{P "" i} {NUM} NewGRF-ist
+STR_NEWGRF_SCAN_ARCHIVES :Arhiivide otsimine
+
# Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Siltide nimekiri - {COMMA} Silt{P "" i}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Tõstutundlik
@@ -2873,6 +2893,8 @@ STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Uus lennuk
STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Hind: {GOLD}{CURRENCY}{BLACK} Tühimass: {GOLD}{WEIGHT_S}
STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Tippkiirus: {GOLD}{VELOCITY}{BLACK} Võimsus: {GOLD}{POWER}
STR_PURCHASE_INFO_SPEED :{BLACK}Tippkiirus: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_SPEED_OCEAN :{BLACK}Kiirus ookeanil: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_SPEED_CANAL :{BLACK}Kiirus kanalil/jõel: {GOLD}{VELOCITY}
STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Käituskulud: {GOLD}{CURRENCY}/aastas
STR_PURCHASE_INFO_CAPACITY :{BLACK}Kandevõime: {GOLD}{CARGO} {STRING}
STR_PURCHASE_INFO_REFITTABLE :(ümberseadistatav)
@@ -3233,12 +3255,15 @@ STR_ORDER_DROP_HALT_DEPOT :Peatu
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Jäta see käsk vahele, kui hooldust ei vajata
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Sõiduki andmed, millel sihtpunkti vahetamine põhineb
+
+# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Koorem prontsentides
STR_ORDER_CONDITIONAL_RELIABILITY :Tehnoseisund
STR_ORDER_CONDITIONAL_MAX_SPEED :Tippkiirus
-STR_ORDER_CONDITIONAL_AGE :Sõiduki vanus (aastates)
+STR_ORDER_CONDITIONAL_AGE :Vanus (aastates)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Vajab hooldust
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Alati
+STR_ORDER_CONDITIONAL_REMAINING_LIFETIME :Allesjäänud eluaeg (aastates)
STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP :{BLACK}Kuidas sõiduki andmeid antud väärtusega võrreldakse
STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS :on võrdne
@@ -3484,6 +3509,8 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... mida
STR_ERROR_BMPMAP :{WHITE}Ei suuda laadida maastikku BMP failist...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... ei suutnud muuta pildi tüüpi
+STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... pilt on liiga suur
+
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Skaala hoiatus
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Kaardi suuruse liigne muutmine pole soovitatav. Jätka?
@@ -3578,6 +3605,8 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}... saab
STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS :{WHITE}... saab ainult madalatele aladele ehitada
STR_ERROR_CAN_ONLY_BE_POSITIONED :{WHITE}... saab ainult ehitada kaardi serva
STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}... metsa saab istutada ainult lumepiirist kõrgemale
+STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE :{WHITE}... saab ehitada ainult ülespoole lumepiiri
+STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE :{WHITE}... saab ehitada ainult allapoole lumepiiri
# Station construction related errors
STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Siia ei saa raudteejaama ehitada...
@@ -3699,6 +3728,9 @@ STR_ERROR_CAN_T_BUILD_LOCKS :{WHITE}Siia ei
STR_ERROR_CAN_T_PLACE_RIVERS :{WHITE}Jõgesid ei saa siia teha...
STR_ERROR_MUST_BE_BUILT_ON_WATER :{WHITE}... peab ehitama vette
STR_ERROR_CAN_T_BUILD_ON_WATER :{WHITE}... vette ei saa ehitada
+STR_ERROR_CAN_T_BUILD_ON_SEA :{WHITE}... ei saa ehitada avamerele
+STR_ERROR_CAN_T_BUILD_ON_CANAL :{WHITE}... ei saa ehitada kanali peale
+STR_ERROR_CAN_T_BUILD_ON_RIVER :{WHITE}... ei saa ehitada jõe peale
STR_ERROR_MUST_DEMOLISH_CANAL_FIRST :{WHITE}Kanal tuleb enne lammutada
STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE :{WHITE}Siia ei saa veejuhet ehitada...
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 601518626..67299a661 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -3305,8 +3305,8 @@ STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP :{BLACK}Fejlett
STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP :{BLACK}Megmutatja az összes járművet, amik megosztják ezt a menetrendet
# String parts to build the order string
-STR_ORDER_GO_TO_WAYPOINT :Menj át a(z) {WAYPOINT}
-STR_ORDER_GO_NON_STOP_TO_WAYPOINT :Megállás nélkül menj át a(z) {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT :Menj át {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT :Megállás nélkül menj át {WAYPOINT}
STR_ORDER_SERVICE_AT :Javításra menj
STR_ORDER_SERVICE_NON_STOP_AT :Javításra megállás nélkül menj
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 58ec1df84..f144d2b7b 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -1059,6 +1059,11 @@ STR_SEA_LEVEL_HIGH :Vill
STR_SEA_LEVEL_CUSTOM :Eegen
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Eegen ({NUM}%)
+STR_RIVERS_NONE :Keng
+STR_RIVERS_FEW :Wéineg
+STR_RIVERS_MODERATE :Mëttel
+STR_RIVERS_LOT :Vill
+
STR_DISASTER_NONE :Keng
STR_DISASTER_REDUCED :Manner
STR_DISASTER_NORMAL :Normal
@@ -1113,7 +1118,7 @@ STR_CONFIG_SETTING_TRAIN_LENGTH :{LTBLUE}Maximal
STR_CONFIG_SETTING_SMOKE_AMOUNT :{LTBLUE}Unzuel vun Gefiererdamp/partikel: {ORANGE}{STRING}
STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL :{LTBLUE}Zuchbeschleunegung: {ORANGE}{STRING}
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Stroossengefier Beschleunigungsmodell: {ORANGE}{STRING}
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Neigungsstärkt fir Zich{ORANGE}{STRING}%
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Neigungsstärkt fir Zich: {ORANGE}{STRING}%
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Steigung fir Stroossengefierer {ORANGE}{STRING}%
STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Verbidd Zich an Schëffer fir 90 Grad Kéieren ze maachen: {ORANGE}{STRING}
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Erlaabt Statiounen zesummen ze setzen och wann se net direkt uneneen leien: {ORANGE}{STRING}
@@ -1396,6 +1401,8 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Check op
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}KI Astellungen uweisen
STR_INTRO_TOOLTIP_QUIT :{BLACK}Aus 'OpenTTD' eraus goen
+STR_INTRO_TRANSLATION :{BLACK}Des Iwwersetzung huet {NUM} String{P "" s}. Hëlleft OpenTTD besser ze man andem der ierch als Iwwersetzer mellt!. Liest readme.txt fir d'Detailer.
+
# Quit window
STR_QUIT_CAPTION :{WHITE}Eraus
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Sidd der sécher dass dir aus dem OpenTTD eraus wëllt , an an den {STRING} zréck?
@@ -2317,6 +2324,7 @@ STR_MAPGEN_LAND_GENERATOR :{BLACK}Landgene
STR_MAPGEN_TREE_PLACER :{BLACK}Baam Algorithmus:
STR_MAPGEN_TERRAIN_TYPE :{BLACK}Terrain Typ:
STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Mieresspigel:
+STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Flëss:
STR_MAPGEN_SMOOTHNESS :{BLACK}Mëllt:
STR_MAPGEN_VARIETY :{BLACK}Vielfaltverdeelung:
STR_MAPGEN_GENERATE :{WHITE}Generéiren
@@ -2361,6 +2369,7 @@ STR_GENERATION_ABORT_MESSAGE :{YELLOW}Wëllt
STR_GENERATION_PROGRESS :{WHITE}{NUM}% komplett
STR_GENERATION_PROGRESS_NUM :{BLACK}{NUM} / {NUM}
STR_GENERATION_WORLD_GENERATION :{BLACK}Welt Generatioun
+STR_GENERATION_RIVER_GENERATION :{BLACK}Generéiren vun Flëss
STR_GENERATION_TREE_GENERATION :{BLACK}Baam Generatioun
STR_GENERATION_OBJECT_GENERATION :{BLACK}Unbewegbar Generatioun
STR_GENERATION_CLEARING_TILES :{BLACK}Generatioun vun knubblegen an stengegen Land
@@ -2514,6 +2523,12 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} vun <in
STR_NEWGRF_INVALID_ENGINE :<invaliden Gefier-Modell>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<invalid Industrie>
+# NewGRF scanning window
+STR_NEWGRF_SCAN_CAPTION :{WHITE}Scannen NewGRFen
+STR_NEWGRF_SCAN_MESSAGE :{BLACK}Scannen NewGRFen. Dëst kann eng Weil dauern, je no Emfang ...
+STR_NEWGRF_SCAN_STATUS :{BLACK}{NUM} NewGRF{P "" en} gescanned vun ongeféier {NUM} NewGRF{P "" en}
+STR_NEWGRF_SCAN_ARCHIVES :Archiver scannen
+
# Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Schëlderlëscht - {COMMA} Schëld{P "" er}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Zoutreffenden Fall
@@ -2821,6 +2836,8 @@ STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Neien Fliger
STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Käschten: {GOLD}{CURRENCY}{BLACK} Gewiicht: {GOLD}{WEIGHT_S}
STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Geschw.: {GOLD}{VELOCITY}{BLACK} Kraaft: {GOLD}{POWER}
STR_PURCHASE_INFO_SPEED :{BLACK}Geschw.: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_SPEED_OCEAN :{BLACK}Geschwindegkeet um Ozean: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_SPEED_CANAL :{BLACK}Geschwindegkeet um Kanal/Floss: {GOLD}{VELOCITY}
STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Betriibskäschtent: {GOLD}{CURRENCY}/Jr
STR_PURCHASE_INFO_CAPACITY :{BLACK}Kapazitéit: {GOLD}{CARGO} {STRING}
STR_PURCHASE_INFO_REFITTABLE :(ëmbaubar)
@@ -3181,12 +3198,15 @@ STR_ORDER_DROP_HALT_DEPOT :Stop
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Iwwersprang dësen Optrag wann keng Revisioun néideg ass
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Gefiertsdaten als Basis fir den Optragssprong
+
+# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Prozent gelueden
STR_ORDER_CONDITIONAL_RELIABILITY :Zouverlässegkeet
STR_ORDER_CONDITIONAL_MAX_SPEED :Maximal Geschwindegkeet
-STR_ORDER_CONDITIONAL_AGE :Gefiertalter (Joer)
+STR_ORDER_CONDITIONAL_AGE :Alter (Joer)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Brauch eng Revisioun
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Ëmmer
+STR_ORDER_CONDITIONAL_REMAINING_LIFETIME :Reschtlaafzäit (Joer)
STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP :{BLACK}Wéi Gefiertsdaten verglach sollen ginn
STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS :ass gläich
@@ -3432,6 +3452,8 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... eppe
STR_ERROR_BMPMAP :{WHITE}Kann d'Landschaft net aus der BMP lueden...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... konnt den Bildtyp net konvertéieren
+STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... Bild ass ze grouss
+
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Scaléirungswarnung
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Quellenkaart zevill an der Gréisst änneren ass net ugeroden. Weiderman ?
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 4a63ffd87..69a501a8d 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -45,7 +45,7 @@ STR_CARGO_PLURAL_GRAIN :Obilie
STR_CARGO_PLURAL_GRAIN.g :obilia
STR_CARGO_PLURAL_WOOD :Drevo
STR_CARGO_PLURAL_WOOD.g :dreva
-STR_CARGO_PLURAL_IRON_ORE :Železnú rudu
+STR_CARGO_PLURAL_IRON_ORE :{G=z}Železná ruda
STR_CARGO_PLURAL_IRON_ORE.g :železnej rudy
STR_CARGO_PLURAL_STEEL :Oceľ
STR_CARGO_PLURAL_STEEL.g :ocele
@@ -138,23 +138,23 @@ STR_CARGO_SINGULAR_RUBBER :Kaucuk
STR_CARGO_SINGULAR_RUBBER.g :kaucuku
STR_CARGO_SINGULAR_SUGAR :Cukor
STR_CARGO_SINGULAR_SUGAR.g :cukru
-STR_CARGO_SINGULAR_TOY :Hracky
+STR_CARGO_SINGULAR_TOY :Hračka
STR_CARGO_SINGULAR_TOY.g :hraciek
-STR_CARGO_SINGULAR_CANDY :Cukriky
+STR_CARGO_SINGULAR_CANDY :Cukrík
STR_CARGO_SINGULAR_CANDY.g :cukrikov
STR_CARGO_SINGULAR_COLA :Kofola
STR_CARGO_SINGULAR_COLA.g :kofoly
STR_CARGO_SINGULAR_COTTON_CANDY :Cukrova vata
STR_CARGO_SINGULAR_COTTON_CANDY.g :cukrovej vaty
-STR_CARGO_SINGULAR_BUBBLE :Bubliny
+STR_CARGO_SINGULAR_BUBBLE :Bublina
STR_CARGO_SINGULAR_BUBBLE.g :bublin
STR_CARGO_SINGULAR_TOFFEE :Karamel
STR_CARGO_SINGULAR_TOFFEE.g :karamelu
-STR_CARGO_SINGULAR_BATTERY :Baterie
+STR_CARGO_SINGULAR_BATTERY :Batéria
STR_CARGO_SINGULAR_BATTERY.g :baterii
-STR_CARGO_SINGULAR_PLASTIC :Zuvacky
+STR_CARGO_SINGULAR_PLASTIC :Žuvacka
STR_CARGO_SINGULAR_PLASTIC.g :zuvaciek
-STR_CARGO_SINGULAR_FIZZY_DRINK :Sumienka
+STR_CARGO_SINGULAR_FIZZY_DRINK :Šumienka
STR_CARGO_SINGULAR_FIZZY_DRINK.g :sumienky
# Quantity of cargo
@@ -188,8 +188,8 @@ STR_QUANTITY_CANDYFLOSS :{WEIGHT} cukrov
STR_QUANTITY_BUBBLES :{COMMA} bublin{P a y ""}
STR_QUANTITY_TOFFEE :{WEIGHT} karamelu
STR_QUANTITY_BATTERIES :{COMMA} bateri{P a e i}
-STR_QUANTITY_PLASTIC :{VOLUME} zuvacka
-STR_QUANTITY_FIZZY_DRINKS :{COMMA} sumien{P ka ky ok}
+STR_QUANTITY_PLASTIC :{VOLUME} zuvačiek
+STR_QUANTITY_FIZZY_DRINKS :{COMMA} šumien{P ka ky ok}
STR_QUANTITY_N_A :Nie je
# Two letter abbreviation of cargo name
@@ -299,7 +299,7 @@ STR_TOOLTIP_STICKY :{BLACK}Zamknú
STR_TOOLTIP_RESIZE :{BLACK}Uchop a ťahaj pre zmenu veľkosti okna
STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Prepnúť veľkosť okna
STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST :{BLACK}Navigacná lišta
-STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST :{BLACK}Navigacna lista - posuva vypis dolava/doprava
+STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST :{BLACK}Posuvná lišta - posúva zoznam doľava/doprava
STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}Demolácia budov atď. na rovný terén. CTRL označí oblasť diagonálne. Shift zobrazí odhad nákladov
# Query window
@@ -361,7 +361,7 @@ STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Uložiť
STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Zobraziť mapu
STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY :{BLACK}Zobraziť zoznam miest
STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES :{BLACK}Zobraziť dotácie
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS :{BLACK}Zoznam staníc spoločnosti
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS :{BLACK}Zoznam staníc spoločností
STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES :{BLACK}Finančné informácie o spoločnosti
STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL :{BLACK}Informácie o spoločnosti
STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Grafy
@@ -1332,7 +1332,7 @@ STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES :{LTBLUE}Zakáza
STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :{LTBLUE}Zakázať lietadlá pre počítač: {ORANGE}{STRING}
STR_CONFIG_SETTING_AI_BUILDS_SHIPS :{LTBLUE}Zakázať lode pre počítač: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :{LTBLUE}Povoliť AI v hre viacerých hráčov (experimentálne): {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :{LTBLUE}Povoliť AI-ov v hre viacerých hráčov: {ORANGE}{STRING}
STR_CONFIG_SETTING_AI_MAX_OPCODES :{LTBLUE}#opcodes pred AI sú suspendované: {ORANGE}{STRING}
STR_CONFIG_SETTING_SERVINT_ISPERCENT :{LTBLUE}Servisné intervaly v percentách: {ORANGE}{STRING}
@@ -1605,12 +1605,12 @@ STR_FACE_EARRING :Náušnica:
STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Zmenit kravatu alebo náušnicu
# Network server list
-STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Hra pre viac hrácov
+STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Hra pre viac hráčov
STR_NETWORK_SERVER_LIST_CONNECTION :{BLACK}Pripojenie:
STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP :{BLACK}Vyber si medzi hrou na internete alebo na lokalnej sieti
STR_NETWORK_SERVER_LIST_LAN :LAN
STR_NETWORK_SERVER_LIST_INTERNET :Internet
-STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Meno hraca:
+STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Meno hráča:
STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Toto je meno podla ktoreho vas ostatny identifikuju
STR_NETWORK_SERVER_LIST_GAME_NAME :{BLACK}Názov
@@ -2900,7 +2900,7 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION :Nove automobily
STR_BUY_VEHICLE_SHIP_CAPTION :Nove lode
STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Nove Lietadlo
-STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{WEIGHT_S}
+STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnosť: {GOLD}{WEIGHT_S}
STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Rýchlosť: {GOLD}{VELOCITY}{BLACK} Výkon: {GOLD}{POWER}
STR_PURCHASE_INFO_SPEED :{BLACK}Rýchlosť: {GOLD}{VELOCITY}
STR_PURCHASE_INFO_SPEED_OCEAN :{BLACK}Rýchlosť na oceáne: {GOLD}{VELOCITY}
@@ -2912,9 +2912,9 @@ STR_PURCHASE_INFO_DESIGNED_LIFE :{BLACK}Vyrobene
STR_PURCHASE_INFO_RELIABILITY :{BLACK}Max. spolahlivost: {GOLD}{COMMA}%
STR_PURCHASE_INFO_COST :{BLACK}Cena: {GOLD}{CURRENCY}
STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Hmotnosť: {GOLD}{WEIGHT_S} ({WEIGHT_S})
-STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Rychlost: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_COST_SPEED :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Rýchlosť: {GOLD}{VELOCITY}
STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kapacita: {GOLD}{CARGO}, {CARGO}
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Pohanane vagony: {GOLD}+{POWER}{BLACK} Hmotnost: {GOLD}+{WEIGHT_S}
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Poháňané vagóny: {GOLD}+{POWER}{BLACK} Hmotnosť: {GOLD}+{WEIGHT_S}
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Prestavatelne na: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Všetky druhy nákladu
STR_PURCHASE_INFO_ALL_BUT :Všetko okrem {GOLD}
@@ -3047,15 +3047,15 @@ STR_REPLACE_VEHICLE_ROAD_VEHICLE :{G=m}Automobil
STR_REPLACE_VEHICLE_SHIP :{G=z}Lod
STR_REPLACE_VEHICLE_AIRCRAFT :{G=s}Lietadlo
-STR_REPLACE_HELP_LEFT_ARRAY :{BLACK}Vyber typ lokomotivy na vymenu
-STR_REPLACE_HELP_RIGHT_ARRAY :{BLACK}Vyber typ novej lokomotivy, ktoru chces pouzit namiesto typu v zozname nalavo
+STR_REPLACE_HELP_LEFT_ARRAY :{BLACK}Zvoľte typ lokomotívy na výmenu
+STR_REPLACE_HELP_RIGHT_ARRAY :{BLACK}Zvoľte nový typ lokomotívy, ktorú chceš použiť namiesto typu z ľavého zoznamu
STR_REPLACE_VEHICLES_START :{BLACK}Začať výmenu vozidiel
-STR_REPLACE_HELP_START_BUTTON :{BLACK}Stlac toto tlacidlo, ak chces zacat vymienat typ lokomotivy v lavom zozname za typ lokomotivy v pravom zozname
+STR_REPLACE_HELP_START_BUTTON :{BLACK}Stlačte pre začatie výmeny typu lokomotívy v ľavom zozname za lokomotívu v pravom zozname
STR_REPLACE_NOT_REPLACING :{BLACK}Nevymiena sa
STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED :{BLACK}Nie je oznacene vozidlo
STR_REPLACE_VEHICLES_STOP :{BLACK}Zastaviť výmenu vozidiel
-STR_REPLACE_HELP_STOP_BUTTON :{BLACK}Stlac toto tlacidlo, ak nechces vymienat typ lokomotivy vybrany v lavom zozname
+STR_REPLACE_HELP_STOP_BUTTON :{BLACK}Stlačte pre zastavenie výmeny lokomotívy vybranej z ľavého zoznamu
STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}Vymena: {ORANGE}{STRING}
STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK}Prepne medzi oknami na vymenu lokomotiv a vagonov
@@ -3063,14 +3063,14 @@ STR_REPLACE_ENGINES :Lokomotívy
STR_REPLACE_WAGONS :Vagonov
STR_REPLACE_HELP_RAILTYPE :{BLACK}Vyber typ koľajníc, pre ktoré chceš vymieňať lokomotívy
-STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}Zobrazenie za ktoru lokomotivu sa lokomotiva v zozname nalavo zamiena
+STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}Zobrazí, ak existuje lokomotíva z ľavého zoznamu, ktorá sa zamení s ňou
STR_REPLACE_RAIL_VEHICLES :Lokomotívy
STR_REPLACE_ELRAIL_VEHICLES :Elektrické lokomotívy
STR_REPLACE_MONORAIL_VEHICLES :Lokomotiva pre jednokolajovku
STR_REPLACE_MAGLEV_VEHICLES :Lokomotiva pre magneticku drahu
-STR_REPLACE_REMOVE_WAGON :{BLACK}Odstranenie vagonu: {ORANGE}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Funkcia automatického vylepšovania vlakov môže udržovať rovnakú dĺžku vlakov odstraňovaním vagónov (od začiatku vlakov), pokiaľ by zmena rušňa vlak predĺžila
+STR_REPLACE_REMOVE_WAGON :{BLACK}Odstránenie vagónu: {ORANGE}{STRING}
+STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Zachovanie pôvodnej dĺžky vlaku, odstránením vagónov (odpredu), keď by funkcia automatickej zmeny rušňa vlak predĺžila
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
@@ -3943,14 +3943,14 @@ STR_INDUSTRY_NAME_FARM_2 :Farma
STR_INDUSTRY_NAME_LUMBER_MILL :Pila
STR_INDUSTRY_NAME_COTTON_CANDY_FOREST :Les cukrovej vaty
STR_INDUSTRY_NAME_CANDY_FACTORY :Cukrovar
-STR_INDUSTRY_NAME_BATTERY_FARM :Vyroba baterii
+STR_INDUSTRY_NAME_BATTERY_FARM :Výroba batérii
STR_INDUSTRY_NAME_COLA_WELLS :Výroba kofoly
STR_INDUSTRY_NAME_TOY_SHOP :Hrackarstvo
STR_INDUSTRY_NAME_TOY_FACTORY :Vyroba hraciek
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS :Zuvackova fontana
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS :Žuvačkové fontány
STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY :Vyroba sumienky
STR_INDUSTRY_NAME_BUBBLE_GENERATOR :Bublifuk
-STR_INDUSTRY_NAME_TOFFEE_QUARRY :Karamelovy lom
+STR_INDUSTRY_NAME_TOFFEE_QUARRY :Karamelový lom
STR_INDUSTRY_NAME_SUGAR_MINE :Cukrová baňa
############ WARNING, using range 0x6000 for strings that are stored in the savegame
@@ -4022,45 +4022,45 @@ STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_30_ELECTRIC :SH '30' (Elektr
STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_40_ELECTRIC :SH '40' (Elektricky)
STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_T_I_M_ELECTRIC :'T.I.M.' (Elektricky)
STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_ASIASTAR_ELECTRIC :'AsiaStar' (Elektricky)
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PASSENGER_CAR :Vagon pre cestujucich
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_MAIL_VAN :Postovy vagon
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PASSENGER_CAR :Vagón pre cestujúcich
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_MAIL_VAN :Poštový vagón
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COAL_CAR :Vagón na uhlie
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_OIL_TANKER :Vagón na ropu
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_LIVESTOCK_VAN :Vagon na dobytok
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_GOODS_VAN :Vagon na tovar
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_GRAIN_HOPPER :Vagon na obilie
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_LIVESTOCK_VAN :Vagón na dobytok
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_GOODS_VAN :Vagón na tovar
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_GRAIN_HOPPER :Vagón na obilie
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WOOD_TRUCK :Vagón na drevo
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_IRON_ORE_HOPPER :Vagon na zeleznu rudu
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_IRON_ORE_HOPPER :Vagón na železnú rudu
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_STEEL_TRUCK :Vagón na oceľ
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_ARMORED_VAN :Obrneny vagon
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FOOD_VAN :Vagon na jedlo
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_ARMORED_VAN :Obrnený vagón
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FOOD_VAN :Vagón na jedlo
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PAPER_TRUCK :Vagón na papier
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COPPER_ORE_HOPPER :Vagon na medennu rudu
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COPPER_ORE_HOPPER :Vagón na medenú rudu
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WATER_TANKER :Vagón na vodu
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FRUIT_TRUCK :Vagón na ovocie
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_RUBBER_TRUCK :Vagon na kaucuk
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_RUBBER_TRUCK :Vagón na kaučuk
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_SUGAR_TRUCK :Vagón na cukor
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COTTON_CANDY_HOPPER :Vagon na cukrovu vatu
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOFFEE_HOPPER :Vagon na karamel
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BUBBLE_VAN :Vagon na bubliny
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COTTON_CANDY_HOPPER :Vagón na cukrovú vatu
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOFFEE_HOPPER :Vagón na karamel
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BUBBLE_VAN :Vagón na bubliny
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COLA_TANKER :Vagón na kofolu
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN :Vagon na cukriky
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN :Vagon na hracky
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK :Vagon na baterie
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK :Vagon na sumienku
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK :Vagon na zuvacky
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN :Vagón na cukríky
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN :Vagón na hračky
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK :Vagón na batérie
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK :Vagón na šumienku
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK :Vagón na žuvačky
STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC :'X2001' (Elektricky)
STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_MILLENNIUM_Z1_ELECTRIC :'Millennium Z1' (Elektricky)
STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_WIZZOWOW_Z99 :Wizzowow Z99
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PASSENGER_CAR :Vagon pre cestujucich
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_MAIL_VAN :Postovy vagon
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COAL_CAR :Vagon na uhlie
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PASSENGER_CAR :Vagón pre cestujúcich
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_MAIL_VAN :Poštový vagón
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COAL_CAR :Vagón na uhlie
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_OIL_TANKER :Vagon na ropu
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_LIVESTOCK_VAN :Vagon na dobytok
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GOODS_VAN :Vagon na tovar
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GRAIN_HOPPER :Vagon na obilie
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WOOD_TRUCK :Vagon na drevo
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_IRON_ORE_HOPPER :Vagon na zeleznu rudu
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_IRON_ORE_HOPPER :Vagón na železnú rudu
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_STEEL_TRUCK :Vagon na ocel
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN :Obrneny vagon
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN :Vagon na jedlo
@@ -4072,13 +4072,13 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_RUBBER_TRUCK :Vagon na kaucuk
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_SUGAR_TRUCK :Vagon na cukor
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COTTON_CANDY_HOPPER :Vagon na cukrovu vatu
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOFFEE_HOPPER :Vagon na karamel
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BUBBLE_VAN :Vagon na bubliny
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BUBBLE_VAN :Vagón na bubliny
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COLA_TANKER :Vagon na kofolu
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_CANDY_VAN :Vagon na cukriky
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN :Vagon na hracky
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN :Vagón na hračky
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BATTERY_TRUCK :Vagon na baterie
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK :Vagon na sumienku
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PLASTIC_TRUCK :Vagon na zuvacky
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PLASTIC_TRUCK :Vagón na žuvačky
STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV1_LEVIATHAN_ELECTRIC :Lev1 'Leviathan' (Elektricky)
STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV2_CYCLOPS_ELECTRIC :Lev2 'Cyclops' (Elektricky)
STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV3_PEGASUS_ELECTRIC :Lev3 'Pegasus' (Elektricky)
@@ -4104,13 +4104,13 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_RUBBER_TRUCK :Vagon na kaucuk
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_SUGAR_TRUCK :Vagon na cukor
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COTTON_CANDY_HOPPER :Vagon na cukrovu vatu
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOFFEE_HOPPER :Vagon na karamel
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN :Vagon na bubliny
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN :Vagón na bubliny
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COLA_TANKER :Vagon na kofolu
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_CANDY_VAN :Vagon na cukriky
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOY_VAN :Vagon na hracky
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOY_VAN :Vagón na hračky
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BATTERY_TRUCK :Vagon na baterie
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FIZZY_DRINK_TRUCK :Vagon na sumienku
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PLASTIC_TRUCK :Vagon na zuvacky
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PLASTIC_TRUCK :Vagón na žuvačky
STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_REGAL_BUS :MPS Regal Autobus
STR_VEHICLE_NAME_ROAD_VEHICLE_HEREFORD_LEOPARD_BUS :Hereford Leopard Autobus
STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_BUS :Foster Autobus
@@ -4124,9 +4124,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_DW_COAL_TRUCK :DW - Uhlie
STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_MAIL_TRUCK :MPS - Posta
STR_VEHICLE_NAME_ROAD_VEHICLE_REYNARD_MAIL_TRUCK :Reynard - Posta
STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_MAIL_TRUCK :Perry - Posta
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_MAIL_TRUCK :MightyMover - Posta
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_MAIL_TRUCK :Powernaught - Posta
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_MAIL_TRUCK :Wizzowow - Posta
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_MAIL_TRUCK :MightyMover - Pošta
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_MAIL_TRUCK :Powernaught - Pošta
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_MAIL_TRUCK :Wizzowow - Pošta
STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_OIL_TANKER :Witcombe - Ropa
STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_OIL_TANKER :Foster - Ropa
STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_OIL_TANKER :Perry - Ropa
@@ -4181,21 +4181,21 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COTTON_CANDY_TRUCK :Wizzowow - Cukr
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOFFEE_TRUCK :MightyMover - Karamel
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOFFEE_TRUCK :Powernaught - Karamel
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOFFEE_TRUCK :Wizzowow - Karamel
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOY_VAN :MightyMover - Hracky
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOY_VAN :Powernaught - Hracky
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOY_VAN :Wizzowow - Hracky
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_CANDY_TRUCK :MightyMover - Cukriky
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_CANDY_TRUCK :Powernaught - Cukriky
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_CANDY_TRUCK :Wizzowow - Cukriky
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOY_VAN :MightyMover - Hračky
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOY_VAN :Powernaught - Hračky
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOY_VAN :Wizzowow - Hračky
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_CANDY_TRUCK :MightyMover - Cukríky
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_CANDY_TRUCK :Powernaught - Cukríky
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_CANDY_TRUCK :Wizzowow - Cukríky
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BATTERY_TRUCK :MightyMover - Baterie
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BATTERY_TRUCK :Powernaught - Baterie
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BATTERY_TRUCK :Wizzowow - Baterie
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_FIZZY_DRINK :MightyMover - Sumienka
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_FIZZY_DRINK :Powernaught - Sumienka
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_FIZZY_DRINK_TRUCK :Wizzowow - Sumienka
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_PLASTIC_TRUCK :MightyMover - Zuvacky
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_PLASTIC_TRUCK :Powernaught - Zuvacky
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_PLASTIC_TRUCK :Wizzowow - Zuvacky
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_PLASTIC_TRUCK :MightyMover - Žuvačky
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_PLASTIC_TRUCK :Powernaught - Žuvačky
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_PLASTIC_TRUCK :Wizzowow - Žuvačky
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BUBBLE_TRUCK :MightyMover - Bubliny
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BUBBLE_TRUCK :Powernaught - Bubliny
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BUBBLE_TRUCK :Wizzowow - Bubliny
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 1260af6fd..7cb3dbafd 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -874,7 +874,7 @@ STR_GAME_OPTIONS_CURRENCY_DEM :Alman markı (D
STR_GAME_OPTIONS_CURRENCY_DKK :Danimarka Kronu (DKK)
STR_GAME_OPTIONS_CURRENCY_ESP :Peseta (ESP)
STR_GAME_OPTIONS_CURRENCY_FIM :Fin Markka (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF :Frank (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF :Fransız Frankı (FRF)
STR_GAME_OPTIONS_CURRENCY_GRD :Yunan Drachma (GRD)
STR_GAME_OPTIONS_CURRENCY_HUF :Macar Forinti (HUF)
STR_GAME_OPTIONS_CURRENCY_ISK :Iceland Kronasi (ISK)
@@ -1119,8 +1119,8 @@ STR_CONFIG_SETTING_TRAIN_LENGTH :{LTBLUE}Trenler
STR_CONFIG_SETTING_SMOKE_AMOUNT :{LTBLUE}Araçlardan çıkan duman veya kıvılcım miktarı: {ORANGE}{STRING}
STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL :{LTBLUE}Tren ivme modeli: {ORANGE}{STRING}
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Kara taşıtı ivme modeli: {ORANGE}{STRING}
-STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Trenler için eğim dikliği {ORANGE}{STRING}%
-STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Kara taşıtları için eğim dikliği %{ORANGE}{STRING}
+STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Trenler için eğim dikliği: {ORANGE}{STRING}%
+STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Kara taşıtları için eğim dikliği: %{ORANGE}{STRING}
STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Tren ve gemilerin 90 derece dönmesini yasakla: {ORANGE}{STRING}
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Doğrudan bitişik olmayan istasyonları birleştirme izni: {ORANGE}{STRING}
STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Geliştirilmiş yükleme algoritması kullan: {ORANGE}{STRING}
@@ -3453,6 +3453,8 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... yanl
STR_ERROR_BMPMAP :{WHITE}Arazi BMP'den yüklenemedi...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... resim türü çevrilemedi
+STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... resim çok büyük
+
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Ölcek uyarısı
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Kaynak haritanin boyutunu değiştirmek önerilmez. Harita oluşturmaya devam edilsin mi?
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index 13bb01602..5423ec25d 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -277,8 +277,8 @@ STR_SORT_BY_ENGINE_ID :ID Injan (math
STR_SORT_BY_COST :Côst
STR_SORT_BY_POWER :Pŵer
STR_SORT_BY_INTRO_DATE :Dyddiad Cyflwyno
-STR_SORT_BY_RUNNING_COST :Côst Rhedeg
-STR_SORT_BY_POWER_VS_RUNNING_COST :Côst Pŵer/Rhedeg
+STR_SORT_BY_RUNNING_COST :Cost Rhedeg
+STR_SORT_BY_POWER_VS_RUNNING_COST :Pŵer/Cost Rhedeg
STR_SORT_BY_CARGO_CAPACITY :Gallu cludo Llwyth
# Tooltips for the main toolbar
@@ -318,16 +318,17 @@ STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD :{BLACK}Symud y
STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD :{BLACK}Symud y dyddiad cychwyn ymlaen 2 flynedd
STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY :{BLACK}Dangos map, cyfeiriadur trefi
STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION :{BLACK}Cynhyrchu tirwedd
-STR_SCENEDIT_TOOLBAR_TOWN_GENERATION :{BLACK}Cynhyrchu Trefi
+STR_SCENEDIT_TOOLBAR_TOWN_GENERATION :{BLACK}Cynhyrchu trefi
STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION :{BLACK}Cynhyrchu Diwydiannau
STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Cynhyrchu Ffyrdd
-STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Plannu Coed
+STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Plannu coed. Mae Shift yn toglo adeiladu/amcangyfrif y gost
STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Gosod arwydd
############ range for SE file menu starts
STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO :Cadw senario
STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO :Llwytho senario
-STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP :Llwytho heightmap
+STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP :Cadw siart uchder
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP :Llwytho siart uchder
STR_SCENEDIT_FILE_MENU_QUIT_EDITOR :Gadael golygydd
STR_SCENEDIT_FILE_MENU_SEPARATOR :
STR_SCENEDIT_FILE_MENU_QUIT :Gadael
@@ -343,10 +344,11 @@ STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED :Dangos enwau tr
STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED :Dangos enwau gorsafoedd
STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :Dangos Pwyntiau Llwybrau
STR_SETTINGS_MENU_SIGNS_DISPLAYED :Dangos arwyddion
+STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS :Dangos arwyddion ac enwau cystadleuwyr
STR_SETTINGS_MENU_FULL_ANIMATION :Animeiddiad llawn
STR_SETTINGS_MENU_FULL_DETAIL :Manylder llawn
-STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Adeiladau Tryloyw
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Arwyddion Tryloyw
+STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Adeiladau tryloyw
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Arwyddion gorsaf tryloyw
############ range ends here
############ range for file menu starts
@@ -432,6 +434,7 @@ STR_ABOUT_MENU_AI_DEBUG :Dadfygio AI
STR_ABOUT_MENU_SCREENSHOT :Llun Sgrîn
STR_ABOUT_MENU_GIANT_SCREENSHOT :Ciplun anferth (Ctrl-G)
STR_ABOUT_MENU_ABOUT_OPENTTD :Gwybodaeth am 'OpenTTD'
+STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Toglo bocsys ffinio
############ range ends here
############ range for days starts (also used for the place in the highscore window)
@@ -593,7 +596,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC :{BLACK}Dewis y
STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Dewis y rhaglen 'Ezy Scoedent style music'
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED :{BLACK}Dewis y rhaglen 'Cyfaddas 1' (dewis y defnyddiwr)
STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED :{BLACK}Dewis y rhaglen 'Cyfaddas 2' (dewis y defnyddiwr)
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Togu cymysgu trefn raglen ymlaen neu i ffwrdd
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Toglu cymysgu trefn rhaglen ymlaen neu i ffwrdd
STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Dangos y ffenestr dewis traciau cerddoriaeth
@@ -803,7 +806,7 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO :{WHITE}Mae {STA
STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIGFONT}{BLACK}Cynnig cymhorthdal ar ben: {}{}Ni fydd cludo {STRING} o {STRING} i {STRING} bellach yn derbyn cymhorthdal.
STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIGFONT}{BLACK}Cymhorthdal wedi'i dynnu'n ôl: {}{}Ni fydd y gwasanaeth {STRING} o {STRING} i {STRING} bellach yn derbyn cymhorthdal.
-STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIGFONT}{BLACK}Cymhorthdal yn cael ei gynnig:{}{}bydd y gwasanaeth {STRING} cyntaf o {STRING} i {STRING} yn derbyn blwyddyn o gymhorthdal oddi wrth yr awdurdod lleol!
+STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIGFONT}{BLACK}Cynnig cymhorthdal:{}{}Bydd y gwasanaeth {STRING} cyntaf o {STRING} i {STRING} yn derbyn blwyddyn o gymhorthdal oddi wrth yr awdurdod lleol!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}! Bydd y gwasanaeth {}{}{STRING} o {STRING} i {STRING} yn talu 50% yn fwy am y flwyddyn nesaf!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}! Bydd y gwasanaeth {}{}{STRING} o {STRING} i {STRING} yn talu dwywaith yn fwy am y flwyddyn nesaf!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}! Bydd y gwasanaeth {}{}{STRING} o {STRING} i {STRING} yn talu teirgwaith yn fwy am y flwyddyn nesaf!
@@ -814,9 +817,9 @@ STR_NEWS_ROAD_REBUILDING :{BIGFONT}{BLACK
# Extra view window
STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Ffenestr Olygfa{COMMA}
STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Copïo i Ffenestr Olygfa
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copïo lleoliad y golwg byd-eang i'r Ffenestr Olygfa
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copïo lleoliad y golwg byd-eang i'r ffenestr olygfa
STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Gludo o'r Ffenestr Olygfa
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Gludo lleoliad y Ffenestr Olygfa i'r golwg byd-eang
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Gludo lleoliad y ffenestr olygfa i'r golwg byd-eang
# Game options window
STR_GAME_OPTIONS_CAPTION :{WHITE}Dewisiadau Gêm
@@ -986,6 +989,8 @@ STR_DIFFICULTY_LEVEL_SETTING_CITY_APPROVAL :{LTBLUE}Agwedd
############ range for difficulty settings ends
STR_NONE :Dim
+STR_FUNDING_ONLY :Ariannu'n unig
+STR_MINIMAL :Lleiafsymol
STR_NUM_VERY_LOW :STR_NUM_ISEL_IAWN
STR_NUM_LOW :Isel
STR_NUM_NORMAL :Arferol
@@ -995,7 +1000,7 @@ STR_NUM_CUSTOM :Addasedig
STR_AI_SPEED_VERY_SLOW :Araf Iawn
STR_AI_SPEED_SLOW :Araf
-STR_AI_SPEED_MEDIUM :Canolig
+STR_AI_SPEED_MEDIUM :Cymhedrol
STR_AI_SPEED_FAST :Cyflym
STR_AI_SPEED_VERY_FAST :Cyflym iawn
@@ -1004,6 +1009,11 @@ STR_SEA_LEVEL_LOW :Isel
STR_SEA_LEVEL_MEDIUM :Canolig
STR_SEA_LEVEL_HIGH :Uchel
+STR_RIVERS_NONE :Dim
+STR_RIVERS_FEW :Ychydig
+STR_RIVERS_MODERATE :Cymhedrol
+STR_RIVERS_LOT :Llawer
+
STR_DISASTER_NONE :Dim
STR_DISASTER_REDUCED :Llai
STR_DISASTER_NORMAL :Arferol
@@ -1041,13 +1051,16 @@ STR_CONFIG_SETTING_COMPANIES_OFF :I ffwrdd
STR_CONFIG_SETTING_COMPANIES_OWN :Eich cwmni
STR_CONFIG_SETTING_COMPANIES_ALL :Cwmnïau eraill
+STR_CONFIG_SETTING_NONE :Dim
+STR_CONFIG_SETTING_ORIGINAL :Gwreiddiol
+STR_CONFIG_SETTING_REALISTIC :Realistig
STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT :Chwith
STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER :Canol
STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT :De
STR_CONFIG_SETTING_BUILDONSLOPES :{LTBLUE}Caniatáu adeiladu a'r lethrau ac arfordiroedd {ORANGE}{STRING}
-STR_CONFIG_SETTING_AUTOSLOPE :{LTBLUE}Caniatáu daearffurfio o dan adeiladau, traciau, etc. (awtolethru): {ORANGE}{STRING}
+STR_CONFIG_SETTING_AUTOSLOPE :{LTBLUE}Caniatáu tirffurfio o dan adeiladau, traciau, etc. (awtolethru): {ORANGE}{STRING}
STR_CONFIG_SETTING_CATCHMENT :{LTBLUE}Caniatáu ardaloedd dalgylch mwy realistig eu maint: {ORANGE}{STRING}
STR_CONFIG_SETTING_EXTRADYNAMITE :{LTBLUE}Caniatáu chwalu ffyrdd, pontydd ayb. o eiddo trefi: {ORANGE}{STRING}
STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL :{LTBLUE}Model cyflymu trenau: {ORANGE}{STRING}
@@ -1073,6 +1086,7 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING :{LTBLUE}Ciwio c
STR_CONFIG_SETTING_AUTOSCROLL :{LTBLUE}Tremio'r ffenestr pan fydd y llygoden ar ymyl y sgrin: {ORANGE}{STRING}
STR_CONFIG_SETTING_BRIBE :{LTBLUE}Caniatáu llwgrwobrwyo'r awdurdod lleol: {ORANGE}{STRING}
STR_CONFIG_SETTING_ALLOW_EXCLUSIVE :{LTBLUE}Caniatáu prynu hawliau cludo unigryw: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_ROAD :{LTBLUE}Caniatáu ariannu gwaith ffordd lleol: {ORANGE}{STRING}
STR_CONFIG_SETTING_ALLOW_GIVE_MONEY :{LTBLUE}Caniatáu trosglwyddo arian i gwmnïau eraill: {ORANGE}{STRING}
STR_CONFIG_SETTING_FREIGHT_TRAINS :{LTBLUE}Lluosogydd pwysau ar gyfer llwythi i adlewyrchu trenau trwm{ORANGE}{STRING}
STR_CONFIG_SETTING_PLANE_SPEED :{LTBLUE}Ffactor cyflymder awyrenau: {ORANGE}1 / {STRING}
@@ -1094,7 +1108,7 @@ STR_CONFIG_SETTING_WARN_INCOME_LESS :{LTBLUE}Rhybudd
STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES :{LTBLUE}Nid yw cerbydau'n darfod: {ORANGE}{STRING}
STR_CONFIG_SETTING_AUTORENEW_VEHICLE :{LTBLUE}Awtoadnewyddu cerbyd pan aiff yn hen: {ORANGE}{STRING}
STR_CONFIG_SETTING_AUTORENEW_MONTHS :{LTBLUE}Awtoadnewyddu cerbyd {ORANGE}{STRING}{LTBLUE} mis{P 0:1 "" oedd} cyn ei oedran eithaf
-STR_CONFIG_SETTING_AUTORENEW_MONEY :{LTBLUE}Isafswm arain awtoadnewyddu ar gyfer adolygu: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AUTORENEW_MONEY :{LTBLUE}Isafswm arian awtoadnewyddu ar gyfer adnewyddu: {ORANGE}{STRING}
STR_CONFIG_SETTING_ERRMSG_DURATION :{LTBLUE}Cyfnod dangos neges wall: {ORANGE}{STRING} eiliad{P 0:1 "" s}
STR_CONFIG_SETTING_POPULATION_IN_LABEL :{LTBLUE}Dangos poblogaeth tref yn label y dref: {ORANGE}{STRING}
@@ -1116,7 +1130,7 @@ STR_CONFIG_SETTING_HEIGHTMAP_ROTATION :{LTBLUE}Tro Map
STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :Gwrthglocwedd
STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE :Clocwedd
STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT :{LTBLUE}Y lefel map uchder mae map senario fflat yn ei dderbyn: {ORANGE}{STRING}
-STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES :{LTBLUE}Galluogi tirffurfio'r teiliau ar ymylon mapiau: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES :{LTBLUE}Galluogi tirffurfio'r teiliau ar ymylon y map: {ORANGE}{STRING}
STR_CONFIG_SETTING_EDGES_NOT_EMPTY :{WHITE}Nid yw un neu fwy o'r teiliau ar ymyl gogleddol y map yn wag
STR_CONFIG_SETTING_EDGES_NOT_WATER :{WHITE}Nid yw un neu fwy o'r teiliau ar un o'r ymylon yn ddw^r
@@ -1149,6 +1163,9 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :hir (31fed Rhag
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT :byr(31-12-2008)
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO :ISO (2008-12-31)
+STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE :{LTBLUE}Palet rhagosodedig ar gyfer NewGRFau nad yw'n dynodi un: {ORANGE}{STRING}
+STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_DOS :Palet DOS
+STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_WIN :Palet Windows
STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME :{LTBLUE}Oedi'n awtomatig wrth gychwyn gêm newydd: {ORANGE}{STRING}
STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :{LTBLUE}Defnyddio'r rhestr cerbydau uwch {ORANGE}{STRING}
@@ -1249,6 +1266,7 @@ STR_CONFIG_SETTING_VEHICLES_TRAINS :{ORANGE}Trenau
STR_CONFIG_SETTING_ECONOMY_TOWNS :{ORANGE}Trefi
STR_CONFIG_SETTING_ECONOMY_INDUSTRIES :{ORANGE}Diwydiannau
+STR_CONFIG_SETTING_PATHFINDER_OPF :Gwreiddiol
STR_CONFIG_SETTING_PATHFINDER_NPF :NPF
STR_CONFIG_SETTING_PATHFINDER_YAPF_RECOMMENDED :YAPF {BLUE}(Argymellir)
@@ -1296,6 +1314,8 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Gwirio a
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Dangos Gosodiadau AI
STR_INTRO_TOOLTIP_QUIT :{BLACK}Gadael 'OpenTTD'
+STR_INTRO_TRANSLATION :{BLACK}Mae'r cyfieithiad yma'n brin o {NUM} linyn. Helpwch wella OpenTTD drwy ymaelodi fel cyfieithydd. Gweler readme.txt am fanylion.
+
# Quit window
STR_QUIT_CAPTION :{WHITE}Gadael
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ydych chi eisiau gadael y gêm a dychwelyd i {STRING}?
@@ -1440,8 +1460,8 @@ STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}Byddwch
STR_NETWORK_SERVER_LIST_GAME_NAME :{BLACK}Enw
STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP :{BLACK}Enwi'r gêm
STR_NETWORK_SERVER_LIST_GENERAL_ONLINE :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION :{BLACK}Cleientiaid
-STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP :{BLACK}Cleientiaid ar-lein / uchafswm cleientiaid{}Cwmnïau ar-lein / uchafswm cwmnïau
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION :{BLACK}Gwesteion
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP :{BLACK}Gwesteion ar-lein / uchafswm gwesteion{}Cwmnïau ar-lein / uchafswm cwmnïau
STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT :{BLACK}{COMMA}x{COMMA}
STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION :{BLACK}Maint map
STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP :{BLACK}Maint map y gêm{}Cliciwch i drefnu'n ôl ardal
@@ -1456,7 +1476,7 @@ STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER :{BLACK}Y gweiny
STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST :{BLACK}Cliciwch i ddewis y gweinydd y chwaraeoch chi ddiwethaf
STR_NETWORK_SERVER_LIST_GAME_INFO :{SILVER}GWYBODAETH AM Y GÊM
-STR_NETWORK_SERVER_LIST_CLIENTS :{SILVER}Cleientiaid: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS :{SILVER}Gwesteion: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
STR_NETWORK_SERVER_LIST_LANGUAGE :{SILVER}Iaith: {WHITE}{STRING}
STR_NETWORK_SERVER_LIST_LANDSCAPE :{SILVER}Set Teils: {WHITE}{STRING}
STR_NETWORK_SERVER_LIST_MAP_SIZE :{SILVER}Maint Map: {WHITE}{COMMA}x{COMMA}
@@ -1494,9 +1514,9 @@ STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Diogelwc
STR_NETWORK_START_SERVER_LAN_INTERNET :LAN / Rhyngrwyd
STR_NETWORK_START_SERVER_INTERNET_ADVERTISE :Rhyngrwyd (hysbysebu)
-STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} cleient{P "" iau}
-STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Uchafswm cleientiaid:
-STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP :{BLACK}Dewiswch uchafswm y cleientiaid. Does dim rhaid llanw pob slot
+STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} gwest{P ai eion}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Uchafswm gwesteion:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP :{BLACK}Dewiswch uchafswm y gwesteion. Does dim rhaid llanw pob slot
STR_NETWORK_START_SERVER_COMPANIES_SELECT :{BLACK}{NUM} cwmn{P i ïau}
STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES :{BLACK}Uchafswm cwmnïau:
STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP :{BLACK}rhoi cyfyngiad penodol ar sawl cwmni mae'r gweinydd yn ei ganiatáu
@@ -1587,7 +1607,7 @@ STR_NETWORK_CONNECTING_6 :{BLACK}(6/6) Co
STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Estyn gwybodaeth gêm..
STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Estyn gwybodaeth cwmnïau..
############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} cleient{P "" iau}o'ch blaen
+STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} gwest{P ai eion}o'ch blaen
STR_NETWORK_CONNECTING_DOWNLOADING_2 :{BLACK}{BYTES} / {BYTES} wedi eu llwytho i lawr hyd yn hyn
STR_NETWORK_CONNECTION_DISCONNECT :{BLACK}Datgysylltu
@@ -1608,7 +1628,7 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY :Speak â chwmni
STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT :Neges breifat
STR_NETWORK_SERVER :Gweinydd
-STR_NETWORK_CLIENT :Cleient
+STR_NETWORK_CLIENT :Gwestai
STR_NETWORK_SPECTATORS :Gwylwyr
STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Nodwch faint o arian yr hoffech chi ei roi
@@ -1651,7 +1671,7 @@ STR_NETWORK_ERROR_SERVER_START :{WHITE}Methwyd
STR_NETWORK_ERROR_CLIENT_START :{WHITE}Doedd dim modd cysylltu
STR_NETWORK_ERROR_TIMEOUT :{WHITE}Daeth cyfnod cyswllt #{NUM} i ben
STR_NETWORK_ERROR_SERVER_ERROR :{WHITE}Caewyd y cyswllt oherwydd gwall protocol
-STR_NETWORK_ERROR_WRONG_REVISION :{WHITE}Nid y fersiwn y cleient yn cyfateb i fersiwn y gweinydd
+STR_NETWORK_ERROR_WRONG_REVISION :{WHITE}Nid y fersiwn y gwestai yn cyfateb i fersiwn y gweinydd
STR_NETWORK_ERROR_WRONG_PASSWORD :{WHITE}Cyfrinair anghywir
STR_NETWORK_ERROR_SERVER_FULL :{WHITE}Mae'r gweinydd yn llawn
STR_NETWORK_ERROR_SERVER_BANNED :{WHITE}Rydych chi wedi'ch gwahardd o'r gweinydd hwn
@@ -1682,6 +1702,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :gweinydd llawn
############ End of leave-in-this-order
STR_NETWORK_MESSAGE_CLIENT_LEAVING :wrthi'n gadael
STR_NETWORK_MESSAGE_CLIENT_JOINED :*** Mae {STRING} wedi ymuno â'r gêm
+STR_NETWORK_MESSAGE_CLIENT_JOINED_ID :*** Mae {STRING} wedi ymuno a'r gêm (Gwestai #{2:NUM})
STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN :*** Mae {STRING} wedi ymuno â chwmni #{2:NUM}
STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** Mae {STRING} wedi ymuno â'r gwylwyr
STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** Mae {STRING} wedi dechrau cwmni newydd (#{2:NUM})
@@ -1788,11 +1809,11 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL :{BLACK}Adeiladu
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Adeiladu trên depo (ar gyfer adeiladu a rhoi gwasanaeth i drenau)
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Newid rheilffordd yn bwynt llwybr
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION :{BLACK}Adeiladu gorsaf reilffordd
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Adeiladu signalau rheilffordd. Mae Ctrl yn toglo signalau semafor/golau lliw{}llusgion yn adeiladu signalau ar trac rheilffordd syth. Mae Ctrl yn adeiladu signalau ers y gyffordd nesaf{}Mae Ctrl+Clic yn toglo agor y ffenestr dewis signalau.
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Adeiladu pont reilffordd
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Adeiladu twnnel rheilffordd
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Adeiladu signalau rheilffordd. Mae Ctrl yn toglo signalau semafor/golau lliw{}Mae llusgo'n adeiladu signalau ar hyd trac syth. Mae Ctrl yn adeiladu signalau hyd y gyffordd nesaf{}Mae Ctrl+Clic yn toglo agor y ffenestr dewis signalau. Mae Shift yn toglo adeiladu/amcangyfrif y gost
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Adeiladu pont reilffordd. Mae Shift yn toglo adeiladu/amcangyfrif y gost
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Adeiladu twnnel rheilffordd. Mae Shift yn toglo adeiladu/amcangyfrif y gost
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Toglu adeiladu/tynnu ar gyfer traciau a signalau
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Trosi/Diweddaru math y rheilffordd
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Trosi/Diweddaru math y rheilffordd. Mae Shift yn toglo adeiladu/amcangyfrif y gost
# Rail depot construction window
STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Cyfeiriad Depo Trên
@@ -1867,10 +1888,10 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION :{BLACK}Adeiladu
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY :{BLACK}Adeiladu bae llwytho lorïau
STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION :{BLACK}Adeiladu gorsaf tramiau nwyddau
STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD :{BLACK}Gweithredu/dadweithredu ffyrdd un-ffordd
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE :{BLACK}Adeiladu pont ffordd
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE :{BLACK}Adeiladu pont tramffordd
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL :{BLACK}Adeiladu twnnel ffordd
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL :{BLACK}Adeiladu twnel tramffordd
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE :{BLACK}Adeiladu pont ffordd. Mae Shift yn toglo adeiladu/amcangyfrif y gost
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE :{BLACK}Adeiladu pont tramffordd. Mae Shift yn toglo adeiladu/amcangyfrif y gost
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL :{BLACK}Adeiladu twnnel ffordd. Mae Shift yn toglo adeiladu/amcangyfrif y gost
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL :{BLACK}Adeiladu twnel tramffordd. Mae Shift yn toglo adeiladu/amcangyfrif y gost
STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD :{BLACK}toglu adeiladu/clirio ar gyfer adeiladu ffyrdd
STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Toglu adeiladu/dileu ar gyfer adeiladu tramffordd
@@ -1894,13 +1915,13 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP :{BLACK}Dewiswch
STR_WATERWAYS_TOOLBAR_CAPTION :{WHITE}Adeiladu camlesi
STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Camlesi
STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP :{BLACK}Adeiladu camlesi.
-STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP :{BLACK}Adeiladu lociau
+STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP :{BLACK}Adeiladu lociau. Mae Shift yn toglo adeiladu/amcangyfrif y gost
STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP :{BLACK}Adeiladu depo llongau (ar gyfer adeiladu a rhoi gwasanaeth i longau)
STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP :{BLACK}Adeiladu doc llongau
-STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Gosod bwi a ellir ei ddefnyddio fel pwynt llwybr
-STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP :{BLACK}Adeiladu traphont
+STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Gosod bwi a ellir ei ddefnyddio fel pwynt llwybr. Mae Shift yn toglo adeiladu/amcangyfrif y gost
+STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP :{BLACK}Adeiladu traphont. Mae Shift yn toglo adeiladu/amcangyfrif y gost
STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP :{BLACK}Pennu ardal Dŵr.{}Creu camlas, oni bai fod CTRL yn cael ei ddal i lawr ar lefel y môr, fydd yn gorlifo'r ardal o'i gwmpas yn lle
-STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP :{BLACK}Creu afonydd.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP :{BLACK}Creu afonydd
# Ship depot construction window
STR_DEPOT_BUILD_SHIP_CAPTION :{WHITE}Cyfeiriad Depo Llong
@@ -1939,7 +1960,7 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}Tirweddu
STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Gostwng cornel o dir
STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Codi cornel o dir
STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Gwastatáu Tir
-STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Prynu tir ar gyfer defnydd yn y dyfodol
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Prynu tir ar gyfer defnydd yn y dyfodol. Mae Shift yn toglo adeiladu/amcangyfrif y gost
# Object construction window
@@ -1948,7 +1969,7 @@ STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Prynu ti
STR_PLANT_TREE_CAPTION :{WHITE}Coed
STR_PLANT_TREE_TOOLTIP :{BLACK}Dewiswch y math o goeden i'w phlannu
STR_TREES_RANDOM_TYPE :{BLACK}Coed o fath ar hap
-STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Gosod coed o fath ar hap
+STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Gosod coed o fath ar hap. Mae Shift yn toglo adeiladu/dangos amcangyfrif cost
STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Coed ar hap
STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Plannu coed ar hap ar draws y tirwedd
@@ -1978,7 +1999,7 @@ STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP :{BLACK}Gorchudd
STR_FOUND_TOWN_INITIAL_SIZE_TITLE :{YELLOW}Maint tref:
STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON :{BLACK}Bach
-STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON :{BLACK}Canolig
+STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON :{BLACK}Cymhedrol
STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON :{BLACK}Mawr
STR_FOUND_TOWN_SIZE_RANDOM :{BLACK}Ar hap
STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP :{BLACK}Dewiswch maint y dref
@@ -2007,8 +2028,8 @@ STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY :{BLACK}Ariannu
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Gwybodath Ardal Tir
-STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Côst i'w glirio: {LTBLUE}N/A
-STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Côst i'w glirio: {RED}{CURRENCY}
+STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Cost i'w glirio: {LTBLUE}Amherthnasol
+STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Cost i'w glirio: {RED}{CURRENCY}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Elw o'i glirio: {LTBLUE}{CURRENCY}
STR_LAND_AREA_INFORMATION_OWNER_N_A :N/A
STR_LAND_AREA_INFORMATION_OWNER :{BLACK}Perchennog: {LTBLUE}{STRING}
@@ -2128,6 +2149,7 @@ STR_SAVELOAD_LOAD_CAPTION :{WHITE}Llwytho
STR_SAVELOAD_SAVE_SCENARIO :{WHITE}Cadw Senario
STR_SAVELOAD_LOAD_SCENARIO :{WHITE}Llwytho Senario
STR_SAVELOAD_LOAD_HEIGHTMAP :{WHITE}Llwytho Heightmap
+STR_SAVELOAD_SAVE_HEIGHTMAP :{WHITE}Cadw Siart Uchder
STR_SAVELOAD_HOME_BUTTON :{BLACK}Cliciwch yma i newid i'r cyfeiriadur cadw/llwytho diofyn cyfredol
STR_SAVELOAD_BYTES_FREE :{BLACK}{BYTES} yn rhydd
STR_SAVELOAD_LIST_TOOLTIP :{BLACK}Rhestr o yriannau, cyfeiriaduron ffeiliau gemau wedi'i cadw
@@ -2157,6 +2179,7 @@ STR_MAPGEN_LAND_GENERATOR :{BLACK}Cynhyrch
STR_MAPGEN_TREE_PLACER :{BLACK}Algorithm Coed:
STR_MAPGEN_TERRAIN_TYPE :{BLACK}Math Tirwedd:
STR_MAPGEN_QUANTITY_OF_SEA_LAKES :{BLACK}Lefel y Môr:
+STR_MAPGEN_QUANTITY_OF_RIVERS :{BLACK}Afonydd:
STR_MAPGEN_SMOOTHNESS :{BLACK}Llyfnder:
STR_MAPGEN_GENERATE :{WHITE}Cynhyrchu
@@ -2200,6 +2223,7 @@ STR_GENERATION_ABORT_MESSAGE :{YELLOW}Ydych c
STR_GENERATION_PROGRESS :{WHITE}{NUM}% cyflawn
STR_GENERATION_PROGRESS_NUM :{BLACK}{NUM} / {NUM}
STR_GENERATION_WORLD_GENERATION :{BLACK}Cynhyrchu Byd
+STR_GENERATION_RIVER_GENERATION :{BLACK}Cynhyrchu afonydd
STR_GENERATION_TREE_GENERATION :{BLACK}Cynhyrchu Coed
STR_GENERATION_OBJECT_GENERATION :{BLACK}Cynhyrchu Nodweddion Ansymudol
STR_GENERATION_CLEARING_TILES :{BLACK}Cynhyrchu ardaloedd creigiog a chnapiog
@@ -2262,30 +2286,33 @@ STR_NEWGRF_ERROR_MSG_WARNING :{RED}Rhybudd: {
STR_NEWGRF_ERROR_MSG_ERROR :{RED}Gwall: {SILVER}{STRING}
STR_NEWGRF_ERROR_MSG_FATAL :{RED}Angheuol: {SILVER}{STRING}
STR_NEWGRF_ERROR_VERSION_NUMBER :Ni fydd {1:STRING} yn gweithio gyda'r fersiwn o TTDPatch y mae OpenTTD yn ei gefnogi.
-STR_NEWGRF_ERROR_DOS_OR_WINDOWS :Mae {1:STRING} ar gyfer y fersiwn {STRING} oTTD.
+STR_NEWGRF_ERROR_DOS_OR_WINDOWS :Mae {1:STRING} ar gyfer y fersiwn {STRING} o TTD
STR_NEWGRF_ERROR_UNSET_SWITCH :Mae {1:STRING} wedi ei gynllunio i gael ei ddefnyddio gyda {STRING}
STR_NEWGRF_ERROR_INVALID_PARAMETER :Paramedr Annilys ar gyfer {1:STRING}: paramedr {STRING} ({NUM})
-STR_NEWGRF_ERROR_LOAD_BEFORE :Rhaid i {1:STRING} fod wedi ei lwytho cyn {STRING}.
-STR_NEWGRF_ERROR_LOAD_AFTER :Rhad i {1:STRING} fod wedi ei lwytho wedi {STRING}.
-STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER :Mae {1:STRING} angen OpenTTD fersiwn {STRING} neu'n hwyrach.
+STR_NEWGRF_ERROR_LOAD_BEFORE :Rhaid i {1:STRING} fod wedi ei lwytho cyn {STRING}
+STR_NEWGRF_ERROR_LOAD_AFTER :Rhaid i {1:STRING} fod wedi ei lwytho ar ôl {STRING}
+STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER :Mae {1:STRING} angen OpenTTD fersiwn {STRING} neu'n well
STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :Cofodd y ffeil GRF hwn ei gynllunio i gyfieithu
-STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED :mae gormod o NewGRFs wedi'u llwytho
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC :Gallai llwytho {2:STRING} fel NewGRF statig gyda {4:STRING} achosi dadsyncroneiddio.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE :Corlun Annisgwyliedig
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY :Priodwedd Gweithred 0.
-STR_NEWGRF_ERROR_INVALID_ID :Ceisio defnyddio ID annilys.
-STR_NEWGRF_ERROR_CORRUPT_SPRITE :{YELLOW}Mae'r {STRING} yn cynnwys corlun llygredig. Bydd corluniaid llygredig yn cael eu dangos gyda mark cwestiwn coch (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8 :Mae'n cynnwys nifer o gofnodion Gweithred 8.
-STR_NEWGRF_ERROR_READ_BOUNDS :Ddarllen ar ol diwedd y psuedo-sprite
+STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED :Mae gormod o NewGRFau wedi'u llwytho
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC :Gallai llwytho {2:STRING} fel NewGRF statig gyda {4:STRING} achosi dadsyncroneiddio
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE :Corlun annisgwyliedig
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY :Priodwedd Gweithred 0 anhysbys
+STR_NEWGRF_ERROR_INVALID_ID :Ceisio defnyddio ID annilys
+STR_NEWGRF_ERROR_CORRUPT_SPRITE :{YELLOW}Mae'r {STRING} yn cynnwys corlun llygredig. Bydd corluniau llygredig yn cael eu dynodi gan farc cwestiwn coch (?)
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8 :Mae'n cynnwys mwy nac un Gweithred 8
+STR_NEWGRF_ERROR_READ_BOUNDS :Darllen wedi diwedd y llid-gorlun
+STR_NEWGRF_ERROR_GRM_FAILED :Nid yw'r adnoddau GRF a geiswyd ar gael
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED :Fe analluogwyd {2:STRING} gan {4:STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT :Fformat gosodiad corlun annilys/anhysbys
# NewGRF related 'general' warnings
STR_NEWGRF_POPUP_CAUTION_CAPTION :{WHITE}Rhybudd!
STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Rydych ar fin gwneud newidiadau i gêm sy'n rhedeg; all hyn beri i OpenTTD grashio.{}Ydych chi'n siŵr eich bod chi eisiau gwneud hyn?
STR_NEWGRF_DUPLICATE_GRFID :{WHITE}Does dim modd ychwanegu'r ffeil: ID GRF dyblyg
-STR_NEWGRF_COMPATIBLE_LOADED :{ORANGE}Ni ddarganfuwyd ffeil sy'n cyfateb (GRF cytûn wedi'i lwytho)
+STR_NEWGRF_COMPATIBLE_LOADED :{ORANGE}Ni ddarganfuwyd ffeil sy'n cydweddu (GRF cydnaws wedi'i lwytho)
-STR_NEWGRF_COMPATIBLE_LOAD_WARNING :{WHITE}Llwythwyd GRF(au) cytûn yn lle'r rhai coll
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING :{WHITE}Llwythwyd GRF(au) cydnaws yn lle'r rhai coll
STR_NEWGRF_DISABLED_WARNING :{WHITE}Analluogwyd y ffeiliau GRF coll
STR_NEWGRF_UNPAUSE_WARNING_TITLE :{YELLOW}Ffeil(iau) GRF coll
STR_NEWGRF_UNPAUSE_WARNING :{WHITE}Gall dadseibio beri i OpenTTD grasio. Peidiwch ag anfon adroddiadau am fygiau ar gyfer crasiau pellach.{}Ydych chi wir eisiau dadseibio?
@@ -2293,16 +2320,22 @@ STR_NEWGRF_UNPAUSE_WARNING :{WHITE}Gall dad
# NewGRF status
# NewGRF 'it's broken' warnings
-STR_NEWGRF_BROKEN :{WHITE}Mae ymddygiad NewGRF '{0:STRING}' yn debygol o beri dadsyncroneiddio ac/neu crasio.
+STR_NEWGRF_BROKEN :{WHITE}Mae ymddygiad NewGRF '{0:STRING}' yn debygol o beri dadsyncroneiddio a/neu chwalfa
STR_NEWGRF_BROKEN_VEHICLE_LENGTH :{WHITE}Wedi newid hyd cerbyd i '{1:ENGINE}' pan na fyddai mewn depo.
-STR_BROKEN_VEHICLE_LENGTH :{WHITE}Mae gan y trên'{VEHICLE}' sy'n eiddo i '{COMPANY}' hyd annilys. Mwy na thebyg fe'u hachoswyd gan NewGRFau. Gall y gêm ddadsyncroneiddio neu grasio.
+STR_BROKEN_VEHICLE_LENGTH :{WHITE}Mae gan y trên' {VEHICLE}' sy'n eiddo i '{COMPANY}' hyd annilys. Mwy na thebyg fe'u hachoswyd gan NewGRFau. Gall y gêm ddadsyncroneiddio neu chwalu.
-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_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 awtoadnewyddu/-ddisodli fethu ag ailfitio'n gywir
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK :{WHITE}'{1:STRING}' wedi creu lŵp diddiwedd yn y system adalw cynhyrchu
# 'User removed essential NewGRFs'-placeholders for stuff without specs
+# NewGRF scanning window
+STR_NEWGRF_SCAN_CAPTION :{WHITE}Yn sganio NewGRFau
+STR_NEWGRF_SCAN_MESSAGE :{BLACK}Yn sganio NewGRFau. Gall gymeryd peth amser yn ddibynnol ar eu nifer...
+STR_NEWGRF_SCAN_STATUS :{BLACK}{NUM} NewGRF wedi ei sganio allan o gyfanswm o {NUM} rhagdybiedig
+STR_NEWGRF_SCAN_ARCHIVES :Sganio am archifau
+
# Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Rhestr Arwyddion - {COMMA} Arwydd{P "" ion}
@@ -2351,7 +2384,7 @@ STR_LOCAL_AUTHORITY_DO_IT_BUTTON :{BLACK}Gwneud h
STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP :{BLACK}Gweithredu'r dewis uchod
STR_LOCAL_AUTHORITY_ACTION_SMALL_ADVERTISING_CAMPAIGN :Ymgyrch hysbysebu fach
-STR_LOCAL_AUTHORITY_ACTION_MEDIUM_ADVERTISING_CAMPAIGN :Ymgyrch hysbysebu ganolig
+STR_LOCAL_AUTHORITY_ACTION_MEDIUM_ADVERTISING_CAMPAIGN :Ymgyrch hysbysebu gymhedrol
STR_LOCAL_AUTHORITY_ACTION_LARGE_ADVERTISING_CAMPAIGN :Ymgyrch hysbysebu fawr
STR_LOCAL_AUTHORITY_ACTION_ROAD_RECONSTRUCTION :Ariannu gwaith ffordd lleol
STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY :Adeiladu cerflun o berchennog y cwmni
@@ -2359,10 +2392,10 @@ STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS :Ariannu adeilad
STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT :Prynu'r hawl unigryw i wasanaethu anghenion cludiant y dref
STR_LOCAL_AUTHORITY_ACTION_BRIBE :Llwgrwobrwyo awdurdod lleol
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{YELLOW} Dechrau ymgyrch hysbyseb bach yn lleol, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd.{} Côst: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{YELLOW} Dechrau ymgyrch hysbyseb bach yn lleol, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd.{} Côst: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{YELLOW} Dechrau ymgyrch hysbyseb bach yn lleol, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd .{} Côst: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{YELLOW} Ariannu gwith ffordd trefol. Bydd yn amharu'n fawr ar drafnidiaeth y dref am hyd at 6 mis .{} Côst: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING :{YELLOW}Dechrau ymgyrch hysbyseb bach yn yr ardal, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd.{} Côst: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING :{YELLOW}Dechrau ymgyrch hysbyseb gymhedrol yn yr ardal, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd.{} Côst: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING :{YELLOW}Dechrau ymgyrch hysbyseb fawr yn yr adral, er mwyn denu mwy o deithwyr a llwythi i'ch gorsafoedd .{} Cost: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION :{YELLOW} Ariannu gwaith ffordd ar y rhwydwaith ffyrdd trefol. Bydd yn amharu'n fawr ar drafnidiaeth y dref am hyd at 6 mis .{} Cost: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY :{YELLOW} Adeiladu a statue in honour o your company.{} Côst: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS :{YELLOW} Ariannu adeiladu adeiladau masnachol newydd yn y dref.{} Côst: {CURRENCY}
STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT :{YELLOW} Prynu'r hawl i fod yr unig gwmni trafnidiaeth sy'n cael gweithredu yn ardal y dref am flwydd. Dim ond eich gorsafoedd chi fydd yr awdurdod lleol yn caniatáu i deithwyr a llwythi eu defnyddio.{} Côst: {CURRENCY}
@@ -2434,10 +2467,10 @@ STR_FINANCES_EXPENDITURE_INCOME_TITLE :{WHITE}Gwariant
STR_FINANCES_YEAR :{WHITE}{NUM}
STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Adeiladu
STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Cerbydau Newydd
-STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Côst Rhedeg Trenau
+STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Costau Rhedeg Trenau
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Côst Rhedeg Cerbydau Ffordd
-STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Côst Rhedeg Awyrennau
-STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Côst Rhedeg Llongau
+STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Costau Rhedeg Awyrennau
+STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Costau Rhedeg Llongau
STR_FINANCES_SECTION_PROPERTY_MAINTENANCE :{GOLD}Cynnal Eiddo
STR_FINANCES_SECTION_TRAIN_INCOME :{GOLD}Incwm Trenau
STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME :{GOLD}Incwm Cerbydau Ffordd
@@ -2475,7 +2508,7 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA}
STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Adeiladu Pencadlys
STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Gweld pencadlys cwmni
STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Ail-leoli pencadlys cwmni
-STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Ailadeiladu pencadlys cwmni mewn man arall am 1% o werth y cwmni
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Ailadeiladu pencadlys cwmni mewn man arall am 1% o werth y cwmni. Mae Shift+Clicio yn dangos amcangyfrif o'r gost heb adleoli
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Gwyneb Newydd
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Dewiswch wyneb newydd ar gyfer y rheolwr
@@ -2488,8 +2521,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP :{BLACK}Newid en
STR_COMPANY_VIEW_BUY_SHARE_BUTTON :{BLACK}Prynu cyfran o 25% o'r cwmni
STR_COMPANY_VIEW_SELL_SHARE_BUTTON :{BLACK}Gwerthu cyfran o 25% o'r cwmni
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP :{BLACK}Prynu cyfran o 25% o'r cwmni hwn
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Gwerthu cyfran o 25% o'r cwmni hwn
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP :{BLACK}Prynu cyfran o 25% o'r cwmni hwn. Mae Shift+Clicio yn dangos amcangyfrif o'r gost heb brynnu cyfran
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Gwerthu cyfran o 25% o'r cwmni hwn. Mae Shift+Clic yn dangos amcangyfrif o'r gost heb werthu cyfran
STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Enw Cwmni
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Enw Rheolwr
@@ -2541,7 +2574,7 @@ STR_VEHICLE_LIST_AVAILABLE_TRAINS :Trenau sydd ar
STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :Cerbydau sydd ar gael
STR_VEHICLE_LIST_AVAILABLE_SHIPS :Llongau sydd ar gael
STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :Awyrennau sydd ar gael
-STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP :{BLACK}Gweld rhestr o'r cynlluniau modur sydd ar gael ar gyfer y math cerbyd hwn.
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP :{BLACK}Gweld rhestr o'r dyluniau modur sydd ar gael ar gyfer y math yma o gerbyd
STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Golygu'r rhestr
STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Anfon y cyfarwyddiadau at bob cerbyd yn y rhestr
@@ -2569,7 +2602,7 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES :Cerbydau ffordd
STR_GROUP_DEFAULT_SHIPS :Llongau heb eu grwpio
STR_GROUP_DEFAULT_AIRCRAFTS :Awyrenau heb eu grwpio
-STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Grw^p - cliciwch ar grw^p i restru pob cerbyd yn y grw^p hwn
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Grŵp - cliciwch ar rŵp i restru pob cerbyd yn y grŵp hwn
STR_GROUP_CREATE_TOOLTIP :{BLACK}Cliciwch i greu grw^p
STR_GROUP_DELETE_TOOLTIP :{BLACK}Dileu'r grŵp a ddewiswyd
STR_GROUP_RENAME_TOOLTIP :{BLACK}Ailenwi'r grw^p a ddewiswyd
@@ -2591,17 +2624,19 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION :Cerbydau Ffordd
STR_BUY_VEHICLE_SHIP_CAPTION :Llong Newydd
STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Awyrennau Newydd
-STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Côst: {GOLD}{CURRENCY}{BLACK} Pwysau: {GOLD}{WEIGHT_S}
+STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Pwysau: {GOLD}{WEIGHT_S}
STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Cyflymder: {GOLD}{VELOCITY}{BLACK} Pŵer: {GOLD}{POWER}
STR_PURCHASE_INFO_SPEED :{BLACK}Cyflymder: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Côst Rhedeg: {GOLD}{CURRENCY}/flwyddyn
+STR_PURCHASE_INFO_SPEED_OCEAN :{BLACK}Cyflymder ar y môr: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_SPEED_CANAL :{BLACK}Cyflymder ar gamlas/afon: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Cost Rhedeg: {GOLD}{CURRENCY}/bl
STR_PURCHASE_INFO_CAPACITY :{BLACK}Gallu cludo: {GOLD}{CARGO} {STRING}
STR_PURCHASE_INFO_REFITTABLE :(gallu ailffitio)
STR_PURCHASE_INFO_DESIGNED_LIFE :{BLACK}Cynlluniwyd: {GOLD}{NUM}{BLACK} Bywyd: {GOLD}{COMMA} mlynedd{P "" s}
-STR_PURCHASE_INFO_RELIABILITY :{BLACK}Dibynadwyedd Uchaf : {GOLD}{COMMA}%
-STR_PURCHASE_INFO_COST :{BLACK}Côst: {GOLD}{CURRENCY}
+STR_PURCHASE_INFO_RELIABILITY :{BLACK}Dibynadwyedd Uchaf: {GOLD}{COMMA}%
+STR_PURCHASE_INFO_COST :{BLACK}Cost: {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_COST_SPEED :{BLACK}Cost: {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}
@@ -2722,8 +2757,8 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE :trên monoreilf
STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE :trên maglef
STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Côst: {CURRENCY} Pwysau: {WEIGHT_S}{}Cyflymder: {VELOCITY} Pŵer: {POWER}{}Côst Rhedeg: {CURRENCY}/bl{}Gallu cludo: {CARGO}
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST :{BLACK}Côst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}, {CARGO}{}Côst Rhedfa: {CURRENCY}/yr
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST :{BLACK}Côst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}{}Cost Rhedfa: {CURRENCY}/bl
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST :{BLACK}Cost: {CURRENCY} Cyflym. Uchaf: {VELOCITY}{}Cynhwysedd: {CARGO}, {CARGO}{}Côst Rhedeg: {CURRENCY}/bl
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST :{BLACK}Cost: {CURRENCY} Cyflym. Uchaf: {VELOCITY}{}Cynhwysedd: {CARGO}{}Cost Rhedeg: {CURRENCY}/bl
# Autoreplace window
STR_REPLACE_VEHICLES_WHITE :{WHITE}Disodli {STRING}
@@ -2755,7 +2790,7 @@ STR_REPLACE_MONORAIL_VEHICLES :Cerbydau Monore
STR_REPLACE_MAGLEV_VEHICLES :Cerbydau Maglef
STR_REPLACE_REMOVE_WAGON :{BLACK}Tynnu wagenni: {ORANGE}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Gwneud i awtoddisodli gadw hyd y trên yr un peth drwy dynnu wagenni (gan ddechrau yn y blaen), os byddai disodli'r injan yn gwneud y trên yn hirach.
+STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Gwneud i awtoddisodli gadw hyd y trên yr un peth drwy dynnu wagenni (gan ddechrau yn y blaen), os byddai newid yr injan yn gwneud y trên yn hirach
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
@@ -2825,7 +2860,7 @@ STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME :{BLACK}Enwi cer
STR_VEHICLE_DETAILS_SHIP_RENAME :{BLACK}Enwi llong
STR_VEHICLE_DETAILS_AIRCRAFT_RENAME :{BLACK}Enwi awyren
-STR_VEHICLE_INFO_AGE_RUNNING_COST_YR :{BLACK}Oed: {LTBLUE}{STRING}{BLACK} Cost Rhedfa: {LTBLUE}{CURRENCY}/bl.
+STR_VEHICLE_INFO_AGE_RUNNING_COST_YR :{BLACK}Oed: {LTBLUE}{STRING}{BLACK} Cost Rhedeg: {LTBLUE}{CURRENCY}/bl
# The next two need to stay in this order
STR_VEHICLE_INFO_AGE :{COMMA} b{P "lwyddyn" lynyddoedd} ({COMMA})
STR_VEHICLE_INFO_AGE_RED :{RED}{COMMA} b{P "" lynyddoedd} ({COMMA})
@@ -2835,7 +2870,7 @@ STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Pwys: {L
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_RELIABILITY_BREAKDOWNS :{BLACK}Dibynadwyedd: {LTBLUE}{COMMA}% {BLACK}Toriadau ers 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}{3:STRING}
@@ -2939,12 +2974,15 @@ STR_ORDER_DROP_HALT_DEPOT :Stopio
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Hepgor y gorchymyn hwn os nad oes angen gwasanaeth
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Data cerbyd i seilio'r naid arno
+
+# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Canran llwyth
STR_ORDER_CONDITIONAL_RELIABILITY :Dibynadwyedd
STR_ORDER_CONDITIONAL_MAX_SPEED :Cyflymder uchaf
STR_ORDER_CONDITIONAL_AGE :Oed cerbyd (blynyddoedd)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Angen gwasanaeth
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Bob tro
+STR_ORDER_CONDITIONAL_REMAINING_LIFETIME :Oes yn weddill (blynyddoedd)
STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP :{BLACK}Sut i gymharu'r data cerbyd i'r gwerth a roddwyd
STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS :yn hafal i
@@ -2994,6 +3032,7 @@ STR_ORDER_STOP_ORDER :(Stopio)
STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING}
+STR_ORDER_IMPLICIT :(Ymhlyg)
STR_ORDER_FULL_LOAD :(Llwyth llawn)
STR_ORDER_FULL_LOAD_ANY :(Llwyth llawn o unrhyw gargo)
@@ -3008,7 +3047,7 @@ STR_ORDER_TRANSFER_FULL_LOAD_ANY :(Trosglwyddo ac
STR_ORDER_TRANSFER_NO_LOAD :(Trosglwyddo a gadael yn wag)
STR_ORDER_NO_UNLOAD :(Dim dadlwytho ond cymryd cargo)
STR_ORDER_NO_UNLOAD_FULL_LOAD :(Dim dadlwytho, aros am lwyth llawn)
-STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Dim dadlwytho, aros am lwyth llawn)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Dim dadlwytho, aros am unrhyw lwyth llawn)
STR_ORDER_STOP_LOCATION_NEAR_END :[ochr agos]
STR_ORDER_STOP_LOCATION_MIDDLE :[canol]
@@ -3025,7 +3064,7 @@ STR_TIMETABLE_TITLE :{WHITE}{VEHICLE
STR_TIMETABLE_ORDER_VIEW :{BLACK}Gorchmynion
STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Newid i'r golwg gorchmynion
-STR_TIMETABLE_TOOLTIP :{BLACK}Amserlen - cliciwch ar orchymyn er mwyn ei amlygu.
+STR_TIMETABLE_TOOLTIP :{BLACK}Amserlen - cliciwch ar orchymyn i'w amlygu
STR_TIMETABLE_NO_TRAVEL :Dim teithio
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Teithio (heb ei amserlenu)
@@ -3038,7 +3077,7 @@ STR_TIMETABLE_TICKS :{COMMA} tic{P "
STR_TIMETABLE_TOTAL_TIME :{BLACK}Bydd yr amserlen hon yn cymryd {STRING} i'w chwblhau
STR_TIMETABLE_TOTAL_TIME_INCOMPLETE :{BLACK}Bydd yr amserlen hon yn cymryd o leiaf {STRING} i'w chwblhau (heb ei hamserlennu'n llwyr)
-STR_TIMETABLE_STATUS_ON_TIME :{BLACK}Mae'r cerbyd hwn yn rhedeg ar hyn o bryd
+STR_TIMETABLE_STATUS_ON_TIME :{BLACK}Mae'r cerbyd hwn yn rhedeg ar amser ar hyn o bryd
STR_TIMETABLE_STATUS_LATE :{BLACK}Mae'r cerbyd hwn yn rhedeg {STRING} yn hwyr ar hyn o bryd
STR_TIMETABLE_STATUS_EARLY :{BLACK}Mae'r cerbyd hwn yn rhedeg {STRING} yn gynnar ar hyn o bryd
@@ -3069,7 +3108,7 @@ STR_AI_DEBUG_RELOAD :{BLACK}Ail-lwyt
STR_AI_DEBUG_RELOAD_TOOLTIP :{BLACK}lladd yr AI, ail-lwytho'r sgript ac ailgychwyn yr AI
-STR_ERROR_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.
+STR_ERROR_AI_PLEASE_REPORT_CRASH :{WHITE}Mae AI a oedd yn rhedeg wedi chwalu. A fyddwch cystad ag adrodd am hyn i awdur yr AI ynghyd â sgrin-gipiad o'r Ffenestr Ddadnamu AI
STR_ERROR_AI_DEBUG_SERVER_ONLY :{YELLOW}Mae'r Ffenestr Ddadfygio AI ar gael yn unig ar gyfer y gweinydd
# AI configuration window
@@ -3111,7 +3150,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
# Income 'floats'
-STR_INCOME_FLOAT_COST_SMALL :{TINYFONT}{RED}Côst: {CURRENCY}
+STR_INCOME_FLOAT_COST_SMALL :{TINYFONT}{RED}Cost: {CURRENCY}
STR_INCOME_FLOAT_COST :{RED}Côst: {CURRENCY}
STR_INCOME_FLOAT_INCOME_SMALL :{TINYFONT}{GREEN}Incwm: {CURRENCY}
STR_INCOME_FLOAT_INCOME :{GREEN}Incwm: {CURRENCY}
@@ -3133,19 +3172,21 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Mae'r gêm a ga
STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Ffeil annarllenadwy
STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Ffeil anysgrifenadwy
STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED :Methodd y gwirio cyfanrwydd data
-STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Cafodd y gêm ei gadw mewn fersiwn heb dram. Cafodd y tramiau eu dileu.
+STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Cafodd y gêm ei gadw mewn fersiwn heb gynhaliaeth tramiau. Dileuwyd y tramiau
# Map generation messages
STR_ERROR_COULD_NOT_CREATE_TOWN :{WHITE}Ataliwyd creu map...{}... nid oedd lleoliadau addas ar gyfer trefi
STR_ERROR_NO_TOWN_IN_SCENARIO :{WHITE}... nid oes tref yn y senario hwn
STR_ERROR_PNGMAP :{WHITE}Methwyd llwytho tirwedd o PNG...
-STR_ERROR_PNGMAP_FILE_NOT_FOUND :{WHITE}... ni ddaethpwyd o hyd i'r ffeil.
-STR_ERROR_PNGMAP_IMAGE_TYPE :{WHITE}... nid oedd modd trosi math y ddelwedd. rhaid cael delwedd PNG 8 neu 24-bit.
-STR_ERROR_PNGMAP_MISC :{WHITE}... aeth rhywbeth o'i le (mwy na thebyg roedd y ffeil wedi'i llygru)
+STR_ERROR_PNGMAP_FILE_NOT_FOUND :{WHITE}... ni ganfuwyd y ffeil
+STR_ERROR_PNGMAP_IMAGE_TYPE :{WHITE}... nid oedd modd trosi math y ddelwedd. Rhaid cael delwedd PNG 8 neu 24-did.
+STR_ERROR_PNGMAP_MISC :{WHITE}... aeth rhywbeth o'i le (ffeil lygredig fwy na thebyg)
STR_ERROR_BMPMAP :{WHITE}Methu llwytho delwedd o BMP...
-STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... nid oedd modd trosi math y ddelwedd.
+STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... ni fu modd trosi math y ddelwedd
+
+STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... delwedd yn rhy fawr
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Rhybudd Graddfa
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Ni argymhellir newid gormod ar faint y map gwreiddiol. Parhau gyda'r cynhyrchu?
@@ -3188,7 +3229,7 @@ STR_ERROR_CAN_T_RAISE_LAND_HERE :{WHITE}Does dim
STR_ERROR_CAN_T_LOWER_LAND_HERE :{WHITE}Does dim modd gostwng tir yma...
STR_ERROR_CAN_T_LEVEL_LAND_HERE :{WHITE}Does dim modd lefelu tir yma...
STR_ERROR_EXCAVATION_WOULD_DAMAGE :{WHITE}Byddai cloddio yno'n difrodi twnnel
-STR_ERROR_ALREADY_AT_SEA_LEVEL :{WHITE}Eisoes ar lefel y môr
+STR_ERROR_ALREADY_AT_SEA_LEVEL :{WHITE}... eisoes ar lefel y môr
STR_ERROR_TOO_HIGH :{WHITE}Rhy uchel
STR_ERROR_ALREADY_LEVELLED :{WHITE}... mae eisoes yn fflat
@@ -3227,11 +3268,13 @@ STR_ERROR_INDUSTRY_TOO_CLOSE :{WHITE}... rhy
STR_ERROR_MUST_FOUND_TOWN_FIRST :{WHITE}... rhaid adeiladu tref yn gyntaf
STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN :{WHITE}... caniateir un yn unig ym mhob tref
STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200 :{WHITE}... gellir ei adeiladu'n unig mewn trefi gyda phoblogaeth o 1200 neu fwy
-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_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}... gellir ei adeiladu mewn ardal coedwig glaw yn unig
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}... gellir ei adeiladu mewn ardal anialwch yn unig
STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}... gellir ei adeiladu mewn trefi yn unig
STR_ERROR_CAN_ONLY_BE_POSITIONED :{WHITE}... dim ond ger ymyl y map y gellir ei leoli
STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}... dim ond uwch ben y llinell eira mae modd plannu fforest
+STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE :{WHITE}... gellir ei adeiladu uwchben yr eirlin yn unig
+STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE :{WHITE}... gellir ei adeiladu islaw i'r eirlin yn unig
# Station construction related errors
STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Methu adeiladu gorsaf reilffordd yma...
@@ -3297,7 +3340,7 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR :{WHITE}... fod
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_ERROR_TRAIN_TOO_LONG :{WHITE}Mae'r Trên yn rhy hir
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_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}... mae'n cynnwys sawl uned
STR_ERROR_INCOMPATIBLE_RAIL_TYPES :Mathau rheilffordd anghydnaws
STR_ERROR_CAN_T_MOVE_VEHICLE :{WHITE}Methu symud y cerbyd...
@@ -3309,7 +3352,7 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :math depo anghy
# Autoreplace related errors
STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}Aeth gormod o amser heibio i allu adnewyddu {VEHICLE}
-STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Ni weithredwyd unrhyw reolau awtogyfnewid/adnewydd.
+STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Ni weithredwyd unrhyw reolau awtogyfnewid/adnewyddu
STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(terfyn arian)
# Rail construction errors
@@ -3338,7 +3381,10 @@ STR_ERROR_CAN_T_BUILD_CANALS :{WHITE}Methu ad
STR_ERROR_CAN_T_BUILD_LOCKS :{WHITE}Methu adeiladu lociau yma...
STR_ERROR_CAN_T_PLACE_RIVERS :{WHITE}Methu gosod afonydd yma...
STR_ERROR_MUST_BE_BUILT_ON_WATER :{WHITE}... rhaid ei adeiladu ar ddŵr
-STR_ERROR_CAN_T_BUILD_ON_WATER :{WHITE}... Methu adeiladu ar ddŵr
+STR_ERROR_CAN_T_BUILD_ON_WATER :{WHITE}... methu adeiladu ar ddŵr
+STR_ERROR_CAN_T_BUILD_ON_SEA :{WHITE}... methu adeiladu ynghanol y môr
+STR_ERROR_CAN_T_BUILD_ON_CANAL :{WHITE}... methu adeiladu ar gamlas
+STR_ERROR_CAN_T_BUILD_ON_RIVER :{WHITE}... methu adeiladu ar afon
STR_ERROR_MUST_DEMOLISH_CANAL_FIRST :{WHITE}Rhaid dymchwel camlas yn gyntaf
STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE :{WHITE}Methu adeiladu traphont yma...
@@ -3430,6 +3476,7 @@ STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Methu ne
# Specific vehicle errors
STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL :{WHITE}Does dim modd gwneud i drên basio signal pan fo perygl...
STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN :{WHITE}Methu gwrthdroi cyfeiriad trên...
+STR_ERROR_TRAIN_START_NO_POWER :Mae'r trên heb bŵer
STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN :{WHITE}ddim yn methu troi'r cerbyd...
@@ -3454,8 +3501,8 @@ STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION :{WHITE}... rhy
# Timetable related errors
STR_ERROR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Methu amserlennu cerbyd...
-STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Dim ond mewn gorsafoedd y gall cerbydau aros.
-STR_ERROR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Nid yw'r cerbyd hwn yn aros yn yr orsaf hon.
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Dim ond mewn gorsafoedd y gall cerbydau aros
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Nid yw'r cerbyd hwn yn galw yn yr orsaf hon
# Sign related errors
STR_ERROR_TOO_MANY_SIGNS :{WHITE}... gormod o arwyddion
@@ -3906,6 +3953,7 @@ STR_TINY_BLACK_COMA :{TINYFONT}{BLAC
STR_TINY_COMMA :{TINYFONT}{COMMA}
STR_BLUE_COMMA :{BLUE}{COMMA}
STR_RED_COMMA :{RED}{COMMA}
+STR_TINY_BLACK_DECIMAL :{TINYFONT}{BLACK}{DECIMAL}
STR_COMPANY_MONEY :{WHITE}{CURRENCY}
STR_BLACK_DATE_LONG :{BLACK}{DATE_LONG}
STR_BLACK_CROSS :{BLACK}{CROSS}