--- a/src/lang/unfinished/maltese.txt
+++ b/src/lang/unfinished/maltese.txt
@@ -118,7 +118,7 @@
 
 # 'Mode' of transport for cargoes
 STR_PASSENGERS                                                  :{COMMA} passiġġieri
-STR_BAGS                                                        :{COMMA} boroż
+STR_BAGS                                                        :{COMMA} bagalji
 STR_TONS                                                        :{COMMA} tunnellati
 STR_LITERS                                                      :{COMMA} litri
 STR_ITEMS                                                       :{COMMA} oġġetti
@@ -126,6 +126,7 @@
 
 # Colours, do not shuffle
 STR_COLOUR_DARK_BLUE                                            :Blu Skur
+STR_COLOUR_PALE_GREEN                                           :Aħdar ċar
 STR_COLOUR_PINK                                                 :Roża
 STR_COLOUR_YELLOW                                               :Isfar
 STR_COLOUR_RED                                                  :Aħmar
@@ -134,33 +135,73 @@
 STR_COLOUR_DARK_GREEN                                           :Aħdar Skur
 STR_COLOUR_BLUE                                                 :Blu
 STR_COLOUR_CREAM                                                :Krema
+STR_COLOUR_PURPLE                                               :Vjola
 STR_COLOUR_ORANGE                                               :Oranġjo
 STR_COLOUR_BROWN                                                :Kannella
 STR_COLOUR_GREY                                                 :Griż
 STR_COLOUR_WHITE                                                :Abjad
 
 # Units used in OpenTTD
+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} mph
+STR_UNITS_VELOCITY_METRIC                                       :{COMMA} km/h
+STR_UNITS_VELOCITY_SI                                           :{COMMA} m/s
 
+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}hp
+STR_UNITS_POWER_METRIC                                          :{COMMA}hp
+STR_UNITS_POWER_SI                                              :{COMMA}kW
 
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}t
+STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}kg
 
-
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} tunnellata
+STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg
 
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}l
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³
 
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} litru
+STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
+
+STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA} ft
 STR_UNITS_HEIGHT_SI                                             :{COMMA} m
 
 # Common window strings
+STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Daħħal sentenza għall-iffiltrar
+STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Daħħal kelma biex tiffiltra din il-lista għall-
 
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Għazel ordni biex tissortja (tielgħa/niezel)
+STR_TOOLTIP_SORT_CRITERIA                                       :{BLACK}Għazel il-kriterju biex tissortja
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Għazel il-kriterju biex tiffilterja
+STR_BUTTON_SORT_BY                                              :{BLACK}Issortja b'dan
+STR_BUTTON_LOCATION                                             :{BLACK}Lokal
+STR_BUTTON_RENAME                                               :{BLACK}Semmi mil-ġdid
 
+STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Għalaq it-tieqa
+STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Titlu tat-Tieqa - iddregja din biex tmexxi it-tieqa
+STR_TOOLTIP_SHADE                                               :{BLACK}Tieqa tad-dell - uri biss il-faxxa tat-titlu
+STR_TOOLTIP_DEBUG                                               :{BLACK}Uri l-informazzjoni tan-NewGRF debug
+STR_TOOLTIP_STICKY                                              :{BLACK}Immarka din it-tieqa li ma tistax tingħalaq mil-buttuna 'Għalaq it-twieqi kolla'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Għafas u dragja biex tbiddel id-daqs tat-tieqa
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Biddel id-daqs tat-tieqa bejn kbir u zgħir
+STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Faxxa biex tiskrolja - iskrolja l-lista l-fuq jew l-isfel
+STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Faxxa biex tiskrolja - iskrolja l-lista lejn ix-xellug jew lemin
+STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Waqqa bini, etc.., Ctrl tagħzel zona dijagonali. Shift taqleb bejn bini/turija ta' stima ta' l-ispiza
 
 # Query window
+STR_BUTTON_DEFAULT                                              :{BLACK}Default
+STR_BUTTON_CANCEL                                               :{BLACK}Ikkanċella
 STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
+STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
+STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 
 # Measurement tooltip
 STR_MEASURE_LENGTH                                              :{BLACK}Tul: {NUM}
