Merge branch 'master' into more_cond_orders

Conflicts: src/order_base.h src/order_gui.cpp src/saveload/saveload.cpp src/saveload/saveload.h
2015-08-26 22:51:47 +01:00
parent ea5c33029b 8c389a2a96
commit ffdd845b1c
1117 changed files with 142468 additions and 73477 deletions
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
--- a/src/lang/thai.txt
+++ b/src/lang/thai.txt
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
--- a/src/lang/unfinished/basque.txt
+++ b/src/lang/unfinished/basque.txt
--- a/src/lang/unfinished/chuvash.txt
+++ b/src/lang/unfinished/chuvash.txt
@@ -171,6 +171,9 @@ STR_BUTTON_RENAME                                               :{BLACK}Ята

 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Чӳречене хуп

+# Show engines button
+
+
 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}Пӳрнӗ пек
 STR_BUTTON_CANCEL                                               :{BLACK}Улӑштар
@@ -186,7 +189,6 @@ STR_MEASURE_AREA                                                :{BLACK}Лапт


 # These are used in buttons
-STR_SORT_BY_CAPTION_POPULATION                                  :{BLACK}Ҫынисем
 STR_SORT_BY_CAPTION_NAME                                        :{BLACK}Ячӗ
 STR_SORT_BY_CAPTION_DATE                                        :{BLACK}Кун
 # These are used in dropdowns
@@ -201,6 +203,7 @@ STR_SORT_BY_VALUE                                               :Хак
 STR_SORT_BY_LENGTH                                              :Тӑршшӗ
 STR_SORT_BY_COST                                                :Хак
 STR_SORT_BY_POWER                                               :Хӑватлӑх
+STR_SORT_BY_POPULATION                                          :Ҫынисем

 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Вӑййи тӑхтав
@@ -227,10 +230,10 @@ STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Тух
 ############ range ends here

-############ range for map menu starts
-############ range for town menu starts, yet the town directory is shown in the map menu in the scenario editor
-############ end of the 'Display map' dropdown
-############ end of the 'Town' dropdown
+# map menu
+
+############ range for town menu starts
+############ range ends here

 ############ range for subsidies menu starts
 STR_SUBSIDIES_MENU_SUBSIDIES                                    :Грантсем
@@ -275,7 +278,7 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Яланхил
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :'OpenTTD' çинчен
 ############ range ends here

-############ range for days starts (also used for the place in the highscore window)
+############ range for ordinal numbers used for the place in the highscore window
 STR_ORDINAL_NUMBER_1ST                                          :1мӗш
 STR_ORDINAL_NUMBER_2ND                                          :2мӗш
 STR_ORDINAL_NUMBER_3RD                                          :3-мӗш
@@ -291,22 +294,40 @@ STR_ORDINAL_NUMBER_12TH                                         :12-мӗш
 STR_ORDINAL_NUMBER_13TH                                         :13-мӗш
 STR_ORDINAL_NUMBER_14TH                                         :14-мӗш
 STR_ORDINAL_NUMBER_15TH                                         :15-мӗш
-STR_ORDINAL_NUMBER_16TH                                         :16-мӗш
-STR_ORDINAL_NUMBER_17TH                                         :17-мӗш
-STR_ORDINAL_NUMBER_18TH                                         :18-мӗш
-STR_ORDINAL_NUMBER_19TH                                         :19-мӗш
-STR_ORDINAL_NUMBER_20TH                                         :20-мӗш
-STR_ORDINAL_NUMBER_21ST                                         :21-мӗш
-STR_ORDINAL_NUMBER_22ND                                         :22-мӗш
-STR_ORDINAL_NUMBER_23RD                                         :23-мӗш
-STR_ORDINAL_NUMBER_24TH                                         :24-мӗш
-STR_ORDINAL_NUMBER_25TH                                         :25-мӗш
-STR_ORDINAL_NUMBER_26TH                                         :26-мӗш
-STR_ORDINAL_NUMBER_27TH                                         :27-мӗш
-STR_ORDINAL_NUMBER_28TH                                         :28-мӗш
-STR_ORDINAL_NUMBER_29TH                                         :29-мӗш
-STR_ORDINAL_NUMBER_30TH                                         :30-мӗш
-STR_ORDINAL_NUMBER_31ST                                         :31-мӗш
+############ range for ordinal numbers ends
+
+############ range for days starts
+STR_DAY_NUMBER_1ST                                              :1мӗш
+STR_DAY_NUMBER_2ND                                              :2мӗш
+STR_DAY_NUMBER_3RD                                              :3-мӗш
+STR_DAY_NUMBER_4TH                                              :4-мӗш
+STR_DAY_NUMBER_5TH                                              :5-мӗш
+STR_DAY_NUMBER_6TH                                              :6-мӗш
+STR_DAY_NUMBER_7TH                                              :7-мӗш
+STR_DAY_NUMBER_8TH                                              :8-мӗш
+STR_DAY_NUMBER_9TH                                              :9-мӗш
+STR_DAY_NUMBER_10TH                                             :10-мӗш
+STR_DAY_NUMBER_11TH                                             :11-мӗш
+STR_DAY_NUMBER_12TH                                             :12-мӗш
+STR_DAY_NUMBER_13TH                                             :13-мӗш
+STR_DAY_NUMBER_14TH                                             :14-мӗш
+STR_DAY_NUMBER_15TH                                             :15-мӗш
+STR_DAY_NUMBER_16TH                                             :16-мӗш
+STR_DAY_NUMBER_17TH                                             :17-мӗш
+STR_DAY_NUMBER_18TH                                             :18-мӗш
+STR_DAY_NUMBER_19TH                                             :19-мӗш
+STR_DAY_NUMBER_20TH                                             :20-мӗш
+STR_DAY_NUMBER_21ST                                             :21-мӗш
+STR_DAY_NUMBER_22ND                                             :22-мӗш
+STR_DAY_NUMBER_23RD                                             :23-мӗш
+STR_DAY_NUMBER_24TH                                             :24-мӗш
+STR_DAY_NUMBER_25TH                                             :25-мӗш
+STR_DAY_NUMBER_26TH                                             :26-мӗш
+STR_DAY_NUMBER_27TH                                             :27-мӗш
+STR_DAY_NUMBER_28TH                                             :28-мӗш
+STR_DAY_NUMBER_29TH                                             :29-мӗш
+STR_DAY_NUMBER_30TH                                             :30-мӗш
+STR_DAY_NUMBER_31ST                                             :31-мӗш
 ############ range for days ends

 ############ range for months starts
@@ -389,7 +410,7 @@ STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLA

 # Highscore window
 STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
-STR_HIGHSCORE_NAME                                              :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY}
+STR_HIGHSCORE_NAME                                              :{PRESIDENT_NAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIG_FONT}'{STRING}'   ({COMMA})

 # Smallmap window
@@ -428,14 +449,7 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ВӐ
 # News message history
 STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}

-# Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Пӗлтерӳ
-STR_NEWS_MESSAGE_OPTIONS_CAPTION                                :{WHITE}Майлаштару пӗлтерӗвӗ
-STR_NEWS_MESSAGES_OFF                                           :Сӳнтер
-STR_NEWS_MESSAGES_SUMMARY                                       :Кӗске
-STR_NEWS_MESSAGES_FULL                                          :Тулли
-
-STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Грантсем



@@ -447,10 +461,7 @@ STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Гра



-
-# Start of order review system
-# DON'T ADD OR REMOVE LINES HERE
-# end of order system
+# Order review system / warnings



@@ -467,10 +478,6 @@ STR_GAME_OPTIONS_CURRENCY_RUR                                   :Вырӑсла
 ############ end of currency region


-############ start of measuring units region
-############ end of measuring units region
-
-

 ############ start of townname region
 STR_GAME_OPTIONS_TOWN_NAME_ORIGINAL_ENGLISH                     :Акӑлчан
@@ -496,7 +503,9 @@ STR_GAME_OPTIONS_TOWN_NAME_CATALAN                              :Катталу

 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Хӑй управ

+############ start of autosave dropdown
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Сӳнтер
+############ end of autosave dropdown

 STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Чӗлхи

@@ -505,7 +514,7 @@ STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Тулл
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Экрана сӑнарлама пултарни
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :расна

-STR_GAME_OPTIONS_SCREENSHOT_FORMAT                              :{BLACK}Формат экран сӑнӗ
+



@@ -521,21 +530,6 @@ STR_CURRENCY_SUFFIX                                             :{LTBLUE}Суф

 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Малтанласа пӑхса тухни: {ORANGE}{CURRENCY_LONG}

-# Difficulty level window
-
-############ range for difficulty levels starts
-STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Ҫӑмӑл
-STR_DIFFICULTY_LEVEL_MEDIUM                                     :{BLACK}Вӑтам
-STR_DIFFICULTY_LEVEL_HARD                                       :{BLACK}Йывӑр
-STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}Харпӑр хӑй
-############ range for difficulty levels ends
-
-STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Упра
-
-############ range for difficulty settings starts
-STR_DIFFICULTY_LEVEL_SETTING_ECONOMY                            :{LTBLUE}Экономика: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_DISASTERS                          :{LTBLUE}Инкек: {ORANGE}{STRING}
-############ range for difficulty settings ends

 STR_NONE                                                        :Ҫук
 STR_NUM_CUSTOM                                                  :Харпӑр хӑй
@@ -558,9 +552,9 @@ STR_SUBSIDY_X4                                                  :x4



+# Settings tree window


-# Advanced settings window

 STR_CONFIG_SETTING_OFF                                          :Сӳнтер
 STR_CONFIG_SETTING_ON                                           :Ҫут
@@ -576,6 +570,7 @@ STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT                          :Сулахай
 STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER                        :Варринче
 STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT                         :Сылтӑмра

+
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :ҫук
 STR_CONFIG_SETTING_PLANE_CRASHES_NONE                           :ҫук

@@ -594,6 +589,7 @@ STR_CONFIG_SETTING_SCROLLWHEEL_OFF                              :Сӳнтер
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Сӳнтер


+
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :вӑрӑм (2008 раш 31меш)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :кӗске (2008-12-31)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)
@@ -605,6 +601,13 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31



+STR_CONFIG_SETTING_NEWS_SUBSIDIES                               :Грантсем: {STRING}
+
+STR_CONFIG_SETTING_NEWS_MESSAGES_OFF                            :Сӳнтер
+STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY                        :Кӗске
+STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :Тулли
+
+
 STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT                          :чӑн
 STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID                         :2x2
 STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID                         :3x3
@@ -618,14 +621,18 @@ STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL                           :Виҫеллӗ
 STR_CONFIG_SETTING_TOWN_GROWTH_FAST                             :Хӑвӑрт
 STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :Питӗ хӑвӑрт

-STR_CONFIG_SETTING_GUI                                          :{ORANGE}Интерфейс
-STR_CONFIG_SETTING_CONSTRUCTION                                 :{ORANGE}Лартӑм
+
+
+
+
+
+
+
+STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Интерфейс
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Лартӑм
 STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Ҫул-йӗр:
-STR_CONFIG_SETTING_STATIONS                                     :{ORANGE}Станцисем:
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Хуласем
 STR_CONFIG_SETTING_AI                                           :{ORANGE}Ӑмӑртуҫӑсем
-STR_CONFIG_SETTING_VEHICLES_AUTORENEW                           :{ORANGE}Автоҫӗнет
-STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE}Пуйӑссем
-STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}Хуласем

 STR_CONFIG_SETTING_PATHFINDER_NPF                               :NPF

@@ -730,9 +737,6 @@ STR_FACE_TIE                                                    :Галстук:
 STR_FACE_EARRING                                                :Алка:

 # Network server list
-STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Ҫыхӑну:
-STR_NETWORK_SERVER_LIST_LAN                                     :LAN
-STR_NETWORK_SERVER_LIST_INTERNET                                :Тетел
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Вӑйӑҫӑ ят:

 STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Ят
@@ -774,7 +778,6 @@ STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Серв
 STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Вӑййи ят:
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Вырнаҫтар вӑрттӑн сӑмахӗ

-STR_NETWORK_START_SERVER_LAN_INTERNET                           :Вырӑнти Тӗвӗлӗх/Тетел


 # Network game languages
@@ -831,6 +834,10 @@ STR_CONTENT_DETAIL_VERSION                                      :{SILVER}Вер

 # Transparency settings window

+# Linkgraph legend window
+
+# Linkgraph legend window and linkgraph legend in smallmap
+
 # Base for station construction window(s)

 # Join station window
@@ -988,6 +995,8 @@ STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Объе
 STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Верси: {SILVER}{NUM}


+# NewGRF save preset window
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Хуп
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Сикӗ
@@ -1018,10 +1027,11 @@ STR_NEWGRF_LIST_NONE                                            :Ҫук

 # 'User removed essential NewGRFs'-placeholders for stuff without specs

+# Placeholders for other invalid stuff, e.g. vehicles that have gone (Game Script).
+
 # NewGRF scanning window

 # Sign list window
-STR_SIGN_LIST_CLEAR                                             :{BLACK}Филтр тасат

 # Sign window

@@ -1045,11 +1055,14 @@ STR_GOALS_TEXT                                                  :{ORANGE}{STRING

 # Goal question window

-### Start of Goal Question button list
+############ Start of Goal Question button list
+############ End of Goal Question button list

 # Subsidies window
 STR_SUBSIDIES_NONE                                              :{ORANGE}- Ҫук -

+# Story book window
+
 # Station list window
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATION_FEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
@@ -1060,7 +1073,9 @@ STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION
 STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO_LONG}


-STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
+
+
+

 ############ range for rating starts
 ############ range for rating ends
@@ -1068,6 +1083,7 @@ STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}



+
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}

@@ -1115,6 +1131,7 @@ STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Ҫу



+
 # Build vehicle window


@@ -1125,6 +1142,9 @@ STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Ҫу



+
+
+
 # Depot window
 STR_DEPOT_CAPTION                                               :{WHITE}{DEPOT}

@@ -1157,6 +1177,7 @@ STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO_LONG}



+
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}

@@ -1186,6 +1207,7 @@ STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Савӑ



+
 # Extra buttons for train details windows


@@ -1292,6 +1314,7 @@ STR_GAME_SAVELOAD_NOT_AVAILABLE                                 :<палӑ ма
 # Soundset messages

 # Screenshot related messages
+
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Ӑнӑҫсӑр экран сӑнӗ

 # Error message titles
@@ -1310,6 +1333,7 @@ STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Пӗл

 # Industry related errors

+
 # Station construction related errors


@@ -1362,6 +1386,7 @@ STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Ҫул



+
 # Specific vehicle errors


@@ -1375,6 +1400,8 @@ STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Ҫул

 # Translatable comment for OpenTTD's desktop shortcut

+# Translatable descriptions in media/baseset/*.ob* files
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_CHURCH_1                                 :Чиркӳ
@@ -1452,7 +1479,7 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
-STR_JUST_STRING_SPACE_STRING                                    :{STRING} {STRING}
+STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}

 # Slightly 'raw' stringcodes with colour or size
