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

all languages - update for latest commits which moved around lots of strings
dutch - 5 changes by Yexo
norwegian_bokmal - 1 changes by CyberKenny
romanian - 1 changes by kkmic
spanish - 1 changes by Terkhen

9 files changed, 872 insertions, 484 deletions

diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index c33ab5080..38045a8bf 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -101,8 +101,6 @@ STR_QUANTITY_FOOD                                               :{WEIGHT} ton it
 STR_QUANTITY_PAPER                                              :{WEIGHT} ton papier
 STR_QUANTITY_GOLD                                               :{COMMA} sekken goud
 STR_QUANTITY_WATER                                              :{VOLUME} wetter
-STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
-STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SMALLMAP_CAPTION                                            :{WHITE}Kaart - {STRING}
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spul Opsjes
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Berjocht
@@ -113,17 +111,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Orizjine
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD fersje {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 It OpenTTD team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Ofslúte
 STR_YES                                                         :{BLACK}Ja
 STR_NO                                                          :{BLACK}Nee
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Witte jo seker dat jo dit spul ôfslúte wolle en werom gean wolle nei {STRING}?
-STR_BLACK_1                                                     :{BLACK}1
-STR_BLACK_2                                                     :{BLACK}2
-STR_BLACK_3                                                     :{BLACK}3
-STR_BLACK_4                                                     :{BLACK}4
-STR_BLACK_5                                                     :{BLACK}5
+
 STR_JUST_NOTHING                                                :Neat
 STR_COLOUR_DARK_BLUE                                            :Tsjuster Blauw
 STR_COLOUR_PALE_GREEN                                           :Fel Grien
@@ -142,8 +134,6 @@ STR_COLOUR_BROWN                                                :Brún
 STR_COLOUR_GREY                                                 :Griis
 STR_COLOUR_WHITE                                                :Wyt
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Te folle fartugen yn it spul
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lokaasje
 STR_SMALLMAP_TYPE_CONTOURS                                      :Kontoeren
 STR_SMALLMAP_TYPE_VEHICLES                                      :Reauen
@@ -233,26 +223,15 @@ STR_FILE_MENU_QUIT_GAME                                         :Spul ferlitte
 STR_FILE_MENU_EXIT                                              :Ofslúte
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Ferlit Spul
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
+
+STR_SEND_FOR_SERVICING                                          :Stjoer foar ûnderhâldsbeurt
+
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Stjoer nei depot
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stjoer nei depot
 STR_SEND_SHIP_TO_DEPOT                                          :Stjoer nei depot
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stjoer nei hangaar
-STR_SEND_FOR_SERVICING                                          :Stjoer foar ûnderhâldsbeurt
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mrt
-STR_MONTH_ABBREV_APR                                            :Apr
-STR_MONTH_ABBREV_MAY                                            :Mai
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Aug
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Des
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -280,8 +259,6 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Bou flea
 STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS                     :{BLACK}Plantsje beamen, set buordsjes del, ensfh.
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Lân ynformaasje
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opsjes
-STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
-STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kin tiid tusken ûnderhâldsbeurten net feroarje...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Slút finster
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Finstertitel - hjirmei kinst it finster ferslepe
@@ -328,7 +305,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neat
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Namme
 STR_VEHICLE_NAME_SMALL                                          :{BLACK}{TINYFONT}{VEHICLE}
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -362,6 +339,22 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mrt
+STR_MONTH_ABBREV_APR                                            :Apr
+STR_MONTH_ABBREV_MAY                                            :Mai
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Aug
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Des
+
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Akseptearre fracht: {LTBLUE}
@@ -451,12 +444,9 @@ STR_HIGHSCORE_NAME                                              :{BIGFONT}{PRESI
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS                           :{BLACK}{BIGFONT}{COMPANY} behellet '{STRING}' status!
 STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS              :{WHITE}{BIGFONT}{PRESIDENTNAME} fan {COMPANY} behellet '{STRING}' status!
-STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Lânskip Ferbouer
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Lân Generaasje
-STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
-STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Fergrutsje gebiet om te ferheegjen/ferleegjen
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Ferlyts gebiet om te ferheegjen/ferleegjen
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Meitsje samar wat lân
@@ -534,7 +524,6 @@ STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Samar
 STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Lit lêste (neis)berjocht sjen
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spul Opsjes
@@ -618,9 +607,6 @@ STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Keapje l
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOSAVE
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Selektear 'Ezy Street' musyk programma
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 ############ end of townname region
 
@@ -636,8 +622,6 @@ STR_BLACK_7                                                     :{BLACK}7
 
 
 
-
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -902,7 +886,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipi's
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teepothûs
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Sparbaarch
 
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Plantsje beammen
 STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Set buordsje del
@@ -949,6 +932,8 @@ STR_CARGO_RATING_GOOD                                           :Goed
 STR_CARGO_RATING_VERY_GOOD                                      :Hiel Goed
 ############ range for rating ends
 
+### station view strings
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} akseptearret gjin {STRING} mear
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} akseptearret gjin {STRING} en {STRING} mear
@@ -1106,6 +1091,7 @@ STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...it is
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -1142,8 +1128,6 @@ STR_NUM_LOW                                                     :Leech
 STR_NUM_NORMAL                                                  :Gewoan
 STR_NUM_HIGH                                                    :Heech
 STR_NUM_CUSTOM                                                  :Oars
-STR_BLACK_SMALL_ARROW_LEFT                                      :{BLACK}{SMALLLEFTARROW}
-STR_BLACK_SMALL_ARROW_RIGHT                                     :{BLACK}{SMALLRIGHTARROW}
 STR_AI_SPEED_VERY_SLOW                                          :Traach
 STR_AI_SPEED_SLOW                                               :Stadich
 STR_AI_SPEED_MEDIUM                                             :Gewoan