+STR_MEASURE_AREA                                                :{BLACK}Arja: {NUM} x {NUM}
+STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Tul: {NUM}{}Differenza fl-għoli: {HEIGHT}
 
 
 # These are used in buttons
@@ -372,6 +413,7 @@
 
 
 
+
 # Advanced settings window
 
 
@@ -387,6 +429,7 @@
 
 
 
+
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :l-ebda azzjoni
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :l-azzjonijiet kollha
 
@@ -409,6 +452,7 @@
 
 
 
+
 # Quit window
 
 # Supported OSes
@@ -627,6 +671,8 @@
 STR_NEWGRF_INVALID_ENGINE                                       :<magna invalida>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<industrija invalida>
 
+# NewGRF scanning window
+
 # Sign list window
 
 # Sign window
@@ -785,6 +831,8 @@
 
 
 
+# Conditional order variables, must follow order of OrderConditionVariable enum
+
 
 
 
@@ -848,6 +896,7 @@
 
 
 
+
 # Soundset messages
 
 # Screenshot related messages

--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -841,10 +841,10 @@
 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 gan yr awdurdod lleol!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}! Bydd y gwasanaeth {}{}{STRING} o {STRING} i {STRING} yn talu 50% yn fwy am y flwyddyn nesaf!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}! Bydd y gwasanaeth {}{}{STRING} o {STRING} i {STRING} yn talu dwywaith yn fwy am y flwyddyn nesaf!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}! Bydd y gwasanaeth {}{}{STRING} o {STRING} i {STRING} yn talu teirgwaith yn fwy am y flwyddyn nesaf!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}! Bydd y gwasanaeth {}{}{STRING} o {STRING} i {STRING} yn talu pedair gwaith yn fwy am y flwyddyn nesaf!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}!{}{}Bydd y gwasanaeth {STRING} o {STRING} i {STRING} yn talu 50% yn fwy am y flwyddyn nesaf!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}!{}{}Bydd y gwasanaeth {STRING} o {STRING} i {STRING} yn talu dwywaith yn fwy am y flwyddyn nesaf!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}!{}{}Bydd y gwasanaeth {STRING} o {STRING} i {STRING} yn talu teirgwaith yn fwy am y flwyddyn nesaf!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}!{}{}Bydd y gwasanaeth {STRING} o {STRING} i {STRING} yn talu pedair gwaith yn fwy am y flwyddyn nesaf!
 
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Anrhefn traffig yn {TOWN}!{}{}Daw gwaith ffordd a ariannwyd gan {STRING} â 6 mis o boen i deithwyr ffordd y dref!
 
@@ -1035,7 +1035,7 @@
 STR_NUM_VERY_LOW                                                :Isel Iawn
 STR_NUM_LOW                                                     :Isel
 STR_NUM_NORMAL                                                  :Arferol
-STR_NUM_HIGH                                                    :Anodd
+STR_NUM_HIGH                                                    :Uchel
 STR_NUM_CUSTOM                                                  :Addasedig
 STR_NUM_CUSTOM_NUMBER                                           :Addasiedig ({NUM})
 
@@ -1179,7 +1179,7 @@
 STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}Cynhyrchydd Tir: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Gwreiddiol
 STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
-STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Pellter uchafsymol o'r ymyl ar gyfer Purfeydd Olew {ORANGE}{STRING} sgwar{P 0:1 "" s}
+STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Pellter uchafsymol o'r ymyl ar gyfer Purfeydd Olew {ORANGE}{STRING} sgwâr
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :{LTBLUE}Uchder Llinell Eira: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Garwder y tirwedd (TerraGenesis yn unig) : {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Llyfn Iawn
@@ -2336,7 +2336,7 @@
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}De Ddwyrain
 STR_MAPGEN_SOUTHWEST                                            :{BLACK}De Orllewin
 STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Ffurfrydd
-STR_MAPGEN_BORDER_WATER                                         :{BLACK}Dw^r
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Dŵr
 STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Ar hap
 STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Ar hap
 STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Â Llaw
@@ -3774,7 +3774,7 @@
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Methu gwrthdroi'r trên...
 STR_ERROR_TRAIN_START_NO_POWER                                  :Mae'r trên heb bŵer
 
-STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}ddim yn methu troi'r cerbyd...
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Methu troi'r cerbyd...
 
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}mae'r awyren yn hedfan