@@ -1465,8 +1492,6 @@ STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINY_FONT}{BLACK}{DATE_LONG}
@@ -1477,9 +1502,7 @@ STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_TINY_BLACK_STATION                                          :{TINY_FONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
-STR_RED_STRING                                                  :{RED}{STRING}
 STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_ORANGE_STRING1_WHITE                                        :{ORANGE}{STRING}{WHITE}
--- a/src/lang/unfinished/faroese.txt
+++ b/src/lang/unfinished/faroese.txt
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -224,6 +224,9 @@ STR_BUTTON_RENAME                                               :{BLACK}Rinomiza
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Klozas fenestro
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Baskulas granda/mikra fenestro grandeso

+# Show engines button
+
+
 # Query window
 STR_BUTTON_CANCEL                                               :{BLACK}Anular
 STR_BUTTON_OK                                                   :{BLACK}OK
@@ -240,7 +243,6 @@ STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Areo: {N


 # These are used in buttons
-STR_SORT_BY_CAPTION_POPULATION                                  :{BLACK}Populo
 STR_SORT_BY_CAPTION_NAME                                        :{BLACK}Nomo
 STR_SORT_BY_CAPTION_DATE                                        :{BLACK}Dato
 # These are used in dropdowns
@@ -253,6 +255,7 @@ STR_SORT_BY_MAX_SPEED                                           :Maximo rapideso
 STR_SORT_BY_LENGTH                                              :Longeso
 STR_SORT_BY_FACILITY                                            :Stacion-tipo
 STR_SORT_BY_POWER                                               :Povo
+STR_SORT_BY_POPULATION                                          :Populo

 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pauzas ludo
@@ -292,12 +295,12 @@ STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Ekiras
 ############ range ends here

-############ range for map menu starts
+# map menu
 STR_MAP_MENU_MAP_OF_WORLD                                       :Mapo di mondo
 STR_MAP_MENU_SIGN_LIST                                          :Listo di signi
-############ range for town menu starts, yet the town directory is shown in the map menu in the scenario editor
-############ end of the 'Display map' dropdown
-############ end of the 'Town' dropdown
+
+############ range for town menu starts
+############ range ends here

 ############ range for subsidies menu starts
 ############ range ends here
@@ -337,7 +340,10 @@ STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH                            :Livrita kargajo
 ############ range for about menu starts
 ############ range ends here

-############ range for days starts (also used for the place in the highscore window)
+############ range for ordinal numbers used for the place in the highscore window
+############ range for ordinal numbers ends
+
+############ range for days starts
 ############ range for days ends

 ############ range for months starts
@@ -376,7 +382,7 @@ STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKG

 # Highscore window
 STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
-STR_HIGHSCORE_NAME                                              :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY}
+STR_HIGHSCORE_NAME                                              :{PRESIDENT_NAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIG_FONT}'{STRING}'   ({COMMA})

 # Smallmap window
@@ -429,7 +435,6 @@ STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {C

 # News message history

-# Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Sendajo


@@ -442,11 +447,7 @@ STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Sendajo



-
-
-# Start of order review system
-# DON'T ADD OR REMOVE LINES HERE
-# end of order system
+# Order review system / warnings



@@ -463,15 +464,13 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Ludo Sel
 ############ end of currency region


-############ start of measuring units region
-############ end of measuring units region
-
-

 ############ start of townname region
 ############ end of townname region


+############ start of autosave dropdown
+############ end of autosave dropdown



@@ -482,6 +481,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :altra



+
 # Custom currency window


@@ -489,16 +489,6 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :altra



-# Difficulty level window
-
-############ range for difficulty levels starts
-############ range for difficulty levels ends
-
-
-############ range for difficulty settings starts
-STR_DIFFICULTY_LEVEL_SETTING_ECONOMY                            :{LTBLUE}Ekonomio: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_DISASTERS                          :{LTBLUE}Dizastri: {ORANGE}{STRING}
-############ range for difficulty settings ends

 STR_NUM_LOW                                                     :Basa
 STR_NUM_NORMAL                                                  :Normala
@@ -528,15 +518,16 @@ STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Kustumigita ({N



+# Settings tree window


-# Advanced settings window



 STR_CONFIG_SETTING_NONE                                         :Nulo


+
 STR_CONFIG_SETTING_PLANE_CRASHES_NONE                           :nulo
 STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :normala

@@ -558,6 +549,10 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :Violkolora



+
+
+
+
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :omnube


@@ -565,6 +560,13 @@ STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :omnube



+
+
+
+
+
+
+
 # Config errors

 # Intro window
@@ -668,6 +670,10 @@ STR_NETWORK_SERVER_MESSAGE                                      :*** {1:STRING}

 # Transparency settings window

+# Linkgraph legend window
+
+# Linkgraph legend window and linkgraph legend in smallmap
+
 # Base for station construction window(s)
 STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Aceptas: {GOLD}{CARGO_LIST}

@@ -770,7 +776,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_HEADQUARTERS                 :Stabeyo di komp

 # About OpenTTD window
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versiono {REV}
-STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2012 La kruo OpenTTD
+STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2015 La kruo OpenTTD

 # Save/load game/scenario
 STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Ludo Detali
@@ -797,6 +803,8 @@ STR_MAPGEN_BY                                                   :{BLACK}*
 STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Versiono: {SILVER}{NUM}


+# NewGRF save preset window
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Klozas
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
@@ -830,6 +838,8 @@ STR_NEWGRF_LIST_NONE                                            :Nulo
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??

+# Placeholders for other invalid stuff, e.g. vehicles that have gone (Game Script).
+
 # NewGRF scanning window

 # Sign list window
@@ -855,22 +865,26 @@ STR_GOALS_TEXT                                                  :{ORANGE}{STRING

 # Goal question window

-### Start of Goal Question button list
+############ Start of Goal Question button list
+############ End of Goal Question button list

 # Subsidies window

+# Story book window
+
 # Station list window
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATION_FEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}

 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATION_FEATURES}
-STR_STATION_VIEW_WAITING_TITLE                                  :{BLACK}Vartabas: {WHITE}{STRING}
 STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO_LONG}

 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Aceptas: {WHITE}{CARGO_LIST}

-STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
+
+
+

 ############ range for rating starts
 ############ range for rating ends
@@ -878,6 +892,7 @@ STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}



+
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}

@@ -950,6 +965,7 @@ STR_GROUP_DEFAULT_AIRCRAFTS                                     :Negrupigita aer



+
 # Build vehicle window


@@ -960,6 +976,9 @@ STR_GROUP_DEFAULT_AIRCRAFTS                                     :Negrupigita aer



+
+
+
 # Depot window
 STR_DEPOT_CAPTION                                               :{WHITE}{DEPOT}

@@ -998,6 +1017,7 @@ STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aeronavo



+
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}

@@ -1031,6 +1051,7 @@ STR_VEHICLE_COMMAND_STARTED                                     :{GREEN}Komencin



+
 # Extra buttons for train details windows


@@ -1139,6 +1160,7 @@ STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORAN

 # Screenshot related messages

+
 # Error message titles
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Sendajo
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Sendajo de {STRING}
@@ -1167,6 +1189,7 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... tro
 # Industry related errors
 STR_ERROR_TOO_MANY_INDUSTRIES                                   :{WHITE}... tro multa industrii

+
 # Station construction related errors


@@ -1223,6 +1246,7 @@ STR_ERROR_CAN_T_BUILD_OBJECT                                    :{WHITE}Ne povas
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Tro multa vehili en la ludo


+
 # Specific vehicle errors


@@ -1236,6 +1260,8 @@ STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Tro mult

 # Translatable comment for OpenTTD's desktop shortcut

+# Translatable descriptions in media/baseset/*.ob* files
+
 ##id 0x2000
 # Town building names

@@ -1314,7 +1340,7 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
-STR_JUST_STRING_SPACE_STRING                                    :{STRING} {STRING}
+STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}

 # Slightly 'raw' stringcodes with colour or size
@@ -1327,8 +1353,6 @@ STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINY_FONT}{BLACK}{DATE_LONG}
@@ -1339,9 +1363,7 @@ STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_TINY_BLACK_STATION                                          :{TINY_FONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
-STR_RED_STRING                                                  :{RED}{STRING}
 STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_ORANGE_STRING1_WHITE                                        :{ORANGE}{STRING}{WHITE}
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -166,7 +166,7 @@ STR_ABBREV_ALL                                                  :{TINY_FONT}Се

 # 'Mode' of transport for cargoes
 STR_PASSENGERS                                                  :{COMMA} патници{P "" s}
-STR_BAGS                                                        :{COMMA} вреќи
+STR_BAGS                                                        :{COMMA} вреќи{P "" s}
 STR_TONS                                                        :{COMMA} тон{P "" s}
 STR_LITERS                                                      :{COMMA} литар{P "" s}
 STR_ITEMS                                                       :{COMMA} точка{P "" s}
@@ -238,6 +238,9 @@ STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Поме
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Лизгач - свитоци листата лево / десно
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Уривање згради итн. на квадратна област

+# Show engines button
+
+
 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}Зададено
 STR_BUTTON_CANCEL                                               :{BLACK}Откажи
@@ -255,7 +258,6 @@ STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Долж


 # These are used in buttons
-STR_SORT_BY_CAPTION_POPULATION                                  :{BLACK}Населеност
 STR_SORT_BY_CAPTION_NAME                                        :{BLACK}Име
 STR_SORT_BY_CAPTION_DATE                                        :{BLACK}Датум
 # These are used in dropdowns
@@ -265,7 +267,7 @@ STR_SORT_BY_TYPE                                                :Тип
 STR_SORT_BY_TRANSPORTED                                         :Транспортирано
 STR_SORT_BY_NUMBER                                              :Број
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Минатогодишен профит
-STR_SORT_BY_PROFIT_THIS_YEAR                                    :Годинашен профит
+STR_SORT_BY_PROFIT_THIS_YEAR                                    :Профит оваа година
 STR_SORT_BY_AGE                                                 :Старост
 STR_SORT_BY_RELIABILITY                                         :Веродостојност
 STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Вкупен капацитет според типот на товарот
@@ -276,9 +278,8 @@ STR_SORT_BY_LENGTH                                              :Должина
 STR_SORT_BY_LIFE_TIME                                           :Преостанат животен век
 STR_SORT_BY_TIMETABLE_DELAY                                     :распоред задоцнување
 STR_SORT_BY_FACILITY                                            :Вид на станица
-STR_SORT_BY_WAITING                                             :Вредност на товарот кој чека
-STR_SORT_BY_RATING_MAX                                          :Највисока товар рејтинг
-STR_SORT_BY_RATING_MIN                                          :Најниска товар рејтинг
+STR_SORT_BY_RATING_MAX                                          :Највисок рејтинг за товар
+STR_SORT_BY_RATING_MIN                                          :Најнизок рејтинг за товар
 STR_SORT_BY_ENGINE_ID                                           :Идентификација на моторот (класично сортирање)
 STR_SORT_BY_COST                                                :Цена
 STR_SORT_BY_POWER                                               :Моќност
@@ -288,6 +289,8 @@ STR_SORT_BY_RUNNING_COST                                        :Потрошу
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Моќност/Потрошувачка
 STR_SORT_BY_CARGO_CAPACITY                                      :Капацитет за товар
 STR_SORT_BY_RANGE                                               :опсег
+STR_SORT_BY_POPULATION                                          :Населеност
+STR_SORT_BY_RATING                                              :Рејтинг

 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Паузирај ја играта
@@ -347,10 +350,8 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Напушти

 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :игра опции
-STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Ниво на тешкотија подесувања
-STR_SETTINGS_MENU_CONFIG_SETTINGS                               :напредни поставувања
 STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :АИ / игри поставувања
-STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :НовGRF подесувања
+STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF подесувања
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :транспарентност опции
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Место имиња прикажани
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Станица имиња прикажани
@@ -371,19 +372,18 @@ STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Излез
 ############ range ends here

-############ range for map menu starts
+# map menu
 STR_MAP_MENU_MAP_OF_WORLD                                       :Мапа на светот
 STR_MAP_MENU_EXTRA_VIEW_PORT                                    :екстра прозорец
 STR_MAP_MENU_SIGN_LIST                                          :Си листа
-############ range for town menu starts, yet the town directory is shown in the map menu in the scenario editor
+
+############ range for town menu starts
 STR_TOWN_MENU_TOWN_DIRECTORY                                    :Место
-############ end of the 'Display map' dropdown
 STR_TOWN_MENU_FOUND_TOWN                                        :Резултати градот
-############ end of the 'Town' dropdown
+############ range ends here

 ############ range for subsidies menu starts
 STR_SUBSIDIES_MENU_SUBSIDIES                                    :субвенции
-STR_SUBSIDIES_MENU_GOAL                                         :Сега цели
 ############ range ends here

 ############ range for graph menu starts
@@ -437,7 +437,6 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Звук/муз

 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Последната порака/вест
-STR_NEWS_MENU_MESSAGE_SETTINGS                                  :Поставки за пораки
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :порака историјата
 ############ range ends here

@@ -454,7 +453,7 @@ STR_ABOUT_MENU_SPRITE_ALIGNER                                   :самовил
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Вклучи одблеснува кутии
 ############ range ends here

-############ range for days starts (also used for the place in the highscore window)
+############ range for ordinal numbers used for the place in the highscore window
 STR_ORDINAL_NUMBER_1ST                                          :1-в
 STR_ORDINAL_NUMBER_2ND                                          :2-ор
 STR_ORDINAL_NUMBER_3RD                                          :3-ет
@@ -470,22 +469,40 @@ STR_ORDINAL_NUMBER_12TH                                         :12-ти
 STR_ORDINAL_NUMBER_13TH                                         :13-ти
 STR_ORDINAL_NUMBER_14TH                                         :14-ти
 STR_ORDINAL_NUMBER_15TH                                         :15-ти
-STR_ORDINAL_NUMBER_16TH                                         :16-ти
-STR_ORDINAL_NUMBER_17TH                                         :17-ти
-STR_ORDINAL_NUMBER_18TH                                         :18-ти
-STR_ORDINAL_NUMBER_19TH                                         :19-ти
-STR_ORDINAL_NUMBER_20TH                                         :20-ти
-STR_ORDINAL_NUMBER_21ST                                         :21-ви
-STR_ORDINAL_NUMBER_22ND                                         :22-ри
-STR_ORDINAL_NUMBER_23RD                                         :23-ти
-STR_ORDINAL_NUMBER_24TH                                         :24-ти
-STR_ORDINAL_NUMBER_25TH                                         :25-ти
-STR_ORDINAL_NUMBER_26TH                                         :26-ти
-STR_ORDINAL_NUMBER_27TH                                         :27-ми
-STR_ORDINAL_NUMBER_28TH                                         :28-ми
-STR_ORDINAL_NUMBER_29TH                                         :29-ти
-STR_ORDINAL_NUMBER_30TH                                         :30-ти
-STR_ORDINAL_NUMBER_31ST                                         :31-ви
+############ range for ordinal numbers ends
+
+############ range for days starts
+STR_DAY_NUMBER_1ST                                              :1-в
+STR_DAY_NUMBER_2ND                                              :2-ор
+STR_DAY_NUMBER_3RD                                              :3-ет
+STR_DAY_NUMBER_4TH                                              :4-рт
+STR_DAY_NUMBER_5TH                                              :5-ти
+STR_DAY_NUMBER_6TH                                              :6-ти
+STR_DAY_NUMBER_7TH                                              :7-ми
+STR_DAY_NUMBER_8TH                                              :8-ми
+STR_DAY_NUMBER_9TH                                              :9-ти
+STR_DAY_NUMBER_10TH                                             :10-ти
+STR_DAY_NUMBER_11TH                                             :11-ти
+STR_DAY_NUMBER_12TH                                             :12-ти
+STR_DAY_NUMBER_13TH                                             :13-ти
+STR_DAY_NUMBER_14TH                                             :14-ти
+STR_DAY_NUMBER_15TH                                             :15-ти
+STR_DAY_NUMBER_16TH                                             :16-ти
+STR_DAY_NUMBER_17TH                                             :17-ти
+STR_DAY_NUMBER_18TH                                             :18-ти
+STR_DAY_NUMBER_19TH                                             :19-ти
+STR_DAY_NUMBER_20TH                                             :20-ти
+STR_DAY_NUMBER_21ST                                             :21-ви
+STR_DAY_NUMBER_22ND                                             :22-ри
+STR_DAY_NUMBER_23RD                                             :23-ти
+STR_DAY_NUMBER_24TH                                             :24-ти
+STR_DAY_NUMBER_25TH                                             :25-ти
+STR_DAY_NUMBER_26TH                                             :26-ти
+STR_DAY_NUMBER_27TH                                             :27-ми
+STR_DAY_NUMBER_28TH                                             :28-ми
+STR_DAY_NUMBER_29TH                                             :29-ти
+STR_DAY_NUMBER_30TH                                             :30-ти
+STR_DAY_NUMBER_31ST                                             :31-ви
 ############ range for days ends

 ############ range for months starts
@@ -637,7 +654,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Клик
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Кликнете на песна за да го отстраните од тековната програма (Прилагодено 1 или 2 Прилагодено само)

 # Highscore window
-STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}Топ компании што постигнаа {NUM}{}({STRING} Ниво)
+STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}Топ компании што постигнаа {NUM}
 STR_HIGHSCORE_TOP_COMPANIES_NETWORK_GAME                        :{BIG_FONT}{BLACK}Компанијата табелата во {NUM}
 STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
 STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN                     :Бизнисмен
@@ -647,7 +664,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST                      :Капитал
 STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE                         :Магнат
 STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL                           :Могул
 STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY           :Тајкун на векот
-STR_HIGHSCORE_NAME                                              :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY}
+STR_HIGHSCORE_NAME                                              :{PRESIDENT_NAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIG_FONT}'{STRING}'   ({COMMA})
 STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS                           :{BIG_FONT}{BLACK}{COMPANY} постигна статус на '{STRING}'!
 STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS              :{BIG_FONT}{WHITE}{PRESIDENT_NAME} од {COMPANY} постигна статус на'{STRING}'!
@@ -699,7 +716,7 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINY_FONT}{BLA
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINY_FONT}{BLACK}Пустина
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINY_FONT}{BLACK}Снег

-STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Вклучи/исклучи имиња на градови на мапа
+STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Вклучи/исклучи ги имињата на градовите на мапата
 STR_SMALLMAP_CENTER                                             :{BLACK}Центар мали мапата на тековната позиција
 STR_SMALLMAP_INDUSTRY                                           :{TINY_FONT}{STRING} ({NUM})
 STR_SMALLMAP_COMPANY                                            :{TINY_FONT}{COMPANY}
@@ -725,32 +742,7 @@ STR_MESSAGE_HISTORY                                             :{WHITE}пора
 STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Листа на последните вести пораки
 STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}

-# Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Порака
-STR_NEWS_MESSAGE_OPTIONS_CAPTION                                :{WHITE}Опции за пораки
-STR_NEWS_MESSAGES_ALL                                           :{YELLOW}Намести сите типови на пораки на: Исклучување / Краток преглед / Целосна
-STR_NEWS_MESSAGES_SOUND                                         :{YELLOW}Пушти звук за сумирани вести пораки
-STR_NEWS_MESSAGES_OFF                                           :исклучен
-STR_NEWS_MESSAGES_SUMMARY                                       :резиме
-STR_NEWS_MESSAGES_FULL                                          :целосна
-
-STR_NEWS_MESSAGE_TYPES                                          :{BLACK}Типови на пораки:
-STR_NEWS_MESSAGE_TYPE_ARRIVAL_OF_FIRST_VEHICLE_OWN              :{YELLOW}Пристигнување на првото возило на станицата на играчот
-STR_NEWS_MESSAGE_TYPE_ARRIVAL_OF_FIRST_VEHICLE_OTHER            :{YELLOW}Пристигнување на прво возило на конкурентска станица
-STR_NEWS_MESSAGE_TYPE_ACCIDENTS_DISASTERS                       :{YELLOW}Несреќи / хаварии
-STR_NEWS_MESSAGE_TYPE_COMPANY_INFORMATION                       :{YELLOW}Информации за компанијата
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_OPEN                             :{YELLOW}Отворање на индустрии
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_CLOSE                            :{YELLOW}Затворање на индустрии
-STR_NEWS_MESSAGE_TYPE_ECONOMY_CHANGES                           :{YELLOW}Промени во економијата
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_SERVED_BY_COMPANY        :{YELLOW}Производство промени на индустрии сервира од страна на компанијата
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_SERVED_BY_OTHER          :{YELLOW}Производство промени на индустрии сервира од страна конкурент(и)
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_UNSERVED                 :{YELLOW}Други индустрија производство промени
-STR_NEWS_MESSAGE_TYPE_ADVICE_INFORMATION_ON_COMPANY             :{YELLOW}Совет / информации за возилата на компанијата
-STR_NEWS_MESSAGE_TYPE_NEW_VEHICLES                              :{YELLOW}Нови возила
-STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Промени во прием на товар
-STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Субвенции
-STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}Општи информации
-
 STR_NEWS_CUSTOM_ITEM                                            :{BIG_FONT}{BLACK}{STRING}

 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK}Граѓаните го слават. . .{}Првиот воз пристигнува во {STATION}!
