--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -3928,9 +3928,9 @@
 STR_SV_STNAME_CENTRAL                                           :{STRING} Centrale
 STR_SV_STNAME_TRANSFER                                          :{STRING} Interscambio
 STR_SV_STNAME_HALT                                              :{STRING} Fermata
-STR_SV_STNAME_VALLEY                                            :{STRING} Valle
+STR_SV_STNAME_VALLEY                                            :Valle di {STRING}
 STR_SV_STNAME_HEIGHTS                                           :Alture di {STRING}
-STR_SV_STNAME_WOODS                                             :{STRING} Bosco
+STR_SV_STNAME_WOODS                                             :Bosco di {STRING}
 STR_SV_STNAME_LAKESIDE                                          :{STRING} Lago
 STR_SV_STNAME_EXCHANGE                                          :{STRING} Scambio
 STR_SV_STNAME_AIRPORT                                           :Aeroporto di {STRING}

--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -264,7 +264,7 @@
 STR_SORT_BY_POPULATION                                          :Iedzīvotājiem
 STR_SORT_BY_NAME                                                :Nosaukuma
 STR_SORT_BY_PRODUCTION                                          :Produkcijas
-STR_SORT_BY_TYPE                                                :Tipa
+STR_SORT_BY_TYPE                                                :Veida
 STR_SORT_BY_TRANSPORTED                                         :Transportētā
 STR_SORT_BY_NUMBER                                              :Numura
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Ienākumiem pērn
@@ -296,7 +296,7 @@
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Paātrināta spēle
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opcijas
 STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Saglabāt spēli, pamest spēli, beigt
-STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Parādīt karti, papildus redzespunktu vai zīmju sarakstu
+STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Parādīt karti, papildus skatpunktu vai zīmju sarakstu
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Parādīt pilsētu sarakstu
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Rādīt subsīdijas
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS            :{BLACK}Parādīt uzņēmuma staciju sarakstu
@@ -305,10 +305,10 @@
 STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Parādīt grafikus
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Parādīt uzņēmuma rangu sarakstu
 STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Finansēt jauna industriāla objekta būvniecību
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Parādīt uzņēmuma vilcienu sarkstu. Ctrl+Klikšķis pārslēdz starp grupu/transportlīdzekļu sarakstu
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Parādīt uzņēmuma mašīnu sarakstu. Ctrl+Klikšķis pārslēdz grupu/transportlīdzekļu saraksta atvēršanu
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Parādīt uzņēmuma kuģu sarakstu. Ctrl+Klikšķis pārslēdz grupu/transportlīdzekļu saraksta atvēršanu
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Parādīt uzņēmuma lidaparātu sarakstu. Ctrl+Klikšķis pārslēdz grupu/transportlīdzekļu saraksta atvēršanu
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Parādīt uzņēmuma vilcienu sarakstu. Ctrl+klikšķis pārslēdz starp grupu/transportlīdzekļu sarakstu
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Parādīt uzņēmuma automašīnu sarakstu. Ctrl+klikšķis pārslēdz grupu/transportlīdzekļu saraksta atvēršanu
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Parādīt uzņēmuma kuģu sarakstu. Ctrl+klikšķis pārslēdz grupu/transportlīdzekļu saraksta atvēršanu
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Parādīt uzņēmuma lidaparātu sarakstu. Ctrl+klikšķis pārslēdz grupu/transportlīdzekļu saraksta atvēršanu
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Pietuvināt skatu
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Attālināt skatu
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Būvēt sliežu posmu
@@ -436,7 +436,7 @@
 ############ range ends here
 
 ############ range for message menu starts
-STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Pēdējā ziņa/jaunums
+STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Pēdējā ziņa/avīžraksts
 STR_NEWS_MENU_MESSAGE_SETTINGS                                  :Ziņojumu iestatījumi
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Ziņojumu vēsture
 ############ range ends here
@@ -1139,7 +1139,7 @@
 STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END                       :beigu tuvumā
 STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE                         :vidū
 STR_CONFIG_SETTING_STOP_LOCATION_FAR_END                        :tālākajā galā
-STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :{LTBLUE}Automobiļu rindas (ar kvantu efektiem): {ORANGE}{STRING}
+STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :{LTBLUE}Autotransporta rindas (ar kvantu efektiem): {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}Bīdīt logu, kad peles kursors atrodas tā malā: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}Atļaut vietējo varas iestāžu piekukuļošanu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :{LTBLUE}Atļaut iegādāties ekskluzīvās pārvadājumu tiesības: {ORANGE}{STRING}
@@ -1152,23 +1152,23 @@
 STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED                        :samazināts
 STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :{G=f}normāla
 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :{LTBLUE}Atļaut braukt cauri pilsētai piederošiem slēgtiem ceļiem: {ORANGE}{STRING}
-STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}Atļaut caurbraucošas pieturas uz konkurentu ceļiem: {ORANGE}{STRING}
+STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}Atļaut caurbraucamas pieturas uz konkurentu ceļiem: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Atļaut būvēt vienu otrai piekļautas stacijas: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}Iespējot vairākus NewGRF transporta līdzekļu komplektus: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Šo parametru nav iespējams izmainīt, kad tur ir transportlīdzekļi
+STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Šo iestatījumu nav iespējams izmainīt, kad tur ir transportlīdzekļi
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE}Lidostas darbosies mūžīgi: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_WARN_LOST_VEHICLE                            :{LTBLUE}Brīdināt, ja transportlīdzeklis ir noklīdis: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ORDER_REVIEW                                 :{LTBLUE}Pārskatīt transportu rīkojumus: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ORDER_REVIEW_OFF                             :nē
-STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT                         :jā, izņemot apstādinātos transportus
-STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :visiem transporta līdzekļiem
+STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT                         :jā, izņemot apstādinātos transportlīdzekļus
+STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :visiem transportlīdzekļiem
 STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE}Brīdināt, ja transporta ienākumi ir negatīvi: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Transporta līdzekļi nekad nemirst: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}Automātiski atjaunot transportl., kad tie kļuvuši veci: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Automātiski atjaunot transportl. {ORANGE}{STRING}{LTBLUE} mēnešus pirms/pēc maks. vecuma
-STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}Automātiski atjaunot minimālo naudu, kas vajadzīga atjaunošanai: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}Automātiski atjaunot transportlīdz., kad tie kļuvuši veci: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Automātiski atjaunot transportlīdz. {ORANGE}{STRING}{LTBLUE} mēnešus pirms/pēc maks. vecuma
+STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}Automātiski atjaunot minimālo naudu atjaunošanai: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}Kļūdas ziņojuma ilgums: {ORANGE}{STRING} sekun{P 0:1 di des žu}
 STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}Rādīt skaidrojumus: {ORANGE}Attēlot {STRING} sekund{P 0:1 i es es}
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :{LTBLUE}Rādīt skaidrojumus: {ORANGE}Labais klikšķis
@@ -1188,44 +1188,44 @@
 STR_CONFIG_SETTING_TREE_PLACER_NONE                             :Nav
 STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL                         :Parasts
 STR_CONFIG_SETTING_TREE_PLACER_IMPROVED                         :Uzlabots
-STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :{LTBLUE}Augstumkartes rotācija: {ORANGE}{STRING}
-STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Pret pulksteņa radītāja virzienu
-STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Pa pulksteņa radītāja virzienu
-STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Augstuma līmenis prekš līdzena scenārija kartes: {ORANGE}{STRING}
+STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :{LTBLUE}Augstumu kartes pagriešana: {ORANGE}{STRING}
+STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Pret pulksteņa rādītāja virzienu
+STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Pulksteņa rādītāja virzienā
+STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Augstuma līmenis līdzenai scenārija kartei: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE}Atļaut pārveidot laukus, kas atrodas kartes malās : {ORANGE}{STRING}
-STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}Viena vai vairākas malas ziemeļu stūrī nav tukšas
-STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}Vienā vai vairākās malās, vienā no stūriem nav ūdens
-
-STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Maks. staciju izmērs: {ORANGE}{STRING} lauciņ{P 0:1 š i u} {RED}Brīdinājums: Lielas vērtības palēlina spēli
+STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}Viens vai vairāki lauciņi pie ziemeļu malas nav tukši
+STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}Vienam vai vairākiem lauciņiem kādā malā nav ūdens
+
+STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Maksimālais staciju lielums: {ORANGE}{STRING} lauciņ{P 0:1 š i u} {RED}Brīdinājums: Lielas vērtības palēnina spēli
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}Automātiski apkalpot helikopterus heliportos: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Sasaitē ainavas rīkjoslu ar celtniecības rīkjoslām: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR                         :{LTBLUE}Kartes zemes krāsa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN                   :Zaļa
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN              :{G=f}Tumši zaļa
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :{G=f}Violeta
-STR_CONFIG_SETTING_REVERSE_SCROLLING                            :{LTBLUE}Pretējs pārtīšanas virziens: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :{LTBLUE}Plūstoša skatpunkta pārbīde: {ORANGE}{STRING}
+STR_CONFIG_SETTING_REVERSE_SCROLLING                            :{LTBLUE}Pretējs ritināšanas virziens: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :{LTBLUE}Plūdena skatpunkta ritināšana: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :{LTBLUE}Rādīt mērījumu rīkjoslu, izmantojot celtniecības rīkus: {ORANGE}{STRING}
-STR_CONFIG_SETTING_LIVERIES                                     :{LTBLUE}Parādīt kompānijas ģildes: {ORANGE}{STRING}
+STR_CONFIG_SETTING_LIVERIES                                     :{LTBLUE}Rādīt uzņēmuma livrejas (krāsojumu): {ORANGE}{STRING}
 STR_CONFIG_SETTING_LIVERIES_NONE                                :Nav
 STR_CONFIG_SETTING_LIVERIES_OWN                                 :Paša uzņēmums
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :Visi uzņēmumi
 STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :{LTBLUE}Dot priekšroku tērzēšanai ar <ENTER>: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING                        :{LTBLUE}Peles ritenīša funkcija: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM                             :Pietuvināt karti
-STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL                           :Bīdīt karti
+STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL                           :Ritināt karti
 STR_CONFIG_SETTING_SCROLLWHEEL_OFF                              :Izslēgts
 STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER                       :{LTBLUE}Peles ritenīša ātrums: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU                          :{LTBLUE}Labā klikšķa emulēšana: {ORANGE}{STRING}
-STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Kommand-klik
-STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Ctrl-klik
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Komanda+klikšķis
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Ctrl+klikšķis
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Izslēgta
 
-STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :{LTBLUE}Kreisā-klikšķa ritināšana: {ORANGE}{STRING}
+STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :{LTBLUE}Kreisā klikšķa ritināšana: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :{LTBLUE}Lietot {ORANGE}{STRING}{LTBLUE} datuma formātu saglabāto spēļu nosaukumiem .
-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :garš (31-ais Dec.2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :garš (31. Dec. 2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :īss (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)
 
@@ -1239,24 +1239,24 @@
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION     :visas, izņemot būvniecības darbības
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING      :visas, izņemot ainavas pārveidošanas darbības
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :visas darbības
-STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}Lietot speciālo transporta līdzekļu sarakstu: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}Lietot transporta līdzekļu papildināto kustības sarakstu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LOADING_INDICATORS                           :{LTBLUE}Lietot piekraušanas indikatorus: {ORANGE}{STRING}
-STR_CONFIG_SETTING_TIMETABLE_IN_TICKS                           :{LTBLUE}Rādīt sarakstu tikšķos nevis dienās: {ORANGE}{STRING}
-STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE             :{LTBLUE}Rādīt maršrutu sarakstos ienākšanu un atiešanu: {ORANGE}{STRING}
-STR_CONFIG_SETTING_QUICKGOTO                                    :{LTBLUE}Ātrā transporta norīkojumu veidošana: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE                            :{LTBLUE}Sliežu tips pēc noklusējuma: {ORANGE}{STRING}
+STR_CONFIG_SETTING_TIMETABLE_IN_TICKS                           :{LTBLUE}Rādīt sarakstu tikos nevis dienās: {ORANGE}{STRING}
+STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE             :{LTBLUE}Maršrutu sarakstos rādīt pienākšanu un atiešanu: {ORANGE}{STRING}
+STR_CONFIG_SETTING_QUICKGOTO                                    :{LTBLUE}Transporta norīkojumu ātrā veidošana: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE                            :{LTBLUE}Noklusējuma sliežu veids (pēc jaunas spēles/spēles ielādes): {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST                      :Pirmās pieejamās
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST                       :Pēdējās pieejamās
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED                  :Visbiežāk lietotās
 STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :{LTBLUE}Rādīt rezervētās sliedes: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :{LTBLUE}Paturēt celtnes rīkus aktīvus pēc lietošanas: {ORANGE}{STRING}
-STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Grupēt izdevumu sadaļas kompānijas finanšu informācijas logā: {ORANGE}{STRING}
-
-STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :{LTBLUE}Atspējot infrastruktūras būvēšanu, ja nav pieejamu piemērotu transportlīdzekļu: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Maks. vilcieni uz kompāniju: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :{LTBLUE}Maks. mašīnas uz kompāniju: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Maks. lidaparāti uz kompāniju: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_SHIPS                                    :{LTBLUE}Maks. kuģi uz kompāniju: {ORANGE}{STRING}
+STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Grupēt izdevumu sadaļas uzņēmuma finansu informācijas logā: {ORANGE}{STRING}
+
+STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :{LTBLUE}Atspējot infrastruktūras būvēšanu, ja nav pieejami piemēroti transportlīdzekļi: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Maksimālais vilcienu skaits uzņēmumā: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :{LTBLUE}Maksimālais automašīnu skaits uzņēmumā: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Maksimālais lidaparātu skaits uzņēmumam: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_SHIPS                                    :{LTBLUE}Maksimālais kuģu skaits uzņēmumā: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :{LTBLUE}Izslēgt datoram vilcienus: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :{LTBLUE}Izslēgt datoram mašīnas: {ORANGE}{STRING}
@@ -1461,11 +1461,11 @@
 STR_LIVERY_MAGLEV                                               :Magnētiskais
 STR_LIVERY_DMU                                                  :DMU
 STR_LIVERY_EMU                                                  :EMU
-STR_LIVERY_PASSENGER_WAGON_STEAM                                :Pasažieru vagons (Tvaika)
-STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Pasažieru vagons (Dīzelis)
-STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Pasažieru vagons (Elektriskais)
-STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Pasažieru vagons (Viensliežu)
-STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Pasažieru vagons (Maglevs)
+STR_LIVERY_PASSENGER_WAGON_STEAM                                :Pasažieru vagons (tvaika)
+STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Pasažieru vagons (dīzeļa)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Pasažieru vagons (elektriskais)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Pasažieru vagons (viensliedes)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Pasažieru vagons (magleva)
 STR_LIVERY_FREIGHT_WAGON                                        :Kravas vagons
 STR_LIVERY_BUS                                                  :Autobuss
 STR_LIVERY_TRUCK                                                :Smagā mašīna
@@ -1686,7 +1686,7 @@
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Savienojos..
 STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Autorizējos..
 STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Gaidu..
-STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) Lejupielādē karti..
+STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) Lejupielādē karti...
 STR_NETWORK_CONNECTING_5                                        :{BLACK}(5/6) Apstrādāju datus..
 STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Reģistrējas...
 
@@ -1807,9 +1807,9 @@
 STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :*** {STRING} ir pievienojies spēlei (Client #{2:NUM})
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} ir pievienojies kompānijai #{2:NUM}
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} ir pievienojis skatītājus
-STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} ir nodibinājis jaunu kompāniju (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} ir nodibinājis jaunu uzņēmumu (#{2:NUM})
 STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} ir pametis spēli ({2:STRING})
-STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} ir nomainījis savu vārdu uz {STRING}
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} ir nomainījis savu nosaukumu uz {STRING}
 STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} iedeva jūsu uzņēmumam {2:CURRENCY}
 STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Jūs iedevāt {1:STRING} {2:CURRENCY}
 STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}Serveris beidza sesiju
@@ -1817,21 +1817,21 @@
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Satura lejupielāde
-STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tips
-STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Satura tips
-STR_CONTENT_NAME_CAPTION                                        :{BLACK}Vārds
-STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}SAtura vārds
+STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Veids
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Satura veids
+STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nosaukums
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Satura nosaukums
 STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klikšķiniet uz līnijas lai redzētu detaļas{}Klikšķiniet kvadrātā, lai iezīmētu to lejupielādei
-STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Iezīmēt visu
-STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Iezīmēt visu saturu lejupielādei
-STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Norādiet uzlabojumus
-STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Iezīmējiet visu saturu lejupielādei, lai, tas ir uzlabojums eksistējošam saturam
-STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Atcelt visa iezīmēšanu
-STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Iezīmēt visu saturu lejupielādei
-STR_CONTENT_FILTER_TITLE                                        :{BLACK}Taga/vārda filtrs:
+STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Atlasīt visu
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Atzīmēt visu saturu lejupielādei
+STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Atlasiet uzlabojumus
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Atzīmējiet visu saturu lejupielādei, lai, tas ir uzlabojums esošajam saturam
+STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Atcelt visa atlasi
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Atzīmēt visu saturu lejupielādei
+STR_CONTENT_FILTER_TITLE                                        :{BLACK}Kategoriju/nosaukumu filtrs:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Lejupielāde
-STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Sākt norādītā lejupielādi
-STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Kopējais apjoms: {WHITE}{BYTES}
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Sākt atlasītā lejupielādi
+STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Lejupielādes kopējais lielums: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}SAtura informācija
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Jūs neesat šo iezīmējuši lejupielādei
 STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}Jūs esat šo iezīmējuši lejupielādei
@@ -1844,15 +1844,15 @@
 STR_CONTENT_DETAIL_DESCRIPTION                                  :{SILVER}Apraksts: {WHITE}{STRING}
 STR_CONTENT_DETAIL_URL                                          :{SILVER}URL: {WHITE}{STRING}
 STR_CONTENT_DETAIL_TYPE                                         :{SILVER}Tips: {WHITE}{STRING}
-STR_CONTENT_DETAIL_FILESIZE                                     :{SILVER}Izmērs: {WHITE}{BYTES}
-STR_CONTENT_DETAIL_SELECTED_BECAUSE_OF                          :{SILVER}Iezīmēts, jo: {WHITE}{STRING}
-STR_CONTENT_DETAIL_DEPENDENCIES                                 :{SILVER}Dependencies: {WHITE}{STRING}
+STR_CONTENT_DETAIL_FILESIZE                                     :{SILVER}Lejupielādes lielums: {WHITE}{BYTES}
+STR_CONTENT_DETAIL_SELECTED_BECAUSE_OF                          :{SILVER}Atlasīts, jo: {WHITE}{STRING}
+STR_CONTENT_DETAIL_DEPENDENCIES                                 :{SILVER}Atkarības: {WHITE}{STRING}
 STR_CONTENT_DETAIL_TAGS                                         :{SILVER}Tags: {WHITE}{STRING}
 STR_CONTENT_NO_ZLIB                                             :{WHITE}OPENTTD ir būvēts bez ''zlib'' palīdzības...
 STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}... lejuplādēt saturu nav iespējams!
 
 # Order of these is important!
-STR_CONTENT_TYPE_BASE_GRAPHICS                                  :Base grafiks
+STR_CONTENT_TYPE_BASE_GRAPHICS                                  :Pamata grafika
 STR_CONTENT_TYPE_NEWGRF                                         :Jauns GRF
 STR_CONTENT_TYPE_AI                                             :Al
 STR_CONTENT_TYPE_AI_LIBRARY                                     :Al bibliotēka
@@ -1869,19 +1869,19 @@
 STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES} no {BYTES} lejupielādēts ({NUM} %)
 
 # Content downloading error messages
-STR_CONTENT_ERROR_COULD_NOT_CONNECT                             :{WHITE}Nav iespējams kontaktēties ar satura serveri...
+STR_CONTENT_ERROR_COULD_NOT_CONNECT                             :{WHITE}Nav iespējams savienoties ar satura serveri...
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD                            :{WHITE}Lejupielāde nav notikusi...
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... pārtrūkuši sakari
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... fails nav rakstāms
-STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Neizdevās saspiest lejupielādējamo failu
+STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Neizdevās atspiest lejupielādēto failu
 
 # Transparency settings window
-STR_TRANSPARENCY_CAPTION                                        :{WHITE}Caurspīdības opcija
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Pārslēgt stacijas zīmju caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Pārslēgt koku caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Pārslēgt ēku caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Pārslēgt rūpniecības ēku caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Pārslēgt caurspīdību tādām ēkām kā depo,stacijas un ceļapunkti. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Caurspīdības opcijas
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Pārslēgt stacijas zīmju caurspīdību. Ctrl+klikšķis lai slēgtu
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Pārslēgt koku caurspīdību. Ctrl+klikšķis lai slēgtu
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Pārslēgt ēku caurspīdību. Ctrl+klikšķis lai slēgtu
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Pārslēgt rūpniecības ēku caurspīdību. Ctrl+klikšķis lai slēgtu
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Pārslēgt caurspīdību tādām ēkām kā depo, stacijas un ceļapunkti. Ctrl+klikšķis lai slēgtu.
 STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Pārslēgt tiltu caurspīdību. CTRL+klikšķis lai slēgtu.
 STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Pārslēgt caurspīdību tādām ēkām kā bākas un antenas. CTRL+klikšķis lai slēgtu.
 STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Pārslēgt catenary caurspīdību. CTRL+klikšķis lai slēgtu.