@@ -1173,7 +1157,6 @@ STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Lit hi-s
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Bedriuw {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nei Gesicht
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Kleurenskema
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Kleurenskema:
@@ -1205,7 +1188,6 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totaal:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Ynkomstengrafyk
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Winstgrafyk
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Jild
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Liening
@@ -1422,8 +1404,6 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PLASTIC_TRUCK               :Plestikwein
 
 
 
-
-
 ##id 0x9000
 
 
@@ -1454,6 +1434,48 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1492,18 +1514,44 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
 
 
-##### Mass Order
 
 
+#### String control codes and their formatting
+
+STR_JUST_COMMA                                                  :{COMMA}
+
+
+STR_FORMAT_COMPANY_NUM                                          :(Bedriuw {COMMA})
+
+STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
+STR_BLACK_STRING                                                :{BLACK}{STRING}
 
+STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
+STR_BLACK_SMALL_ARROW_LEFT                                      :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT                                     :{BLACK}{SMALLRIGHTARROW}
 
+STR_BLACK_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
+STR_BLACK_6                                                     :{BLACK}6
+STR_BLACK_7                                                     :{BLACK}7
 
 
 #### Improved sign GUI
diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt
index 0f666e6e0..d68bc215a 100644
--- a/src/lang/unfinished/greek.txt
+++ b/src/lang/unfinished/greek.txt
@@ -155,8 +155,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}ALL
-STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
-STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SMALLMAP_CAPTION                                            :{WHITE}Χάρτης - {STRING}
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Επιλογές Παιχνιδιού
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Μήνυμα
@@ -168,17 +166,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Αρχι
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD έκδοση {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Η ομάδα του OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Έξοδος
 STR_YES                                                         :{BLACK}Ναι
 STR_NO                                                          :{BLACK}Όχι
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Είστε σίγουρος/η ότι θέλετε να παρατήσετε το παιχνίδι και να επιστρέψετε στο {STRING};
-STR_BLACK_1                                                     :{BLACK}1
-STR_BLACK_2                                                     :{BLACK}2
-STR_BLACK_3                                                     :{BLACK}3
-STR_BLACK_4                                                     :{BLACK}4
-STR_BLACK_5                                                     :{BLACK}5
+
 STR_JUST_NOTHING                                                :Τίποτα
 STR_COLOUR_DARK_BLUE                                            :Σκούρο Μπλε
 STR_COLOUR_PALE_GREEN                                           :Ανοικτό Πράσινο
@@ -197,8 +189,6 @@ STR_COLOUR_BROWN                                                :Καφέ
 STR_COLOUR_GREY                                                 :Γκρι
 STR_COLOUR_WHITE                                                :Λευκό
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Πάρα πολλά οχήματα στο παιχνίδι
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Τοποθεσία
 STR_SMALLMAP_TYPE_CONTOURS                                      :Περιγράμματα
 STR_SMALLMAP_TYPE_VEHICLES                                      :Οχήματα
@@ -324,12 +314,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Επιλ
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Επιλέξτε κριτήρια φιλτραρίσματος
 STR_SORT_BY                                                     :{BLACK}Ταξινόμηση κατά
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Πληθυσμός
+STR_SORT_BY_NAME                                                :{BLACK}Όνομα
+STR_SORT_BY_DATE                                                :{BLACK}Μέρα
 STR_SORT_BY_PRODUCTION                                          :Παραγωγή
 STR_SORT_BY_TYPE                                                :Τύπος
 STR_SORT_BY_TRANSPORTED                                         :Μεταφέρθηκαν
-STR_SORT_BY_NAME                                                :{BLACK}Όνομα
-STR_SORT_BY_DATE                                                :{BLACK}Μέρα
 STR_SORT_BY_NUMBER                                              :Αριθμός
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Κέρδος προηγούμενου χρόνου
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Κέρδος αυτού του χρόνου
@@ -352,37 +343,25 @@ STR_SORT_BY_INTRO_DATE                                          :Ημέρα Κυ
 STR_SORT_BY_RUNNING_COST                                        :Κόστος Συντήρησης
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Δύναμη/Κόστος Συντήρησης
 STR_SORT_BY_CARGO_CAPACITY                                      :Χωρητικότητα Φορτίου
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Κανένα εμπόρευμα κανενός τύπου δεν περιμένει
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Επιλογή όλων των εγκαταστάσεων
 STR_SELECT_ALL_TYPES                                            :{BLACK}Επιλογή όλων των τύπων φορτίου (συμπεριλαμβανομένου φορτίου μη-αναμονής)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Διαθέσιμα Τρένα
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Διαθέσιμα Οχήματα
-STR_AVAILABLE_SHIPS                                             :{BLACK}Διαθέσιμα Πλοία
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Διαθέσιμα Αεροσκάφη
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Προβολή λίστας διαθέσιμων σχεδίων μηχανών για τον τύπο οχήματος.
 STR_MANAGE_LIST                                                 :{BLACK}Διαχείριση λίστας
 STR_MANAGE_LIST_TIP                                             :{BLACK}Στείλε οδηγίες σε όλα τα οχήματα σε αυτή λίστα
 STR_REPLACE_VEHICLES                                            :Αντικατέστησε τα οχήματα
+STR_SEND_FOR_SERVICING                                          :Στείλε για επισκευή
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Διαθέσιμα Τρένα
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Διαθέσιμα Οχήματα
+STR_AVAILABLE_SHIPS                                             :{BLACK}Διαθέσιμα Πλοία
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Διαθέσιμα Αεροσκάφη
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Στείλε στο υπόστεγο
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Στείλε στο υπόστεγο
 STR_SEND_SHIP_TO_DEPOT                                          :Στείλε στο υπόστεγο
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Στείλε στο υπόστεγο
-STR_SEND_FOR_SERVICING                                          :Στείλε για επισκευή
-
-############ 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                                            :Δεκ
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -410,8 +389,6 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Κατα
 STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS                     :{BLACK}Τοποθέτηση δεντρων, πινακίδων κλπ.
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Πληροφορίες περιοχής
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Επιλογές
-STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
-STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Δεν μπορεί να αλλάξει το διάστημα της συντήρησης...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Κλείσιμο παραθύρου
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Τίτλος παραθύρου - σύρετε για να το μετακινήσετε
@@ -458,7 +435,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Κανένα
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Όνομα
 STR_VEHICLE_NAME_SMALL                                          :{BLACK}{TINYFONT}{VEHICLE}
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1{G ος η ο}
 STR_ORDINAL_NUMBER_2ND                                          :2{G ος η ο}
 STR_ORDINAL_NUMBER_3RD                                          :3{G ος η ο}
@@ -492,6 +469,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30{G ος η ο
 STR_ORDINAL_NUMBER_31ST                                         :31{G ος η ο}
 ############ 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                                                   :Φεβρουάριος
+STR_MONTH_MAR                                                   :Μάρτιος
+STR_MONTH_APR                                                   :Απρίλιος
+STR_MONTH_MAY                                                   :Μάιος
+STR_MONTH_JUN                                                   :Ιούνιος
+STR_MONTH_JUL                                                   :Ιούλιος
+STR_MONTH_AUG                                                   :Άυγουστος
+STR_MONTH_SEP                                                   :Σεπτέμβριος
+STR_MONTH_OCT                                                   :Οκτόβριος
+STR_MONTH_NOV                                                   :Νοέμβριος
+STR_MONTH_DEC                                                   :Δεκέμβριος
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Αποδεκτό Εμπόρευμα: {LTBLUE}
@@ -581,12 +586,9 @@ STR_HIGHSCORE_NAME                                              :{BIGFONT}{PRESI
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS                           :{BLACK}{BIGFONT}{COMPANY} έφτασε  στο επίπεδο '{STRING}'
 STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS              :{WHITE}{BIGFONT}{PRESIDENTNAME} της εταιρείας {COMPANY} έφτασε στο επίπεδο '{STRING}'!
-STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Πρόγραμμα Επεξεργασίας Σεναρίου
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Δημιουργία Γης
-STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
-STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Αύξηση περιοχής για χαμήλωμα/ανύψωση γης
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Μείωση περιοχής για χαμήλωμα/ανύψωση γης
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Δημιουργία τυχαίου εδάφους
@@ -668,9 +670,7 @@ STR_OFF                                                         :Κλειστό
 STR_SUMMARY                                                     :Περιγραφή
 STR_FULL                                                        :Ολόκληρο
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Επιλογές παιχνιδιού
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Ρυθμίσεις δυσκολίας
@@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Χρηματο�
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Χρηματοδότηση νέας βιομηχανίας
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...μπορεί να χτιστεί μόνο σε δασώδεις περιοχές
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...μπορεί να χτιστεί μόνο σε ερημικές περιοχές
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  ΠΑΥΣΗ  *  *
@@ -778,9 +775,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ΑΠ
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Η αποθήκευση είναι σε εξέλιξη,{}παρακαλώ περιμένετε να τελειώσει!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Επιλογή προγράμματος 'Ezy Street στυλ μουσικής'
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Αγγλικά (Αυθεντικά)
 STR_TOWNNAME_FRENCH                                             :Γαλλικά
@@ -860,19 +854,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Επιπ
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}Το αυτόματο σώσιμο απέτυχε
 
-STR_MONTH_JAN                                                   :Ιανουάριος
-STR_MONTH_FEB                                                   :Φεβρουάριος
-STR_MONTH_MAR                                                   :Μάρτιος
-STR_MONTH_APR                                                   :Απρίλιος
-STR_MONTH_MAY                                                   :Μάιος
-STR_MONTH_JUN                                                   :Ιούνιος
-STR_MONTH_JUL                                                   :Ιούλιος
-STR_MONTH_AUG                                                   :Άυγουστος
-STR_MONTH_SEP                                                   :Σεπτέμβριος
-STR_MONTH_OCT                                                   :Οκτόβριος
-STR_MONTH_NOV                                                   :Νοέμβριος
-STR_MONTH_DEC                                                   :Δεκέμβριος
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Πάει προς {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Πάει προς {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Δεν έχει οδηγίες
@@ -887,8 +868,6 @@ STR_CRATES                                                      :Κουτιά
 STR_RES_OTHER                                                   :άλλα
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Αδύνατο να μοιραστεί η λίστα εντολών...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Αδύνατο να αντιγραφεί η λίστα εντολών...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Τέλος Μοιρασμένων Οδηγιών - -
@@ -1145,7 +1124,6 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-μέ�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :απενεργοποιημένο
-STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Αλλαγή τιμής ρύθμισης
 
 STR_TEMPERATE_LANDSCAPE                                         :Συγκρατημένο τοπίο
@@ -1181,7 +1159,6 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Επιλ
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Διαμόρφωση ονόματος σημείου πορείας
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Αδύνατο να αλλαχτεί το όνομα του σημείου πορείας...
@@ -1243,11 +1220,6 @@ STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Ονόμ
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...πολύ κοντά σε άλλη βιομηχανία
 
-STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Αναπροσαρμογή τρένου για μεταφορά διαφορετικού φορτίου
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Αναπροσαρμογή τρένου
-STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Επιλογή τύπου φορτίου για να μεταφέρει το τρένο
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Διασκευή του τρένου ώστε να μεταφέρει το επιλεγμένο φορτίο
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Δεν γίνεται να αναπροσαρμοστεί το τρένο...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Αλλαγή παραγωγής
 
 ############ network gui strings
@@ -1610,7 +1582,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Σκηνές ι
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Σπίτι-Καφετιέρα
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Τράπεζα-κουμπαράς
 
-
 ##id 0x2800
 STR_LANDSCAPING_MENU_PLANT_TREES                                :Φύτευση δέντρων
 STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Τοποθέτηση σηματοδότη
@@ -1663,6 +1634,8 @@ STR_CARGO_RATING_EXCELLENT                                      :Εξαιρετ�
 STR_CARGO_RATING_OUTSTANDING                                    :Καταπληκτική
 ############ range for rating ends
 
+### station view strings
+
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}Ο σταθμός {STATION} δεν δέχεται πια {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}Ο σταθμός {STATION} δεν δέχεται πια {STRING} ούτε {STRING}
@@ -1854,6 +1827,7 @@ STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...εί�
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 STR_SV_STNAME_UPPER                                             :Άνω {STRING}
 STR_SV_STNAME_LOWER                                             :Κάτω {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Ελικοδρόμιο
@@ -1897,8 +1871,6 @@ STR_NUM_LOW                                                     :Χαμηλό
 STR_NUM_NORMAL                                                  :Κανονικό
 STR_NUM_HIGH                                                    :Υψηλό
 STR_NUM_CUSTOM                                                  :Προσαρμοσμέν{G ος η ο}
-STR_BLACK_SMALL_ARROW_LEFT                                      :{BLACK}{SMALLLEFTARROW}
-STR_BLACK_SMALL_ARROW_RIGHT                                     :{BLACK}{SMALLRIGHTARROW}
 STR_AI_SPEED_VERY_SLOW                                          :Πολύ αργό
 STR_AI_SPEED_SLOW                                               :Αργό
 STR_AI_SPEED_MEDIUM                                             :Μέτριο
@@ -1931,7 +1903,6 @@ STR_CITY_APPROVAL_HOSTILE                                       :Εχθρικό
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_FORMAT_COMPANY_NUM                                          :(Εταιρία {COMMA})
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Νέο Πρόσωπο
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Χρωματισμός
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Χρωματισμός:
@@ -1964,7 +1935,6 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Σύνο
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Γράφημα Εισοδήματος
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
-STR_JUST_COMMA                                                  :{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Γράφημα Ενεργών Εσόδων
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Ισολογισμός Τραπέζης
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Δάνειο
@@ -2166,8 +2136,6 @@ STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_WIZZOWOW_Z99             :Wizzowow Z99
 
 
 
-
-
 STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}το όχημα δε μπορεί να πάει σε όλους τους σταθμούς
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}Το όχημα δεν μπορεί να πάει σε αυτό τον σταθμό
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}όχημα που μοιράζεται αυτή την εντολή δεν μπορεί να πάει σε αυτό τον σταθμό
@@ -2236,6 +2204,53 @@ STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Θέστ
 STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Λίρες (£) στο νόμισμά σας
 
 
+############ Vehicle lists
+
+
+
+
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Αναπροσαρμογή τρένου
+
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Διασκευή του τρένου ώστε να μεταφέρει το επιλεγμένο φορτίο
+
+STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Επιλογή τύπου φορτίου για να μεταφέρει το τρένο
+
+
+
+
+
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Δεν γίνεται να αναπροσαρμοστεί το τρένο...
+
+
+
+
+
+
+
+
+
+
+
+
+STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Αναπροσαρμογή τρένου για μεταφορά διαφορετικού φορτίου
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -2275,18 +2290,51 @@ STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Αερο
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
+STR_WAYPOINT_NAME                                               :{WAYPOINT}
+
+STR_JUST_CHECKMARK                                              :{CHECKMARK}
+STR_JUST_COMMA                                                  :{COMMA}
+STR_JUST_CURRENCY                                               :{CURRENCY}
+STR_JUST_INT                                                    :{NUM}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
 
 
+STR_FORMAT_COMPANY_NUM                                          :(Εταιρία {COMMA})
 
+STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
+STR_BLACK_STRING                                                :{BLACK}{STRING}
+
+STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
+STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
+STR_BLACK_SMALL_ARROW_LEFT                                      :{BLACK}{SMALLLEFTARROW}
+STR_BLACK_SMALL_ARROW_RIGHT                                     :{BLACK}{SMALLRIGHTARROW}
+
+STR_BLACK_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
+STR_BLACK_6                                                     :{BLACK}6
+STR_BLACK_7                                                     :{BLACK}7
 
 
 #### Improved sign GUI
diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt
index 3a2c09714..cc85c19dc 100644
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -81,8 +81,6 @@ STR_CARGO_SINGULAR_TOFFEE                                       :Karamelo
 STR_CARGO_SINGULAR_BATTERY                                      :Baterio
 STR_CARGO_SINGULAR_PLASTIC                                      :Plastiko
 STR_CARGO_SINGULAR_FIZZY_DRINK                                  :Gasoza Drinkajo
-STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
-STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SMALLMAP_CAPTION                                            :{WHITE}Mapo - {STRING}
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Ludo Selekti
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Sendajo
@@ -92,17 +90,11 @@ STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Ne povas
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versiono {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 La kruo OpenTTD
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Livas
 STR_YES                                                         :{BLACK}Yes
 STR_NO                                                          :{BLACK}Ne
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Kad tu esas certa ke tu volas livar OpenTTD ed rivenar a {STRING}?
-STR_BLACK_1                                                     :{BLACK}1
-STR_BLACK_2                                                     :{BLACK}2
-STR_BLACK_3                                                     :{BLACK}3
-STR_BLACK_4                                                     :{BLACK}4
-STR_BLACK_5                                                     :{BLACK}5
+
 STR_JUST_NOTHING                                                :Nulo
 STR_COLOUR_DARK_BLUE                                            :Obskur-blua
 STR_COLOUR_PALE_GREEN                                           :Pal-verda
@@ -121,8 +113,6 @@ STR_COLOUR_BROWN                                                :Bruna
 STR_COLOUR_GREY                                                 :Griza
 STR_COLOUR_WHITE                                                :Blanka
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Tro multa vehili en la ludo
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Loko
 STR_SMALLMAP_TYPE_CONTOURS                                      :Konturi
 STR_SMALLMAP_TYPE_VEHICLES                                      :Vehili
@@ -194,9 +184,10 @@ STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH                            :Livrita kargajo
 ############ range for menu ends
 
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
+
+
 
-############ range for months starts
-############ range for months ends
 
 STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Montrar transport-voyi ad la mapo
 STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Montrar vejetado ad la mapo
@@ -212,9 +203,13 @@ STR_VEHICLE_ROAD_VEHICLE                                        :Voy-vehili
 STR_VEHICLE_SHIP                                                :Bateli
 STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 ############ range for days ends
 
+############ range for months starts
+
+############ range for months ends
+
 
 
 
@@ -239,7 +234,6 @@ STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 
 
 
-
 ############ start of townname region
 ############ end of townname region
 
@@ -255,8 +249,6 @@ STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 
 
 
-
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -367,7 +359,6 @@ STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 
 ##id 0x2000
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -376,6 +367,8 @@ STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -401,6 +394,7 @@ STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Faro
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -446,8 +440,6 @@ STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vehili:
 
 
 
-
-
 ##id 0x9000
 
 
@@ -478,6 +470,48 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -516,20 +550,34 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
 
 
-##### Mass Order
 
 
+#### String control codes and their formatting
 
 
 
 
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
+
+
+STR_BLACK_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
+
+
 #### Improved sign GUI
 
 ########
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 5cf5e6195..9f7db3e88 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}ПЛ
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}ПП
 STR_ABBREV_NONE                                                 :{TINYFONT}НТ
 STR_ABBREV_ALL                                                  :{TINYFONT}Се`
-STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
-STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SMALLMAP_CAPTION                                            :{WHITE}Мапа - {STRING}
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Опции на Играта
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Порака
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Ориг
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD верзија {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD тимот
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Напушти
 STR_YES                                                         :{BLACK}Да
 STR_NO                                                          :{BLACK}Не
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Дали сте сигурни дека сакате да ја напуштите OpenTTD и да се вратите во {STRING}?
-STR_BLACK_1                                                     :{BLACK}1
-STR_BLACK_2                                                     :{BLACK}2
-STR_BLACK_3                                                     :{BLACK}3
-STR_BLACK_4                                                     :{BLACK}4
-STR_BLACK_5                                                     :{BLACK}5
+
 STR_JUST_NOTHING                                                :Ништо
 STR_COLOUR_DARK_BLUE                                            :Темоно Сина
 STR_COLOUR_PALE_GREEN                                           :Матно Зелена
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :Кафена
 STR_COLOUR_GREY                                                 :Сива
 STR_COLOUR_WHITE                                                :Бела
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Има премногу возила во играта
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Локација
 STR_SMALLMAP_TYPE_CONTOURS                                      :Контури
 STR_SMALLMAP_TYPE_VEHICLES                                      :Возила
@@ -320,12 +310,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}Избе
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Изберете критериум за сортирање
 STR_SORT_BY                                                     :{BLACK}Сортирање според
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Населеност
+STR_SORT_BY_NAME                                                :{BLACK}Име
+STR_SORT_BY_DATE                                                :{BLACK}Датум
 STR_SORT_BY_PRODUCTION                                          :Производство
 STR_SORT_BY_TYPE                                                :Тип
 STR_SORT_BY_TRANSPORTED                                         :Транспортирано
-STR_SORT_BY_NAME                                                :{BLACK}Име
-STR_SORT_BY_DATE                                                :{BLACK}Датум
 STR_SORT_BY_NUMBER                                              :Број
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Минатогодишен профит
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Годинашен профит
@@ -346,36 +337,24 @@ STR_SORT_BY_INTRO_DATE                                          :Датум на
 STR_SORT_BY_RUNNING_COST                                        :Потрошувачка
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Моќност/Потрошувачка
 STR_SORT_BY_CARGO_CAPACITY                                      :Капацитет за товар
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Не чека никаков товар
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Избери ги сите објекти
 STR_SELECT_ALL_TYPES                                            :{BLACK}Избери ги сите видови товар (including no waiting cargo)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Достапни Возови
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Достапни Возила
-STR_AVAILABLE_SHIPS                                             :{BLACK}Достапни Бродови
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Достапни Летала
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Преглед на листа на достапни мотори за овој вид на возило
 STR_MANAGE_LIST                                                 :{BLACK}Менаџирање на листа
 STR_MANAGE_LIST_TIP                                             :{BLACK}Испрати ги инструкциите на сите возила во листата
 STR_REPLACE_VEHICLES                                            :Замени ги возилата
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Достапни Возови
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Достапни Возила
+STR_AVAILABLE_SHIPS                                             :{BLACK}Достапни Бродови
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Достапни Летала
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Испрати во Гаража
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Испрати во Гаража
 STR_SEND_SHIP_TO_DEPOT                                          :Испрати во Гаража
 
-############ 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                                            :Дек
-############ range for months ends
-
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_GRAPH_Y_LABEL                                               :{TINYFONT}{STRING}-
@@ -402,8 +381,6 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Град
 STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS                     :{BLACK}Засадување на дрва, местење знаци итн.
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Информација за земјишна област
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Опции
-STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
-STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Не може да се смени интервалот за сервисирање...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Затвори го прозорецот
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Наслов на прозорец - влечи тука за да го поместиш прозорецот
@@ -439,7 +416,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ништо
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Име
 STR_VEHICLE_NAME_SMALL                                          :{BLACK}{TINYFONT}{VEHICLE}
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1-в
 STR_ORDINAL_NUMBER_2ND                                          :2-ор
 STR_ORDINAL_NUMBER_3RD                                          :3-ет
@@ -473,6 +450,22 @@ STR_ORDINAL_NUMBER_30TH                                         :30-ти
 STR_ORDINAL_NUMBER_31ST                                         :31-ви
 ############ 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                                            :Дек
+
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Прифатен товар: {LTBLUE}
@@ -550,12 +543,9 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL                           :Могул
 STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY           :Тајкун на векот
 STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS                           :{BLACK}{BIGFONT}{COMPANY} постигна статус на '{STRING}'!
 STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS              :{WHITE}{BIGFONT}{PRESIDENTNAME} од {COMPANY} постигна статус на'{STRING}'!
-STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Сценарио Едитор
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Генерирање на терен
-STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
-STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Зголеми површина на област за спуштање/подигање
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Намали површина на област за спуштање/подигање
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Генерирај случаен терен
@@ -601,7 +591,6 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :Секој ме
 
 
 
-
 ############ start of townname region
 ############ end of townname region
 
@@ -615,12 +604,10 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :Секој ме
 STR_AUTOSAVE_FAILED                                             :{WHITE}Автоматското снимање неуспешно
 
 
-
 STR_BAGS                                                        :вреќи
 
 
 
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -746,7 +733,6 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Изгр
 
 ##id 0x2000
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -755,6 +741,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Изгр
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -783,6 +771,7 @@ STR_BRIDGE_TUBULAR_SILICON                                      :Цилиндр�
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -811,9 +800,6 @@ STR_AIRCRAFT                                                    :{WHITE}{COMMA}
 
 
 
-STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Шински возила
-
-
 
 
 
@@ -821,65 +807,26 @@ STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Шинс
 
 ##id 0x9000
 STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Капацитет: {LTBLUE}
-STR_JUST_CARGO                                                  :{CARGO}
 
 
 
 ##id 0x9800
 
 STR_BUILD_AQUEDUCT                                              :{BLACK}Изгради водовод
-STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Пренамени брод
-STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Одбери тип на товар што ќе го носи бродот
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Пренамени го бродот за да носи од одбележаниот тип на товар
 STR_REFIT_TITLE                                                 :{GOLD}Одбери тип на товар за носење:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нов капацитет: {GOLD}{CARGO}{}{BLACK}Пренамената чини: {GOLD}{CURRENCY}
-STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Не може да се пренамени бродот...
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Аеродроми
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Не може да се изгради аеродром на оваа локација...
-STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Авионска гаража
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Нов авион
-STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Нов авион
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Направи авион
-STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Не може да се направи авионот...
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Авион
-STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Не може да се прати авионот во гаража...
-STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Авион на патот
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Не може да сопре/тргне авионот...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Авионот е во лет
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Авионот мора да се сопре во хангар
-STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Не може да се продаде авионот...
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Изградба на аеродром
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Изгради аеродром
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Авион - кликни на авионот за информации
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Авион - кликни на авионот за информации
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Направи нов авион
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Повлечи го авионот со глушецот овде за да го продадеш
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Позиционирај го хангарот на центар
-STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Листа за селекција од авиони - кликни на авионот за информации
-STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Направи авион од селектираниот тип
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Моментална активност на авионот - кликни овде за стоп/старт на авионот
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Прикажи ги наредбите на авионот
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Прикажи го авионот на средина
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Прати го авионот во хангар. CTRL+клик ќе го прати само на сервис
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Прикажи детали за авионот
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Име на авионот
-STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Не може да се именува авионот...
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Име на авионот
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BLACK}{BIGFONT}Градска прослава . . .{}Првиот авион пристигна на {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BLACK}{BIGFONT}Авионска несреќа!{}{COMMA} загинати во пожарот на {STATION}
 STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Преименувај
-STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Преименувај го типот на авиони
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Преименувај го типот на авиони
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Не може да се преименува типот на авиони...
-STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Пренамени авион за да може да пренесува друг вид на товар
-STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Пренамени авион
-STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Одбери тип на товар за авионот
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Пренамени го авионот за да носи од одбележаниот тип на товар
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Не може да се пренамени авионот...
 
 
 ##id 0xB000
@@ -913,9 +860,90 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Возо
 
 STR_BUS                                                         :{BLACK}{BUS}
 
+############ Vehicle lists
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Авион - кликни на авионот за информации
+
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Авион
+
+
+
+STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Пренамени брод
+STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Пренамени авион
+
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Пренамени го бродот за да носи од одбележаниот тип на товар
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Пренамени го авионот за да носи од одбележаниот тип на товар
+
+STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Одбери тип на товар што ќе го носи бродот
+STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Одбери тип на товар за авионот
+
+STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Авионска гаража
+
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Име на авионот
+
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Име на авионот
+
+STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Авион на патот
+
+STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Не може да се пренамени бродот...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Не може да се пренамени авионот...
+
+STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Не може да се именува авионот...
+
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Не може да сопре/тргне авионот...
+
+STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Не може да се прати авионот во гаража...
+
+STR_ERROR_CAN_T_BUILD_AIRCRAFT                                  :{WHITE}Не може да се направи авионот...
+
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Не може да се преименува типот на авиони...
+
+STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Не може да се продаде авионот...
+
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Моментална активност на авионот - кликни овде за стоп/старт на авионот
+
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Прикажи ги наредбите на авионот
+
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Прикажи го авионот на средина
+
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Прати го авионот во хангар. CTRL+клик ќе го прати само на сервис
+
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Прикажи детали за авионот
+
+STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Пренамени авион за да може да пренесува друг вид на товар
+
+
 
 
 
+
+
+
+STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION                             :{WHITE}Шински возила
+STR_BUILD_VEHICLE_AIRCRAFT_CAPTION                              :{WHITE}Нов авион
+
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_BUTTON                 :{BLACK}Направи авион
+
+STR_BUILD_VEHICLE_AIRCRAFT_LIST_TOOLTIP                         :{BLACK}Листа за селекција од авиони - кликни на авионот за информации
+
+STR_BUILD_VEHICLE_AIRCRAFT_BUILD_VEHICLE_TOOLTIP                :{BLACK}Направи авион од селектираниот тип
+
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_BUTTON                        :{BLACK}Преименувај
+
+STR_BUILD_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                       :{BLACK}Преименувај го типот на авиони
+
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Преименувај го типот на авиони
+
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Нов авион
+
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Авион - кликни на авионот за информации
+
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Направи нов авион
+
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Повлечи го авионот со глушецот овде за да го продадеш
+
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Позиционирај го хангарот на центар
+
+
 ### depot strings
 
 
@@ -952,18 +980,38 @@ STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Авио
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
 
+STR_JUST_CARGO                                                  :{CARGO}
+
+
+
+STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 
+STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
 
+STR_BLACK_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
 
 
 #### Improved sign GUI
diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt
index 939d2ddfb..1cc8e3aff 100644
--- a/src/lang/unfinished/malay.txt
+++ b/src/lang/unfinished/malay.txt
@@ -135,8 +135,6 @@ STR_ABBREV_WATER                                                :{TINYFONT}AR
 STR_ABBREV_RUBBER                                               :{TINYFONT}GT
 STR_ABBREV_SUGAR                                                :{TINYFONT}GU
 STR_ABBREV_TOYS                                                 :{TINYFONT}MA
-STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
-STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SMALLMAP_CAPTION                                            :{WHITE}MAP-{STRING}
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Pilihan Permainan
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Pesanan
@@ -148,17 +146,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Hakcipta
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD versi {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2008 The OpenTTD team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Keluar
 STR_YES                                                         :{BLACK}Ya
 STR_NO                                                          :{BLACK}Tidak
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Anda pasti mahu keluar dari OpenTTD dan kembali ke {STRING}?
-STR_BLACK_1                                                     :{BLACK}1
-STR_BLACK_2                                                     :{BLACK}2
-STR_BLACK_3                                                     :{BLACK}3
-STR_BLACK_4                                                     :{BLACK}4
-STR_BLACK_5                                                     :{BLACK}5
+
 STR_JUST_NOTHING                                                :Tiada
 STR_COLOUR_DARK_BLUE                                            :Biru Gelap
 STR_COLOUR_PALE_GREEN                                           :Hijau Pucat
@@ -177,8 +169,6 @@ STR_COLOUR_BROWN                                                :Perang
 STR_COLOUR_GREY                                                 :Kelabu
 STR_COLOUR_WHITE                                                :Putih
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Terlalu banyak kenderaan dalam permainan
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Lokasi
 STR_SMALLMAP_TYPE_CONTOURS                                      :Bentuk
 STR_SMALLMAP_TYPE_VEHICLES                                      :Kenderaan
@@ -300,12 +290,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Pilih kr
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}Pilih kriteria tapisan
 STR_SORT_BY                                                     :{BLACK}Menyusun mengikuti
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Bilangan Penduduk
+STR_SORT_BY_NAME                                                :{BLACK}Nama
+STR_SORT_BY_DATE                                                :{BLACK}Tarikh
 STR_SORT_BY_PRODUCTION                                          :Pengeluaran
 STR_SORT_BY_TYPE                                                :Jenis
 STR_SORT_BY_TRANSPORTED                                         :Telah dihantarkan
-STR_SORT_BY_NAME                                                :{BLACK}Nama
-STR_SORT_BY_DATE                                                :{BLACK}Tarikh
 STR_SORT_BY_NUMBER                                              :Nombor
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Keuntungan tahun lepas
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Keuntungan tahunan
@@ -322,36 +313,24 @@ STR_SORT_BY_COST                                                :Kos
 STR_SORT_BY_POWER                                               :Tenaga
 STR_SORT_BY_INTRO_DATE                                          :Tarikh Pengenalan
 STR_SORT_BY_CARGO_CAPACITY                                      :Kapasiti Kargo
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Tiada kargo menunggu
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Pilih semua kemudahan
 STR_SELECT_ALL_TYPES                                            :{BLACK}Pilih semua kargo (termasuk kargo tiada menunggu)
+STR_MANAGE_LIST                                                 :{BLACK}Kendali senarai
+STR_MANAGE_LIST_TIP                                             :{BLACK}Hantar arahan pada semua kenderaan didalam senarai
+STR_REPLACE_VEHICLES                                            :Tukar kenderaan
+STR_SEND_FOR_SERVICING                                          :Hantar untuk servis
+
 STR_AVAILABLE_TRAINS                                            :{BLACK}Keretapi sedia ada
 STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Kenderaan sedia ada
 STR_AVAILABLE_SHIPS                                             :{BLACK}Kapal sedia ada
 STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Kapal terbang sedia ada
-STR_MANAGE_LIST                                                 :{BLACK}Kendali senarai
-STR_MANAGE_LIST_TIP                                             :{BLACK}Hantar arahan pada semua kenderaan didalam senarai
-STR_REPLACE_VEHICLES                                            :Tukar kenderaan
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Hantar ke pangkalan
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Hantar ke pangkalan
 STR_SEND_SHIP_TO_DEPOT                                          :Hantar ke pangkalan
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Hantar ke bangsal Kapal Terbang
-STR_SEND_FOR_SERVICING                                          :Hantar untuk servis
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :Jan
-STR_MONTH_ABBREV_FEB                                            :Feb
-STR_MONTH_ABBREV_MAR                                            :Mac
-STR_MONTH_ABBREV_APR                                            :Apr
-STR_MONTH_ABBREV_MAY                                            :Mei
-STR_MONTH_ABBREV_JUN                                            :Jun
-STR_MONTH_ABBREV_JUL                                            :Jul
-STR_MONTH_ABBREV_AUG                                            :Ogos
-STR_MONTH_ABBREV_SEP                                            :Sep
-STR_MONTH_ABBREV_OCT                                            :Okt
-STR_MONTH_ABBREV_NOV                                            :Nov
-STR_MONTH_ABBREV_DEC                                            :Dis
-############ range for months ends
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -379,8 +358,6 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Bina lap
 STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS                     :{BLACK}Tumbuh pokok, letak papan tanda dll.
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Maklumat kawasan tanah
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Pilihan
-STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
-STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Tidak boleh tukar jarak waktu perkhidmatan...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Tutup window
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Tajuk tetingkap -  seret ini untuk pindahkan tetingkap
@@ -423,7 +400,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Tiada
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nama
 STR_VEHICLE_NAME_SMALL                                          :{BLACK}{TINYFONT}{VEHICLE}
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :Pertama
 STR_ORDINAL_NUMBER_2ND                                          :Kedua
 STR_ORDINAL_NUMBER_3RD                                          :Ketiga
@@ -457,6 +434,34 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :Jan
+STR_MONTH_ABBREV_FEB                                            :Feb
+STR_MONTH_ABBREV_MAR                                            :Mac
+STR_MONTH_ABBREV_APR                                            :Apr
+STR_MONTH_ABBREV_MAY                                            :Mei
+STR_MONTH_ABBREV_JUN                                            :Jun
+STR_MONTH_ABBREV_JUL                                            :Jul
+STR_MONTH_ABBREV_AUG                                            :Ogos
+STR_MONTH_ABBREV_SEP                                            :Sep
+STR_MONTH_ABBREV_OCT                                            :Okt
+STR_MONTH_ABBREV_NOV                                            :Nov
+STR_MONTH_ABBREV_DEC                                            :Dis
+
+STR_MONTH_JAN                                                   :Januari
+STR_MONTH_FEB                                                   :Februari
+STR_MONTH_MAR                                                   :Mac
+STR_MONTH_APR                                                   :April
+STR_MONTH_MAY                                                   :May
+STR_MONTH_JUN                                                   :Jun
+STR_MONTH_JUL                                                   :Julai
+STR_MONTH_AUG                                                   :Ogos
+STR_MONTH_SEP                                                   :September
+STR_MONTH_OCT                                                   :Oktober
+STR_MONTH_NOV                                                   :November
+STR_MONTH_DEC                                                   :Desember
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Kargo yang diterima: {LTBLUE}
@@ -539,12 +544,9 @@ STR_HIGHSCORE_NAME                                              :{BIGFONT}{PRESI
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS                           :{BLACK}{BIGFONT}{COMPANY} mencapai status '{STRING}'!
 STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS              :{WHITE}{BIGFONT}{PRESIDENTNAME} dari {COMPANY} mencapai status '{STRING}'!
-STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Penyunting Senario
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Pembentukan Tanah
-STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
-STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Meningkatan penyebaran kawasan tanah untuk dinaikkan/diturunkan
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Menurunkan penyebaran kawasan tanah untuk dinaikkan/diturunkan
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Hasilkan secara rawak
@@ -615,9 +617,7 @@ STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Tunjukka
 STR_OFF                                                         :Padam
 STR_FULL                                                        :Penuh
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
-STR_JUST_CHECKMARK                                              :{CHECKMARK}
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Pilihan permainan
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Tetapan kesukaran
@@ -694,9 +694,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY                             :Biaya industri
 ############ range ends here
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Biaya industri baru
-STR_JUST_STRING                                                 :{STRING}
-STR_JUST_RAW_STRING                                             :{STRING}
-STR_JUST_INT                                                    :{NUM}
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...hanya boleh dibina di kawasan hutan
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...hanya boleh dibina di kawasan gurun
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  DIHENTIKAN  *  *
@@ -706,9 +703,6 @@ STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Beli tan
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SIMPAN PERMAINAN  *  *
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Pilih program 'Muzik gaya Ezy Street'
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inggeris (Original)
 STR_TOWNNAME_FRENCH                                             :French
@@ -758,19 +752,6 @@ STR_OPTIONS_BASE_GRF_STATUS                                     :{RED}{10:NUM} f
 STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}Maklumat tambahan tentang set grafik asas ini
 
 
-STR_MONTH_JAN                                                   :Januari
-STR_MONTH_FEB                                                   :Februari
-STR_MONTH_MAR                                                   :Mac
-STR_MONTH_APR                                                   :April
-STR_MONTH_MAY                                                   :May
-STR_MONTH_JUN                                                   :Jun
-STR_MONTH_JUL                                                   :Julai
-STR_MONTH_AUG                                                   :Ogos
-STR_MONTH_SEP                                                   :September
-STR_MONTH_OCT                                                   :Oktober
-STR_MONTH_NOV                                                   :November
-STR_MONTH_DEC                                                   :Desember
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Menuju ke {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Menuju ke {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Tiada perintah
@@ -785,8 +766,6 @@ STR_CRATES                                                      :peti
 STR_RES_OTHER                                                   :lain
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 
 STR_TRAIN_IS_STUCK                                              :{WHITE}{VEHICLE} tidak boleh mencari arah jalan untuk teruskan jalan
 STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} telah hilang jalan.
@@ -1092,7 +1071,6 @@ STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHIT
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (sedang dibina)
 
-
 ##id 0x2800
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Pokok
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Tidak boleh menanam pokok di sini...
@@ -1117,6 +1095,8 @@ STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Terima
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} tidak lagi menerima {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} tidak lagi menerima {STRING} or {STRING}
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Terlalu rapat dengan perlabuhan lain
@@ -1172,6 +1152,7 @@ STR_SV_AIRCRAFT_NAME                                            :Pesawat Udara {
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Utara
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -1218,8 +1199,6 @@ STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_DIESEL             :Powernaut Diese
 
 
 
-
-
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Kenderaan ini sedang berjalan mengikuti jadual
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Kenderaan ini sedang berjalan {STRING} lewat
 STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Kenderaan ini sedang berjalan {STRING} awal
@@ -1236,8 +1215,6 @@ STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Jadual w
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bina Lapangan Terbang
 
-STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nama kapal terbang
-STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nama kapal terbang
 
 
 ##id 0xB000
@@ -1269,16 +1246,60 @@ STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Tetapkan
 STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}Mata wang anda berbanding 10000 Pound (£)
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nama kapal terbang
+
+STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nama kapal terbang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
-### depot strings
 
 
 
 
 
+
+
+
+
+
+
+### depot strings
+
+
+
+
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Menggantikan: {ORANGE}{SKIP}{SKIP}{STRING}
+
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Kenderaan tidak boleh didapati sekarang
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Kenderaan tidak boleh didapati sekarang
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Kapal tidak boleh didapati sekarang
@@ -1325,10 +1346,6 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Muatan:
 ############ Tooltip measurment
 
 
-############ Date formatting
-
-########
-
 
 
 
@@ -1338,6 +1355,37 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Muatan:
 
 STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Kumpulan - klik sebuah kumpulan untuk menaraikan semua kenderaan di dalam kumpulan
 
+#### String control codes and their formatting
+
+STR_JUST_CHECKMARK                                              :{CHECKMARK}
+STR_JUST_INT                                                    :{NUM}
+STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+
+
+
+STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
+STR_BLACK_STRING                                                :{BLACK}{STRING}
+
+STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
+STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
+
+STR_BLACK_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
+STR_BLACK_6                                                     :{BLACK}6
+STR_BLACK_7                                                     :{BLACK}7
 
 
 #### Improved sign GUI
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 08f164cb9..c3201172d 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}NO
 STR_ABBREV_ALL                                                  :{TINYFONT}همه
-STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
-STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SMALLMAP_CAPTION                                            :{WHITE}نقشه - {STRING}
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}تنظیمات بازی
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}پیام
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD version {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 The OpenTTD team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}خروج
 STR_YES                                                         :{BLACK}بله
 STR_NO                                                          :{BLACK}خیر
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}آیا می‌خواهید از بازی خارج شوید و برگردید به{STRING}?
-STR_BLACK_1                                                     :{BLACK}1
-STR_BLACK_2                                                     :{BLACK}2
-STR_BLACK_3                                                     :{BLACK}3
-STR_BLACK_4                                                     :{BLACK}4
-STR_BLACK_5                                                     :{BLACK}5
+
 STR_JUST_NOTHING                                                :هیچی
 STR_COLOUR_DARK_BLUE                                            :آبی تیره
 STR_COLOUR_PALE_GREEN                                           :سبز روشن
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :قهوه‌ای
 STR_COLOUR_GREY                                                 :خاکستری
 STR_COLOUR_WHITE                                                :سفید
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}ماشین‌های زیادی در بازی هستند
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}مختصات
 STR_SMALLMAP_TYPE_CONTOURS                                      :حد فاصل ها
 STR_SMALLMAP_TYPE_VEHICLES                                      :وسایل نقلیه
@@ -323,12 +313,13 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}انتخ
 STR_FILTER_CRITERIA_TIP                                         :{BLACK}انتخاب معیار پایش
 STR_SORT_BY                                                     :{BLACK}مرتب کردن بر اساس
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}جمعیت
+STR_SORT_BY_NAME                                                :{BLACK}نام
+STR_SORT_BY_DATE                                                :{BLACK}تاریخ
 STR_SORT_BY_PRODUCTION                                          :تولید
 STR_SORT_BY_TYPE                                                :نوع
 STR_SORT_BY_TRANSPORTED                                         :منتقل شده
-STR_SORT_BY_NAME                                                :{BLACK}نام
-STR_SORT_BY_DATE                                                :{BLACK}تاریخ
 STR_SORT_BY_NUMBER                                              :تعداد
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :سود در سال گذشته
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :سود در سال جاری
@@ -351,6 +342,7 @@ STR_SORT_BY_INTRO_DATE                                          :تاریخ اح
 STR_SORT_BY_RUNNING_COST                                        :هزینه کارکرد
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :توان/هزینه کارکرد
 STR_SORT_BY_CARGO_CAPACITY                                      :ظرفیت محموله
+
 STR_NO_WAITING_CARGO                                            :{BLACK}هیچ نوع محموله در انتظار نیست
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}انتخاب تمامی تسهیلات
 STR_SELECT_ALL_TYPES                                            :{BLACK}انتخاب همه ی انواع محموله ها (شامل محموله های در انتظار)
@@ -370,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :فرستادن
 STR_SEND_SHIP_TO_DEPOT                                          :فرستادن به مقر فنی
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :فرستادن به آشیانه
 
-############ 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                                            :دی
-############ range for months ends
-
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_GRAPH_Y_LABEL                                               :{TINYFONT}{STRING}-
@@ -411,8 +388,6 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}ساخت
 STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS                     :{BLACK}کاشتن درختان، قرار دادن علامت و غیره
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}توضیحات درباره ی زمین
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}تنضیمات
-STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
-STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}امکان تغییر فواصل زمانی سرویس وجود ندارد...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}بستن پنجره
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}تخریب ساختمان و ... در بخشی از زمین
@@ -442,7 +417,7 @@ STR_LAND_AREA_INFORMATION_OWNER_N_A                             :0
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}نام
 STR_VEHICLE_NAME_SMALL                                          :{BLACK}{TINYFONT}{VEHICLE}
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
 STR_ORDINAL_NUMBER_2ND                                          :2
 STR_ORDINAL_NUMBER_3RD                                          :3
@@ -476,6 +451,22 @@ STR_ORDINAL_NUMBER_30TH                                         :30
 STR_ORDINAL_NUMBER_31ST                                         :31
 ############ 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                                            :دی
+
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}محموله های دریافتی : {LTBLUE}
@@ -525,11 +516,8 @@ STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}توض�
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}از هدف قبلی بسیار دور است......
 STR_HIGHSCORE_POSITION                                          :{BLACK}{BIGFONT}{COMMA}.
 STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN                     :تاجر
-STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}طراحی اتوماتیک سرزمین
-STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
-STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}نقشه ی تصادفی بساز
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}تمام تغییرات را بر گردان
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}تمام تغییرات را بر گردان
@@ -576,7 +564,6 @@ STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}اند�
 STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK} اخرین پیغام یا گزارش را نشان بده
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_BLACK_STRING                                                :{BLACK}{STRING}
 
 ############ range for menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :تنظیمات بازی
@@ -650,8 +637,6 @@ STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}تصئی
 STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}خرید زمین برای استفاده های بعدی
 STR_STATUSBAR_AUTOSAVE                                          :{RED}ذخیره اتوماتیک
 
-STR_BLACK_6                                                     :{BLACK}6
-
 ############ start of townname region
 ############ end of townname region
 
@@ -668,8 +653,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK} اطل�
 
 
 
-
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -1718,6 +1701,27 @@ STR_FORMAT_COMPANY_NUM                                          :(شرکت {COMM
 STR_FORMAT_GROUP_NAME                                           :گروه {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 
+STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
+STR_BLACK_STRING                                                :{BLACK}{STRING}
+
+STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
+
+STR_BLACK_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
+STR_BLACK_6                                                     :{BLACK}6
+
 
 #### Improved sign GUI
 
diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt
index 48d2611d5..9d2aa4adf 100644
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
@@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}พ�
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}น้ำอัดลม
 STR_ABBREV_NONE                                                 :{TINYFONT}ว่าง
 STR_ABBREV_ALL                                                  :{TINYFONT}ทั้งหมด
-STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
-STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SMALLMAP_CAPTION                                            :{WHITE}แผนที่ - {STRING}
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}การตั้งค่าของเกม
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}ข้อความ
@@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}ลิ�
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD รุ่นที่ {REV}
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}ลิขสิทธิ์ OpenTTD {COPYRIGHT}2002-2008 ของ The OpenTTD team
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}ออกจากเกม
 STR_YES                                                         :{BLACK}ใช่
 STR_NO                                                          :{BLACK}ไม่
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}คุณแน่ใจว่าจะออกจากเกม OpenTTD แล้วกลับสู่ {STRING}?
-STR_BLACK_1                                                     :{BLACK}1
-STR_BLACK_2                                                     :{BLACK}2
-STR_BLACK_3                                                     :{BLACK}3
-STR_BLACK_4                                                     :{BLACK}4
-STR_BLACK_5                                                     :{BLACK}5
+
 STR_JUST_NOTHING                                                :ไม่มีอะไร
 STR_COLOUR_DARK_BLUE                                            :สีกรมท่า
 STR_COLOUR_PALE_GREEN                                           :สีเขียวอ่อน
@@ -196,8 +188,6 @@ STR_COLOUR_BROWN                                                :สีน้ำ
 STR_COLOUR_GREY                                                 :สีเทา
 STR_COLOUR_WHITE                                                :สีขาว
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}ขณะนี้มียานยนต์มากเกินไปแล้วในเกม
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}ที่ตั้ง
 STR_SMALLMAP_TYPE_CONTOURS                                      :โครงร่าง
 STR_SMALLMAP_TYPE_VEHICLES                                      :ยานยนต์
@@ -318,10 +308,11 @@ STR_ABANDON_GAME_QUERY                                          :{YELLOW}แน�
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}เลิกเล่น
 STR_SORT_BY                                                     :{BLACK}เรียงตาม
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}ประชากร
-STR_SORT_BY_TYPE                                                :ประเภท
 STR_SORT_BY_NAME                                                :{BLACK}ชื่อ
 STR_SORT_BY_DATE                                                :{BLACK}วันที่
+STR_SORT_BY_TYPE                                                :ประเภท
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :กำไรปีที่แล้ว
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :กำไรปีนี้
 STR_SORT_BY_AGE                                                 :อายุ
@@ -333,26 +324,14 @@ STR_SORT_BY_LIFE_TIME                                           :อายุก
 STR_SORT_BY_FACILITY                                            :ประเภทสถานี
 STR_SORT_BY_COST                                                :ราคา
 STR_SORT_BY_INTRO_DATE                                          :วันเปิดตัวจำหน่าย
+
+
+
 STR_SEND_TRAIN_TO_DEPOT                                         :ส่งเข้าอู่ซ่อมบำรุง
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :ส่งเข้าอู่ซ่อมรถ
 STR_SEND_SHIP_TO_DEPOT                                          :ส่งเข้าอู่ต่อเรือ
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :ส่งเข้าโรงเก็บเครื่องบิน
 
-############ 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                                            :ธ.ค.
-############ range for months ends
-
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_GRAPH_Y_LABEL                                               :{TINYFONT}{STRING}-
@@ -379,8 +358,6 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}สร�
 STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS                     :{BLACK}ปลูกต้นไม้ ปักป้าย ฯลฯ
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}ข้อมูลที่ดิน
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}ตั้งค่า
-STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
-STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}ไม่สามารถเปลี่ยนระยะเวลาการซ่อมบำรุงได้...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}ปิดหน้าต่าง
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}หัวของหน้าต่าง - คลิกค้างแล้วลากเพื่อเลื่อนหน้าต่าง
@@ -422,7 +399,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :ไม่มี
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}ชื่อ
 STR_VEHICLE_NAME_SMALL                                          :{BLACK}{TINYFONT}{VEHICLE}
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :อันดับที่ 1
 STR_ORDINAL_NUMBER_2ND                                          :อันดับที่ 2
 STR_ORDINAL_NUMBER_3RD                                          :อันดับที่ 3
@@ -456,6 +433,31 @@ STR_ORDINAL_NUMBER_30TH                                         :อันดั
 STR_ORDINAL_NUMBER_31ST                                         :อันดับที่ 31
 ############ 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_APR                                                   :เมษายน
+STR_MONTH_MAY                                                   :พฤษภาคม
+STR_MONTH_JUN                                                   :มิถุนายน
+STR_MONTH_JUL                                                   :กรกฎาคม
+STR_MONTH_AUG                                                   :สิงหาคม
+STR_MONTH_SEP                                                   :กันยายน
+STR_MONTH_OCT                                                   :ตุลาคม
+STR_MONTH_NOV                                                   :พฤศจิกายน
+STR_MONTH_DEC                                                   :ธันวาคม
+############ range for months ends
+
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}สินค้าที่รับ: {LTBLUE}
@@ -535,12 +537,9 @@ STR_HIGHSCORE_NAME                                              :{BIGFONT}{PRESI
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS                           :{BLACK}{BIGFONT}{COMPANY} ได้ก้าวไปสู่ขั้น '{STRING}'!
 STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS              :{WHITE}{BIGFONT}{PRESIDENTNAME} จาก {COMPANY} ได้ก้าวไปสู่ขั้น '{STRING}'!
-STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}โปรแกรมสร้างฉาก
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}สร้างแผ่นดิน
-STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
-STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}เพิ่มพื้นที่ในการปรับระดับแผ่นดิน
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}ลดพื้นที่ในการปรับระดับแผ่นดิน
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}สร้างแผ่นดินแบบสุ่ม
@@ -607,9 +606,6 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ก�
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}ขณะนี้กำลังบันทึก,{}โปรดรอจนกว่าจะเสร็จ!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}เลือกเพลงฟังรายการเพลง Ezy Street
 
-STR_BLACK_6                                                     :{BLACK}6
-STR_BLACK_7                                                     :{BLACK}7
-
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :อังกฤษ (ดั้งเดิม)
 STR_TOWNNAME_FRENCH                                             :ฝรั่งเศส
@@ -635,16 +631,6 @@ STR_TOWNNAME_ROMANIAN                                           :โรมาเ
 
 
 
-STR_MONTH_APR                                                   :เมษายน
-STR_MONTH_MAY                                                   :พฤษภาคม
-STR_MONTH_JUN                                                   :มิถุนายน
-STR_MONTH_JUL                                                   :กรกฎาคม
-STR_MONTH_AUG                                                   :สิงหาคม
-STR_MONTH_SEP                                                   :กันยายน
-STR_MONTH_OCT                                                   :ตุลาคม
-STR_MONTH_NOV                                                   :พฤศจิกายน
-STR_MONTH_DEC                                                   :ธันวาคม
-
 STR_HEADING_FOR_STATION                                         :{LTBLUE}มุ่งหน้าสู่ {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}มุ่งหน้าสู่ {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}ไม่มีสถานที่ที่ต้องไป
@@ -659,8 +645,6 @@ STR_CRATES                                                      :ลัง
 STR_RES_OTHER                                                   :อื่นๆ
 STR_NOTHING                                                     :
 
-STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}ไม่สามารถใช้รายการสถานที่ร่วมกันได้
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}ไม่สามารถคัดลอกรายการสถานที่ได้
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - สิ้นสุดรายการที่ใช้ร่วมกัน - -
@@ -805,7 +789,6 @@ STR_SUBSIDIES_CAPTION                                           :{WHITE}เง�
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}ให้เงินอุดหนุนสำหรับการบริการ:
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}การบริการได้เงินอุดหนุนเรียบร้อยแล้ว:
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -814,6 +797,8 @@ STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}กา�
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -838,6 +823,7 @@ STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}กา�
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -880,8 +866,6 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :รถหุ้
 
 
 
-
-
 ##id 0x9000
 
 
@@ -912,6 +896,48 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -950,19 +976,41 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
 
 
 
 
+STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
+STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
+
+STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
+STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
+
+STR_BLACK_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
+STR_BLACK_6                                                     :{BLACK}6
+STR_BLACK_7                                                     :{BLACK}7
+
 
 #### Improved sign GUI
 
diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt
index a58dd5368..f065eedee 100644
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -95,16 +95,10 @@ STR_QUANTITY_COAL                                               :{WEIGHT} کوی
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}یہ نہیں کر سکتا۔۔۔
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}یہ جگہ صاف نہیں کر سکتا۔۔۔
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}باہر نکلو
 STR_YES                                                         :{BLACK}ہاں
 STR_NO                                                          :{BLACK}نہیں
-STR_BLACK_1                                                     :{BLACK}۱
-STR_BLACK_2                                                     :{BLACK}۲
-STR_BLACK_3                                                     :{BLACK}۳
-STR_BLACK_4                                                     :{BLACK}۴
-STR_BLACK_5                                                     :{BLACK}۵
+
 STR_JUST_NOTHING                                                :کچھ نہیں
 STR_COLOUR_DARK_BLUE                                            :گہرا نیلا
 STR_COLOUR_PALE_GREEN                                           :ہلکا سبز
@@ -121,8 +115,6 @@ STR_COLOUR_BROWN                                                :بھورا
 STR_COLOUR_GREY                                                 :سلیٹی
 STR_COLOUR_WHITE                                                :سفید
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}کھیل میں بہت زیادہ سواریاں
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}جگہ
 STR_SMALLMAP_TYPE_VEHICLES                                      :سواریاں
 STR_SMALLMAP_TYPE_INDUSTRIES                                    :صنعتیں
@@ -172,27 +164,28 @@ STR_SORT_ORDER_TIP                                              :{BLACK} (ترت
 STR_SORT_CRITERIA_TIP                                           :{BLACK}ترتیب کا طریقہ منتخب کریں
 STR_SORT_BY                                                     :{BLACK}سے ترتیب دو
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}آبادی
+STR_SORT_BY_NAME                                                :{BLACK}نام
+STR_SORT_BY_DATE                                                :{BLACK}تاریخ
 STR_SORT_BY_PRODUCTION                                          :پیداوار
 STR_SORT_BY_TYPE                                                :طرز
 STR_SORT_BY_TRANSPORTED                                         :منتقل شدہ
-STR_SORT_BY_NAME                                                :{BLACK}نام
-STR_SORT_BY_DATE                                                :{BLACK}تاریخ
 STR_SORT_BY_NUMBER                                              :تعداد
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :پچھلے سال کا منافع
 STR_SORT_BY_CARGO_CAPACITY                                      :سامان کی گنجایش
+
 STR_NO_WAITING_CARGO                                            :{BLACK}کسی قسم کا کویی سامان انتظار نہیں کر رہا ہے
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}تمام سہولتوں کا انتخاب کرو
 STR_SELECT_ALL_TYPES                                            :{BLACK}تمام قسم کا سامان کا انتخاب کرو  (بشمول غیر منتظر سامان کے)
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}اس قسم کی گاڑیوں کےلیے دستیاب انجنوں کی فہرست دیکھو
+STR_MANAGE_LIST                                                 :{BLACK}فہرست کا انتظام کرو
+
 STR_AVAILABLE_TRAINS                                            :{BLACK}دستیاب ریل گاڑیاں
 STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}دستیاب گاڑیاں
 STR_AVAILABLE_SHIPS                                             :{BLACK}دستیاب کشتیاں
 STR_AVAILABLE_AIRCRAFT                                          :{BLACK}دستیاب ہوایی جہاز
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}اس قسم کی گاڑیوں کےلیے دستیاب انجنوں کی فہرست دیکھو
-STR_MANAGE_LIST                                                 :{BLACK}فہرست کا انتظام کرو
 
-############ range for months starts
-############ range for months ends
 
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES                    :{BLACK}کمپنی کی مالیاتی معلومات دکھاو
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL                     :{BLACK}کمپنی کی عام معلومات دکھاو
@@ -208,8 +201,6 @@ STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}بندر
 STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}ہوای اڈے بناو
 STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS                     :{BLACK}درخت اگاو، اشارے لگاو، وغیرہ
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}زمینی رقبہ کی معلومات
-STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
-STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}کھڑکی بند کرو
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}کھڑکی کا نام - کھڑکی کو ہلانے کیلیے اسے پکڑ کر ہلاو
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}زمین کے ایک مربے پر عمارتیں وغیرہ گراو
@@ -220,9 +211,13 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 ############ range for service numbers ends
 
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 ############ range for days ends
 
+############ range for months starts
+
+############ range for months ends
+
 
 
 
@@ -247,7 +242,6 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 
 
-
 ############ start of townname region
 ############ end of townname region
 
@@ -263,8 +257,6 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 
 
-
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -375,7 +367,6 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 ##id 0x2000
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -384,6 +375,8 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -408,6 +401,7 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -440,8 +434,6 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 
 
-
-
 ##id 0x9000
 
 
@@ -471,6 +463,48 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -509,19 +543,33 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
 
 
 
 
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+
+STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
+STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
+
+STR_BLACK_1                                                     :{BLACK}۱
+STR_BLACK_2                                                     :{BLACK}۲
+STR_BLACK_3                                                     :{BLACK}۳
+STR_BLACK_4                                                     :{BLACK}۴
+STR_BLACK_5                                                     :{BLACK}۵
+
 
 #### Improved sign GUI
 
diff --git a/src/lang/unfinished/vietnamese.txt b/src/lang/unfinished/vietnamese.txt
index a25ac9df8..908e58955 100644
--- a/src/lang/unfinished/vietnamese.txt
+++ b/src/lang/unfinished/vietnamese.txt
@@ -141,8 +141,6 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}Cd
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}Ug
 STR_ABBREV_NONE                                                 :{TINYFONT}K0
 STR_ABBREV_ALL                                                  :{TINYFONT}Tất
-STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
-STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SMALLMAP_CAPTION                                            :{WHITE}Bản đồ - {STRING}
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Tùy chọn Trò chơi
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Thông điệp
@@ -152,17 +150,11 @@ STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Không t
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Không thể dọn dẹp khu vực này....
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD phiên bản {REV}
 
-STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
-STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_QUIT_CAPTION                                                :{WHITE}Thoát
 STR_YES                                                         :{BLACK}Đồng ý
 STR_NO                                                          :{BLACK}Không đồng ý
 STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Bạn có chắc chắn muốn thoát khỏi OpenTTD và trở lại {STRING}?
-STR_BLACK_1                                                     :{BLACK}1
-STR_BLACK_2                                                     :{BLACK}2
-STR_BLACK_3                                                     :{BLACK}3
-STR_BLACK_4                                                     :{BLACK}4
-STR_BLACK_5                                                     :{BLACK}5
+
 STR_JUST_NOTHING                                                :Không màu
 STR_COLOUR_DARK_BLUE                                            :Xanh da trời đậm
 STR_COLOUR_PALE_GREEN                                           :Xanh lá cây nhạt
@@ -181,8 +173,6 @@ STR_COLOUR_BROWN                                                :Nâu
 STR_COLOUR_GREY                                                 :Xám
 STR_COLOUR_WHITE                                                :Trắng
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Quá nhiều phương tiện trong trò chơi
-STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_BUTTON_LOCATION                                             :{BLACK}Vị trí
 STR_SMALLMAP_TYPE_CONTOURS                                      :Địa hình
 STR_SMALLMAP_TYPE_VEHICLES                                      :Phương tiện
@@ -294,12 +284,13 @@ STR_SORT_ORDER_TIP                                              :{BLACK}Chọn t
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Chọn tiêu chí sắp xếp
 STR_SORT_BY                                                     :{BLACK}Sắp xếp bởi
 
+### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Dân số
+STR_SORT_BY_NAME                                                :{BLACK}Tên
+STR_SORT_BY_DATE                                                :{BLACK}Ngày tháng
 STR_SORT_BY_PRODUCTION                                          :Sản lượng
 STR_SORT_BY_TYPE                                                :Loại
 STR_SORT_BY_TRANSPORTED                                         :Dung lượng đã vận chuyển
-STR_SORT_BY_NAME                                                :{BLACK}Tên
-STR_SORT_BY_DATE                                                :{BLACK}Ngày tháng
 STR_SORT_BY_NUMBER                                              :Số
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Lợi nhuận năm trước
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Lợi nhuận năm nay
@@ -318,35 +309,23 @@ STR_SORT_BY_INTRO_DATE                                          :Ngày giới th
 STR_SORT_BY_RUNNING_COST                                        :Chi phí chạy
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Năng lượng/Chi phí chạy
 STR_SORT_BY_CARGO_CAPACITY                                      :Dung lượng toa xe
+
 STR_NO_WAITING_CARGO                                            :{BLACK}Không có bất kỳ loại toa xe nào đang chờ
 STR_SELECT_ALL_TYPES                                            :{BLACK}Chọn tất cả loại toa xe (including no waiting cargo)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Tàu sẵn có
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Xe sẵn có
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Máy bay sẵn có
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Xam danh sách các động cơ thiết kế cho loại toa xe này.
 STR_MANAGE_LIST                                                 :{BLACK}Quản lý danh sách
 STR_MANAGE_LIST_TIP                                             :{BLACK}Gửi chỉ dẫn tới toàn bộ phương tiện trong danh sách
 STR_REPLACE_VEHICLES                                            :Thay phương tiện
+STR_SEND_FOR_SERVICING                                          :Gửi tới dịch vụ sửa chữa
+
+STR_AVAILABLE_TRAINS                                            :{BLACK}Tàu sẵn có
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Xe sẵn có
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Máy bay sẵn có
+
 STR_SEND_TRAIN_TO_DEPOT                                         :Gửi về xưởng
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Gửi về xưởng
 STR_SEND_SHIP_TO_DEPOT                                          :Gửi về xưởng
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Gửi về Hangar
-STR_SEND_FOR_SERVICING                                          :Gửi tới dịch vụ sửa chữa
-
-############ range for months starts
-STR_MONTH_ABBREV_JAN                                            :T1
-STR_MONTH_ABBREV_FEB                                            :T2
-STR_MONTH_ABBREV_MAR                                            :T3
-STR_MONTH_ABBREV_APR                                            :T4
-STR_MONTH_ABBREV_MAY                                            :T5
-STR_MONTH_ABBREV_JUN                                            :T6
-STR_MONTH_ABBREV_JUL                                            :T7
-STR_MONTH_ABBREV_AUG                                            :T8
-STR_MONTH_ABBREV_SEP                                            :T9
-STR_MONTH_ABBREV_OCT                                            :T10
-STR_MONTH_ABBREV_NOV                                            :T11
-STR_MONTH_ABBREV_DEC                                            :T12
-############ range for months ends
 
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Tạm dừng trò chơi
 STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Lưu, thoat trò chơi, thoát
@@ -369,9 +348,37 @@ STR_VEHICLE_IS_GETTING_VERY_OLD                                 :{WHITE}{VEHICLE
 STR_VEHICLE_IS_GETTING_VERY_OLD_AND                             :{WHITE}{VEHICLE} đang xuống cấp trầm trọng và cần được thay thế ngay lập tức
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Tên
 
-############ range for days starts
+############ range for days starts (also used for the place in the highscore window)
 ############ range for days ends
 
+############ range for months starts
+STR_MONTH_ABBREV_JAN                                            :T1
+STR_MONTH_ABBREV_FEB                                            :T2
+STR_MONTH_ABBREV_MAR                                            :T3
+STR_MONTH_ABBREV_APR                                            :T4
+STR_MONTH_ABBREV_MAY                                            :T5
+STR_MONTH_ABBREV_JUN                                            :T6
+STR_MONTH_ABBREV_JUL                                            :T7
+STR_MONTH_ABBREV_AUG                                            :T8
+STR_MONTH_ABBREV_SEP                                            :T9
+STR_MONTH_ABBREV_OCT                                            :T10
+STR_MONTH_ABBREV_NOV                                            :T11
+STR_MONTH_ABBREV_DEC                                            :T12
+
+STR_MONTH_JAN                                                   :Tháng Một
+STR_MONTH_FEB                                                   :Tháng Hai
+STR_MONTH_MAR                                                   :Tháng Ba
+STR_MONTH_APR                                                   :Tháng Tư
+STR_MONTH_MAY                                                   :Tháng Năm
+STR_MONTH_JUN                                                   :Tháng Sáu
+STR_MONTH_JUL                                                   :Tháng Bảy
+STR_MONTH_AUG                                                   :Tháng Tám
+STR_MONTH_SEP                                                   :Tháng Chín
+STR_MONTH_OCT                                                   :Tháng Mười
+STR_MONTH_NOV                                                   :Tháng Mười Một
+STR_MONTH_DEC                                                   :Tháng Mười Hai
+############ range for months ends
+
 
 
 STR_TOOLBAR_SOUND_MUSIC                                         :Âm thanh/aamm nhạc
@@ -427,8 +434,6 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}...chỉ
 ############ range for menu starts
 ############ range ends here
 
-STR_JUST_RAW_STRING                                             :{STRING}
-
 
 
 
@@ -453,19 +458,6 @@ STR_OPTIONS_FULLSCREEN                                          :{BLACK}Toàn m�
 
 
 
-STR_MONTH_JAN                                                   :Tháng Một
-STR_MONTH_FEB                                                   :Tháng Hai
-STR_MONTH_MAR                                                   :Tháng Ba
-STR_MONTH_APR                                                   :Tháng Tư
-STR_MONTH_MAY                                                   :Tháng Năm
-STR_MONTH_JUN                                                   :Tháng Sáu
-STR_MONTH_JUL                                                   :Tháng Bảy
-STR_MONTH_AUG                                                   :Tháng Tám
-STR_MONTH_SEP                                                   :Tháng Chín
-STR_MONTH_OCT                                                   :Tháng Mười
-STR_MONTH_NOV                                                   :Tháng Mười Một
-STR_MONTH_DEC                                                   :Tháng Mười Hai
-
 
 STR_PASSENGERS                                                  :hành khách
 STR_BAGS                                                        :túi
@@ -477,7 +469,6 @@ STR_RES_OTHER                                                   :khác
 
 
 
-
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -588,7 +579,6 @@ STR_RES_OTHER                                                   :khác
 
 ##id 0x2000
 
-
 ##id 0x2800
 
 ##id 0x3000
@@ -597,6 +587,8 @@ STR_RES_OTHER                                                   :khác
 ############ range for rating starts
 ############ range for rating ends
 
+### station view strings
+
 
 
 ##id 0x3800
@@ -660,6 +652,7 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL                   :{BLACK}{BIGFONT
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 
+##id 0x6020
 
 ############ end of savegame specific region!
 
@@ -692,8 +685,6 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL                   :{BLACK}{BIGFONT
 
 
 
-
-
 ##id 0x9000
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Không thể làm xe quay lại được...
@@ -724,6 +715,48 @@ STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Không t
 
 
 
+############ Vehicle lists
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -762,18 +795,33 @@ STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Không t
 ############ Tooltip measurment
 
 
-############ Date formatting
 
-########
 
 
+##### Mass Order
+
 
 
-##### Mass Order
 
+#### String control codes and their formatting
+
+STR_JUST_RAW_STRING                                             :{STRING}
 
 
 
+STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
+STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
+STR_SILVER_CROSS                                                :{SILVER}{CROSS}
+STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
+STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
+
+
+STR_BLACK_1                                                     :{BLACK}1
+STR_BLACK_2                                                     :{BLACK}2
+STR_BLACK_3                                                     :{BLACK}3
+STR_BLACK_4                                                     :{BLACK}4
+STR_BLACK_5                                                     :{BLACK}5
 
 
 #### Improved sign GUI