@@ -780,9 +772,7 @@ STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIG_FONT}{BLAC



-# Start of order review system
-# DON'T ADD OR REMOVE LINES HERE
-# end of order system
+# Order review system / warnings

 STR_NEWS_AIRCRAFT_DEST_TOO_FAR                                  :{WHITE}{VEHICLE} не може да се стигне до следната дестинација, бидејќи тоа е надвор од опсегот

@@ -800,19 +790,15 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Опци
 ############ end of currency region


-############ start of measuring units region
-STR_GAME_OPTIONS_MEASURING_UNITS_IMPERIAL                       :Империјален
-STR_GAME_OPTIONS_MEASURING_UNITS_METRIC                         :Метрички
-STR_GAME_OPTIONS_MEASURING_UNITS_SI                             :SI
-############ end of measuring units region
-
-

 ############ start of townname region
 ############ end of townname region


+############ start of autosave dropdown
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :Секој месец
+############ end of autosave dropdown
+



@@ -829,14 +815,6 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :Секој ме



-# Difficulty level window
-
-############ range for difficulty levels starts
-############ range for difficulty levels ends
-
-
-############ range for difficulty settings starts
-############ range for difficulty settings ends

 STR_NUM_CUSTOM_NUMBER                                           :Прилагодено ({NUM})

@@ -851,9 +829,10 @@ STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Прилаго



+# Settings tree window


-# Advanced settings window
+STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL                            :Сите подесувања



@@ -862,6 +841,7 @@ STR_CONFIG_SETTING_ORIGINAL                                     :Авторск
 STR_CONFIG_SETTING_REALISTIC                                    :Реален


+
 STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :Износ на локомотива чад / искри: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Инфраструктура за одржување: {STRING}

@@ -875,11 +855,36 @@ STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :Дебелин



+STR_CONFIG_SETTING_SOUND_NEW_YEAR                               :Крај на година: {STRING}
+STR_CONFIG_SETTING_SOUND_CONFIRM                                :Изградба: {STRING}
+STR_CONFIG_SETTING_SOUND_VEHICLE                                :Возила: {STRING}
+
+


 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :#ОПкодови пред скрипти се суспендирани: {STRING}


+STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OWN               :Пристигнување на првото возило на станицата на играчот: {STRING}
+STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER             :Пристигнување на прво возило на конкурентска станица: {STRING}
+STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS                     :Несреќи / хаварии: {STRING}
+STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION                     :Информации за компанијата: {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_OPEN                           :Отворање на индустрии: {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_CLOSE                          :Затворање на индустрии: {STRING}
+STR_CONFIG_SETTING_NEWS_ECONOMY_CHANGES                         :Промени во економијата: {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_CHANGES_COMPANY                :Производство промени на индустрии сервира од страна на компанијата: {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_CHANGES_OTHER                  :Производство промени на индустрии сервира од страна конкурент(и): {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_CHANGES_UNSERVED               :Други индустрија производство промени: {STRING}
+STR_CONFIG_SETTING_NEWS_ADVICE                                  :Совет / информации за возилата на компанијата: {STRING}
+STR_CONFIG_SETTING_NEWS_NEW_VEHICLES                            :Нови возила: {STRING}
+STR_CONFIG_SETTING_NEWS_CHANGES_ACCEPTANCE                      :Промени во прием на товар: {STRING}
+STR_CONFIG_SETTING_NEWS_SUBSIDIES                               :Субвенции: {STRING}
+STR_CONFIG_SETTING_NEWS_GENERAL_INFORMATION                     :Општи информации: {STRING}
+
+STR_CONFIG_SETTING_NEWS_MESSAGES_OFF                            :исклучен
+STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY                        :резиме
+STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :целосна
+

 STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS                   :Градови смеете да изгради ниво премини: {STRING}

@@ -894,7 +899,13 @@ STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X                              :2x
 STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X                              :4x
 STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X                              :8x

-STR_CONFIG_SETTING_ECONOMY_SCRIPTS                              :{ORANGE}скрипти
+
+
+
+
+
+
+



@@ -913,6 +924,7 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :некомпа
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :непознат
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... ниво на компресија '{STRING}' не е валидна
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... спаси играта формат '{STRING}' не е достапен. се врати на '{STRING}'
+STR_CONFIG_ERROR_OUT_OF_MEMORY                                  :{WHITE}Нема доволно меморија

 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -923,7 +935,6 @@ STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Сцен
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Повеќе играчи

 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Опции на Играта
-STR_INTRO_DIFFICULTY                                            :{BLACK}Тежина ({STRING})
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}АИ / Играта Подесувања


@@ -1022,6 +1033,8 @@ STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT              :игра скр
 ############ End of leave-in-this-order

 # Content downloading window
+STR_CONTENT_SEARCH_EXTERNAL                                     :{BLACK}Пребарај надворешни веб-страни
+STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER_CAPTION                  :{WHITE}Вие заминувате од OpenTTD!
 STR_CONTENT_OPEN_URL                                            :{BLACK}Посетете го веб-
 STR_CONTENT_OPEN_URL_TOOLTIP                                    :{BLACK}Посетете го веб-сајт за оваа содржина

@@ -1036,6 +1049,10 @@ STR_CONTENT_TYPE_GS_LIBRARY                                     :ГШ библи

 # Transparency settings window

+# Linkgraph legend window
+
+# Linkgraph legend window and linkgraph legend in smallmap
+
 # Base for station construction window(s)
 STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Прифаќа: {GOLD}{CARGO_LIST}
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Залихи: {GOLD}{CARGO_LIST}
@@ -1185,7 +1202,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND                   :Компани
 STR_ABOUT_OPENTTD                                               :{WHITE}За OpenTTD
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Оригинален copyright {COPYRIGHT} 1995 Chris Sawyer, Сите права се задржани
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD верзија {REV}
-STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2012 OpenTTD тимот
+STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2015 OpenTTD тимот

 # Save/load game/scenario
 STR_SAVELOAD_LOAD_BUTTON                                        :{BLACK}Оптоварување
@@ -1219,14 +1236,21 @@ STR_NEWGRF_SETTINGS_SELECT_PRESET                               :{ORANGE}Изб
 STR_NEWGRF_FILTER_TITLE                                         :{ORANGE}Филтер стринг:
 STR_NEWGRF_SETTINGS_ADD_FILE_TOOLTIP                            :{BLACK}Додај го избраниот НовGRF датотека за вашата конфигурација
 STR_NEWGRF_SETTINGS_RESCAN_FILES                                :{BLACK}повторно да го скенира додадени фајлови
-STR_NEWGRF_SETTINGS_RESCAN_FILES_TOOLTIP                        :{BLACK}Ажурирање на листата на НоваGRF датотеки
+STR_NEWGRF_SETTINGS_RESCAN_FILES_TOOLTIP                        :{BLACK}Ажурирање на листата на NewGRF датотеки
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Отстрани
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Отстрани го слектиранијот NewGRF фајл од листата
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Листа на NewGRF фајлови кој се инсталирани

+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Внеси параметри
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Прикажи параметри


 STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Верзија за: {SILVER}{NUM}
 STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Мин. компатибилна верзија: {SILVER}{NUM}


+# NewGRF save preset window
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Промена НовGRF параметри
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Затвори
@@ -1271,13 +1295,13 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} на <
 STR_NEWGRF_INVALID_ENGINE                                       :<валиден возило модел>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<валиден индустрија>

+# Placeholders for other invalid stuff, e.g. vehicles that have gone (Game Script).
+
 # NewGRF scanning window

 # Sign list window
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Совпаѓање на
-STR_SIGN_LIST_CLEAR                                             :{BLACK}Исчисти филтер
 STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Вклучи појавување случај кога се споредуваат знак имиња против низа филтер
-STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}Исчисти филтер низа

 # Sign window

@@ -1298,7 +1322,6 @@ STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPAN


 # Goal window
-STR_GOALS_CAPTION                                               :{WHITE}цели
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Глобал цели:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Никој -
@@ -1307,11 +1330,14 @@ STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Клик

 # Goal question window

-### Start of Goal Question button list
+############ Start of Goal Question button list
+############ End of Goal Question button list

 # Subsidies window
 STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Кликни на сервис за да се центрира погледот на индустријата/градот

+# Story book window
+
 # Station list window
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATION_FEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
@@ -1321,13 +1347,14 @@ STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Не ч

 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATION_FEATURES}
-STR_STATION_VIEW_WAITING_TITLE                                  :{BLACK}Чекање: {WHITE}{STRING}
 STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO_LONG}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO_SHORT} пренасочено од {STATION})

 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Прифаќа: {WHITE}{CARGO_LIST}

-STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
+
+
+

 ############ range for rating starts
 ############ range for rating ends
@@ -1335,6 +1362,7 @@ STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}



+
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}

@@ -1375,7 +1403,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}кана
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}станици:
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}станица плочки
 STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}аеродроми
-STR_COMPANY_INFRASTRUCTURE_VIEW_COST                            :{WHITE}{1:CURRENCY_LONG}/годишно ({0:COMMA})
 STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENCY_LONG}/годишно

 # Industry directory
@@ -1420,6 +1447,7 @@ STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Испрати



+
 # Build vehicle window

 STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :Шински возила
@@ -1437,6 +1465,9 @@ STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON                          :{BLACK}Преи

 STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                         :{BLACK}Преименувај го типот на авиони

+
+
+
 STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Преименувај го типот на авиони

 # Depot window
@@ -1484,6 +1515,7 @@ STR_REPLACE_VEHICLE_AIRCRAFT                                    :Летало



+
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}

@@ -1523,6 +1555,10 @@ STR_VEHICLE_INFO_MAX_SPEED_RANGE                                :{BLACK}Макс



+STR_SERVICE_INTERVAL_DROPDOWN_TOOLTIP                           :{BLACK}Смени тип на интервалот за сервисирање
+STR_VEHICLE_DETAILS_DAYS                                        :Дена
+STR_VEHICLE_DETAILS_PERCENT                                     :Процент
+
 STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Име на авионот

 # Extra buttons for train details windows
@@ -1541,8 +1577,8 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Капа

 # Vehicle refit
 STR_REFIT_TITLE                                                 :{GOLD}Одбери тип на товар за носење:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нов капацитет: {GOLD}{CARGO_LONG}{}{BLACK}Пренамената чини: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Нов капацитет: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK} Цена на ремонтирам: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нов капацитет: {GOLD}{CARGO_LONG}{}{BLACK}Пренамената чини: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Нов капацитет: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK} Цена на ремонтирам: {RED}{CURRENCY_LONG}

 STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Одбери тип на товар што ќе го носи бродот
 STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Одбери тип на товар за авионот
@@ -1666,6 +1702,7 @@ STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... мо

 # Screenshot related messages

+
 # Error message titles
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Порака
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Порака од {STRING}
@@ -1700,6 +1737,7 @@ STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... не

 # Industry related errors

+
 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Не може да се изгради аеродром на оваа локација...

@@ -1781,6 +1819,7 @@ STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Не м

 STR_ERROR_VEHICLE_IS_DESTROYED                                  :{WHITE}... возилото е уништено

+
 # Specific vehicle errors


@@ -1798,6 +1837,8 @@ STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE                             :{WHITE}... во
 # Translatable comment for OpenTTD's desktop shortcut
 STR_DESKTOP_SHORTCUT_COMMENT                                    :А симулација игра базирана на транспорт Тајкун Делукс

+# Translatable descriptions in media/baseset/*.ob* files
+
 ##id 0x2000
 # Town building names

@@ -1873,7 +1914,7 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
-STR_JUST_STRING_SPACE_STRING                                    :{STRING} {STRING}
+STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}

 # Slightly 'raw' stringcodes with colour or size
@@ -1886,8 +1927,6 @@ STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINY_FONT}{BLACK}{DATE_LONG}
@@ -1898,9 +1937,7 @@ STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_TINY_BLACK_STATION                                          :{TINY_FONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
-STR_RED_STRING                                                  :{RED}{STRING}
 STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_ORANGE_STRING1_WHITE                                        :{ORANGE}{STRING}{WHITE}
--- a/src/lang/unfinished/maltese.txt
+++ b/src/lang/unfinished/maltese.txt
@@ -21,7 +21,7 @@
 ##id 0x0000
 STR_NULL                                                        :
 STR_EMPTY                                                       :
-STR_UNDEFINED                                                   :(frażi mhux definit)
+STR_UNDEFINED                                                   :(frażi mhix definita)
 STR_JUST_NOTHING                                                :Xejn

 # Cargo related strings
@@ -191,6 +191,9 @@ STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Faxxa bi
 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

+# Show engines button
+
+
 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}Default
 STR_BUTTON_CANCEL                                               :{BLACK}Ikkanċella
@@ -207,7 +210,6 @@ STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Tul: {NU


 # These are used in buttons
-STR_SORT_BY_CAPTION_POPULATION                                  :{BLACK}Popolazzjoni
 STR_SORT_BY_CAPTION_NAME                                        :{BLACK}Isem
 STR_SORT_BY_CAPTION_DATE                                        :{BLACK}Data
 # These are used in dropdowns
@@ -228,7 +230,6 @@ STR_SORT_BY_LENGTH                                              :Tul
 STR_SORT_BY_LIFE_TIME                                           :Isservi sa
 STR_SORT_BY_TIMETABLE_DELAY                                     :Dewmien fl-iskeda
 STR_SORT_BY_FACILITY                                            :Tip ta' stazzjon
-STR_SORT_BY_WAITING                                             :Valur tal-Kargo
 STR_SORT_BY_RATING_MAX                                          :L-Ogħla livell tal-Kargo
 STR_SORT_BY_RATING_MIN                                          :L-Inqas livell tal-Kargo
 STR_SORT_BY_ENGINE_ID                                           :ID tal-magna (issortjar klassiku)
@@ -240,6 +241,7 @@ STR_SORT_BY_RUNNING_COST                                        :Kemm Taħli
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Saħħa/Kemm Taħli
 STR_SORT_BY_CARGO_CAPACITY                                      :Kapaċita ta' merkanzija
 STR_SORT_BY_RANGE                                               :Kemm Twassal
+STR_SORT_BY_POPULATION                                          :Popolazzjoni

 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Waqfa temporanja mil-logħba
@@ -266,10 +268,10 @@ STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_FILE_MENU_SEPARATOR                                         :
 ############ range ends here

-############ range for map menu starts
-############ range for town menu starts, yet the town directory is shown in the map menu in the scenario editor
-############ end of the 'Display map' dropdown
-############ end of the 'Town' dropdown
+# map menu
+
+############ range for town menu starts
+############ range ends here

 ############ range for subsidies menu starts
 ############ range ends here
@@ -307,7 +309,10 @@ STR_FILE_MENU_SEPARATOR                                         :
 ############ range for about menu starts
 ############ range ends here

-############ range for days starts (also used for the place in the highscore window)
+############ range for ordinal numbers used for the place in the highscore window
+############ range for ordinal numbers ends
+
+############ range for days starts
 ############ range for days ends

 ############ range for months starts
@@ -346,7 +351,7 @@ STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKG

 # Highscore window
 STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
-STR_HIGHSCORE_NAME                                              :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY}
+STR_HIGHSCORE_NAME                                              :{PRESIDENT_NAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIG_FONT}'{STRING}'   ({COMMA})

 # Smallmap window