@@ -1912,10 +1912,10 @@
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Būvēt sliedes. Ctrl pārslēdz sliežu būvniecību/demolēšanu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Būvēt dzelzceļu, izmantojot Autorail režīmu. Ctrl pārslēdz sliežu būvniecību/demolēšanu
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Build vilcienu depo (priekš vilcienu celtniecības un apkopes)
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Būvēt vilcienu depo (vilcienu pirkšanai un apkopei). Shift pārslēdz ēkas/rādīt izmaksu tāmi
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Pārvērst sliedes par maršruta punktu. Ctrl iespējo maršrutu punktu apvienošanu
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Būvēt dzelzceļa staciju. Ctrl iespējo staciju apvienošanu
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Būvēt dzelzceļa signālus. Ctrl pārslēdz semaforas/luksoforus{}Vilkšana rada signālus uz taisna sliežu posma. Ctrl uzbūvē signālus līdz nākamajam sazarojumam{}Ctrl+Klikšķis pārslēdz signālu izvēles loga atvēršanu
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Būvēt dzelzceļa staciju. Ctrl iespējo staciju apvienošanu. Shift pārslēdz ēkas/rādīt izmaksu tāmi
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Būvēt dzelzceļa signālus. Ctrl pārslēdz semaforus/luksoforus{}Vilkšana uzbūvē signālus uz taisna sliežu posma. Ctrl uzbūvē signālus līdz nākamajam sazarojumam{}Ctrl+klikšķis pārslēdz signālu izvēles loga atvēršanu. Shift pārslēdz ēkas/rādīt izmaksu tāmi
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Būvēt dzelzceļa tiltu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Būvēt dzelzceļa tuneli
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Pārslēgties starp sliežu un semaforu būvēšanas/nojaukšanas režīmiem
@@ -1944,7 +1944,7 @@
 STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Izvēlieties, kuru stacijas veidu būvēt
 
 STR_STATION_CLASS_DFLT                                          :Noklusētā stacija
-STR_STATION_CLASS_WAYP                                          :Waypoints
+STR_STATION_CLASS_WAYP                                          :Ceļapunkti
 
 # Signal window
 STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signāla izvēle
@@ -1987,11 +1987,11 @@
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Būvēt ceļu. Ctrl pārslēdz ceļa būvniecību/demolēšanu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Būvēt tramvaja sliedes. Ctrl pārslēdz tramvaja sliežu būvniecību/demolēšanu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Būvēt ceļu Autoroad režīmā. Ctrl pārslēdz ceļu būvēšanu/demolēšanu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Būvēt tramvaja sliedes ar Autotram iespēju. Ctrl pārslēdz tramvaja sliežu būvēšanu/demolēšanu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Būvēt automašīnu depo (priekš automašīnu būvniecības un apkopes)
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Būvēt tramvaju depo (tramvaju ražošanai un apkopei)
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Būvēt tramvaja sliedes ar Autotram paņēmienu. Ctrl pārslēdz tramvaja sliežu būvēšanu/nojaukšanu. Shift pārslēdz ēkas/rādīt izmaksu tāmi
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Būvēt automašīnu depo (automašīnu pirkšanai un apkopei). Shift pārslēdz ēkas/rādīt izmaksu tāmi
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :Editted: {BLACK}Būvēt tramvaju depo (tramvaju pirkšanai un apkopei). Shift pārslēdz ēkas/rādīt izmaksu tāmi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Būvēt autobusa pieturu. Ctrl iespējo staciju apvienošanu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Būvēt tramvaja pasažieru pieturu. Ctrl iespējo staciju apvienošanu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Būvēt pasažieru tramvaja pieturu. Ctrl iespējo staciju apvienošanu. Shift pārslēdz ēkas/rādīt izmaksu tāmi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Būvēt kravas automašīnu staciju. Ctrl iespējo staciju apvienošanu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Būvēt kravas tramvaja pieturu. Ctrl iespējo staciju apvienošanu
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Ieslēgt/izslēgt vienvirziena ceļus
@@ -2554,7 +2554,7 @@
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} nepieciešams ziemā
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{ORANGE}{CARGO}{BLACK} pagājušajā mēnesī piegādātas
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Trokšņu limits pilsētā: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrēt galveno skatu uz pilsētu. Ctrl+Klikšķis atvērs skatu uz pilsētu jaunā skatulaukā
+STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrēt galveno skatu uz pilsētu. Ctrl+klikšķis atvērs skatu uz pilsētu jaunā skatlaukā
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Pašvaldība
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Parādīt informāciju par pašvaldību
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Pārdēvēt pilsētu
@@ -2639,7 +2639,7 @@
 STR_CARGO_RATING_OUTSTANDING                                    :Izcils
 ############ range for rating ends
 
-STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centrēt galveno skatu uz staciju. Ctrl+Klikšķis atvērs skatu uz staciju jaunā skatulaukā
+STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centrēt galveno skatu uz staciju. Ctrl+klikšķis atvērs skatu uz staciju jaunā skatlaukā
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Pārdēvēt staciju
 
 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Rādīt vilcienus, kuru rīkojumu sarakstos ir šī stacija
@@ -2741,7 +2741,7 @@
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Iepriekšējā mēnesī saražots:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% aizvests)
-STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centrēt galveno skatu uz rūpnīcu. Ctrl+Klikšķis atvērs skatu uz rūpnīcu jaunā skatulaukā
+STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centrēt galveno skatu uz rūpnīcu. Ctrl+klikšķis atvērs skatu uz rūpnīcu jaunā skatlaukā
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Ražošanas līmenis: {YELLOW}{COMMA}%
 
 ############ range for requires starts
@@ -2928,10 +2928,10 @@
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Šis uzbūvēs kuģa kopiju, Klik uz pogas un pēc tam uz kuģa. Izmantojot CTRL+klik, kuģi dalīsies ar rīkojumiem
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Šis uzbūvēs lidaparāta kopiju, Klik uz pogas un pēc tam uz lidaparāta. Izmantojot CTRL+klik, lidaparāti dalīsies ar rīkojumiem
 
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrēt galveno skatu uz vilciena depo. Ctrl+Klikšķis atvērs skatu uz depo jaunā skatulaukā
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrēt galveno skatu uz vilciena depo. Ctrl+klikšķis atvērs skatu uz depo jaunā skatlaukā
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrēt galveno skatu uz auto depo. Ctrl+Klikšķis atvērs skatu uz depo jaunā skatulaukā
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrēt galveno skatu uz kuģu depo. Ctrl+Klikšķis atvērs skatu uz depo jaunā skatulaukā
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrēt galveno skatu uz angāru. Ctrl+Klikšķis atvērs skatu uz angāru jaunā skatulaukā
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrēt galveno skatu uz kuģu depo. Ctrl+klikšķis atvērs skatu uz depo jaunā skatlaukā
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrēt galveno skatu uz angāru. Ctrl+klikšķis atvērs skatu uz angāru jaunā skatlaukā
 
 STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Iegūt vilcienu sarakstu, kuru rīkojumos ir pašreizējais depo
 STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Iegūt transportu sarakstu, kuru rīkojumos ir pašreizējais depo
@@ -2972,38 +2972,38 @@
 STR_REPLACE_VEHICLE_SHIP                                        :Kuģis
 STR_REPLACE_VEHICLE_AIRCRAFT                                    :Lidaparāts
 
-STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Izvēlies lokomatīves tipu, kuru vēlies mainīt
-STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Izvēlies jaunās lokomatīves tipu, kuru vēlies lietot kreisā pusē atzīmētās lokomatīves vietā
+STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Izvēlieties lokomotīves veidu, kuru vēlaties mainīt
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Izvēlieties jaunu lokomotīves veidu, kuru vēlaties lietot kreisajā pusē atlasītās lokomotīves vietā
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Sākt transportlīdzekļu nomaiņu
-STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Nospied, lai sāktu kreisā pusē atzīmētās lokomatīves aizvietošanu
+STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Nospiediet, lai sāktu kreisajā pusē atlasītās lokomotīves aizvietošanu
 STR_REPLACE_NOT_REPLACING                                       :{BLACK}Netiks nomainîts
-STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nav izvēlēt transportlīdzekļa
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nav atlasītu transportlīdzekļu
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Pārtraukt transportlīdzekļu nomaiņu
-STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Nospied, lai apturētu atzīmētās lokomatīves aizvietošanu
+STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Nospiediet, lai apturētu kreisajā pusē atlasītās lokomotīves aizvietošanu
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Aizvietošana: {ORANGE}{STRING}
-STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Parslēgties starp dzinēja un vagona aizvietošanas logiem
+STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Parslēgties starp lokomotīves un vagona aizvietošanas logiem
 STR_REPLACE_ENGINES                                             :Lokomotīves
 STR_REPLACE_WAGONS                                              :Vagoni
 
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Izvēlies sliežu tipu, kurām vēlies nomainīt lokomatīves
-STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Parāda, kura lokomatīve no pa kreisi izvēlētajām tiek nomainīta, ja vien kāda ir
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Izvēlieties sliežu veidu, kuram vēlaties nomainīt lokomotīves
+STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Parāda, kura lokomotīve no kreisajā pusē atlasītajām tiek nomainīta, ja vien kāda ir
 STR_REPLACE_RAIL_VEHICLES                                       :Sliežu transportlīdzekļi
 STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrificēto sliežu vilcieni
-STR_REPLACE_MONORAIL_VEHICLES                                   :Viensliežu transportlīdzekļi
+STR_REPLACE_MONORAIL_VEHICLES                                   :Viensliedes transportlīdzekļi
 STR_REPLACE_MAGLEV_VEHICLES                                     :Magleva transportlīdzekļi
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagona noņemšana: {ORANGE}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Auto-aizvietošana saglabās vilciena garumu, aizvācot vagonus (sākot no priekšas), ja mainot lokomatīvi, tas kļūtu garāks.
+STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Autoaizvietošana saglabās vilciena garumu, aizvācot vagonus (sākot no priekšas), ja mainot lokomotīvi, tas kļūtu garāks
 
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrēt galveno skatu uz vilcienu. Ctrl+Klikšķis sekos vilcienam galvenajā skatā
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrēt galveno skatu uz transportlīdzekli. Ctrl+Klikšķis sekos transportlīdzeklim galvenajā skatā
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrēt galveno skatu uz kuģi. Ctrl+Klikšķis sekos kuģim galvenajā skatā
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrēt galveno skatu uz lidaparātu. Ctrl+Klikšķis sekos lidaparātam galvenajā skatā
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrēt galveno skatu uz vilcienu. Ctrl+klikšķis sekos vilcienam galvenajā skatā
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrēt galveno skatu uz transportlīdzekli. Ctrl+klikšķis sekos transportlīdzeklim galvenajā skatā
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrēt galveno skatu uz kuģi. Ctrl+klikšķis sekos kuģim galvenajā skatā
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrēt galveno skatu uz lidaparātu. Ctrl+klikšķis sekos lidaparātam galvenajā skatā
 
 STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Sūtīt vilcienu uz depo. Ctrl+klik - tikai apkope
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Sūtīt transportl. uz depo. Ctrl+klik tikai apkope
@@ -3036,7 +3036,7 @@
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Rādīt lidaparāta informāciju
 
 STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Pašreizējā vilciena darbība - klik šeit, lai apstādinātu/palaistu vilcienu
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Transportl. pašreizējā darbība - klik šeit, lai apstādinātu/palaistu to
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Transportlīdzekļa pašreizējā darbība - klikšķis šeit, lai to apstādinātu/palaistu. Ctrl+klikšķis lai ritinātu līdz galamērķim
 STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Pašreizējā kuģa darbība - klik šeit, lai to apstādinātu/palaistu
 STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Tekošā lidaparāta darbība - klikot šeit, lai apturētu/palaistu lidaparātu
 