@@ -364,7 +369,6 @@ STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {C

 # News message history

-# Message settings window



@@ -376,11 +380,7 @@ STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {C



-
-
-# Start of order review system
-# DON'T ADD OR REMOVE LINES HERE
-# end of order system
+# Order review system / warnings

 STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE} mitluf

@@ -397,15 +397,13 @@ STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE
 ############ end of currency region


-############ start of measuring units region
-############ end of measuring units region
-
-

 ############ start of townname region
 ############ end of townname region


+############ start of autosave dropdown
+############ end of autosave dropdown



@@ -416,6 +414,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :oħrajn



+
 # Custom currency window


@@ -423,14 +422,6 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :oħrajn



-# Difficulty level window
-
-############ range for difficulty levels starts
-############ range for difficulty levels ends
-
-
-############ range for difficulty settings starts
-############ range for difficulty settings ends



@@ -442,9 +433,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :oħrajn



-
-
-# Advanced settings window
+# Settings tree window



@@ -452,6 +441,26 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :oħrajn



+STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT                       :Stabbilixxi l-kosti għal manutenzjoni u servizzi fuq vetturi u infrastruttura
+STR_CONFIG_SETTING_CONSTRUCTION_SPEED                           :Veloċita' tal-kostruzzjoni: {STRING}
+STR_CONFIG_SETTING_CONSTRUCTION_SPEED_HELPTEXT                  :Illimita l-ammont massimu ta' kostruzzjonijiet għall-AI
+STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS                           :Ħsarat fil-vetturi: {STRING}
+STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT                  :Ikkontrolla kemm-il darba vettura li ma ingħatatx servizz riċentament tieqaf
+STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER                           :Multiplikatur tas-sussidju: {STRING}
+STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT                  :Stabbilixxi kemm jiġi mħallas għal konnessjonijiet sussidjati
+STR_CONFIG_SETTING_CONSTRUCTION_COSTS                           :Kosti tal-kostruzzjoni: {STRING}
+STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT                  :Stabbilixxi l-livell ta' kostruzzjoni u l-prezz tax-xiri
+STR_CONFIG_SETTING_RECESSIONS                                   :Riċessjonijiet: {STRING}
+STR_CONFIG_SETTING_RECESSIONS_HELPTEXT                          :Jekk mixgħula kull ftit snin tista' sseħħ riċessjoni. Waqt riċessjoni, il-produzzjoni ta' kollox tonqos (tirritorna għal kemm kienet qabel kif tgħaddi r-riċessjoni)
+STR_CONFIG_SETTING_TRAIN_REVERSING                              :Tħallix li ferrovija ddur lura fi stazzjon: {STRING}
+STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT                     :Jekk tinxtegħel, ferroviji ma jdurux lura fi stazzjonijiet li mhumiex fit-tarf, jekk teżisti rotta iqsar għad-destinazzjoni li jmiss
+STR_CONFIG_SETTING_DISASTERS                                    :Diżastri: {STRING}
+STR_CONFIG_SETTING_DISASTERS_HELPTEXT                           :Ixgħel jew itfi diżastri li xi drabi jistgħu jaffetwaw jew ikissru vetturi jew infrastrutturi
+STR_CONFIG_SETTING_CITY_APPROVAL                                :L-attitudni tal-kunsill lokali lejn bidliet fil-viċinanzi: {STRING}
+STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT                       :Iddeċiedi kemm l-ammont ta storbju u danni lill-ambjent ta' kumpanija jaffetwaw il-klassifikazzjoni tagħhom mar-raħal u proġetti oħra tal-futur
+
+
+
 STR_CONFIG_SETTING_WARN_LOST_VEHICLE                            :Avza jekk jintilef il-vehikolu: {STRING}


@@ -460,8 +469,21 @@ STR_CONFIG_SETTING_WARN_LOST_VEHICLE                            :Avza jekk jinti



-STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :l-ebda azzjoni
-STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :l-azzjonijiet kollha
+STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :L-ebda azzjoni
+STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :L-azzjonijiet kollha
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :Uza l-lista avvanzata tal-vetturi: {STRING}
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT              :Ippermetti l-uzu tal-listi avvanzati tal-vetturi biex tghaqqad il-vetturi fi gruppi
+
+
+
+
+
+
+
+
+
+
+



@@ -575,6 +597,10 @@ STR_NETWORK_SERVER_MESSAGE                                      :*** {1:STRING}

 # Transparency settings window

+# Linkgraph legend window
+
+# Linkgraph legend window and linkgraph legend in smallmap
+
 # Base for station construction window(s)

 # Join station window
@@ -685,6 +711,8 @@ STR_NEWGRF_SETTINGS_RESCAN_FILES_TOOLTIP                        :{BLACK}Aġġorn

 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Ma jaqblux ma din il-verzjoni ta' OpenTTD

+# NewGRF save preset window
+
 # NewGRF parameters window

 # NewGRF inspect window
@@ -710,6 +738,8 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 STR_NEWGRF_INVALID_ENGINE                                       :<magna invalida>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<industrija invalida>

+# Placeholders for other invalid stuff, e.g. vehicles that have gone (Game Script).
+
 # NewGRF scanning window

 # Sign list window
@@ -735,10 +765,13 @@ STR_GOALS_TEXT                                                  :{ORANGE}{STRING

 # Goal question window

-### Start of Goal Question button list
+############ Start of Goal Question button list
+############ End of Goal Question button list

 # Subsidies window

+# Story book window
+
 # Station list window
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATION_FEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
@@ -748,7 +781,9 @@ STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION
 STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO_LONG}


-STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
+
+
+

 ############ range for rating starts
 ############ range for rating ends
@@ -756,6 +791,7 @@ STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}



+
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}

@@ -801,6 +837,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN



+
 # Build vehicle window


@@ -811,6 +848,9 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN



+
+
+
 # Depot window
 STR_DEPOT_CAPTION                                               :{WHITE}{DEPOT}

@@ -845,6 +885,7 @@ STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO_LONG}



+
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}

@@ -873,6 +914,7 @@ STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE



+
 # Extra buttons for train details windows


@@ -989,6 +1031,9 @@ STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Лице
 # Soundset messages

 # Screenshot related messages
+STR_WARNING_SCREENSHOT_SIZE_CAPTION                             :{WHITE} Stampa kbira hafna
+STR_WARNING_SCREENSHOT_SIZE_MESSAGE                             :{YELLOW}L-istampa se jkollha reżoluzzjoni ta {COMMA} x {COMMA}
+

 # Error message titles

@@ -1005,6 +1050,7 @@ STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Лице

 # Industry related errors

+
 # Station construction related errors


@@ -1066,6 +1112,7 @@ STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Dan l-aj
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Hemm wisq vetturi fil-logħba


+
 # Specific vehicle errors
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Ma tistax tbiddel id-direzzjoni tal-ferrovija...

@@ -1089,6 +1136,8 @@ STR_ERROR_CAN_T_SKIP_ORDER                                      :{WHITE}Ma tista
 # Translatable comment for OpenTTD's desktop shortcut
 STR_DESKTOP_SHORTCUT_COMMENT                                    :Logħba simulazzjoni bbażata fuq Transport Tycoon Deluxe

+# Translatable descriptions in media/baseset/*.ob* files
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_FOUNTAIN_1                               :Funtana
@@ -1175,7 +1224,7 @@ STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MJS_250_DIESEL               :MJS 250 (Diesel)
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_PLODDYPHUT_CHOO_CHOO         :Ploddyphut Choo-Choo
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_CHOO_CHOO          :Powernaut Choo-Choo
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MIGHTYMOVER_CHOO_CHOO        :Mightymover Choo-Choo
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MIGHTYMOVER_CHOO_CHOO        :MightyMover Choo-Choo
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_PLODDYPHUT_DIESEL            :Ploddyphut Diesel
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_DIESEL             :Powernaut Diesel
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_WILLS_2_8_0_STEAM            :Wills 2-8-0 (Fwar)
@@ -1232,7 +1281,7 @@ STR_VEHICLE_NAME_SHIP_CHUGGER_CHUG_PASSENGER                    :Vapur tal-passi
 STR_VEHICLE_NAME_SHIP_SHIVERSHAKE_PASSENGER_FERRY               :Vapur tal-passiġġieri Shivershake
 STR_VEHICLE_NAME_SHIP_YATE_CARGO_SHIP                           :Vapur tal-merkanzija Yate
 STR_VEHICLE_NAME_SHIP_BAKEWELL_CARGO_SHIP                       :Vapur tal-merkanzija Bakewell
-STR_VEHICLE_NAME_SHIP_MIGHTYMOVER_CARGO_SHIP                    :Vapur tal-merkanzija Mightymover
+STR_VEHICLE_NAME_SHIP_MIGHTYMOVER_CARGO_SHIP                    :Vapur tal-merkanzija MightyMover
 STR_VEHICLE_NAME_SHIP_POWERNAUT_CARGO_SHIP                      :Vapur tal-merkanzija Powernaut
 STR_VEHICLE_NAME_AIRCRAFT_SAMPSON_U52                           :Sampson U52
 STR_VEHICLE_NAME_AIRCRAFT_COLEMAN_COUNT                         :Coleman Count
@@ -1333,7 +1382,7 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
-STR_JUST_STRING_SPACE_STRING                                    :{STRING} {STRING}
+STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}

 # Slightly 'raw' stringcodes with colour or size
@@ -1346,8 +1395,6 @@ STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINY_FONT}{BLACK}{DATE_LONG}
@@ -1358,9 +1405,7 @@ STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_TINY_BLACK_STATION                                          :{TINY_FONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
-STR_RED_STRING                                                  :{RED}{STRING}
 STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_ORANGE_STRING1_WHITE                                        :{ORANGE}{STRING}{WHITE}
--- a/src/lang/unfinished/marathi.txt
+++ b/src/lang/unfinished/marathi.txt
@@ -192,31 +192,57 @@ STR_COLOUR_WHITE                                                :पांढर

 # Units used in OpenTTD
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} mph
+STR_UNITS_VELOCITY_METRIC                                       :{COMMA} किमी / तास
+STR_UNITS_VELOCITY_SI                                           :{COMMA} m/s

+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}hp
+STR_UNITS_POWER_METRIC                                          :{COMMA}hp

-STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA} किग्रॅ
+STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}ट
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}ट
+STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA} किलो

 STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} टन
 STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} किलो

+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}गॅलन
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}लि
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³

 STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} लिटर
+STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³



 # Common window strings
+STR_LIST_FILTER_TITLE                                           :{BLACK}शब्द गाळा:
+STR_LIST_FILTER_OSKTITLE                                        :{BLACK}गाळेला शब्द प्रविष्ट करा
+STR_LIST_FILTER_TOOLTIP                                         :{BLACK}सूची फिल्टर करण्यासाठी एक शब्द प्रविष्ट करा

+STR_TOOLTIP_GROUP_ORDER                                         :{BLACK}वर्गीकरण क्रम निवडा
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}वर्गीकरण आदेश निवडा (उतरत्या / चढत्या)
+STR_TOOLTIP_SORT_CRITERIA                                       :{BLACK}वर्गीकरण निकष निवडा
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}फिल्टरिंग निकष निवडा
+STR_BUTTON_SORT_BY                                              :{BLACK}यानुसार क्रमवारी लावा
 STR_BUTTON_LOCATION                                             :{BLACK}जागा
 STR_BUTTON_RENAME                                               :{BLACK}नाव बदला

 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}खिडकी बंद करा
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}खिडकीचं नाव - खिडकी हलवण्यासाठी हे पकडून ओढा.
 STR_TOOLTIP_SHADE                                               :{BLACK}गवाक्ष - फक्त नावाची पट्टी दाखवा
+STR_TOOLTIP_DEFSIZE                                             :{BLACK} डीफॉल्ट आकारात विंडो आकार बदला.Ctrl+Click डीफॉल्ट म्हणून वर्तमान आकार साठवण्यासाठी
+STR_TOOLTIP_STICKY                                              :{BLACK} ही विंडो म्हणून चिन्हांकित समाप्त नाही 'बंद करा सर्व विंडोज'.Ctrl+Click डीफॉल्ट म्हणून राज्य जतन
 STR_TOOLTIP_RESIZE                                              :{BLACK}खिडकीचा आकार बदलण्यासाठी पकडून ओढा
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}खिडकीचा आकार लहान/मोठा करा
+STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}स्क्रोल पट्टी - स्क्रोल यादी वर/खाली
+STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}स्क्रोल पट्टी - स्क्रोल यादी डाव्या/उजव्या
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}जमिनीच्या एका चौकोनावरील इमारत नष्ट करणे इ. Ctrl ने तिरका प्रदेश निवडता येतो. Shift नं इमारती किंवा किंमतीचा अंदाज दिसणं चालू/बंद होतं.

+# Show engines button
+
+
 # Query window
+STR_BUTTON_DEFAULT                                              :{BLACK}स्थिर
 STR_BUTTON_CANCEL                                               :{BLACK}रद्द करा
 STR_BUTTON_OK                                                   :{BLACK}ठीक आहे

@@ -232,13 +258,13 @@ STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}क्


 # These are used in buttons
-STR_SORT_BY_CAPTION_POPULATION                                  :{BLACK}लोकसंख्या
 STR_SORT_BY_CAPTION_NAME                                        :{BLACK}नाव
 STR_SORT_BY_CAPTION_DATE                                        :{BLACK}दिनांक
 # These are used in dropdowns
 STR_SORT_BY_NAME                                                :नाव
 STR_SORT_BY_PRODUCTION                                          :निर्मिती
 STR_SORT_BY_TYPE                                                :प्रकार
+STR_SORT_BY_TRANSPORTED                                         :रवाना
 STR_SORT_BY_NUMBER                                              :क्रमांक
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :गेल्या वर्षीचा नफा
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :चालू वर्षीचा नफा
@@ -249,23 +275,44 @@ STR_SORT_BY_MAX_SPEED                                           :सर्वो
 STR_SORT_BY_MODEL                                               :मोडल
 STR_SORT_BY_VALUE                                               :किंमत
 STR_SORT_BY_LENGTH                                              :लांबी
-STR_SORT_BY_LIFE_TIME                                           :उर्वरित आयुर्मान
+STR_SORT_BY_LIFE_TIME                                           :उर्वरित कार्यकाळात
 STR_SORT_BY_TIMETABLE_DELAY                                     :वेळापत्रकीय अंतर
 STR_SORT_BY_FACILITY                                            :स्थानक प्रकार
+STR_SORT_BY_WAITING_TOTAL                                       :एकूण प्रतीक्षा मालवाहू
+STR_SORT_BY_WAITING_AVAILABLE                                   :उपलब्ध प्रतीक्षा मालवाहू
+STR_SORT_BY_RATING_MAX                                          :सर्वोच्च मालवाहू धारा
+STR_SORT_BY_RATING_MIN                                          :सर्वात कमी मालवाहू धारा
+STR_SORT_BY_ENGINE_ID                                           :यंत्र क्रमांक (जुन्या क्रमवारी)
 STR_SORT_BY_COST                                                :किंमत
 STR_SORT_BY_POWER                                               :ताकद
+STR_SORT_BY_INTRO_DATE                                          :परिचय तारीख
 STR_SORT_BY_RUNNING_COST                                        :चालवण्याचा खर्च
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :ताकद/चालवण्याचा खर्च
 STR_SORT_BY_CARGO_CAPACITY                                      :मालवाहन क्षमता
+STR_SORT_BY_RANGE                                               :प्रकार
+STR_SORT_BY_POPULATION                                          :लोकसंख्या
+STR_SORT_BY_RATING                                              :धारा

 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK} खेळ स्थगित करा
+STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}जलद खेळ अग्रेषित
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}पर्याय
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}खेळ जतन, खेळ त्याग, बाहेर जाणे
+STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}प्रदर्शन नकाशा, अतिरिक्त व्ह्यूपोर्ट किंवा चिन्हे यादी
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}शहरांची यादी दाखवा
+STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}प्रदर्शन अनुदान
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS            :{BLACK}कंपनीच्या स्थानकांची यादी दाखवा
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES                    :{BLACK}कंपनीची आर्थिक माहिती दाखवा
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL                     :{BLACK}कंपनीची सर्वसाधारण माहिती दाखवा
+STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK                          :{BLACK}प्रदर्शन पुस्तक
+STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST                          :{BLACK}प्रदर्शन ध्येय सूची
 STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}आलेख दाखवा
+STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}दाखवा कंपनी लीग तक्ता
+STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}नवीन उद्योगाचे फंड बांधकाम
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}कंपनीच्या गाड्या प्रदर्शन यादी.Ctrl+Click गट / वाहन सूची उघडणे
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}कंपनीच्या रस्त्याच्या वाहने प्रदर्शन यादी.Ctrl+Click गट / वाहन सूची उघडणे
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}कंपनीच्या जहाजे प्रदर्शन यादी.Ctrl+Click गट / वाहन सूची उघडणे
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK} कंपनीच्या विमानाची प्रदर्शन यादी.Ctrl+Click गट / वाहन सूची उघडणे
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}द्श्य मोठे करा
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}द्श्य छोटे करा
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK} लोहमार्ग बांधा
@@ -273,6 +320,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}रस
 STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}बोटींचा धक्का बांधा
 STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}विमानतळ बांधा
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}आवाज/संगीत खिडकी दाखवा
+STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}शेवटचा संदेश अहवाल दर्शवा, संदेश पर्याय दर्शवा
+STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}साधनपट्टी बदला

 # Extra tooltips for the scenario editor toolbar
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}ओपेन टीटीडी
@@ -280,52 +329,75 @@ STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}सु
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}सुरुवातीची तारीख एक वर्ष पुढे न्या
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE                           :{BLACK}सुरुवातीचं वर्ष पुरवण्यासाठी क्लिक करा
 STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY         :{BLACK}नकाशा, शहरांची यादी दाखवा
+STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}प्रदेश उत्पन्न करणे
+STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}गावे उत्पन्न करणे
+STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}इंडस्ट्री उत्पन्न करणे
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}रस्तेबांधणी
 STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}चिन्ह लावा

 ############ range for SE file menu starts
+STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :उद्देश जतन
+STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :उद्देश उघडा
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :बंद करा
 ############ range for SE file menu starts

 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :खेळाचे पर्याय
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :ए.आय. / गेम स्क्रिप्ट सेटिंग्ज
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF पर्याय
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :पारदर्शकता पर्याय
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :शहरांची नावे दाखवा
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :स्थानकांची नावे दाखवा
+STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :दिशा नावे दर्शविली
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :चिन्ह दाखवा
+STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :स्पर्धक चिन्हे आणि दर्शविले नावे
+STR_SETTINGS_MENU_FULL_ANIMATION                                :पूर्ण अॅनिमेशन
 STR_SETTINGS_MENU_FULL_DETAIL                                   :पूर्ण तपशील
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :इमारती पारदर्शक
 STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :स्थानकांची नावे पारदर्शक
 ############ range ends here

 ############ range for file menu starts
+STR_FILE_MENU_SAVE_GAME                                         :खेळ वाचवणे
+STR_FILE_MENU_LOAD_GAME                                         :खेळ उघडा
 STR_FILE_MENU_QUIT_GAME                                         :खेळ सोडून द्या
 STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :बाहेर पडा
 ############ range ends here

-############ range for map menu starts
+# map menu
 STR_MAP_MENU_MAP_OF_WORLD                                       :वैश्विक नकाशा
 STR_MAP_MENU_SIGN_LIST                                          :चिन्हांची यादी
-############ range for town menu starts, yet the town directory is shown in the map menu in the scenario editor
+
+############ range for town menu starts
 STR_TOWN_MENU_TOWN_DIRECTORY                                    :शहरांची यादी
-############ end of the 'Display map' dropdown
 STR_TOWN_MENU_FOUND_TOWN                                        :सापडलेलं शहर
-############ end of the 'Town' dropdown
+############ range ends here

 ############ range for subsidies menu starts
+STR_SUBSIDIES_MENU_SUBSIDIES                                    :अनुदान
 ############ range ends here

 ############ range for graph menu starts
+STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH                           :चालू असले नफा आलेख
 STR_GRAPH_MENU_INCOME_GRAPH                                     :आवक आलेख
+STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH                            :वितरित मालवाहू आलेख
+STR_GRAPH_MENU_PERFORMANCE_HISTORY_GRAPH                        :कामगिरी इतिहास आलेख
+STR_GRAPH_MENU_COMPANY_VALUE_GRAPH                              :कंपनी मूल्य आलेख
+STR_GRAPH_MENU_CARGO_PAYMENT_RATES                              :मालवाहू देयक दर
 ############ range ends here

 ############ range for company league menu starts
+STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE                             :कंपनी लीग तक्ता
+STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING                      :तपशीलावर कामगिरी रेटिंग
+STR_GRAPH_MENU_HIGHSCORE                                        :उच्च स्कोअर तक्ता
 ############ range ends here

 ############ range for industry menu starts
+STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY                            :उद्योग निर्देशिका
+STR_INDUSTRY_MENU_INDUSTRY_CHAIN                                :इंडस्ट्री बंदिवासात
+STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :नवीन उद्योग फंड
 ############ range ends here

 ############ range for railway construction menu starts
@@ -358,24 +430,85 @@ STR_TOOLBAR_SOUND_MUSIC                                         :ध्वनी
 ############ range ends here

 ############ range for message menu starts
-STR_NEWS_MENU_MESSAGE_SETTINGS                                  :निरोपांचे पर्याय
+STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :शेवटचा संदेश/बातम्या अहवाल
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :निरोपांचा इतिहास
 ############ range ends here

 ############ range for about menu starts
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :जागाची माहिती
 STR_ABOUT_MENU_SEPARATOR                                        :
+STR_ABOUT_MENU_SCREENSHOT                                       :द्श्य
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :द्श्य मोठे करा
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :स्थिर द्श्य
+STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :संपूर्ण नकाशा स्क्रीनशॉट
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :ओपेन टीटीडी बद्दल
 ############ range ends here

-############ range for days starts (also used for the place in the highscore window)
-STR_ORDINAL_NUMBER_1ST                                          :प्रथम
-STR_ORDINAL_NUMBER_2ND                                          :द्वितीय
-STR_ORDINAL_NUMBER_3RD                                          :तृतीय
-STR_ORDINAL_NUMBER_4TH                                          :चौथे
+############ range for ordinal numbers used for the place in the highscore window
+STR_ORDINAL_NUMBER_1ST                                          :१
+STR_ORDINAL_NUMBER_2ND                                          :२
+STR_ORDINAL_NUMBER_3RD                                          :३
+STR_ORDINAL_NUMBER_4TH                                          :४
+STR_ORDINAL_NUMBER_5TH                                          :५
+STR_ORDINAL_NUMBER_6TH                                          :६
+STR_ORDINAL_NUMBER_7TH                                          :७
+STR_ORDINAL_NUMBER_8TH                                          :८
+STR_ORDINAL_NUMBER_9TH                                          :९
+STR_ORDINAL_NUMBER_10TH                                         :१०
+STR_ORDINAL_NUMBER_11TH                                         :११
+STR_ORDINAL_NUMBER_12TH                                         :१२
+STR_ORDINAL_NUMBER_13TH                                         :१३
+STR_ORDINAL_NUMBER_14TH                                         :१४
+STR_ORDINAL_NUMBER_15TH                                         :१५
+############ range for ordinal numbers ends
+
+############ range for days starts
+STR_DAY_NUMBER_1ST                                              :१
+STR_DAY_NUMBER_2ND                                              :२
+STR_DAY_NUMBER_3RD                                              :३
+STR_DAY_NUMBER_4TH                                              :४
+STR_DAY_NUMBER_5TH                                              :५
+STR_DAY_NUMBER_6TH                                              :६
+STR_DAY_NUMBER_7TH                                              :७
+STR_DAY_NUMBER_8TH                                              :८
+STR_DAY_NUMBER_9TH                                              :९
+STR_DAY_NUMBER_10TH                                             :१०
+STR_DAY_NUMBER_11TH                                             :११
+STR_DAY_NUMBER_12TH                                             :१२
+STR_DAY_NUMBER_13TH                                             :१३
+STR_DAY_NUMBER_14TH                                             :१४
+STR_DAY_NUMBER_15TH                                             :१५
+STR_DAY_NUMBER_16TH                                             :१६
+STR_DAY_NUMBER_17TH                                             :१७
+STR_DAY_NUMBER_18TH                                             :१८
+STR_DAY_NUMBER_19TH                                             :१९
+STR_DAY_NUMBER_20TH                                             :२०
+STR_DAY_NUMBER_21ST                                             :२१
+STR_DAY_NUMBER_22ND                                             :२२
+STR_DAY_NUMBER_23RD                                             :२३
+STR_DAY_NUMBER_24TH                                             :२४
+STR_DAY_NUMBER_25TH                                             :२५
+STR_DAY_NUMBER_26TH                                             :२६
+STR_DAY_NUMBER_27TH                                             :२७
+STR_DAY_NUMBER_28TH                                             :२८
+STR_DAY_NUMBER_29TH                                             :२९
+STR_DAY_NUMBER_30TH                                             :३०
+STR_DAY_NUMBER_31ST                                             :३१
 ############ range for days ends

 ############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :जाने
+STR_MONTH_ABBREV_FEB                                            :फेब्रु
+STR_MONTH_ABBREV_MAR                                            :मार्च
+STR_MONTH_ABBREV_APR                                            :एप्रिल
+STR_MONTH_ABBREV_MAY                                            :मे
+STR_MONTH_ABBREV_JUN                                            :जून
+STR_MONTH_ABBREV_JUL                                            :जुलै
+STR_MONTH_ABBREV_AUG                                            :ऑग
+STR_MONTH_ABBREV_SEP                                            :सप्टें
+STR_MONTH_ABBREV_OCT                                            :ऑक्टो
+STR_MONTH_ABBREV_NOV                                            :नोव्हें
+STR_MONTH_ABBREV_DEC                                            :डिसें

 STR_MONTH_JAN                                                   :जानेवारी
 STR_MONTH_FEB                                                   :फेब्रूवारी
@@ -392,41 +525,122 @@ STR_MONTH_DEC                                                   :डिसें
 ############ range for months ends

 # Graph window
+STR_GRAPH_KEY_BUTTON                                            :{BLACK}किल्ली
+STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}आलेख दर्शवा की
 STR_GRAPH_X_LABEL_MONTH                                         :{TINY_FONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINY_FONT}{STRING}{} {STRING}{}{NUM}
 STR_GRAPH_Y_LABEL                                               :{TINY_FONT}{STRING}
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINY_FONT}{COMMA}

+STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}चालू असले नफा आलेख
+STR_GRAPH_INCOME_CAPTION                                        :{WHITE}उत्पन्न आलेख
+STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}वितरित कार्गो एकके
+STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}कंपनी कामगिरी रेटिंग (कमाल रेटिंग = 1000)
+STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}कंपनी मूल्ये

+STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}मालवाहू भरणा दर
+STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL                           :{TINY_FONT}{BLACK}संक्रमणादरम्यान दिवस
+STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}मालवाहू 10 युनिट (किंवा 10,000 लिटर) 20 चौरस अंतरावर वितरण भरणा
+STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLACK}सर्व सक्षम
+STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}सर्व अक्षम
+STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}देयक दर आलेखावरील सर्व मालवाहू प्रदर्शित
+STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}देयक दर आलेखावरील नाही मालवाहू प्रदर्शित
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}मालवाहू प्रकारासाठी टॉगल आलेख - वर / बंद
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLACK}{STRING}

+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}सविस्तर कामगिरी रेटिंग दाखवा

 # Graph key window
+STR_GRAPH_KEY_CAPTION                                           :{WHITE}कंपनी आलेख किल्ली

 # Company league window
+STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}कंपनी लीग सारणी
 STR_COMPANY_LEAGUE_COMPANY_NAME                                 :{ORANGE}{COMPANY} {BLACK}{COMPANY_NUM} '{STRING}'
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER                   :अभियंता
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER            :वाहतूक व्यवस्थापक
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR      :वाहतूक समन्वयक
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ROUTE_SUPERVISOR           :रूट पर्यवेक्षक
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_DIRECTOR                   :संचालक
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHIEF_EXECUTIVE            :मुख्य कार्यकारी
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHAIRMAN                   :अध्यक्ष
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :राष्ट्राध्यक्ष

 # Performance detail window
+STR_PERFORMANCE_DETAIL                                          :{WHITE}तपशीलवार कामगिरी रेटिंग
+STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}तपशील
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRENCY_SHORT}/{CURRENCY_SHORT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
+STR_PERFORMANCE_DETAIL_SELECT_COMPANY_TOOLTIP                   :{BLACK}या कंपनी बद्दल तपशील पहा
 ############ Those following lines need to be in this order!!
+STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}वाहने:
+STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}स्टेशन:
+STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}किमान नफा:
+STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}किमान उत्पन्न:
+STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}कमाल उत्पन्न:
+STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}वितरीत:
+STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}मालवाहू:
+STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}पैसा:
+STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}कर्ज:
+STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}एकूण:
 ############ End of order list
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}गेल्या वर्षी नफा दिल्या वाहनांची संख्या. या वाहने, गाड्या, जहाजे, विमानाची समावेश आहे.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}सर्वात कमी उत्पन्न वाहनाच्या नफा (दोन वर्षे पेक्षा फक्त वाहने जुन्या मानले जातात)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}गेल्या 12 मात्रेत सर्वात कमी नफा तिमाहीत केली रोख
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}गेल्या 12 मात्रेत सर्वाधिक नफा तिमाहीत केली रोख
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}गेल्या चार मात्रेत वितरित कार्गो एकके
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}गेल्या तिमाहीत वितरित माल प्रकारच्या संख्या
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}पैसा या कंपनीच्या बँकेत आहे.
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}पैसा हा कंपनी कर्ज घेतले आहे.
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}शक्य बिंदू बाहेर एकूण गुण.

 # Music window
+STR_MUSIC_PLAYLIST_ALL                                          :{TINY_FONT}{BLACK}सर्व
+STR_MUSIC_PLAYLIST_OLD_STYLE                                    :{TINY_FONT}{BLACK}जुन्या शैली
+STR_MUSIC_PLAYLIST_NEW_STYLE                                    :{TINY_FONT}{BLACK}नवीन शैली
+STR_MUSIC_PLAYLIST_EZY_STREET                                   :{TINY_FONT}{BLACK}Ezy रस्त्यावर
+STR_MUSIC_PLAYLIST_CUSTOM_1                                     :{TINY_FONT}{BLACK}सानुकूल १
+STR_MUSIC_PLAYLIST_CUSTOM_2                                     :{TINY_FONT}{BLACK}सानुकूल २
+STR_MUSIC_MUSIC_VOLUME                                          :{TINY_FONT}{BLACK}संगीत आवाज
+STR_MUSIC_EFFECTS_VOLUME                                        :{TINY_FONT}{BLACK}प्रभाव आवाज
+STR_MUSIC_RULER_MIN                                             :{TINY_FONT}{BLACK}कमी
+STR_MUSIC_RULER_MAX                                             :{TINY_FONT}{BLACK}अधिक
 STR_MUSIC_RULER_MARKER                                          :{TINY_FONT}{BLACK}'
 STR_MUSIC_TRACK_NONE                                            :{TINY_FONT}{DKGREEN}--
 STR_MUSIC_TRACK_DIGIT                                           :{TINY_FONT}{DKGREEN}{ZEROFILL_NUM}
 STR_MUSIC_TITLE_NONE                                            :{TINY_FONT}{DKGREEN}------
 STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKGREEN}"{STRING}"
+STR_MUSIC_TRACK                                                 :{TINY_FONT}{BLACK}लोहमार्ग
+STR_MUSIC_XTITLE                                                :{TINY_FONT}{BLACK}शीर्षक
+STR_MUSIC_SHUFFLE                                               :{TINY_FONT}{BLACK}चुळबूळ
+STR_MUSIC_PROGRAM                                               :{TINY_FONT}{BLACK}कार्यक्रम
+STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK                        :{BLACK}मागील संगीत जा
+STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION               :{BLACK}पुढील संगीत जा
+STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC                            :{BLACK}संगीत थांबवा
+STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC                           :{BLACK}संगीत प्रारंभ
+STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC                     :{BLACK}संगीत आणि खंड सेट करण्यासाठी स्लाइडर पकडू
+STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM                     :{BLACK}निवडा 'सर्व संगीत' कार्यक्रम
+STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC                        :{BLACK}निवडा 'जुन्या प्रकारच्या संगीत' कार्यक्रम
+STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC                        :{BLACK}निवडा 'नवीन संगीत' कार्यक्रम
+STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}निवडा 'स्ट्रीट संगीत' कार्यक्रम
+STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED                  :{BLACK}'कस्टम 1' (वापरकर्ता परिभाषित) कार्यक्रम निवडा
+STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED                  :{BLACK}'कस्टम 2' (वापरकर्ता परिभाषित) कार्यक्रम निवडा
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}कार्यक्रम चुळबूळ - प्रारंभ / बंद
+STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}संगीत ट्रॅक निवड दाखवा

+STR_ERROR_NO_SONGS                                              :{WHITE}संगीत न संगीत संच निवडले गेले आहे. एकही गाणी खेळला जाईल.

 # Playlist window
+STR_PLAYLIST_MUSIC_PROGRAM_SELECTION                            :{WHITE}संगीत कार्यक्रम निवड.
 STR_PLAYLIST_TRACK_NAME                                         :{TINY_FONT}{LTBLUE}{ZEROFILL_NUM} "{STRING}"
+STR_PLAYLIST_TRACK_INDEX                                        :{TINY_FONT}{BLACK}गाणे क्रमांक
+STR_PLAYLIST_PROGRAM                                            :{TINY_FONT}{BLACK}कार्यक्रम - '{STRING}'
+STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}स्पष्ट

 # Highscore window
+STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}{NUM} स्थान अव्वल कंपन्या
 STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
-STR_HIGHSCORE_NAME                                              :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY}
+STR_HIGHSCORE_NAME                                              :{PRESIDENT_NAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIG_FONT}'{STRING}'   ({COMMA})

 # Smallmap window
@@ -452,9 +666,6 @@ STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {C
 # News message history
 STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}

-# Message settings window
-
-



@@ -467,9 +678,7 @@ STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDE



-# Start of order review system
-# DON'T ADD OR REMOVE LINES HERE
-# end of order system
+# Order review system / warnings

 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} जुनी होत आहे
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} खूप जुनी होत आहे
@@ -514,10 +723,6 @@ STR_GAME_OPTIONS_CURRENCY_SKK                                   :स्लोव
 ############ end of currency region


-############ start of measuring units region
-############ end of measuring units region
-
-

 ############ start of townname region
 STR_GAME_OPTIONS_TOWN_NAME_FRENCH                               :फ्रेंच
@@ -539,10 +744,12 @@ STR_GAME_OPTIONS_TOWN_NAME_ITALIAN                              :ईटेलि
 ############ end of townname region


+############ start of autosave dropdown
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :दर महिने
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS               :दर ३ महिने
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_6_MONTHS               :दर ६ महिने
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS              :दर १२ महिने
+############ end of autosave dropdown

 STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}भाषा

@@ -554,6 +761,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :अन्य



+
 # Custom currency window


@@ -561,14 +769,6 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :अन्य



-# Difficulty level window
-
-############ range for difficulty levels starts
-############ range for difficulty levels ends
-
-
-############ range for difficulty settings starts
-############ range for difficulty settings ends



@@ -584,9 +784,9 @@ STR_SUBSIDY_X4                                                  :x४



+# Settings tree window


-# Advanced settings window



@@ -595,6 +795,7 @@ STR_CONFIG_SETTING_ORIGINAL                                     :मुळ
 STR_CONFIG_SETTING_REALISTIC                                    :खरेखुरे


+
 STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :वाहनांचा धूर/ठिणग्या: {STRING}


@@ -616,12 +817,23 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :सर्व



+
+
+
+
 STR_CONFIG_SETTING_STATUSBAR_POS                                :स्टेटसबार वरचं स्थान: {STRING}





+
+
+
+
+
+
+
 # Config errors

 # Intro window
@@ -788,6 +1000,10 @@ STR_NETWORK_SERVER_MESSAGE                                      :*** {1:STRING}

 # Transparency settings window