@@ -3424,7 +3424,7 @@
 STR_ERROR_GAME_LOAD_FAILED                                      :{WHITE}Spēles ielādēšana neizdevās{}{STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :Iekšēja kļūda: {STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Bojāts saglabātās spēles fails - {STRING}
-STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Spēle saglabāta ar jaunāku versiju
+STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Spēle ir saglabāta ar jaunāku versiju
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Failu nevar nolasīt
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Failā nevar ierakstīt
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Datu integritātes pārbaude nav izdevusies

--- a/src/lang/unfinished/basque.txt
+++ b/src/lang/unfinished/basque.txt
@@ -275,11 +275,11 @@
 STR_SORT_BY_VALUE                                               :Balioa
 STR_SORT_BY_LENGTH                                              :Luzera
 STR_SORT_BY_LIFE_TIME                                           :Geratzen zaion bizitza denbora
-STR_SORT_BY_TIMETABLE_DELAY                                     :denbora zutabeko atzerapenaz
+STR_SORT_BY_TIMETABLE_DELAY                                     :Ordutegiko atzerapena
 STR_SORT_BY_FACILITY                                            :Geltoki mota
 STR_SORT_BY_WAITING                                             :Karga balioa itxaroten
-STR_SORT_BY_RATING_MAX                                          :Karga balorazio handiena
-STR_SORT_BY_RATING_MIN                                          :Karga balorazio txikiena
+STR_SORT_BY_RATING_MAX                                          :Zama balorazio handiena
+STR_SORT_BY_RATING_MIN                                          :Zama balorazio txikiena
 STR_SORT_BY_ENGINE_ID                                           :MotoreID (ordenatze klasikoa)
 STR_SORT_BY_COST                                                :Kostua
 STR_SORT_BY_POWER                                               :Potentzia
@@ -356,6 +356,7 @@
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Geltoki izen erakutsiak
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Ibilbide izen erakutsiak
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Erakutsitako kartelak
+STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Aurkarien izenak eta kartelak erakutsi
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Animazio betea
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Xehetasun betea
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Eraikin transparenteak
@@ -665,6 +666,8 @@
 STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Erakutsi garraio-iblibideak mapan
 STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Erakutsi begetazioa mapan
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Erakutsi lur-jabeak mapan
+STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION                         :{BLACK}Click egin industria mota batetan hau erakusteko/ ez erakusteko. Ctrl+Click hautatutakoa izan ezik guztiak desaktibatzeko . Berriro Ctrl+Click hautatutakoan industria mota guztiak aktibatzeko
+STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK}Click egin kompainia batetan haren ondasunak ikusteko/ ez ikusteko. Ctrl+Click egitean hautatutakoa izan ezik baino beste kompainia guztiak desaktibatzeko. Berriro Ctrl+Click egin hautatutakoankompania guztiak aktibatzeko
 
 STR_SMALLMAP_LEGENDA_ROADS                                      :{TINYFONT}{BLACK}Errepideak
 STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINYFONT}{BLACK}Trenbideak
@@ -705,6 +708,7 @@
 STR_SMALLMAP_SHOW_HEIGHT                                        :{BLACK}Altuera erakutsi
 STR_SMALLMAP_TOOLTIP_DISABLE_ALL_INDUSTRIES                     :{BLACK}Ez erakutsi industriarik mapan
 STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRIES                      :{BLACK}Erakutsi industria guztiak mapan
+STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT                                :{BLACK}Altuera mapa erakutsi/ ez erakutsi
 STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES                      :{BLACK}Ez erakutsi konpainiaren jabetzak mapan.
 STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES                       :{BLACK}Erakutsi konpaniaren propietate denak mapan
 
@@ -1049,6 +1053,11 @@
 STR_SEA_LEVEL_CUSTOM                                            :Pertsonalizatua
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :(%{NUM}) pertsonalizatua
 
+STR_RIVERS_NONE                                                 :Bat ere ez
+STR_RIVERS_FEW                                                  :Gutxi
+STR_RIVERS_MODERATE                                             :Ez asko ez gutxi
+STR_RIVERS_LOT                                                  :Asko
+
 STR_DISASTER_NONE                                               :Ezer ez
 STR_DISASTER_REDUCED                                            :Mugatua
 STR_DISASTER_NORMAL                                             :Normala
@@ -1099,6 +1108,7 @@
 STR_CONFIG_SETTING_AUTOSLOPE                                    :{LTBLUE}Eraikinen, trenbideen etabarren azpian paisaia aldatzea baimendu. (autoaldapak): {ORANGE}{STRING}
 STR_CONFIG_SETTING_CATCHMENT                                    :{LTBLUE}Bilketa guneen tamaina errealago egitea baimendu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :{LTBLUE}Herriarenak diren errepide, zubi eta tunel gehiago kentzea baimendu: {ORANGE}{STRING}
+STR_CONFIG_SETTING_TRAIN_LENGTH                                 :{LTBLUE}Trenen gehienezko luzera: {ORANGE}{STRING} tile{P 0:1 "" s}
 STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :{LTBLUE}Trenaren ke/txinparta kantitatea: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Trenaren azelerazio modeloa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Ibilgailuen azelerazio modelua: {ORANGE}{STRING}
@@ -1110,6 +1120,8 @@
 STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}Ibilgailuak mailaka zamatu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_INFLATION                                    :{LTBLUE}Inflazioa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SELECTGOODS                                  :{LTBLUE}Geltoki batetan bakarrik bertan hartzen duten zama baino ez utzi: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :{LTBLUE}Zubien gehienezko luzera: {ORANGE}{STRING} tile{P 0:1 "" s}
+STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :{LTBLUE}Tunelen gehienezko luzera: {ORANGE}{STRING} tile{P 0:1 "" s}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Industria primarioa eraikitzeko era: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :ezer ez
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :beste industriak bezala
@@ -1127,6 +1139,7 @@
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}Leioa mugitu kurtsorea ertzean dagoenean: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}Udaletxeko agintariak erostea baimendu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :{LTBLUE}Garraiatzeko eskubide esklusiboen erosketa baimendu: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :{LTBLUE}Bertako errepideak hobetzea utzi: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :{LTBLUE}Beste empresei dirua bidaltzea baimendu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :{LTBLUE}Zamaren pisuaren biderkatzailea tren astunagoak simulatzeko: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PLANE_SPEED                                  :{LTBLUE}hegazkinen: {ORANGE}1 / {STRING}
@@ -1267,6 +1280,8 @@
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Jokoaren aukerak erakutsi
 
+STR_INTRO_TRANSLATION                                           :{BLACK}Itzultze honi {NUM} string{P "" s} falta zaio. Mesedez OpenTTD hobeago egiten lagundu itzultzaile bezala aritzen. Ikusi readme.txt zehetasunentzako.
+
 # Quit window
 
 # Supported OSes
@@ -1498,6 +1513,7 @@
 
 # World generation
 STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_QUANTITY_OF_RIVERS                                   :{BLACK}Errekak:
 STR_MAPGEN_VARIETY                                              :{BLACK}Barietateen distribuzioa:
 
 # Strings for map borders at game generation
@@ -1509,6 +1525,7 @@
 
 # Map generation progress
 STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_RIVER_GENERATION                                 :{BLACK}Erreka sorkuntza
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Objektu sorkuntza
 
 # NewGRF settings
@@ -1587,6 +1604,11 @@
 STR_NEWGRF_INVALID_ENGINE                                       :<garraio modelo baliogabea>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<industria baliogabea>
 
+# NewGRF scanning window
+STR_NEWGRF_SCAN_CAPTION                                         :{WHITE} NewGRF berriak bilatzen.
+STR_NEWGRF_SCAN_MESSAGE                                         :{BLACK} NewGRFak bilatzen. Zenbatekoaren arabera tartetxo baterako luza litzateke...
+STR_NEWGRF_SCAN_ARCHIVES                                        :Fitxategiak bilatzen
+
 # Sign list window
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Bat egin maiuskula eta minuskulak
 
@@ -1679,6 +1701,8 @@
 # Build vehicle window
 
 
+STR_PURCHASE_INFO_SPEED_OCEAN                                   :{BLACK}Abiadura ozeanoan: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_SPEED_CANAL                                   :{BLACK}Abiadura kanaletan/erreketan: {GOLD}{VELOCITY}
 
 
 
@@ -1777,6 +1801,9 @@
 
 
 
+# Conditional order variables, must follow order of OrderConditionVariable enum
+STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Geratzen zaion bizitza (urteetan)
+
 
 
 
@@ -1860,6 +1887,8 @@
 
 
 
+STR_ERROR_HEIGHTMAP_TOO_LARGE                                   :{WHITE}... irudia handiegia da
+
 
 # Soundset messages
 