+# Linkgraph legend window
+
+# Linkgraph legend window and linkgraph legend in smallmap
+
 # Base for station construction window(s)

 # Join station window
@@ -922,6 +1138,8 @@ STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} /



+# NewGRF save preset window
+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}

@@ -948,6 +1166,8 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??

+# Placeholders for other invalid stuff, e.g. vehicles that have gone (Game Script).
+
 # NewGRF scanning window

 # Sign list window
@@ -976,10 +1196,13 @@ STR_GOALS_TEXT                                                  :{ORANGE}{STRING

 # Goal question window

-### Start of Goal Question button list
+############ Start of Goal Question button list
+############ End of Goal Question button list

 # Subsidies window

+# Story book window
+
 # Station list window
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATION_FEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
@@ -989,7 +1212,9 @@ STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION
 STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO_LONG}


-STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
+
+
+

 ############ range for rating starts
 STR_CARGO_RATING_APPALLING                                      :धक्कादायक
@@ -1005,6 +1230,7 @@ STR_CARGO_RATING_OUTSTANDING                                    :उत्कृ



+
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}

@@ -1080,6 +1306,7 @@ STR_GROUP_ALL_AIRCRAFTS                                         :सर्व



+
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :सगळे वाहने काढा


@@ -1102,6 +1329,9 @@ STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}कि



+
+
+
 # Depot window
 STR_DEPOT_CAPTION                                               :{WHITE}{DEPOT}

@@ -1138,6 +1368,7 @@ STR_REPLACE_VEHICLE_AIRCRAFT                                    :विमान



+
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}

@@ -1166,6 +1397,7 @@ STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE



+
 # Extra buttons for train details windows


@@ -1285,6 +1517,7 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}अं

 # Screenshot related messages

+
 # Error message titles

 # Generic construction errors
@@ -1301,6 +1534,7 @@ STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE} स्

 # Industry related errors

+
 # Station construction related errors


@@ -1351,6 +1585,7 @@ STR_ERROR_BRIDGE_THROUGH_MAP_BORDER                             :{WHITE}पू



+
 # Specific vehicle errors


@@ -1364,6 +1599,8 @@ STR_ERROR_BRIDGE_THROUGH_MAP_BORDER                             :{WHITE}पू

 # Translatable comment for OpenTTD's desktop shortcut

+# Translatable descriptions in media/baseset/*.ob* files
+
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_HOTEL_1                                  :हॉटेल
@@ -1567,7 +1804,7 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
-STR_JUST_STRING_SPACE_STRING                                    :{STRING} {STRING}
+STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}

 # Slightly 'raw' stringcodes with colour or size
@@ -1580,8 +1817,6 @@ STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINY_FONT}{BLACK}{DATE_LONG}
@@ -1592,9 +1827,7 @@ STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_TINY_BLACK_STATION                                          :{TINY_FONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
-STR_RED_STRING                                                  :{RED}{STRING}
 STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_ORANGE_STRING1_WHITE                                        :{ORANGE}{STRING}{WHITE}
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
--- a/src/lang/unfinished/tamil.txt
+++ b/src/lang/unfinished/tamil.txt
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -206,16 +206,16 @@ STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA} kg
 STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} من
 STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg

-STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA} l
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³
+STR_UNITS_VOLUME_SHORT_METRIC                                   :I{NBSP}{COMMA}
+STR_UNITS_VOLUME_SHORT_SI                                       :{NBSP}{COMMA}کیوبک میٹر

-STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} لیٹر
-STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
+STR_UNITS_VOLUME_LONG_METRIC                                    :{NBSP}{COMMA} لیٹر
+STR_UNITS_VOLUME_LONG_SI                                        :{NBSP}{COMMA}کیوبک میٹر

-STR_UNITS_FORCE_SI                                              :{COMMA} kN
+STR_UNITS_FORCE_SI                                              :{NBSP}{COMMA}کلو نیوٹن

-STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA} فٹ
-STR_UNITS_HEIGHT_SI                                             :{COMMA} میٹر
+STR_UNITS_HEIGHT_IMPERIAL                                       :{NBSP}{COMMA} فٹ
+STR_UNITS_HEIGHT_SI                                             :{NBSP}{COMMA} میٹر

 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK} چھان کے الفاظ درج کیجیئے
@@ -239,6 +239,17 @@ STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK} فھر
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK} فھرستی پٹی - فھرست کو دایئں بایئں کرنے کے لیے
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}زمین کے ایک مربے پر عمارتیں وغیرہ گرائیں. Ctrl ترچھے انداز میں علاقے کا انتخاب کرتا ہے. عمارتیں یا انکی لاگت تخمینہ دیکھنے کے لئے Shift کا استعمال کیجیے.

+# Show engines button
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN                           :{BLACK}پوشیدہ دکهایں
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE                    :{BLACK}پوشیدہ دکهایں
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP                            :{BLACK}پوشیدہ دکهایں
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT                        :{BLACK}پوشیدہ دکهایں
+
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN_TOOLTIP                   :{BLACK}اس بٹن سے پوشیدہ ٹرینیں نظر آیں گی
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE_TOOLTIP            :{BLACK}اس بٹن سے پوشیدہ گاڑیاں نظر آیں گی
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP_TOOLTIP                    :{BLACK}اس بٹن سے پوشیدہ بہری جہاز نظر آیں گے
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}اس بٹن سے پوشیدہ طیارے نظر آیں گے
+
 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}طے شدہ
 STR_BUTTON_CANCEL                                               :{BLACK} ترک کیجیئے
@@ -256,7 +267,6 @@ STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK} پھی


 # These are used in buttons
-STR_SORT_BY_CAPTION_POPULATION                                  :{BLACK}آبادی
 STR_SORT_BY_CAPTION_NAME                                        :{BLACK}نام
 STR_SORT_BY_CAPTION_DATE                                        :{BLACK}تاریخ
 # These are used in dropdowns
@@ -277,7 +287,6 @@ STR_SORT_BY_LENGTH                                              :لمبائی
 STR_SORT_BY_LIFE_TIME                                           :بقیھ زندگی
 STR_SORT_BY_TIMETABLE_DELAY                                     :ٹایم ٹیبل تاخیر
 STR_SORT_BY_FACILITY                                            :طرزِ اسٹیشن
-STR_SORT_BY_WAITING                                             :قیمتِ منتظر سامان
 STR_SORT_BY_RATING_MAX                                          :سامانی سرِ فھرست درجھ بندی
 STR_SORT_BY_RATING_MIN                                          :سامانی پیشِ فھرست درجھ بندی
 STR_SORT_BY_ENGINE_ID                                           :انجن کی شناخت (کلاسیکی چھانٹ)
@@ -289,6 +298,7 @@ STR_SORT_BY_RUNNING_COST                                        :قیمتِ رو
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :قیمتِ رواں/ طاقت
 STR_SORT_BY_CARGO_CAPACITY                                      :سامان کی گنجایش
 STR_SORT_BY_RANGE                                               :پہنچ
+STR_SORT_BY_POPULATION                                          :آبادی

 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK} کھیل میں وقفھ لیجیئے
@@ -312,9 +322,9 @@ STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}بڑا
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}چھوٹا کر کے دکھاو
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}ریل کی پٹری بچھاو
 STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}سڑکیں بناو
-STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}بندرگاہیں بناو
-STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}ہوای اڈے بناو
-STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK} منظر کشی ٹول بآر کھولیئے اور زمین اوپر نیچے، درخت لگایئے، وغیرھ
+STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}بندرگاہیں بنایں
+STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}ہوای اڈے بنایں
+STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}منظر کشی ٹول بآر کھولیئے اور زمین اوپر نیچےکریں، درخت لگایئے، وغیره
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK} آواز/موسیقی ونڈو دکھایئے
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK} آخری پیغام/ خبر دکھایئے، پیغام کے اختیارات کھولیئے
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}زمینی رقبہ کی معلومات، کانسول،AI debug ،اسکرین شاٹس، Open TTD کے بارے میں
@@ -348,8 +358,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :باہر نکل

 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :کھیل کے اختیارات
-STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :مشکلات چنئے
-STR_SETTINGS_MENU_CONFIG_SETTINGS                               :اعلی اختیارات
 STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :AI / کھیل کے اختیارات
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF اختیارات
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Transparency کے اختیارات
@@ -372,19 +380,18 @@ STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :باہر نکلو
 ############ range ends here

-############ range for map menu starts
+# map menu
 STR_MAP_MENU_MAP_OF_WORLD                                       :دنیا کا نقشھ
 STR_MAP_MENU_EXTRA_VIEW_PORT                                    :اضافی منظر
 STR_MAP_MENU_SIGN_LIST                                          :اشاروں کی فھرست
-############ range for town menu starts, yet the town directory is shown in the map menu in the scenario editor
+
+############ range for town menu starts
 STR_TOWN_MENU_TOWN_DIRECTORY                                    :کتبِ قصبھ جات
-############ end of the 'Display map' dropdown
 STR_TOWN_MENU_FOUND_TOWN                                        :قصبھ قائم کیجیئے
-############ end of the 'Town' dropdown
+############ range ends here

 ############ range for subsidies menu starts
 STR_SUBSIDIES_MENU_SUBSIDIES                                    :امداد
-STR_SUBSIDIES_MENU_GOAL                                         :موجودہ اہداف
 ############ range ends here

 ############ range for graph menu starts
@@ -438,7 +445,6 @@ STR_TOOLBAR_SOUND_MUSIC                                         :آواز و م

 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :پچھلا پیعام/ خبر
-STR_NEWS_MENU_MESSAGE_SETTINGS                                  :اختیاراتِ پعغام
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :تاریخِ پیغامات
 ############ range ends here

@@ -457,7 +463,7 @@ STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :احاطہ کر
 STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS                              :گندے بلاکوں کا رنگ تبدیل کرو
 ############ range ends here

-############ range for days starts (also used for the place in the highscore window)
+############ range for ordinal numbers used for the place in the highscore window
 STR_ORDINAL_NUMBER_1ST                                          :پھل
 STR_ORDINAL_NUMBER_2ND                                          :دوسر
 STR_ORDINAL_NUMBER_3RD                                          :تیسر
@@ -473,22 +479,40 @@ STR_ORDINAL_NUMBER_12TH                                         :بارھو
 STR_ORDINAL_NUMBER_13TH                                         :تیرھو
 STR_ORDINAL_NUMBER_14TH                                         :چودھو
 STR_ORDINAL_NUMBER_15TH                                         :پندھرو
-STR_ORDINAL_NUMBER_16TH                                         :سولھو
-STR_ORDINAL_NUMBER_17TH                                         :سترھو
-STR_ORDINAL_NUMBER_18TH                                         :اٹھارو
-STR_ORDINAL_NUMBER_19TH                                         :انیسو
-STR_ORDINAL_NUMBER_20TH                                         :بیسو
-STR_ORDINAL_NUMBER_21ST                                         :اکیسو
-STR_ORDINAL_NUMBER_22ND                                         :بایئسو
-STR_ORDINAL_NUMBER_23RD                                         :تیئسو
-STR_ORDINAL_NUMBER_24TH                                         :چوبیسو
-STR_ORDINAL_NUMBER_25TH                                         :پچیسو
-STR_ORDINAL_NUMBER_26TH                                         :چھبیسو
-STR_ORDINAL_NUMBER_27TH                                         :ستایئسو
-STR_ORDINAL_NUMBER_28TH                                         :اٹھایئسو
-STR_ORDINAL_NUMBER_29TH                                         :انتیسو
-STR_ORDINAL_NUMBER_30TH                                         :تیسو
-STR_ORDINAL_NUMBER_31ST                                         :اکتیسو
+############ range for ordinal numbers ends
+
+############ range for days starts
+STR_DAY_NUMBER_1ST                                              :پھل
+STR_DAY_NUMBER_2ND                                              :دوسر
+STR_DAY_NUMBER_3RD                                              :تیسر
+STR_DAY_NUMBER_4TH                                              :چوتھ
+STR_DAY_NUMBER_5TH                                              :پانچھو
+STR_DAY_NUMBER_6TH                                              :چھٹ
+STR_DAY_NUMBER_7TH                                              :ساتو
+STR_DAY_NUMBER_8TH                                              :آٹھو
+STR_DAY_NUMBER_9TH                                              :نو
+STR_DAY_NUMBER_10TH                                             :دسو
+STR_DAY_NUMBER_11TH                                             :گیارھو
+STR_DAY_NUMBER_12TH                                             :بارھو
+STR_DAY_NUMBER_13TH                                             :تیرھو
+STR_DAY_NUMBER_14TH                                             :چودھو
+STR_DAY_NUMBER_15TH                                             :پندھرو
+STR_DAY_NUMBER_16TH                                             :سولھو
+STR_DAY_NUMBER_17TH                                             :سترھو
+STR_DAY_NUMBER_18TH                                             :اٹھارو
+STR_DAY_NUMBER_19TH                                             :انیسو
+STR_DAY_NUMBER_20TH                                             :بیسو
+STR_DAY_NUMBER_21ST                                             :اکیسو
+STR_DAY_NUMBER_22ND                                             :بایئسو
+STR_DAY_NUMBER_23RD                                             :تیئسو
+STR_DAY_NUMBER_24TH                                             :چوبیسو
+STR_DAY_NUMBER_25TH                                             :پچیسو
+STR_DAY_NUMBER_26TH                                             :چھبیسو
+STR_DAY_NUMBER_27TH                                             :ستایئسو
+STR_DAY_NUMBER_28TH                                             :اٹھایئسو
+STR_DAY_NUMBER_29TH                                             :انتیسو
+STR_DAY_NUMBER_30TH                                             :تیسو
+STR_DAY_NUMBER_31ST                                             :اکتیسو
 ############ range for days ends

 ############ range for months starts
@@ -638,7 +662,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}موجو
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}موجودہ پروگرام میں سے نکالنے کے لئے گانے پر کلک کریں (صرف اپنی مرضی کے مطابق 1 یا 2)

 # Highscore window
-STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}سر فہرست کمپنیاں جو {NUM}{}({STRING} کے مقام پر پہنچیں)
+STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}سر فہرست کمپنیاں جو {NUM}
 STR_HIGHSCORE_TOP_COMPANIES_NETWORK_GAME                        :{BIG_FONT}{BLACK}کمپنیوں کی فہرست میں {NUM}
 STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
 STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN                     :کاروباری
@@ -648,7 +672,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST                      :سرمایہ د
 STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE                         :امیر و اثر پزیر
 STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL                           :مُغل
 STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY           :صدی کا ٹائیکون
-STR_HIGHSCORE_NAME                                              :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY}
+STR_HIGHSCORE_NAME                                              :{PRESIDENT_NAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIG_FONT}'{STRING}'   ({COMMA})
 STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS                           :{BIG_FONT}{BLACK}{COMPANY} '{STRING}' کا درجہ حاصل کرتا ہے
 STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS              :{BIG_FONT}{WHITE}{PRESIDENT_NAME} جو {COMPANY} سے تعلق رکھتا ہے۔ '{STRING}' کا درجہ حاصل کرتا ہے
@@ -724,32 +748,7 @@ STR_MESSAGE_HISTORY                                             :{WHITE}پران
 STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}حالیہ پیغاموں کی فہرست
 STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}

-# Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}پیغام
-STR_NEWS_MESSAGE_OPTIONS_CAPTION                                :{WHITE}پیغاموں کے اختیارات
-STR_NEWS_MESSAGES_ALL                                           :{YELLOW}تمام قسم کے پیغاموں کو بند/خلاصہ/مکمل کریں
-STR_NEWS_MESSAGES_SOUND                                         :{YELLOW}خبروں کے خلاصے کے لے آواز چلائیں
-STR_NEWS_MESSAGES_OFF                                           :بند
-STR_NEWS_MESSAGES_SUMMARY                                       :خلاصہ
-STR_NEWS_MESSAGES_FULL                                          :مکمل
-
-STR_NEWS_MESSAGE_TYPES                                          :{BLACK}پیغاموں کی اقسام:
-STR_NEWS_MESSAGE_TYPE_ARRIVAL_OF_FIRST_VEHICLE_OWN              :{YELLOW}کھلاڑی کے اسٹیشن پر پہلی گاڑی کی آمد
-STR_NEWS_MESSAGE_TYPE_ARRIVAL_OF_FIRST_VEHICLE_OTHER            :{YELLOW}مقابل کے اسٹیشن پر پہلی گاڑی کی آمد
-STR_NEWS_MESSAGE_TYPE_ACCIDENTS_DISASTERS                       :{YELLOW}حادثے / تباہیاں
-STR_NEWS_MESSAGE_TYPE_COMPANY_INFORMATION                       :{YELLOW}کمپنی کی معلومات
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_OPEN                             :{YELLOW}صنعتوں کا افتتاح
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_CLOSE                            :{YELLOW}صنعتوں کی بندش
-STR_NEWS_MESSAGE_TYPE_ECONOMY_CHANGES                           :{YELLOW}معیشت بدل گئی
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_SERVED_BY_COMPANY        :{YELLOW}کمپنی کی خدمات حاصل کرنے والی صنعتوں کی پیداوار میں تبدیلی
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_SERVED_BY_OTHER          :{YELLOW}مُقابل کی خدمات حاصل کرنے والی صنعتوں کی پیداوار میں تبدیلی
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_UNSERVED                 :{YELLOW}دوسری صنعت کی پیداوار میں تبدیلی
-STR_NEWS_MESSAGE_TYPE_ADVICE_INFORMATION_ON_COMPANY             :{YELLOW}کمپنی کی گاڑیوں کے بارے پیں نصیحت / معلومات
-STR_NEWS_MESSAGE_TYPE_NEW_VEHICLES                              :{YELLOW}نئی گاڑیاں
-STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}کارگو کی منظوری میں تبدیلی
-STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}امداد
-STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}عمومی معلومات
-
 STR_NEWS_CUSTOM_ITEM                                            :{BIG_FONT}{BLACK}{STRING}

 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK}شہریوں کا جشن ۔ ۔ ۔{}پہلی ریل گاڑی {STATION} پر پہنچی
@@ -812,13 +811,11 @@ STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE
 STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} اڈے میں انتظار کر رہا یے
 STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} ہوائی یینگر میں انتظار کر رہا یے

-# Start of order review system
-# DON'T ADD OR REMOVE LINES HERE
+# Order review system / warnings
 STR_NEWS_VEHICLE_HAS_TOO_FEW_ORDERS                             :{WHITE}{VEHICLE} کے پاس اوقات کے جدول کے مطابق احکامات بہت کم ہیں
 STR_NEWS_VEHICLE_HAS_VOID_ORDER                                 :{WHITE}{VEHICLE} کے پاس غلط (بے کار) حکم ہے
 STR_NEWS_VEHICLE_HAS_DUPLICATE_ENTRY                            :{WHITE}{VEHICLE} کے پاس ایسا ہی حکم پہلے سے ہے
 STR_NEWS_VEHICLE_HAS_INVALID_ENTRY                              :{WHITE}{VEHICLE} کے پاس احکامات میں ایک ختم شدہ اسٹیشن ہے
-# end of order system

 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} پرانا ہو رہا ہے
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} بہت پرانا ہو رہا ہے
@@ -897,15 +894,6 @@ STR_GAME_OPTIONS_CURRENCY_ZAR                                   :جنوبی اف
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :اپنی مرضی کی ۔۔۔
 ############ end of currency region

-STR_GAME_OPTIONS_MEASURING_UNITS_FRAME                          :{BLACK}پیمائشی اکائیاں
-STR_GAME_OPTIONS_MEASURING_UNITS_DROPDOWN_TOOLTIP               :{BLACK}پیمائشی اکائیاں اختیار کریں
-
-############ start of measuring units region
-STR_GAME_OPTIONS_MEASURING_UNITS_IMPERIAL                       :اِمپیریل
-STR_GAME_OPTIONS_MEASURING_UNITS_METRIC                         :میٹرک
-STR_GAME_OPTIONS_MEASURING_UNITS_SI                             :اکائیوں کا بین الاقوامی نظام
-############ end of measuring units region
-
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}گاڑیاں
 STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_TOOLTIP                 :{BLACK}اختیار کریں کہ گاڑی سڑک کی کس طرف چلے
 STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT                    :بائیں طرف چلے
@@ -941,11 +929,13 @@ STR_GAME_OPTIONS_TOWN_NAME_CATALAN                              :کاٹالن
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}خود مختار بچاو
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}خودمختار کھیل بچانے کے درمیان وقفہ اختیار کریں

+############ start of autosave dropdown
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :بند
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :ہر مہینے
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_3_MONTHS               :ہر سہ ماہی
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_6_MONTHS               :ہر شش ماہی
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS              :ہر سال
+############ end of autosave dropdown

 STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}زبان
 STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}استعمال کرنے کےلئے زبان اختیار کئیجیے
@@ -957,8 +947,7 @@ STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}اسکر
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}اسکرین کی resolution اختیار کریں
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :دیگر

-STR_GAME_OPTIONS_SCREENSHOT_FORMAT                              :{BLACK}اسکرین کی تصویر کا فارمیٹ
-STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP                      :{BLACK}اسکرین کی تصویر کے استعال کے لئے فارمیٹ اختیار کریں
+

 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}بُنیادی گرافک سیٹ
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}بُنیادی گرافک سیٹ اختیار کریں
@@ -1002,37 +991,7 @@ STR_CURRENCY_PREVIEW                                            :{LTBLUE}جائ
 STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}اپنی کرنسی میں 10000 پاونڈ (£)
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}اپنی مرضی کے کرنسی پیرامیٹر کو تبدیل کریں

-# Difficulty level window
-STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}مشکلات کا درجہ
-
-############ range for difficulty levels starts
-STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}آسان
-STR_DIFFICULTY_LEVEL_MEDIUM                                     :{BLACK}درمیانہ
-STR_DIFFICULTY_LEVEL_HARD                                       :{BLACK}مشکل
-STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}اپنی مرضی کا
-############ range for difficulty levels ends
-
-STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}زیادہ اسکور کا جدول دیکھیں
-STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}محفوظ کریں
-
-############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}مدمقابلوں کی زیادہ سے زیادہ تعداد: {ORANGE}{COMMA}
-STR_DIFFICULTY_LEVEL_SETTING_NO_OF_TOWNS                        :{LTBLUE}شہروں کی تعداد: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_NO_OF_INDUSTRIES                   :{LTBLUE}صنعتوں کی تعداد: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_INITIAL_LOAN_000           :{LTBLUE}زیادہ سے زیادہ شروعاتی قرصہ: {ORANGE}{CURRENCY_LONG}
-STR_DIFFICULTY_LEVEL_SETTING_INITIAL_INTEREST_RATE              :{LTBLUE}ابتدائی شرحِ سود: {ORANGE}{COMMA}%
-STR_DIFFICULTY_LEVEL_SETTING_VEHICLE_RUNNING_COSTS              :{LTBLUE}گاڑی چلانے کا خرچہ: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_CONSTRUCTION_SPEED_OF_COMPETITOR   :{LTBLUE}مد مقابلوں کی تعمیر کی رفتار: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_VEHICLE_BREAKDOWNS                 :{LTBLUE}گاڑی خراب ہوگئی: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_SUBSIDY_MULTIPLIER                 :{LTBLUE}امداد کا ضارِب: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_COST_OF_CONSTRUCTION               :{LTBLUE}تعمیر کا خرچہ: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_TERRAIN_TYPE                       :{LTBLUE}خطے کی قسم: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_QUANTITY_OF_SEA_LAKES              :{LTBLUE}سُمندر/جھیلوں کی تعداد: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_ECONOMY                            :{LTBLUE}معیشت: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_TRAIN_REVERSING                    :{LTBLUE}ریل گاڑی اُلٹی چلنا: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_DISASTERS                          :{LTBLUE}تباہیاں: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_CITY_APPROVAL                      :{LTBLUE}سٹی کونسل کا علاقے میں تعمیرات (تبدیلیوں) کے بارے میں رویہ: {ORANGE}{STRING}
-############ range for difficulty settings ends

 STR_NONE                                                        :کوئی نہیں
 STR_FUNDING_ONLY                                                :صرف فنڈنگ
@@ -1083,22 +1042,16 @@ STR_TERRAIN_TYPE_FLAT                                           :سیدھا
 STR_TERRAIN_TYPE_HILLY                                          :ٹیلوں والا
 STR_TERRAIN_TYPE_MOUNTAINOUS                                    :پہاڑی

-STR_ECONOMY_STEADY                                              :مستحکم
-STR_ECONOMY_FLUCTUATING                                         :غیر مستحکم
-
-STR_REVERSE_AT_END_OF_LINE_AND_AT_STATIONS                      :پٹڑی کے آخر پر اور اسٹیشن پر
-STR_REVERSE_AT_END_OF_LINE_ONLY                                 :صرف پٹڑی کے آخر پر
-
 STR_CITY_APPROVAL_PERMISSIVE                                    :اجازت دینے والا
 STR_CITY_APPROVAL_TOLERANT                                      :برداشت کرنے والا
 STR_CITY_APPROVAL_HOSTILE                                       :مخالفانہ

-STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}اس عمل نے مشکل کی سطح کو اپنی مرضی کا کر دیا ہے

-# Advanced settings window
-STR_CONFIG_SETTING_CAPTION                                      :{WHITE}ایڈوانسڈ سیٹنگ
+# Settings tree window
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(کوئی وضاحت موجود نہیں)

+
+
 STR_CONFIG_SETTING_OFF                                          :بند
 STR_CONFIG_SETTING_ON                                           :آن
 STR_CONFIG_SETTING_DISABLED                                     :غیر فعال
@@ -1115,7 +1068,7 @@ STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT                          :بائیں
 STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER                        :درمیان
 STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT                         :دائیں

-STR_CONFIG_SETTING_BUILDONSLOPES                                :ڈھلان اور ساحل پر تعمیر کی اجازت: {STRING}
+
 STR_CONFIG_SETTING_AUTOSLOPE                                    :تعمیرات کے نیچے منظر کشی کی اجازت: {STRING}
 STR_CONFIG_SETTING_CATCHMENT                                    :کوریج کے علاقے کے حقیقت پسندانہ سائز کی اجازت: {STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :شہروں کی ملکیت زیادہ سڑکوں، پلوں اور سرنگوں کو توڑنے کی اجازت: {STRING}
@@ -1128,10 +1081,7 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :گاڑی کو
 STR_CONFIG_SETTING_PERCENTAGE                                   :{COMMA}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :ریل گاڑیوں اور بحری جہازوں کو 90° مڑنے سے روکیں: {STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :اسٹیشنوں کو جوڑنے کی اجازت: {STRING}
-STR_CONFIG_SETTING_IMPROVEDLOAD                                 :سامان لوڈ کرنے کا بہتر طریقہ استعمال کریں: {STRING}
-STR_CONFIG_SETTING_GRADUAL_LOADING                              :گاڑیوں کو آہستہ آہستہ بھریں: {STRING}
 STR_CONFIG_SETTING_INFLATION                                    :افراط زر: {STRING}
-STR_CONFIG_SETTING_SELECTGOODS                                  :سامان صرف اُسی صورت میں کسی اسٹیشن تک پہنچایا جب وہ اُسے قبول کرتا ہو: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :پل کی زیادہ سے زیادہ لمبائی: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :پل بنانے کی زیادہ سے زیادہ لمبائی
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :سرنگ کی زیادہ سے زیادہ لمبائی: {STRING}
@@ -1149,12 +1099,11 @@ STR_CONFIG_SETTING_STOP_LOCATION                                :نئے احکا
 STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END                       :شروع میں
 STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE                         :درمیان میں
 STR_CONFIG_SETTING_STOP_LOCATION_FAR_END                        :آخر میں
-STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :گاڑیوں کی قطار: {STRING}
 STR_CONFIG_SETTING_AUTOSCROLL                                   :ونڈو کو پین کرو جب ماؤس کنارے پر ہو: {STRING}
 STR_CONFIG_SETTING_BRIBE                                        :مقامی اتھارٹی کی رشوت کی اجازت دیں: {STRING}
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :خصوصی نقل و حمل کے حقوق کو خریدنے کی اجازت: {STRING}
-STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :فنڈنگ عمارتوں کی اجازت: {STRING}
-STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :مقامی سڑکوں کی تعمیر نو فنڈنگ کی اجازت: {STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :فنڈنگ عمارتوں کی اجازت: {STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :مقامی سڑکوں کی تعمیر نو فنڈنگ کی اجازت: {STRING}
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :دوسری کمپنیوں کو پیسے بھیجنے کی اجازت: {STRING}
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :مال گاڑیوں کو وزنی دکھانے کے لئے وزن کا ضارب: {STRING}
 STR_CONFIG_SETTING_PLANE_CRASHES                                :ہوائی جہازوں کے حادثوں کی تعداد: {STRING}
@@ -1163,8 +1112,6 @@ STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED                        :کم
 STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :نارمل
 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :شہر کی ملکیت سڑکوں پر ڈرائیو تھرو اڈے بنانے کی اجازت: {STRING}
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :مد مقابلوں کی ملکیت سڑکوں پر ڈرائیو تھرو اڈے بنانے کی اجازت: {STRING}
-STR_CONFIG_SETTING_ADJACENT_STATIONS                            :اسٹیشن کے ساتھ اسٹیشں بنانے کی اجازت: {STRING}
-STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :ایک سے زیادہ NewGRF انجن سیٹوں کو فعال کریں: {STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}جب گاڑیاں موجود ہوں تو یہ سیٹنگ بدلنا ممکن نہیں
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :انفراسٹرکچر کی بحالی: {STRING}

@@ -1200,8 +1147,6 @@ STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :اونچائی
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :الٹی گھڑی وار
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :گھڑی وار
 STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :ایک سیدھے scenario والا نقشہ کتنا اونچا ہو گا: {STRING}
-STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :نقشے کے کناروں پر منظر کشی فعال کریں: {STRING}
-STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES_HELPTEXT               :اگر منع کر دیا، تو نقسے کی حدود ہمیشہ سمندر ہوں گی
 STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}جنوبی کنارے پر ایک یا ایک سے زیادہ ٹائلیں خالی نہیں ہیں
 STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}کسی کنارے پر ایک یا ایک سے زیادہ ٹائلیں پانی کی نہیں ہیں

@@ -1228,14 +1173,14 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Ctrl+Click
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :آف


+STR_CONFIG_SETTING_AUTOSAVE                                     :Autosave: {STRING}
+STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT                            :گیم بچانے کا وقفا چنیں
+
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :کھیل کو محفوظ کرنے کے لئے تاریخ کا {STRING} طریقہ استعمال کریں
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :long (31st Dec 2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :short (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_DOS                   :DOS palette
-STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_WIN                   :Windows palette
-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :نیا کھیل شروع کرنے پر خودکار توقف: {STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :توقف کے دوران اجازت دیں: {STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :کوئی فعل نہیں
@@ -1255,6 +1200,7 @@ STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :مخصوص پٹ
 STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :تعمیراتی ٹول کو استعمال کے بعد فعال رکھیں: {STRING}
 STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :کمپنی کی مالیاتی ونڈو میں اخراجات کو اکٹھا دکھائیں: {STRING}

+
 STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :موزوں گاڑیاں نہ ہونے کی صورت میں عمارت کو غیر فعال کر دیں: {STRING}
 STR_CONFIG_SETTING_MAX_TRAINS                                   :کمپنی کی زیادہ سے زیادہ ریل گاڑیاں: {STRING}
 STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :کمپنی کی زیادہ سے زیادہ گاڑیاں: {STRING}
@@ -1266,6 +1212,7 @@ STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :کمپیوٹر
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :کمپیوٹر کے لئے ہوائی جہاز غیر فعال کریں: {STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :کمپیوٹر کے لئے بحری جہاز غیر فعال کریں: {STRING}

+
 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :زیادہ کھلاڑیوں والے کھیل میں AI کی اجازت دیں: {STRING}
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :اسکرپٹس کے معطل ہونے سے پہلے #opcodes: {STRING}

@@ -1274,6 +1221,26 @@ STR_CONFIG_SETTING_NOSERVICE                                    :گاڑیوں ک
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :مال گاڑی کی حد رفتار فعال کریں: {STRING}
 STR_CONFIG_SETTING_DISABLE_ELRAILS                              :الیلٹرک ریل گاڑیاں غیر فعال کریں: {STRING}

+STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OWN               :کھلاڑی کے اسٹیشن پر پہلی گاڑی کی آمد: {STRING}
+STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER             :مقابل کے اسٹیشن پر پہلی گاڑی کی آمد: {STRING}
+STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS                     :حادثے / تباہیاں: {STRING}
+STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION                     :کمپنی کی معلومات: {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_OPEN                           :صنعتوں کا افتتاح: {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_CLOSE                          :صنعتوں کی بندش: {STRING}
+STR_CONFIG_SETTING_NEWS_ECONOMY_CHANGES                         :معیشت بدل گئی: {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_CHANGES_COMPANY                :کمپنی کی خدمات حاصل کرنے والی صنعتوں کی پیداوار میں تبدیلی: {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_CHANGES_OTHER                  :مُقابل کی خدمات حاصل کرنے والی صنعتوں کی پیداوار میں تبدیلی: {STRING}
+STR_CONFIG_SETTING_NEWS_INDUSTRY_CHANGES_UNSERVED               :دوسری صنعت کی پیداوار میں تبدیلی: {STRING}
+STR_CONFIG_SETTING_NEWS_ADVICE                                  :کمپنی کی گاڑیوں کے بارے پیں نصیحت / معلومات: {STRING}
+STR_CONFIG_SETTING_NEWS_NEW_VEHICLES                            :نئی گاڑیاں: {STRING}
+STR_CONFIG_SETTING_NEWS_CHANGES_ACCEPTANCE                      :کارگو کی منظوری میں تبدیلی: {STRING}
+STR_CONFIG_SETTING_NEWS_SUBSIDIES                               :امداد: {STRING}
+STR_CONFIG_SETTING_NEWS_GENERAL_INFORMATION                     :عمومی معلومات: {STRING}
+
+STR_CONFIG_SETTING_NEWS_MESSAGES_OFF                            :بند
+STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY                        :خلاصہ
+STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :مکمل
+
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :رنگین خبریں کون سے سال سے شروع ہوں: {STRING}
 STR_CONFIG_SETTING_STARTING_YEAR                                :شروعاتی سال: {STRING}
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :مستحکم معیشت فعال کریں: {STRING}
@@ -1325,26 +1292,22 @@ STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL                           :نارمل
 STR_CONFIG_SETTING_TOWN_GROWTH_FAST                             :تیز
 STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :بہت تیز
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :شہر کا شروعاتی ضارب: {STRING}
-STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD                        :سڑک کی تعمیر کے دوران غلط تعمیر شدہ حصوں کو ہٹا دے: {STRING}

-STR_CONFIG_SETTING_GUI                                          :{ORANGE}انٹرفیس
-STR_CONFIG_SETTING_CONSTRUCTION                                 :{ORANGE}تعمیرات
+
+
+
+
+
+
+
+STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}انٹرفیس
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}تعمیرات
 STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}گاڑیاں
-STR_CONFIG_SETTING_STATIONS                                     :{ORANGE} اسٹیشن
-STR_CONFIG_SETTING_ECONOMY                                      :{ORANGE}معیشت
-STR_CONFIG_SETTING_AI                                           :{ORANGE}مد مقابل
-STR_CONFIG_SETTING_DISPLAY_OPTIONS                              :{ORANGE}ڈسپلے کے اختیارات
-STR_CONFIG_SETTING_INTERACTION                                  :{ORANGE}چوراہا
-STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS                         :{ORANGE}اشعارے
-STR_CONFIG_SETTING_STATIONS_CARGOHANDLING                       :{ORANGE}سامان کو سنبھالنا
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}کمپیوٹر کے کھلاڑی
-STR_CONFIG_SETTING_VEHICLES_AUTORENEW                           :{ORANGE}خودکار تبدیلی
-STR_CONFIG_SETTING_VEHICLES_SERVICING                           :{ORANGE}مرمت
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}روٹنگ
-STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE}ریل گاڑیاں
-STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}شہر
-STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}صنعتیں
-STR_CONFIG_SETTING_ECONOMY_SCRIPTS                              :{ORANGE}اسکرپٹس
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}شہر
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}صنعتیں
+STR_CONFIG_SETTING_AI                                           :{ORANGE}مد مقابل
+STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}کمپیوٹر کے کھلاڑی

 STR_CONFIG_SETTING_PATHFINDER_OPF                               :اصلی
 STR_CONFIG_SETTING_PATHFINDER_NPF                               :NPF