--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -130,39 +130,39 @@
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
-STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
-STR_ABBREV_COAL                                                 :{TINYFONT}CL
-STR_ABBREV_MAIL                                                 :{TINYFONT}ML
-STR_ABBREV_OIL                                                  :{TINYFONT}OL
-STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
-STR_ABBREV_GOODS                                                :{TINYFONT}GD
-STR_ABBREV_GRAIN                                                :{TINYFONT}GR
-STR_ABBREV_WOOD                                                 :{TINYFONT}WD
-STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
-STR_ABBREV_STEEL                                                :{TINYFONT}ST
-STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
-STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
-STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
-STR_ABBREV_FRUIT                                                :{TINYFONT}FT
-STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
-STR_ABBREV_FOOD                                                 :{TINYFONT}FD
-STR_ABBREV_PAPER                                                :{TINYFONT}PR
-STR_ABBREV_GOLD                                                 :{TINYFONT}GD
-STR_ABBREV_WATER                                                :{TINYFONT}WR
-STR_ABBREV_WHEAT                                                :{TINYFONT}WH
-STR_ABBREV_RUBBER                                               :{TINYFONT}RB
-STR_ABBREV_SUGAR                                                :{TINYFONT}SG
-STR_ABBREV_TOYS                                                 :{TINYFONT}TY
-STR_ABBREV_SWEETS                                               :{TINYFONT}SW
-STR_ABBREV_COLA                                                 :{TINYFONT}CL
-STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
-STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
-STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
-STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
-STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
-STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
-STR_ABBREV_NONE                                                 :{TINYFONT}NO
-STR_ABBREV_ALL                                                  :{TINYFONT}ALL
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}TEI
+STR_ABBREV_COAL                                                 :{TINYFONT}GLO
+STR_ABBREV_MAIL                                                 :{TINYFONT}PST
+STR_ABBREV_OIL                                                  :{TINYFONT}OLW
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}DBW
+STR_ABBREV_GOODS                                                :{TINYFONT}NWY
+STR_ABBREV_GRAIN                                                :{TINYFONT}GRW
+STR_ABBREV_WOOD                                                 :{TINYFONT}COE
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}HAE
+STR_ABBREV_STEEL                                                :{TINYFONT}DUR
+STR_ABBREV_VALUABLES                                            :{TINYFONT}TRY
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CPR
+STR_ABBREV_MAIZE                                                :{TINYFONT}CRN
+STR_ABBREV_FRUIT                                                :{TINYFONT}FFR
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DMN
+STR_ABBREV_FOOD                                                 :{TINYFONT}BWD
+STR_ABBREV_PAPER                                                :{TINYFONT}PAP
+STR_ABBREV_GOLD                                                 :{TINYFONT}AUR
+STR_ABBREV_WATER                                                :{TINYFONT}DWR
+STR_ABBREV_WHEAT                                                :{TINYFONT}GTH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RWB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SIW
+STR_ABBREV_TOYS                                                 :{TINYFONT}TEG
+STR_ABBREV_SWEETS                                               :{TINYFONT}MEL
+STR_ABBREV_COLA                                                 :{TINYFONT}COL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CFF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}SWI
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TFI
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BAT
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PLS
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}DIO
+STR_ABBREV_NONE                                                 :{TINYFONT}DIM
+STR_ABBREV_ALL                                                  :{TINYFONT}OLL
 
 # 'Mode' of transport for cargoes
 STR_PASSENGERS                                                  :{COMMA} teithiwr{P "" s}
@@ -312,7 +312,7 @@
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Adeiladu Rheilffyrdd
 STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Adeiladu Ffordd
 STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Adeiladu Doc Llongau
-STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Adeiladu Meysydd Awyr
+STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Adeiladu meysydd awyr
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Agor y bar offer tirweddu er mwyn codi neu ostwng tir, plannu coed ayb.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Dangos y ffenestr Sain/Cerddoriaeth
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Dangos Neges/Adroddiad newyddion ddiwethaf, Dangos Dewisiadau Negeseuon
@@ -354,7 +354,7 @@
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Dewisiadau tryloywder
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Dangos enwau trefi
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Dangos enwau gorsafoedd
-STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Dangos Pwyntiau Llwybrau
+STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Dangos enwau pwyntiau llwybro
 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
@@ -404,10 +404,10 @@
 ############ range ends here
 
 ############ range for railway construction menu starts
-STR_RAIL_MENU_RAILROAD_CONSTRUCTION                             :Adeiladu Rheilffordd
+STR_RAIL_MENU_RAILROAD_CONSTRUCTION                             :Adeiladu rheilffordd
 STR_RAIL_MENU_ELRAIL_CONSTRUCTION                               :Adeiladu Rheilffordd Drydan
-STR_RAIL_MENU_MONORAIL_CONSTRUCTION                             :Adeiladu Monoreilffordd
-STR_RAIL_MENU_MAGLEV_CONSTRUCTION                               :Adeiladu Maglef
+STR_RAIL_MENU_MONORAIL_CONSTRUCTION                             :Adeiladu monoreilffordd
+STR_RAIL_MENU_MAGLEV_CONSTRUCTION                               :Adeiladu maglef
 ############ range ends here
 
 ############ range for road construction menu starts
@@ -420,7 +420,7 @@
 ############ range ends here
 
 ############ range for airport construction menu starts
-STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Adeiladu Maes Awyr
+STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Adeiladu maes awyr
 ############ range ends here
 
 ############ range for landscaping menu starts
@@ -463,27 +463,27 @@
 STR_ORDINAL_NUMBER_8TH                                          :8fed
 STR_ORDINAL_NUMBER_9TH                                          :9fed
 STR_ORDINAL_NUMBER_10TH                                         :10fed
-STR_ORDINAL_NUMBER_11TH                                         :11fed
+STR_ORDINAL_NUMBER_11TH                                         :11eg
 STR_ORDINAL_NUMBER_12TH                                         :12fed
-STR_ORDINAL_NUMBER_13TH                                         :13fed
-STR_ORDINAL_NUMBER_14TH                                         :14fed
+STR_ORDINAL_NUMBER_13TH                                         :13eg
+STR_ORDINAL_NUMBER_14TH                                         :14eg
 STR_ORDINAL_NUMBER_15TH                                         :15fed
-STR_ORDINAL_NUMBER_16TH                                         :16fed
-STR_ORDINAL_NUMBER_17TH                                         :17fed
+STR_ORDINAL_NUMBER_16TH                                         :16eg
+STR_ORDINAL_NUMBER_17TH                                         :17eg
 STR_ORDINAL_NUMBER_18TH                                         :18fed
 STR_ORDINAL_NUMBER_19TH                                         :19fed
 STR_ORDINAL_NUMBER_20TH                                         :20fed
-STR_ORDINAL_NUMBER_21ST                                         :21fed
-STR_ORDINAL_NUMBER_22ND                                         :22fed
-STR_ORDINAL_NUMBER_23RD                                         :23fed
-STR_ORDINAL_NUMBER_24TH                                         :24fed
-STR_ORDINAL_NUMBER_25TH                                         :25fed
-STR_ORDINAL_NUMBER_26TH                                         :26fed
-STR_ORDINAL_NUMBER_27TH                                         :27fed
-STR_ORDINAL_NUMBER_28TH                                         :28fed
-STR_ORDINAL_NUMBER_29TH                                         :29fed
-STR_ORDINAL_NUMBER_30TH                                         :30fed
-STR_ORDINAL_NUMBER_31ST                                         :31fed
+STR_ORDINAL_NUMBER_21ST                                         :21ain
+STR_ORDINAL_NUMBER_22ND                                         :22ain
+STR_ORDINAL_NUMBER_23RD                                         :23ain
+STR_ORDINAL_NUMBER_24TH                                         :24ain
+STR_ORDINAL_NUMBER_25TH                                         :25ain
+STR_ORDINAL_NUMBER_26TH                                         :26ain
+STR_ORDINAL_NUMBER_27TH                                         :27ain
+STR_ORDINAL_NUMBER_28TH                                         :28ain
+STR_ORDINAL_NUMBER_29TH                                         :29ain
+STR_ORDINAL_NUMBER_30TH                                         :30ain
+STR_ORDINAL_NUMBER_31ST                                         :31ain
 ############ range for days ends
 
 ############ range for months starts
@@ -770,7 +770,7 @@
 STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY                         :{BIGFONT}{BLACK}Ffrwydrad purfa olew ger {TOWN}!
 STR_NEWS_DISASTER_HELICOPTER_FACTORY                            :{BIGFONT}{BLACK}Dinistriwyd ffatri mewn modd amheus ger {TOWN}!
 STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK}Glaniodd 'UFO' ger {TOWN}!
-STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Ymsuddiant mwynglawdd glo ger {TOWN} yn creu llanast!
+STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Ymsuddiant glofa ger {TOWN} yn creu llanast!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Llifogydd!{}O leiaf {COMMA} ar goll, wedi'i tybio'n farw wedi glaw mawr!
 
 STR_NEWS_COMPANY_IN_TROUBLE_TITLE                               :{BIGFONT}{BLACK}Cwmni Trafnidiaeth mewn Trafferth!
@@ -795,9 +795,9 @@
 
 STR_NEWS_EURO_INTRODUCTION                                      :{BIGFONT}{BLACK}Arian Sengl Ewropeaidd!{}{}Cafodd yr Ewro ei gyflwyno fel unig arian cyfred eich gwlad!
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Dirwasgiad Byd-eang!{}{}Arbenigwyr ariannol yn ofni'r gwaethaf wrth i'r economi gwympo!
-STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Dirwasgiad ar Ben!{}{}Mae cynnydd mewn masnach yn rhoi hyder i ddiwydiant wrth i'r economi gryfhau!
-
-STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL                   :{BIGFONT}{BLACK}Mae {INDUSTRY} `yn cynyddu ei gynnyrch!
+STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Dirwasgiad ar Ben!{}{}Cynnydd masnach yn rhoi hyder i ddiwydiant wrth i'r economi gryfhau!
+
+STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL                   :{BIGFONT}{BLACK}Mae {INDUSTRY} yn cynyddu ei gynnyrch!
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL                      :{BIGFONT}{BLACK}Darganfuwyd gwythïen newydd o lo yn {INDUSTRY}!{}Disgwylir y bydd y cynnyrch yn dyblu!
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL                       :{BIGFONT}{BLACK}Darganfuwyd ffynhonnell newydd o olew yn {INDUSTRY}!{}Disgwylir y bydd y cynnyrch yn dyblu!
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM                      :{BIGFONT}{BLACK}Mae disgwyl i well ddulliau ffermio yn {INDUSTRY} ddyblu'r cynnyrch!
@@ -822,8 +822,8 @@
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}Mae {VEHICLE} yn heneiddio
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}Mae {VEHICLE} yn hynod o hen
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}Mae {VEHICLE} yn hynod o hen ac angen ei ddisodli
-STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}Mae {VEHICLE} yn methu dod o hyd i lwybr er mwyn parhau.
-STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}Mae {VEHICLE} ar goll.
+STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}Mae {VEHICLE} yn methu dod o hyd i lwybr i barhau
+STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}Mae {VEHICLE} ar goll
 STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :{WHITE}Elw {VEHICLE} y flwyddyn diwethaf oedd {CURRENCY}
 
 STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Stopiodd achos methiant hefo trefnu ailffitio {VEHICLE}
@@ -838,8 +838,8 @@
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO                              :{WHITE}Mae {STATION} nawr yn derbyn {STRING}
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}Mae {STATION} nawr yn derbyn {STRING} a {STRING}
 
-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_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}Cynnig cymhorthdal ar ben:{}{}Ni fydd cludo {STRING} o {STRING} i {STRING} yn derbyn cymhorthdal bellach
+STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Cymhorthdal wedi'i dynnu'n ôl: {}{}Ni fydd gwasanaeth {STRING} o {STRING} i {STRING} yn derbyn cymhorthdal bellach
 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!
@@ -861,26 +861,26 @@
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Dewis unedau arian
 
 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Punnoedd (£)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Doleri ($)
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Ewro (€)
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Yen (¥)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Punnoedd Prydeinig (GBP)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Doleri America (USD)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Ewro (EUR)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Yen Siapan (JPY)
 STR_GAME_OPTIONS_CURRENCY_ATS                                   :Swllt Awstriaidd (ATS)
 STR_GAME_OPTIONS_CURRENCY_BEF                                   :Ffranc Belgaidd (BEF)
 STR_GAME_OPTIONS_CURRENCY_CHF                                   :Ffranc Swisaidd (CHF)
 STR_GAME_OPTIONS_CURRENCY_CZK                                   :Koruna Tsecaidd (CZK)
 STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark (DEM)
 STR_GAME_OPTIONS_CURRENCY_DKK                                   :Krone Danaidd (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta Sbaen (ESP)
 STR_GAME_OPTIONS_CURRENCY_FIM                                   :Markka Ffinaidd(FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Ffranc (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Ffranc Ffrainc (FRF)
 STR_GAME_OPTIONS_CURRENCY_GRD                                   :Drachma (GRD)
 STR_GAME_OPTIONS_CURRENCY_HUF                                   :Forint (HUF)
 STR_GAME_OPTIONS_CURRENCY_ISK                                   :Krona Ynys yr Iâ (ISK)
 STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira Eidalaidd (ITL)
 STR_GAME_OPTIONS_CURRENCY_NLG                                   :Guilder (NLG)
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Krone Norwyaidd (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zloty Pwylaidd (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Złoty Pwylaidd (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu Rwmanaidd (RON)
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Rwbl Rwsaidd (RUR)
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tolar Slofenaidd (SIT)
@@ -1094,7 +1094,7 @@
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Ffurfweddu Addasiadau
 
-STR_CONFIG_SETTING_OFF                                          :I  Ffwrdd
+STR_CONFIG_SETTING_OFF                                          :I Ffwrdd
 STR_CONFIG_SETTING_ON                                           :Ymlaen
 STR_CONFIG_SETTING_DISABLED                                     :analluogwyd
 
@@ -1113,7 +1113,7 @@
 STR_CONFIG_SETTING_BUILDONSLOPES                                :{LTBLUE}Caniatáu adeiladu a'r lethrau ac arfordiroedd {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_EXTRADYNAMITE                                :{LTBLUE}Caniatáu chwalu mwy o ffyrdd, pontydd ayb. sy'n berthyn i drefi: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :{LTBLUE}Hyd uchafsymol trenau: {ORANGE}{STRING} teil
 STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :{LTBLUE}Faint o fŵg/sbarciau gan gerbydau: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Model cyflymu trenau: {ORANGE}{STRING}
@@ -1157,7 +1157,7 @@
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}Caniatáu i ffyrdd gyrru-drwodd stopio ar ffyrdd sy'n eiddo i gystadleuwyr: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Caniatáu adeiladu gorsafoedd cyfochrog: {ORANGE}{STRING}
 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_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Nid yw'n bosib newid y gosodiad yma pan fo cerbydau'n bodoli
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE}Maes awyr ddim yn dibennu: {ORANGE}{STRING}
 
@@ -1198,7 +1198,7 @@
 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
 
-STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Arwynebedd mwyaf gorsaf: {ORANGE}{STRING} {RED}Rhybudd: Byddgosodiad uchel yn arafu'r gêm
+STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Ymlediad mwyaf gorsaf: {ORANGE}{STRING} teil {RED}Rhybudd: Bydd gwerth uchel yn arafu'r gêm
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}Rhoi gwasanaeth i hofrenyddion ar helepads yn awtomatig: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Cyfuno'r bar offer tirwedd gyda'r bariau offer ffordd/rheilffordd/maes awyr: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR                         :{LTBLUE}Lliw tir a ddefnyddir ar y map bychan: {ORANGE}{STRING}
@@ -1226,8 +1226,8 @@
 
 STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :{LTBLUE}Sgrolio Clic-chwith: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :{LTBLUE}Defnyddio'r fformat dyddiad {ORANGE}{STRING}{LTBLUE} ar gyfer enwau gemau wedi'u cadw.
-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :hir (31fed Rhag 2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :{LTBLUE}Defnyddio'r fformat dyddiad {ORANGE}{STRING}{LTBLUE} ar gyfer enwau gemau wedi'u cadw
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :hir (31ain Rhag 2008)
 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)
 
@@ -1236,7 +1236,7 @@
 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_COMMAND_PAUSE_LEVEL                          :{LTBLUE}Tra fo wedi' oedi, caniatau: {ORANGE}{STRING}
+STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}Tra fo wedi'i oedi, caniatáu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :dim gweithredoedd
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION     :pob gweithred ac eithro adeiladu
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING      :pob gweithred ac eithro addasu tirwedd
@@ -1255,10 +1255,10 @@
 STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Grwpio costau yn ffenestr cyllid y cwmni: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :{LTBLUE}Analluogi adeiladu tanadeiledd pan nad oes cerbydau addas ar gael: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Uchafswm trenau y chwaraewr: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :{LTBLUE}Uchafswm cerbyd ffordd y chwaraewr: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Uchafswm awyren y chwaraewr: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_SHIPS                                    :{LTBLUE}Uchafswm llongau y chwaraewr: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Uchafswm nifer trenau cwmni: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :{LTBLUE}Uchafswm cerbydau ffordd cwmni: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Uchafswm awyrennau cwmni: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_SHIPS                                    :{LTBLUE}Uchafswm llongau cwmni: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :{LTBLUE}Analluogi trenau ar gyfer y cyfrifiadur: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :{LTBLUE}Analluogi cerbyd ffordd ar gyfer y cyfrifiadur: {ORANGE}{STRING}
@@ -1269,13 +1269,13 @@
 STR_CONFIG_SETTING_AI_MAX_OPCODES                               :{LTBLUE}#opcodes cyn yr atelir AI: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Dangos y cyfnod rhwng gwasanaethau mewn canrannau: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethau ar gyfer trenau: {ORANGE}{STRING} days/%
+STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethu ar gyfer trenau: {ORANGE}{STRING} diwrnod
 STR_CONFIG_SETTING_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethau ar gyfer trenau: {ORANGE}disabled
-STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethau ar gyfer cerbyd ffordd: {ORANGE}{STRING} days/%
+STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethu ar gyfer cerbyd ffordd: {ORANGE}{STRING} diwrnod
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_DISABLED               :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethau ar gyfer cerbyd ffordd: {ORANGE}disabled
-STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethau ar gyfer awyren: {ORANGE}{STRING} days/%
+STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethu ar gyfer awyrennau: {ORANGE}{STRING} diwrnod
 STR_CONFIG_SETTING_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethau ar gyfer awyren: {ORANGE}disabled
-STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethau ar gyfer llongau: {ORANGE}{STRING} days/%
+STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethu ar gyfer llongau: {ORANGE}{STRING} diwrnod
 STR_CONFIG_SETTING_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Cyfnod rhagosodedig rhwng gwasanaethau ar gyfer llongau: {ORANGE}disabled
 STR_CONFIG_SETTING_NOSERVICE                                    :{LTBLUE}Analluogi gwasanaethau pan fydd torri i lawr wedi ei osod i Ddim: {ORANGE}{STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :{LTBLUE}Galluogi terfynau cyflymder wagenni: {ORANGE}{STRING}
@@ -1307,10 +1307,19 @@
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :{LTBLUE}Caiff trefi adeiladu ffyrdd: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS                   :{LTBLUE}Caniatáu i drefi adeiladau croesfannau rheilffordd: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NOISE_LEVEL                                  :{LTBLUE}Caniatáu i drefi reoli lefel swn meysydd awyrenau: {ORANGE}{STRING}
-
+STR_CONFIG_SETTING_TOWN_FOUNDING                                :{LTBLUE}Sefydlu trefi mewn gêm: {ORANGE}{STRING}
+STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :gwahardd
+STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :caniatáu
+STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :caniatáu, cynllun tref addasiedig
+
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :{LTBLUE}Gosod coed mewn gêm: {ORANGE}{STRING}
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :dim {RED}(yn torri'r felin goed)
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :mewn glawgoedwigoedd yn unig
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :pob man
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :{LTBLUE}Safle'r prif far offer: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}Radiws snap ffenestr: {ORANGE}{STRING} px
+STR_CONFIG_SETTING_STATUSBAR_POS                                :{LTBLUE}Lleoliad y bar statws: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}Radiws snap ffenestr: {ORANGE}{STRING} picsel
 STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED                         :{LTBLUE}Radiws snap ffenestr: {ORANGE}analluogwyd
 STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}Uchafswm ffenestri (nad yw'n ludiog): {ORANGE}{STRING}
 STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE}Uchafswm ffenestri (nad yw'n ludiog): {ORANGE}wedi'i analluogi
@@ -1372,11 +1381,11 @@
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Gosodiadau Ai
 STR_INTRO_QUIT                                                  :{BLACK}Gadael
 
-STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Dechrau Gêm Newydd
+STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Dechrau gêm newydd. Mae Ctrl+Clicio yn hepgor dewisiadau map
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Llwytho Gêm sydd wedi'i Gadw
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Dechrau gêm newydd, gan ddefnyddio'r map uchder fel tirwedd
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}Dechrau gêm newydd, gan ddefnyddio senario wedi'i haddasu
-STR_INTRO_TOOLTIP_SCENARIO_EDITOR                               :{BLACK}Creu addasiad o fyd/senario ar gyfer y gêm
+STR_INTRO_TOOLTIP_SCENARIO_EDITOR                               :{BLACK}Creu byd gêm/senario addasiedig
 STR_INTRO_TOOLTIP_MULTIPLAYER                                   :{BLACK}Cychwyn gêm amlchwaraewr
 
 STR_INTRO_TOOLTIP_TEMPERATE                                     :{BLACK}Dewis tirwedd tymherus
@@ -1406,6 +1415,7 @@
 STR_OSNAME_UNIX                                                 :Unix
 STR_OSNAME_OSX                                                  :OS{NBSP}X
 STR_OSNAME_BEOS                                                 :BeOS
+STR_OSNAME_HAIKU                                                :Haiku
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
 STR_OSNAME_OS2                                                  :OS/2
@@ -1419,18 +1429,19 @@
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Twyllo
 STR_CHEATS_TOOLTIP                                              :{BLACK}Mae'r blychau marcio'n dangos os ydych chi wedi twyllo neu beidio, gan nodi sut
-STR_CHEATS_WARNING                                              :{BLACK}Rhybudd! Rydych chi ar fin bradychu eich cydgystadleuwyr. Cofiwch y bydd y fath gywilydd yn cael ei gofio hyd tragwyddoldeb.
+STR_CHEATS_WARNING                                              :{BLACK}Rhybudd! Rydych ar fin bradychu eich cydgystadleuwyr. Cofiwch y bydd y fath gywilydd yn cael ei gofio o'r awr hon hyd byth
 STR_CHEAT_MONEY                                                 :{LTBLUE}Cynyddu arian {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Chwarae fel cwmni: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Tarw Dur Hud (chwalu diwydiannau, gwrthrychau nad oes modd eu chwalu): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Caiff twneli groesi eu gilydd: {ORANGE}{STRING}
-STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Ni fydd awyrennau jet yn crashio (yn aml) ar feysydd awyr bach: {ORANGE} {STRING}
-STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Newid hinsawdd: {ORANGE} {STRING}
+STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Ni fydd awyrennau jet yn crashio (yn aml) ar feysydd awyr bychain: {ORANGE}{STRING}
+STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Newid hinsawdd: {ORANGE}{STRING}
 STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Tirwedd Tymherus
 STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Tirwedd Is-arctig
 STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Tirwedd Is-drofannol
 STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Tirwedd Teganau
-STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Newid dyddiad: {ORANGE} {DATE_SHORT}
+STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Newid dyddiad: {ORANGE}{DATE_SHORT}
+STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Newid y flwyddyn bresennol
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Galluogi newid graddfeydd cynhyrchu: {ORANGE}{STRING}
 
 # Livery window
@@ -1475,30 +1486,30 @@
 STR_FACE_OK_TOOLTIP                                             :{BLACK}Derbyn y dewis newydd o wyneb
 
 STR_FACE_MALE_BUTTON                                            :{BLACK}Gwrywaidd
-STR_FACE_MALE_TOOLTIP                                           :{BLACK}Dewis wyneb gwrywaidd
+STR_FACE_MALE_TOOLTIP                                           :{BLACK}Dewis gwyneb gwrywaidd
 STR_FACE_FEMALE_BUTTON                                          :{BLACK}Benywaidd
-STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Dewis wyneb benywaidd
+STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Dewis gwyneb benywaidd
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Gwyneb Newydd
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Cynhyrchu wyneb newydd ar hap
 STR_FACE_ADVANCED                                               :{BLACK}Uwch
-STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Dewis wyneb uwch.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Dewis wyneb manwl
 STR_FACE_SIMPLE                                                 :{BLACK}Syml
-STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Dewis wyneb symln.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Dewis wyneb syml
 STR_FACE_LOAD                                                   :{BLACK}Llwytho
 STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Llwytho hoff wyneb
-STR_FACE_LOAD_DONE                                              :{WHITE}Cafodd eich hoff wyneb ei lwytho o'r ffeil ffurfweddu OpenTTD.
+STR_FACE_LOAD_DONE                                              :{WHITE}Llwythwyd eich hoff wyneb o'r ffeil ffurfweddu OpenTTD
 STR_FACE_FACECODE                                               :{BLACK}Wyneb chwaraewr rhif:
-STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Gweld ac/neu osod rhif wyneb chwaraewr
-STR_FACE_FACECODE_CAPTION                                       :{WHITE}Gweld ac/neu osod rhif wyneb chwaraewr
-STR_FACE_FACECODE_SET                                           :{WHITE}Cafodd rhif wyneb newydd ei osod.
-STR_FACE_FACECODE_ERR                                           :{WHITE}Doedd dim modd gosod rhif wyneb chwaraewr - rhaid iddo dod yn rhif rhwng 0 a 4,294,967,295!
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Gweld ac/neu osod rhif wyneb llywydd y cwmni
+STR_FACE_FACECODE_CAPTION                                       :{WHITE}Gweld ac/neu osod rhif gwyneb llywydd
+STR_FACE_FACECODE_SET                                           :{WHITE}Cafodd rhif wyneb newydd ei osod
+STR_FACE_FACECODE_ERR                                           :{WHITE}Methu gosod rhif wyneb llywydd - rhaid iddo fod yn rhif rhwng 0 a 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Cadw
 STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Cadw hoff wyneb
-STR_FACE_SAVE_DONE                                              :{WHITE}bydd yr wyneb hwn yn cael ei gadw fel eich ffefryn yn y ffeil ffurfweddu OpenTTD.
+STR_FACE_SAVE_DONE                                              :{WHITE}Bydd yr wyneb hwn yn cael ei gadw fel eich ffefryn yn y ffeil ffurfweddu OpenTTD
 STR_FACE_EUROPEAN                                               :{BLACK}Ewropeiaidd
-STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Dewis o blith wynebau ewropeaidd
+STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Dewis gwyneb Ewropeaidd
 STR_FACE_AFRICAN                                                :{BLACK}Affricanaidd
-STR_FACE_SELECT_AFRICAN                                         :{BLACK}Dewis gwynebau affricanaidd
+STR_FACE_SELECT_AFRICAN                                         :{BLACK}Dewis gwyneb Affricanaidd
 STR_FACE_YES                                                    :Iawn
 STR_FACE_NO                                                     :Na
 STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Galluogi mwstásh neu glustdlws
@@ -1623,7 +1634,7 @@
 STR_NETWORK_LANG_HUNGARIAN                                      :Hwngareg
 STR_NETWORK_LANG_ICELANDIC                                      :Islandaidd
 STR_NETWORK_LANG_ITALIAN                                        :Eidaleg
-STR_NETWORK_LANG_JAPANESE                                       :Japaneeg
+STR_NETWORK_LANG_JAPANESE                                       :Siapaneaidd
 STR_NETWORK_LANG_KOREAN                                         :Coreeg
 STR_NETWORK_LANG_LITHUANIAN                                     :Lithiwaneg
 STR_NETWORK_LANG_NORWEGIAN                                      :Norwyeg
@@ -1686,6 +1697,7 @@
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Estyn gwybodaeth cwmnïau..
 ############ End of leave-in-this-order
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} gwest{P ai eion}o'ch blaen
+STR_NETWORK_CONNECTING_DOWNLOADING_1                            :{BLACK}{BYTES} wedi'i lawrlwytho hyd yn hyn
 STR_NETWORK_CONNECTING_DOWNLOADING_2                            :{BLACK}{BYTES} / {BYTES} wedi eu llwytho i lawr hyd yn hyn
 
 STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Datgysylltu
@@ -1700,6 +1712,7 @@
 
 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Cicio
+STR_NETWORK_CLIENTLIST_BAN                                      :Gwahardd
 STR_NETWORK_CLIENTLIST_GIVE_MONEY                               :Rhoi arian
 STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL                             :Siarad â phawb
 STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Speak â chwmni
@@ -1728,6 +1741,7 @@
 # Network chat
 STR_NETWORK_CHAT_SEND                                           :{BLACK}Anfon
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Tîm] :
+STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Preifat] {STRING}:
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Pawb] :
 
 STR_NETWORK_CHAT_COMPANY                                        :[Tîm] {STRING}: {WHITE}{STRING}
@@ -1755,12 +1769,13 @@
 STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Rydych chi wedi'ch gwahardd o'r gweinydd hwn
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}YCafoch chi eich cicio o'r gêm
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Ni chaniateir twyllo ar y gweinydd hwn
+STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Roeddech yn gyrru gormod o orchmynion i'r gweinydd
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :gwall cyffredinol
 STR_NETWORK_ERROR_CLIENT_DESYNC                                 :gwall dadgydamseru
 STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :methwyd llwytho'r map
-STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :collwyd y cyswllt
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :collwyd y cysylltiad
 STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :gwall protocol
 STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF ddim yn cyfateb
 STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :heb ei awdurdodi
@@ -1772,11 +1787,23 @@
 STR_NETWORK_ERROR_CLIENT_KICKED                                 :wedi cael cic gan y gweinydd
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :yn ceisio twyllo
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :gweinydd llawn
+STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :yn gyrru gormod o orchmynion
 ############ End of leave-in-this-order
 
+STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Colled cysylltiad o bosib
+STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION                    :{WHITE}Am y {NUM} eiliad diwethaf nid oes data wedi cyrraedd o'r gweinydd
 
 # Network related errors
+STR_NETWORK_SERVER_MESSAGE                                      :*** {1:STRING}
 ############ Leave those lines in this order!!
+STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED                          :Gêm wedi'i oedi ({STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :Gêm wedi'i oedi o hyd ({STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :Gêm wedi'i oedi o hyd ({STRING}, {STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :Gêm wedi'i oedi o hyd ({STRING}, {STRING}, {STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Gêm yn rhedeg eto ({STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :nifer chwaraewyr
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :cysylltu gwesteion
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :â llaw
 ############ 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
@@ -1834,13 +1861,15 @@
 STR_CONTENT_TYPE_AI_LIBRARY                                     :llyfrgell AI
 STR_CONTENT_TYPE_SCENARIO                                       :Senario
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Map Uchder
+STR_CONTENT_TYPE_BASE_SOUNDS                                    :Seiniau sylfaenol
+STR_CONTENT_TYPE_BASE_MUSIC                                     :Cerddoriaeth sylfaenol
 
 # Content downloading progress window
 STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}Wrthi'n llwytho cynnwys i lawr...
 STR_CONTENT_DOWNLOAD_INITIALISE                                 :{WHITE}Wrthi'n gwneud cais am ffeiliau...
 STR_CONTENT_DOWNLOAD_FILE                                       :{WHITE}Wrthi'n llwytho i lawr {STRING} ({NUM} o {NUM})
 STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Llwytho i lawr wedi'i gwblhau
-STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES} o{BYTES} wedi llwytho i lawr ({NUM} %)
+STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES} o {BYTES} wedi'i llawrlwytho ({NUM} %)
 
 # Content downloading error messages
 STR_CONTENT_ERROR_COULD_NOT_CONNECT                             :{WHITE}Methwyd â chysylltu i'r gweinydd cynnwys...
@@ -1875,6 +1904,8 @@
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Uno gorsaf
 STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Adeiladu gorsaf ar wahân
 
+STR_JOIN_WAYPOINT_CAPTION                                       :{WHITE}Uno pwynt llwybro
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Adeiladu pwynt llwybro annibynnol
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :Adeiladu Rheilffyrdd
@@ -1885,7 +1916,7 @@
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Adeiladu trac rheilffordd
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Adeiladu trac yn defnyddio'r modd Awtoreilffordd
 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_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Newid rheilffordd yn bwynt llwybro. Mae Ctrl yn galluogi uno pwyntiau llwybro, tra fod Shift yn toglo adeiladu/dangos amcangyfrif o'r gost
 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{}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
@@ -1898,8 +1929,8 @@
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Dewiswch gyfeiriad depo rheilffordd
 
 # Rail waypoint construction window
-STR_WAYPOINT_CAPTION                                            :{WHITE}Pwynt Llwybr
-STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Dewiswch math Pwynt Llwybr
+STR_WAYPOINT_CAPTION                                            :{WHITE}Pwynt Llwybro
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Dewis math o bwynt llwybro
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Dewiswch Orsaf Reilffordd
@@ -1916,7 +1947,7 @@
 STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Dewiswch y math o orsaf i'w hadeiladu
 
 STR_STATION_CLASS_DFLT                                          :Gorsaf Ddiofyn
-STR_STATION_CLASS_WAYP                                          :Pwyntiau llwybr
+STR_STATION_CLASS_WAYP                                          :Pwyntiau llwybro
 
 # Signal window
 STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Dewis Signal
@@ -1942,6 +1973,7 @@
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Dewiswch Bont Ffordd
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Dewi pont - cliciwch ar y bont rydych chi'n dymuno ei hadeiladu
 STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SCENEDIT_INFO                                 :{GOLD}{STRING},{} {VELOCITY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Crog, Dur
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Hytrawst, Dur
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Canttilifer, Dur
@@ -1996,7 +2028,7 @@
 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. Mae Shift yn toglo adeiladu/amcangyfrif y gost
+STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Gosod bwi a ellir ei ddefnyddio fel pwynt llwybro. 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
@@ -2015,6 +2047,8 @@
 # Airport construction window
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Dewiswch Faes Awyr
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Dewiswch maint/math y maes awyr
+STR_STATION_BUILD_AIRPORT_CLASS_LABEL                           :{BLACK}Maint maes awyr
+STR_STATION_BUILD_AIRPORT_LAYOUT_NAME                           :{BLACK}Cynllun {NUM}
 
 STR_AIRPORT_SMALL                                               :Bach
 STR_AIRPORT_CITY                                                :Dinas
@@ -2041,7 +2075,14 @@
 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
-
+STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Dewis Gwrthrych
+STR_OBJECT_BUILD_TOOLTIP                                        :{BLACK}Dewisiwch wrthrych i'w hadeiladu. Mae Shift yn toglo adeiladu/dangor amcangyfrif o'r gost
+STR_OBJECT_BUILD_CLASS_TOOLTIP                                  :{BLACK}Dewisiwch dosbarth y gwrthrych i'w hadeiladu
+STR_OBJECT_BUILD_PREVIEW_TOOLTIP                                :{BLACK}Rhagolwg o'r gwrthrych
+STR_OBJECT_BUILD_SIZE                                           :{BLACK}Maint: {GOLD}{NUM} x {NUM} teil
+
+STR_OBJECT_CLASS_LTHS                                           :Goleudai
+STR_OBJECT_CLASS_TRNS                                           :Tyrrau Darlledu
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Coed
@@ -2074,6 +2115,11 @@
 STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Llawer o drefi ar hap
 STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Gorchuddio'r map gyda threfi wedi'i lleoli ar hap
 
+STR_FOUND_TOWN_NAME_TITLE                                       :{YELLOW}Enw tref:
+STR_FOUND_TOWN_NAME_EDITOR_TITLE                                :{BLACK}Rhowch enw'r dref
+STR_FOUND_TOWN_NAME_EDITOR_HELP                                 :{BLACK}Cliciwch i fewnbynnu enw'r dref
+STR_FOUND_TOWN_NAME_RANDOM_BUTTON                               :{BLACK}Enw ar hap
+STR_FOUND_TOWN_NAME_RANDOM_TOOLTIP                              :{BLACK}Cynhyrchu enw newydd ar hap
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Maint tref:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Bach
@@ -2103,6 +2149,15 @@
 STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Ariannu
 
 # Industry cargoes window
+STR_INDUSTRY_CARGOES_INDUSTRY_CAPTION                           :{WHITE}Cadwyn ddiwydiant ar gyfer diwydiant {STRING}
+STR_INDUSTRY_CARGOES_CARGO_CAPTION                              :{WHITE}Cadwyn ddiwydiant ar gyfer llwythi {STRING}
+STR_INDUSTRY_CARGOES_PRODUCERS                                  :{WHITE}Diwydiannau'n creu
+STR_INDUSTRY_CARGOES_CUSTOMERS                                  :{WHITE}Diwydiannau'n derbyn
+STR_INDUSTRY_CARGOES_HOUSES                                     :{WHITE}Tai
+STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP                           :{BLACK}Cliciwch ar ddiwydiant i weld ei gyflenwyr a chwsmeriaid
+STR_INDUSTRY_CARGOES_CARGO_TOOLTIP                              :{BLACK}{STRING}{}Cliciwch ar math llwyth i weld ei gyflenwyr a'i chwsmeriaid
+STR_INDUSTRY_DISPLAY_CHAIN                                      :{BLACK}Dangos cadwyn
+STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP                              :{BLACK}Dangos diwydiannau sy'n cyflenwi a derbyn llwythi
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Gwybodath Ardal Tir
@@ -2178,7 +2233,7 @@
 STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Gorsaf fysiau
 STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Doc llongau
 STR_LAI_STATION_DESCRIPTION_BUOY                                :Bwi
-STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Pwynt Llwybr
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Pwynt Llwybro
 
 STR_LAI_WATER_DESCRIPTION_WATER                                 :Dŵr
 STR_LAI_WATER_DESCRIPTION_CANAL                                 :Camlas
@@ -2300,10 +2355,10 @@
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Ydych chi eisiau diddymu cynhyrchu'r byd?
 STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% cyflawn
 STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
-STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Cynhyrchu Byd
+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_TREE_GENERATION                                  :{BLACK}Cynhyrchu coed
+STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Cynhyrchu gwrthrych
 STR_GENERATION_CLEARING_TILES                                   :{BLACK}Cynhyrchu ardaloedd creigiog a chnapiog
 STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Gosod gêm yn ei le
 STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Rhedeg dolen teiliau
@@ -2434,7 +2489,7 @@
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Dinas)
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Poblogaeth: {ORANGE}{COMMA}{BLACK}  Tai: {ORANGE}{COMMA}
-STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}teithiwr mis diwethaf: {ORANGE}{COMMA}{BLACK}  uchafswm: {ORANGE}{COMMA}
+STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Teithwyr mis diwethaf: {ORANGE}{COMMA}{BLACK}  uchafswm: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Post mis diwethaf: {ORANGE}{COMMA}{BLACK}  uchafswm: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Cargo angen i tyfi'r tref:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{STRING}{BLACK} angen
@@ -2537,7 +2592,7 @@
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Newid enw pwynt llwybro
 
-STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Golygu enw Pwynt Llwybr
+STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Golygu enw pwynt llwybro
 
 # Finances window
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Cyllid {BLACK}{COMPANYNUM}
@@ -3344,7 +3399,7 @@
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Does dim modd adeiladu diwydiant o'r math hwn yma...
 STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... rhy agos i ddiwydiant arall
 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_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... un yn unig a ganiateir 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 mewn ardal coedwig glaw yn unig
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... gellir ei adeiladu mewn ardal anialwch yn unig
@@ -3395,11 +3450,11 @@
 
 # Waypoint related errors
 
-STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Does dim modd adeiladu pwynt llwybr trên yma...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Does dim modd adeiladu pwynt llwybro trên yma...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Methu gosod bwi yma...
-STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Does dim modd newid enw Pwynt Llwybr...
-
-STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Does dim modd tynnu'r pwynt llwybr trên yma...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Does dim modd newid enw pwynt llwybro...
+
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Does dim modd tynnu'r pwynt llwybro trên yma...
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... bwi yn y ffordd
 STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... bwi mewn defnydd gan cwmni arall!
 
@@ -3416,7 +3471,7 @@
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR                :{WHITE}... fod wedi'i stopio mewn awyrendâi
 
 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_TRAIN_TOO_LONG                                        :{WHITE}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}... mae'n cynnwys sawl uned
 STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Mathau rheilffordd anghydnaws
@@ -3628,7 +3683,7 @@
 
 ##id 0x4800
 # industry names
-STR_INDUSTRY_NAME_COAL_MINE                                     :Gorsaf Lo
+STR_INDUSTRY_NAME_COAL_MINE                                     :Glofa
 STR_INDUSTRY_NAME_POWER_STATION                                 :Gorsaf Bŵer
 STR_INDUSTRY_NAME_SAWMILL                                       :Melin Goed
 STR_INDUSTRY_NAME_FOREST                                        :Coedwig
@@ -3638,19 +3693,19 @@
 STR_INDUSTRY_NAME_PRINTING_WORKS                                :Gwaith Argraffu
 STR_INDUSTRY_NAME_STEEL_MILL                                    :Melin Ddur
 STR_INDUSTRY_NAME_FARM                                          :Fferm
-STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :Mwynglawdd Mwyn Copr
+STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :Cloddfa Gopr
 STR_INDUSTRY_NAME_OIL_WELLS                                     :Ffynhonnau Olew
 STR_INDUSTRY_NAME_BANK                                          :Banc
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :Gwaith Prosesu Bwyd
 STR_INDUSTRY_NAME_PAPER_MILL                                    :Melin Bapur
-STR_INDUSTRY_NAME_GOLD_MINE                                     :Mwynglawdd Aur
+STR_INDUSTRY_NAME_GOLD_MINE                                     :Cloddfa Aur
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC                            :Banc
-STR_INDUSTRY_NAME_DIAMOND_MINE                                  :Mwynglawdd Ddiemwntau
-STR_INDUSTRY_NAME_IRON_ORE_MINE                                 :Mwynglawdd Mwyn Haearn
+STR_INDUSTRY_NAME_DIAMOND_MINE                                  :Cloddfa Diemwntau
+STR_INDUSTRY_NAME_IRON_ORE_MINE                                 :Cloddfa Haearn
 STR_INDUSTRY_NAME_FRUIT_PLANTATION                              :Planhigfa Ffrwythau
 STR_INDUSTRY_NAME_RUBBER_PLANTATION                             :Planhigfa Rwber
-STR_INDUSTRY_NAME_WATER_SUPPLY                                  :Cyflenwad Dŵr
-STR_INDUSTRY_NAME_WATER_TOWER                                   :Twr Dŵr
+STR_INDUSTRY_NAME_WATER_SUPPLY                                  :Ffynhonell Ddŵr
+STR_INDUSTRY_NAME_WATER_TOWER                                   :Storfa Ddŵr
 STR_INDUSTRY_NAME_FACTORY_2                                     :Ffatri
 STR_INDUSTRY_NAME_FARM_2                                        :Fferm
 STR_INDUSTRY_NAME_LUMBER_MILL                                   :Melin Goed
@@ -3664,7 +3719,7 @@
 STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :Ffatri Ddŵr Pefriol
 STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :Cynhyrchydd Swigod
 STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :Chwarel Doffi
-STR_INDUSTRY_NAME_SUGAR_MINE                                    :Mwynglawdd Siwgr
+STR_INDUSTRY_NAME_SUGAR_MINE                                    :Cloddfa Siwgr
 
 ############ WARNING, using range 0x6000 for strings that are stored in the savegame
 ############ These strings may never get a new id, or savegames will break!
@@ -3973,8 +4028,8 @@
 STR_FORMAT_COMPANY_NUM                                          :(Cwmni {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Grw^p {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
-STR_FORMAT_WAYPOINT_NAME                                        :Pwynt Llwybr {TOWN}
-STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Pwynt Llwybr {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :Pwynt Llwybro {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Pwynt Llwybro {TOWN} #{COMMA}
 
 
 STR_UNKNOWN_STATION                                             :gorsaf anhysbys