@@ -1383,8 +1346,6 @@ STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}منظر
 STR_INTRO_MULTIPLAYER                                           :{BLACK}زیادہ کھلاڑی

 STR_INTRO_GAME_OPTIONS                                          :{BLACK}کھیل کے اختیارات
-STR_INTRO_DIFFICULTY                                            :{BLACK}مشکل ({STRING})
-STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}ایڈوانسڈ سیٹنگ
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF چنئے
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}آن لائن مواد دیکھیں
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}AI / کھیل کے اختیارات
@@ -1403,8 +1364,6 @@ STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE                        :{BLACK}منظر
 STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}منظر کشی کا 'toyland' طریقہ چُنئیے

 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}کھیل کے اختیارات دکھائیں
-STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}مشکلات کے اختیارات دیکھیئے
-STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}ایڈوانسڈ سیتنگز دیکھیئے
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF سیٹنگز دیکھیئے
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}نئے اور ترمیم شدہ مواد کو ڈاون لوڈ کرنے کے لئے چیک کریں
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK} AI اور کھیل کے اختیارات دکھائیں
@@ -1546,10 +1505,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}ٹائی

 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}زیادہ کھلاڑی
-STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}کنکشن:
-STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}انٹرنیٹ یا LAN کھیل میں سے کوئی ایک اختیار کریں
-STR_NETWORK_SERVER_LIST_LAN                                     :LAN
-STR_NETWORK_SERVER_LIST_INTERNET                                :انٹرنیٹ
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}کھلاڑی کا نام:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}دوسرے کھلاڑی آپ کو اس نام سے جانیں گے

@@ -1608,8 +1563,6 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}کھیل
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}پاس ورڈ رکھیں
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}اگر آپ اس کھیل کو ہر کسی کی پہنچ سے بچانا چاہتے ہیں تو کھیل کو پاس ورڈ سے محفوظ بنا لیں

-STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / انٹرنیٹ
-STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (advertise)
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} کلائینٹ{P "" س}
 STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}زیادہ سے زیادہ کلائینٹ:
 STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}زیادہ سے زیادہ کلائینٹس کی تعداد کا انتخاب کریں
@@ -1917,6 +1870,10 @@ STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}catenary
 STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}لوڈ کرنے کے نشانوں کی شفافیت کی تدویم کریں۔ محدوظ کرنے کے لئے Ctrl+Click دبائیں
 STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}چیزوں کو شفاف کی بجائے غائب کر دیں

+# Linkgraph legend window
+
+# Linkgraph legend window and linkgraph legend in smallmap
+
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}کوریج والے علاقے کو واضح کریں
 STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}بند
@@ -2191,11 +2148,17 @@ STR_NEWGRF_SETTINGS_INACTIVE_LIST                               :{WHITE} غیر
 STR_NEWGRF_SETTINGS_ADD_FILE_TOOLTIP                            :{BLACK} منتخب NewGRF فائل اپنے configuration میں شامل کیجئے
 STR_NEWGRF_SETTINGS_RESCAN_FILES                                :{BLACK} فائلوں کو دوبارھ اسکین کیجئے
 STR_NEWGRF_SETTINGS_RESCAN_FILES_TOOLTIP                        :{BLACK} نئی دستیاب NewGRF فائلوں کی فھرست حاصل کیجئے
+STR_NEWGRF_SETTINGS_UPGRADE                                     :{BLACK}اپگریڈ





+# NewGRF save preset window
+STR_SAVE_PRESET_CANCEL                                          :{BLACK}منسوخ
+STR_SAVE_PRESET_CANCEL_TOOLTIP                                  :{BLACK}پریسیٹ تبدیل نہ کریں
+STR_SAVE_PRESET_SAVE                                            :{BLACK}بچایں
+
 # NewGRF parameters window

 # NewGRF inspect window
@@ -2236,6 +2199,8 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :<غلط سام
 STR_NEWGRF_INVALID_ENGINE                                       :<غلط انجن ماڈل>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<غلط صنعت>

+# Placeholders for other invalid stuff, e.g. vehicles that have gone (Game Script).
+
 # NewGRF scanning window

 # Sign list window
@@ -2273,10 +2238,13 @@ STR_GOAL_QUESTION_CAPTION_INFORMATION                           :معلومات
 STR_GOAL_QUESTION_CAPTION_WARNING                               :انتباہ
 STR_GOAL_QUESTION_CAPTION_ERROR                                 :خرابی

-### Start of Goal Question button list
+############ Start of Goal Question button list
+############ End of Goal Question button list

 # Subsidies window

+# Story book window
+
 # Station list window
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATION_FEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
@@ -2286,14 +2254,14 @@ STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}کسی

 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATION_FEATURES}
-STR_STATION_VIEW_WAITING_TITLE                                  :{BLACK}منتظر: {WHITE}{STRING}
 STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO_LONG}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO_SHORT} سے براستہ ہے {STATION})

 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}منظور کرتا ہے: {WHITE}{CARGO_LIST}


-STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
+
+

 ############ range for rating starts
 ############ range for rating ends
@@ -2313,9 +2281,9 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN

 # Company view

-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} ریل کے ٹکڑے
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} سڑک کے ٹکڑے
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} پانی کی ٹائلیں
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA}پٹڑی { "کا" "کے" P} { "ٹکڑا" "ٹکڑے" P}
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} سڑک { "کا" "کے" P} { "ٹکڑا" "ٹکڑے" P}
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} پانی { "کا" "کے" P} { "ٹکڑا" "ٹکڑے" P}
 STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} اسٹیشن کی ٹائلیں
 STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{COMMA}{WHITE} ہوائی اڈے
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}کوئی نہیں
@@ -2337,7 +2305,6 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}نہری
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD} اسٹیشن:
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}اسٹیشن کی ٹائل
 STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}ہوائی اڈے
-STR_COMPANY_INFRASTRUCTURE_VIEW_COST                            :{WHITE}{1:CURRENCY_LONG}سالانہ ({0:COMMA})
 STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENCY_LONG}سالانہ

 # Industry directory
@@ -2372,6 +2339,7 @@ STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}فہرس



+
 # Build vehicle window


@@ -2382,6 +2350,24 @@ STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}پہنچ



+STR_BUY_VEHICLE_TRAIN_HIDE_TOGGLE_BUTTON                        :{BLACK}چهپایں
+STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_TOGGLE_BUTTON                 :{BLACK}چهپایں
+STR_BUY_VEHICLE_SHIP_HIDE_TOGGLE_BUTTON                         :{BLACK}چهپایں
+STR_BUY_VEHICLE_AIRCRAFT_HIDE_TOGGLE_BUTTON                     :{BLACK}چهپایں
+
+STR_BUY_VEHICLE_TRAIN_SHOW_TOGGLE_BUTTON                        :{BLACK}دکهایں
+STR_BUY_VEHICLE_ROAD_VEHICLE_SHOW_TOGGLE_BUTTON                 :{BLACK}دکهایں
+STR_BUY_VEHICLE_SHIP_SHOW_TOGGLE_BUTTON                         :{BLACK}دکهایں
+STR_BUY_VEHICLE_AIRCRAFT_SHOW_TOGGLE_BUTTON                     :{BLACK}دکهایں
+
+STR_BUY_VEHICLE_TRAIN_HIDE_SHOW_TOGGLE_TOOLTIP                  :{BLACK}ٹرین کا قسم دکهایں یه نا
+STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_SHOW_TOGGLE_TOOLTIP           :{BLACK}گاڑی کا قسم دکهایں یه نا
+STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP                   :{BLACK}سمندری جہاز کا قسم دکهایں یه نا
+STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP               :{BLACK}ہوائی جہاز کا قسم دکهایں یه نا
+
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}ٹرین کےقسم کا نام تبدیل کریں
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}گاڑی کےقسم کا نام تبدیل کریں
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}بہری جہاز کےقسم کا نام تبدیل کریں

 # Depot window
 STR_DEPOT_CAPTION                                               :{WHITE}{DEPOT}
@@ -2414,6 +2400,9 @@ STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}قیمت

 # Autoreplace window

+STR_REPLACE_VEHICLE_VEHICLES_IN_USE                             :{YELLOW}استعمالکردہ گاڑیاں
+STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES                          :{YELLOW}میسر گاڑیاں
+



@@ -2455,6 +2444,7 @@ STR_VEHICLE_INFO_MAX_SPEED_RANGE                                :{BLACK}حد ر



+
 # Extra buttons for train details windows


@@ -2573,6 +2563,7 @@ STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}لائس

 # Screenshot related messages

+
 # Error message titles

 # Generic construction errors
@@ -2604,6 +2595,7 @@ STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN}
 # Industry related errors
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{G=m}{WHITE}... صرف ان شہروں میں بن سکتا ہے جن کی آبادی ۱۲۰۰ سے زیادہ ہے

+
 # Station construction related errors


@@ -2701,6 +2693,7 @@ STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}کھیل
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}مرمت کا دورانیہ تبدیل نہین کرسکتے


+
 # Specific vehicle errors


@@ -2716,6 +2709,8 @@ STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE                             :{WHITE} ۔ ۔
 # Translatable comment for OpenTTD's desktop shortcut
 STR_DESKTOP_SHORTCUT_COMMENT                                    :Transport Tycoon Deluxe کا ھم جنس

+# Translatable descriptions in media/baseset/*.ob* files
+
 ##id 0x2000
 # Town building names

@@ -2737,20 +2732,60 @@ STR_SV_STNAME_WAYPOINT                                          :{STRING}
 # Vehicle names
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_PLODDYPHUT_CHOO_CHOO         :Ploddyphut Choo-Choo
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_CHOO_CHOO          :Powernaut Choo-Choo
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MIGHTYMOVER_CHOO_CHOO        :Mightymover Choo-Choo
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MIGHTYMOVER_CHOO_CHOO        :MightyMover Choo-Choo
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_WIZZOWOW_Z99             :Wizzowow Z99
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_WIZZOWOW_ROCKETEER         :Wizzowow Rocketeer
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_COAL_TRUCK                 :Balogh کوئلے کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COAL_TRUCK                    :Uhl کوئلے کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_DW_COAL_TRUCK                     :DW کوئلے کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_MAIL_TRUCK                    :MPS ڈاک کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_REYNARD_MAIL_TRUCK                :Reynard ڈاک کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_MAIL_TRUCK                  :Perry ڈاک کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_MAIL_TRUCK            :MightyMover ڈاک کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_MAIL_TRUCK            :Powernaught ڈاک کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_MAIL_TRUCK               :Wizzowow ڈاک کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_OIL_TANKER               :Witcombe تیل کا ٹینکر
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_OIL_TANKER                 :Foster تیل کا ٹینکر
+STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_OIL_TANKER                  :Perry تیل کا ٹینکر
+STR_VEHICLE_NAME_ROAD_VEHICLE_TALBOTT_LIVESTOCK_VAN             :Talbott مویشی وین
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_LIVESTOCK_VAN                 :Uhl مویشی وین
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_LIVESTOCK_VAN              :Foster مویشی وین
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_GOODS_TRUCK                :Balogh عام اشیاء کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_CRAIGHEAD_GOODS_TRUCK             :Craighead عام اشیاء کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GOODS_TRUCK                  :Goss عام اشیاء کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_HEREFORD_GRAIN_TRUCK              :Hereford اناج کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_THOMAS_GRAIN_TRUCK                :Thomas اناج کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GRAIN_TRUCK                  :Goss اناج کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_WOOD_TRUCK               :Witcombe لکڑی کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_WOOD_TRUCK                 :Foster لکڑی کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_MORELAND_WOOD_TRUCK               :Moreland لکڑی کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_IRON_ORE_TRUCK                :MPS لوہے کی دھات کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_IRON_ORE_TRUCK                :Uhl لوہے کی دھات کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_IRON_ORE_TRUCK             :Chippy لوہے کی دھات کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_STEEL_TRUCK                :Balogh فولاد کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_STEEL_TRUCK                   :Uhl فولاد کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK               :Kelling فولاد کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK              :Balogh بکتربند ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :Uhl بکتربند ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :Foster بکتربند ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_FOOD_VAN                   :Foster خوراک کی ویگن
 STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_FOOD_VAN                    :Perry خوراک کی ویگن
 STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN                   :Chippy خوراک کی ویگن
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_PAPER_TRUCK                   :Uhl کاغذ کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_PAPER_TRUCK                :Balogh کاغذ کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_PAPER_TRUCK                   :MPS کاغذ کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_COPPER_ORE_TRUCK              :MPS تانبے کی دهات کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COPPER_ORE_TRUCK              :Uhl تانبے کی دهات کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_COPPER_ORE_TRUCK             :Goss تانبے کی دهات کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_WATER_TANKER                  :Uhl پانی کا ٹینکر
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_WATER_TANKER               :Balogh پانی کا ٹینکر
+STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_WATER_TANKER                  :MPS پانی کا ٹینکر
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_FRUIT_TRUCK                :Balogh پھلوں کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_FRUIT_TRUCK                   :Uhl پھلوں کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_FRUIT_TRUCK               :Kelling پھلوں کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_RUBBER_TRUCK               :Balogh کہریا(ربر) کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_RUBBER_TRUCK                  :Uhl کہریا(ربر) کا ٹرک
+STR_VEHICLE_NAME_ROAD_VEHICLE_RMT_RUBBER_TRUCK                  :RMT کہریا(ربر) کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_SUGAR_TRUCK           :MightyMover چینی کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_SUGAR_TRUCK           :Powernaught چینی کا ٹرک
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_SUGAR_TRUCK              :Wizzowow چینی کا ٹرک
@@ -2790,7 +2825,7 @@ STR_VEHICLE_NAME_SHIP_CHUGGER_CHUG_PASSENGER                    :Chugger-Chug م
 STR_VEHICLE_NAME_SHIP_SHIVERSHAKE_PASSENGER_FERRY               :Shivershake مسافر کشتی
 STR_VEHICLE_NAME_SHIP_YATE_CARGO_SHIP                           :Yate مال بردار کشتی
 STR_VEHICLE_NAME_SHIP_BAKEWELL_CARGO_SHIP                       :Bakewell مال بردار کشتی
-STR_VEHICLE_NAME_SHIP_MIGHTYMOVER_CARGO_SHIP                    :Mightymover مال بردار کشتی
+STR_VEHICLE_NAME_SHIP_MIGHTYMOVER_CARGO_SHIP                    :MightyMover مال بردار کشتی
 STR_VEHICLE_NAME_SHIP_POWERNAUT_CARGO_SHIP                      :Powernaut مال بردار کشتی
 STR_VEHICLE_NAME_AIRCRAFT_SAMPSON_U52                           :Sampson U52
 STR_VEHICLE_NAME_AIRCRAFT_COLEMAN_COUNT                         :Coleman گنتی
@@ -2882,6 +2917,7 @@ STR_COMPANY_NAME                                                :{COMPANY}
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANY_NUM}
 STR_DEPOT_NAME                                                  :{DEPOT}
 STR_ENGINE_NAME                                                 :{ENGINE}
+STR_HIDDEN_ENGINE_NAME                                          :{ENGINE}(پوشیدہ)
 STR_GROUP_NAME                                                  :{GROUP}
 STR_INDUSTRY_NAME                                               :{INDUSTRY}
 STR_PRESIDENT_NAME                                              :{PRESIDENT_NAME}
@@ -2903,7 +2939,7 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
-STR_JUST_STRING_SPACE_STRING                                    :{STRING} {STRING}
+STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}

 # Slightly 'raw' stringcodes with colour or size
@@ -2916,8 +2952,6 @@ STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINY_FONT}{BLACK}{DATE_LONG}
@@ -2928,9 +2962,7 @@ STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_TINY_BLACK_STATION                                          :{TINY_FONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
-STR_RED_STRING                                                  :{RED}{STRING}
 STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_ORANGE_STRING1_WHITE                                        :{ORANGE}{STRING}{WHITE}
@@ -2953,4 +2985,4 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}

-STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
+STR_TOOLBAR_RAILTYPE_VELOCITY                                   :({STRING} ({VELOCITY}
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt