(svn r11995) -Cleanup (r11994): Change the string names in all the other languages.
authormaedhros
Sun, 27 Jan 2008 17:34:08 +0000
changeset 8425 47ce64e9ad50
parent 8424 c3477565c975
child 8426 dcc4a852de3c
(svn r11995) -Cleanup (r11994): Change the string names in all the other languages.
src/lang/afrikaans.txt
src/lang/brazilian_portuguese.txt
src/lang/bulgarian.txt
src/lang/catalan.txt
src/lang/croatian.txt
src/lang/czech.txt
src/lang/danish.txt
src/lang/dutch.txt
src/lang/english_US.txt
src/lang/esperanto.txt
src/lang/estonian.txt
src/lang/finnish.txt
src/lang/french.txt
src/lang/galician.txt
src/lang/german.txt
src/lang/hungarian.txt
src/lang/icelandic.txt
src/lang/italian.txt
src/lang/japanese.txt
src/lang/korean.txt
src/lang/lithuanian.txt
src/lang/norwegian_bokmal.txt
src/lang/norwegian_nynorsk.txt
src/lang/piglatin.txt
src/lang/polish.txt
src/lang/portuguese.txt
src/lang/romanian.txt
src/lang/russian.txt
src/lang/simplified_chinese.txt
src/lang/slovak.txt
src/lang/slovenian.txt
src/lang/spanish.txt
src/lang/swedish.txt
src/lang/traditional_chinese.txt
src/lang/turkish.txt
src/lang/ukrainian.txt
src/lang/unfinished/frisian.txt
src/lang/unfinished/greek.txt
src/lang/unfinished/latvian.txt
--- a/src/lang/afrikaans.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/afrikaans.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Te veel name bepaal
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Gekies naam alreeds in gebruik
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Vrag
 STR_013D_INFORMATION                                            :{BLACK}Inligting
 STR_013E_CAPACITIES                                             :{BLACK}Kapasiteite
-STR_013E_TOTAL_CARGO                                            :{BLACK}Totaale Vrag
+STR_TOTAL_CARGO                                                 :{BLACK}Totaale Vrag
 STR_013F_CAPACITY                                               :{BLACK}Kapasiteit: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapasiteit: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Totaale vrag kapasitiet van die trein:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Totaale vrag kapasitiet van die trein:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nuwe Speletjie
 STR_0141_LOAD_GAME                                              :{BLACK}Laai Speletjie
@@ -725,7 +725,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Uitvee hierdie dorp heeltemal
 STR_0292_SAVE_SCENARIO                                          :Spaar draaiboek
 STR_0293_LOAD_SCENARIO                                          :Laai draaiboek
-STR_LOAD_HEIGHTMAP                                              :Laai Hoogtekaart
+STR_MENU_LOAD_HEIGHTMAP                                         :Laai Hoogtekaart
 STR_0294_QUIT_EDITOR                                            :Laat vaar redigeerder
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Laat vaar
@@ -765,9 +765,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Speletjie opsies
-STR_02C5_DIFFICULTY_SETTINGS                                    :Moeite stellings
-STR_02C7_CONFIG_PATCHES                                         :Konfigureer laslappe
+STR_02C4_GAME_OPTIONS                                           :Speletjie opsies
+STR_02C6_DIFFICULTY_SETTINGS                                    :Moeite stellings
+STR_MENU_CONFIG_PATCHES                                         :Konfigureer laslappe
 STR_NEWGRF_SETTINGS                                             :NewGRF stellings
 STR_TRANSPARENCY_OPTIONS                                        :Deursigtigheid opsies
 STR_GAMEOPTMENU_0A                                              :
@@ -867,8 +867,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Spaar nog in vorder, {}wag asb tot dit klaar is!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Kies 'Ezy Straat styl musiek' musiek lys
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engels (Oorspronkilik)
@@ -1641,41 +1641,41 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Moet pad eers verwyder
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Pad werke in vorder
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Pad Konstruksie
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Tremweg Konstruksie
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Tremweg Konstruksie
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Kies Pad Brug
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... een rigting paaie kan nie aansluitings hê nie
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kan nie pad hier bou nie...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Kan nie tremweg hier bou nie...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Kan nie tremweg hier bou nie...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Kan nie pad van hier verwyder nie...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Kan nie tremweg van hier af verwyder nie...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Kan nie tremweg van hier af verwyder nie...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Pad Depot Ori�tering
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Trem Depot Orientasie
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Trem Depot Orientasie
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan nie pad voertuig depot hier bou nie...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Kan nie trem voertuig depot hier bou nie...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Kan nie trem voertuig depot hier bou nie...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Kan nie bus stasie hier bou nie...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kan nie vragmotor stasie bou nie...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Kan nie passasier trem stasie bou nie...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Kan nie vrag trem stasie bou nie...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Kan nie passasier trem stasie bou nie...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Kan nie vrag trem stasie bou nie...
 STR_180A_ROAD_CONSTRUCTION                                      :Pad konstruksie
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Tremweg konstruksie
+STR_TRAMWAY_CONSTRUCTION                                        :Tremweg konstruksie
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Bou pad afdeling
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Bou pad seksie gebruikend Outopad metode
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Bou tremweg afdeling
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Bou tremweg afdeling
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Bou tremweg gebruikend die Outotrem metode
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bou pad voertuig depot (vir bou en diens van voertuie)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Bou trem voertuig depot (vir bou en diens van voertuie)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Bou trem voertuig depot (vir bou en diens van voertuie)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Bou bus stasie
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bou vraagmotor laai area
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Bou passasier trem stasie
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Bou vrag trem stasie
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Bou passasier trem stasie
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Bou vrag trem stasie
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bou pad brug
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Bou tremweg brug
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Bou tremweg brug
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Bou pad tonnel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Bou tremweg tonnel
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Bou tremweg tonnel
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Tokkel bou/verwyder vir pad bou
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Tokkel bou/verwyder vir tremweg konstruksie
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Tokkel bou/verwyder vir tremweg konstruksie
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Kies pad voertuig depot orientasie
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Kies trem voertuig depot orientasie
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Kies trem voertuig depot orientasie
 STR_1814_ROAD                                                   :Pad
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Pad met straatligte
 STR_1816_TREE_LINED_ROAD                                        :Boom-belynde pad
@@ -1817,8 +1817,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Grens aan meer as een bestaande stasie/laai area
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Te veel stasies/laai areas in die stad
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Te veel stasies/laai areas
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Te veel bushalte
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Te veel vragmotor stasies
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Te veel bushalte
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Te veel vragmotor stasies
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Te naby aan 'n ander stasie/laai area
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Moet eers spoorweg stasie afbreek
@@ -1849,12 +1849,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} aanvaar nou {STRING} en {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Bus Stasie Orientasie
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Vragmotor Stasie Orientasie
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Passasier Trem Orientasie
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Vrag Trem Orientasie
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Passasier Trem Orientasie
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Vrag Trem Orientasie
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Moet eers bus stasie afbreek
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Moet eers vragmotor stasie afbreek
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Moet eers passasier trem stasie afbreek
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Moet eers vrag trem stasie afbreek
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Moet eers passasier trem stasie afbreek
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Moet eers vrag trem stasie afbreek
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stasie{P "" s}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Geen -
@@ -1866,8 +1866,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Kies lengte van spoorweg stasie
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Kies bus stasie orientasie
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Kies vragmotor laai area orientasie
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Kies passasier trem stasie orientasie
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Kies vrag trem stasie orientasie
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Kies passasier trem stasie orientasie
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Kies vrag trem stasie orientasie
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Senter skerm op stasie
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Toon stasie graderings
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Verander naam van stasie
@@ -1889,7 +1889,7 @@
 STR_3069_BUOY                                                   :Baken
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...baken in die pad
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...Stasie te ver van mekaar af
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ongelyk stasies is versper
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ongelyk stasies is versper
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hou in CTRL om meer as een item te selekteer
 
 STR_UNDEFINED                                                   :(undefined string)
@@ -1930,7 +1930,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Kies Nuwe Speletjie Tipe
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Kies draaiboek (groen), vooraf-stel speletjie (blou), of lukraak nuwe speletjie
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Opwek lukraak nuwe speletjie
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Laai Hoogtekaart
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Laai Hoogtekaart
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} in die pad
@@ -2134,10 +2134,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomie: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Trein omkeer: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Rampe: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Stad raad se houding na area herstruktuuring: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Stad raad se houding na area herstruktuuring: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Geen
+STR_NONE                                                        :Geen
 STR_NUM_VERY_LOW                                                :Baie laag
 STR_6816_LOW                                                    :Laag
 STR_6817_NORMAL                                                 :Normaal
@@ -2175,9 +2175,9 @@
 STR_6836_OFF                                                    :Af
 STR_6837_ON                                                     :Aan
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Wys ho�telling tabel
-STR_6839_PERMISSIVE                                             :Permissief
-STR_683A_TOLERANT                                               :Toelaatbaar
-STR_683B_HOSTILE                                                :Vyandelik
+STR_PERMISSIVE                                                  :Permissief
+STR_TOLERANT                                                    :Toelaatbaar
+STR_HOSTILE                                                     :Vyandelik
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2309,7 +2309,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan nie 25% aandeel in die maatskappy verkoop nie...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% besit by {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} is deur {COMPANY} oorgevat!
-STR_7080_PROTECTED                                              :{WHITE}Die maatskappy is nie oud genoeg om aandeele te handel nie...
+STR_PROTECTED                                                   :{WHITE}Die maatskappy is nie oud genoeg om aandeele te handel nie...
 
 STR_LIVERY_DEFAULT                                              :Standaard Lewery
 STR_LIVERY_STEAM                                                :Stoom Enjin
@@ -2616,17 +2616,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Gaan na {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Gaan na {STATION} (Oordrag en vat vrag)
-STR_8808_GO_TO_UNLOAD                                           :Gaan na {STATION} (Aflaai)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Gaan na {STATION} (Oordrag en verlaat leeg)
-STR_880A_GO_TO_LOAD                                             :Gaan na {STATION} (Laai)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Gaan na {STATION} (Oordrag en wag vir volle lading)
-STR_880C_GO_NON_STOP_TO                                         :Gaan deurgaande na {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Gaan deurgaande na {STATION} (Oordra en neem vrag)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Gaan deurgaande na {STATION} (Aflaai)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Gaan deurgaande na {STATION} (Oordra en verlaat leë)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Gaan deurgaande na {STATION} (Laai)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Gaan deurgaande na {STATION} (Oordra en wag vir volle lading)
+STR_GO_TO_TRANSFER                                              :Gaan na {STATION} (Oordrag en vat vrag)
+STR_8807_GO_TO_UNLOAD                                           :Gaan na {STATION} (Aflaai)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Gaan na {STATION} (Oordrag en verlaat leeg)
+STR_8808_GO_TO_LOAD                                             :Gaan na {STATION} (Laai)
+STR_GO_TO_TRANSFER_LOAD                                         :Gaan na {STATION} (Oordrag en wag vir volle lading)
+STR_880A_GO_NON_STOP_TO                                         :Gaan deurgaande na {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Gaan deurgaande na {STATION} (Oordra en neem vrag)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Gaan deurgaande na {STATION} (Aflaai)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Gaan deurgaande na {STATION} (Oordra en verlaat leë)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Gaan deurgaande na {STATION} (Laai)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Gaan deurgaande na {STATION} (Oordra en wag vir volle lading)
 STR_GO_TO_TRAIN_DEPOT                                           :Gaan na {TOWN} Trein Depot
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Diens by {TOWN} Trein Depot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Gaan deurgaande na {TOWN} Trein Depot
@@ -2730,7 +2730,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Toon besonderhede van vrag gedra
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Toon besonderhede van trein voertuie
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Toon kapasiteite van elke voertuig
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Toon totaale kapasitiet van trein, verdeel by vrag tipe
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Toon totaale kapasitiet van trein, verdeel by vrag tipe
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Opdraglys - kliek op 'n opdrag om dit te verlig. CTRL + kliek senter op stasie
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Sprong die huidige opdraag, en begin die volgende. CTRL + kliek sprong na verkieste opdrag
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Vee uit die verlig opdrag
@@ -2761,8 +2761,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan nie rigting van trein omkeer nie...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Hernoem trein voertuig tipe
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Trein voertuig tipe kan nie hernoem word nie...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Maak die verlig opdrag forseer die voertuig om sy vrag te stort
-STR_886F_TRANSFER                                               :{BLACK}Oordra
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Maak die verlig opdrag forseer die voertuig om sy vrag te stort
+STR_TRANSFER                                                    :{BLACK}Oordra
 STR_CLEAR_TIME                                                  :{BLACK}Reinig Tyd
 STR_RESET_LATENESS                                              :{BLACK}Herstel Laat Teller
 
@@ -2839,8 +2839,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Benaam pad voertuig
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste bus arriveer by {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste trok arriveer by {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste passasier trein arriveer by {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste vrag trein arriveer by {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste passasier trein arriveer by {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste vrag trein arriveer by {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Pad Voertuig Botsing!{}Bestuurder sterf in vuurbol na botsing met trein
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Pad voertuig Botsing!{}{COMMA} sterf in vuurbol na botsing met trein
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan nie voertuig forseer om te omdraai nie...
@@ -2849,7 +2849,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Hernoem pad voertuig tipe
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Hernoem pad voertuig tipe
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Pad voertuig tipe kan nie hernoem word nie...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Gaan na {TOWN} Pad Voertuig Depot
+STR_GO_TO_ROADVEH_DEPOT                                         :Gaan na {TOWN} Pad Voertuig Depot
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Diens by {TOWN} Pad Voertuig Depot
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Herpas pad voertuig om 'n ander vrag tipe te ontvoer
--- a/src/lang/brazilian_portuguese.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/brazilian_portuguese.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -274,9 +274,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Muitos nomes definidos
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}O nome escolhido já está em uso
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -287,11 +287,11 @@
 STR_013C_CARGO                                                  :{BLACK}Carga
 STR_013D_INFORMATION                                            :{BLACK}Informação
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
-STR_013E_TOTAL_CARGO                                            :{BLACK}Carga Total
+STR_TOTAL_CARGO                                                 :{BLACK}Carga Total
 STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacidade: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Capacidade total deste trem:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Capacidade total deste trem:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Novo Jogo
 STR_0141_LOAD_GAME                                              :{BLACK}Abrir Jogo
@@ -730,7 +730,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Remover esta cidade completamente
 STR_0292_SAVE_SCENARIO                                          :Salvar cenário
 STR_0293_LOAD_SCENARIO                                          :Abrir cenário
-STR_LOAD_HEIGHTMAP                                              :Carregar relevo
+STR_MENU_LOAD_HEIGHTMAP                                         :Carregar relevo
 STR_0294_QUIT_EDITOR                                            :Sair do editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Sair
@@ -770,9 +770,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Opções do Jogo
-STR_02C5_DIFFICULTY_SETTINGS                                    :Configurações de dificuldade
-STR_02C7_CONFIG_PATCHES                                         :Configurar correções
+STR_02C4_GAME_OPTIONS                                           :Opções do Jogo
+STR_02C6_DIFFICULTY_SETTINGS                                    :Configurações de dificuldade
+STR_MENU_CONFIG_PATCHES                                         :Configurar correções
 STR_NEWGRF_SETTINGS                                             :Configurar NewGRF
 STR_TRANSPARENCY_OPTIONS                                        :Opções de Transparência
 STR_GAMEOPTMENU_0A                                              :
@@ -872,8 +872,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Gravação em progresso,{}por favor aguarde até que termine!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Selecionar programa 'Ezy Street'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglês (Original)
@@ -1648,42 +1648,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Deve remover a rodovia primeiro
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Recapeamento rodoviário em progresso
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construir rodovias
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Construção de Bonde
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Construção de Bonde
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Selecionar Ponte Rodoviária
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... vias de mão única não podem ter junções
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Impossível construir rodovia aqui...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Impossível construir bonde aqui...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Impossível construir bonde aqui...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Impossível remover rodovia daqui...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Impossível remover bonde daqui...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Impossível remover bonde daqui...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientação da Garagem
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientação do Depósito
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientação do Depósito
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Impossível construir garagem aqui...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Impossível construir depósito aqui...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Impossível construir depósito aqui...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Impossível construir estação de ônibus...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Impossível construir estação de caminhão
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Impossível construir estação de bonde...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Impossível construir estação de bonde
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Impossível construir estação de bonde...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Impossível construir estação de bonde
 STR_180A_ROAD_CONSTRUCTION                                      :Construir rodovias
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Construção de Bonde
+STR_TRAMWAY_CONSTRUCTION                                        :Construção de Bonde
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Construir trecho rodoviário
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Construir estradas usando o modo Autoestrada
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Construir linha de bonde
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Construir linha de bonde
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Construir linha de bonde usando o modo Automático
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Construir garagem (para construção e manutenção de automóveis)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Construir depósito de bonde (para construção e manutenção de bondes)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Construir depósito de bonde (para construção e manutenção de bondes)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Construir estação de ônibus
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Construir carga de caminhões
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Constuir estação de bonde para passageiros
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Constuir estação de bonde para carga
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Constuir estação de bonde para passageiros
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Constuir estação de bonde para carga
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Construir ponte rodoviária
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Construir ponte de bonde
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Construir ponte de bonde
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Construir túnel rodoviário
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Construir túnel de bonde
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Construir túnel de bonde
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Ativar/Desativar vias de mão única
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Alternar construir/remover para contrução rodoviária
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Alternar construir/remover linhas de bonde e sinais
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Alternar construir/remover linhas de bonde e sinais
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Selecionar a orientação da garagem
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Selecionar a orientação do depósito de bonde
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Selecionar a orientação do depósito de bonde
 STR_1814_ROAD                                                   :Rodovia
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Rodovia iluminada
 STR_1816_TREE_LINED_ROAD                                        :Rodovia arborizada
@@ -1828,8 +1828,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Muito perto de uma estação/local de carga já existente
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Muitas estações/áreas de carga nesta cidade
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Muitas estações/áreas de carga
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Muitas estações de ônibus
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Muitos locais de carga
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Muitas estações de ônibus
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Muitos locais de carga
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Muito perto de outra estação/local de carga
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Deve demolir a estação primeiro
@@ -1860,12 +1860,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} agora aceita {STRING} e {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientação do estação de ônibus
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientação da estação de caminhão
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orientação da Estação de Bonde
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orientação da Estação de Bonde
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orientação da Estação de Bonde
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orientação da Estação de Bonde
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Deve demolir a estação de ônibus primeiro
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Deve demolir a estação de caminhão
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Deve demolir a estação de bonde primeiro
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Deve demolir a estação de bonde primeiro
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Deve demolir a estação de bonde primeiro
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Deve demolir a estação de bonde primeiro
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estações
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nenhuma -
@@ -1877,8 +1877,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Selecionar o tamanho da estação ferroviária
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Selecionar orientação do estação de ônibus
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Selecionar orientação da área de carga
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Selecionar orientação da estação de bonde
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Selecionar orientação da estação de bonde
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Selecionar orientação da estação de bonde
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Selecionar orientação da estação de bonde
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centralizar visualização no local estação
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Exibir avaliações da estação
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Alterar o nome da estação
@@ -1900,7 +1900,7 @@
 STR_3069_BUOY                                                   :Bóia
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...bóia no caminho
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...estação muito extensa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...Estações não-uniformes desativadas
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...Estações não-uniformes desativadas
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Segure CTRL para selecionar mais de um item
 
 STR_UNDEFINED                                                   :(undefined string)
@@ -1941,7 +1941,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Selecionar Novo Tipo de Jogo
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Selecionar cenário (verde), jogo pré-programado (azul), ou novo jogo aleatório
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Gerar novo jogo aleatório
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Carregar Relevo
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Carregar Relevo
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} no caminho
@@ -2145,10 +2145,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economia: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Inverter trem: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Atitude das autoridades sobre reestruturamentos: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Atitude das autoridades sobre reestruturamentos: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Nenhum
+STR_NONE                                                        :Nenhum
 STR_NUM_VERY_LOW                                                :Muito baixo
 STR_6816_LOW                                                    :Baixo
 STR_6817_NORMAL                                                 :Normal
@@ -2186,9 +2186,9 @@
 STR_6836_OFF                                                    :Off
 STR_6837_ON                                                     :On
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Exibir melhores pontuações
-STR_6839_PERMISSIVE                                             :Permissivo
-STR_683A_TOLERANT                                               :Tolerante
-STR_683B_HOSTILE                                                :Hostil
+STR_PERMISSIVE                                                  :Permissivo
+STR_TOLERANT                                                    :Tolerante
+STR_HOSTILE                                                     :Hostil
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2325,7 +2325,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Impossível vender 25% das ações desta empresa...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propriedade de {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} foi comprada por {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Esta empresa ainda não troca ações...
+STR_PROTECTED                                                   :{WHITE}Esta empresa ainda não troca ações...
 
 STR_LIVERY_DEFAULT                                              :Cores padrão
 STR_LIVERY_STEAM                                                :Máquina a Vapor
@@ -2634,17 +2634,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Ir para {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Ir para {STATION} (Transferir e carregar)
-STR_8808_GO_TO_UNLOAD                                           :Ir para {STATION} (Descarregar)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Ir para {STATION} (Transferir e deixar vazio)
-STR_880A_GO_TO_LOAD                                             :Ir para {STATION} (Carregar)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Ir para {STATION} (Trasferir e aguardar carga total)
-STR_880C_GO_NON_STOP_TO                                         :Ir sem parar para {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Ir sem parar para {STATION} (Transferir e carregar)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Ir sem parar para {STATION} (Descarregar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Ir sem parar para {STATION} (Transferir e deixar vazio)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Ir sem parar para {STATION} (Carregar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ir sem parar para {STATION} (Trasferir e aguardar carga total)
+STR_GO_TO_TRANSFER                                              :Ir para {STATION} (Transferir e carregar)
+STR_8807_GO_TO_UNLOAD                                           :Ir para {STATION} (Descarregar)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Ir para {STATION} (Transferir e deixar vazio)
+STR_8808_GO_TO_LOAD                                             :Ir para {STATION} (Carregar)
+STR_GO_TO_TRANSFER_LOAD                                         :Ir para {STATION} (Trasferir e aguardar carga total)
+STR_880A_GO_NON_STOP_TO                                         :Ir sem parar para {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Ir sem parar para {STATION} (Transferir e carregar)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Ir sem parar para {STATION} (Descarregar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Ir sem parar para {STATION} (Transferir e deixar vazio)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Ir sem parar para {STATION} (Carregar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Ir sem parar para {STATION} (Trasferir e aguardar carga total)
 STR_GO_TO_TRAIN_DEPOT                                           :Ir para o depósito de {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Manutenção no depósito de {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ir sem parar para o depósito de {TOWN}
@@ -2748,7 +2748,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Exibir detalhes da carga transportada
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Exibir detalhes dos veículos
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Exibir capacidades de cada veículo
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Exibir capacidade total do trem, dividir por tipo de carga
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Exibir capacidade total do trem, dividir por tipo de carga
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Lista de ordens - clique numa ordem para a selecionar
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Pula a ordem atual e executa a próxima. CTRL + clique pula a ordem selecionada
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Remover a ordem selecionada
@@ -2779,8 +2779,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Impossível inverter a direção do trem...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renomear tipo de veículo ferroviário
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Impossível renomear tipo de veículo ferroviário...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Força o veículo a deixar a carga na ordem selecionada
-STR_886F_TRANSFER                                               :{BLACK}Transferir
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Força o veículo a deixar a carga na ordem selecionada
+STR_TRANSFER                                                    :{BLACK}Transferir
 STR_CLEAR_TIME                                                  :{BLACK}Resetar horário
 STR_RESET_LATENESS                                              :{BLACK}Resetar contador de atraso
 
@@ -2858,8 +2858,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Renomear automóvel
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro ônibus chega a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro caminhão chega a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de passageiros chega a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de carga chega a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de passageiros chega a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de carga chega a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Acidente Rodoviário!{} Condutor morre numa explosão após a colisão com um trem
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Acidente Rodoviário!{} {COMMA} mortos numa explosão após a colisão com um trem
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Impossível fazer o veículo dar a volta...
@@ -2868,7 +2868,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomear tipo do automóvel
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomear tipo do automóvel
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Impossível renomear tipo do automóvel...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Ir para a garagem de {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Ir para a garagem de {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Manutenção na garagem de {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Adaptar automóvel para carregar tipo de carga diferente
--- a/src/lang/bulgarian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/bulgarian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -274,9 +274,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Прекалено много имена
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Избраното име вече е в употреба
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :ОС Х
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :ОС Х
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -287,11 +287,11 @@
 STR_013C_CARGO                                                  :{BLACK}Товар
 STR_013D_INFORMATION                                            :{BLACK}Информация
 STR_013E_CAPACITIES                                             :{BLACK}Вместимости
-STR_013E_TOTAL_CARGO                                            :{BLACK}Общо товар
+STR_TOTAL_CARGO                                                 :{BLACK}Общо товар
 STR_013F_CAPACITY                                               :{BLACK}Вместимост: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Капацитет: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Обща товарна вместимост на влака:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Обща товарна вместимост на влака:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Нова игра
 STR_0141_LOAD_GAME                                              :{BLACK}Отвори игра
@@ -730,7 +730,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Премахни напълно града
 STR_0292_SAVE_SCENARIO                                          :Запис на сценарий
 STR_0293_LOAD_SCENARIO                                          :Зареждане на сценарий
-STR_LOAD_HEIGHTMAP                                              :Отвори височинна карта
+STR_MENU_LOAD_HEIGHTMAP                                         :Отвори височинна карта
 STR_0294_QUIT_EDITOR                                            :Изход от редактора
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Изход
@@ -770,9 +770,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Игрови опции
-STR_02C5_DIFFICULTY_SETTINGS                                    :Опции за трудност
-STR_02C7_CONFIG_PATCHES                                         :Конфигурирай патчове
+STR_02C4_GAME_OPTIONS                                           :Игрови опции
+STR_02C6_DIFFICULTY_SETTINGS                                    :Опции за трудност
+STR_MENU_CONFIG_PATCHES                                         :Конфигурирай патчове
 STR_NEWGRF_SETTINGS                                             :Newgrf настройки
 STR_TRANSPARENCY_OPTIONS                                        :Опций на прозрачност
 STR_GAMEOPTMENU_0A                                              :
@@ -872,8 +872,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Записването продължава,{}моля изчакайте да сръши!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Избери програмата 'Ezy Street style music'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :английски (оригинални)
@@ -1648,42 +1648,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Първо махнете пътя
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Пътни ремонти в процес
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Пътно строителство
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Конструкциа на трамвайна линиа
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Конструкциа на трамвайна линиа
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Избор на асфалтов мост
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... еднопосочни пътища немогат да имат съединениа
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Пътя не може да се построи...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Трамвайна линиа неможе да бъде посроена тук...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Трамвайна линиа неможе да бъде посроена тук...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Пътя не може да се махне...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Трамвайната линиа неможе да бъде премахната от тук...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Трамвайната линиа неможе да бъде премахната от тук...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Ориентация на гараж
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Посока на Трамвайно Депо
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Посока на Трамвайно Депо
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Гаража не може да се построи...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Трамвайно депо неможе да бъде построено тук...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Трамвайно депо неможе да бъде построено тук...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Автогарата не може да се построи...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Товарната гара не може да се построи...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Пътническа трамвайна гара неможе да бъде построена...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Товарна трамвайна гара неможе да бъде построена...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Пътническа трамвайна гара неможе да бъде построена...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Товарна трамвайна гара неможе да бъде построена...
 STR_180A_ROAD_CONSTRUCTION                                      :Пътно строителство
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Конструкциа на трамвайна линиа
+STR_TRAMWAY_CONSTRUCTION                                        :Конструкциа на трамвайна линиа
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Строене на път
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Построи отсечка от шосе използвайки Афто-шосе методът
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Построи секциа от трамвайна линиа
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Построи секциа от трамвайна линиа
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Построи отсечка от железопътна линиа използвайки Афто-линиа методът
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Строене на гараж (за строене и сервиз на МПС-та)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Построи трамвайно депо (за стройтелни и сервизни коли)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Построи трамвайно депо (за стройтелни и сервизни коли)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Строене на автогара
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Строене на товарна гара
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Построи пъгническа трамвайна гара
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Построи товарна трамвайна гара
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Построи пъгническа трамвайна гара
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Построи товарна трамвайна гара
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Построй мост
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Построи трамвайен мост
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Построи трамвайен мост
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Построй тунел
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Построи трамвайен тунел
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Построи трамвайен тунел
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Активирай/Деактивирай еднопосочни пътища
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Премахване на асфалтов път
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Превключване строене/разрушаване на трамвайни консктрукции
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Превключване строене/разрушаване на трамвайни консктрукции
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Ориентация на гараж
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Избери посоката на трамвайното депо
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Избери посоката на трамвайното депо
 STR_1814_ROAD                                                   :път
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Асфалтов път с улични лампи
 STR_1816_TREE_LINED_ROAD                                        :Асфалтов път с дървета
@@ -1826,8 +1826,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Граничи с повече от една гара/товарна платформа
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Твърде много гари/товарни платформи в града
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Твърде много гари/товарни платформи
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Твърде много автобусни спирки
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Твърде много гари за камиони
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Твърде много автобусни спирки
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Твърде много гари за камиони
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Твърде близо до друга гара/товарна платформа
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Първо разрушете ЖП гарата
@@ -1858,12 +1858,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} вече приема {STRING} и {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Ориентация на автогара
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Ориент. товарна гара
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Посока на пътнически трамвай
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Посока на товарен трамвай
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Посока на пътнически трамвай
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Посока на товарен трамвай
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Първо разрушете автогарата
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Първо разрушете товарната гара
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Пътническата трамвайна гара трябва да бъде унищожена първо
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Товарната трамвайна гара трябва да бъде унищожена първо
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Пътническата трамвайна гара трябва да бъде унищожена първо
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Товарната трамвайна гара трябва да бъде унищожена първо
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Станци{P я и}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Николко -
@@ -1875,8 +1875,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Дължина на ЖП гарата
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Ориентация на автогарата
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Ориентация на товарната гара
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Избери посоката на пътническата трамвайна гара
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Избери посоката на товарната трамвайна гара
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Избери посоката на пътническата трамвайна гара
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Избери посоката на товарната трамвайна гара
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Центриране на главния прозорец върху станцията
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Покажи нивото на обслужване
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Промяна името на станцията
@@ -1898,7 +1898,7 @@
 STR_3069_BUOY                                                   :Шамандура
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...шамандура на пътя
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...станцията е прекалено разпръсната
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...неправилните станции са изключени
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...неправилните станции са изключени
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Задържете CTRL за да изберете повече от един обект
 
 STR_UNDEFINED                                                   :(неопределен текст)
@@ -1939,7 +1939,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Избери нов тип игра
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Избери на сценарии (зелено), предварително настроена игра (синьо), или произволна нова игра
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Генерирай произволна нова игра
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Зареди височинна карта
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Зареди височинна карта
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} пречи
@@ -2143,10 +2143,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Икономика: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Обръщане на влаковете: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Бедствия: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Отношение на градските власти към промяна на земята: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Отношение на градските власти към промяна на земята: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Николко
+STR_NONE                                                        :Николко
 STR_NUM_VERY_LOW                                                :Много ниско
 STR_6816_LOW                                                    :малко
 STR_6817_NORMAL                                                 :нормално
@@ -2184,9 +2184,9 @@
 STR_6836_OFF                                                    :изключено
 STR_6837_ON                                                     :включено
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Покажи класирането
-STR_6839_PERMISSIVE                                             :разрешаващи
-STR_683A_TOLERANT                                               :толерантни
-STR_683B_HOSTILE                                                :враждебни
+STR_PERMISSIVE                                                  :разрешаващи
+STR_TOLERANT                                                    :толерантни
+STR_HOSTILE                                                     :враждебни
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2323,7 +2323,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Не може да продадеш 25% от акциите на тази компания...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% е притежание на {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} бе закупена от {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Тази компания все още не е достатъчно стара да предлага акции...
+STR_PROTECTED                                                   :{WHITE}Тази компания все още не е достатъчно стара да предлага акции...
 
 STR_LIVERY_DEFAULT                                              :Стандартен Ливъри
 STR_LIVERY_STEAM                                                :Парен локомотив
@@ -2630,17 +2630,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Отиди на {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Отиди на {STATION} (Обмени и вземи товар)
-STR_8808_GO_TO_UNLOAD                                           :Отиди на {STATION} (Разтовари)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Отиди на {STATION} (Обмени и не взимай нов товар)
-STR_880A_GO_TO_LOAD                                             :Отиди на {STATION} (Товари)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Отиди на {STATION} (Обмени и изчакай до пълен товар)
-STR_880C_GO_NON_STOP_TO                                         :Отиди без да спираш на {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Отиди без да спираш на {STATION} (Обмени и вземи товар)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :отиди без да спираш на {STATION} (Разтовари)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Отиди без да спираш на {STATION} (Обмени и не товари)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Отиди без да спираш на {STATION} (Товари)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Отиди без да спираш на {STATION} (Обмени и изчакай до пълен товар)
+STR_GO_TO_TRANSFER                                              :Отиди на {STATION} (Обмени и вземи товар)
+STR_8807_GO_TO_UNLOAD                                           :Отиди на {STATION} (Разтовари)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Отиди на {STATION} (Обмени и не взимай нов товар)
+STR_8808_GO_TO_LOAD                                             :Отиди на {STATION} (Товари)
+STR_GO_TO_TRANSFER_LOAD                                         :Отиди на {STATION} (Обмени и изчакай до пълен товар)
+STR_880A_GO_NON_STOP_TO                                         :Отиди без да спираш на {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Отиди без да спираш на {STATION} (Обмени и вземи товар)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :отиди без да спираш на {STATION} (Разтовари)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Отиди без да спираш на {STATION} (Обмени и не товари)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Отиди без да спираш на {STATION} (Товари)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Отиди без да спираш на {STATION} (Обмени и изчакай до пълен товар)
 STR_GO_TO_TRAIN_DEPOT                                           :Отиди до Влаковото депо на {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Ремонт в {TOWN} влаково депо
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Отиди без да спираш на {TOWN} Влаково депо
@@ -2744,7 +2744,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Информация за превозвания товар
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Информация за влаковата композиция
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Капацитет на влаковата композиция
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Общ капацитет на влака, разбит по типове товар
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Общ капацитет на влака, разбит по типове товар
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Пътен лист - натиснете върху назначение за маркиране. CTRL + натискане - центрира върху станцията
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Прескачане на настоящата заповед и започване на цледващата. CTRL + клик прескача до избраната заповед
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Изтриване на избраното назначение
@@ -2775,8 +2775,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Не може да обърне посоката на влак...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Преименуване на влак
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Не може да се преименува влак...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Изхвърляне на товара при достигане на избраното назначение
-STR_886F_TRANSFER                                               :{BLACK}Транфер
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Изхвърляне на товара при достигане на избраното назначение
+STR_TRANSFER                                                    :{BLACK}Транфер
 STR_CLEAR_TIME                                                  :{BLACK}Изчисти времето
 STR_RESET_LATENESS                                              :{BLACK}Преправи закъснялата бройка
 
@@ -2854,8 +2854,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Преименувай МПС-то
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първият автобус пристигнал в {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Хората празнуват . . .{}Първи камион пристигна на {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първиат пътнически трамвай пристига на {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първиат товарен трамвай пристига на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първиат пътнически трамвай пристига на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първиат товарен трамвай пристига на {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}Шофьор загина на място при екплозия на МПС след сблъсък с влак
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}{COMMA} загинаха на място при екплозия на МПС след сблъсък с влак
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Не може да обърнеш МПС-то...
@@ -2864,7 +2864,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Преименувай МПС-то
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Преименувай МПС-то
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Не може да преименуваш МПС-то...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Отиди  в {TOWN} МПС-депото
+STR_GO_TO_ROADVEH_DEPOT                                         :Отиди  в {TOWN} МПС-депото
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Ремонт в {TOWN} гараж
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Преоборудване автомобила за друг товар
--- a/src/lang/catalan.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/catalan.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Massa noms definits
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Aquest nom ja es fa servir
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Càrrega
 STR_013D_INFORMATION                                            :{BLACK}Informació
 STR_013E_CAPACITIES                                             :{BLACK}Capacitats
-STR_013E_TOTAL_CARGO                                            :{BLACK}Càrrega Total
+STR_TOTAL_CARGO                                                 :{BLACK}Càrrega Total
 STR_013F_CAPACITY                                               :{BLACK}Capacitats: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacitat: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Càrrega total (capacitat) d'aquest tren:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Càrrega total (capacitat) d'aquest tren:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Joc Nou
 STR_0141_LOAD_GAME                                              :{BLACK}Carrega un Joc
@@ -729,7 +729,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Esborra totalment aquesta població
 STR_0292_SAVE_SCENARIO                                          :Desa l'escenari
 STR_0293_LOAD_SCENARIO                                          :Carrega un escenari
-STR_LOAD_HEIGHTMAP                                              :Carrega Mapa d'alçades
+STR_MENU_LOAD_HEIGHTMAP                                         :Carrega Mapa d'alçades
 STR_0294_QUIT_EDITOR                                            :Surt de l'editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Surt
@@ -769,9 +769,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Opcions del Joc
-STR_02C5_DIFFICULTY_SETTINGS                                    :Paràmetres de dificultat
-STR_02C7_CONFIG_PATCHES                                         :Configura pedaços
+STR_02C4_GAME_OPTIONS                                           :Opcions del Joc
+STR_02C6_DIFFICULTY_SETTINGS                                    :Paràmetres de dificultat
+STR_MENU_CONFIG_PATCHES                                         :Configura pedaços
 STR_NEWGRF_SETTINGS                                             :Extensions NewGRF
 STR_TRANSPARENCY_OPTIONS                                        :Opcions de transparència
 STR_GAMEOPTMENU_0A                                              :
@@ -871,8 +871,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}S'està desant el joc,{}espera a que acabi l'operació!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Selecciona el programa 'Ezy Street style music'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglès
@@ -1647,42 +1647,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}S'ha de treure la carretera primer
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Obres en progrés
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construcció de Carreteres
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Construcció de Tramvies
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Construcció de Tramvies
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Selecciona un Pont per Carretera
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... les carreteres de sentit únic no poden tenir encreuaments
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Aquí no es pot construir una carretera...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}No puc construir la via de tramvia aquí...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}No puc construir la via de tramvia aquí...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Aquí no es pot treure una carretera...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}No puc treure la via de tramvia d'aquí...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}No puc treure la via de tramvia d'aquí...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Cotxeres
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientació de les cotxeres de tramvies
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientació de les cotxeres de tramvies
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Aquí no es pot construir una cotxera...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Aquí no puc construir les cotxeres de tramvies...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Aquí no puc construir les cotxeres de tramvies...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}No es pot construir una parada d'autobús...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}No es pot construir estació de mercaderies...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}No puc construir l'estació de tramvies de passatgers
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}No puc construir l'estació de tramvies de càrrega
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}No puc construir l'estació de tramvies de passatgers
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}No puc construir l'estació de tramvies de càrrega
 STR_180A_ROAD_CONSTRUCTION                                      :Construcció de Carreteres
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Construcció de Tramvies
+STR_TRAMWAY_CONSTRUCTION                                        :Construcció de Tramvies
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Construeix una secció de carretera
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Construeix secció de carretera utilitzant el mode Autocarretera
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Construeix una secció de via de tramvia
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Construeix una secció de via de tramvia
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Construeix secció de tramvia utilitzant el mode Autotramvia
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Construeix una cotxera (per construir i mantenir vehicles)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Construeix cotxeres de tramvies (per construir i revisar tramvies)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Construeix cotxeres de tramvies (per construir i revisar tramvies)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Constueix una parada d'autobús
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Construeix un moll de càrrega
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Construeix una estació de tramvies de passatgers
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Construeix una estació de tramvies de mercaderies
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Construeix una estació de tramvies de passatgers
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Construeix una estació de tramvies de mercaderies
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Construeix un pont per carretera
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Construeix pont per tramvies
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Construeix pont per tramvies
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Construeix un túnel per carretera
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Construeix túnel per tramvies
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Construeix túnel per tramvies
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Activa/Desactiva les carreteres d'un sentit
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Intercanvia funció construeix/treu per la construcció de carreteres
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Canvia construeix/treu de la construcció de vies de tramvia
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Canvia construeix/treu de la construcció de vies de tramvia
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Selecciona la orientació de les Cotxeres
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Selecciona l'orientació de les cotxeres de tramvies
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Selecciona l'orientació de les cotxeres de tramvies
 STR_1814_ROAD                                                   :Carretera
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Carretera amb fanals
 STR_1816_TREE_LINED_ROAD                                        :Carretera de tres carrils
@@ -1825,8 +1825,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Fusiona més d'una estació/àrea de càrrega existent
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Hi ha massa estacions/àrees de càrrega en aquesta població
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Massa estacions/àrees de càrrega
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Massa parades d'autobús
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Masses estacions de càrrega
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Massa parades d'autobús
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Masses estacions de càrrega
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Massa a prop d'una altra estació/àrea de càrrega
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Primer has d'enderrocar l'estació de tren
@@ -1857,12 +1857,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} ara accepta {STRING} i {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Parada d'autobús
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Estació de Mercaderies
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orientació estació passatgers
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orientació estació mercaderies
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orientació estació passatgers
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orientació estació mercaderies
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Primer has d'enderrocar la parada d'autobús
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Primer has d'enderrocar l'estació de mercaderies
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Primer has de demolir l'estació de tramvies de passatgers
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Primer has de demolir l'estació de tramvies de mercaderies
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Primer has de demolir l'estació de tramvies de passatgers
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Primer has de demolir l'estació de tramvies de mercaderies
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estacions/Parades
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Cap -
@@ -1874,8 +1874,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Selecciona la mida de les andanes de l'estació de tren
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Selecciona l'orientació de la parada d'autobús
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Selecciona l'orientació del moll de càrrega de camions
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Selecciona l'orientació de l'estació de tramvies de passatgers
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Selecciona l'orientació de l'estació de tramvies de mercaderies
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Selecciona l'orientació de l'estació de tramvies de passatgers
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Selecciona l'orientació de l'estació de tramvies de mercaderies
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centra la pantalla principal al lloc de l'estació
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Mostra els ratis de l'estació
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Canvia el nom de l'estació
@@ -1897,7 +1897,7 @@
 STR_3069_BUOY                                                   :Boia
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...boia en el camí
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...estació massa extesa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...estacions no uniformes desactivades
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...estacions no uniformes desactivades
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Mantin apretat CTRL per a seleccionar més de un item
 
 STR_UNDEFINED                                                   :(cadena sense definir)
@@ -1938,7 +1938,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Selecciona el Nou Tipus de Joc
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Selecciona l'escenari (verd), joc pre-programat (blau), o el nou joc aleatori
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Genera un nou joc aleatori
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Carrega un Mapa d'alçades
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Carrega un Mapa d'alçades
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} en el camí
@@ -2142,10 +2142,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economia: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Canvi de sentit dels trens: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Actitud de l'Ajuntament sobre reestructuracions d'àrees: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Actitud de l'Ajuntament sobre reestructuracions d'àrees: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Cap
+STR_NONE                                                        :Cap
 STR_NUM_VERY_LOW                                                :Molt baix
 STR_6816_LOW                                                    :Baix
 STR_6817_NORMAL                                                 :Normal
@@ -2183,9 +2183,9 @@
 STR_6836_OFF                                                    :Desactivat
 STR_6837_ON                                                     :Activat
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Veure la taula de les majors puntuacions
-STR_6839_PERMISSIVE                                             :Permisiu
-STR_683A_TOLERANT                                               :Tolerant
-STR_683B_HOSTILE                                                :Hostil
+STR_PERMISSIVE                                                  :Permisiu
+STR_TOLERANT                                                    :Tolerant
+STR_HOSTILE                                                     :Hostil
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2322,7 +2322,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}No pots vendre el 25% de participació en aquesta empresa...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propietat de {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} ha estat absorbida per {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Aquesta empresa ja no negocia participacions...
+STR_PROTECTED                                                   :{WHITE}Aquesta empresa ja no negocia participacions...
 
 STR_LIVERY_DEFAULT                                              :Decoració estandard
 STR_LIVERY_STEAM                                                :Motor de vapor
@@ -2631,17 +2631,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Ves a {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Ves a {STATION} (Transfereix i agafa càrrega)
-STR_8808_GO_TO_UNLOAD                                           :Ves a {STATION} (Descarrega)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Ves a {STATION} (Transfereix i deixa buit)
-STR_880A_GO_TO_LOAD                                             :Ves a {STATION} (Carrega)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Ves a {STATION} (Transfereix i espera càrrega completa)
-STR_880C_GO_NON_STOP_TO                                         :Ves sense parar a {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Ves sense parar a {STATION} (Transfereix i agafa càrrega)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Ves sense parar a {STATION} (Descarrega)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Ves sense parar a {STATION} (Transfereix i deixa buit)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Ves sense parar a {STATION} (Carrega)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ves sense parar a {STATION} (Transfereix i espera càrrega completa)
+STR_GO_TO_TRANSFER                                              :Ves a {STATION} (Transfereix i agafa càrrega)
+STR_8807_GO_TO_UNLOAD                                           :Ves a {STATION} (Descarrega)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Ves a {STATION} (Transfereix i deixa buit)
+STR_8808_GO_TO_LOAD                                             :Ves a {STATION} (Carrega)
+STR_GO_TO_TRANSFER_LOAD                                         :Ves a {STATION} (Transfereix i espera càrrega completa)
+STR_880A_GO_NON_STOP_TO                                         :Ves sense parar a {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Ves sense parar a {STATION} (Transfereix i agafa càrrega)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Ves sense parar a {STATION} (Descarrega)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Ves sense parar a {STATION} (Transfereix i deixa buit)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Ves sense parar a {STATION} (Carrega)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Ves sense parar a {STATION} (Transfereix i espera càrrega completa)
 STR_GO_TO_TRAIN_DEPOT                                           :Ves al Diposit {TOWN} de Tren
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Manteniment a cotxeres de {TOWN}.
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ves sense parar a les cotxeres de {TOWN}.
@@ -2745,7 +2745,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Mostra els detalls de càrrega transportada
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Mostra els detalls d'elements del tren
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Mostra les capacitats de cada element
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Mostra la capacitat total del tren, separat per tipus de càrrega
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Mostra la capacitat total del tren, separat per tipus de càrrega
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Llista d'ordres - clica en una per seleccionar-la
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Salta l'ordre actual, i comença la següent. CTRL + clic salta l'ordre seleccionada
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Esborra l'ordre seleccionada
@@ -2776,8 +2776,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}No es pot invertir la direcció del tren...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Reanomena el tipus d'element del tren
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}No es pot reanomenar el tipus d'element del tren...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Fer que l'ordre marcada forci al vehicle a volcar la càrrega
-STR_886F_TRANSFER                                               :{BLACK}Transf.
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Fer que l'ordre marcada forci al vehicle a volcar la càrrega
+STR_TRANSFER                                                    :{BLACK}Transf.
 STR_CLEAR_TIME                                                  :{BLACK}Esborra Temps
 STR_RESET_LATENESS                                              :{BLACK}Reset. control de retràs
 
@@ -2855,8 +2855,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Anomena automòbil
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{}Primer autobús arriba a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{}Primer camió arriba a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de passatgers arriba a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de mercaderies arriba a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de passatgers arriba a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de mercaderies arriba a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident de Vehicle!{}El conductor mor en una bola de foc després de la colisió amb un tren
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident de Vehicle!{}{COMMA} moren en una bola de foc després d'una colisió amb un tren
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}No es pot fer que el vehicle torni...
@@ -2865,7 +2865,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Reanomena tipus d'automòbil
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Reanomena tipus d'automòbil
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}No es pot reanomenar tipus d'automòbil
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Ves a la cotxera de {TOWN}.
+STR_GO_TO_ROADVEH_DEPOT                                         :Ves a la cotxera de {TOWN}.
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Manteniment a la cotxera de {TOWN}.
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Remodela vehicle de carretera per dur un tipus diferent de càrrega
--- a/src/lang/croatian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/croatian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -274,9 +274,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Previše definiranih imena
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Odabrano ime već se koristi
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -287,11 +287,11 @@
 STR_013C_CARGO                                                  :{BLACK}Teret
 STR_013D_INFORMATION                                            :{BLACK}Informacije
 STR_013E_CAPACITIES                                             :{BLACK}Nosivosti
-STR_013E_TOTAL_CARGO                                            :{BLACK}Ukupni teret
+STR_TOTAL_CARGO                                                 :{BLACK}Ukupni teret
 STR_013F_CAPACITY                                               :{BLACK}Nosivost: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Nosivost: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Ukupna nosivost tereta ovog vlaka:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Ukupna nosivost tereta ovog vlaka:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nova igra
 STR_0141_LOAD_GAME                                              :{BLACK}Učitaj igru
@@ -730,7 +730,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Obriši ovaj grad u cjelosti
 STR_0292_SAVE_SCENARIO                                          :Spremi scenarij
 STR_0293_LOAD_SCENARIO                                          :Učitaj secenarij
-STR_LOAD_HEIGHTMAP                                              :Učitaj visinsku kartu
+STR_MENU_LOAD_HEIGHTMAP                                         :Učitaj visinsku kartu
 STR_0294_QUIT_EDITOR                                            :Završi s uređivanjem
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Završi
@@ -770,9 +770,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Postavke igre
-STR_02C5_DIFFICULTY_SETTINGS                                    :Postavke težine
-STR_02C7_CONFIG_PATCHES                                         :Konfiguriraj zakrpe
+STR_02C4_GAME_OPTIONS                                           :Postavke igre
+STR_02C6_DIFFICULTY_SETTINGS                                    :Postavke težine
+STR_MENU_CONFIG_PATCHES                                         :Konfiguriraj zakrpe
 STR_NEWGRF_SETTINGS                                             :Postavke NewGRF-a
 STR_TRANSPARENCY_OPTIONS                                        :Postavke prozirnosti
 STR_GAMEOPTMENU_0A                                              :
@@ -872,8 +872,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Spremanje još u tijeku,{}molimo pričekajte dok se ne završi!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Odaberi glazbeni program 'Ezy Street style'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engleski (original)
@@ -1648,42 +1648,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Najprije moraš ukloniti cestu
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Cestovni radovi u tijeku
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Izgradnja ceste
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Izgradnja tramvaja
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Izgradnja tramvaja
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Odaberi cestovni most
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}...jednosmjerne ceste ne mogu imati raskrižja
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Ovdje nije moguće izgraditi cestu...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Ovdje nije moguće izgraditi tramvaj...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Ovdje nije moguće izgraditi tramvaj...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Nije moguće ukloniti cestu odavdje...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Nije moguće ukloniti tramvaj odavdje...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Nije moguće ukloniti tramvaj odavdje...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Smjer cestovnog spremišta
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Smjer tramvajskog spremišta
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Smjer tramvajskog spremišta
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Ovdje nije moguće izgraditi spremište cestovnih vozila...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Ovdje nije moguće izgraditi tramvajsko spremište...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Ovdje nije moguće izgraditi tramvajsko spremište...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nije moguće izgraditi autobusnu stanicu...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nije moguće izgraditi kamionski terminal...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Nije moguće izgraditi tramvajsku stanicu za putnike...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Nije moguće izgraditi teretnu tramvajsku stanicu...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Nije moguće izgraditi tramvajsku stanicu za putnike...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Nije moguće izgraditi teretnu tramvajsku stanicu...
 STR_180A_ROAD_CONSTRUCTION                                      :Izgradnja ceste
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Izgradnja tramvaja
+STR_TRAMWAY_CONSTRUCTION                                        :Izgradnja tramvaja
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Izgradi dio ceste
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Izgradi cestu koristeći Autoroad način gradnje
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Izgradi tramvajski dio
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Izgradi tramvajski dio
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Izgradi tramvajsku prugu koristeći Autotram način gradnje
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Izgradi spremište cestovnih vozila (za izgradnju i servisiranje vozila)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Izgradi spremište tramvajskih vozila (za izgradnju i servisiranje vozila)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Izgradi spremište tramvajskih vozila (za izgradnju i servisiranje vozila)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Izgradi autobusnu stanicu
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Izgradi pretovarni kamionski terminal
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Izgradi putničku tramvajsku stanicu
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Izgradi teretnu tramvajsku stanicu
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Izgradi putničku tramvajsku stanicu
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Izgradi teretnu tramvajsku stanicu
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Izgradi cestovni most
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Izgradi tramvajski most
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Izgradi tramvajski most
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Izgradi cestovni tunel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Izgradi tramvajski tunel
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Izgradi tramvajski tunel
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Aktiviraj/deaktiviraj jednosmjerne ceste
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Aktiviraj izgradnju/uklanjanje ceste
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Aktiviraj izgradnju/brisanje za izgradnju tramvaja
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Aktiviraj izgradnju/brisanje za izgradnju tramvaja
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Odaberi smjer spremišta cestovnih vozila
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Odaberi smjer tramvajskog spremišta
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Odaberi smjer tramvajskog spremišta
 STR_1814_ROAD                                                   :Cesta
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Cesta sa semaforima
 STR_1816_TREE_LINED_ROAD                                        :Cesta s tri trake
@@ -1826,8 +1826,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Spaja više od jedne postojeće stanice/terminala
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}U ovom gradu ima previše stanica/terminala
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Previše stanica/terminala
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Previše autobusnih stanica
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Previše kamionskih stanica
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Previše autobusnih stanica
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Previše kamionskih stanica
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Preblizu drugoj stanici/terminalu
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Najprije moraš srušiti željezničku stanicu
@@ -1858,12 +1858,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} od sada prihvaća {STRING} i {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Smjer autobusne stanice
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Smjer kamionskog terminala
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orijentacija putničkog tramvaja
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orijentacija teretnog tramvaja
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orijentacija putničkog tramvaja
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orijentacija teretnog tramvaja
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Najprije moraš srušiti autobusnu stanicu
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Najprije moraš srušiti kamionski terminal
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Najprije moraš srušiti putničku tramvajsku stanicu
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Najprije moraš srušiti teretnu tramvajsku stanicu
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Najprije moraš srušiti putničku tramvajsku stanicu
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Najprije moraš srušiti teretnu tramvajsku stanicu
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} stanic{P a e a}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ništa -
@@ -1875,8 +1875,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Odaberi dužinu željezničke stanice
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Odaberi smjer autobusne stanice
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Odaberi smjer kamionskog terminala
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Odaberi smjer putničke tramvajske stanice
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Odaberi smjer teretne tramvajske stanice
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Odaberi smjer putničke tramvajske stanice
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Odaberi smjer teretne tramvajske stanice
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centriraj glavni pogled na lokaciju stanice
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Pokaži ocjene stanice
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Promijeni ime stanice
@@ -1898,7 +1898,7 @@
 STR_3069_BUOY                                                   :Plutača
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...plutača na putu
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stanica previše proširena
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...neujednačene stanice onemogućene
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...neujednačene stanice onemogućene
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Drži CTRL kako bi odabrao više od jedne stavke
 
 STR_UNDEFINED                                                   :(neodređen znakovni niz)
@@ -1939,7 +1939,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Odaberi vrstu nove igre
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Odaberi scenarij (zeleno), namještenu igru (plavo), ili nasumičnu novu igru
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Stvori nasumičnu novu igru
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Učitaj visinsku kartu
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Učitaj visinsku kartu
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} na putu
@@ -2143,10 +2143,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomija: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Promjena smjera vlaka: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Prirodne katastrofe: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Stav gradsko vijeća prema restrukturiranju područja: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Stav gradsko vijeća prema restrukturiranju područja: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Ništa
+STR_NONE                                                        :Ništa
 STR_NUM_VERY_LOW                                                :Vrlo nisko
 STR_6816_LOW                                                    :Nisko
 STR_6817_NORMAL                                                 :Normalno
@@ -2184,9 +2184,9 @@
 STR_6836_OFF                                                    :Isključeno
 STR_6837_ON                                                     :Uključeno
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Pokaži tablice najboljih rezultata
-STR_6839_PERMISSIVE                                             :Dopustiv
-STR_683A_TOLERANT                                               :Tolerantan
-STR_683B_HOSTILE                                                :Agresivan
+STR_PERMISSIVE                                                  :Dopustiv
+STR_TOLERANT                                                    :Tolerantan
+STR_HOSTILE                                                     :Agresivan
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2323,7 +2323,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nije moguće prodati 25% udjela u ovoj tvrtci...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% u vlasništvu {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} je preuzeta od strane tvrtke {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Ova tvrka još nije dovoljno stara da bi trgovala udjelima...
+STR_PROTECTED                                                   :{WHITE}Ova tvrka još nije dovoljno stara da bi trgovala udjelima...
 
 STR_LIVERY_DEFAULT                                              :Standardna boja
 STR_LIVERY_STEAM                                                :Parna lokomotiva
@@ -2630,17 +2630,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Idi do {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Idi do {STATION} (Transferiraj i preuzmi teret)
-STR_8808_GO_TO_UNLOAD                                           :Idi do {STATION} (Istovar)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Go to {STATION} (Transferiraj i otiđi prazan)
-STR_880A_GO_TO_LOAD                                             :Idi do{STATION} (Utovar)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Idi do {STATION} (Transferiraj i pričekaj puni utovar)
-STR_880C_GO_NON_STOP_TO                                         :Idi neprekidno do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Idi neprekidno do {STATION} (Transferiraj i preuzmi teret)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Idi neprekidno do {STATION} (Istovar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Idi neprekidno do {STATION} (Transferiraj i otiđi prazan)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Idi neprekidno do {STATION} (Utovar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Idi neprekidno do {STATION} (Transferiraj i pričekaj puni utovar)
+STR_GO_TO_TRANSFER                                              :Idi do {STATION} (Transferiraj i preuzmi teret)
+STR_8807_GO_TO_UNLOAD                                           :Idi do {STATION} (Istovar)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Go to {STATION} (Transferiraj i otiđi prazan)
+STR_8808_GO_TO_LOAD                                             :Idi do{STATION} (Utovar)
+STR_GO_TO_TRANSFER_LOAD                                         :Idi do {STATION} (Transferiraj i pričekaj puni utovar)
+STR_880A_GO_NON_STOP_TO                                         :Idi neprekidno do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Idi neprekidno do {STATION} (Transferiraj i preuzmi teret)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Idi neprekidno do {STATION} (Istovar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Idi neprekidno do {STATION} (Transferiraj i otiđi prazan)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Idi neprekidno do {STATION} (Utovar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Idi neprekidno do {STATION} (Transferiraj i pričekaj puni utovar)
 STR_GO_TO_TRAIN_DEPOT                                           :Idi u spremište vlakova grada {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Servisiranje u spremištu vlakova grada {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Idi neprekidno do spremišta vlakova grada {TOWN}
@@ -2744,7 +2744,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Pokaži detalje tereta koji se prevozi
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Pokaži detalje vagona
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Pokaži nosivosti svakog vagona
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Pokaži ukupnu nosivost vlaka podijeljenu prema vrsti tereta
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Pokaži ukupnu nosivost vlaka podijeljenu prema vrsti tereta
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Popis naredbi - klikni na naredbu kako bi ju označio. CTRL + klik klizi na stanicu
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Preskoči trenutnu naredbu i pokreni slijedeću. CTRL + klik preskače na odabranu naredbu
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Obriši označenu naredbu
@@ -2775,8 +2775,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nije moguće promijeniti smjer vlaka...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Preimenuj vrstu vagona
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nije moguće preimenovati vrstu vagona...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Napravi da označena naredba prisili vozilo da izbaci teret
-STR_886F_TRANSFER                                               :{BLACK}Transfer
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Napravi da označena naredba prisili vozilo da izbaci teret
+STR_TRANSFER                                                    :{BLACK}Transfer
 STR_CLEAR_TIME                                                  :{BLACK}Obriši vrijeme
 STR_RESET_LATENESS                                              :{BLACK}Poništi Brojač Kašnjenja
 
@@ -2854,8 +2854,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Imenuj cestovno vozilo
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi bus je stigao na {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi kamion je stigao na {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Građani slave . . .{}Prvi putnički tramvaj je stigao na {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Građani slave . . .{}Prvi teretni tramvaj je stigao na {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Građani slave . . .{}Prvi putnički tramvaj je stigao na {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Građani slave . . .{}Prvi teretni tramvaj je stigao na {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}Vozač poginuo u eksploziji nakon sudara s vlakom
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}{COMMA} poginulih u eksploziji nakon sudara s vlakom
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nije moguće natjerati vozilo da se okrene...
@@ -2864,7 +2864,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Preimenuj vrstu cestovnog vozila
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Preimenuj vrstu cestovnog vozila
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nije moguće preimenovati vrstu cestovnog vozila...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Idi prema spremištu cestovnih vozila grada {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Idi prema spremištu cestovnih vozila grada {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servisiranje u spremištu cestovnih vozila grada {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Prenamijeni cestovno vozilo  za prijevoz neke druge vrste tereta
--- a/src/lang/czech.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/czech.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -330,9 +330,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Definováno příliš mnoho jmen
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Zvolené jméno se už používá
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unixu
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unixu
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -343,11 +343,11 @@
 STR_013C_CARGO                                                  :{BLACK}Náklad
 STR_013D_INFORMATION                                            :{BLACK}Informace
 STR_013E_CAPACITIES                                             :{BLACK}Kapacity
-STR_013E_TOTAL_CARGO                                            :{BLACK}Celkový náklad
+STR_TOTAL_CARGO                                                 :{BLACK}Celkový náklad
 STR_013F_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapacita: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Celková kapacita tohoto vlaku:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Celková kapacita tohoto vlaku:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nová hra
 STR_0141_LOAD_GAME                                              :{BLACK}Nahrát hru
@@ -787,7 +787,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Smazat celé toto město
 STR_0292_SAVE_SCENARIO                                          :Uložit mapu
 STR_0293_LOAD_SCENARIO                                          :Otevřit mapu
-STR_LOAD_HEIGHTMAP                                              :Použít výškovou mapu
+STR_MENU_LOAD_HEIGHTMAP                                         :Použít výškovou mapu
 STR_0294_QUIT_EDITOR                                            :Ukončit editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Ukončit
@@ -827,9 +827,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Možnosti hry
-STR_02C5_DIFFICULTY_SETTINGS                                    :Nastavení obtížnosti
-STR_02C7_CONFIG_PATCHES                                         :Nastavení patchů
+STR_02C4_GAME_OPTIONS                                           :Možnosti hry
+STR_02C6_DIFFICULTY_SETTINGS                                    :Nastavení obtížnosti
+STR_MENU_CONFIG_PATCHES                                         :Nastavení patchů
 STR_NEWGRF_SETTINGS                                             :Nastavení newgrf
 STR_TRANSPARENCY_OPTIONS                                        :Nastavení průhlednosti
 STR_GAMEOPTMENU_0A                                              :
@@ -929,8 +929,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Ukládání ještě běží,{}počkej prosím, než doběhne!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Zvolit 'Ezy Street style music' program
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglická (původní)
@@ -1705,42 +1705,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Musíš nejprve odstranit silnici
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Silnice je v rekonstrukci
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Výstavba silnic
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Výstavba tramvajové tratě
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Výstavba tramvajové tratě
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Zvolit silniční most
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... na jednosměrných silnicích nemůžou být křižovatky
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Zde nemohu postavit silnici...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Zde není možné postavit tramvajovou trať...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Zde není možné postavit tramvajovou trať...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Nemohu odsud odstranit silnici
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Není možné odsud odstranit tramvajovou trať...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Není možné odsud odstranit tramvajovou trať...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientace garáže
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientace tramvajového depa
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientace tramvajového depa
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Tady nejde postavit garáž
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Zde není možné postavit depo pro tramvaje...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Zde není možné postavit depo pro tramvaje...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nemohu postavit autobusovou stanici...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nemohu postavit nákladovou rampu...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Není možné postavit tramvajovou stanici pro cestující...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Není možné postavit tramvajovou stanici pro cestující...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Není možné postavit tramvajovou stanici pro cestující...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Není možné postavit tramvajovou stanici pro cestující...
 STR_180A_ROAD_CONSTRUCTION                                      :Výstavba silnic
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Výstavba tramvajové tratě
+STR_TRAMWAY_CONSTRUCTION                                        :Výstavba tramvajové tratě
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Postavit silnici
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Postavit úsek silnice pomocí módu Autoroad
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Položit kus kolejí pro tramvaje
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Položit kus kolejí pro tramvaje
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Postavit úsek tramvajové tratě pomocí módu Autoroad
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Postavit garáž (pro nákup a servis vozidel)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Vystavět tramvajové depo (na kupování a servis tramvají)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Vystavět tramvajové depo (na kupování a servis tramvají)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Postavit autobusovou stanici
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Postavit nákladovou rampu
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Postavit tramvajovou stanici pro cestující
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Postavit nákladní tramvajovou stanici
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Postavit tramvajovou stanici pro cestující
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Postavit nákladní tramvajovou stanici
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Postavit silniční most
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Postavit tramvajový most
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Postavit tramvajový most
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Postavit silniční tunel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Postavit tramvajový tunel
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Postavit tramvajový tunel
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Povolit / zakázat jednosměrné silnice
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Přepnout stavba / odstranění silnice
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Přepínání mezi výstavbou a bouráním tramvajové tratě
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Přepínání mezi výstavbou a bouráním tramvajové tratě
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Výběr orientace garáže
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Zvol směr tramvajového depa
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Zvol směr tramvajového depa
 STR_1814_ROAD                                                   :Silnice
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Silnice s pouličním osvětlením
 STR_1816_TREE_LINED_ROAD                                        :Silnice s alejí
@@ -1883,8 +1883,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Spojuje více jak jedno existující nádraží nebo nákladovou rampu...
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Příliš mnoho nádraží nebo nákladových ramp v tomto městě
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Příliš mnoho nádraží nebo nákladových ramp
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Příliš mnoho autobusových zastávek
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Příliš mnoho zastávek nákladních automobilů
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Příliš mnoho autobusových zastávek
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Příliš mnoho zastávek nákladních automobilů
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Příliš blízko k jinému nádraží nebo nákladové rampě
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Musíš nejprve zničit stanici
@@ -1915,12 +1915,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} nyní přijímá {STRING} a {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientace autobusové zastávky.
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientace nákladové rampy
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orientace tramvajové stanice pro cestující
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orientace nákladní tramvajové stanice
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orientace tramvajové stanice pro cestující
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orientace nákladní tramvajové stanice
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Musíš nejprve zničit autobusovou zastávku
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Musíš nejprve zničit nákladovou rampu
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Je nutné nejdříve zbourat tramvajovou stanici pro cestující
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Je nutné nejdříve zbourat nákladní tramvajovou stanici
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Je nutné nejdříve zbourat tramvajovou stanici pro cestující
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Je nutné nejdříve zbourat nákladní tramvajovou stanici
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} stanic{P e e ""}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nic -
@@ -1932,8 +1932,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Zvolit délku nádraží
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Zvolit orientaci autobusové zastávky
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Zvolit orientaci nákladové rampy
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Vyber směr tramvajové stanice pro cestující
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Vyber směr nákladní tramvajové stanice
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Vyber směr tramvajové stanice pro cestující
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Vyber směr nákladní tramvajové stanice
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Vycentrovat pohled na stanici
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Ukázat hodnocení společností
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Změnit jméno stanice
@@ -1955,7 +1955,7 @@
 STR_3069_BUOY                                                   :Bójka
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}... bójka v cestě
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}... stanice je příliš rozložitá
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}... nejednolité stanice nejsou povoleny
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}... nejednolité stanice nejsou povoleny
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Podržením CTRL můžeš označit více položek
 
 STR_UNDEFINED                                                   :(nedefinovaný řetězec)
@@ -1996,7 +1996,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Zvolit nový typ hry
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Zvolit scénář (zelená), přednastavenou hru (modrá), nebo novou náhodnou hru
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Vytvořit novou náhodnou hru
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Nahrát výškovou mapu
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Nahrát výškovou mapu
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} v cestě
@@ -2200,10 +2200,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomika: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Otáčení vlaků: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastrofy: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Postoj místní rady k (terénním) úpravám kolem města: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Postoj místní rady k (terénním) úpravám kolem města: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :žádný
+STR_NONE                                                        :žádný
 STR_NUM_VERY_LOW                                                :velmi nízké
 STR_6816_LOW                                                    :nízké
 STR_6817_NORMAL                                                 :střední
@@ -2241,9 +2241,9 @@
 STR_6836_OFF                                                    :vypnuty
 STR_6837_ON                                                     :zapnuty
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Zobraz tabulku nejlepších výsledků
-STR_6839_PERMISSIVE                                             :nezaujatý
-STR_683A_TOLERANT                                               :tolerantní
-STR_683B_HOSTILE                                                :zaujatý
+STR_PERMISSIVE                                                  :nezaujatý
+STR_TOLERANT                                                    :tolerantní
+STR_HOSTILE                                                     :zaujatý
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2380,7 +2380,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nemohu prodat podíl v této společnosti...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% vlastněno {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} byla převzata {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Tato společnost zatím neobchoduje s akciemi...
+STR_PROTECTED                                                   :{WHITE}Tato společnost zatím neobchoduje s akciemi...
 
 STR_LIVERY_DEFAULT                                              :Výchozí barva
 STR_LIVERY_STEAM                                                :Parní lokomotiva
@@ -2695,17 +2695,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Jet do {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Jet do {STATION} (přeložit a naložit jiný náklad)
-STR_8808_GO_TO_UNLOAD                                           :Jet do {STATION} (vyložit)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Jet do {STATION} (přeložit a nenakládat)
-STR_880A_GO_TO_LOAD                                             :Jet do {STATION} (naložit)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Jet do {STATION} (přeložit a plně naložit jiný náklad)
-STR_880C_GO_NON_STOP_TO                                         :Jet bez zastavení do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Jet bez zastavení do {STATION} (přeložit a naložit jiný náklad)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Jet bez zastavení do {STATION} (vyložit)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Jet bez zastavení do {STATION} (přeložit a nenakládat)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Jet bez zastavení do {STATION} (naložit)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Jet bez zastavení do {STATION} (přeložit a plně naložit jiný náklad)
+STR_GO_TO_TRANSFER                                              :Jet do {STATION} (přeložit a naložit jiný náklad)
+STR_8807_GO_TO_UNLOAD                                           :Jet do {STATION} (vyložit)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Jet do {STATION} (přeložit a nenakládat)
+STR_8808_GO_TO_LOAD                                             :Jet do {STATION} (naložit)
+STR_GO_TO_TRANSFER_LOAD                                         :Jet do {STATION} (přeložit a plně naložit jiný náklad)
+STR_880A_GO_NON_STOP_TO                                         :Jet bez zastavení do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Jet bez zastavení do {STATION} (přeložit a naložit jiný náklad)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Jet bez zastavení do {STATION} (vyložit)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Jet bez zastavení do {STATION} (přeložit a nenakládat)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Jet bez zastavení do {STATION} (naložit)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Jet bez zastavení do {STATION} (přeložit a plně naložit jiný náklad)
 STR_GO_TO_TRAIN_DEPOT                                           :Jet do železničního depa v {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Údržba v železničním depu {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Jet bez zastavení do železničního depa {TOWN}
@@ -2809,7 +2809,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Ukázat detaily přepravovaného zboží
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Ukázat detaily jednotlivých vagonů
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Ukázat kapacity jednotlivých vagonů
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Ukázat celkovou kapacitu vlaku, rozdělenou dle nákladu
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Ukázat celkovou kapacitu vlaku, rozdělenou dle nákladu
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Seznam příkazů - stiskni příkaz pro označení. Kliknutím na příkaz se stisknutým CTRL se nastaví pohled na stanici
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Přeskočit příkaz a jít na další. Pomocí CTRL + kliknutí se přeskočí na vybraný příkaz
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Smazat označený příkaz
@@ -2840,8 +2840,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nelze obrátit vlak...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Přejmenovat typ železničního vozidla
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nemohu přejmenovat typ železničního vozidla...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}U označeného příkazu vozidlo musí vyložit náklad
-STR_886F_TRANSFER                                               :{BLACK}Překládka
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}U označeného příkazu vozidlo musí vyložit náklad
+STR_TRANSFER                                                    :{BLACK}Překládka
 STR_CLEAR_TIME                                                  :{BLACK}Smazat čas
 STR_RESET_LATENESS                                              :{BLACK}Smazat ukazatel zpoždění
 
@@ -2919,8 +2919,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Přejmenovat silniční vozidlo
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První autobus přijel do {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní vozidlo přijelo do {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První tramvaj pro cestující přijela do {STATION}
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní tramvaj přijíždí do {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První tramvaj pro cestující přijela do {STATION}
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní tramvaj přijíždí do {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Dopravní nehoda!{}Řidič zahynul v plamenech při srážce s vlakem
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Dopravní nehoda!{}{COMMA} {P člověk lidé lidí} zahynul{P "" i o} v plamenech při srážce s vlakem
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nelze otočit vozidlo...
@@ -2929,7 +2929,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Přejmenovat typ silničního vozidla
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Přejmenovat typ silničního vozidla
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nelze přejmenovat typ silničního vozidla...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Jet do garáže {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Jet do garáže {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Údržba v garáži {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Přestavět silniční vozidlo, aby mohlo vozit jiný druh nákladu
--- a/src/lang/danish.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/danish.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}For mange navne defineret
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Valgte navn bruges allerede
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Last
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Lasteevner
-STR_013E_TOTAL_CARGO                                            :{BLACK}Samlet last
+STR_TOTAL_CARGO                                                 :{BLACK}Samlet last
 STR_013F_CAPACITY                                               :{BLACK}Lasteevne: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Samlet last (lasteevne) på dette tog:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Samlet last (lasteevne) på dette tog:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nyt spil
 STR_0141_LOAD_GAME                                              :{BLACK}Hent spil
@@ -728,7 +728,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Slet denne by fuldstændigt
 STR_0292_SAVE_SCENARIO                                          :Gem scenarie
 STR_0293_LOAD_SCENARIO                                          :Hent scenarie
-STR_LOAD_HEIGHTMAP                                              :Hent højdekort
+STR_MENU_LOAD_HEIGHTMAP                                         :Hent højdekort
 STR_0294_QUIT_EDITOR                                            :Afslut editoren
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Afslut
@@ -768,9 +768,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Spilvalg
-STR_02C5_DIFFICULTY_SETTINGS                                    :Sværhedsgrad
-STR_02C7_CONFIG_PATCHES                                         :Indstil programrettelser
+STR_02C4_GAME_OPTIONS                                           :Spilvalg
+STR_02C6_DIFFICULTY_SETTINGS                                    :Sværhedsgrad
+STR_MENU_CONFIG_PATCHES                                         :Indstil programrettelser
 STR_NEWGRF_SETTINGS                                             :NewGRF indstillinger
 STR_TRANSPARENCY_OPTIONS                                        :Gennemsigtighedsvalg
 STR_GAMEOPTMENU_0A                                              :
@@ -870,8 +870,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Gemmer stadig,{}vent venligst!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Vælg 'Ezy Street musik' program
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engelske
@@ -1645,42 +1645,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Det er nødvendigt at fjerne vejen først
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vejarbejde i gang
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Vejkonstruktion
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Sporvejskonstruktion
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Sporvejskonstruktion
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Vælg vejbro
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... ensrettede veje kan ikke have kryds
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kan ikke bygge vej her...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Kan ikke bygge sporvej her...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Kan ikke bygge sporvej her...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Kan ikke fjerne vej herfra...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Kan ikke fjerne sporvej her...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Kan ikke fjerne sporvej her...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Retning af værksted
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Retning af sporvognsremise
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Retning af sporvognsremise
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan ikke bygge værksted her...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Kan ikke bygge sporvognsremise her...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Kan ikke bygge sporvognsremise her...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Kan ikke bygge rutebilstation...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kan ikke bygge fragtcentral...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Kan ikke bygge passager-sporvognsstation...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Kan ikke bygge fragt-sporvognsstation...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Kan ikke bygge passager-sporvognsstation...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Kan ikke bygge fragt-sporvognsstation...
 STR_180A_ROAD_CONSTRUCTION                                      :Vejkonstruktion
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Sporvejskonstruktion
+STR_TRAMWAY_CONSTRUCTION                                        :Sporvejskonstruktion
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Byg en sektion vej
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Byg vejsektion ved hjælp af 'Auto-vej'
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Byg sporvejssektion
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Byg sporvejssektion
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Byg sporvejssektion ved hjælp af 'Auto-sporvej'
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Byg værksted (til bygning og servicering af vejkøretøjer)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Byg sporvognsremise (til konstruktion og service af vogne)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Byg sporvognsremise (til konstruktion og service af vogne)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Byg rutebilstation
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Byg fragtcentral
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Byg passager-sporvognsstation
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Byg fragt-sporvognsstation
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Byg passager-sporvognsstation
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Byg fragt-sporvognsstation
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Byg bro
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Byg sporvejsbro
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Byg sporvejsbro
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Byg tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Byg sporvejstunnel
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Byg sporvejstunnel
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Aktiver/Deaktiver ensrettede veje
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Skift mellem bygning/fjernelse af veje
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Skift mellem bygning/fjernelse af sporveje
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Skift mellem bygning/fjernelse af sporveje
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Vælg retning for værksted
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Vælg retning af sporvognsremise
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Vælg retning af sporvognsremise
 STR_1814_ROAD                                                   :Vej
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Vej med gadelygter
 STR_1816_TREE_LINED_ROAD                                        :Vej med vejtræer
@@ -1823,8 +1823,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Grænser op til mere end en eksisterende station/fragtcentral
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}For mange stationer/fragtcentraler i denne by
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}For mange stationer/fragtcentraler
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}For mange busterminaler
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}For mange fragtcentraler
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}For mange busterminaler
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}For mange fragtcentraler
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}For tæt på en anden station/fragtcentral
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Det er nødvendigt at rive stationen ned først
@@ -1855,12 +1855,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} accepterer nu {STRING} og {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Retning af rutebilstation
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Retning af fragtcentral
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Retning af sporvognsstation
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Retning af sporvognsstation
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Retning af sporvognsstation
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Retning af sporvognsstation
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Det er nødvendigt at nedrive rutebilstationen først
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Det er nødvendigt at rive fragtcentralen ned først
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Passager-sporvognsstation skal fjernes først
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Fragt-sporvognsstation skal fjernes først
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Passager-sporvognsstation skal fjernes først
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Fragt-sporvognsstation skal fjernes først
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stationer
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ingen -
@@ -1872,8 +1872,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Vælg længde af banegård
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Vælg retning af rutebilstation
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Vælg retning af fragtcentral
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Vælg retning af sporvognsstation
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Vælg retning af sporvognsstation
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Vælg retning af sporvognsstation
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Vælg retning af sporvognsstation
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centrer skærmen over stationens lokalitet
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Vis stationens bedømmelse
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Ændre stationens navn
@@ -1895,7 +1895,7 @@
 STR_3069_BUOY                                                   :Bøje
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...der er en bøje i vejen
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stationen er for spredt
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ikke uniforme stationer er slået fra
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ikke uniforme stationer er slået fra
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hold CTRL nede for at vælge mere end en ting
 
 STR_UNDEFINED                                                   :(udefineret tekststring)
@@ -1936,7 +1936,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Vælg Spiltype til Nyt Spil
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Vælg scenarie (grøn), predefineret spil (blå), eller nyt tilfældigt spil
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Generer nyt tilfældigt spil
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Hent højdekort
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Hent højdekort
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} i vejen
@@ -2140,10 +2140,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Økonomi: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Tog vender: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastrofer: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Byrådets holdning til ændring i landskabet: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Byrådets holdning til ændring i landskabet: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Ingen
+STR_NONE                                                        :Ingen
 STR_NUM_VERY_LOW                                                :Meget lav
 STR_6816_LOW                                                    :Lav
 STR_6817_NORMAL                                                 :Normal
@@ -2181,9 +2181,9 @@
 STR_6836_OFF                                                    :Fra
 STR_6837_ON                                                     :Til
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Vis higscoreliste
-STR_6839_PERMISSIVE                                             :Passiv
-STR_683A_TOLERANT                                               :Tolerant
-STR_683B_HOSTILE                                                :Fjendtlig
+STR_PERMISSIVE                                                  :Passiv
+STR_TOLERANT                                                    :Tolerant
+STR_HOSTILE                                                     :Fjendtlig
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2320,7 +2320,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan ikke sælge 25% aktier i dette selskab...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% ejes af {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} er blevet overtaget af {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Dette selskab sælger ikke aktier endnu...
+STR_PROTECTED                                                   :{WHITE}Dette selskab sælger ikke aktier endnu...
 
 STR_LIVERY_DEFAULT                                              :Standardfarver
 STR_LIVERY_STEAM                                                :Damplokomotiv
@@ -2627,17 +2627,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Gå til {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Gå til {STATION} (Overfør og tag gods)
-STR_8808_GO_TO_UNLOAD                                           :Gå til {STATION} (Aflæs)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Gå til {STATION} (Overfør og efterlad tom)
-STR_880A_GO_TO_LOAD                                             :Gå til {STATION} (Fuld last)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Gå til {STATION} (Overfør og vent på fuld last)
-STR_880C_GO_NON_STOP_TO                                         :Gå uden stop til {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Gå uden stop til {STATION} (Overfør og tag gods)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Gå uden stop til {STATION} (Aflæs)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Gå uden stop til {STATION} (Overfør og efterlad tom)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Gå uden stop til {STATION} (Fuld last)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Gå uden stop til {STATION} (Overfør og vent på fuld last)
+STR_GO_TO_TRANSFER                                              :Gå til {STATION} (Overfør og tag gods)
+STR_8807_GO_TO_UNLOAD                                           :Gå til {STATION} (Aflæs)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Gå til {STATION} (Overfør og efterlad tom)
+STR_8808_GO_TO_LOAD                                             :Gå til {STATION} (Fuld last)
+STR_GO_TO_TRANSFER_LOAD                                         :Gå til {STATION} (Overfør og vent på fuld last)
+STR_880A_GO_NON_STOP_TO                                         :Gå uden stop til {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Gå uden stop til {STATION} (Overfør og tag gods)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Gå uden stop til {STATION} (Aflæs)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Gå uden stop til {STATION} (Overfør og efterlad tom)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Gå uden stop til {STATION} (Fuld last)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Gå uden stop til {STATION} (Overfør og vent på fuld last)
 STR_GO_TO_TRAIN_DEPOT                                           :Gå til {TOWN} remise
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Service i {TOWN} remise
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Gå uden stop til {TOWN} remise
@@ -2741,7 +2741,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Vis detaljer omkring den last der medbringes
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Vis detaljer omkring toget/vognene
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Vis kapaciteten af hver togvogn
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Vis total lasteevne på toget, fordelt på lasttyper
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Vis total lasteevne på toget, fordelt på lasttyper
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Ordreliste - klik på en ordre for at markere den. CTRL-klik for at centrere skærmen over stationen
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Spring over nuværende ordre og start næste. CTRL + klik springer til den valgte ordre
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Slet den markerede ordre
@@ -2772,8 +2772,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan ikke vende retningen af toget...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Omdøb tog-/togvognstypen
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan ikke omdøbe tog-/togvognstypen...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Få den valgte ordre til at tvinge køretøjet til at smide lasten
-STR_886F_TRANSFER                                               :{BLACK}Overfør
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Få den valgte ordre til at tvinge køretøjet til at smide lasten
+STR_TRANSFER                                                    :{BLACK}Overfør
 STR_CLEAR_TIME                                                  :{BLACK}Nulstil tid
 STR_RESET_LATENESS                                              :{BLACK}Nulstil forsinkelse
 
@@ -2850,8 +2850,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Giv køretøjet et navn
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første bus ankommer til {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første lastbil ankommer til {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første passager-sporvogn ankommer til {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første fragt-sporvogn ankommer til {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første passager-sporvogn ankommer til {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første fragt-sporvogn ankommer til {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Lastbil forulykket!{}Chauffør dør i flammerne efter sammenstød med tog
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Bus forulykket!{}{COMMA} dør i flammerne efter kollision med et tog
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan ikke få køretøjet til at vende...
@@ -2860,7 +2860,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Omdøb køretøjstypen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Omdøb køretøjstypen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan ikke omdøbe køretøjstypen...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Gå til {TOWN} værksted
+STR_GO_TO_ROADVEH_DEPOT                                         :Gå til {TOWN} værksted
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Service i {TOWN} værksted
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Ombyg vejkøretøj til at laste en anden type last
--- a/src/lang/dutch.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/dutch.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Te veel namen in gebruik
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Deze naam is al in gebruik
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Lading
 STR_013D_INFORMATION                                            :{BLACK}Informatie
 STR_013E_CAPACITIES                                             :{BLACK}Capaciteiten
-STR_013E_TOTAL_CARGO                                            :{BLACK}Totale lading
+STR_TOTAL_CARGO                                                 :{BLACK}Totale lading
 STR_013F_CAPACITY                                               :{BLACK}Capaciteit: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capaciteit: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Totale lading (capaciteit) van deze trein:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Totale lading (capaciteit) van deze trein:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nieuw spel
 STR_0141_LOAD_GAME                                              :{BLACK}Laad spel
@@ -728,7 +728,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Verwijder deze hele stad
 STR_0292_SAVE_SCENARIO                                          :Scenario opslaan
 STR_0293_LOAD_SCENARIO                                          :Scenario openen
-STR_LOAD_HEIGHTMAP                                              :Laad hoogtekaart
+STR_MENU_LOAD_HEIGHTMAP                                         :Laad hoogtekaart
 STR_0294_QUIT_EDITOR                                            :Sluit editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Afsluiten
@@ -768,9 +768,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Spelopties
-STR_02C5_DIFFICULTY_SETTINGS                                    :Moeilijkheidsgraad
-STR_02C7_CONFIG_PATCHES                                         :Kies patches
+STR_02C4_GAME_OPTIONS                                           :Spelopties
+STR_02C6_DIFFICULTY_SETTINGS                                    :Moeilijkheidsgraad
+STR_MENU_CONFIG_PATCHES                                         :Kies patches
 STR_NEWGRF_SETTINGS                                             :Newgrf instellingen
 STR_TRANSPARENCY_OPTIONS                                        :Doorzichtigheidsopties
 STR_GAMEOPTMENU_0A                                              :
@@ -870,8 +870,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Opslaan van spel is nog bezig,{}Wacht tot dit voltooid is!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Kies 'Ezy Street style music' programma
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engels (Origineel)
@@ -1646,42 +1646,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Moet weg eerst weghalen
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Er wordt aan de weg gewerkt
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Wegenbouw
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Bouw tramrails
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Bouw tramrails
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Kies brug
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... eenrichtingswegen kunnen geen kruisingen hebben
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kan hier geen weg bouwen...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Kan geen tramrails bouwen hier...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Kan geen tramrails bouwen hier...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Kan hier geen weg weghalen...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Kan de tramrails hier niet verwijderen...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Kan de tramrails hier niet verwijderen...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Bouw wegvoertuigdepot
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Tram depot richting
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Tram depot richting
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan hier geen vrachtwagendepot bouwen...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Kan geen tram voertuig depot bouwen hier...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Kan geen tram voertuig depot bouwen hier...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Kan hier geen bushalte bouwen...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kan hier geen laadstation bouwen...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Kan geen passagiers tram station bouwen...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Kan geen vracht tram station bouwen...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Kan geen passagiers tram station bouwen...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Kan geen vracht tram station bouwen...
 STR_180A_ROAD_CONSTRUCTION                                      :Wegenbouw
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Tramrails constructie
+STR_TRAMWAY_CONSTRUCTION                                        :Tramrails constructie
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Bouw weg
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Bouw weg met de Autoweg-methode
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Bouw tramrails onderdeel
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Bouw tramrails onderdeel
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Bouw tramrails met de Autotram-methode
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bouw wegvoertuigdepot (om voertuigen te bouwen en te repareren)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Bouw tram voertuig depot (voor de bouw en onderhoud)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Bouw tram voertuig depot (voor de bouw en onderhoud)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Bouw bushalte
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bouw vrachtwagen laadhal
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Bouw passagiers tram station
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Bouw vracht tram station
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Bouw passagiers tram station
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Bouw vracht tram station
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bouw brug voor wegvoertuigen
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Bouw tramrails brug
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Bouw tramrails brug
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Bouw wegtunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Bouw tramrails tunnel
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Bouw tramrails tunnel
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Activeer/Deactiveer eenrichtingsverkeer
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Schakel tussen bouwen en verwijderen voor wegbouw
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Schakelaar tussen bouwen/verwijderen van tramrails
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Schakelaar tussen bouwen/verwijderen van tramrails
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Selecteer richting van wegvoertuigdepot
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Selecteer tram voertuig depot richting
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Selecteer tram voertuig depot richting
 STR_1814_ROAD                                                   :Weg
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Weg met straatlantaarns
 STR_1816_TREE_LINED_ROAD                                        :Weg met bomenrij
@@ -1824,8 +1824,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Voegt meer dan één bestaand (laad)station samen
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Teveel (laad)stations in de buurt van deze stad
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Teveel (laad)stations
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Te veel bushaltes
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Te veel vrachtwagenstations
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Te veel bushaltes
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Te veel vrachtwagenstations
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Te dicht bij een andere (laad)station
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Verwijder eerst treinstation
@@ -1856,12 +1856,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} accepteert voortaan {STRING} en {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Bouw bushalte
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Bouw Vrachtwagenstation
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Passagiers tram richting
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Vracht tram richting
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Passagiers tram richting
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Vracht tram richting
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Verwijder eerst bushalte
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Verwijder eerst vrachtwagenstation
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Verwijder eerst passagiers tram station
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Verwijder eerst vracht tram station
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Verwijder eerst passagiers tram station
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Verwijder eerst vracht tram station
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stations
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Geen -
@@ -1873,8 +1873,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Selecteer lengte van station
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Selecteer richting van bushalte
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Selecteer richting van vrachtwagenstation
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Selecteer passagiers tram station richting
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Selecteer vracht tram station richting
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Selecteer passagiers tram station richting
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Selecteer vracht tram station richting
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centreer hoofdbeeld op locatie van station
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Bekijk stationsreputaties
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Hernoem station
@@ -1896,7 +1896,7 @@
 STR_3069_BUOY                                                   :Boei
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...boei in de weg
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...station te verspreid
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...niet uniforme stations uit
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...niet uniforme stations uit
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Houd CTRL ingedrukt om meer items te kiezen
 
 STR_UNDEFINED                                                   :(ongedefinieerde string)
@@ -1937,7 +1937,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Selecteer nieuw speltype
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Selecteer scenario (groen), vooraf ingesteld spel (blauw), or willekeurig nieuw spel
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Genereer willekeurig nieuw spel
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Laad Hoogtekaart
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Laad Hoogtekaart
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} in de weg
@@ -2141,10 +2141,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economie: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Treinen draaien om: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Rampen: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Houding van gemeente mbt landschapsaanpassingen: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Houding van gemeente mbt landschapsaanpassingen: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Geen
+STR_NONE                                                        :Geen
 STR_NUM_VERY_LOW                                                :Erg laag
 STR_6816_LOW                                                    :Laag
 STR_6817_NORMAL                                                 :Normaal
@@ -2182,9 +2182,9 @@
 STR_6836_OFF                                                    :Uit
 STR_6837_ON                                                     :Aan
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Bekijk topscore lijst
-STR_6839_PERMISSIVE                                             :Tolerant
-STR_683A_TOLERANT                                               :Neutraal
-STR_683B_HOSTILE                                                :Negatief
+STR_PERMISSIVE                                                  :Tolerant
+STR_TOLERANT                                                    :Neutraal
+STR_HOSTILE                                                     :Negatief
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2321,7 +2321,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan geen 25% aandeel in dit bedrijf verkopen...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% eigendom van {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} is overgenomen door {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Dit bedrijf verhandelt nog geen aandelen...
+STR_PROTECTED                                                   :{WHITE}Dit bedrijf verhandelt nog geen aandelen...
 
 STR_LIVERY_DEFAULT                                              :Standaard Logo
 STR_LIVERY_STEAM                                                :Stoom Locomotief
@@ -2630,17 +2630,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Ga naar {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Ga naar {STATION} (Overladen en neem goederen)
-STR_8808_GO_TO_UNLOAD                                           :Ga naar {STATION} (Uit laden)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Ga naar {STATION} (Overladen en leeg laten)
-STR_880A_GO_TO_LOAD                                             :Ga naar {STATION} (Laden)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Ga naar {STATION} (Overladen en wacht tot vol geladen)
-STR_880C_GO_NON_STOP_TO                                         :Ga non-stop naar {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Ga non-stop naar {STATION} (Overladen en neem goederen)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Ga non-stop naar {STATION} (Uitladen)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Ga non-stop naar {STATION} (Overladen en leeg laten)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Ga non-stop naar {STATION} (Laden)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ga non-stop naar {STATION} (Overladen en wacht tot vol geladen)
+STR_GO_TO_TRANSFER                                              :Ga naar {STATION} (Overladen en neem goederen)
+STR_8807_GO_TO_UNLOAD                                           :Ga naar {STATION} (Uit laden)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Ga naar {STATION} (Overladen en leeg laten)
+STR_8808_GO_TO_LOAD                                             :Ga naar {STATION} (Laden)
+STR_GO_TO_TRANSFER_LOAD                                         :Ga naar {STATION} (Overladen en wacht tot vol geladen)
+STR_880A_GO_NON_STOP_TO                                         :Ga non-stop naar {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Ga non-stop naar {STATION} (Overladen en neem goederen)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Ga non-stop naar {STATION} (Uitladen)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Ga non-stop naar {STATION} (Overladen en leeg laten)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Ga non-stop naar {STATION} (Laden)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Ga non-stop naar {STATION} (Overladen en wacht tot vol geladen)
 STR_GO_TO_TRAIN_DEPOT                                           :Ga naar {TOWN} Trein Depot
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Reparatie in {TOWN} treindepot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ga zonder tussenstop naar {TOWN} Treindepot
@@ -2744,7 +2744,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Laat details zien van vervoerde goederen
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Laat details zien van treinvoertuigen
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Laat de mogelijkheden van elk voertuig zien
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Laat totale capaciteit van trein zien, gescheiden door goederentype
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Laat totale capaciteit van trein zien, gescheiden door goederentype
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Orderlijst - klik op een order om deze te selecteren. CTRL + klikken gaat naar het station
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Sla huidige order over, en begin met de volgende. CTRL + klik, begin direct met geselecteerde order
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Verwijder de geselecteerde order
@@ -2775,8 +2775,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan de richting van de trein niet omdraaien...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Hernoem trein voertuig type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan het trein voertuig type niet hernoemen...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Forceer het voertuig goederen te dumpen bij geselecteerde order
-STR_886F_TRANSFER                                               :{BLACK}Overladen
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Forceer het voertuig goederen te dumpen bij geselecteerde order
+STR_TRANSFER                                                    :{BLACK}Overladen
 STR_CLEAR_TIME                                                  :{BLACK}Reset de tijd
 STR_RESET_LATENESS                                              :{BLACK}Reset teller
 
@@ -2854,8 +2854,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Benoem wegvoertuig
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Inwoners feesten...{}Eerste bus arriveert in {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Inwoners feesten...{}Eerste vrachtwagen arriveert in {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste passagiers tram arriveert in {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste vracht tram arriveert in {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste passagiers tram arriveert in {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste vracht tram arriveert in {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}Bestuurder verongelukt door treinbotsing
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}{COMMA} verongelukt door treinbotsing
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan voertuig niet omdraaien...
@@ -2864,7 +2864,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Hernoem wegvoertuigtype
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Hernoem wegvoertuigtype
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan wegvoertuigtype niet hernoemen...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Ga naar {TOWN} Wegvoertuig Depot
+STR_GO_TO_ROADVEH_DEPOT                                         :Ga naar {TOWN} Wegvoertuig Depot
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Repareren in {TOWN} wagendepot
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Verbouw het wegvoertuig om een andere lading the vervoeren
--- a/src/lang/english_US.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/english_US.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Too many names defined
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Chosen name already in use
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Cargo
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Capacities
-STR_013E_TOTAL_CARGO                                            :{BLACK}Total Cargo
+STR_TOTAL_CARGO                                                 :{BLACK}Total Cargo
 STR_013F_CAPACITY                                               :{BLACK}Capacity: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacity: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Total cargo (capacity) of this train:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Total cargo (capacity) of this train:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}New Game
 STR_0141_LOAD_GAME                                              :{BLACK}Load Game
@@ -728,7 +728,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Delete this town completely
 STR_0292_SAVE_SCENARIO                                          :Save scenario
 STR_0293_LOAD_SCENARIO                                          :Load scenario
-STR_LOAD_HEIGHTMAP                                              :Load heightmap
+STR_MENU_LOAD_HEIGHTMAP                                         :Load heightmap
 STR_0294_QUIT_EDITOR                                            :Quit editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Quit
@@ -768,9 +768,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Game options
-STR_02C5_DIFFICULTY_SETTINGS                                    :Difficulty settings
-STR_02C7_CONFIG_PATCHES                                         :Configure patches
+STR_02C4_GAME_OPTIONS                                           :Game options
+STR_02C6_DIFFICULTY_SETTINGS                                    :Difficulty settings
+STR_MENU_CONFIG_PATCHES                                         :Configure patches
 STR_NEWGRF_SETTINGS                                             :Newgrf settings
 STR_TRANSPARENCY_OPTIONS                                        :Transparency options
 STR_GAMEOPTMENU_0A                                              :
@@ -870,8 +870,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Saving still in progress,{}please wait until it is finished!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Select 'Ezy Street style music' program
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :English (Original)
@@ -1645,42 +1645,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Must remove road first
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Road works in progress
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Road Construction
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Tramway Construction
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Tramway Construction
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Select Road Bridge
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... one way roads can't have junctions
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Can't build road here...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Can't build tramway here...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Can't build tramway here...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Can't remove road from here...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Can't remove tramway from here...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Can't remove tramway from here...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Road Depot Orientation
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Tram Depot Orientation
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Tram Depot Orientation
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Can't build road vehicle depot here...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Can't build tram vehicle depot here...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Can't build tram vehicle depot here...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Can't build bus station...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Can't build truck station...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Can't build passenger tram station...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Can't build freight tram station...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Can't build passenger tram station...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Can't build freight tram station...
 STR_180A_ROAD_CONSTRUCTION                                      :Road construction
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Tramway construction
+STR_TRAMWAY_CONSTRUCTION                                        :Tramway construction
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Build road section
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Build road section using the Autoroad mode
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Build tramway section
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Build tramway section
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Build tramway section using the Autotram mode
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Build road vehicle depot (for building and servicing vehicles)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Build tram vehicle depot (for building and servicing trams)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Build tram vehicle depot (for building and servicing trams)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Build bus station
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Build truck loading bay
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Build passenger tram station
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Build freight tram station
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Build passenger tram station
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Build freight tram station
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Build road bridge
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Build tramway bridge
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Build tramway bridge
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Build road tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Build tramway tunnel
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Build tramway tunnel
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Activate/Deactivate one way roads
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Toggle build/remove for road construction
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Toggle build/remove for tramway construction
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Toggle build/remove for tramway construction
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Select road vehicle depot orientation
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Select tram vehicle depot orientation
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Select tram vehicle depot orientation
 STR_1814_ROAD                                                   :Road
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Road with streetlights
 STR_1816_TREE_LINED_ROAD                                        :Tree-lined road
@@ -1823,8 +1823,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Adjoins more than one existing station/loading area
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Too many stations/loading areas in this town
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Too many stations/loading areas
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Too many bus stops
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Too many truck stations
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Too many bus stops
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Too many truck stations
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Too close to another station/loading area
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Must demolish railroad station first
@@ -1855,12 +1855,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} now accepts {STRING} and {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Bus Station Orientation
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Truck Station Orient.
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Passenger Tram Orientation
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Freight Tram Orientation
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Passenger Tram Orientation
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Freight Tram Orientation
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Must demolish bus station first
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Must demolish truck station first
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Must demolish passenger tram station first
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Must demolish freight tram station first
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Must demolish passenger tram station first
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Must demolish freight tram station first
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Station{P "" s}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- None -
@@ -1872,8 +1872,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Select length of railroad station
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Select bus station orientation
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Select truck loading bay orientation
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Select passenger tram station orientation
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Select freight tram station orientation
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Select passenger tram station orientation
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Select freight tram station orientation
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Center main view on station location
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Show station ratings
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Change name of station
@@ -1895,7 +1895,7 @@
 STR_3069_BUOY                                                   :Buoy
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...buoy in the way
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...station too spread out
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...nonuniform stations disabled
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...nonuniform stations disabled
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hold down CTRL to select more than one item
 
 STR_UNDEFINED                                                   :(undefined string)
@@ -1936,7 +1936,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Select New Game Type
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Select scenario (green), pre-set game (blue), or random new game
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Generate random new game
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Load Heightmap
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Load Heightmap
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} in the way
@@ -2140,10 +2140,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economy: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Train reversing: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Disasters: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}City council's attitude towards area restructuring: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}City council's attitude towards area restructuring: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :None
+STR_NONE                                                        :None
 STR_NUM_VERY_LOW                                                :Very low
 STR_6816_LOW                                                    :Low
 STR_6817_NORMAL                                                 :Normal
@@ -2181,9 +2181,9 @@
 STR_6836_OFF                                                    :Off
 STR_6837_ON                                                     :On
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Show hi-score chart
-STR_6839_PERMISSIVE                                             :Permissive
-STR_683A_TOLERANT                                               :Tolerant
-STR_683B_HOSTILE                                                :Hostile
+STR_PERMISSIVE                                                  :Permissive
+STR_TOLERANT                                                    :Tolerant
+STR_HOSTILE                                                     :Hostile
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2320,7 +2320,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Can't sell 25% share in this company...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}This company is not old enough to trade shares yet...
+STR_PROTECTED                                                   :{WHITE}This company is not old enough to trade shares yet...
 
 STR_LIVERY_DEFAULT                                              :Standard Livery
 STR_LIVERY_STEAM                                                :Steam Engine
@@ -2627,17 +2627,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Go to {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Go to {STATION} (Transfer and take cargo)
-STR_8808_GO_TO_UNLOAD                                           :Go to {STATION} (Unload)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Go to {STATION} (Transfer and leave empty)
-STR_880A_GO_TO_LOAD                                             :Go to {STATION} (Load)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Go to {STATION} (Transfer and wait for full load)
-STR_880C_GO_NON_STOP_TO                                         :Go non-stop to {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Go non-stop to {STATION} (Transfer and take cargo)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Go non-stop to {STATION} (Unload)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Go non-stop to {STATION} (Transfer and leave empty)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Go non-stop to {STATION} (Load)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Go non-stop to {STATION} (Transfer and wait for full load)
+STR_GO_TO_TRANSFER                                              :Go to {STATION} (Transfer and take cargo)
+STR_8807_GO_TO_UNLOAD                                           :Go to {STATION} (Unload)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Go to {STATION} (Transfer and leave empty)
+STR_8808_GO_TO_LOAD                                             :Go to {STATION} (Load)
+STR_GO_TO_TRANSFER_LOAD                                         :Go to {STATION} (Transfer and wait for full load)
+STR_880A_GO_NON_STOP_TO                                         :Go non-stop to {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Go non-stop to {STATION} (Transfer and take cargo)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Go non-stop to {STATION} (Unload)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Go non-stop to {STATION} (Transfer and leave empty)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Go non-stop to {STATION} (Load)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Go non-stop to {STATION} (Transfer and wait for full load)
 STR_GO_TO_TRAIN_DEPOT                                           :Go to {TOWN} Train Depot
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Service at {TOWN} Train Depot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Go non-stop to {TOWN} Train Depot
@@ -2741,7 +2741,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Show details of cargo carried
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Show details of train vehicles
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Show capacities of each vehicle
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Show total capacity of train, split by cargo type
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Show total capacity of train, split by cargo type
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Orders list - click on order to highlight it
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Skip the current order, and start the next. CTRL + click skips to the selected order)
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Delete the highlighted order
@@ -2772,8 +2772,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Can't reverse direction of train...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Rename train vehicle type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Can't rename train vehicle type...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Make the highlighted order force the vehicle to dump cargo
-STR_886F_TRANSFER                                               :{BLACK}Transfer
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Make the highlighted order force the vehicle to dump cargo
+STR_TRANSFER                                                    :{BLACK}Transfer
 STR_CLEAR_TIME                                                  :{BLACK}Clear Time
 STR_RESET_LATENESS                                              :{BLACK}Reset Late Counter
 
@@ -2850,8 +2850,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Name road vehicle
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First bus arrives at {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First truck arrives at {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger tram arrives at {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight tram arrives at {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger tram arrives at {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight tram arrives at {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Can't make vehicle turn around...
@@ -2860,7 +2860,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rename road vehicle type
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Rename road vehicle type
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Can't rename road vehicle type...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Go to {TOWN} Road Vehicle Depot
+STR_GO_TO_ROADVEH_DEPOT                                         :Go to {TOWN} Road Vehicle Depot
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Service at {TOWN} Road Vehicle Depot
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Refit road vehicle to carry a different cargo type
--- a/src/lang/esperanto.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/esperanto.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -273,9 +273,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Tro da nomoj difinitaj
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}La elektita nomo jam uziĝas
 
-STR_0133_WINDOWS                                                :Vindozo
-STR_0134_UNIX                                                   :Unikso
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Vindozo
+STR_OSNAME_UNIX                                                 :Unikso
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -286,11 +286,11 @@
 STR_013C_CARGO                                                  :{BLACK}Ŝarĝo
 STR_013D_INFORMATION                                            :{BLACK}Informoj
 STR_013E_CAPACITIES                                             :{BLACK}Kapabloj
-STR_013E_TOTAL_CARGO                                            :{BLACK}Tuta Ŝarĝo
+STR_TOTAL_CARGO                                                 :{BLACK}Tuta Ŝarĝo
 STR_013F_CAPACITY                                               :{BLACK}Enhavkapablo: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapablo: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Tuta ŝarĝkapablo de ĉi tiu trajno:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Tuta ŝarĝkapablo de ĉi tiu trajno:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nova Ludo
 STR_0141_LOAD_GAME                                              :{BLACK}Ŝarĝu ludon
@@ -726,7 +726,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Plene forigu ĉi tiun urbon
 STR_0292_SAVE_SCENARIO                                          :Konservu scenaron
 STR_0293_LOAD_SCENARIO                                          :Ŝarĝu scenaron
-STR_LOAD_HEIGHTMAP                                              :Ŝarĝu altecmapon
+STR_MENU_LOAD_HEIGHTMAP                                         :Ŝarĝu altecmapon
 STR_0294_QUIT_EDITOR                                            :Fermu kreilon
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Fermu
@@ -766,9 +766,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Ludaj opcioj
-STR_02C5_DIFFICULTY_SETTINGS                                    :Malfacilec-agordoj
-STR_02C7_CONFIG_PATCHES                                         :Agordu flikojn
+STR_02C4_GAME_OPTIONS                                           :Ludaj opcioj
+STR_02C6_DIFFICULTY_SETTINGS                                    :Malfacilec-agordoj
+STR_MENU_CONFIG_PATCHES                                         :Agordu flikojn
 STR_NEWGRF_SETTINGS                                             :Agordoj de NewGRF
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Urbonomoj montriĝas
@@ -867,8 +867,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Ankoraŭ konservas,{}bv atendi ĝis finiĝo!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Elektu programon de 'Facilvoja muziko'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Angle (Origine)
@@ -1723,8 +1723,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Alligas pli ol unu ekzistantan stacion/ŝarĝejon
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Tro da stacioj/ŝarĝejoj en la urbo
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Tro da stacioj/ŝarĝejoj
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Tro da bushaltejoj
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Tro da ŝarĝaŭtaj stacioj
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Tro da bushaltejoj
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Tro da ŝarĝaŭtaj stacioj
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Tro proksime al alia stacioj/ŝarĝejoj
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Antaŭe forigu stacidomon
@@ -1789,7 +1789,7 @@
 STR_3069_BUOY                                                   :Buo
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...buo okupas la lokon
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stacio tro vastas
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...nekonformaj stacioj neebligitaj
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...nekonformaj stacioj neebligitaj
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Tenu la CTRL-klavon por elekti pliajn erojn
 
 STR_UNDEFINED                                                   :(nedifinita tekstero)
@@ -1824,7 +1824,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Elektu Novan Ludtipon
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Elektu scenaron (green), antaŭ-agorditan ludon (blue), aŭ hazardan novan ludon
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Generu hazardan novan ludon
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Ŝarĝu Altecmapon
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Ŝarĝu Altecmapon
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} okupas la lokon
@@ -2019,10 +2019,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomio: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Trajna inversigo: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastrofoj: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Urbestrara teniĝo al regiona strukturŝanĝiĝo: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Urbestrara teniĝo al regiona strukturŝanĝiĝo: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Neniu
+STR_NONE                                                        :Neniu
 STR_NUM_VERY_LOW                                                :Tre malalte
 STR_6816_LOW                                                    :Malalte
 STR_6817_NORMAL                                                 :Normale
@@ -2060,9 +2060,9 @@
 STR_6836_OFF                                                    :Malaktiva
 STR_6837_ON                                                     :Aktiva
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Montru plej bonajn ludantojn
-STR_6839_PERMISSIVE                                             :Permeseme
-STR_683A_TOLERANT                                               :Tolerante
-STR_683B_HOSTILE                                                :Gastige
+STR_PERMISSIVE                                                  :Permeseme
+STR_TOLERANT                                                    :Tolerante
+STR_HOSTILE                                                     :Gastige
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2194,7 +2194,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Ne povas vendi 25%-an dividaĵon...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% posedataj de {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} estas transprenita de {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Ĉi tiu kompanio ne sufiĉe aĝas por jam komerci dividaĵojn...
+STR_PROTECTED                                                   :{WHITE}Ĉi tiu kompanio ne sufiĉe aĝas por jam komerci dividaĵojn...
 
 STR_LIVERY_DEFAULT                                              :Normala Koloro
 STR_LIVERY_STEAM                                                :Vapormaŝino
@@ -2499,17 +2499,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Iru al {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Iru al {STATION} (Transigu kaj prenu ŝarĝon)
-STR_8808_GO_TO_UNLOAD                                           :Iru al {STATION} (Deŝarĝu)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Iru al {STATION} (Transigu kaj lasu malplena)
-STR_880A_GO_TO_LOAD                                             :Iru al {STATION} (Ŝarĝu)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Iru al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
-STR_880C_GO_NON_STOP_TO                                         :Iru senhalte al {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Iru senhalte al {STATION} (Transigu kaj prenu ŝarĝon)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Iru senhalte al {STATION} (Deŝarĝu)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Iru senhalte al {STATION} (Transigu kaj lasu malplena)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Iru senhalte al {STATION} (Ŝarĝu)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Iru senhalte al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
+STR_GO_TO_TRANSFER                                              :Iru al {STATION} (Transigu kaj prenu ŝarĝon)
+STR_8807_GO_TO_UNLOAD                                           :Iru al {STATION} (Deŝarĝu)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Iru al {STATION} (Transigu kaj lasu malplena)
+STR_8808_GO_TO_LOAD                                             :Iru al {STATION} (Ŝarĝu)
+STR_GO_TO_TRANSFER_LOAD                                         :Iru al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
+STR_880A_GO_NON_STOP_TO                                         :Iru senhalte al {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Iru senhalte al {STATION} (Transigu kaj prenu ŝarĝon)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Iru senhalte al {STATION} (Deŝarĝu)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Iru senhalte al {STATION} (Transigu kaj lasu malplena)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Iru senhalte al {STATION} (Ŝarĝu)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Iru senhalte al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
 STR_GO_TO_TRAIN_DEPOT                                           :Iru al {TOWN} Trajndeponejo
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Prizorgo ĉe {TOWN} Trajndeponejo
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Iru senhalte al {TOWN} Trajndeponejo
@@ -2601,7 +2601,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Montru detalojn de portata ŝarĝo
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Montru detalojn de trajnaj veturiloj
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Montru kapablojn de ĉiu veturilo
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Montru tutan kapablon de trajno, dividite laŭ ŝarĝtipo
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Montru tutan kapablon de trajno, dividite laŭ ŝarĝtipo
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Ordena listo - alklaku ordenon por elekti. CTRL + klako skrolas al la stacio
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Forviŝu la elektitan ordenon
 STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Senhaltigu elektitan ordenon
@@ -2627,8 +2627,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Ne povas inversigi direkton de trajno...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renomu trajnan veturiltipon
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Ne povas renomi trajnan veturiltipon...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}La elektita ordeno igu la veturilon demeti la ŝarĝon
-STR_886F_TRANSFER                                               :{BLACK}Transigu
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}La elektita ordeno igu la veturilon demeti la ŝarĝon
+STR_TRANSFER                                                    :{BLACK}Transigu
 
 STR_TRAIN_STOPPING                                              :{RED}Haltiĝas
 STR_TRAIN_STOPPING_VEL                                          :{RED}Haltiĝas, {VELOCITY}
@@ -2695,7 +2695,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomu vojveturilan tipon
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomu vojveturilan tipon
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Ne povas renomi vojveturilan tipon...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Iru al {TOWN} Vojveturila Deponejo
+STR_GO_TO_ROADVEH_DEPOT                                         :Iru al {TOWN} Vojveturila Deponejo
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Prizorgo ĉe {TOWN} Vojveturila Deponejo
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Transformu vojveturilon por porti alian ŝarĝon
--- a/src/lang/estonian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/estonian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -372,9 +372,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Liiga palju määratletud nimesid
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Valitud nimi on juba kasutusel
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -385,11 +385,11 @@
 STR_013C_CARGO                                                  :{BLACK}Laadung
 STR_013D_INFORMATION                                            :{BLACK}Andmed
 STR_013E_CAPACITIES                                             :{BLACK}Kandevõimed
-STR_013E_TOTAL_CARGO                                            :{BLACK}Laadungit kokku
+STR_TOTAL_CARGO                                                 :{BLACK}Laadungit kokku
 STR_013F_CAPACITY                                               :{BLACK}Kandevõime: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kandevõime: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Selle rongi kandevõime:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Selle rongi kandevõime:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Uus mäng
 STR_0141_LOAD_GAME                                              :{BLACK}Mängu laadimine
@@ -828,7 +828,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Hävita see linn täielikult
 STR_0292_SAVE_SCENARIO                                          :Salvesta kaart
 STR_0293_LOAD_SCENARIO                                          :Laadi kaart
-STR_LOAD_HEIGHTMAP                                              :Lae kõrguskaart
+STR_MENU_LOAD_HEIGHTMAP                                         :Lae kõrguskaart
 STR_0294_QUIT_EDITOR                                            :Lahku redaktorist
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Välju
@@ -868,9 +868,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Mängu valikud
-STR_02C5_DIFFICULTY_SETTINGS                                    :Raskusastme seadistused
-STR_02C7_CONFIG_PATCHES                                         :Paikade seadistamine
+STR_02C4_GAME_OPTIONS                                           :Mängu valikud
+STR_02C6_DIFFICULTY_SETTINGS                                    :Raskusastme seadistused
+STR_MENU_CONFIG_PATCHES                                         :Paikade seadistamine
 STR_NEWGRF_SETTINGS                                             :NewGRF seadistused
 STR_TRANSPARENCY_OPTIONS                                        :Läbipaistvuse valikud
 STR_GAMEOPTMENU_0A                                              :
@@ -970,8 +970,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Ikka salvestamisel,{}palun oota salvestuse lõpuni!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}'Ezy Street' stiilis muusikaprogrammi valimine
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglise (originaalne)
@@ -1746,42 +1746,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Enne on vaja sõidutee lammutada
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Teede ehitamine
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Sõiduteede ehitus
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Trammitee ehitamine
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Trammitee ehitamine
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Vali sillatüüp
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... ühesuunalised teed ei saa teedesõlmi omada
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Siia ei saa sõiduteed ehitada...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Trammiteed ei ole võimalik siia rajada...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Trammiteed ei ole võimalik siia rajada...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Siinset sõiduteed ei saa lammutada...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Siinset trammiteed ei saa lammutada...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Siinset trammiteed ei saa lammutada...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Depoo suund
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Trammidepoo suund
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Trammidepoo suund
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Siia ei saa depood ehitada...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Trammidepood ei saa siia rajada
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Trammidepood ei saa siia rajada
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Siia ei saa bussijaama ehitada...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Siia ei saa laadimisplatsi ehitada...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Siia ei saa reisitrammijaama rajada...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Siia ei saa kaubatrammijaama rajada...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Siia ei saa reisitrammijaama rajada...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Siia ei saa kaubatrammijaama rajada...
 STR_180A_ROAD_CONSTRUCTION                                      :Tee-ehitus
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Trammitee ehitamine
+STR_TRAMWAY_CONSTRUCTION                                        :Trammitee ehitamine
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Ehita sõidutee blokk
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Ehita autotee osa kasutades Autoroad režiimi
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Ehita trammitee blokk
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Ehita trammitee blokk
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Ehita trammitee osa kasutades Autotram režiimi
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Depoo ehitamine (veovahendite ehitamiseks ja hooldamiseks)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Ehita trammidepoo (veeremi ehitamiseks ja hoolduseks)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Ehita trammidepoo (veeremi ehitamiseks ja hoolduseks)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Ehita bussijaam
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Ehita veokite laadimisplats
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Ehita reisitrammijaam
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Ehita kaubatrammijaam
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Ehita reisitrammijaam
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Ehita kaubatrammijaam
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Ehita sild
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Ehita trammisild
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Ehita trammisild
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Ehita tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Ehita trammitunnel
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Ehita trammitunnel
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Lülita ühesuunalised teed sisse/välja
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Tee-ehituse ja -lammutamise vahetamine
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Lülitu trammitee ehitamise ja lammutamise vahel
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Lülitu trammitee ehitamise ja lammutamise vahel
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Vali depoole suund
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Vali trammidepoo suund
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Vali trammidepoo suund
 STR_1814_ROAD                                                   :Sõidutee
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Valgustatud sõidutee
 STR_1816_TREE_LINED_ROAD                                        :Puiestee
@@ -1924,8 +1924,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Mitme olemasoleva jaama ühendamine
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Selles linnas on juba liiga palju jaamasid
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Liiga palju jaamu
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Liiga palju bussipeatusi
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Liiga palju laadimisplatvorme
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Liiga palju bussipeatusi
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Liiga palju laadimisplatvorme
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Mõnele teisele jaamale liiga lähedal
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Raudteejaam tuleb eelnevalt lammutada
@@ -1956,12 +1956,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}Jaam {STATION} võtab nüüd vastu veoseid {STRING} ja {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Bussijaama suund
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Laadimisplatsi suund
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Reisitrammi suund
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Kaubatrammi suund
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Reisitrammi suund
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Kaubatrammi suund
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Bussijaam tuleb enne hävitada
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Enne pead laadimisplatsi hävitama
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Reisitrammijaam tuleb eelnevalt lammutada
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Kaubatrammijaam tuleb eelnevalt lammutada
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Reisitrammijaam tuleb eelnevalt lammutada
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Kaubatrammijaam tuleb eelnevalt lammutada
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} jaam{P "" a}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Puudub -
@@ -1973,8 +1973,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Vali raudteejaama pikkus
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Vali bussijaamale suund
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Vali laadimisplatsile suund
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Vali reisitrammijaama suund
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Vali kaubatrammijaama suund
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Vali reisitrammijaama suund
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Vali kaubatrammijaama suund
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Vaate viimine jaama juurde
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Näita jaamahinnangut
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Muuda jaama nime
@@ -1996,7 +1996,7 @@
 STR_3069_BUOY                                                   :Poi
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...poi on ees
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...jaam on liiga laiaks venitatud
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...korrapäratud jaamad keelatud
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...korrapäratud jaamad keelatud
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Enam kui ühe eseme valimiseks hoia all CTRL klahvi
 
 STR_UNDEFINED                                                   :(määratlemata väljend)
@@ -2037,7 +2037,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Vali uue mängu tüüp
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Vali valmis kaart (roheline), eelseadistatud mäng (sinine), või juhusliku kaardiga uus mäng
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Tekita suvaline kaart
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Laadi kõrguskaart
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Laadi kõrguskaart
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} on ees
@@ -2241,10 +2241,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Majandus: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Rongide ümberpööramine: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastroofid: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Linnanõukogu suhtumine maastikukujundusse: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Linnanõukogu suhtumine maastikukujundusse: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Pole
+STR_NONE                                                        :Pole
 STR_NUM_VERY_LOW                                                :Väga madal
 STR_6816_LOW                                                    :Madal
 STR_6817_NORMAL                                                 :Harilik
@@ -2282,9 +2282,9 @@
 STR_6836_OFF                                                    :Väljas
 STR_6837_ON                                                     :Sees
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Näita mängijate edetabelit
-STR_6839_PERMISSIVE                                             :Soodustav
-STR_683A_TOLERANT                                               :Tolerantne
-STR_683B_HOSTILE                                                :Vaenulik
+STR_PERMISSIVE                                                  :Soodustav
+STR_TOLERANT                                                    :Tolerantne
+STR_HOSTILE                                                     :Vaenulik
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2421,7 +2421,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Selle ettevõtte aktsiatest ei saa 25% müüa...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% on ettevõtte {COMPANY} käes)
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} võeti üle ettevõtte {COMPANY} poolt!
-STR_7080_PROTECTED                                              :{WHITE}See ettevõtte pole veel piisavalt vana, et aktsiaid vahetada...
+STR_PROTECTED                                                   :{WHITE}See ettevõtte pole veel piisavalt vana, et aktsiaid vahetada...
 
 STR_LIVERY_DEFAULT                                              :Firmavärv
 STR_LIVERY_STEAM                                                :Aurumootorvedur
@@ -2728,17 +2728,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Mine {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Mine {STATION} (laadi ümber ja võta laadung peale)
-STR_8808_GO_TO_UNLOAD                                           :Mine {STATION} (laadi maha)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Mine {STATION} (laadi ümber ja jäta tühjaks)
-STR_880A_GO_TO_LOAD                                             :Mine {STATION} (laadi)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Mine {STATION} (laadi ümber ja oota täislaadungit)
-STR_880C_GO_NON_STOP_TO                                         :Sõida läbi {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Sõida läbi {STATION} (laadi ümber ja oota täislaadungit)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Sõida läbi {STATION} (laadi maha)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Sõida läbi {STATION} (laadi ümber ja jäta tühjaks)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Sõida läbi {STATION} (laadi)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Sõida läbi {STATION} (laadi ümber ja oota täislaadungit)
+STR_GO_TO_TRANSFER                                              :Mine {STATION} (laadi ümber ja võta laadung peale)
+STR_8807_GO_TO_UNLOAD                                           :Mine {STATION} (laadi maha)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Mine {STATION} (laadi ümber ja jäta tühjaks)
+STR_8808_GO_TO_LOAD                                             :Mine {STATION} (laadi)
+STR_GO_TO_TRANSFER_LOAD                                         :Mine {STATION} (laadi ümber ja oota täislaadungit)
+STR_880A_GO_NON_STOP_TO                                         :Sõida läbi {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Sõida läbi {STATION} (laadi ümber ja oota täislaadungit)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Sõida läbi {STATION} (laadi maha)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Sõida läbi {STATION} (laadi ümber ja jäta tühjaks)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Sõida läbi {STATION} (laadi)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Sõida läbi {STATION} (laadi ümber ja oota täislaadungit)
 STR_GO_TO_TRAIN_DEPOT                                           :Mine linna {TOWN} rongidepoosse
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Hoolda linna {TOWN} rongidepoos
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Sõida läbi linna {TOWN} rongidepoo
@@ -2842,7 +2842,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Näita detaile viidud kauba kohta
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Näita täpsemat infot rongivagunite kohta
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Näita iga rongivaguni kandevõimet
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Näita kogu rongi mahtu, jagatud kauba tüübi järgi
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Näita kogu rongi mahtu, jagatud kauba tüübi järgi
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Sihtpunktide nimekiri - vajuta käsul et see valida. CTRL + klik kerib jaama juurde
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Jäta praegune järjestus vahele ja alusta järgmisega. CTRL + klõps jätab vahele kuni valitud järjestuseni
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Kustuta valitud käsk
@@ -2873,8 +2873,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Ei saa rongi ümber pöörata.
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Muuda rongivaguni tüübinime
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Raudteesõiduki tüübinime ei saa muuta...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Käsi valitud sihtpunktis sõiduki laadung kõrvaldada
-STR_886F_TRANSFER                                               :{BLACK}Laadi ümber
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Käsi valitud sihtpunktis sõiduki laadung kõrvaldada
+STR_TRANSFER                                                    :{BLACK}Laadi ümber
 STR_CLEAR_TIME                                                  :{BLACK}Tühista aeg
 STR_RESET_LATENESS                                              :{BLACK}Tühista hilinemisloendur
 
@@ -2952,8 +2952,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Nimeta mootorsõidukit
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}{STATION} jaama saabus esimene buss!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{} esimene veok saabus {STATION} jaama!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene reisitramm saabus trammijaama {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene kaubatramm saabus trammijaama {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene reisitramm saabus trammijaama {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene kaubatramm saabus trammijaama {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Rongikokkupõrge!{}Juht suri peale õnnetust tules
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Mootorsõiduki kokkupõrge rongiga!{}{COMMA} inimest suri õnnetuses
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Transpordivahendit ei saa ümber pöörata...
@@ -2962,7 +2962,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Muuda mootorsõiduki tüübinime
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Muuda mootorsõiduki tüübinime
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Mootorsõiduki tüübinime ei saa muuta...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Mine linna {TOWN} garaaži
+STR_GO_TO_ROADVEH_DEPOT                                         :Mine linna {TOWN} garaaži
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Hoolda linna {TOWN} mootorsõidukidepoos
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Seadista mootorsõidukit kandmaks teist tüüpi veost
--- a/src/lang/finnish.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/finnish.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Liian monta nimeä määritelty
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Nimi on jo käytössä
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS{NBSP}X{NBSP}
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS{NBSP}X{NBSP}
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Rahti
 STR_013D_INFORMATION                                            :{BLACK}Tietoa
 STR_013E_CAPACITIES                                             :{BLACK}Kapasiteetit
-STR_013E_TOTAL_CARGO                                            :{BLACK}Rahtia yhteensä
+STR_TOTAL_CARGO                                                 :{BLACK}Rahtia yhteensä
 STR_013F_CAPACITY                                               :{BLACK}Kapaisteetti: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapasiteetti: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Kokonaisrahtikapasiteetti:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Kokonaisrahtikapasiteetti:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Uusi peli
 STR_0141_LOAD_GAME                                              :{BLACK}Lataa peli
@@ -725,7 +725,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Poista tämä kaupunki kokonaan.
 STR_0292_SAVE_SCENARIO                                          :Tallenna skenaario
 STR_0293_LOAD_SCENARIO                                          :Lataa skenaario
-STR_LOAD_HEIGHTMAP                                              :Lataa korkeuskartta
+STR_MENU_LOAD_HEIGHTMAP                                         :Lataa korkeuskartta
 STR_0294_QUIT_EDITOR                                            :Sulje muokkain
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Sulje
@@ -765,9 +765,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Pelin asetukset
-STR_02C5_DIFFICULTY_SETTINGS                                    :Vaikeusasetukset
-STR_02C7_CONFIG_PATCHES                                         :Muokkaa paikkauksia
+STR_02C4_GAME_OPTIONS                                           :Pelin asetukset
+STR_02C6_DIFFICULTY_SETTINGS                                    :Vaikeusasetukset
+STR_MENU_CONFIG_PATCHES                                         :Muokkaa paikkauksia
 STR_NEWGRF_SETTINGS                                             :Newgrf-asetukset
 STR_TRANSPARENCY_OPTIONS                                        :Läpinäkyvyysvalinnat
 STR_GAMEOPTMENU_0A                                              :
@@ -866,8 +866,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Tallentaminen käynnissä,{}odota, kunnes se päättyy!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Valitse 'Ezy Street'.
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Englantilainen
@@ -1636,39 +1636,39 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Tie pitää siirtää ensin.
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Tietyöt ovat käynnissä.
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Tien rakentaminen
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Raitiotien rakentaminen
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Raitiotien rakentaminen
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Valitse maantiesilta
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... yksisuuntaisella kadulla ei voi olla risteystä
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Tietä ei voi rakentaa.
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Tähän ei voi rakentaa raitiotietä.
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Tähän ei voi rakentaa raitiotietä.
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Tietä ei voi poistaa.
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Tästä ei voi poistaa raitiotietä.
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Tästä ei voi poistaa raitiotietä.
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Autovarikon suunta
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Varikon suunta
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Varikon suunta
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Autovarikkoa ei voi rakentaa.
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Tähän ei voi rakentaa varikkoa.
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Tähän ei voi rakentaa varikkoa.
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Linja-autoasemaa ei voi rakentaa.
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Lastauslaituria ei voi rakentaa.
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Ei voi rakentaa asemaa.
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Ei voi rakentaa rahtiasemaa.
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Ei voi rakentaa asemaa.
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Ei voi rakentaa rahtiasemaa.
 STR_180A_ROAD_CONSTRUCTION                                      :Tien rakentaminen
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Raitiotien rakentaminen
+STR_TRAMWAY_CONSTRUCTION                                        :Raitiotien rakentaminen
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Rakenna tieosuus.
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Rakenna raitiotietä
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Rakenna raitiotietä
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Rakenna autovarikko (ajoneuvojen rakentamista ja huoltoa varten)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Rakenna raitiotievarikko (vaunujen rakentamiseen ja korjaamiseen)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Rakenna raitiotievarikko (vaunujen rakentamiseen ja korjaamiseen)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Rakenna linja-autoasema
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Rakenna lastauslaituri
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Rakenna asema
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Rakenna rahtiasema
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Rakenna asema
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Rakenna rahtiasema
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Rakenna maantiesilta
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Rakenna raitiotiesilta
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Rakenna raitiotiesilta
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Rakenna maantietunneli
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Rakenna raitiotietunneli
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Rakenna raitiotietunneli
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Tien rakentaminen/siirtäminen päälle/pois
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Vaihda rakentamisen ja purkamisen välillä
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Vaihda rakentamisen ja purkamisen välillä
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Valitse autovarikon suunta.
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Valitse varikon suunta
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Valitse varikon suunta
 STR_1814_ROAD                                                   :Tie
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Tie katuvaloilla
 STR_1816_TREE_LINED_ROAD                                        :Puilla reunustettu tie
@@ -1810,8 +1810,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Liitä yhteen useampi asema/lastausalue.
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Liian monta asemaa ja lastausaluetta kaupungissa.
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Liian monta asemaa ja lastausaluetta.
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Liian monta linja-autopysäkkiä.
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Liian monta lastauslaituria.
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Liian monta linja-autopysäkkiä.
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Liian monta lastauslaituria.
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Liian lähellä toista asemaa tai lastausaluetta.
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Rautatieasema pitää tuhota ensin.
@@ -1842,12 +1842,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} ottaa nyt vastaan {STRING} ja {STRING}.
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Linja-autoaseman suunta
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Lastauslaiturin suunta
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Aseman suunta
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Rahtiaseman suunta
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Aseman suunta
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Rahtiaseman suunta
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Linja-autoasema pitää purkaa ensin.
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Lastauslaituri pitää purkaa ensin.
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Asema täytyy purkaa ensin
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Rahtiasema täytyy purkaa ensin
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Asema täytyy purkaa ensin
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Rahtiasema täytyy purkaa ensin
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} asema{P "" a}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ei mitään -
@@ -1859,8 +1859,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Valitse rautatieaseman pituus.
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Valitse linja-autoaseman suunta.
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Valitse lastauslaiturin suunta.
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Valitse aseman suunta
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Valitse rahtiaseman suunta
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Valitse aseman suunta
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Valitse rahtiaseman suunta
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Keskitä näkymä aseman sijaintiin.
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Näytä aseman arviot.
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Muuta aseman nimi.
@@ -1882,7 +1882,7 @@
 STR_3069_BUOY                                                   :Poiju
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...poiju on tiellä.
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...asema liian levittäytynyt.
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...epäsymmetriset asemat poissa käytöstä.
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...epäsymmetriset asemat poissa käytöstä.
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Pidä CTRL painettuna valitaksesi enemmän kuin yhden tavaran
 
 STR_UNDEFINED                                                   :(määrittelemätön)
@@ -1923,7 +1923,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Valitse uusi pelityyppi
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Valitse skenaario (vihreä), alkuasetettu peli (sininen) tai satunnainen peli.
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Luo uusi satunnainen peli
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Lataa korkeuskartta
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Lataa korkeuskartta
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} on tiellä.
@@ -2125,10 +2125,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Talous: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Junien peruutus: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Onnettomuudet: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Kaupunginvaltuuston asenne alueen uudelleenjärjestelyyn: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Kaupunginvaltuuston asenne alueen uudelleenjärjestelyyn: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Ei mitään
+STR_NONE                                                        :Ei mitään
 STR_NUM_VERY_LOW                                                :Erittäin alhainen
 STR_6816_LOW                                                    :Matala
 STR_6817_NORMAL                                                 :Normaali
@@ -2166,9 +2166,9 @@
 STR_6836_OFF                                                    :Pois
 STR_6837_ON                                                     :Päällä
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Näytä pistetaulukko
-STR_6839_PERMISSIVE                                             :Salliva
-STR_683A_TOLERANT                                               :Suvaitseva
-STR_683B_HOSTILE                                                :Vihamielinen
+STR_PERMISSIVE                                                  :Salliva
+STR_TOLERANT                                                    :Suvaitseva
+STR_HOSTILE                                                     :Vihamielinen
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2300,7 +2300,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Tästä yhtiöstä ei voi myydä 25{NBSP}%:n osuutta...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}{NBSP}%:n omistus: {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}Yhtiön {COMPANY} on ottanut haltuun {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...
+STR_PROTECTED                                                   :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...
 
 STR_LIVERY_DEFAULT                                              :Normaalit tunnusvärit
 STR_LIVERY_STEAM                                                :Höyryveturi
@@ -2607,17 +2607,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Asemalle {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Mene asemalle {STATION} (Siirrä ja ota rahti)
-STR_8808_GO_TO_UNLOAD                                           :Mene asemalle {STATION} (Pura rahti)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Mene asemalle {STATION} (Siirrä ja jätä tyhjäksi)
-STR_880A_GO_TO_LOAD                                             :Mene asemalle {STATION} (Lastaa)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Mene asemalle {STATION} (Siirrä ja odota täyttä rahtia)
-STR_880C_GO_NON_STOP_TO                                         :Mene tauotta asemalle {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Mene tauotta asemalle {STATION} (Siirrä ja ota rahti)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Mene tauotta asemalle {STATION} (Pura rahti)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Mene tauotta asemalle {STATION} (Siirrä ja jätä tyhjäksi)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Mene tauotta asemalle {STATION} (Lastaa)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Mene tauotta asemalle {STATION} (Siirrä ja odota täyttä rahtia)
+STR_GO_TO_TRANSFER                                              :Mene asemalle {STATION} (Siirrä ja ota rahti)
+STR_8807_GO_TO_UNLOAD                                           :Mene asemalle {STATION} (Pura rahti)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Mene asemalle {STATION} (Siirrä ja jätä tyhjäksi)
+STR_8808_GO_TO_LOAD                                             :Mene asemalle {STATION} (Lastaa)
+STR_GO_TO_TRANSFER_LOAD                                         :Mene asemalle {STATION} (Siirrä ja odota täyttä rahtia)
+STR_880A_GO_NON_STOP_TO                                         :Mene tauotta asemalle {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Mene tauotta asemalle {STATION} (Siirrä ja ota rahti)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Mene tauotta asemalle {STATION} (Pura rahti)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Mene tauotta asemalle {STATION} (Siirrä ja jätä tyhjäksi)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Mene tauotta asemalle {STATION} (Lastaa)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Mene tauotta asemalle {STATION} (Siirrä ja odota täyttä rahtia)
 STR_GO_TO_TRAIN_DEPOT                                           :Mene kaupungin {TOWN} veturitalliin
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Huolto veturitallilla ({TOWN})
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Mene pysähtymättä veturitalliin ({TOWN})
@@ -2721,7 +2721,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Näytä kuljetettavan rahdin tiedot.
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Näytä yksikön tiedot.
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Näytä kunkin ajoneuvon kapasiteetti.
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Näytä junan kokonaiskapasiteetti, eritelty rahtityypin mukaan.
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Näytä junan kokonaiskapasiteetti, eritelty rahtityypin mukaan.
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Aikataulu - napsauta määräystä korostaaksesi.
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Ohita nykyinen pysähdys ja aloita seuraava.
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Poista korostettu määräys.
@@ -2752,8 +2752,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Junan suuntaa ei voi kääntää...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Nimeä juna(vaunu)n tyyppi uudelleen.
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Juna(vaunu)n tyyppiä ei voi uudelleennimetä...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Pakottaa tyhjentämään rahdin valitulla pysäkillä
-STR_886F_TRANSFER                                               :{BLACK}Siirrä
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Pakottaa tyhjentämään rahdin valitulla pysäkillä
+STR_TRANSFER                                                    :{BLACK}Siirrä
 STR_CLEAR_TIME                                                  :{BLACK}Nollaa aika
 STR_RESET_LATENESS                                              :{BLACK}Nollaa myöhästymislaskuri
 
@@ -2828,8 +2828,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Nimeä ajoneuvo
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen linja-auto saapuu asemalle {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen kuorma-auto saapuu asemalle {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen raitiovaunu saapuu asemalle {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen rahtiraitiovaunu saapuu asemalle {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen raitiovaunu saapuu asemalle {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen rahtiraitiovaunu saapuu asemalle {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Ajoneuvokolari!{}Kuljettaja kuolee junaan törmäyksen jälkeisessä tulipallossa
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Ajoneuvokolari!{}{COMMA} kuolee junaan törmäyksen jälkeisessä tulipallossa
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Ajoneuvoa ei voi pakottaa kääntymään ympäri...
@@ -2838,7 +2838,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Nimeä ajoneuvon tyyppi uudelleen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Nimeä ajoneuvon tyyppi uudelleen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Ajoneuvotyyppiä ei voi uudelleennimetä...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Aseta kohteeksi huoltoasema, {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Aseta kohteeksi huoltoasema, {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Huolto, kohteena huoltoasema, {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Muuta ajoneuvo rahtaamaan muuta rahtityyppiä.
--- a/src/lang/french.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/french.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -273,9 +273,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Trop de noms déjà définis
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Ce nom est déjà utilisé
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -286,11 +286,11 @@
 STR_013C_CARGO                                                  :{BLACK}Cargaison
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Capacités
-STR_013E_TOTAL_CARGO                                            :{BLACK}Charge totale
+STR_TOTAL_CARGO                                                 :{BLACK}Charge totale
 STR_013F_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacité: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Capacité totale de ce train:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Capacité totale de ce train:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nouvelle Partie
 STR_0141_LOAD_GAME                                              :{BLACK}Charger une Partie
@@ -730,7 +730,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Supprimer complètement cette ville
 STR_0292_SAVE_SCENARIO                                          :Sauvegarder scénario
 STR_0293_LOAD_SCENARIO                                          :Charger scénario
-STR_LOAD_HEIGHTMAP                                              :Charger une carte d'altitude
+STR_MENU_LOAD_HEIGHTMAP                                         :Charger une carte d'altitude
 STR_0294_QUIT_EDITOR                                            :Quitter éditeur
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Quitter
@@ -770,9 +770,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Options du Jeu
-STR_02C5_DIFFICULTY_SETTINGS                                    :Niveau de Difficulté
-STR_02C7_CONFIG_PATCHES                                         :Configuration Avancée
+STR_02C4_GAME_OPTIONS                                           :Options du Jeu
+STR_02C6_DIFFICULTY_SETTINGS                                    :Niveau de Difficulté
+STR_MENU_CONFIG_PATCHES                                         :Configuration Avancée
 STR_NEWGRF_SETTINGS                                             :Paramètres Newgrf
 STR_TRANSPARENCY_OPTIONS                                        :Options de transparence
 STR_GAMEOPTMENU_0A                                              :
@@ -872,8 +872,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Sauvegarde en cours,{}Veuillez attendre la fin du processus!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Sélectionner programme de musique 'Ezy Street'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglais (Originaux)
@@ -1648,42 +1648,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Vous devez d'abord retirer la route
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Route en travaux
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construction routière
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Construction de tramway
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Construction de tramway
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Choisir Pont Routier
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... les routes à sens unique ne peuvent pas avoir de jonctions
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Impossible de construire la route ici...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Impossible de construire une section de tramway ici...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Impossible de construire une section de tramway ici...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Impossible de retirer la route ici...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Impossible de retirer la section de tramway d'ici...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Impossible de retirer la section de tramway d'ici...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientation du dépôt
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientation du dépôt
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientation du dépôt
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Impossible de construire un dépôt routier ici...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Impossible de construire un dépôt de tramway ici...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Impossible de construire un dépôt de tramway ici...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Impossible de construire un arrêt d'autobus...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Impossible de construire une aire de chargement...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Impossible de construire une station de tramway pour passagers...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Impossible de construire une station de tramway pour fret...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Impossible de construire une station de tramway pour passagers...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Impossible de construire une station de tramway pour fret...
 STR_180A_ROAD_CONSTRUCTION                                      :Construction routière
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Construction de tramway
+STR_TRAMWAY_CONSTRUCTION                                        :Construction de tramway
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Construire une section de route
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Construire une route avec le mode Auto-route
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Construire une section de tramway
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Construire une section de tramway
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Construire une section de tramway avec le mode Auto-tram
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Construire un dépôt routier (pour construire et entretenir les véhicules routiers)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Construire un dépôt de tramway (pour la construction et l'entretien des véhicules)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Construire un dépôt de tramway (pour la construction et l'entretien des véhicules)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Construire un arrêt d'autobus
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Construire une aire de chargement
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Construire une station de tramway pour passagers
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Construire une station de tramway pour fret
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Construire une station de tramway pour passagers
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Construire une station de tramway pour fret
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Construire un pont routier
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Construire un pont
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Construire un pont
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Construire un tunnel routier
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Construire un tunnel
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Construire un tunnel
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Activer/Désactiver les routes à sens unique
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Basculer construire/détruire routes
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Basculer construire/retirer pour tramways
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Basculer construire/retirer pour tramways
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Choisir orientation du dépôt routier
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Choisir l'orientation du dépôt de tramway
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Choisir l'orientation du dépôt de tramway
 STR_1814_ROAD                                                   :Route
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Route avec lampadaires
 STR_1816_TREE_LINED_ROAD                                        :Route avec lignée d'arbustres
@@ -1826,8 +1826,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Adjacent à plus d'une gare à la fois
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Trop de gares dans cette ville
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Trop de gares
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Trop d'arrêts d'autobus
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Trop d'aires de chargement
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Trop d'arrêts d'autobus
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Trop d'aires de chargement
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Trop près d'une autre gare
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Vous devez d'abord détruire la gare
@@ -1858,12 +1858,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} accepte désormais: {STRING} et {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Arrêt d'autobus
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Aire de chargement
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Tramway pour passagers
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Tramway pour fret
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Tramway pour passagers
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Tramway pour fret
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Vous devez d'abord détruire l'arrêt d'autobus
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Vous devez d'abord détruire l'aire de chargement
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Vous devez d'abord démolir la station de tramway pour passagers
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Vous devez d'abord démolir la station de tramway pour fret
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Vous devez d'abord démolir la station de tramway pour passagers
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Vous devez d'abord démolir la station de tramway pour fret
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Station{P 2 "" s}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Aucun -
@@ -1875,8 +1875,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Choisir la longueur de la gare
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Choisir l'orientation de l'arrêt d'autobus
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Choix de l'orientation de l'aire de chargement
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Choisir l'orientation de la station de tramway pour passagers
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Choisir l'orientation de la station de tramway pour fret
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Choisir l'orientation de la station de tramway pour passagers
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Choisir l'orientation de la station de tramway pour fret
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centrer la vue sur la station
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Afficher la notation de la station
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Renommer la station
@@ -1898,7 +1898,7 @@
 STR_3069_BUOY                                                   :Bouée
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...bouée présente
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...gare trop étendue
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...stations non-uniformes désactivées
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...stations non-uniformes désactivées
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Cliquer avec Ctrl pour sélectionner plus d'un élément
 
 STR_UNDEFINED                                                   :(chaîne non définie)
@@ -1939,7 +1939,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Choix du type de partie
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Choisir un scénario (vert), une partie préparée (bleu), ou une partie aléatoire
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Créer une partie aléatoirement
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Charger une carte d'altitude
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Charger une carte d'altitude
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} présente
@@ -2143,10 +2143,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economie: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Demi-tour des trains: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Désastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Attitude de la municipalité face au repaysagement : {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Attitude de la municipalité face au repaysagement : {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Aucune
+STR_NONE                                                        :Aucune
 STR_NUM_VERY_LOW                                                :Très bas
 STR_6816_LOW                                                    :Bas
 STR_6817_NORMAL                                                 :Normal
@@ -2184,9 +2184,9 @@
 STR_6836_OFF                                                    :Désactivé
 STR_6837_ON                                                     :Activé
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Afficher le tableau des scores
-STR_6839_PERMISSIVE                                             :Laxiste
-STR_683A_TOLERANT                                               :Tolérant
-STR_683B_HOSTILE                                                :Hostile
+STR_PERMISSIVE                                                  :Laxiste
+STR_TOLERANT                                                    :Tolérant
+STR_HOSTILE                                                     :Hostile
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2323,7 +2323,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Impossible de vendre des parts...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% détenus par {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} a été rachetée par {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Cette compagnie ne vend pas d'actions pour le moment...
+STR_PROTECTED                                                   :{WHITE}Cette compagnie ne vend pas d'actions pour le moment...
 
 STR_LIVERY_DEFAULT                                              :Livrée standard
 STR_LIVERY_STEAM                                                :Locomotive à vapeur
@@ -2632,17 +2632,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Aller à {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Aller à {STATION} (Transférer et charger)
-STR_8808_GO_TO_UNLOAD                                           :Aller à {STATION} (Décharger)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Aller à {STATION} (Transférer et laisser vide)
-STR_880A_GO_TO_LOAD                                             :Aller à {STATION} (Charger)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Aller à {STATION} (Transférer et attendre pleine charge)
-STR_880C_GO_NON_STOP_TO                                         :Aller sans s'arrêter à {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Aller sans s'arrêter à {STATION} (Transférer et charger)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Aller sans s'arrêter à {STATION} (Décharger)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Aller sans s'arrêter à {STATION} (Transférer et laisser vide)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Aller sans s'arrêter à {STATION} (Charger)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Aller sans s'arrêter à {STATION} (Transférer et attendre pleine charge)
+STR_GO_TO_TRANSFER                                              :Aller à {STATION} (Transférer et charger)
+STR_8807_GO_TO_UNLOAD                                           :Aller à {STATION} (Décharger)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Aller à {STATION} (Transférer et laisser vide)
+STR_8808_GO_TO_LOAD                                             :Aller à {STATION} (Charger)
+STR_GO_TO_TRANSFER_LOAD                                         :Aller à {STATION} (Transférer et attendre pleine charge)
+STR_880A_GO_NON_STOP_TO                                         :Aller sans s'arrêter à {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Aller sans s'arrêter à {STATION} (Transférer et charger)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Aller sans s'arrêter à {STATION} (Décharger)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Aller sans s'arrêter à {STATION} (Transférer et laisser vide)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Aller sans s'arrêter à {STATION} (Charger)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Aller sans s'arrêter à {STATION} (Transférer et attendre pleine charge)
 STR_GO_TO_TRAIN_DEPOT                                           :Aller au dépot de {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Entretien au dépôt de {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Aller sans s'arrêter au dépôt de {TOWN}
@@ -2746,7 +2746,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Afficher des informations sur les marchandises transportées
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Afficher des informations sur les wagons
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Afficher la capacité de chaque wagon
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Afficher la capacité totale du train, par type de cargaison
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Afficher la capacité totale du train, par type de cargaison
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Liste des ordres - Cliquer sur un ordre pour le sélectionner.  Cliquer avec Ctrl déplace la vue sur la station
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Sauter l'ordre courant, et enchaîner sur le suivant. Ctrl-clic pour sauter l'ordre sélectionné
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Supprime l'ordre sélectionné
@@ -2777,8 +2777,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Impossible de faire faire demi-tour...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renommer le type de train
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Impossible de renommer le type de train...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Forcer le véhicule à vider sa cargaison pour l'ordre sélectionné
-STR_886F_TRANSFER                                               :{BLACK}Transfert
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Forcer le véhicule à vider sa cargaison pour l'ordre sélectionné
+STR_TRANSFER                                                    :{BLACK}Transfert
 STR_CLEAR_TIME                                                  :{BLACK}Annuler durée
 STR_RESET_LATENESS                                              :{BLACK}RAZ compteur de retard
 
@@ -2856,8 +2856,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Renommer le véhicule
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier bus arrive à {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier camion arrive à {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident routier!{}Un automobiliste meurt brûlé vif lors d'une collision avec un train
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident routier!{}{COMMA} mort{P "" s} lors d'une collision avec un train
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Impossible de faire faire demi-tour au véhicule...
@@ -2866,7 +2866,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renommer type de véhicule routier
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renommer type de véhicule routier
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Impossible de renommer type de véhicule routier...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Aller à {TOWN} Dépôt Routier
+STR_GO_TO_ROADVEH_DEPOT                                         :Aller à {TOWN} Dépôt Routier
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Entretien au dépôt de {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Réaménager le véhicule routier pour transporter une cargaison différente
--- a/src/lang/galician.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/galician.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Hay demasiados nomes definidos
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}O nome elixido xa está en uso
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Carga
 STR_013D_INFORMATION                                            :{BLACK}Información
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
-STR_013E_TOTAL_CARGO                                            :{BLACK}Carga Total
+STR_TOTAL_CARGO                                                 :{BLACK}Carga Total
 STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacidade: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carga total (capacidade) deste tren:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Carga total (capacidade) deste tren:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nova Partida
 STR_0141_LOAD_GAME                                              :{BLACK}Cargar Partida
@@ -744,9 +744,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Opcións da Partida
-STR_02C5_DIFFICULTY_SETTINGS                                    :Configuración de Dificultade
-STR_02C7_CONFIG_PATCHES                                         :Configuración dos Parches
+STR_02C4_GAME_OPTIONS                                           :Opcións da Partida
+STR_02C6_DIFFICULTY_SETTINGS                                    :Configuración de Dificultade
+STR_MENU_CONFIG_PATCHES                                         :Configuración dos Parches
 STR_NEWGRF_SETTINGS                                             :Configuración NewGRF
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Amosar nomes de cidades
@@ -843,8 +843,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}¡Grabación en progreso,{}por favor espera ata que termine!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Selecciona-lo programa 'Música Estilo Ezy Street'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglés
@@ -1666,8 +1666,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Xunta máis dunha estación/área de carga existente
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Hay demasiadas estacións/áreas de carga nesta cidade
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Hay demasiadas estacións/áreas de carga
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Demasiadas paradas de bus
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Demasiadas estacions de camións
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Demasiadas paradas de bus
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Demasiadas estacions de camións
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Demasiado cerca doutra estación ou área de carga
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Debes demole-la estación de ferrocarril primeiro
@@ -1732,7 +1732,7 @@
 STR_3069_BUOY                                                   :Boia
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...boia no camiño
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...a estación ocupa demasiado
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...estacións non uniformes deshabilitadas
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...estacións non uniformes deshabilitadas
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Presiona CTRL para seleccionar máis dun ítem
 
 STR_UNDEFINED                                                   :(cadea indefinida)
@@ -1966,10 +1966,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economía: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Inverti-lo sentido do tren: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Actitude do consello sobre a reestructuración de áreas: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Actitude do consello sobre a reestructuración de áreas: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Ningún
+STR_NONE                                                        :Ningún
 STR_6816_LOW                                                    :Baixo
 STR_6817_NORMAL                                                 :Normal
 STR_6818_HIGH                                                   :Alto
@@ -2006,9 +2006,9 @@
 STR_6836_OFF                                                    :Off
 STR_6837_ON                                                     :On
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Mostra-la lista das mellores puntuacións
-STR_6839_PERMISSIVE                                             :Permisivo
-STR_683A_TOLERANT                                               :Tolerante
-STR_683B_HOSTILE                                                :Hostil
+STR_PERMISSIVE                                                  :Permisivo
+STR_TOLERANT                                                    :Tolerante
+STR_HOSTILE                                                     :Hostil
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2139,7 +2139,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Non se pode vender un 25% das accións desta compañía...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propiedade de {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} comprada por  {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Esta compañía todavía non comercia con accións...
+STR_PROTECTED                                                   :{WHITE}Esta compañía todavía non comercia con accións...
 
 STR_LIVERY_STEAM                                                :Máquina de Vapor
 STR_LIVERY_DIESEL                                               :Máquina Diésel
@@ -2435,17 +2435,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Ir a {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Ir a {STATION} (Transferir e coller carga)
-STR_8808_GO_TO_UNLOAD                                           :Ir a {STATION} (Descargar)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Ir a {STATION} (Transferir e sair valeiro)
-STR_880A_GO_TO_LOAD                                             :Ir a {STATION} (Cargar)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Ir a {STATION} (Transferir e esperar a cargar)
-STR_880C_GO_NON_STOP_TO                                         :Ir sen parar a {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Ir sen parar a {STATION} (Transferir e coller carga)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Ir sen parar a {STATION} (Descargar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Ir sen parar a {STATION} (Descargar e saír baleiro)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Ir sen parar a {STATION} (Cargar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ir sen parar a {STATION} (Transferir e esperar a cargar)
+STR_GO_TO_TRANSFER                                              :Ir a {STATION} (Transferir e coller carga)
+STR_8807_GO_TO_UNLOAD                                           :Ir a {STATION} (Descargar)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Ir a {STATION} (Transferir e sair valeiro)
+STR_8808_GO_TO_LOAD                                             :Ir a {STATION} (Cargar)
+STR_GO_TO_TRANSFER_LOAD                                         :Ir a {STATION} (Transferir e esperar a cargar)
+STR_880A_GO_NON_STOP_TO                                         :Ir sen parar a {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Ir sen parar a {STATION} (Transferir e coller carga)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Ir sen parar a {STATION} (Descargar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Ir sen parar a {STATION} (Descargar e saír baleiro)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Ir sen parar a {STATION} (Cargar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Ir sen parar a {STATION} (Transferir e esperar a cargar)
 STR_GO_TO_TRAIN_DEPOT                                           :Ir o Depósito De Trens de {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Face-lo servicio no Depósito de Trens de {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ir sen paradas o Depósito de Trens de {TOWN}
@@ -2533,7 +2533,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Mostra-los detalles das mercadorías transportadas
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Mostra-los detalles dos vehículos do tren
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Mostra-la capacidade de cada vehículo
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Mostra-la capacidade total do tren, dividida por tipos de carga
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Mostra-la capacidade total do tren, dividida por tipos de carga
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Lista de Ordes - Pincha nunha orde para seleccionala
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Borra-la orde seleccionada
 STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Facer que a orde seleccionada sexa de Non Parar
@@ -2559,7 +2559,7 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}No se pode cambia-lo sentido do tren...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renomea-lo tipo de vehículo de ferrocarril
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Non se pode renome-lo tipo de vehículo de ferrocarril...
-STR_886F_TRANSFER                                               :{BLACK}Transferir
+STR_TRANSFER                                                    :{BLACK}Transferir
 
 STR_TRAIN_STOPPING                                              :{RED}Parando
 STR_TRAIN_STOPPING_VEL                                          :{RED}Parando, {VELOCITY}
@@ -2632,7 +2632,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomea-lo tipo de vehículo de estrada
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomea-lo tipo de vehículo de estrada
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Non se pode renomea-lo tipo de vehículo de estrada...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Ir ó Depósito de Vehículos de Estrada de {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Ir ó Depósito de Vehículos de Estrada de {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servicio no Depósito de Vehículos de Estrada de {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Reaxustar vehículo para levar un tipo diferente de carga
--- a/src/lang/german.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/german.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -273,9 +273,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Zu viele Namen definiert
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Gewählter Name existiert bereits
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -286,11 +286,11 @@
 STR_013C_CARGO                                                  :{BLACK}Fracht
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Kapazitäten
-STR_013E_TOTAL_CARGO                                            :{BLACK}Frachtübersicht
+STR_TOTAL_CARGO                                                 :{BLACK}Frachtübersicht
 STR_013F_CAPACITY                                               :{BLACK}Kapazität: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapazität: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Frachtkapazität dieses Zuges:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}{CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Frachtkapazität dieses Zuges:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}{CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Neues Spiel
 STR_0141_LOAD_GAME                                              :{BLACK}Spiel laden
@@ -729,7 +729,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Diese Stadt vollständig löschen
 STR_0292_SAVE_SCENARIO                                          :Szenario speichern
 STR_0293_LOAD_SCENARIO                                          :Szenario laden
-STR_LOAD_HEIGHTMAP                                              :Reliefkarte laden
+STR_MENU_LOAD_HEIGHTMAP                                         :Reliefkarte laden
 STR_0294_QUIT_EDITOR                                            :Editor verlassen
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Beenden
@@ -769,9 +769,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Spieleinstellungen
-STR_02C5_DIFFICULTY_SETTINGS                                    :Schwierigkeitsgrad
-STR_02C7_CONFIG_PATCHES                                         :Einstellungen der Patches
+STR_02C4_GAME_OPTIONS                                           :Spieleinstellungen
+STR_02C6_DIFFICULTY_SETTINGS                                    :Schwierigkeitsgrad
+STR_MENU_CONFIG_PATCHES                                         :Einstellungen der Patches
 STR_NEWGRF_SETTINGS                                             :Newgrf-Einstellungen
 STR_TRANSPARENCY_OPTIONS                                        :Transparenzeinstellungen
 STR_GAMEOPTMENU_0A                                              :
@@ -871,8 +871,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Speichern läuft,{}bitte warten bis beendet!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Wähle 'Ezy Street style music'-Programm
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Englisch
@@ -1647,42 +1647,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Straße muss erst entfernt werden
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Straßenarbeiten sind im Gange
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Straßenbau
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Straßenbahnbau
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Straßenbahnbau
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Brücke wählen
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... Einbahnstraßen können keine Abzweigung haben
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Straße kann hier nicht gebaut werden...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Straßenbahn kann hier nicht gebaut werden...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Straßenbahn kann hier nicht gebaut werden...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Diese Straße kann nicht entfernt werden...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Straßenbahn kann hier nicht entfernt werden...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Straßenbahn kann hier nicht entfernt werden...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Fahrzeugdepot-Ausr.
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Ausrichtung des Straßenbahndepots
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Ausrichtung des Straßenbahndepots
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Fahrzeugdepot kann hier nicht gebaut werden...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Straßenbahndepot kann hier nicht gebaut werden...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Straßenbahndepot kann hier nicht gebaut werden...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Busbahnhof kann nicht gebaut werden...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Lkw-Ladeplatz kann nicht gebaut werden...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Straßenbahnhaltestelle kann hier nicht gebaut werden...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Güterverladestelle kann hier nicht gebaut werden...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Straßenbahnhaltestelle kann hier nicht gebaut werden...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Güterverladestelle kann hier nicht gebaut werden...
 STR_180A_ROAD_CONSTRUCTION                                      :Straßenbau
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Straßenbahnbau
+STR_TRAMWAY_CONSTRUCTION                                        :Straßenbahnbau
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Straße bauen
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Werkzeug zum automatischen Bauen von Straßen
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Straßenbahnabschnitt bauen
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Straßenbahnabschnitt bauen
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Werkzeug zum automatischen Bauen von Schienen
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Fahrzeugdepot bauen (zum Bau und zur Wartung von Fahrzeugen)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Straßenbahndepot bauen (zum Erstellen und Warten von Straßenbahnen)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Straßenbahndepot bauen (zum Erstellen und Warten von Straßenbahnen)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Busbahnhof bauen
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Lkw-Ladeplatz bauen
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Straßenbahnhaltestelle bauen
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Güterverladestelle bauen
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Straßenbahnhaltestelle bauen
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Güterverladestelle bauen
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Straßenbrücke bauen
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Straßenbahnbrücke bauen
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Straßenbahnbrücke bauen
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Straßentunnel bauen
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Straßenbahntunnel bauen
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Straßenbahntunnel bauen
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Aktiviere/Deaktiviere Einbahnstraßen
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Zwischen Bau/Abriss der Straße umschalten
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Umschalten zwischen Bauen/Entfernen für Straßenbahnbau
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Umschalten zwischen Bauen/Entfernen für Straßenbahnbau
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Ausrichtung des Fahrzeugdepots wählen
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Ausrichtung des Straßenbahndepots wählen
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Ausrichtung des Straßenbahndepots wählen
 STR_1814_ROAD                                                   :Straße
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Straße mit Laternen
 STR_1816_TREE_LINED_ROAD                                        :Straße mit Bäumen
@@ -1825,8 +1825,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Grenzt an mehr als eine vorhandene Station/Ladeplatz
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Zu viele Stationen/Ladeplätze im Stadtgebiet
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Zu viele Stationen/Ladeplätze im Umkreis
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Zu viele Busbahnhöfe
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Zu viele Lkw-Ladeplätze
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Zu viele Busbahnhöfe
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Zu viele Lkw-Ladeplätze
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Stationen/Ladeplätze liegen zu dicht beisammen
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Bahnhof muss erst abgerissen werden
@@ -1857,12 +1857,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} akzeptiert jetzt auch {STRING} und {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Busbahnhof-Ausr.
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Lkw-Ladeplatz-Ausr.
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Ausrichtung der Straßenbahnhaltestelle
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Ausrichtung der Güterverladestelle
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Ausrichtung der Straßenbahnhaltestelle
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Ausrichtung der Güterverladestelle
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Der Busbahnhof muss erst abgerissen werden
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Der Lkw-Ladeplatz muss erst abgerissen werden
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Straßenbahnhaltestelle muss vorher abgerissen werden
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Güterverladestelle muss vorher abgerissen werden
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Straßenbahnhaltestelle muss vorher abgerissen werden
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Güterverladestelle muss vorher abgerissen werden
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Haltestelle{P "" n}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Keine -
@@ -1874,8 +1874,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Bahnsteiglänge wählen
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Busbahnhofsausrichtung wählen
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Ladeplatzausrichtung wählen
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Ausrichtung für die Straßenbahnhaltestelle wählen
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Ausrichtung für die Güterverladestelle wählen
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Ausrichtung für die Straßenbahnhaltestelle wählen
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Ausrichtung für die Güterverladestelle wählen
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Hauptansicht zur Station scrollen
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Stationsbewertung anzeigen
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Name der Station ändern
@@ -1897,7 +1897,7 @@
 STR_3069_BUOY                                                   :Boje
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...Boje ist im Weg
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...Bahnhof ist zu groß
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ungleichförmige Stationen deaktiviert
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ungleichförmige Stationen deaktiviert
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}STRG gedrückt halten um mehrere Einträge auszuwählen
 
 STR_UNDEFINED                                                   :(nicht definierter Wert)
@@ -1938,7 +1938,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Neues Spiel auswählen
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Wähle Szenario (grün), vorgegebens Spiel (blau), oder ein Spiel nach dem Zufallsprinzip
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Spiel nach Zufallsprinzip erstellen
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Reliefkarte laden
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Reliefkarte laden
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} im Weg
@@ -2142,10 +2142,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Wirtschaft: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Zug umkehren: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastrophen: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Haltung der Stadtverwaltung zum Landschaftsbau: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Haltung der Stadtverwaltung zum Landschaftsbau: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Keine
+STR_NONE                                                        :Keine
 STR_NUM_VERY_LOW                                                :Sehr niedrig
 STR_6816_LOW                                                    :Niedrig
 STR_6817_NORMAL                                                 :Normal
@@ -2183,9 +2183,9 @@
 STR_6836_OFF                                                    :Aus
 STR_6837_ON                                                     :An
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Highscoretabelle zeigen
-STR_6839_PERMISSIVE                                             :Zustimmend
-STR_683A_TOLERANT                                               :Akzeptierend
-STR_683B_HOSTILE                                                :Feindlich
+STR_PERMISSIVE                                                  :Zustimmend
+STR_TOLERANT                                                    :Akzeptierend
+STR_HOSTILE                                                     :Feindlich
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2322,7 +2322,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Verkauf von 25% der Aktien dieser Firma nicht möglich...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% Eigentum von {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} wurde von {COMPANY} übernommen!
-STR_7080_PROTECTED                                              :{WHITE}Dieses Unternehmen ist noch nicht an der Börse...
+STR_PROTECTED                                                   :{WHITE}Dieses Unternehmen ist noch nicht an der Börse...
 
 STR_LIVERY_DEFAULT                                              :Standardlackierung
 STR_LIVERY_STEAM                                                :Dampflok
@@ -2629,17 +2629,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Fahre nach {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Fahre nach {STATION} (Umladen und beladen)
-STR_8808_GO_TO_UNLOAD                                           :Fahre nach {STATION} (Entladen)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Fahre nach {STATION} (Umladen und leer verlassen)
-STR_880A_GO_TO_LOAD                                             :Fahre nach {STATION} (Beladen)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Fahre nach {STATION} (Umladen und voll beladen)
-STR_880C_GO_NON_STOP_TO                                         :Fahre ohne Halt nach {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Fahre ohne Halt nach {STATION} (Umladen und beladen)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Fahre ohne Halt nach {STATION} (Entladen)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Fahre nach {STATION} (Umladen und leer verlassen)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Fahre ohne Halt nach {STATION} (Beladen)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Fahre ohne Halt nach {STATION} (Umladen und voll beladen)
+STR_GO_TO_TRANSFER                                              :Fahre nach {STATION} (Umladen und beladen)
+STR_8807_GO_TO_UNLOAD                                           :Fahre nach {STATION} (Entladen)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Fahre nach {STATION} (Umladen und leer verlassen)
+STR_8808_GO_TO_LOAD                                             :Fahre nach {STATION} (Beladen)
+STR_GO_TO_TRANSFER_LOAD                                         :Fahre nach {STATION} (Umladen und voll beladen)
+STR_880A_GO_NON_STOP_TO                                         :Fahre ohne Halt nach {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Fahre ohne Halt nach {STATION} (Umladen und beladen)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Fahre ohne Halt nach {STATION} (Entladen)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Fahre nach {STATION} (Umladen und leer verlassen)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Fahre ohne Halt nach {STATION} (Beladen)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Fahre ohne Halt nach {STATION} (Umladen und voll beladen)
 STR_GO_TO_TRAIN_DEPOT                                           :Fahre zum {TOWN} Zugdepot
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Wartung bei {TOWN} Zugdepot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Fahre ohne Halt zu {TOWN} Zugdepot
@@ -2743,7 +2743,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Zeige Einzelheiten zur geladenen Fracht
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Zeige Einzelheiten zu den Schienenfahrzeugen
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Zeige Kapazität jedes Fahrzeugs
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Frachtübersicht des Zuges anzeigen, aufgeteilt nach Frachttyp
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Frachtübersicht des Zuges anzeigen, aufgeteilt nach Frachttyp
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Auftragsliste - zum Markieren hier anklicken
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Übergehe den laufenden Auftrag, und starte den nächsten
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Lösche den markierten Auftrag
@@ -2774,8 +2774,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Die Zugbewegung kann nicht umgekehrt werden...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Zugtyp umbenennen
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Zugtyp kann nicht umbenannt werden...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Beim markierten Eintrag wird die Ladung in den Bahnhof entladen (für späteren Weitertransport)
-STR_886F_TRANSFER                                               :{BLACK}Umladen
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Beim markierten Eintrag wird die Ladung in den Bahnhof entladen (für späteren Weitertransport)
+STR_TRANSFER                                                    :{BLACK}Umladen
 STR_CLEAR_TIME                                                  :{BLACK}Zeit löschen
 STR_RESET_LATENESS                                              :{BLACK}Verspätungszähler zurücksetzen
 
@@ -2853,8 +2853,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Name des Fahrzeuges
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Der erste Bus erreicht {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Der erste Lkw erreicht {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Die erste Straßenbahn erreicht {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Die erste Frachtstraßenbahn erreicht {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Die erste Straßenbahn erreicht {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Die Einwohner feiern . . .{}Die erste Frachtstraßenbahn erreicht {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Fahrzeug verunglückt!{}Fahrer stirbt in Inferno nach Zusammenstoß mit Zug
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Fahrzeug verunglückt!{}{COMMA} sterben in Inferno nach Zusammenstoß mit Zug
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Das Fahrzeug kann nicht wenden...
@@ -2863,7 +2863,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Fahrzeug umbenennen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Fahrzeug umbenennen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Fahrzeug kann nicht umbenannt werden...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Fahre zum Fahrzeugdepot {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Fahre zum Fahrzeugdepot {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Wartung im Fahrzeugdepot {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Straßenfahrzeug für den Transport anderer Güter umrüsten
--- a/src/lang/hungarian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/hungarian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -338,9 +338,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Túl sok név van megadva
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}A megadott név már használatban van
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -351,11 +351,11 @@
 STR_013C_CARGO                                                  :{BLACK}Rakomány
 STR_013D_INFORMATION                                            :{BLACK}Információ
 STR_013E_CAPACITIES                                             :{BLACK}Kapacitás
-STR_013E_TOTAL_CARGO                                            :{BLACK}Teljes rakomány
+STR_TOTAL_CARGO                                                 :{BLACK}Teljes rakomány
 STR_013F_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapacitás: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Teljes rakománya (kapacitása) ennek a vonatnak:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Teljes rakománya (kapacitása) ennek a vonatnak:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Új játék
 STR_0141_LOAD_GAME                                              :{BLACK}Játék betöltése
@@ -795,7 +795,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}A város teljes eltüntetése
 STR_0292_SAVE_SCENARIO                                          :Pálya mentése
 STR_0293_LOAD_SCENARIO                                          :Pálya betöltése
-STR_LOAD_HEIGHTMAP                                              :Magasságtérkép betöltése
+STR_MENU_LOAD_HEIGHTMAP                                         :Magasságtérkép betöltése
 STR_0294_QUIT_EDITOR                                            :Kilépés a szerkesztőből
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Kilépés
@@ -835,9 +835,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Beállítások
-STR_02C5_DIFFICULTY_SETTINGS                                    :Nehézségi beállítások
-STR_02C7_CONFIG_PATCHES                                         :Foltok beállítása
+STR_02C4_GAME_OPTIONS                                           :Beállítások
+STR_02C6_DIFFICULTY_SETTINGS                                    :Nehézségi beállítások
+STR_MENU_CONFIG_PATCHES                                         :Foltok beállítása
 STR_NEWGRF_SETTINGS                                             :Newgrf beállítások
 STR_TRANSPARENCY_OPTIONS                                        :Átlátszósági beállítások
 STR_GAMEOPTMENU_0A                                              :
@@ -937,8 +937,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}A mentés még tart,{}kérlek várd meg a végét!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}A 'szép az élet' zenei műsor kiválasztása
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Angol (Eredeti)
@@ -1713,42 +1713,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Előbb le kell rombolnod az utat
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Útkarbantartás folyamatban
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Útépítés
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Villamospálya építés
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Villamospálya építés
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Közúti híd építése
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... egy irányú utaknak nem lehetnek kereszteződéseik...
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Nem építhetsz ide utat...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Nem lehet villamossínt építeni itt...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Nem lehet villamossínt építeni itt...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Nem rombolhatod le innen az utat...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Nem lehet villamossínt eltávolítani innen...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Nem lehet villamossínt eltávolítani innen...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Garázs helyzete
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Villamos-depó iránya
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Villamos-depó iránya
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nem építhetsz ide garázst...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Nem lehet villamos-depót építeni ide...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Nem lehet villamos-depót építeni ide...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nem építhetsz ide buszmegállót...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nem építhetsz ide teherautó-rakodóhelyet...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Nem lehet villamos utasvárót építeni...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Nem lehet tehervillamos-állomást építeni...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Nem lehet villamos utasvárót építeni...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Nem lehet tehervillamos-állomást építeni...
 STR_180A_ROAD_CONSTRUCTION                                      :Útépítés
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Villamospálya építés
+STR_TRAMWAY_CONSTRUCTION                                        :Villamospálya építés
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Út építése
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Közút-szakasz megépítése automata módon
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Villamos-sín építése
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Villamos-sín építése
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Villamos-sín szakasz megépítése automata módon
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Garázs építése (járművek vételére és karbantartására)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Villamos-depó építése (járművek megépítésére és szervizelésére)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Villamos-depó építése (járművek megépítésére és szervizelésére)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Buszmegálló építése
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Teherautó-rakodóhely építése
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Villamos utasváró építése
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Tehervillamos-állomás építése
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Villamos utasváró építése
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Tehervillamos-állomás építése
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Közúti híd építése
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Villamos-híd építése
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Villamos-híd építése
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Közúti alagút építése
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Villamos-alagút építése
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Villamos-alagút építése
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Egyirányú utak ki/be kapcsolása
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Építés/felszedés közötti váltás utaknál
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Építő/bontó üzemmód váltása a villamospályákhoz
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Építő/bontó üzemmód váltása a villamospályákhoz
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Válaszd ki a garázs helyzetét
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Válassz villamos-depó irányt
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Válassz villamos-depó irányt
 STR_1814_ROAD                                                   :Út
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Út lámpákkal
 STR_1816_TREE_LINED_ROAD                                        :Fával szegélyezett út
@@ -1891,8 +1891,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Több állomással/rakodóhellyel érintkezik
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Túl sok állomás/rakodóhely van ebben a városban
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Túl sok az állomás/rakodóhely
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Túl sok buszmegálló
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Túl sok kamion megálló
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Túl sok buszmegálló
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Túl sok kamion megálló
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Túl közel van egy másik állomáshoz/rakodóhelyhez
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Előbb le kell rombolnod a vasútállomást
@@ -1923,12 +1923,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} most már elfogad {STRING} és {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Buszmegálló helyzete
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Rakodóhely helyzete
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Utasszállító villamos irány
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Teherszállító-villamos irány
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Utasszállító villamos irány
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Teherszállító-villamos irány
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Előbb le kell rombolnod a buszmegállót
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Előbb le kell rombolnod a teherautó-rakodóhelyet
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Előbb le kell rombolni a villamos utasvárót
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Előbb le kell rombolni a tehervillamos-állomást
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Előbb le kell rombolni a villamos utasvárót
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Előbb le kell rombolni a tehervillamos-állomást
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} állomásai - {COMMA}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nincs -
@@ -1940,8 +1940,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}A vasútállomás hossza
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Buszmegálló helyzetének kiválasztása
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Teherautó-rakodó helyzetének kiválasztása
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Válassz villamos utasváró irányt
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Válassz tehervillamos-állomás irányt
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Válassz villamos utasváró irányt
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Válassz tehervillamos-állomás irányt
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}A fő nézetet az állomásra állítja
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Vélemény megmutatása az állomásról
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Az állomás nevének megváltoztatása
@@ -1963,7 +1963,7 @@
 STR_3069_BUOY                                                   :Bója
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...bója van az útban
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...az állomás túl kiterjedt
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...csak egyféle vágánytípusú állomások lehetnek
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...csak egyféle vágánytípusú állomások lehetnek
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Több elem kiválasztásához tartsd lenyomva a CTRL-t
 
 STR_UNDEFINED                                                   :(nem definiált string)
@@ -2004,7 +2004,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Az új játék típusa
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Válassz egy pályát (zöld), előre beállított játékot (kék) vagy véletlenszerű új játékot
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Véletlenszerű új játék
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Magasságtérkép betöltése
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Magasságtérkép betöltése
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}...{STRING} van az útban
@@ -2245,10 +2245,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Gazdasági élet: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Vonatok fordítása: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katasztrófák: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}A városi tanács hozzáállása a területrendezéshez: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}A városi tanács hozzáállása a területrendezéshez: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Egyiksem
+STR_NONE                                                        :Egyiksem
 STR_NUM_VERY_LOW                                                :Nagyon kevés
 STR_6816_LOW                                                    :Kevés
 STR_6817_NORMAL                                                 :Normál
@@ -2286,9 +2286,9 @@
 STR_6836_OFF                                                    :Ki
 STR_6837_ON                                                     :Be
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Legjobb pontok
-STR_6839_PERMISSIVE                                             :Engedékeny
-STR_683A_TOLERANT                                               :Toleráns
-STR_683B_HOSTILE                                                :Ellenséges
+STR_PERMISSIVE                                                  :Engedékeny
+STR_TOLERANT                                                    :Toleráns
+STR_HOSTILE                                                     :Ellenséges
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2425,7 +2425,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nem adhatsz el 25%-ot ebből a cégből...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% {COMPANY} tulajdona)
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} céget felvásárolta {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Ez a cég egyelőre még nem rendelkezik részvényekkel...
+STR_PROTECTED                                                   :{WHITE}Ez a cég egyelőre még nem rendelkezik részvényekkel...
 
 STR_LIVERY_DEFAULT                                              :Alapértelmezett
 STR_LIVERY_STEAM                                                :Gőzmozdony
@@ -2734,17 +2734,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING}{STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
 STR_8806_GO_TO                                                  :Menj {STATION} állomásra
-STR_8807_GO_TO_TRANSFER                                         :Menj {STATION} (odaszállít és felvesz rakományt)
-STR_8808_GO_TO_UNLOAD                                           :Menj {STATION} (lepakol)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Menj {STATION} (odaszállít és üresen továbbmegy)
-STR_880A_GO_TO_LOAD                                             :Menj {STATION} (felpakol)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Menj {STATION} (odaszállít és teljes rakományra vár)
-STR_880C_GO_NON_STOP_TO                                         :Megállás nélkül menj {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Megállás nélkül menj {STATION} (odaszállít és felvesz rakományt)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Megállás nélkül menj {STATION} (lepakol)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Megállás nélkül menj {STATION} (odaszállít és üresen távozik)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Megállás nélkül menj {STATION} (felpakol)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Megállás nélkül menj {STATION} (odaszállít és teljes rakományra vár)
+STR_GO_TO_TRANSFER                                              :Menj {STATION} (odaszállít és felvesz rakományt)
+STR_8807_GO_TO_UNLOAD                                           :Menj {STATION} (lepakol)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Menj {STATION} (odaszállít és üresen továbbmegy)
+STR_8808_GO_TO_LOAD                                             :Menj {STATION} (felpakol)
+STR_GO_TO_TRANSFER_LOAD                                         :Menj {STATION} (odaszállít és teljes rakományra vár)
+STR_880A_GO_NON_STOP_TO                                         :Megállás nélkül menj {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Megállás nélkül menj {STATION} (odaszállít és felvesz rakományt)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Megállás nélkül menj {STATION} (lepakol)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Megállás nélkül menj {STATION} (odaszállít és üresen távozik)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Megállás nélkül menj {STATION} (felpakol)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Megállás nélkül menj {STATION} (odaszállít és teljes rakományra vár)
 STR_GO_TO_TRAIN_DEPOT                                           :Menj {TOWN} jármütelepre
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Javítsd a vonatot a {TOWN}i járműtelepen
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Menj megállás nélkül {TOWN}i járműtelepre
@@ -2848,7 +2848,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}A szállított rakomány részletei
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}A vonat kocsiainak részletei
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}A kocsik kapacitása
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Megmutatja a vonat teljes kapacitását, rakománytípusokra lebontva
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Megmutatja a vonat teljes kapacitását, rakománytípusokra lebontva
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Menetrend - kattints egy célpontra a kijelöléséhez
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Jelenlegi úticél átugrása, és a következő aktiválása. CTRL + kattintásra a kiválasztott úticélra ugrik
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}A kijelölt célpont törlése
@@ -2879,8 +2879,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nem fordíthatod meg a vonatot...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Márkanév megváltoztatása
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nem változtathatod meg a márkanevet...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A kiválasztott állomásnál a jármű a rakományt leteszi
-STR_886F_TRANSFER                                               :{BLACK}Elszállít
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}A kiválasztott állomásnál a jármű a rakományt leteszi
+STR_TRANSFER                                                    :{BLACK}Elszállít
 STR_CLEAR_TIME                                                  :{BLACK}Idő törlése
 STR_RESET_LATENESS                                              :{BLACK}Késés nullázása
 
@@ -2958,8 +2958,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Közúti jármű átnevezése
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az első busz {STATION} állomásra!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Az emberek ünnepelnek . . .{}Megérkezett az első teherautó {STATION} állomásra!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}A lakosság ünnepel . . .{}Első utasszállító villamos megérkezett {STATION} állomásra!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}A lakosság ünnepel . . .{}Első teherszállító-villamos megérkezett {STATION} állomásra!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}A lakosság ünnepel . . .{}Első utasszállító villamos megérkezett {STATION} állomásra!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}A lakosság ünnepel . . .{}Első teherszállító-villamos megérkezett {STATION} állomásra!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Közúti baleset!{}A vezető meghalt a vonattal való ütközéskor
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Közúti baleset!{}{COMMA} ember meghalt a vonattal való ütközéskor
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nem fordíthatod vissza a járművet...
@@ -2968,7 +2968,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}A közúti jármű márkanevének megváltoztatása
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Márkanév megváltoztatása
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nem változtathatod meg a márkanevet...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Menj a  {TOWN}i garázsba
+STR_GO_TO_ROADVEH_DEPOT                                         :Menj a  {TOWN}i garázsba
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Javítsd a járművet a {TOWN}i garázsban
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Teherautó átalakítása hogy mást is tudjon szállítani
--- a/src/lang/icelandic.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/icelandic.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -271,9 +271,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Of mörg nöfn skilgreint
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Valið nafn er þegar í notkun
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -283,11 +283,11 @@
 STR_013C_CARGO                                                  :{BLACK}Farmur
 STR_013D_INFORMATION                                            :{BLACK}Upplýsingar
 STR_013E_CAPACITIES                                             :{BLACK}Burðargeta
-STR_013E_TOTAL_CARGO                                            :{BLACK}Heildarfarmur
+STR_TOTAL_CARGO                                                 :{BLACK}Heildarfarmur
 STR_013F_CAPACITY                                               :{BLACK}Burðargeta: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Burðargeta: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Farmur alls (burðargeta) þessarar lestar:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Farmur alls (burðargeta) þessarar lestar:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nýr leikur
 STR_0141_LOAD_GAME                                              :{BLACK}Opna leik
@@ -721,7 +721,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Eyða þessum bæ algjörlega
 STR_0292_SAVE_SCENARIO                                          :Vista kort
 STR_0293_LOAD_SCENARIO                                          :Opna kort
-STR_LOAD_HEIGHTMAP                                              :Hlaða hæðarkorti
+STR_MENU_LOAD_HEIGHTMAP                                         :Hlaða hæðarkorti
 STR_0294_QUIT_EDITOR                                            :Hætta í kortagerð
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Hætta
@@ -760,9 +760,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Stillingar
-STR_02C5_DIFFICULTY_SETTINGS                                    :Erfiðleikastig
-STR_02C7_CONFIG_PATCHES                                         :Viðbætur
+STR_02C4_GAME_OPTIONS                                           :Stillingar
+STR_02C6_DIFFICULTY_SETTINGS                                    :Erfiðleikastig
+STR_MENU_CONFIG_PATCHES                                         :Viðbætur
 STR_NEWGRF_SETTINGS                                             :NewGRF stillingar
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Bæjarnöfn sýnd
@@ -860,8 +860,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Vistun er enn í gangi,{}vinsamlegast bíddu á meðan hún klárst!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Velja 'Ezy gata' listann
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Ensk (Upphafleg)
@@ -1690,8 +1690,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Tengist fleiri en einni annarri stöð
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Of margar stöðvar/lestunarsvæði í þessum bæ
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Of margar stöðvar/lestunarsvæði
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Of margar strætisvagnastöðvar
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Of margar vörubílastöðvar
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Of margar strætisvagnastöðvar
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Of margar vörubílastöðvar
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Of nálægt annarri stöð/lestunarsvæði
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Þarf fyrst að rífa lestarstöð
@@ -1756,7 +1756,7 @@
 STR_3069_BUOY                                                   :Bauja
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...bauja fyrir
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stöð of dreyfð
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...óregluleg lögun lestarstöðva bönnuð
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...óregluleg lögun lestarstöðva bönnuð
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Haltu CTRL inni til að velja fleiri en eitt
 
 STR_UNDEFINED                                                   :(óskilgreindur strengur)
@@ -1791,7 +1791,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Velja tegund leiks
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Velja landslag (grænt), forstilltan leik (blátt) eða handahófskenndan leik
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Búa til nýjan leik
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Hlaða hæðakorti
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Hlaða hæðakorti
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} er fyrir
@@ -1985,10 +1985,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Efnahagur: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Snúningur lestar: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Hrakföll: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Afstaða borgaryfirvalda til landmótunar: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Afstaða borgaryfirvalda til landmótunar: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Engin
+STR_NONE                                                        :Engin
 STR_6816_LOW                                                    :Fáir
 STR_6817_NORMAL                                                 :Miðlungs
 STR_6818_HIGH                                                   :Margir
@@ -2025,9 +2025,9 @@
 STR_6836_OFF                                                    :Ekki á
 STR_6837_ON                                                     :Á
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Sýna topplistann
-STR_6839_PERMISSIVE                                             :Eftirgefin
-STR_683A_TOLERANT                                               :Umburðarlynd
-STR_683B_HOSTILE                                                :Fjandsamleg
+STR_PERMISSIVE                                                  :Eftirgefin
+STR_TOLERANT                                                    :Umburðarlynd
+STR_HOSTILE                                                     :Fjandsamleg
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2159,7 +2159,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Get ekki selt 25% hlut í þessu fyrirtæki...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% í eigu {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} hefur verið yfirtekið af {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ...
+STR_PROTECTED                                                   :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ...
 
 STR_LIVERY_DEFAULT                                              :Aðal litaskema
 STR_LIVERY_STEAM                                                :Gufuvagnar
@@ -2464,17 +2464,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Fer til {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Fer til {STATION} (Yfirfæra og ferma)
-STR_8808_GO_TO_UNLOAD                                           :Fer til {STATION} (Afferma)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Fer til {STATION} (Yfirfæra og yfirgefa tóm)
-STR_880A_GO_TO_LOAD                                             :Fer til {STATION} (Fullferma)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Fer til {STATION} (Yfirfæra og fullferma)
-STR_880C_GO_NON_STOP_TO                                         :Fer viðstöðulaust til {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Fer viðstöðulaust til {STATION} (Yfirfæra og ferma)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Fer viðstöðulaust til {STATION} (Afferma)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Fer viðstöðulaust til {STATION} (Yfirfæra og yfirgefa tóm)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Fer viðstöðulaust til {STATION} (Fullferma)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Fer viðstöðulaust til {STATION} (Yfirfæra og fullferma)
+STR_GO_TO_TRANSFER                                              :Fer til {STATION} (Yfirfæra og ferma)
+STR_8807_GO_TO_UNLOAD                                           :Fer til {STATION} (Afferma)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Fer til {STATION} (Yfirfæra og yfirgefa tóm)
+STR_8808_GO_TO_LOAD                                             :Fer til {STATION} (Fullferma)
+STR_GO_TO_TRANSFER_LOAD                                         :Fer til {STATION} (Yfirfæra og fullferma)
+STR_880A_GO_NON_STOP_TO                                         :Fer viðstöðulaust til {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Fer viðstöðulaust til {STATION} (Yfirfæra og ferma)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Fer viðstöðulaust til {STATION} (Afferma)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Fer viðstöðulaust til {STATION} (Yfirfæra og yfirgefa tóm)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Fer viðstöðulaust til {STATION} (Fullferma)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Fer viðstöðulaust til {STATION} (Yfirfæra og fullferma)
 STR_GO_TO_TRAIN_DEPOT                                           :Fer til {TOWN} Lestaskýli
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Viðgerð í {TOWN} Lestar Byggingu
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Fer viðstöðulaust til {TOWN} Lestar Byggingar
@@ -2566,7 +2566,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Sýna nánari upplýsingar um núverandi farm
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Sýna nánari upplýsingar um lestir
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Sýna burðargetu hvers farartækis
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Sýna heildar burðargetu lestar, raðar eftir tegund farms
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Sýna heildar burðargetu lestar, raðar eftir tegund farms
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Áætlun - smelltu til að velja stöð. CTRL + músartakki færir sjónarhorn að stöðinni
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Eyða valdri skipun
 STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Gera valda skipun viðstöðulausa
@@ -2592,8 +2592,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Get ekki snúið lest við...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Endurskíra lestargerð
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Get ekki endurskírt lestargerð...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Lætur lestina losa farminn á valinni skipun
-STR_886F_TRANSFER                                               :{BLACK}Yfirfæra
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Lætur lestina losa farminn á valinni skipun
+STR_TRANSFER                                                    :{BLACK}Yfirfæra
 
 STR_TRAIN_STOPPING                                              :{RED}Stöðva
 STR_TRAIN_STOPPING_VEL                                          :{RED}Stöðva, {VELOCITY}
@@ -2656,7 +2656,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Endurnefna tegund bifreiðar
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Endurnefna tegund bifreiðar
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE} Get ekki endurnefnat tegund bifreiðar...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Fara í {TOWN} bifreiðaskýli
+STR_GO_TO_ROADVEH_DEPOT                                         :Fara í {TOWN} bifreiðaskýli
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Skoða í  {TOWN} bifreiðaskýli
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Breyta bifreið svo hún flytji annan farm
--- a/src/lang/italian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/italian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -274,9 +274,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Troppi nomi definiti
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Il nome scelto è già in uso
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -287,11 +287,11 @@
 STR_013C_CARGO                                                  :{BLACK}Carico
 STR_013D_INFORMATION                                            :{BLACK}Informazioni
 STR_013E_CAPACITIES                                             :{BLACK}Capienza
-STR_013E_TOTAL_CARGO                                            :{BLACK}Carico totale
+STR_TOTAL_CARGO                                                 :{BLACK}Carico totale
 STR_013F_CAPACITY                                               :{BLACK}Capacità: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacità: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Capacità di carico totale di questo treno:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Capacità di carico totale di questo treno:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nuova partita
 STR_0141_LOAD_GAME                                              :{BLACK}Carica partita
@@ -731,7 +731,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Elimina completamente questa città
 STR_0292_SAVE_SCENARIO                                          :Salva scenario
 STR_0293_LOAD_SCENARIO                                          :Carica scenario
-STR_LOAD_HEIGHTMAP                                              :Carica heightmap
+STR_MENU_LOAD_HEIGHTMAP                                         :Carica heightmap
 STR_0294_QUIT_EDITOR                                            :Esci dall'editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Esci
@@ -771,9 +771,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Opzioni gioco
-STR_02C5_DIFFICULTY_SETTINGS                                    :Impostazioni difficoltà
-STR_02C7_CONFIG_PATCHES                                         :Configura patch
+STR_02C4_GAME_OPTIONS                                           :Opzioni gioco
+STR_02C6_DIFFICULTY_SETTINGS                                    :Impostazioni difficoltà
+STR_MENU_CONFIG_PATCHES                                         :Configura patch
 STR_NEWGRF_SETTINGS                                             :Impostazioni NewGRF
 STR_TRANSPARENCY_OPTIONS                                        :Opzioni trasparenza
 STR_GAMEOPTMENU_0A                                              :
@@ -873,8 +873,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Salvataggio in corso,{}prego attenderne la fine!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Seleziona il programma 'Musica ezy street'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglesi (originali)
@@ -1649,42 +1649,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Bisogna rimuovere la strada prima
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Lavori stradali in corso
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Costruzione strade
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Costruzione tranvie
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Costruzione tranvie
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Seleziona ponte stradale
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}...le strade a senso unico non possono avere raccordi
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Impossibile costruire la strada qui...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Impossibile costruire la tranvia qui...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Impossibile costruire la tranvia qui...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Impossibile rimuovere la strada da qui...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Impossibile rimuovere la tranvia da qui...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Impossibile rimuovere la tranvia da qui...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientamento deposito
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientamento deposito
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientamento deposito
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Impossibile costruire il deposito qui...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Impossibile costruire il deposito qui...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Impossibile costruire il deposito qui...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Impossibile costruire la stazione degli autobus qui...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Impossibile costruire la stazione dei camion qui...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Impossibile costruire la stazione tram passeggeri...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Impossibile costruire la stazione tram merci...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Impossibile costruire la stazione tram passeggeri...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Impossibile costruire la stazione tram merci...
 STR_180A_ROAD_CONSTRUCTION                                      :Costruzione strade
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Costruzione tranvie
+STR_TRAMWAY_CONSTRUCTION                                        :Costruzione tranvie
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Costruisce una sezione di strada
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Costruisce sezioni di strada usando la modalità automatica
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Costruisce una sezione di tranvia
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Costruisce una sezione di tranvia
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Costruisce sezioni di tranvia usando la modalità automatica
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Costruisce un deposito automezzi (per costruire e manutenere i veicoli)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Costruisce un deposito tranviario (per costruire e manutenere i veicoli)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Costruisce un deposito tranviario (per costruire e manutenere i veicoli)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Costruisce una stazione degli autobus
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Costruisce un'area di carico per camion
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Costruisce una stazione tram passeggeri
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Costruisce una stazione tram merci
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Costruisce una stazione tram passeggeri
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Costruisce una stazione tram merci
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Costruisce un ponte stradale
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Costruisce un ponte tranviario
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Costruisce un ponte tranviario
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Costruisce un tunnel stradale
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Costruisce un tunnel tranviario
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Costruisce un tunnel tranviario
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Attiva/disattiva strade a senso unico
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Seleziona fra costruzione/rimozione di strade
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Seleziona fra costruzione/rimozione di tranvie
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Seleziona fra costruzione/rimozione di tranvie
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Seleziona l'orientamento del deposito automezzi
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Seleziona l'orientamento del deposito tranviario
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Seleziona l'orientamento del deposito tranviario
 STR_1814_ROAD                                                   :Strada
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Strada con lampioni
 STR_1816_TREE_LINED_ROAD                                        :Strada alberata
@@ -1827,8 +1827,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Farebbe parte di due o più stazioni/aree di carico
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Troppe stazioni/aree di carico in questa città
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Troppe stazioni/aree di carico
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Troppe stazioni degli autobus
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Troppe aree di carico per camion
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Troppe stazioni degli autobus
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Troppe aree di carico per camion
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Troppo vicino ad un'altra stazione/area di carico
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Bisogna demolire la stazione ferroviaria prima
@@ -1859,12 +1859,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} adesso accetta {STRING} e {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientamento stazione
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orient. area carico
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orient. stazione tram passeggeri
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orient. stazione tram merci
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orient. stazione tram passeggeri
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orient. stazione tram merci
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Bisogna demolire la stazione degli autobus prima
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Bisogna demolire l'area di carico per camion prima
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Bisogna demolire la stazione tram passeggeri prima
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Bisogna demolire la stazione tram merci prima
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Bisogna demolire la stazione tram passeggeri prima
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Bisogna demolire la stazione tram merci prima
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} stazion{P 2 e i}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nessuna -
@@ -1876,8 +1876,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Seleziona la lunghezza della stazione ferroviaria
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Seleziona l'orientamento della stazione degli autobus
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Seleziona l'orientamento dell'area di carico per camion
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Seleziona l'orientamento della stazione tram passeggeri
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Seleziona l'orientamento della stazione tram merci
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Seleziona l'orientamento della stazione tram passeggeri
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Seleziona l'orientamento della stazione tram merci
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centra la visuale principale sulla posizione della stazione
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Mostra la valutazione della stazione
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Cambia il nome della stazione
@@ -1899,7 +1899,7 @@
 STR_3069_BUOY                                                   :Boa
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...boa di mezzo
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stazione troppo estesa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...stazioni non uniformi disabilitate
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...stazioni non uniformi disabilitate
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Tenere premuto CTRL per scegliere più di un oggetto
 
 STR_UNDEFINED                                                   :(stringa non definita)
@@ -1940,7 +1940,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Seleziona tipo partita
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Seleziona uno scenario (verde), una partita pre-impostata (blu), o una nuova partita casuale
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Crea partita casuale
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Carica heightmap
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Carica heightmap
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} di mezzo
@@ -2144,10 +2144,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economia: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Inversione treni: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Disastri: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Atteggiamento della città in merito alle modifiche: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Atteggiamento della città in merito alle modifiche: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Nessuno
+STR_NONE                                                        :Nessuno
 STR_NUM_VERY_LOW                                                :Molto basso
 STR_6816_LOW                                                    :Basso
 STR_6817_NORMAL                                                 :Normale
@@ -2185,9 +2185,9 @@
 STR_6836_OFF                                                    :No
 STR_6837_ON                                                     :Si
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Mostra punteggi migliori
-STR_6839_PERMISSIVE                                             :Permissivo
-STR_683A_TOLERANT                                               :Tollerante
-STR_683B_HOSTILE                                                :Ostile
+STR_PERMISSIVE                                                  :Permissivo
+STR_TOLERANT                                                    :Tollerante
+STR_HOSTILE                                                     :Ostile
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2324,7 +2324,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Impossibile vendere il 25% delle azioni...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% posseduto dalla {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}La {COMPANY} è stata rilevata dalla {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Questa compagnia non è abbastanza vecchia per scambiare azioni...
+STR_PROTECTED                                                   :{WHITE}Questa compagnia non è abbastanza vecchia per scambiare azioni...
 
 STR_LIVERY_DEFAULT                                              :Livrea standard
 STR_LIVERY_STEAM                                                :Locomotiva a vapore
@@ -2633,17 +2633,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Vai a {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Vai a {STATION} (Trasferisci e carica merce)
-STR_8808_GO_TO_UNLOAD                                           :Vai a {STATION} (Scarica)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Vai a {STATION} (Trasferisci e parti vuoto)
-STR_880A_GO_TO_LOAD                                             :Vai a {STATION} (Carica)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Vai a {STATION} (Trasferisci e aspetta carico completo)
-STR_880C_GO_NON_STOP_TO                                         :Vai non-stop a {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Vai non-stop a {STATION} (Trasferisci e carica merce)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Vai non-stop a {STATION} (Scarica)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Vai non-stop a {STATION} (Trasferisci e parti vuoto)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Vai non-stop a {STATION} (Carica)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Vai non-stop a {STATION} (Trasferisci e aspetta carico completo)
+STR_GO_TO_TRANSFER                                              :Vai a {STATION} (Trasferisci e carica merce)
+STR_8807_GO_TO_UNLOAD                                           :Vai a {STATION} (Scarica)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Vai a {STATION} (Trasferisci e parti vuoto)
+STR_8808_GO_TO_LOAD                                             :Vai a {STATION} (Carica)
+STR_GO_TO_TRANSFER_LOAD                                         :Vai a {STATION} (Trasferisci e aspetta carico completo)
+STR_880A_GO_NON_STOP_TO                                         :Vai non-stop a {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Vai non-stop a {STATION} (Trasferisci e carica merce)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Vai non-stop a {STATION} (Scarica)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Vai non-stop a {STATION} (Trasferisci e parti vuoto)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Vai non-stop a {STATION} (Carica)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Vai non-stop a {STATION} (Trasferisci e aspetta carico completo)
 STR_GO_TO_TRAIN_DEPOT                                           :Vai al Deposito ferroviario di {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Manutenzione al Deposito di {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Vai non-stop al Deposito ferroviario di {TOWN}
@@ -2747,7 +2747,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Mostra i dettagli sul carico trasportato
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Mostra i dettagli sui veicoli che compongono il treno
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Mostra la capienza di ogni veicolo
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Mostra la capacità totale del treno, suddivisa per tipo di carico
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Mostra la capacità totale del treno, suddivisa per tipo di carico
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Lista degli ordini - fare clic su un ordine per selezionarlo e CTRL+clic per portarsi sulla stazione corrispondente
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Salta l'ordine corrente e inizia il successivo. Tenere premuto CTRL per saltare all'ordine selezionato
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Elimina l'ordine selezionato
@@ -2778,8 +2778,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Impossibile invertire la direzione del treno...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Rinomina tipo di veicolo ferroviario
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Impossibile rinominare il tipo di veicolo ferroviario...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo a trasferire il carico
-STR_886F_TRANSFER                                               :{BLACK}Trasferisci
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo a trasferire il carico
+STR_TRANSFER                                                    :{BLACK}Trasferisci
 STR_CLEAR_TIME                                                  :{BLACK}Elimina tempo
 STR_RESET_LATENESS                                              :{BLACK}Azzera ritardo
 
@@ -2857,8 +2857,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Rinomina l'automezzo
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo autobus arriva a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo camion arriva a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo tram passeggeri arriva a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo tram merci arriva a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo tram passeggeri arriva a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo tram merci arriva a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Incidente stradale!{}Il conducente muore nell'incendio seguito alla collisione con un treno
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Incidente stradale!{}In {COMMA} muoiono nell'incendio seguito alla collisione con un treno
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Impossibile far girare il veicolo...
@@ -2867,7 +2867,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rinomina il tipo di automezzo
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Rinomina tipo automezzo
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Impossibile rinominare il tipo di automezzo...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Vai al Deposito automezzi di {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Vai al Deposito automezzi di {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Manutenzione al Deposito di {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Riadatta l'automezzo per trasportare un tipo di carico differente
--- a/src/lang/japanese.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/japanese.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}名称定義数の制限を超えています
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}指定した名称はすでに使用中です
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}貨物
 STR_013D_INFORMATION                                            :{BLACK}情報
 STR_013E_CAPACITIES                                             :{BLACK}容量
-STR_013E_TOTAL_CARGO                                            :{BLACK}合計貨物
+STR_TOTAL_CARGO                                                 :{BLACK}合計貨物
 STR_013F_CAPACITY                                               :{BLACK}容量:{LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}容量:{LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}この列車の貨物最大容量:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}この列車の貨物最大容量:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}新しいゲーム
 STR_0141_LOAD_GAME                                              :{BLACK}ゲームを開く
@@ -728,7 +728,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}この町を完全に破壊します
 STR_0292_SAVE_SCENARIO                                          :シナリオを保存
 STR_0293_LOAD_SCENARIO                                          :シナリオを開く
-STR_LOAD_HEIGHTMAP                                              :ハイトマップを開く
+STR_MENU_LOAD_HEIGHTMAP                                         :ハイトマップを開く
 STR_0294_QUIT_EDITOR                                            :エディタを終了
 STR_0295                                                        :
 STR_0296_QUIT                                                   :終了
@@ -768,9 +768,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :ゲームの設定
-STR_02C5_DIFFICULTY_SETTINGS                                    :難易度の設定
-STR_02C7_CONFIG_PATCHES                                         :パッチの設定
+STR_02C4_GAME_OPTIONS                                           :ゲームの設定
+STR_02C6_DIFFICULTY_SETTINGS                                    :難易度の設定
+STR_MENU_CONFIG_PATCHES                                         :パッチの設定
 STR_NEWGRF_SETTINGS                                             :NewGRFの設定
 STR_TRANSPARENCY_OPTIONS                                        :半透明設定
 STR_GAMEOPTMENU_0A                                              :
@@ -870,8 +870,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}ゲームを保存しています{}完了してからしばらくお待ちください!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}'Ezy Street 式の音楽'のプレイリストを選択します
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :イギリス
@@ -1646,42 +1646,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}先に道路を破壊しなければなりません
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}道路工事中
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}道路の建設
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}路面電車線の建設
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}路面電車線の建設
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}道路橋を選択
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}...一方通行路上にジャンクションが建設できません
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}ここに道路が建設できません...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}ここに路面電車線が建設できません...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}ここに路面電車線が建設できません...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}ここから道路が破壊できません...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}ここから路面電車線が破壊できません...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}ここから路面電車線が破壊できません...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}車庫の配置
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}路面電車庫の配置
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}路面電車庫の配置
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}ここに車庫が建設できません...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}ここに路面電車庫が建設できません...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}ここに路面電車庫が建設できません...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}バス停が建設できません...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}荷役所が建設できません...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}乗客用路面電車駅が建設できません...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}貨物用路面電車駅が建設できません...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}乗客用路面電車駅が建設できません...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}貨物用路面電車駅が建設できません...
 STR_180A_ROAD_CONSTRUCTION                                      :道路の建設
-STR_180A_TRAMWAY_CONSTRUCTION                                   :路面電車線の建設
+STR_TRAMWAY_CONSTRUCTION                                        :路面電車線の建設
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}道路の部分を建設します
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}自動道路建設モードを用いて道路を建設
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}路面電車線を建設します
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}路面電車線を建設します
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}自動路面電車線建設モードを用いて路面電車線を建設
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}(バス、トラックの建設、整備のための)車庫を建設します
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}(路面電車の購入や修理のため)路面電車庫を建設します
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}(路面電車の購入や修理のため)路面電車庫を建設します
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}バス停を建設します
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}荷役所を建設します
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}乗客用路面電車駅を建設
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}貨物用路面電車駅を建設
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}乗客用路面電車駅を建設
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}貨物用路面電車駅を建設
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}道路の端を建設します
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}路面電車用橋を建設
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}路面電車用橋を建設
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}道路のトンネルを建設します
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}路面電車用トンネルを建設
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}路面電車用トンネルを建設
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}一方通行の道路を入/切
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}道路の建設/破壊を切り替えます
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}路面電車線の建設/破壊を切り替えます
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}路面電車線の建設/破壊を切り替えます
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}車庫の配置の選択
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}路面電車庫の配置を選択
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}路面電車庫の配置を選択
 STR_1814_ROAD                                                   :道路
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :街路照明のある道路
 STR_1816_TREE_LINED_ROAD                                        :並木道
@@ -1824,8 +1824,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}複数のすでに存在している駅/バス停/荷役所に接しています
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}町内に駅/バス停/荷役所が多すぎます
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}駅/バス停/荷役所が多すぎます
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}バス停が多すぎます
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}荷役所が多すぎます
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}バス停が多すぎます
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}荷役所が多すぎます
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}他の駅/荷役所に近すぎます
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}先に駅を破壊しなければなりません
@@ -1856,12 +1856,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION}は今後{STRING}と{STRING}が受入れます
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}バス停の配置
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}荷役所の配置
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}乗客用路面電車駅の配置
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}貨物用路面電車駅の配置
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}乗客用路面電車駅の配置
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}貨物用路面電車駅の配置
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}先にバス停を破壊しなければなりません
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}先にバス停を破壊しなければなりません
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}先に乗客用路面電車駅を破壊しなければなりません
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}先に貨物用路面電車駅を破壊しなければなりません
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}先に乗客用路面電車駅を破壊しなければなりません
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}先に貨物用路面電車駅を破壊しなければなりません
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA}軒の駅
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- なし -
@@ -1873,8 +1873,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}駅のホームの長さを選択します
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}バス停の配置を選択します
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}荷役所の配置を選択します
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}乗客用路面電車駅の配置を選択
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}貨物用路面電車駅の配置を選択
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}乗客用路面電車駅の配置を選択
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}貨物用路面電車駅の配置を選択
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}主の画面を駅の場所に移動します
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}駅の評価を表示します
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}駅名を変更します
@@ -1896,7 +1896,7 @@
 STR_3069_BUOY                                                   :ブイ
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...ブイがあります
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...駅が広すぎます
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...不統一の駅が建設できません
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...不統一の駅が建設できません
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}複数の項目を選択するにはcontrolを押します
 
 STR_UNDEFINED                                                   :(不定義)
@@ -1937,7 +1937,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}新規ゲーム種類の選択
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}シナリオ(緑)、プリセットゲーム(青)もしくは新規ランダムゲームを選択します
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :新規ランダムゲームを作成
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}ハイトマップを開く
+STR_LOAD_HEIGHTMAP                                              :{WHITE}ハイトマップを開く
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING}があります
@@ -2141,10 +2141,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}経済の傾向:{ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}列車の反転:{ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}災害:{ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}町議会の地域の再構築に関わる姿勢:{ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}町議会の地域の再構築に関わる姿勢:{ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :なし
+STR_NONE                                                        :なし
 STR_NUM_VERY_LOW                                                :特に低い
 STR_6816_LOW                                                    :低い
 STR_6817_NORMAL                                                 :通常
@@ -2182,9 +2182,9 @@
 STR_6836_OFF                                                    :切
 STR_6837_ON                                                     :入
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}ハイスコアを表示
-STR_6839_PERMISSIVE                                             :寛大
-STR_683A_TOLERANT                                               :寛容
-STR_683B_HOSTILE                                                :対立
+STR_PERMISSIVE                                                  :寛大
+STR_TOLERANT                                                    :寛容
+STR_HOSTILE                                                     :対立
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2321,7 +2321,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}この会社の25%の株が販売できません...
 STR_707D_OWNED_BY                                               :{WHITE}({1:COMPANY}が{0:COMMA}%株式保有)
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY}が{COMPANY}に買収!
-STR_7080_PROTECTED                                              :{WHITE}まだ早いため、この会社は株式取引できません...
+STR_PROTECTED                                                   :{WHITE}まだ早いため、この会社は株式取引できません...
 
 STR_LIVERY_DEFAULT                                              :通常のカラースキーム
 STR_LIVERY_STEAM                                                :蒸気機関車
@@ -2628,17 +2628,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :{STATION}へ行く
-STR_8807_GO_TO_TRANSFER                                         :{STATION}へ行く(運搬して貨物を積む)
-STR_8808_GO_TO_UNLOAD                                           :{STATION}へ行く(貨物を降ろす)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :{STATION}へ行く(運搬して空そのまま次へ行く)
-STR_880A_GO_TO_LOAD                                             :{STATION}へ行く(全負荷)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :{STATION}へ行く(運搬して全負荷まで待つ)
-STR_880C_GO_NON_STOP_TO                                         :{STATION}へ直行で行く
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :{STATION}へ直行で行く(運搬して貨物を積む)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :{STATION}へ直行で行く(貨物を降ろす)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :{STATION}へ直行で行く(運搬して空そのまま次へ行く)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :{STATION}へ直行で行く(全負荷)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :{STATION}へ直行で行く(運搬して全負荷まで待つ)
+STR_GO_TO_TRANSFER                                              :{STATION}へ行く(運搬して貨物を積む)
+STR_8807_GO_TO_UNLOAD                                           :{STATION}へ行く(貨物を降ろす)
+STR_GO_TO_TRANSFER_UNLOAD                                       :{STATION}へ行く(運搬して空そのまま次へ行く)
+STR_8808_GO_TO_LOAD                                             :{STATION}へ行く(全負荷)
+STR_GO_TO_TRANSFER_LOAD                                         :{STATION}へ行く(運搬して全負荷まで待つ)
+STR_880A_GO_NON_STOP_TO                                         :{STATION}へ直行で行く
+STR_GO_TO_NON_STOP_TRANSFER                                     :{STATION}へ直行で行く(運搬して貨物を積む)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :{STATION}へ直行で行く(貨物を降ろす)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :{STATION}へ直行で行く(運搬して空そのまま次へ行く)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :{STATION}へ直行で行く(全負荷)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :{STATION}へ直行で行く(運搬して全負荷まで待つ)
 STR_GO_TO_TRAIN_DEPOT                                           :{TOWN}電車庫へ回送
 STR_SERVICE_AT_TRAIN_DEPOT                                      :{TOWN}電車庫で修理
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :{TOWN}電車庫へ直行で回送
@@ -2742,7 +2742,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}運送している貨物の情報を表示します
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}鉄道車両の情報を表示します
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}各車両の容量を表示します
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}貨物種類に並べ替えて列車の合計容量を表示します
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}貨物種類に並べ替えて列車の合計容量を表示します
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}指令リスト - 指令を選択するにはクリックします
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}実行中の指令をスキップして、次へ移動します。Control クリックすると、選択した指令へ移動します。
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}選択した指令を削除します
@@ -2773,8 +2773,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}列車が逆転されられません...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}鉄道車両の名称を変更
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}鉄道車両の名称が変更できません...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}選択した指令に貨物の降ろすことを含みます
-STR_886F_TRANSFER                                               :{BLACK}運搬
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}選択した指令に貨物の降ろすことを含みます
+STR_TRANSFER                                                    :{BLACK}運搬
 STR_CLEAR_TIME                                                  :{BLACK}時間を消去
 STR_RESET_LATENESS                                              :{BLACK}遅刻回数をリセット
 
@@ -2852,8 +2852,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}道路車両を名付ける
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}町民の祝賀!{}初バスが{STATION}バス停に到着!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}町民の祝賀!{}初トラックが{STATION}荷役所に到着!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}町民の祝賀{}初乗客用路面電車が{STATION}駅に到着!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}町民の祝賀{}初貨物用路面電車が{STATION}駅に到着!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}町民の祝賀{}初乗客用路面電車が{STATION}駅に到着!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}町民の祝賀{}初貨物用路面電車が{STATION}駅に到着!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}交通事故!{}列車に衝突、運転者が死亡
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}交通事故!{}列車に衝突、{COMMA}人が死亡
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}車両が逆転させられません...
@@ -2862,7 +2862,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}道路車両の名称を変更
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}道路車両の名称を変更
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}道路車両の名称が変更できません...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :{TOWN}車庫へ回送
+STR_GO_TO_ROADVEH_DEPOT                                         :{TOWN}車庫へ回送
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :{TOWN}車庫で修理
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}他の貨物の種類を運送するに道路車両を再装備します
--- a/src/lang/korean.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/korean.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -273,9 +273,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}더이상 이름을 설정할 수 없습니다!
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}이미 사용중인 이름입니다!
 
-STR_0133_WINDOWS                                                :윈도우
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :윈도우
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -286,11 +286,11 @@
 STR_013C_CARGO                                                  :{BLACK}화물
 STR_013D_INFORMATION                                            :{BLACK}정보
 STR_013E_CAPACITIES                                             :{BLACK}수용량
-STR_013E_TOTAL_CARGO                                            :{BLACK}총 화물량
+STR_TOTAL_CARGO                                                 :{BLACK}총 화물량
 STR_013F_CAPACITY                                               :{BLACK}수용량: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}수용량: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}이 열차의 총 수용량:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}이 열차의 총 수용량:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}새로운 게임
 STR_0141_LOAD_GAME                                              :{BLACK}불러오기
@@ -729,7 +729,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}이 도시를 완전히 삭제
 STR_0292_SAVE_SCENARIO                                          :시나리오 저장
 STR_0293_LOAD_SCENARIO                                          :시나리오 불러오기
-STR_LOAD_HEIGHTMAP                                              :DEM지형 불러오기
+STR_MENU_LOAD_HEIGHTMAP                                         :DEM지형 불러오기
 STR_0294_QUIT_EDITOR                                            :에디터 종료
 STR_0295                                                        :
 STR_0296_QUIT                                                   :게임 종료
@@ -769,9 +769,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :게임 옵션
-STR_02C5_DIFFICULTY_SETTINGS                                    :난이도 설정
-STR_02C7_CONFIG_PATCHES                                         :패치 구성
+STR_02C4_GAME_OPTIONS                                           :게임 옵션
+STR_02C6_DIFFICULTY_SETTINGS                                    :난이도 설정
+STR_MENU_CONFIG_PATCHES                                         :패치 구성
 STR_NEWGRF_SETTINGS                                             :NewGRF 설정
 STR_TRANSPARENCY_OPTIONS                                        :투명 옵션
 STR_GAMEOPTMENU_0A                                              :
@@ -871,8 +871,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}저장중입니다,{}끝날때까지 기다려주세요
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}'Ezy Street 스타일 음악' 프로그램 선택
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :영어 (기본)
@@ -1647,42 +1647,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}도로를 먼저 제거하십시오
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}도로 작업이 진행중입니다
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}도로 건설
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}전찻길 건설
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}전찻길 건설
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}교량을 선택하십시오
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... 일방통행 도로는 교차로를 만들 수 없습니다
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}도로를 건설할 수 없습니다...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}여기에 전찻길을 건설할 수 없습니다...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}여기에 전찻길을 건설할 수 없습니다...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}도로를 제거할 수 없습니다...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}이곳의 전찻길을 제거할 수 없습니다...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}이곳의 전찻길을 제거할 수 없습니다...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}차고 방향
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}차량기지 방향
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}차량기지 방향
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}여기에 차고를 지을 수 없습니다...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}여기에 차량기지를 건설할 수 없습니다...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}여기에 차량기지를 건설할 수 없습니다...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}버스 정류장을 지을 수 없습니다...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}트럭 적하장을 지을 수 없습니다...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}여기에 승객 전차 정거장을 건설할 수 없습니다...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}여기에 화물 전차 정거장을 건설할 수 없습니다...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}여기에 승객 전차 정거장을 건설할 수 없습니다...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}여기에 화물 전차 정거장을 건설할 수 없습니다...
 STR_180A_ROAD_CONSTRUCTION                                      :도로 건설
-STR_180A_TRAMWAY_CONSTRUCTION                                   :전찻길 건설
+STR_TRAMWAY_CONSTRUCTION                                        :전찻길 건설
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}도로 섹션 건설
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}자동건설 모드로 도로 섹션 건설
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}전찻길 섹션 건설
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}전찻길 섹션 건설
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}자동건설 모드로 전차 섹션 건설
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}차고 건설 (차량의 제작/점검용)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}차량기지 건설 (차량 건설/점검용)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}차량기지 건설 (차량 건설/점검용)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}버스 정류장 건설
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}트럭 적하장 건설
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}승객 전차 정거장 건설
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}화물 전차 전거장 건설
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}승객 전차 정거장 건설
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}화물 전차 전거장 건설
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}교량 건설
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}철교 건설
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}철교 건설
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}터널 건설
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}터널 건설
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}터널 건설
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}일방통행 활성/비활성화
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}도로 제거툴 켜기/끄기
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}전찻길/신호등 제거툴 켜기/끄기
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}전찻길/신호등 제거툴 켜기/끄기
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}차고의 방향을 선택하십시오
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}차량기지의 방향을 선택하세요
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}차량기지의 방향을 선택하세요
 STR_1814_ROAD                                                   :도로
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :신호등이 있는 도로
 STR_1816_TREE_LINED_ROAD                                        :가로수가 있는 도로
@@ -1825,8 +1825,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}1개 이상의 역을 인접시키십시오
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}이 도시에 너무 많은 역이 있습니다
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}역이 너무 많습니다
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}버스 정류장이 너무 많습니다
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}트럭 적하장이 너무 많습니다
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}버스 정류장이 너무 많습니다
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}트럭 적하장이 너무 많습니다
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}다른 역과 너무 가깝습니다!
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}기차역을 먼저 제거하십시오!
@@ -1857,12 +1857,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION}에서 {STRING}/{STRING}을/를 받습니다.
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}버스 정류장 방향
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}트럭 적하장 방향
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}승객 전차 정거장 방향
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}화물 전차 정거장 방향
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}승객 전차 정거장 방향
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}화물 전차 정거장 방향
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}버스 정류장을 먼저 제거하십시오.
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}트럭 적하장을 먼저 제거하십시오.
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}승객 전차 정거장을 먼저 제거하십시오.
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}화물 전차 정거장을 먼저 제거하십시오.
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}승객 전차 정거장을 먼저 제거하십시오.
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}화물 전차 정거장을 먼저 제거하십시오.
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA}개 역사
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- 없음 -
@@ -1874,8 +1874,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}기차역의 길이를 선택합니다.
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}버스 정류장의 방향을 선택합니다.
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}트럭 적하장의 방향을 선택합니다.
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}승객 전차 정거장의 방향을 선택하세요.
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}화물 전차 정거장의 방향을 선택하세요.
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}승객 전차 정거장의 방향을 선택하세요.
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}화물 전차 정거장의 방향을 선택하세요.
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}이 역이 있는 곳으로 이동합니다.
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}역의 등급 표시
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}역 이름 변경
@@ -1897,7 +1897,7 @@
 STR_3069_BUOY                                                   :부이
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...도중에 부이가 있습니다.
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...역이 너무 큽니다.
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...역을 결합할 수 없습니다! (패치 구성 참고)
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...역을 결합할 수 없습니다! (패치 구성 참고)
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}1개 이상의 아이템을 선택하려면 CTRL키를 누르고 계십시오.
 
 STR_UNDEFINED                                                   :(정의되지 않은 문자열)
@@ -1938,7 +1938,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}새로운 게임 종류를 선택
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}시나리오(녹색), 프리셋 게임(파랑), 무작위 게임 선택
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :신규 무작위 게임 생성
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}DEM지형 로드
+STR_LOAD_HEIGHTMAP                                              :{WHITE}DEM지형 로드
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}중간에 {STRING}이/가 있습니다
@@ -2142,10 +2142,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}경제: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}열차 회차: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}재앙: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}도시 당국의 지역 재건설에 대한 태도: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}도시 당국의 지역 재건설에 대한 태도: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :없음
+STR_NONE                                                        :없음
 STR_NUM_VERY_LOW                                                :매우 적음
 STR_6816_LOW                                                    :낮음
 STR_6817_NORMAL                                                 :보통
@@ -2183,9 +2183,9 @@
 STR_6836_OFF                                                    :끔
 STR_6837_ON                                                     :켬
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}고득점 차트 보이기
-STR_6839_PERMISSIVE                                             :허용적
-STR_683A_TOLERANT                                               :관대함
-STR_683B_HOSTILE                                                :적대적
+STR_PERMISSIVE                                                  :허용적
+STR_TOLERANT                                                    :관대함
+STR_HOSTILE                                                     :적대적
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2322,7 +2322,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}이 회사 주식의 25%를 매도할 수 없습니다...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% {COMPANY}의 소유)
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY}의 관리권이 {COMPANY}(으)로 넘어갔습니다!
-STR_7080_PROTECTED                                              :{WHITE}이 회사는 주식을 거래할 만큼 오래되지 않았습니다...
+STR_PROTECTED                                                   :{WHITE}이 회사는 주식을 거래할 만큼 오래되지 않았습니다...
 
 STR_LIVERY_DEFAULT                                              :기본 색상
 STR_LIVERY_STEAM                                                :증기 기관차
@@ -2629,17 +2629,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :{STATION} 행
-STR_8807_GO_TO_TRANSFER                                         :{STATION} 행 (환승시키고 화물 싣기)
-STR_8808_GO_TO_UNLOAD                                           :{STATION} 행 (모두 내림)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :{STATION} 행 (환승시키고 화물을 모두 내림)
-STR_880A_GO_TO_LOAD                                             :{STATION} 행 (모두 싣기)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :{STATION} 행 (환승시키고 화물을 가득 실음)
-STR_880C_GO_NON_STOP_TO                                         :{STATION} 급행
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :{STATION} 급행 (환승시키고 화물 싣기)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :{STATION} 급행 (모두 내림)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :{STATION} 급행 (환승시키고 화물을 모두 내림)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :{STATION} 급행 (모두 싣기)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :{STATION} 급행 (환승시키고 화물을 가득 실음)
+STR_GO_TO_TRANSFER                                              :{STATION} 행 (환승시키고 화물 싣기)
+STR_8807_GO_TO_UNLOAD                                           :{STATION} 행 (모두 내림)
+STR_GO_TO_TRANSFER_UNLOAD                                       :{STATION} 행 (환승시키고 화물을 모두 내림)
+STR_8808_GO_TO_LOAD                                             :{STATION} 행 (모두 싣기)
+STR_GO_TO_TRANSFER_LOAD                                         :{STATION} 행 (환승시키고 화물을 가득 실음)
+STR_880A_GO_NON_STOP_TO                                         :{STATION} 급행
+STR_GO_TO_NON_STOP_TRANSFER                                     :{STATION} 급행 (환승시키고 화물 싣기)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :{STATION} 급행 (모두 내림)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :{STATION} 급행 (환승시키고 화물을 모두 내림)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :{STATION} 급행 (모두 싣기)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :{STATION} 급행 (환승시키고 화물을 가득 실음)
 STR_GO_TO_TRAIN_DEPOT                                           :{TOWN} 차량기지행
 STR_SERVICE_AT_TRAIN_DEPOT                                      :{TOWN} 차량기지행 (점검)
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :{TOWN} 차량기지 급행
@@ -2743,7 +2743,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}현재 싣고있는 화물 정보를 보여줌
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}각 차량의 상세 정보를 보여줌
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}각 차량의 수송량 정보를 보여줌
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}각 화물 종류에 따른 총 수송량 보여줌
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}각 화물 종류에 따른 총 수송량 보여줌
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}이 열차의 경로 - 선택하려면 클릭하세요. CTRL+클릭하시면 그 역이 있는 장소로 이동합니다.
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}현재 경로를 건너 뜁니다, 그리고 다음 경로를 시작합니다. Ctrl + 클릭은 선택된 경로로 건너 뜁니다.
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}선택된 경로를 삭제합니다.
@@ -2774,8 +2774,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}열차를 회차시킬 수 없습니다...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}열차 차량 타입 이름 재지정
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}차량 타입의 이름을 다시 지정할 수 없습니다...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}선택된 경로에서 모든 화물을 내려서 쌓아놓도록 변경합니다.
-STR_886F_TRANSFER                                               :{BLACK}환승
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}선택된 경로에서 모든 화물을 내려서 쌓아놓도록 변경합니다.
+STR_TRANSFER                                                    :{BLACK}환승
 STR_CLEAR_TIME                                                  :{BLACK}시간 초기화
 STR_RESET_LATENESS                                              :{BLACK}지연 카운터 초기화
 
@@ -2853,8 +2853,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}자동차 이름 지정
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}첫 버스가 {STATION} 정류장에 도착했습니다!{}시민들이 환호하고 있습니다!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}첫 트럭이 {STATION} 정류장에 도착했습니다!{}시민들이 환호하고 있습니다!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}{STATION}에 처음으로 승객 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}{STATION}에 처음으로 화물 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}{STATION}에 처음으로 승객 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}{STATION}에 처음으로 화물 전차가 도착했습니다!{}사람들이 환호성을 지릅니다!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}자동차 충돌!{}열차와의 충돌로 운전사가 사망했습니다!
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}자동차 충돌!{}열차와의 충돌로 {COMMA}명이 사망했습니다!
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}자동차를 회차시킬 수 없습니다...
@@ -2863,7 +2863,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}자동차 타입의 이름 지정
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}자동차 타입의 이름 지정
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}자동차 타입의 이름을 지정할 수 없습니다...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :{TOWN} 차고로 가는 중
+STR_GO_TO_ROADVEH_DEPOT                                         :{TOWN} 차고로 가는 중
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :{TOWN} 차고로 점검하러 가는 중
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}자동차가 다른 종류의 화물을 싣도록 개조
--- a/src/lang/lithuanian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/lithuanian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -306,9 +306,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Per daug vardų
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Pasirinktas vardas jau naudojamas
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -319,11 +319,11 @@
 STR_013C_CARGO                                                  :{BLACK}Keliamoji galia
 STR_013D_INFORMATION                                            :{BLACK}Informacija
 STR_013E_CAPACITIES                                             :{BLACK}Talpumas
-STR_013E_TOTAL_CARGO                                            :{BLACK}Visa keliamoji galia
+STR_TOTAL_CARGO                                                 :{BLACK}Visa keliamoji galia
 STR_013F_CAPACITY                                               :{BLACK}Talpa: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Talpa: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Visa traukinio keliamoji galia:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Visa traukinio keliamoji galia:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Naujas žaidimas
 STR_0141_LOAD_GAME                                              :{BLACK}Atverti žaidimą
@@ -757,7 +757,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Šalinti šį miestą
 STR_0292_SAVE_SCENARIO                                          :Išsaugoti scenarijų
 STR_0293_LOAD_SCENARIO                                          :Atverti scenarijų
-STR_LOAD_HEIGHTMAP                                              :Atverti aukščių žemėlapį
+STR_MENU_LOAD_HEIGHTMAP                                         :Atverti aukščių žemėlapį
 STR_0294_QUIT_EDITOR                                            :Uždaryti redaktoriu
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Išeiti
@@ -797,9 +797,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Žaidimo nustatymai
-STR_02C5_DIFFICULTY_SETTINGS                                    :Sunkumo lygio nustatymai
-STR_02C7_CONFIG_PATCHES                                         :Papildomi nustatymai
+STR_02C4_GAME_OPTIONS                                           :Žaidimo nustatymai
+STR_02C6_DIFFICULTY_SETTINGS                                    :Sunkumo lygio nustatymai
+STR_MENU_CONFIG_PATCHES                                         :Papildomi nustatymai
 STR_NEWGRF_SETTINGS                                             :Papild. grafikos nustatymai (NewGRF)
 STR_TRANSPARENCY_OPTIONS                                        :Permatomumo nustatymai
 STR_GAMEOPTMENU_0A                                              :
@@ -898,8 +898,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Vyksta išsaugojimas,{}palaukite kol baigsis!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Pasirink „Ezy Street“ muzikos stiliaus programą
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglų (Oginalus)
@@ -1730,8 +1730,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Ribojasi su daugiau nei viena stotele/pakrovimo aikštele
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Per daug stotelių/pakrovimo aikstelių šiame mieste
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Per daug stotelių
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Per daug autobusų stotelių
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Per daug sunkvežimių pakrovimo aikstelių
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Per daug autobusų stotelių
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Per daug sunkvežimių pakrovimo aikstelių
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Per arti kitos stotelės
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Pirmiausia reikia nugriauti geležinkelio stotį
@@ -1796,7 +1796,7 @@
 STR_3069_BUOY                                                   :Pluduras
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...pluduras pakeliui
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stotis per daug issipletusi
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...nestandartines stoteles atjungtos
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...nestandartines stoteles atjungtos
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Laikant nuspaustą VALD (CTRL) galima pažymėti daugiau nei vieną
 
 STR_UNDEFINED                                                   :(neapibrėžta eilutė)
@@ -1831,7 +1831,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Pasirink zaujo zaidimo tipa
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Pasirinkite scenariju (zalia spalva), nustatyta zaidima (melyna), ar atsitiktini nauja zaidima
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Sukurti atsitiktinį naują žaidimą
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Atverti aukščių žemėlapį
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Atverti aukščių žemėlapį
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} kelyje
@@ -2028,10 +2028,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomika: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Traukiniai apsisuka: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Nelaimes, katastrofos: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Miesto valdžios požiūris į aplinkos pertvarkymą: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Miesto valdžios požiūris į aplinkos pertvarkymą: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Nėra
+STR_NONE                                                        :Nėra
 STR_6816_LOW                                                    :Žemas
 STR_6817_NORMAL                                                 :Vidutinis
 STR_6818_HIGH                                                   :Aukštas
@@ -2068,9 +2068,9 @@
 STR_6836_OFF                                                    :Išjungta
 STR_6837_ON                                                     :Įjungta
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Rodyti rezultatų lentelę
-STR_6839_PERMISSIVE                                             :Atlaidus
-STR_683A_TOLERANT                                               :Tolerantiskas
-STR_683B_HOSTILE                                                :Priešiškas
+STR_PERMISSIVE                                                  :Atlaidus
+STR_TOLERANT                                                    :Tolerantiskas
+STR_HOSTILE                                                     :Priešiškas
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2202,7 +2202,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Negalima parduoti 25% sios kompanijos akciju...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% priklauso {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} buvo perimta {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Si kompanija dar pernelyg jauna, kad galetu pardavineti savo akcijas...
+STR_PROTECTED                                                   :{WHITE}Si kompanija dar pernelyg jauna, kad galetu pardavineti savo akcijas...
 
 STR_LIVERY_DEFAULT                                              :Standartinis Livery
 STR_LIVERY_STEAM                                                :Garo Variklis
@@ -2507,17 +2507,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Vaziuoja i {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Vykti i {STATION} (Perkelti ir pakrauti krovinius)
-STR_8808_GO_TO_UNLOAD                                           :Vykti i {STATION} (Issikrauti)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Vykti i {STATION} (Perkrauti ir palikti tuscia)
-STR_880A_GO_TO_LOAD                                             :Vykti i {STATION} (Pasikrauti)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Vykti i {STATION} (Perkrauti ir palaukti pilno pakrovimo)
-STR_880C_GO_NON_STOP_TO                                         :Vykti be sustojimo i {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Vykti be sustojimo i {STATION} (Perkrauti ir paimti krovini)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Vykti be sustojimo i {STATION} (Issikrauti)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Vykti be sustojimo i {STATION} (Perkrauti ir palikti tuscia)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Vykti be sustojimo i {STATION} (Pasikrauti)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Vykti be sustojimo i {STATION} (Perkrauti ir palaukti pilno pakrovimo)
+STR_GO_TO_TRANSFER                                              :Vykti i {STATION} (Perkelti ir pakrauti krovinius)
+STR_8807_GO_TO_UNLOAD                                           :Vykti i {STATION} (Issikrauti)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Vykti i {STATION} (Perkrauti ir palikti tuscia)
+STR_8808_GO_TO_LOAD                                             :Vykti i {STATION} (Pasikrauti)
+STR_GO_TO_TRANSFER_LOAD                                         :Vykti i {STATION} (Perkrauti ir palaukti pilno pakrovimo)
+STR_880A_GO_NON_STOP_TO                                         :Vykti be sustojimo i {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Vykti be sustojimo i {STATION} (Perkrauti ir paimti krovini)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Vykti be sustojimo i {STATION} (Issikrauti)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Vykti be sustojimo i {STATION} (Perkrauti ir palikti tuscia)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Vykti be sustojimo i {STATION} (Pasikrauti)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Vykti be sustojimo i {STATION} (Perkrauti ir palaukti pilno pakrovimo)
 STR_GO_TO_TRAIN_DEPOT                                           :Vaziuoti i {TOWN} Traukinio Depa
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Remontas {TOWN} traukiniu depe
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Važiuoti nestojant į {TOWN} traukinių depą
@@ -2610,7 +2610,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Rodyti detalia kroviniu informacija
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Rodyti detalia vagonu informacija
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Rodyti detalia vagonu talpos informacija
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Rodyti bendra traukinio talpos informacija pagal kroviniu tipa
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Rodyti bendra traukinio talpos informacija pagal kroviniu tipa
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Nurodymų sąrašas - nurodymas pažymimas ant jo spragtelėjus. Spregtelėjimas laikant VALD (CTRL) nukelia į stotį
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Istrinti pazymeta uzduoti
 STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Nestoti pazymetoje stoteleje
@@ -2636,8 +2636,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Traukinio vaziavimo krypties pakeisti negalima...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Pervardinti traukinio tipa
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Neimanoma pervardinti traukinio tipo...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Priversti iškrauti krovinius pažymėta tvarka
-STR_886F_TRANSFER                                               :{BLACK}Perkelti
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Priversti iškrauti krovinius pažymėta tvarka
+STR_TRANSFER                                                    :{BLACK}Perkelti
 
 STR_TRAIN_STOPPING                                              :{RED}Stabdoma
 STR_TRAIN_STOPPING_VEL                                          :{RED}Stabdomas, {VELOCITY}
@@ -2703,7 +2703,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Pervardinti automobiliu tipa
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Pervardinti automobiliu tipa
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Negali pervardinti automobliu tipo...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Kursas: {TOWN} automobiliu garazas
+STR_GO_TO_ROADVEH_DEPOT                                         :Kursas: {TOWN} automobiliu garazas
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Remontas: {TOWN} garaze
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Perkomplektuoti transporto priemone kad galetu vezti kitoki krovinio tipa
--- a/src/lang/norwegian_bokmal.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/norwegian_bokmal.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -273,9 +273,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}For mange navn oppgitt
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Navnet er allerede i bruk
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -286,11 +286,11 @@
 STR_013C_CARGO                                                  :{BLACK}Last
 STR_013D_INFORMATION                                            :{BLACK}Informasjon
 STR_013E_CAPACITIES                                             :{BLACK}Kapasitet
-STR_013E_TOTAL_CARGO                                            :{BLACK}Total last
+STR_TOTAL_CARGO                                                 :{BLACK}Total last
 STR_013F_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapasitet: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Total kapasitet på dette toget:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Total kapasitet på dette toget:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nytt spill
 STR_0141_LOAD_GAME                                              :{BLACK}Last inn spill
@@ -729,7 +729,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Slett denne byen fullstendig
 STR_0292_SAVE_SCENARIO                                          :Lagre scenario
 STR_0293_LOAD_SCENARIO                                          :Last inn scenario
-STR_LOAD_HEIGHTMAP                                              :Last høydekart
+STR_MENU_LOAD_HEIGHTMAP                                         :Last høydekart
 STR_0294_QUIT_EDITOR                                            :Avslutt redigeringsprogram
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Avslutt
@@ -769,9 +769,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Spillinnstillinger
-STR_02C5_DIFFICULTY_SETTINGS                                    :Vanskelighetsgrad
-STR_02C7_CONFIG_PATCHES                                         :Konfigurer patcher
+STR_02C4_GAME_OPTIONS                                           :Spillinnstillinger
+STR_02C6_DIFFICULTY_SETTINGS                                    :Vanskelighetsgrad
+STR_MENU_CONFIG_PATCHES                                         :Konfigurer patcher
 STR_NEWGRF_SETTINGS                                             :Innstillinger for ny grafikk
 STR_TRANSPARENCY_OPTIONS                                        :Instillinger for gjennomsiktighet
 STR_GAMEOPTMENU_0A                                              :
@@ -871,8 +871,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Lagring foregår enda,{}vennligst vent til det er ferdig!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Velg 'Ezy style music'-program
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engelsk
@@ -1647,42 +1647,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Må fjerne vei først
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Veiarbeid i gang
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Bygg vei
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Trikkekonstruksjon
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Trikkekonstruksjon
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Velg brotype
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... enveiskjørte veier kan ikke ha kryss
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kan ikke bygge vei her
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Kan ikke bygge trikkespor her...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Kan ikke bygge trikkespor her...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Kan ikke fjerne vei herfra...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Kan ikke fjerne trikkespor herfra...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Kan ikke fjerne trikkespor herfra...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Retning for garasje
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Trikkestallretning
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Trikkestallretning
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan ikke bygge garasje her...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Kan ikke bygge trikkestall her...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Kan ikke bygge trikkestall her...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Kan ikke bygge busstasjon...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kan ikke bygge lasteterminal...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Kan ikke bygge trikkestasjon for passasjerer...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Kan ikke bygge trikkestasjon for frakt...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Kan ikke bygge trikkestasjon for passasjerer...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Kan ikke bygge trikkestasjon for frakt...
 STR_180A_ROAD_CONSTRUCTION                                      :Bygg vei
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Trikkesporkonstruksjon
+STR_TRAMWAY_CONSTRUCTION                                        :Trikkesporkonstruksjon
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Bygg vei
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Bygg veiseksjon ved bruk av autovei-modusen
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Bygg trikkestasjon
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Bygg trikkestasjon
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Bygg trikkespor ved bruk av autotrikkespor-modusen
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bygg garasje (trengs for bygging og vedlikehold av kjøretøy)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Bygg trikkevognstall (for kjøp og vedlikehold av kjøretøy)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Bygg trikkevognstall (for kjøp og vedlikehold av kjøretøy)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Bygg bussstasjon
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bygg lasteterminal
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Bygg trikkestasjon for passasjerer
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Bygg trikkestasjon for frakt
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Bygg trikkestasjon for passasjerer
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Bygg trikkestasjon for frakt
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bygg bro
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Bygg bro for trikkespor
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Bygg bro for trikkespor
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Bygg tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Bygg tunnel for trikkespor
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Bygg tunnel for trikkespor
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Aktiver/deaktiver énveiskjørte veier
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Velg mellom bygging/fjerning for veibygging
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Velg mellom bygging/fjerning for trikkesporkonstruksjon
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Velg mellom bygging/fjerning for trikkesporkonstruksjon
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Velg garasjens retning
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Velg trikkestallens retning
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Velg trikkestallens retning
 STR_1814_ROAD                                                   :Vei
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Vei med gatelykter
 STR_1816_TREE_LINED_ROAD                                        :Aveny
@@ -1825,8 +1825,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Grenser til mer enn én eksiterende stasjon/lasteterminal
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}For mange stasjoner/lasteterminaler i byen
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}For mange stasjoner/lasteterminaler
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}For mange bussholdeplasser
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}For mange lasteterminaler
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}For mange bussholdeplasser
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}For mange lasteterminaler
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}For nær en annen jernbanestasjon/lasteterminal
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Må rive eksiterende jernbanestasjon først
@@ -1857,12 +1857,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} godtar nå {STRING} og {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Retning på bussterminal
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Retning på lasteterminal
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Retning for passasjertrikk
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Retning for frakttrikk
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Retning for passasjertrikk
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Retning for frakttrikk
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Må rive bussterminal først
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Må rive lasteterminal først
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Må fjerne trikkestasjon for passasjerer først
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Må fjerne trikkestasjon for frakt først
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Må fjerne trikkestasjon for passasjerer først
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Må fjerne trikkestasjon for frakt først
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stasjoner
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ingen -
@@ -1874,8 +1874,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Velg hvor lang stasjonen skal være
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Velg retning på bussterminal
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Velg retning på lasteterminal
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Velg retning på trikkestasjon for passasjerer
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Velg retning på trikkestasjon for frakt
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Velg retning på trikkestasjon for passasjerer
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Velg retning på trikkestasjon for frakt
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Sentrer bildet på stasjonen
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Vis stasjonsvurdering
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Endre navnet til stasjonen
@@ -1897,7 +1897,7 @@
 STR_3069_BUOY                                                   :Bøye
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...bøyen er i veien
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stasjonen er spredd for mye
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...uensartede stasjoner deaktivert
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...uensartede stasjoner deaktivert
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hold nede CTRL for å velge mer en en ting
 
 STR_UNDEFINED                                                   :(udefinert streng)
@@ -1938,7 +1938,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Velg ny spilltype
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Velg scenario (grønn), forhåndsatte spill (blått), eller nytt tilfeldig spill
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Lag et tilfeldig spill
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Last høydekart
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Last høydekart
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} er i veien
@@ -2142,10 +2142,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Økonomi: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Togreversering: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastrofer: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Bystyrets holdning mot ombygging av felt: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Bystyrets holdning mot ombygging av felt: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Ingen
+STR_NONE                                                        :Ingen
 STR_NUM_VERY_LOW                                                :Veldig lav
 STR_6816_LOW                                                    :Lite
 STR_6817_NORMAL                                                 :Normal
@@ -2183,9 +2183,9 @@
 STR_6836_OFF                                                    :Av
 STR_6837_ON                                                     :På
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Vis rekorder
-STR_6839_PERMISSIVE                                             :Tillatende
-STR_683A_TOLERANT                                               :Tolerant
-STR_683B_HOSTILE                                                :Fientlig
+STR_PERMISSIVE                                                  :Tillatende
+STR_TOLERANT                                                    :Tolerant
+STR_HOSTILE                                                     :Fientlig
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2322,7 +2322,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan ikke selge 25{NBSP}% av aksjene...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}{NBSP}% eies av {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} har blitt kjøpt opp av {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Dette selskapet selger ikke aksjer enda...
+STR_PROTECTED                                                   :{WHITE}Dette selskapet selger ikke aksjer enda...
 
 STR_LIVERY_DEFAULT                                              :Standardovertakelse
 STR_LIVERY_STEAM                                                :Damplokomotiv
@@ -2629,17 +2629,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Kjør til {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Gå til {STATION} (overfør og ta last)
-STR_8808_GO_TO_UNLOAD                                           :Gå til {STATION} (last av)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Gå til {STATION} (overfør og forlat som tom)
-STR_880A_GO_TO_LOAD                                             :Gå til {STATION} (last)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Gå til {STATION} (overfør og vent på full last)
-STR_880C_GO_NON_STOP_TO                                         :Gå uten stopp til {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Gå uten stopp til {STATION} (overfør og ta last)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Gå uten stopp til {STATION} (last av)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Gå uten stopp {STATION} (overfør og forlat som tom)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Gå uten stopp til {STATION} (last)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Gå uten stopp til {STATION} (overfør og vent på full last)
+STR_GO_TO_TRANSFER                                              :Gå til {STATION} (overfør og ta last)
+STR_8807_GO_TO_UNLOAD                                           :Gå til {STATION} (last av)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Gå til {STATION} (overfør og forlat som tom)
+STR_8808_GO_TO_LOAD                                             :Gå til {STATION} (last)
+STR_GO_TO_TRANSFER_LOAD                                         :Gå til {STATION} (overfør og vent på full last)
+STR_880A_GO_NON_STOP_TO                                         :Gå uten stopp til {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Gå uten stopp til {STATION} (overfør og ta last)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Gå uten stopp til {STATION} (last av)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Gå uten stopp {STATION} (overfør og forlat som tom)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Gå uten stopp til {STATION} (last)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Gå uten stopp til {STATION} (overfør og vent på full last)
 STR_GO_TO_TRAIN_DEPOT                                           :Gå til {TOWN} togdepot
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Velikehold ved {TOWN} togstall
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Kjør uten å stoppe til {TOWN} togstall
@@ -2743,7 +2743,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Vis detaljer om innholdet i vognene
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Vis detaljer om tog/vogner
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Vis kapasiteten til vognene
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Vis en total kapasitet på togene oppdelt etter godstype
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Vis en total kapasitet på togene oppdelt etter godstype
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Ordreliste - trykk på en ordre for å velge den
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Hopp over den nåværende ordren og begynn på neste. CTRL + klikk hopper fram til valgte ordre
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Slett den valgte ordren
@@ -2774,8 +2774,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan ikke snu toget...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Gi tog/vogn nytt navn
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan ikke gi tog/vogn nytt navn...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Få den merkede ordren til å tvinge kjøretøyet til å dumpe lasten
-STR_886F_TRANSFER                                               :{BLACK}Overfør
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Få den merkede ordren til å tvinge kjøretøyet til å dumpe lasten
+STR_TRANSFER                                                    :{BLACK}Overfør
 STR_CLEAR_TIME                                                  :{BLACK}Nullstill tid
 STR_RESET_LATENESS                                              :{BLACK}Nullstill senhetsteller
 
@@ -2853,8 +2853,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Navngi kjøretøy
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første buss ankommer {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Innbyggerne jubler . . .{}Første lastebil ankommer {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første passasjertrikk ankommer {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første frakttrikk ankommer {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første passasjertrikk ankommer {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første frakttrikk ankommer {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Kollisjon!{}Sjåfør dør etter kollisjon med tog
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Kollisjon!{}{COMMA} dør etter kollisjon med tog
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan ikke snu...
@@ -2863,7 +2863,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Endre navnet til kjøretøytypen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Endre navnet til kjøretøytypen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan ikke endre navnet til kjøretøytypen...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Kjør til {TOWN} garasje
+STR_GO_TO_ROADVEH_DEPOT                                         :Kjør til {TOWN} garasje
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Vedlikehold ved {TOWN} garasje
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om kjøretøyet til å ta en annen type last
--- a/src/lang/norwegian_nynorsk.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/norwegian_nynorsk.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -273,9 +273,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}For mange namn oppgjeve
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Namnet er allereie i i bruk
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -286,11 +286,11 @@
 STR_013C_CARGO                                                  :{BLACK}Last
 STR_013D_INFORMATION                                            :{BLACK}Informasjon
 STR_013E_CAPACITIES                                             :{BLACK}Kapasitet
-STR_013E_TOTAL_CARGO                                            :{BLACK}Total last
+STR_TOTAL_CARGO                                                 :{BLACK}Total last
 STR_013F_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapasitet: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Total kapasitet for dette toget:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Total kapasitet for dette toget:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nytt spel
 STR_0141_LOAD_GAME                                              :{BLACK}Last inn spel
@@ -729,7 +729,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Slett byen heilt
 STR_0292_SAVE_SCENARIO                                          :Lagre scenario
 STR_0293_LOAD_SCENARIO                                          :Last inn scenario
-STR_LOAD_HEIGHTMAP                                              :Last inn høgdekart
+STR_MENU_LOAD_HEIGHTMAP                                         :Last inn høgdekart
 STR_0294_QUIT_EDITOR                                            :Avslutt redigeringsprogram
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Avslutt
@@ -769,9 +769,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Spelinstillingar
-STR_02C5_DIFFICULTY_SETTINGS                                    :Vanskegrad
-STR_02C7_CONFIG_PATCHES                                         :Konfigurer patcher
+STR_02C4_GAME_OPTIONS                                           :Spelinstillingar
+STR_02C6_DIFFICULTY_SETTINGS                                    :Vanskegrad
+STR_MENU_CONFIG_PATCHES                                         :Konfigurer patcher
 STR_NEWGRF_SETTINGS                                             :Instillingar for ny grafikk
 STR_TRANSPARENCY_OPTIONS                                        :Gjennomsiktigheitsinnstillingar
 STR_GAMEOPTMENU_0A                                              :
@@ -871,8 +871,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Lagring foregår framleis,{}ver venleg å vente til det er ferdig!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Vel 'Ezy Street style music'-program
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engelsk
@@ -1646,42 +1646,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Må fjerne veg først
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vegarbeid pågår
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Bygg veg
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Trikkekonstruksjon
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Trikkekonstruksjon
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Vel type bru
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... einvegskøyrde vegar kan ikkje ha kryss
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kan ikkje byggje veg her...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Kan ikkje byggje trikk her
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Kan ikkje byggje trikk her
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Kan ikkje fjerne veg her...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Kan ikkje fjerna trikk
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Kan ikkje fjerna trikk
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Retning for garasje
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Retning for trikkedepot
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Retning for trikkedepot
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan ikkje byggje garasje her...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Kan ikkje byggje trikkedepot her
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Kan ikkje byggje trikkedepot her
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Kan ikkje byggje busstasjon...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kan ikkje byggje lasteterminal...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Kan ikkje byggje trikkestasjon for passasjerer...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Kan ikkje byggje trikkestasjon for frakt...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Kan ikkje byggje trikkestasjon for passasjerer...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Kan ikkje byggje trikkestasjon for frakt...
 STR_180A_ROAD_CONSTRUCTION                                      :Bygg veg
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Trikkekonstruksjon
+STR_TRAMWAY_CONSTRUCTION                                        :Trikkekonstruksjon
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Bygg veg
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Bygg vegseksjon med automatisk vegmodus
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Bygg trikkeseksjon
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Bygg trikkeseksjon
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Bygg trikkestasjon med automatisk trikkemodus
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bygg garasje (trengst for bygging og vedlikehald av køyretøy)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Bygg trikkedepot ( for å bygge og vedlikeholde køyretøy)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Bygg trikkedepot ( for å bygge og vedlikeholde køyretøy)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Bygg busstasjon
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bygg lasteterminal
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Bygg trikkestasjon for passasjerer
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Bygg trikkestasjon for frakt
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Bygg trikkestasjon for passasjerer
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Bygg trikkestasjon for frakt
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bygg bru
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Bygg bro for trikk
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Bygg bro for trikk
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Bygg tunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Bygg tunell for trikk
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Bygg tunell for trikk
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Aktiver / Deaktiver envegskøyrde vegar
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Vel mellom bygging/fjerning for vegbygging
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Byt mellom bygge / fjerne for trikk
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Byt mellom bygge / fjerne for trikk
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Vel retninga på garasjen
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Vel retning for trikkedepot
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Vel retning for trikkedepot
 STR_1814_ROAD                                                   :Veg
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Veg med gatelykter
 STR_1816_TREE_LINED_ROAD                                        :Aveny
@@ -1824,8 +1824,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Grensar til meir enn éin eksisterande stasjon/lasteterminal
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}For mange stasjonar/lasteterminalar i byen
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}For mange stasjonar/lasteterminalar
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}For mange busshaldeplassar
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}For mange lasteterminalar
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}For mange busshaldeplassar
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}For mange lasteterminalar
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}For nær ein annan jernbanestasjon/lasteterminal
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Må rive eksisterande jernbanestasjon først
@@ -1856,12 +1856,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} godtek no {STRING} og {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Retning på bussterminal
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Retning på lasteterminal
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Retning på trikkestajon
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Retning på trikkestasjon
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Retning på trikkestajon
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Retning på trikkestasjon
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Må rive bussterminal først
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Må rive lasteterminal først
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Må fjerne trikkestasjon først
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Må fjerne trikkestajon først
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Må fjerne trikkestasjon først
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Må fjerne trikkestajon først
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stasjon{P "" ar}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ingen -
@@ -1873,8 +1873,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Vel kor lang stasjonen skal vere
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Vel retning på bussterminal
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Vel retning på lasteterminal
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Velg retning på trikkestajon
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Velg retning på trikkestajon
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Velg retning på trikkestajon
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Velg retning på trikkestajon
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Sentrer biletet på stasjonen
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Vis stasjonsvurdering
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Endre namnet på stasjonen
@@ -1896,7 +1896,7 @@
 STR_3069_BUOY                                                   :Bøye
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...bøya er i vegen
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stasjonen er spreidd for mykje
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ikkje-einsarta stasjonar er deaktiverte
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ikkje-einsarta stasjonar er deaktiverte
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hald nede CTRL for å velje meir enn éin ting
 
 STR_UNDEFINED                                                   :(udefinert streng)
@@ -1937,7 +1937,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Vel ny speltype
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Vel scenario (grønn), førehandssette spel (blått), eller nytt tilfeldig spel
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Lag eit tilfeldig spel
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Last høgdekart
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Last høgdekart
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} er i vegen
@@ -2141,10 +2141,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Økonomi: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Togreversering: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastrofar: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Haldninga til bystyret til ombygging av felt: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Haldninga til bystyret til ombygging av felt: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Ingen
+STR_NONE                                                        :Ingen
 STR_NUM_VERY_LOW                                                :Særs låg
 STR_6816_LOW                                                    :Lite
 STR_6817_NORMAL                                                 :Normal
@@ -2182,9 +2182,9 @@
 STR_6836_OFF                                                    :Av
 STR_6837_ON                                                     :På
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Vis rekordar
-STR_6839_PERMISSIVE                                             :Tillatande
-STR_683A_TOLERANT                                               :Tolerant
-STR_683B_HOSTILE                                                :Fiendsleg
+STR_PERMISSIVE                                                  :Tillatande
+STR_TOLERANT                                                    :Tolerant
+STR_HOSTILE                                                     :Fiendsleg
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2321,7 +2321,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan ikkje selje 25 % av aksjane...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA} % eigast av {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} har vorte kjøpt opp av {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Dette selskapet sel ikkje aksjer enno...
+STR_PROTECTED                                                   :{WHITE}Dette selskapet sel ikkje aksjer enno...
 
 STR_LIVERY_DEFAULT                                              :Standardovertaking
 STR_LIVERY_STEAM                                                :Damplokomotiv
@@ -2628,17 +2628,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Køyr til {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Køyr til {STATION} (overfør og ta last)
-STR_8808_GO_TO_UNLOAD                                           :Køyr til {STATION} (last av)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Køyr til {STATION} (overfør og forlat som tom)
-STR_880A_GO_TO_LOAD                                             :Køyr til {STATION} (last)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Køyr til {STATION} (overfør og vent på full last)
-STR_880C_GO_NON_STOP_TO                                         :Køyr utan stopp til {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Køyr utan stopp til {STATION} (overfør og ta last)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Køyr utan stopp til {STATION} (last av)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Køyr utan stopp til {STATION} (overfør og forlat som tom)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Køyr utan stopp til {STATION} (last)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Køyr utan stopp til {STATION} (overfør og vent på full last)
+STR_GO_TO_TRANSFER                                              :Køyr til {STATION} (overfør og ta last)
+STR_8807_GO_TO_UNLOAD                                           :Køyr til {STATION} (last av)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Køyr til {STATION} (overfør og forlat som tom)
+STR_8808_GO_TO_LOAD                                             :Køyr til {STATION} (last)
+STR_GO_TO_TRANSFER_LOAD                                         :Køyr til {STATION} (overfør og vent på full last)
+STR_880A_GO_NON_STOP_TO                                         :Køyr utan stopp til {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Køyr utan stopp til {STATION} (overfør og ta last)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Køyr utan stopp til {STATION} (last av)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Køyr utan stopp til {STATION} (overfør og forlat som tom)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Køyr utan stopp til {STATION} (last)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Køyr utan stopp til {STATION} (overfør og vent på full last)
 STR_GO_TO_TRAIN_DEPOT                                           :Køyr til {TOWN} togstall
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Velikehald ved {TOWN} togstall
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Køyr utan stopp til togstallen i {TOWN}
@@ -2742,7 +2742,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Vis detaljar om innhaldet i vognene
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Vis detaljar om tog/vogner
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Vis kapasiteten til vognene
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Vis total kapasitet på vognene, sortert etter type vare
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Vis total kapasitet på vognene, sortert etter type vare
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Ordreliste - trykk på ein ordre for å velje han
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Hopp over gjedande ordre, og start neste.  CTRL + klikk hopper til valde ordre
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Slett den valde ordren
@@ -2773,8 +2773,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan ikkje snu toget...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Gje tog/vogn nytt namn
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan ikkje gje tog/vogn nytt namn...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Få den merka ordren til å tvinge køyretøyet til å dumpe lasta
-STR_886F_TRANSFER                                               :{BLACK}Overfør
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Få den merka ordren til å tvinge køyretøyet til å dumpe lasta
+STR_TRANSFER                                                    :{BLACK}Overfør
 STR_CLEAR_TIME                                                  :{BLACK}Fjern Tid
 STR_RESET_LATENESS                                              :{BLACK}Still attende teljaren for forseining
 
@@ -2851,8 +2851,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Namngje køyretøy
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første buss kjem til {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Innbyggjarane jublar . . .{}Første lastebil kjem til {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første passasjertrikk kjem til{STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første fraktetrikk kjem til {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første passasjertrikk kjem til{STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Innbygjarane feirer . . .{}Første fraktetrikk kjem til {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Kollisjon!{}Sjåfør døyr etter kollisjon med tog
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Kollisjon!{}{COMMA} døyr etter kollisjon med tog
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan ikkje snu...
@@ -2861,7 +2861,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Endre namnet til køyretøytypen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Endre namnet til køyretøytypen
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan ikkje endre namnet til køyretøytypen...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Køyr til {TOWN} garasje
+STR_GO_TO_ROADVEH_DEPOT                                         :Køyr til {TOWN} garasje
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Vedlikehald ved {TOWN} garasje
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om køyretøyet til å ta ein annan type last
--- a/src/lang/piglatin.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/piglatin.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Ootay anymay amesnay efinedday
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Osenchay amenay alreadyway inway useway
 
-STR_0133_WINDOWS                                                :Indowsway
-STR_0134_UNIX                                                   :Unixway
-STR_0135_OSX                                                    :OSWAY Xay
+STR_OSNAME_WINDOWS                                              :Indowsway
+STR_OSNAME_UNIX                                                 :Unixway
+STR_OSNAME_OSX                                                  :OSWAY Xay
 STR_OSNAME_BEOS                                                 :EOSbay
 STR_OSNAME_MORPHOS                                              :OrphOSmay
 STR_OSNAME_AMIGAOS                                              :AmigaOSWAY
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Argocay
 STR_013D_INFORMATION                                            :{BLACK}Informationway
 STR_013E_CAPACITIES                                             :{BLACK}Apacitiescay
-STR_013E_TOTAL_CARGO                                            :{BLACK}Otaltay Argocay
+STR_TOTAL_CARGO                                                 :{BLACK}Otaltay Argocay
 STR_013F_CAPACITY                                               :{BLACK}Apacitycay: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Apacitycay: {LTBLUE}{CARGO} (xay{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Otaltay argocay apacitycay ofway isthay aintray:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Otaltay argocay apacitycay ofway isthay aintray:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (xay{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Ewnay Amegay
 STR_0141_LOAD_GAME                                              :{BLACK}Oadlay Amegay
@@ -725,7 +725,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Eleteday isthay owntay ompletelycay
 STR_0292_SAVE_SCENARIO                                          :Avesay enarioscay
 STR_0293_LOAD_SCENARIO                                          :Oadlay enarioscay
-STR_LOAD_HEIGHTMAP                                              :Oadlay eightmaphay
+STR_MENU_LOAD_HEIGHTMAP                                         :Oadlay eightmaphay
 STR_0294_QUIT_EDITOR                                            :Itquay editorway
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Itquay
@@ -765,9 +765,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Amegay optionsway
-STR_02C5_DIFFICULTY_SETTINGS                                    :Ifficultyday ettingssay
-STR_02C7_CONFIG_PATCHES                                         :Onfigurecay atchespay
+STR_02C4_GAME_OPTIONS                                           :Amegay optionsway
+STR_02C6_DIFFICULTY_SETTINGS                                    :Ifficultyday ettingssay
+STR_MENU_CONFIG_PATCHES                                         :Onfigurecay atchespay
 STR_NEWGRF_SETTINGS                                             :EwGRFnay ettingssay
 STR_TRANSPARENCY_OPTIONS                                        :Ansparencytray optionsway
 STR_GAMEOPTMENU_0A                                              :
@@ -866,8 +866,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Avingsay illstay inway ogresspray,{}easeplay aitway untilway itway isway inishedfay!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Electsay 'Ezyway Eetstray ylestay usic'may ogrammepray
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Englishway (Originalway)
@@ -1636,42 +1636,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Ustmay emoveray oadray irstfay
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Oadray orksway inway ogresspray
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Oadray Onstructioncay
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Amwaytray Onstructioncay
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Amwaytray Onstructioncay
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Electsay Oadray Idgebray
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... oneway ayway oadsray an'tcay avehay unctionsjay
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}An'tcay uildbay oadray erehay...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}An'tcay uildbay amwaytray erehay...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}An'tcay uildbay amwaytray erehay...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}An'tcay emoveray oadray omfray erehay...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}An'tcay emoveray amwaytray omfray erehay...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}An'tcay emoveray amwaytray omfray erehay...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Oadray Epotday Orientationway
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Amtray Epotday Orientationway
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Amtray Epotday Orientationway
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}An'tcay uildbay oadray ehiclevay epotday erehay...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}An'tcay uildbay amtray ehiclevay epotday erehay...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}An'tcay uildbay amtray ehiclevay epotday erehay...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}An'tcay uildbay usbay ationstay...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}An'tcay uildbay orrylay ationstay...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}An'tcay uildbay assengerpay amtray ationstay...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}An'tcay uildbay eightfray amtray ationstay...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}An'tcay uildbay assengerpay amtray ationstay...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}An'tcay uildbay eightfray amtray ationstay...
 STR_180A_ROAD_CONSTRUCTION                                      :Oadray onstructioncay
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Amwaytray onstructioncay
+STR_TRAMWAY_CONSTRUCTION                                        :Amwaytray onstructioncay
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Uildbay oadray ectionsay
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Uildbay oadray ectionsay usingway ethay Autoroadway odemay
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Uildbay amwaytray ectionsay
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Uildbay amwaytray ectionsay
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Uildbay amwaytray ectionsay usingway ethay Autotramway odemay
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Uildbay oadray ehiclevay epotday (orfay uildingbay andway ervicingsay ehiclesvay)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Uildbay amtray ehiclevay epotday (orfay uildingbay andway ervicingsay ehiclesvay)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Uildbay amtray ehiclevay epotday (orfay uildingbay andway ervicingsay ehiclesvay)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Uildbay usbay ationstay
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Uildbay orrylay oadinglay aybay
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Uildbay assengerpay amtray ationstay
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Uildbay eightfray amtray ationstay
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Uildbay assengerpay amtray ationstay
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Uildbay eightfray amtray ationstay
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Uildbay oadray idgebray
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Uildbay amwaytray idgebray
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Uildbay amwaytray idgebray
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Uildbay oadray unneltay
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Uildbay amwaytray unneltay
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Uildbay amwaytray unneltay
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Activateway/Eactivateday oneway ayway oadsray
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Oggletay uildbay/emoveray orfay oadray onstructioncay
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Oggletay uildbay/emoveray orfay amwaytray onstructioncay
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Oggletay uildbay/emoveray orfay amwaytray onstructioncay
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Electsay oadray ehiclevay epotday orientationway
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Electsay amtray ehiclevay epotday orientationway
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Electsay amtray ehiclevay epotday orientationway
 STR_1814_ROAD                                                   :Oadray
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Oadray ithway eetlightsstray
 STR_1816_TREE_LINED_ROAD                                        :Eetray-inedlay oadray
@@ -1814,8 +1814,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Adjoinsway oremay anthay oneway existingway ationstay/oadinglay areaway
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Ootay anymay ationsstay/oadinglay areasway inway isthay owntay
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Ootay anymay ationsstay/oadinglay areasway
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Ootay anymay usbay opsstay
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Ootay anymay orrylay ationsstay
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Ootay anymay usbay opsstay
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Ootay anymay orrylay ationsstay
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Ootay oseclay otay anotherway ationstay/oadinglay areaway
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Ustmay emolishday ailwayray ationstay irstfay
@@ -1846,12 +1846,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} ownay acceptsway {STRING} andway {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Usbay Ationstay Orientationway
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orrylay Ationstay Orientationway
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Assengerpay Amtray Orientationway
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Eightfray Amtray Orientationway
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Assengerpay Amtray Orientationway
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Eightfray Amtray Orientationway
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Ustmay emolishday usbay ationstay irstfay
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Ustmay emolishday orrylay ationstay irstfay
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Ustmay emolishday assengerpay amtray ationstay irstfay
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Ustmay emolishday eightfray amtray ationstay irstfay
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Ustmay emolishday assengerpay amtray ationstay irstfay
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Ustmay emolishday eightfray amtray ationstay irstfay
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Ation{P "" s}stay
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Onenay -
@@ -1863,8 +1863,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Electsay engthlay ofway ailwayray ationstay
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Electsay usbay ationstay orientationway
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Electsay orrylay oadinglay aybay orientationway
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Electsay assengerpay amtray ationstay orientationway
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Electsay eightfray amtray ationstay orientationway
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Electsay assengerpay amtray ationstay orientationway
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Electsay eightfray amtray ationstay orientationway
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Entrecay ainmay iewvay onway ationstay ocationlay
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Owshay ationstay atingsray
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Angechay amenay ofway ationstay
@@ -1886,7 +1886,7 @@
 STR_3069_BUOY                                                   :Uoybay
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...uoybay inway ethay ayway
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...ationstay ootay eadspray outway
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...onuniformnay ationsstay isabledday
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...onuniformnay ationsstay isabledday
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Oldhay ownday CTRLay otay electsay oremay anthay oneway itemway
 
 STR_UNDEFINED                                                   :(undefinedway ingstray)
@@ -1927,7 +1927,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Electsay Ewnay Amegay Ypetay
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Electsay enarioscay (eengray), epray-etsay amegay (ueblay), orway andomray ewnay amegay
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Enerategay andomray ewnay amegay
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Oadlay Eightmaphay
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Oadlay Eightmaphay
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} inway ethay ayway
@@ -2131,10 +2131,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economyway: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Aintray eversingray: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Isastersday: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Itycay ouncil'scay attitudeway owardstay areaway estructuringray: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Itycay ouncil'scay attitudeway owardstay areaway estructuringray: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Onenay
+STR_NONE                                                        :Onenay
 STR_NUM_VERY_LOW                                                :Eryvay owlay
 STR_6816_LOW                                                    :Owlay
 STR_6817_NORMAL                                                 :Ormalnay
@@ -2172,9 +2172,9 @@
 STR_6836_OFF                                                    :Offway
 STR_6837_ON                                                     :Onway
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Owshay ihay-orescay artchay
-STR_6839_PERMISSIVE                                             :Ermissivepay
-STR_683A_TOLERANT                                               :Oleranttay
-STR_683B_HOSTILE                                                :Ostilehay
+STR_PERMISSIVE                                                  :Ermissivepay
+STR_TOLERANT                                                    :Oleranttay
+STR_HOSTILE                                                     :Ostilehay
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2311,7 +2311,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}An'tcay ellsay 25% areshay inway isthay ompanycay...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% ownedway ybay {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} ashay eenbay akentay overway ybay {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Isthay ompanycay isway otnay oldway enoughway otay adetray aresshay etyay...
+STR_PROTECTED                                                   :{WHITE}Isthay ompanycay isway otnay oldway enoughway otay adetray aresshay etyay...
 
 STR_LIVERY_DEFAULT                                              :Andardstay Iverylay
 STR_LIVERY_STEAM                                                :Eamstay Engineway
@@ -2618,17 +2618,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Ogay otay {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Ogay otay {STATION} (Ansfertray andway aketay argocay)
-STR_8808_GO_TO_UNLOAD                                           :Ogay otay {STATION} (Unloadway)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Ogay otay {STATION} (Ansfertray andway eavelay emptyway)
-STR_880A_GO_TO_LOAD                                             :Ogay otay {STATION} (Oadlay)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Ogay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
-STR_880C_GO_NON_STOP_TO                                         :Ogay onnay-opstay otay {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Ogay onnay-opstay otay {STATION} (Ansfertray andway aketay argocay)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Ogay onnay-opstay otay {STATION} (Unloadway)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Ogay onnay-opstay otay {STATION} (Ansfertray andway eavelay emptyway)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Ogay onnay-opstay otay {STATION} (Oadlay)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ogay onnay-opstay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
+STR_GO_TO_TRANSFER                                              :Ogay otay {STATION} (Ansfertray andway aketay argocay)
+STR_8807_GO_TO_UNLOAD                                           :Ogay otay {STATION} (Unloadway)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Ogay otay {STATION} (Ansfertray andway eavelay emptyway)
+STR_8808_GO_TO_LOAD                                             :Ogay otay {STATION} (Oadlay)
+STR_GO_TO_TRANSFER_LOAD                                         :Ogay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
+STR_880A_GO_NON_STOP_TO                                         :Ogay onnay-opstay otay {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Ogay onnay-opstay otay {STATION} (Ansfertray andway aketay argocay)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Ogay onnay-opstay otay {STATION} (Unloadway)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Ogay onnay-opstay otay {STATION} (Ansfertray andway eavelay emptyway)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Ogay onnay-opstay otay {STATION} (Oadlay)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Ogay onnay-opstay otay {STATION} (Ansfertray andway aitway orfay ullfay oadlay)
 STR_GO_TO_TRAIN_DEPOT                                           :Ogay otay {TOWN} Aintray Epotday
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Ervicesay atway {TOWN} Aintray Epotday
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ogay onnay-opstay otay {TOWN} Aintray Epotday
@@ -2732,7 +2732,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Owshay etailsday ofway argocay arriedcay
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Owshay etailsday ofway aintray ehiclesvay
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Owshay apacitiescay ofway eachway ehiclevay
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Owshay otaltay apacitycay ofway aintray, itsplay ybay argocay ypetay
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Owshay otaltay apacitycay ofway aintray, itsplay ybay argocay ypetay
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Ordersway istlay - ickclay onway anway orderway otay ighlighthay itway. CTRLay + ickclay ollsscray otay ethay ationstay
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Ipskay ethay urrentcay orderway, andway artstay ethay extnay. CTRLay + ickclay ipsskay otay ethay electedsay orderway
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Eleteday ethay ighlightedhay orderway
@@ -2763,8 +2763,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}An'tcay everseray irectionday ofway aintray...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Enameray aintray ehiclevay ypetay
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}An'tcay enameray aintray ehiclevay ypetay...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Akemay ethay ighlightedhay orderway orcefay ethay ehiclevay otay umpday argocay
-STR_886F_TRANSFER                                               :{BLACK}Ansfertray
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Akemay ethay ighlightedhay orderway orcefay ethay ehiclevay otay umpday argocay
+STR_TRANSFER                                                    :{BLACK}Ansfertray
 STR_CLEAR_TIME                                                  :{BLACK}Angechay Imetay
 STR_RESET_LATENESS                                              :{BLACK}Esetray Atelay Ountercay
 
@@ -2842,8 +2842,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Amenay oadray ehiclevay
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay usbay arrivesway atway {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay ucktray arrivesway atway {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay assengerpay amtray arrivesway atway {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay eightfray amtray arrivesway atway {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay assengerpay amtray arrivesway atway {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Itizenscay elebratecay . . .{}Irstfay eightfray amtray arrivesway atway {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Oadray Ehiclevay Ashcray!{}Iverdray iesday inway ireballfay afterway ollisioncay ithway aintray
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Oadray Ehiclevay Ashcray!{}{COMMA} ieday inway ireballfay afterway ollisioncay ithway aintray
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}An'tcay akemay ehiclevay urntay aroundway...
@@ -2852,7 +2852,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Enameray oadray ehiclevay ypetay
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Enameray oadray ehiclevay ypetay
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}An'tcay enameray oadray ehiclevay ypetay...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Ogay otay {TOWN} Oadray Ehiclevay Epotday
+STR_GO_TO_ROADVEH_DEPOT                                         :Ogay otay {TOWN} Oadray Ehiclevay Epotday
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Ervicesay atway {TOWN} Oadray Ehiclevay Epotday
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Efitray oadray ehiclevay otay arrycay away ifferentday argocay ypetay
--- a/src/lang/polish.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/polish.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -325,9 +325,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Za dużo zdefiniowanych nazw
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Nazwa jest już używana
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -338,11 +338,11 @@
 STR_013C_CARGO                                                  :{BLACK}Ładunek
 STR_013D_INFORMATION                                            :{BLACK}Informacja
 STR_013E_CAPACITIES                                             :{BLACK}Pojemność
-STR_013E_TOTAL_CARGO                                            :{BLACK}Całkowity ładunek
+STR_TOTAL_CARGO                                                 :{BLACK}Całkowity ładunek
 STR_013F_CAPACITY                                               :{BLACK}Pojemność: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Pojemność: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Calkowita pojemność tego pociągu:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Calkowita pojemność tego pociągu:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nowa Gra
 STR_0141_LOAD_GAME                                              :{BLACK}Wczytaj Grę
@@ -815,7 +815,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Skasuj to miasto
 STR_0292_SAVE_SCENARIO                                          :Zapisz scenariusz
 STR_0293_LOAD_SCENARIO                                          :Wczytaj scenariusz
-STR_LOAD_HEIGHTMAP                                              :Wczytaj mapę wysokości
+STR_MENU_LOAD_HEIGHTMAP                                         :Wczytaj mapę wysokości
 STR_0294_QUIT_EDITOR                                            :Wyjdź z edytora
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Wyjście
@@ -855,9 +855,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Opcje gry
-STR_02C5_DIFFICULTY_SETTINGS                                    :Ustawienia trudności
-STR_02C7_CONFIG_PATCHES                                         :Konfiguracja wtyczek
+STR_02C4_GAME_OPTIONS                                           :Opcje gry
+STR_02C6_DIFFICULTY_SETTINGS                                    :Ustawienia trudności
+STR_MENU_CONFIG_PATCHES                                         :Konfiguracja wtyczek
 STR_NEWGRF_SETTINGS                                             :Ustawienia newgrf
 STR_TRANSPARENCY_OPTIONS                                        :Opcje przeźroczystości
 STR_GAMEOPTMENU_0A                                              :
@@ -957,8 +957,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Zapisywanie trwa,{}proszę zaczekać do zakończenia!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Wybierz program 'Ezy Street'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Angielskie (Oryginalne)
@@ -1732,42 +1732,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Należy najpierw usunąć drogę
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Trwają roboty drogowe
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Tworzenie dróg
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Budowa torowiska tramwajowego
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Budowa torowiska tramwajowego
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Wybierz most drogowy
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... drogi jednokierunkowe nie mogą mieć skrzyżowań
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Nie można tutaj zbudować drogi...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Nie można tutaj zbudować torowiska...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Nie można tutaj zbudować torowiska...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Nie można usunąć drogi z tego miejsca...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Nie można torowiska z tego miejsca...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Nie można torowiska z tego miejsca...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Ukierunkowanie zajezdni samochodowej
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientacja zajezdni
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientacja zajezdni
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nie można tutaj zbudować zajezdni...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Nie można tutaj zbudować zajezdni...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Nie można tutaj zbudować zajezdni...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nie można zbudować przystanku...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nie można zbudować stacji ciężarówek...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Nie można zbudować przystanku tramwajowego...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Nie można zbudować tramwajowej stacji załadunkowej...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Nie można zbudować przystanku tramwajowego...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Nie można zbudować tramwajowej stacji załadunkowej...
 STR_180A_ROAD_CONSTRUCTION                                      :Budowa drogi
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Budowa torowiska tramwajowego
+STR_TRAMWAY_CONSTRUCTION                                        :Budowa torowiska tramwajowego
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Budowa dróg
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Budowa drogi używając trybu Autoroad
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Zbuduj fragment torowiska tramwajowego
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Zbuduj fragment torowiska tramwajowego
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Budowa torów tramwajowych używając trybu Autotram
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Zbuduj zajezdnię samochodową (do budowania i serwisowania pojazdów)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Zbuduj zajezdnię tramwajową (do budowania i serwisowania pojazdów)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Zbuduj zajezdnię tramwajową (do budowania i serwisowania pojazdów)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Budowa przystanku
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Zbuduj stację załadunku ciężarówek
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Zbuduj przystanek tramwajowy
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Zbuduj tramwajową stację załadunkową
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Zbuduj przystanek tramwajowy
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Zbuduj tramwajową stację załadunkową
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Budowa mostu drogowego
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Zbuduj most tramwajowy
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Zbuduj most tramwajowy
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Budowa tunelu drogowego
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Zbuduj tunel tramwajowy
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Zbuduj tunel tramwajowy
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Włącz/Wyłącz drogi jednokierunkowe
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Przełącz buduj/usuń dla konstrukcji dróg
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Przełącz buduj/usuń dla konstrukcji torowiska tramwajowego
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Przełącz buduj/usuń dla konstrukcji torowiska tramwajowego
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Wybierz umiejscowienie zajezdni samochodowej
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Wybierz ukierunkowanie zajezdni tramwajowej
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Wybierz ukierunkowanie zajezdni tramwajowej
 STR_1814_ROAD                                                   :Droga
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Droga z oświetleniem ulicznym
 STR_1816_TREE_LINED_ROAD                                        :Droga z drzewami
@@ -1910,8 +1910,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Przylega do więcej niż jednej stacji
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Za dużo stacji w tym mieście
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Za duzo stacji
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Za dużo przystankow autobusowych
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Za dużo  wiele stacji załadunku ciężarówek
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Za dużo przystankow autobusowych
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Za dużo  wiele stacji załadunku ciężarówek
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Zbyt  blisko innej stacji
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Należy najpierw usunąc stację
@@ -1942,12 +1942,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} już akceptuje {STRING} i {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Ukierunkowanie przystanku
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Ukierunkowanie st. załadunku
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Ukierunkowanie przystanku tramwajowego
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Ukierunkowanie tramwajowej stacji załadunkowej
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Ukierunkowanie przystanku tramwajowego
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Ukierunkowanie tramwajowej stacji załadunkowej
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Należy najpierw usunąć przystanek
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Należy najpierw usunąć stację załadunku ciężarówek
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Najpierw musisz zniszczyć przystanek tramwajowy
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Najpierw musisz zniszczyć tramwajową stację załadunkową
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Najpierw musisz zniszczyć przystanek tramwajowy
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Najpierw musisz zniszczyć tramwajową stację załadunkową
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nic -
@@ -1959,8 +1959,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Wybierz długość stacji
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Wybierz ukierunkowanie przystanku
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Ukierunkowanie stacji załadunku ciężarówek
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Wybierz ukierunkowanie przystanku tramwajowego
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Wybierz ukierunkowanie tramwajowej stacji załadunkowej
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Wybierz ukierunkowanie przystanku tramwajowego
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Wybierz ukierunkowanie tramwajowej stacji załadunkowej
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centruj główny widok na stacji
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Pokaż ocenę stacji
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Zmień nazwę stacji
@@ -1982,7 +1982,7 @@
 STR_3069_BUOY                                                   :Boja
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...boja na drodze
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stacja zbyt rozległa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...niejednorodne  są niedostępne
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...niejednorodne  są niedostępne
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Przytrzymaj CTRL aby zaznaczyć więcej niż jedną opcję
 
 STR_UNDEFINED                                                   :(nieokreślony tekst)
@@ -2023,7 +2023,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Wybierz nowy typ gry
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Wybierz scenariusz (zielony), ustawioną grę (niebieski), lub losową nową grę
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Tworzenie losowej nowej gry
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Wczytaj mapę wysokości
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Wczytaj mapę wysokości
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} na drodze
@@ -2263,10 +2263,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomia: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Zawracanie pociągów: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastrofy: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Nastawienie władz do zmian okolicznych terenów: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Nastawienie władz do zmian okolicznych terenów: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Brak
+STR_NONE                                                        :Brak
 STR_NUM_VERY_LOW                                                :Bardzo mało
 STR_6816_LOW                                                    :Mało
 STR_6817_NORMAL                                                 :Średnio
@@ -2304,9 +2304,9 @@
 STR_6836_OFF                                                    :Wyłączone
 STR_6837_ON                                                     :Włączone
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Pokaż Najlepsze Wyniki
-STR_6839_PERMISSIVE                                             :Przyjazne
-STR_683A_TOLERANT                                               :Tolerancyjne
-STR_683B_HOSTILE                                                :Wrogie
+STR_PERMISSIVE                                                  :Przyjazne
+STR_TOLERANT                                                    :Tolerancyjne
+STR_HOSTILE                                                     :Wrogie
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2443,7 +2443,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}nie można sprzedać 25% udziałów tej firmy...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% w posiadaniu przez {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} zostało przejęte przez {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Ta firma jeszcze nie sprzedaje akcji...
+STR_PROTECTED                                                   :{WHITE}Ta firma jeszcze nie sprzedaje akcji...
 
 STR_LIVERY_DEFAULT                                              :Standardowy wygląd
 STR_LIVERY_STEAM                                                :Parowóz
@@ -2756,17 +2756,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Idź do {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Idź do {STATION} (Przewieź i weź ładunek)
-STR_8808_GO_TO_UNLOAD                                           :Idź do {STATION} (Wyładunek)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Idź do {STATION} (Przewieź i nie bierz ładunku)
-STR_880A_GO_TO_LOAD                                             :Idź do {STATION} (Załadunek)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Idź do {STATION} (Przewieź i czekaj na pełen załadunek)
-STR_880C_GO_NON_STOP_TO                                         :Idź bez zatrzymywania do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Idź bez zatrzymywania do {STATION} (Przewieź i weź ładunek)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Idź bez zatrzymywania do {STATION} (Wyładunek)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Idź bez zatrzymywania do {STATION} (Przewieź i nie bierz ładunku)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Idź bez zatrzymywania do {STATION} (Załadunek)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Idź bez zatrzymywania do {STATION} (Przewieź i czekaj na pełen załadunek)
+STR_GO_TO_TRANSFER                                              :Idź do {STATION} (Przewieź i weź ładunek)
+STR_8807_GO_TO_UNLOAD                                           :Idź do {STATION} (Wyładunek)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Idź do {STATION} (Przewieź i nie bierz ładunku)
+STR_8808_GO_TO_LOAD                                             :Idź do {STATION} (Załadunek)
+STR_GO_TO_TRANSFER_LOAD                                         :Idź do {STATION} (Przewieź i czekaj na pełen załadunek)
+STR_880A_GO_NON_STOP_TO                                         :Idź bez zatrzymywania do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Idź bez zatrzymywania do {STATION} (Przewieź i weź ładunek)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Idź bez zatrzymywania do {STATION} (Wyładunek)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Idź bez zatrzymywania do {STATION} (Przewieź i nie bierz ładunku)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Idź bez zatrzymywania do {STATION} (Załadunek)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Idź bez zatrzymywania do {STATION} (Przewieź i czekaj na pełen załadunek)
 STR_GO_TO_TRAIN_DEPOT                                           :Idź do zajezdni w {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Serwisuj w zajezdni w {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Idź bez zatrzymywania do zajezdni w {TOWN}
@@ -2870,7 +2870,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Pokaż szczegóły przewożonych ładunków
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Pokaż szczegóły pociągu
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Pokaż pojemność każdego wagonu
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Pokaż całkowitą pojemność pociągu, według typu ładunku
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Pokaż całkowitą pojemność pociągu, według typu ładunku
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Lista poleceń - klik na poleceniu aby zaznaczyć. CTRL + klik przenosi do stacji
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Pomiń obecne zadanie, i rozpocznij kolejne. CTRL + klik pomija aż do zaznaczonego zadania
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Usuń podświetlone polecenie
@@ -2901,8 +2901,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nie można odwrócić kierunku jazdy pociągu...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Zmiana nazwy typu pociągu
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nie można zmienić nazwy typu pojazdu...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Spraw by w zaznaczonym poleceniu pojazd był zmuszony do pozostawienia ładunku dla kolejnego pojazdu
-STR_886F_TRANSFER                                               :{BLACK}Przewieź
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Spraw by w zaznaczonym poleceniu pojazd był zmuszony do pozostawienia ładunku dla kolejnego pojazdu
+STR_TRANSFER                                                    :{BLACK}Przewieź
 STR_CLEAR_TIME                                                  :{BLACK}Usuń czas
 STR_RESET_LATENESS                                              :{BLACK}Wyzeruj spóźnienia
 
@@ -2980,8 +2980,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Nazwij samochód
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy autobus przybył do {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwsza ciężarówka przybyła do {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj pasażerski przybył do {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj towarowy przybył do {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj pasażerski przybył do {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy tramwaj towarowy przybył do {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Wypadek samochodowy!{}Kierowca zginął w zderzeniu z pociągiem
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Wypadek samochodowy!{}{COMMA} ofiar{P a y ""} zderzenia z pociągiem
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nie można zawrócić samochodu...
@@ -2990,7 +2990,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Zmień nazwę typu samochodu
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Zmień nazwę typu samochodu
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nie można zmienić nazwy typu samochodu...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Idź do zajezdni sam. w {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Idź do zajezdni sam. w {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Serwisuj w zajezdni sam. w {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Przebudowa samochodu do przewozu innego typu ładunku
--- a/src/lang/portuguese.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/portuguese.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Demasiados nomes definidos
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}O nome escolhido já está a ser usado
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Carga
 STR_013D_INFORMATION                                            :{BLACK}Informação
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
-STR_013E_TOTAL_CARGO                                            :{BLACK}Carga Total
+STR_TOTAL_CARGO                                                 :{BLACK}Carga Total
 STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacidade: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carga total (capacidade) deste comboio:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Carga total (capacidade) deste comboio:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Novo Jogo
 STR_0141_LOAD_GAME                                              :{BLACK}Abrir Jogo
@@ -728,7 +728,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Apagar completamente esta cidade
 STR_0292_SAVE_SCENARIO                                          :Guardar cenário
 STR_0293_LOAD_SCENARIO                                          :Abrir cenário
-STR_LOAD_HEIGHTMAP                                              :Carregar mapa de alturas
+STR_MENU_LOAD_HEIGHTMAP                                         :Carregar mapa de alturas
 STR_0294_QUIT_EDITOR                                            :Sair do editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Sair
@@ -768,9 +768,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Opções do Jogo
-STR_02C5_DIFFICULTY_SETTINGS                                    :Configurações de dificuldade
-STR_02C7_CONFIG_PATCHES                                         :Configurar correcções
+STR_02C4_GAME_OPTIONS                                           :Opções do Jogo
+STR_02C6_DIFFICULTY_SETTINGS                                    :Configurações de dificuldade
+STR_MENU_CONFIG_PATCHES                                         :Configurar correcções
 STR_NEWGRF_SETTINGS                                             :Definições Newgrf
 STR_TRANSPARENCY_OPTIONS                                        :Opções de Transparência
 STR_GAMEOPTMENU_0A                                              :
@@ -870,8 +870,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Gravação ainda em curso,{}por favor aguarde!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Seleccionar programa 'Ezy Street'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglês
@@ -1646,42 +1646,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Deverá remover a estrada primeiro
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Trabalhos na estrada em curso
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construir Estradas
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Construção de eléctricos
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Construção de eléctricos
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Seleccionar Ponte de Estrada
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... estradas de um sentido não podem ter junções
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Não é possível construir estrada aqui...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Não é possível construir carris para eléctricos neste local...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Não é possível construir carris para eléctricos neste local...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Não é possível remover estrada daqui...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Não é possível remover carris para eléctricos deste local...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Não é possível remover carris para eléctricos deste local...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientação do Depósito
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientação do depósito para eléctricos
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientação do depósito para eléctricos
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Não é possível construir depósito de veículos de estrada aqui...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Não é possível construir depósito para eléctricos neste local...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Não é possível construir depósito para eléctricos neste local...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Não é possível construir estação de autocarros...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Não é possível construir estação de carregamento de camiões...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Não é possível construir estação de passageiros para eléctricos...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Não é possível construir estação de carga para eléctricos...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Não é possível construir estação de passageiros para eléctricos...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Não é possível construir estação de carga para eléctricos...
 STR_180A_ROAD_CONSTRUCTION                                      :Construir estradas
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Construção de carris para eléctricos
+STR_TRAMWAY_CONSTRUCTION                                        :Construção de carris para eléctricos
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Construir estradas
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Construir estradas usando o modo automático
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Construir secção de carris para eléctricos
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Construir secção de carris para eléctricos
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Construir carris para eléctricos usando o modo automático
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Construir depósito (para criação e manutenção de veículos de estrada)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Construir depósito de eléctricos (para construção e manutenção)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Construir depósito de eléctricos (para construção e manutenção)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Construir estação de autocarros
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Construir área de carregamento de camiões
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Construir paragem de eléctricos para passageiros
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Construir paragem de eléctricos para carga
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Construir paragem de eléctricos para passageiros
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Construir paragem de eléctricos para carga
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Construir ponte de estrada
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Construir ponte para eléctricos
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Construir ponte para eléctricos
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Construir túnel de estrada
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Construir túnel para eléctricos
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Construir túnel para eléctricos
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Activar/Desactivar estradas de sentido único
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Alternar entre construir/remover estradas
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Alternar construir/remover linhas de eléctricos e sinais
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Alternar construir/remover linhas de eléctricos e sinais
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Seleccionar a orientação do depósito
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Escolher a orientação do depósito de eléctricos
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Escolher a orientação do depósito de eléctricos
 STR_1814_ROAD                                                   :Estrada
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Estrada com iluminação
 STR_1816_TREE_LINED_ROAD                                        :Estrada com árvores
@@ -1824,8 +1824,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Muito junto de uma estação/local de carga já existente
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Demasiadas estações/locais de carga nesta cidade
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Demasiadas estações/locais de carga
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Demasiadas paragens de autocarro
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Demasiadas estações de carga
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Demasiadas paragens de autocarro
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Demasiadas estações de carga
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Muito junto de uma estação/local de carga
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Precisa de demolir a estação primeiro
@@ -1856,12 +1856,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} agora aceita {STRING} e {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientação da estação de autocarros
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientação da estação de carga
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orientação da Estação de Eléctricos
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orientação da Estação de Eléctricos
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orientação da Estação de Eléctricos
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orientação da Estação de Eléctricos
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Precisa de demolir a estação de autocarros primeiro
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Precisa de demolir a estação de carga primeiro
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Precisa demolir estação de eléctricos primeiro
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Precisa demolir estação de eléctricos primeiro
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Precisa demolir estação de eléctricos primeiro
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Precisa demolir estação de eléctricos primeiro
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estações
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nenhuma -
@@ -1873,8 +1873,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Seleccionar o tamanho da estação ferroviária
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Seleccionar a orientação da estação de autocarros
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Seleccionar a orientação da estação de carregamento de camiões
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Selecionar orientação da estação de eléctricos
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Selecionar orientação da estação de eléctricos
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Selecionar orientação da estação de eléctricos
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Selecionar orientação da estação de eléctricos
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centrar visualização no local estação
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Mostrar avaliações da estação
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Alterar o nome da estação
@@ -1896,7 +1896,7 @@
 STR_3069_BUOY                                                   :Bóia
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...bóia no caminho
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...estação muito extensa
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...estações não-uniformes desactivadas
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...estações não-uniformes desactivadas
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Manter CTRL premido para seleccionar mais do que um item
 
 STR_UNDEFINED                                                   :(frase indefinida)
@@ -1937,7 +1937,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Seleccionar Novo Tipo de Jogo
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Seleccionar cenário (verde), jogo pré-programado (azul), ou novo jogo aleatório
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Gerar novo jogo aleatório
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Carregar mapa de alturas
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Carregar mapa de alturas
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} no caminho
@@ -2141,10 +2141,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economia: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Inverter comboio: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Atitude das autoridades sobre reestruturamentos: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Atitude das autoridades sobre reestruturamentos: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Nenhum
+STR_NONE                                                        :Nenhum
 STR_NUM_VERY_LOW                                                :Muito baixo
 STR_6816_LOW                                                    :Baixo
 STR_6817_NORMAL                                                 :Normal
@@ -2182,9 +2182,9 @@
 STR_6836_OFF                                                    :Off
 STR_6837_ON                                                     :On
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Mostrar melhores pontuações
-STR_6839_PERMISSIVE                                             :Permissivo
-STR_683A_TOLERANT                                               :Tolerante
-STR_683B_HOSTILE                                                :Hostil
+STR_PERMISSIVE                                                  :Permissivo
+STR_TOLERANT                                                    :Tolerante
+STR_HOSTILE                                                     :Hostil
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2321,7 +2321,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Não é possível vender 25% de acções nesta empresa...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propriedade de {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} foi comprada por {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Esta empresa ainda não troca acções...
+STR_PROTECTED                                                   :{WHITE}Esta empresa ainda não troca acções...
 
 STR_LIVERY_DEFAULT                                              :Estampagem Padrão
 STR_LIVERY_STEAM                                                :Motor a Vapor
@@ -2630,17 +2630,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Ir para {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Ir para {STATION} (Transferir e levar carga)
-STR_8808_GO_TO_UNLOAD                                           :Ir para {STATION} (Descarregar)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Ir para {STATION} (Transferir e deixar vazio)
-STR_880A_GO_TO_LOAD                                             :Ir para {STATION} (Carregar)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Ir para {STATION} (Transferir e aguardar carga completa)
-STR_880C_GO_NON_STOP_TO                                         :Ir sem parar para {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Ir sem parar para {STATION} (Transfer ir e levar carga)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Ir sem parar para {STATION} (Descarregar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Ir sem parar para {STATION} (Transferir e deixar vazio)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Ir sem parar para {STATION} (Carregar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ir sem parar para {STATION} (Transferir e aguardar carga completa)
+STR_GO_TO_TRANSFER                                              :Ir para {STATION} (Transferir e levar carga)
+STR_8807_GO_TO_UNLOAD                                           :Ir para {STATION} (Descarregar)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Ir para {STATION} (Transferir e deixar vazio)
+STR_8808_GO_TO_LOAD                                             :Ir para {STATION} (Carregar)
+STR_GO_TO_TRANSFER_LOAD                                         :Ir para {STATION} (Transferir e aguardar carga completa)
+STR_880A_GO_NON_STOP_TO                                         :Ir sem parar para {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Ir sem parar para {STATION} (Transfer ir e levar carga)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Ir sem parar para {STATION} (Descarregar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Ir sem parar para {STATION} (Transferir e deixar vazio)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Ir sem parar para {STATION} (Carregar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Ir sem parar para {STATION} (Transferir e aguardar carga completa)
 STR_GO_TO_TRAIN_DEPOT                                           :Ir para o depósito de {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Manutenção no depósito de {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ir sem parar para o depósito de {TOWN}
@@ -2744,7 +2744,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Mostrar detalhes da carga transportada
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Mostrar detalhes dos veículos
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Mostrar capacidades de cada veículo
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Mostrar capacidade total do comboio, dividir por tipo de carga
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Mostrar capacidade total do comboio, dividir por tipo de carga
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Lista de ordens - clique numa ordem para a seleccionar
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Salta a ordem actual, e inicia a próxima. CTRL + clique salta para a ordem seleccionada
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Eliminar a ordem seleccionada
@@ -2775,8 +2775,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Não é possível inverter a direcção do comboio...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renomear tipo de veículo ferroviário
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Não é possível renomear tipo de veículo ferroviário...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A ordem seleccionada forçará o veículo a largar a carga
-STR_886F_TRANSFER                                               :{BLACK}Transferir
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}A ordem seleccionada forçará o veículo a largar a carga
+STR_TRANSFER                                                    :{BLACK}Transferir
 STR_CLEAR_TIME                                                  :{BLACK}Apagar Tempo
 STR_RESET_LATENESS                                              :{BLACK}Apagar Contad. Atraso
 
@@ -2854,8 +2854,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Renomear veículo de estrada
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro autocarro chega a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro camião chega a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de passageiros chega a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de mercadorias chega a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de passageiros chega a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro eléctrico de mercadorias chega a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}Condutor morre na explosão após a colisão com um comboio
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Acidente de Veículo de Estrada!{}{COMMA} morrem na explosão após a colisão com um comboio
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Não é possível fazer o veículo dar a volta...
@@ -2864,7 +2864,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomear tipo de veículo de estrada
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomear tipo de veículo de estrada
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Não é possível renomear tipo de veículo de estrada...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Ir para o depósito de {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Ir para o depósito de {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Manutenção no depósito de {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Reconverter veículo para transportar outro tipo de carga
--- a/src/lang/romanian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/romanian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Prea multe nume definite
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Numele ales este deja folosit
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Încãrcãturã
 STR_013D_INFORMATION                                            :{BLACK}Informatii
 STR_013E_CAPACITIES                                             :{BLACK}Capacitãti
-STR_013E_TOTAL_CARGO                                            :{BLACK}Încãrcãturi
+STR_TOTAL_CARGO                                                 :{BLACK}Încãrcãturi
 STR_013F_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacitate: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Încãrcãtura totalã (capacitatea) acestui tren:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Încãrcãtura totalã (capacitatea) acestui tren:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Joc nou
 STR_0141_LOAD_GAME                                              :{BLACK}Încarcã joc
@@ -728,7 +728,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Şterge acest oraş
 STR_0292_SAVE_SCENARIO                                          :Salvează scenariul
 STR_0293_LOAD_SCENARIO                                          :Încarcă scenariu
-STR_LOAD_HEIGHTMAP                                              :Incarca harta de inaltimi
+STR_MENU_LOAD_HEIGHTMAP                                         :Incarca harta de inaltimi
 STR_0294_QUIT_EDITOR                                            :Ieşire din editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Ieşire din joc
@@ -768,9 +768,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Opţiunile jocului (F2)
-STR_02C5_DIFFICULTY_SETTINGS                                    :Setări dificultate
-STR_02C7_CONFIG_PATCHES                                         :Configurare patch
+STR_02C4_GAME_OPTIONS                                           :Opţiunile jocului (F2)
+STR_02C6_DIFFICULTY_SETTINGS                                    :Setări dificultate
+STR_MENU_CONFIG_PATCHES                                         :Configurare patch
 STR_NEWGRF_SETTINGS                                             :Setari Newgrf
 STR_TRANSPARENCY_OPTIONS                                        :Optiuni transparenta
 STR_GAMEOPTMENU_0A                                              :
@@ -870,8 +870,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Salvarea se efectueaza încã,{}vã rugãm asteptati pânã se încheie!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Selectează programul muzical 'Ezy Street'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engleza (Original)
@@ -1646,42 +1646,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Mai întâi trebuie înlăturată şoseaua
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Lucrari la drum in curs de desfasurare
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construcţii rutiere
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Construcţie Tramvai
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Construcţie Tramvai
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Alege pod rutier
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... drumurile cu sens unic nu pot avea bifurcatii
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Nu pot construi şosea aici...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Nu pot construi şină de tramvai aici...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Nu pot construi şină de tramvai aici...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Nu pot înlătura şoseaua...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Nu pot înlătura şina de tramvai de aici...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Nu pot înlătura şina de tramvai de aici...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientarea autobazei
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientarea Depoului de Tramvaie
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientarea Depoului de Tramvaie
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nu pot construi autobază aici...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Nu pot construi depou de tramvaie aici...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Nu pot construi depou de tramvaie aici...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nu pot construi staţie de autobuz...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nu pot construi platformă pentru camioane...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Nu pot construi staţie de tramvai aici...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Nu pot construi staţie de tramvai aici...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Nu pot construi staţie de tramvai aici...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Nu pot construi staţie de tramvai aici...
 STR_180A_ROAD_CONSTRUCTION                                      :Construcţii rutiere
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Construcţie tramvai
+STR_TRAMWAY_CONSTRUCTION                                        :Construcţie tramvai
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Construieşte secţiune de şosea
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Construieste sectiune de sosea folosind modul Auto-sosea
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Construcieşte şină de tramvai
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Construcieşte şină de tramvai
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Construieste sectiune de sina de tramvai folosind modul Auto-tramvai
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Construieşte o autobază (pentru construire şi întreţinere de autovehicule)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Construieste depou tramvaie (pentru constructii si reparatii vehicule)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Construieste depou tramvaie (pentru constructii si reparatii vehicule)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Plasează staţie de autobuz
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Construieşte platformă pentru camioane
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Construieste statie de tramvai pentru calatori
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Construieste statie de transport marfar
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Construieste statie de tramvai pentru calatori
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Construieste statie de transport marfar
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Construieşte pod rutier
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Construieşte pod pentru tramvaie
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Construieşte pod pentru tramvaie
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Construieşte tunel rutier
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Construieşte tunel pentru tramvaie
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Construieşte tunel pentru tramvaie
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Activare/Dezactivare sensuri unice
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Comutator pentru construcţie/înlăturare şosele
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Comuta constructie/stergere pentru constructia de linii de tramvaie
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Comuta constructie/stergere pentru constructia de linii de tramvaie
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Alege orientarea autobazei
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Alege orientarea depoului de tramvaie
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Alege orientarea depoului de tramvaie
 STR_1814_ROAD                                                   :Şosea
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Stradă iluminată
 STR_1816_TREE_LINED_ROAD                                        :Stradă cu copaci pe margine
@@ -1824,8 +1824,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Este adiacentă mai multor staţii
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Prea multe staţii în acest oraş
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Prea multe staţii
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Prea multe staţii de autobuz
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Prea multe staţii de camion
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Prea multe staţii de autobuz
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Prea multe staţii de camion
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Prea aproape de altă staţie
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Mai întâi trebuie demolată gara
@@ -1856,12 +1856,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} acceptă acum {STRING} si {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientarea staţiei
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientarea platformei de camioane
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orientarea staţiei de tramvai pentru călători
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orientarea staţiei de tramvai pentru marfă
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orientarea staţiei de tramvai pentru călători
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orientarea staţiei de tramvai pentru marfă
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Mai întâi trebuie demolată staţia de autobuz
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Mai întâi trebuie demolată platforma pentru camioane
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Mai întâi trebuie demolată staţia de tramvai
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Mai întâi trebuie demolată staţia de tramvai
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Mai întâi trebuie demolată staţia de tramvai
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Mai întâi trebuie demolată staţia de tramvai
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Staţi{P e i}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nici una -
@@ -1873,8 +1873,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Alege lungimea liniilor gării
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Alege orientarea staţiei de autobuz
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Alege orientarea platformei pentru camioane
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Alege orientarea staţiei de tramvai
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Alege orientarea staţiei de tramvai
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Alege orientarea staţiei de tramvai
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Alege orientarea staţiei de tramvai
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centrează imaginea pe locaţia staţiei
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Afişează evaluările staţiei
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Schimbă numele staţiei
@@ -1896,7 +1896,7 @@
 STR_3069_BUOY                                                   :Baliză
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...baliză în cale
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...staţie prea mare
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...staţiile neuniforme nu sunt permise
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...staţiile neuniforme nu sunt permise
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Tine apãsat CTRL pentru a alege mai mult decât un obiect
 
 STR_UNDEFINED                                                   :(sir nedefinit)
@@ -1937,7 +1937,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Alege tipul noului joc
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Alege un scenariu (verde), un joc predefinit (albastru) sau o hartă aleatoare
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Generează o hartă aleatoare
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Încarcă harta înălţimilor
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Încarcă harta înălţimilor
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} în cale
@@ -2141,10 +2141,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economie: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Trenurile întorc: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Dezastre: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Reacţia autorităţilor la modificarea mediului: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Reacţia autorităţilor la modificarea mediului: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :zero
+STR_NONE                                                        :zero
 STR_NUM_VERY_LOW                                                :Foarte putine
 STR_6816_LOW                                                    :scăzut
 STR_6817_NORMAL                                                 :normal
@@ -2182,9 +2182,9 @@
 STR_6836_OFF                                                    :inactiv
 STR_6837_ON                                                     :activ
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Afişează clasamentul celor mai bune punctaje
-STR_6839_PERMISSIVE                                             :permisivă
-STR_683A_TOLERANT                                               :tolerantă
-STR_683B_HOSTILE                                                :ostilă
+STR_PERMISSIVE                                                  :permisivă
+STR_TOLERANT                                                    :tolerantă
+STR_HOSTILE                                                     :ostilă
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2321,7 +2321,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nu pot vinde 25% din acţiunile acestei companii...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% deţinute de {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} a fost preluată de {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Această companie încă nu vinde acţiuni...
+STR_PROTECTED                                                   :{WHITE}Această companie încă nu vinde acţiuni...
 
 STR_LIVERY_DEFAULT                                              :Uniforma standard
 STR_LIVERY_STEAM                                                :Motor cu abur
@@ -2628,17 +2628,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Mergi la {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Mergi la {STATION} (Preia încărcătura pentru transfer)
-STR_8808_GO_TO_UNLOAD                                           :Mergi la {STATION} (Descarcă)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Mergi la {STATION} (Descarcă încărcătura pentru transfer)
-STR_880A_GO_TO_LOAD                                             :Mergi la {STATION} (Încarcă)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Mergi la {STATION} (Aşteaptă 100% încărcătură pentru transfer)
-STR_880C_GO_NON_STOP_TO                                         :Mergi fără oprire la {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Mergi fără oprire la {STATION} (Preia încărcătura pentru transfer)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Mergi fără oprire la {STATION} (Descarcă)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Mergi fără oprire la {STATION} (Descarcă încărcătura pentru transfer)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Mergi fără oprire la {STATION} (Încarcă)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Mergi fără oprire la {STATION} (Aşteaptă 100% încărcătură pentru transfer)
+STR_GO_TO_TRANSFER                                              :Mergi la {STATION} (Preia încărcătura pentru transfer)
+STR_8807_GO_TO_UNLOAD                                           :Mergi la {STATION} (Descarcă)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Mergi la {STATION} (Descarcă încărcătura pentru transfer)
+STR_8808_GO_TO_LOAD                                             :Mergi la {STATION} (Încarcă)
+STR_GO_TO_TRANSFER_LOAD                                         :Mergi la {STATION} (Aşteaptă 100% încărcătură pentru transfer)
+STR_880A_GO_NON_STOP_TO                                         :Mergi fără oprire la {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Mergi fără oprire la {STATION} (Preia încărcătura pentru transfer)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Mergi fără oprire la {STATION} (Descarcă)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Mergi fără oprire la {STATION} (Descarcă încărcătura pentru transfer)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Mergi fără oprire la {STATION} (Încarcă)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Mergi fără oprire la {STATION} (Aşteaptă 100% încărcătură pentru transfer)
 STR_GO_TO_TRAIN_DEPOT                                           :Mergi la depoul {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Service la Depoul {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Mergi fără oprire la Depoul {TOWN}
@@ -2742,7 +2742,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Afiseazã detalii despre încãrcãtura transportatã
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Afiseazã detalii despre componentele trenului
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Afiseazã capacitãtile componentelor trenului
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Afiseazã capacitãtile totale ale trenului, diferentiate pe tip de încãrcãturã
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Afiseazã capacitãtile totale ale trenului, diferentiate pe tip de încãrcãturã
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Lista de comenzi - clic pe comandã pentru a o selecta
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Renunta la comanta acruala si preia-o pe urmatoarea. CTRL + click face salt la comanda selectata
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Sterge comanda selectatã
@@ -2773,8 +2773,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nu pot schimba sensul de mers al trenului...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Redenumeste modelul vehiculului feroviar
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nu pot redenumi modelul acestui vehicul...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Comanda selectatã forteazã vehiculul sã arunce încãrcãtura
-STR_886F_TRANSFER                                               :{BLACK}Transferă
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Comanda selectatã forteazã vehiculul sã arunce încãrcãtura
+STR_TRANSFER                                                    :{BLACK}Transferă
 STR_CLEAR_TIME                                                  :{BLACK}Curata timp
 STR_RESET_LATENESS                                              :{BLACK}Reinitializeaza contorul de intarziere
 
@@ -2852,8 +2852,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Numele autovehiculului
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc{}sosirea primului autobuz la {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc{}sosirea primului camion la {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru călători la {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru marfă la {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru călători la {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru marfă la {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident rutier!{}Soferul decedat in urma coliziunii cu un tren
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident rutier!{}{COMMA} victime in urma coliziunii cu un tren
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nu pot schimba întoarce autvehiculul...
@@ -2862,7 +2862,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Redenumeste modelul de autovehicul
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Redenumeste modelul autovehiculului
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nu pot redenumi modelul acestui autovehicul...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Mergi la Autobaza {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Mergi la Autobaza {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Service la Autobaza {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Adapteaza autovehiculul pentru o incarcatura diferita
--- a/src/lang/russian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/russian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -274,9 +274,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Слишком много имен определено
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Выбранное имя уже используется
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix/Linux
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix/Linux
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -287,11 +287,11 @@
 STR_013C_CARGO                                                  :{BLACK}Груз
 STR_013D_INFORMATION                                            :{BLACK}Информация
 STR_013E_CAPACITIES                                             :{BLACK}Вместимость
-STR_013E_TOTAL_CARGO                                            :{BLACK}Общий груз
+STR_TOTAL_CARGO                                                 :{BLACK}Общий груз
 STR_013F_CAPACITY                                               :{BLACK}Вместимость: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Емкость: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Общая загруженность этого транспорта:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} (Всего: {SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Общая загруженность этого транспорта:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} (Всего: {SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Новая игра
 STR_0141_LOAD_GAME                                              :{BLACK}Загрузить игру
@@ -730,7 +730,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Полностью уничтожить этот город
 STR_0292_SAVE_SCENARIO                                          :Сохранить сценарий
 STR_0293_LOAD_SCENARIO                                          :Загрузить сценарий
-STR_LOAD_HEIGHTMAP                                              :Загрузить карту высот
+STR_MENU_LOAD_HEIGHTMAP                                         :Загрузить карту высот
 STR_0294_QUIT_EDITOR                                            :Выйти из редактора
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Выход
@@ -770,9 +770,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Настройки игры
-STR_02C5_DIFFICULTY_SETTINGS                                    :Настройки сложности
-STR_02C7_CONFIG_PATCHES                                         :Настройки патчей
+STR_02C4_GAME_OPTIONS                                           :Настройки игры
+STR_02C6_DIFFICULTY_SETTINGS                                    :Настройки сложности
+STR_MENU_CONFIG_PATCHES                                         :Настройки патчей
 STR_NEWGRF_SETTINGS                                             :Настройки NewGRF
 STR_TRANSPARENCY_OPTIONS                                        :Настройки прозрачности
 STR_GAMEOPTMENU_0A                                              :
@@ -872,8 +872,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Сохранение все еще идет,{}пожалуйста, дождитесь завершения!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Выбрать музыкальную программу
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Английские
@@ -1647,42 +1647,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Сначала удалите дорогу
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Идут дорожные работы...
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Строительство дорог
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Трамваи
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Трамваи
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Выберите тип моста
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... односторонние дороги не могут иметь такое пересечение
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Не могу проложить дорогу здесь...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Нельзя построить здесь трамвай...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Нельзя построить здесь трамвай...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Не могу удалить дорогу...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Не могу удалить этот трамвай...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Не могу удалить этот трамвай...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Направление гаража
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Ориентация трамвайного депо
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Ориентация трамвайного депо
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Не могу построить гараж здесь...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Не могу построить здесь трамвайное депо...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Не могу построить здесь трамвайное депо...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Не могу построить остановку здесь...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Не могу построить грузовую станцию...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Не могу построить пассажирскую трамвайную остановку...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Не могу построить грузовую трамвайную остановку...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Не могу построить пассажирскую трамвайную остановку...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Не могу построить грузовую трамвайную остановку...
 STR_180A_ROAD_CONSTRUCTION                                      :Строительство дорог
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Трамваи
+STR_TRAMWAY_CONSTRUCTION                                        :Трамваи
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Проложить дорогу
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Строить автотрассу, используя авто-режим
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Проложить трамвайные пути
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Проложить трамвайные пути
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Строить трамвайный путь, используя авто-режим
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Построить гараж (для закупки и обслуживания машин)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Построить трамвайное депо (для закупки и обслуживания трамваев)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Построить трамвайное депо (для закупки и обслуживания трамваев)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Построить автобусную остановку
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Построить погрузочную станцию
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Построить пассажирскую трамвайную остановку
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Построить грузовую трамвайную остановку
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Построить пассажирскую трамвайную остановку
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Построить грузовую трамвайную остановку
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Построить мост (авто)
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Построить трамвайный мост
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Построить трамвайный мост
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Построить туннель (авто)
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Построить трамвайный туннель
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Построить трамвайный туннель
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Включить/Отключить односторонние дороги
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Переключение строительства/удаления автомобильной инфраструктуры
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Переключение строительства/удаления трамвайной инфраструктуры
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Переключение строительства/удаления трамвайной инфраструктуры
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Выбор ориентации гаража
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Выбор ориентации трамвайного депо
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Выбор ориентации трамвайного депо
 STR_1814_ROAD                                                   :Дорога
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Дорога с уличным освещением
 STR_1816_TREE_LINED_ROAD                                        :Шоссе
@@ -1825,8 +1825,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Присоединяется более чем к одной существующей станции
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Слишком много станций и остановок в этом городе. Переименуйте существующие.
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Слишком много станций и остановок
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Слишком много автобусных остановок
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Слишком много погрузочных станций
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Слишком много автобусных остановок
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Слишком много погрузочных станций
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Слишком близко к другой станции
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Сначала нужно удалить ж/д станцию
@@ -1857,12 +1857,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} теперь принимает {STRING} и {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Направление остановки
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Ориентация станции
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Направление пассажирской трамвайной остановки
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Направление грузовой трамвайной остановки
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Направление пассажирской трамвайной остановки
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Направление грузовой трамвайной остановки
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Сначала удалите автобусную остановку
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Сначала удалите грузовой терминал
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Сначала надо уничтожить пассажирскую трамвайную остановку
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Сначала надо уничтожить грузовую трамвайную остановку
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Сначала надо уничтожить пассажирскую трамвайную остановку
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Сначала надо уничтожить грузовую трамвайную остановку
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Станц{P 2 ия ии ий}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Нет -
@@ -1874,8 +1874,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Выберите длину ж/д станции
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Выберите направление автобусной остановки
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Выберите направление погрузочной станции
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Выберите направление пассажирской трамвайной остановки
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Выберите направление грузовой трамвайной остановки
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Выберите направление пассажирской трамвайной остановки
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Выберите направление грузовой трамвайной остановки
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Показать станцию в основном окне
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Показать рейтинг станции
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Переименовать станцию
@@ -1897,7 +1897,7 @@
 STR_3069_BUOY                                                   :Буй
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...буй на пути
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...станция слишком большая
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...использование непрямоугольных станций запрещено
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...использование непрямоугольных станций запрещено
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Нажмите и держите CTRL для выбора более одного варианта
 
 STR_UNDEFINED                                                   :(неопределено)
@@ -1938,7 +1938,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Выбрать тип новой игры
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Выбрать сценарий(зеленый), предустановленную новую игру (синий) или случайную новую игру
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Сгенерировать случайную карту
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Загруз. ЛАНДШАФТ
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Загруз. ЛАНДШАФТ
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} на пути
@@ -2146,10 +2146,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Экономика: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Разворот поездов: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Катастрофы: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Отношение властей к изменению территорий: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Отношение властей к изменению территорий: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Нет
+STR_NONE                                                        :Нет
 STR_NUM_VERY_LOW                                                :Очень низкое
 STR_6816_LOW                                                    :Низкое
 STR_6817_NORMAL                                                 :Среднее
@@ -2194,9 +2194,9 @@
 STR_6836_OFF                                                    :Выключены
 STR_6837_ON                                                     :Включены
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Показать таблицу рекордов
-STR_6839_PERMISSIVE                                             :Дозволяющее
-STR_683A_TOLERANT                                               :Терпимое
-STR_683B_HOSTILE                                                :Враждебное
+STR_PERMISSIVE                                                  :Дозволяющее
+STR_TOLERANT                                                    :Терпимое
+STR_HOSTILE                                                     :Враждебное
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2333,7 +2333,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Не могу продать 25% акций этой компании...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% владеет {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} выкуплена {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Эта компания еще не может торговать акциями...
+STR_PROTECTED                                                   :{WHITE}Эта компания еще не может торговать акциями...
 
 STR_LIVERY_DEFAULT                                              :Стандарт. раскраска
 STR_LIVERY_STEAM                                                :Паровоз
@@ -2640,17 +2640,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Ехать к ст. {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Ехать к ст. {STATION} (Трансфер)
-STR_8808_GO_TO_UNLOAD                                           :Ехать к ст. {STATION} (Не грузиться)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Ехать к ст. {STATION} (Трансфер и не грузиться)
-STR_880A_GO_TO_LOAD                                             :Ехать к ст. {STATION} (Полная загрузка)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Ехать к ст. {STATION} (Трансфер и полная загрузка)
-STR_880C_GO_NON_STOP_TO                                         :Ехать к ст. {STATION} без остановки
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Ехать к ст. {STATION} без остановки (Трансфер)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Ехать к ст. {STATION} без остановки (Не грузиться)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Ехать к ст. {STATION} без остановки (Трансфер и не грузиться)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Ехать к ст. {STATION} без остановки (Полная загрузка)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ехать к ст. {STATION} без остановки (Трансфер и полная загрузка)
+STR_GO_TO_TRANSFER                                              :Ехать к ст. {STATION} (Трансфер)
+STR_8807_GO_TO_UNLOAD                                           :Ехать к ст. {STATION} (Не грузиться)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Ехать к ст. {STATION} (Трансфер и не грузиться)
+STR_8808_GO_TO_LOAD                                             :Ехать к ст. {STATION} (Полная загрузка)
+STR_GO_TO_TRANSFER_LOAD                                         :Ехать к ст. {STATION} (Трансфер и полная загрузка)
+STR_880A_GO_NON_STOP_TO                                         :Ехать к ст. {STATION} без остановки
+STR_GO_TO_NON_STOP_TRANSFER                                     :Ехать к ст. {STATION} без остановки (Трансфер)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Ехать к ст. {STATION} без остановки (Не грузиться)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Ехать к ст. {STATION} без остановки (Трансфер и не грузиться)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Ехать к ст. {STATION} без остановки (Полная загрузка)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Ехать к ст. {STATION} без остановки (Трансфер и полная загрузка)
 STR_GO_TO_TRAIN_DEPOT                                           :Ехать в депо {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Обслужиться в депо {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ехать в депо {TOWN} без остановки
@@ -2754,7 +2754,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Показать сведения о перевозимых грузах
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Показать сведения о вагонах
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Показать вместимость вагонов
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Показать общую вместимость поезда по типам грузов
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Показать общую вместимость поезда по типам грузов
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Показ списка заданий - щелкните для выделения. Если зажать CTRL - обзор станции.
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Пропустить данное задание и начать следующее. CTRL + клик пропускает выделенное задание.
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Удалить выделенное задание
@@ -2785,8 +2785,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Невозможно развернуть поезд...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Переименовать тип вагона
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Невозможно переименовать тип вагона ...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}По выделенному приказу произойдет принудительная разгрузка транспортного средства
-STR_886F_TRANSFER                                               :{BLACK}Трансфер
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}По выделенному приказу произойдет принудительная разгрузка транспортного средства
+STR_TRANSFER                                                    :{BLACK}Трансфер
 STR_CLEAR_TIME                                                  :{BLACK}Сбросить Время
 STR_RESET_LATENESS                                              :{BLACK}Сброс счетчика
 
@@ -2863,8 +2863,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Назвать автотранспорт
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Жители празднуют!{}Первый автобус прибыл на остановку {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Жители празднуют!{}Первый грузовик прибыл на станцию {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Жители празднуют . . .{}Первый трамвай прибыл на {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Жители празднуют . . .{}Первый грузовой трамвай прибыл на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Жители празднуют . . .{}Первый трамвай прибыл на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Жители празднуют . . .{}Первый грузовой трамвай прибыл на {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}АВАРИЯ!{}Водитель погиб при столкновении с поездом
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}АВАРИЯ!{}{COMMA} человек{P "" а ""} погиб{P "" ло ли} в столкновении с поездом!
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Невозможно развернуть автомобиль...
@@ -2873,7 +2873,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Переименовать автомобиль
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Переименовать автомобиль
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Невозможно переименовать автомобиль...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Ехать в гараж {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Ехать в гараж {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Обслуж. в гараже {TOWN}
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Переоборуд. авто для доставки разных видов грузов.
--- a/src/lang/simplified_chinese.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/simplified_chinese.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}自定义的名字过多
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}选定的名字已经被用了
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}货物
 STR_013D_INFORMATION                                            :{BLACK}信息
 STR_013E_CAPACITIES                                             :{BLACK}装载能力
-STR_013E_TOTAL_CARGO                                            :{BLACK}全部货物
+STR_TOTAL_CARGO                                                 :{BLACK}全部货物
 STR_013F_CAPACITY                                               :{BLACK}装载能力:{LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}装载能力:{LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}全车的装载能力为:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}全车的装载能力为:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}新游戏
 STR_0141_LOAD_GAME                                              :{BLACK}读取存档
@@ -725,7 +725,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}完全删除这座城镇
 STR_0292_SAVE_SCENARIO                                          :保存场景
 STR_0293_LOAD_SCENARIO                                          :读取场景
-STR_LOAD_HEIGHTMAP                                              :读取高度图
+STR_MENU_LOAD_HEIGHTMAP                                         :读取高度图
 STR_0294_QUIT_EDITOR                                            :退出编辑器
 STR_0295                                                        :
 STR_0296_QUIT                                                   :退出
@@ -765,9 +765,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :游戏选项
-STR_02C5_DIFFICULTY_SETTINGS                                    :难度设定
-STR_02C7_CONFIG_PATCHES                                         :配置补丁
+STR_02C4_GAME_OPTIONS                                           :游戏选项
+STR_02C6_DIFFICULTY_SETTINGS                                    :难度设定
+STR_MENU_CONFIG_PATCHES                                         :配置补丁
 STR_NEWGRF_SETTINGS                                             :NewGRF 设置
 STR_TRANSPARENCY_OPTIONS                                        :透明选项
 STR_GAMEOPTMENU_0A                                              :
@@ -866,8 +866,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}保存仍在继续,{}请耐心等待……
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}选择 'Ezy 大街' 风格的音乐
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :英国 (原始的)
@@ -1713,8 +1713,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}与另一车站相连
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}这个城镇中的车站过多
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}车站过多
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}公共汽车站过多
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}汽车货场过多
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}公共汽车站过多
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}汽车货场过多
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}距离另一车站过近
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}必须先拆除火车站
@@ -1779,7 +1779,7 @@
 STR_3069_BUOY                                                   :浮标
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}指定的位置有浮标……
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}站区太大了……
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}已禁用了异形站台……
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}已禁用了异形站台……
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}摁住 CTRL 可以选择多个项目
 
 STR_UNDEFINED                                                   :(未定义字符串)
@@ -1814,7 +1814,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}选择新游戏类型
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}选择场景(绿色),预设游戏(蓝色)或随机开始新游戏
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :随机生成新游戏
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}读取地形图
+STR_LOAD_HEIGHTMAP                                              :{WHITE}读取地形图
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}目标位置有 {STRING}
@@ -2008,10 +2008,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}经济:{ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}列车调头:{ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}灾难:{ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}市政厅对辖区内建设的态度:{ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}市政厅对辖区内建设的态度:{ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :没有
+STR_NONE                                                        :没有
 STR_6816_LOW                                                    :低
 STR_6817_NORMAL                                                 :一般
 STR_6818_HIGH                                                   :高
@@ -2048,9 +2048,9 @@
 STR_6836_OFF                                                    :关闭
 STR_6837_ON                                                     :开启
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}查看高分榜
-STR_6839_PERMISSIVE                                             :宽容
-STR_683A_TOLERANT                                               :隐忍
-STR_683B_HOSTILE                                                :对立
+STR_PERMISSIVE                                                  :宽容
+STR_TOLERANT                                                    :隐忍
+STR_HOSTILE                                                     :对立
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2182,7 +2182,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}不能出售此公司的股份……
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% 由 {COMPANY} 所有)
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} 被 {COMPANY} 收购!
-STR_7080_PROTECTED                                              :{WHITE}这个公司刚刚开业,还不能进行股权交易……
+STR_PROTECTED                                                   :{WHITE}这个公司刚刚开业,还不能进行股权交易……
 
 STR_LIVERY_DEFAULT                                              :标准外观
 STR_LIVERY_STEAM                                                :蒸汽引擎
@@ -2487,17 +2487,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :前往 {STATION}
-STR_8807_GO_TO_TRANSFER                                         :前往 {STATION} (转运并装货)
-STR_8808_GO_TO_UNLOAD                                           :前往 {STATION} (全部卸货)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :前往 {STATION} (转运且不装货)
-STR_880A_GO_TO_LOAD                                             :前往 {STATION} (等待装满)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :前往 {STATION} (转运并等待装满)
-STR_880C_GO_NON_STOP_TO                                         :前往(不停) {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :前往(不停) {STATION} (转运并装货)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :前往(不停) {STATION} (全部卸货)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :前往(不停) {STATION} (转运且不装货)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :前往(不停) {STATION} (等待装满)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :前往(不停) {STATION} (转运并等待装满)
+STR_GO_TO_TRANSFER                                              :前往 {STATION} (转运并装货)
+STR_8807_GO_TO_UNLOAD                                           :前往 {STATION} (全部卸货)
+STR_GO_TO_TRANSFER_UNLOAD                                       :前往 {STATION} (转运且不装货)
+STR_8808_GO_TO_LOAD                                             :前往 {STATION} (等待装满)
+STR_GO_TO_TRANSFER_LOAD                                         :前往 {STATION} (转运并等待装满)
+STR_880A_GO_NON_STOP_TO                                         :前往(不停) {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :前往(不停) {STATION} (转运并装货)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :前往(不停) {STATION} (全部卸货)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :前往(不停) {STATION} (转运且不装货)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :前往(不停) {STATION} (等待装满)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :前往(不停) {STATION} (转运并等待装满)
 STR_GO_TO_TRAIN_DEPOT                                           :前往 {TOWN} 车库
 STR_SERVICE_AT_TRAIN_DEPOT                                      :在 {TOWN} 车库保养
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :前往(不停) {TOWN} 车库
@@ -2601,7 +2601,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}显示运载货物的详情
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}显示列车的性能参数
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}显示列车的运载能力
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}根据不同的挂车种类显示相应的总运力
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}根据不同的挂车种类显示相应的总运力
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}调度列表 - 单击一个调度指令可以使之高亮化. CTRL + 单击可以将视点移动到相应的车站
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}跳过当前命令并执行下一条命令。CTRL并单击可以跳过选定的命令
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}删除高亮的调度命令
@@ -2632,8 +2632,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}不能命令列车调头...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}重命名车辆的类型
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}不能重命名车辆的类型...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}命令列车在高亮指令对应的车站寄存货物
-STR_886F_TRANSFER                                               :{BLACK}联运
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}命令列车在高亮指令对应的车站寄存货物
+STR_TRANSFER                                                    :{BLACK}联运
 STR_CLEAR_TIME                                                  :{BLACK}清除时间
 STR_RESET_LATENESS                                              :{BLACK}清除晚点计数器
 
@@ -2715,7 +2715,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}重命名汽车型号
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}重命名汽车型号
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}不能重命名汽车型号……
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :前往 {TOWN} 车库
+STR_GO_TO_ROADVEH_DEPOT                                         :前往 {TOWN} 车库
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :在 {TOWN} 车库进行保养
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}改装汽车以装载其他货物
--- a/src/lang/slovak.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/slovak.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -336,9 +336,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Použitých príliš vela mien
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Vybrané meno je už použité
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -349,11 +349,11 @@
 STR_013C_CARGO                                                  :{BLACK}Náklad
 STR_013D_INFORMATION                                            :{BLACK}Informácie
 STR_013E_CAPACITIES                                             :{BLACK}Kapacita
-STR_013E_TOTAL_CARGO                                            :{BLACK}Celkový náklad
+STR_TOTAL_CARGO                                                 :{BLACK}Celkový náklad
 STR_013F_CAPACITY                                               :{BLACK}Kapacita: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapacita: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Celkový náklad (kapacita) tohto vlaku:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Celkový náklad (kapacita) tohto vlaku:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nová hra
 STR_0141_LOAD_GAME                                              :{BLACK}Nahrat hru
@@ -792,7 +792,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Kompletne vymazat toto mesto
 STR_0292_SAVE_SCENARIO                                          :Ulozit scenár
 STR_0293_LOAD_SCENARIO                                          :Nahrat scenár
-STR_LOAD_HEIGHTMAP                                              :Nahrat výškovú mapu
+STR_MENU_LOAD_HEIGHTMAP                                         :Nahrat výškovú mapu
 STR_0294_QUIT_EDITOR                                            :Ukoncit editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Ukoncit OpenTTD
@@ -832,9 +832,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Nastavenia hry
-STR_02C5_DIFFICULTY_SETTINGS                                    :Nastavenia obtiaznosti
-STR_02C7_CONFIG_PATCHES                                         :Nastavenia patchov
+STR_02C4_GAME_OPTIONS                                           :Nastavenia hry
+STR_02C6_DIFFICULTY_SETTINGS                                    :Nastavenia obtiaznosti
+STR_MENU_CONFIG_PATCHES                                         :Nastavenia patchov
 STR_NEWGRF_SETTINGS                                             :Nastavenie newgrf
 STR_TRANSPARENCY_OPTIONS                                        :Nastavenia priehladnosti
 STR_GAMEOPTMENU_0A                                              :
@@ -934,8 +934,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Ukladanie hry este bezi,{}pockajte prosim na dokoncenie!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Vyber 'Ezy Street style music' program
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglicke
@@ -1710,42 +1710,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Cesta musi byt najskor odstranena
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Prebiehaju cestne prace
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Výstavba cesty
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Výstavba elektrickovej trate
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Výstavba elektrickovej trate
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Vyber cestny most
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... na jednosmerných cestách nie sú dovolené križovatky
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Tu sa neda postavit cesta ...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Nie je možné postavit elektrickovú trat ...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Nie je možné postavit elektrickovú trat ...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Tu sa neda odstranit cesta ...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Nie je možné odstránit elektrickovú trat ...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Nie je možné odstránit elektrickovú trat ...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientacia garaze
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientácia elektrickového depa
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientácia elektrickového depa
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Tu sa neda postavit garaz ...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Nie je možné postavit elektrickové depo ...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Nie je možné postavit elektrickové depo ...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nemozno postavit autobusovu zastavku ...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nemozno postavit vykladku ...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Nie je možné postavit elektrickovú osobnú stanicu ...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Nie je možné postavit elektrickovú nákladnú stanicu ...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Nie je možné postavit elektrickovú osobnú stanicu ...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Nie je možné postavit elektrickovú nákladnú stanicu ...
 STR_180A_ROAD_CONSTRUCTION                                      :Výstavba cesty
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Výstavba elektrickovej dráhy
+STR_TRAMWAY_CONSTRUCTION                                        :Výstavba elektrickovej dráhy
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Postavit cast cesty
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Stavat casti ciest použitím automatického módu
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Postavit cast elektrickovej dráhy
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Postavit cast elektrickovej dráhy
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Stavat casti elektrickovej trate použitím automatického módu
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Postavit garaz (na vyroby a opravy automobilov)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Postavit elektrickové depo
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Postavit elektrickové depo
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Postavit autobusovu zastavku
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Postavit vykladku
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Postavit osobnú elektrickovú stanicu
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Postavit nákladnú elektrickovú stanicu
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Postavit osobnú elektrickovú stanicu
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Postavit nákladnú elektrickovú stanicu
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Postavit cestny most
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Postavit most s elektrickovou dráhou
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Postavit most s elektrickovou dráhou
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Postavit cestny tunel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Postavit tunel s elektrickovou dráhou
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Postavit tunel s elektrickovou dráhou
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Prepnút stavbu jednosmerných ciest
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Prepnut stavbu/odstranovanie cesty
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Prepnút stavbu/odstranovanie elektrickovej dráhy
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Prepnút stavbu/odstranovanie elektrickovej dráhy
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Vybrat orientaciu garaze
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Vybrat orientáciu elektrickového depa
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Vybrat orientáciu elektrickového depa
 STR_1814_ROAD                                                   :Cesta
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Cesta s lampami
 STR_1816_TREE_LINED_ROAD                                        :Cesta v aleji
@@ -1888,8 +1888,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Susedi z viacerymi stanicami/vykladkami
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Prilis vela stanic/vykladok v tomto meste
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Prilis vela stanic/vykladok
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Prilis vela autobusovych zastavok
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Prilis vela zastavok nakladnych automobilov
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Prilis vela autobusovych zastavok
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Prilis vela zastavok nakladnych automobilov
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Prilis blizko inej stanice/vykladky
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Zeleznicna stanica sa musi naskor zburat
@@ -1920,12 +1920,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} teraz prijima {STRING} a {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientacia stanice
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientacia vykladky
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orientácia osobnej elektricky
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orientácia nákladnej elektricky
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orientácia osobnej elektricky
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orientácia nákladnej elektricky
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Stanica musi byt najskor zburana
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Vykladka musi byt najskor zburana
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Najprv sa musí zbúrat osobná elektricková stanica
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Najprv sa musí zbúrat nákladná elektricková stanica
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Najprv sa musí zbúrat osobná elektricková stanica
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Najprv sa musí zbúrat nákladná elektricková stanica
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stanic{P a e ""}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ziadne -
@@ -1937,8 +1937,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Dlzka zeleznicnej stanice
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Vybrat orientaciu stanice
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Vybrat orientaciu vykladky
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Vyberte orientáciu osobnej elektrickovej stanice
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Vyberte orientáciu nákladnej elektrickovej stanice
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Vyberte orientáciu osobnej elektrickovej stanice
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Vyberte orientáciu nákladnej elektrickovej stanice
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Vycentrovat pohlad na poziciu stanice
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Zobrazit hodnotenie stanice
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Zmenit nazov stanice
@@ -1960,7 +1960,7 @@
 STR_3069_BUOY                                                   :Boja
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}... boja v ceste
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}... stanica je prilis velka
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}... roznorode stanice nie su povolene
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}... roznorode stanice nie su povolene
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Podrzte CTRL pre vyber viacerych poloziek
 
 STR_UNDEFINED                                                   :(nedefinovaný retezec)
@@ -2001,7 +2001,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Vyber typ novej hry
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Vyber scenar (zeleny), prednastavenu hra (modra), alebo nahodnu hru
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Vygenerovat nahodnu novu hru
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Nahrat výškovú mapu
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Nahrat výškovú mapu
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} v ceste
@@ -2205,10 +2205,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomika: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Otacanie vlakov: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Havarie: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Postoj miestnej spravy k stavebnym upravam mesta: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Postoj miestnej spravy k stavebnym upravam mesta: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Ziadny
+STR_NONE                                                        :Ziadny
 STR_NUM_VERY_LOW                                                :Velmi nízky
 STR_6816_LOW                                                    :Nízky
 STR_6817_NORMAL                                                 :Normálny
@@ -2246,9 +2246,9 @@
 STR_6836_OFF                                                    :Vyp.
 STR_6837_ON                                                     :Zap.
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Zobrazit tabulku najlepsich
-STR_6839_PERMISSIVE                                             :Pozitivny
-STR_683A_TOLERANT                                               :Tolerantny
-STR_683B_HOSTILE                                                :Odmietavy
+STR_PERMISSIVE                                                  :Pozitivny
+STR_TOLERANT                                                    :Tolerantny
+STR_HOSTILE                                                     :Odmietavy
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2385,7 +2385,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}25% podiel v tejto spolocnosti sa neda predat ...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% vlastnene {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} bola kupena spolocnostou {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}S akciami tejto spolocnosti nie je zatial mozne obchodovat ...
+STR_PROTECTED                                                   :{WHITE}S akciami tejto spolocnosti nie je zatial mozne obchodovat ...
 
 STR_LIVERY_DEFAULT                                              :Standardna schema
 STR_LIVERY_STEAM                                                :Parny rusen
@@ -2692,17 +2692,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Chod do {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Chod do {STATION} (prelozit a nalozit iny naklad)
-STR_8808_GO_TO_UNLOAD                                           :Chod do {STATION} (vylozit)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Chod do {STATION} (prelozit a nechat prazdne)
-STR_880A_GO_TO_LOAD                                             :Chod do {STATION} (nalozit)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Chod do {STATION} (prelozit a plne nalozit)
-STR_880C_GO_NON_STOP_TO                                         :Chod bez zastavenia do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Chod bez zastavenia do {STATION} (prelozit a nalozit iny naklad)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Chod bez zastavenia do {STATION} (vylozit)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Chod bez zastavenia do {STATION} (prelozit a nechat prazdne)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Chod bez zastavenia do {STATION} (nalozit)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Chod bez zastavenia do {STATION} (prelozit a plne nalozit)
+STR_GO_TO_TRANSFER                                              :Chod do {STATION} (prelozit a nalozit iny naklad)
+STR_8807_GO_TO_UNLOAD                                           :Chod do {STATION} (vylozit)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Chod do {STATION} (prelozit a nechat prazdne)
+STR_8808_GO_TO_LOAD                                             :Chod do {STATION} (nalozit)
+STR_GO_TO_TRANSFER_LOAD                                         :Chod do {STATION} (prelozit a plne nalozit)
+STR_880A_GO_NON_STOP_TO                                         :Chod bez zastavenia do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Chod bez zastavenia do {STATION} (prelozit a nalozit iny naklad)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Chod bez zastavenia do {STATION} (vylozit)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Chod bez zastavenia do {STATION} (prelozit a nechat prazdne)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Chod bez zastavenia do {STATION} (nalozit)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Chod bez zastavenia do {STATION} (prelozit a plne nalozit)
 STR_GO_TO_TRAIN_DEPOT                                           :Chod do depa {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Opravit v {TOWN} Vlakovom Depe
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Chod bez zastavenia do depa {TOWN}
@@ -2806,7 +2806,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Zobrazit detaily o prevezenom naklade
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Zobrazit detaily o vlaku
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Zobrazit kapacitu kazdeho vozidla
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Zobrazit celkovu kapacitu vlaku, rozdelenu podla typu nakladu
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Zobrazit celkovu kapacitu vlaku, rozdelenu podla typu nakladu
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Zoznam prikazov - kliknut na prikaz pre oznacenie
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Preskocit aktuálny príkaz a zacat další. Podržte CTRL pre skok na oznacený príkaz
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Vymazat oznaceny prikaz
@@ -2837,8 +2837,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nemozno zmenit smer vlaku ...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Premenovat typ vlaku
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Typ vlaku nemoze byt premenovany ...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}U vyznaceneho prikazu musi vozidlo vylozit naklad
-STR_886F_TRANSFER                                               :{BLACK}Prekladka
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}U vyznaceneho prikazu musi vozidlo vylozit naklad
+STR_TRANSFER                                                    :{BLACK}Prekladka
 STR_CLEAR_TIME                                                  :{BLACK}Vymazat cas
 STR_RESET_LATENESS                                              :{BLACK}Reset meskania
 
@@ -2916,8 +2916,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Pomenovat automobil
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy autobus dorazil do {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy automobil dorazil do {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá elektricka dorazila do stanice {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá nákladná elektricka dorazila do stanice {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá elektricka dorazila do stanice {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvá nákladná elektricka dorazila do stanice {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Dopravna nehoda!{}Vodic zahynul po kolizii s vlakom
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Dopravna nehoda!{}{COMMA} mrtvych po kolizii s vlakom
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nemozno otocit vozidlo ...
@@ -2926,7 +2926,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Premenovat typ automobilu
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Premenovat typ automobilu
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nemozno premenovat typ automobilu ...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Chod do {TOWN} garaze
+STR_GO_TO_ROADVEH_DEPOT                                         :Chod do {TOWN} garaze
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Opravit v {TOWN} garazi
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Prestavat vozidlo na prepravu ineho druhu nakladu
--- a/src/lang/slovenian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/slovenian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -314,9 +314,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Preveč definiranih imen
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Izbrano ime je že v uporabi
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -327,11 +327,11 @@
 STR_013C_CARGO                                                  :{BLACK}Tovor
 STR_013D_INFORMATION                                            :{BLACK}Informacije
 STR_013E_CAPACITIES                                             :{BLACK}Zmogljivosti
-STR_013E_TOTAL_CARGO                                            :{BLACK}Skupni tovor
+STR_TOTAL_CARGO                                                 :{BLACK}Skupni tovor
 STR_013F_CAPACITY                                               :{BLACK}Zmogljivost: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Zmogljivost: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Skupna tovorna zmogljivost tega vlaka:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Skupna tovorna zmogljivost tega vlaka:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nova igra
 STR_0141_LOAD_GAME                                              :{BLACK}Naloži igro
@@ -770,7 +770,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Popolnoma izbriši mesto
 STR_0292_SAVE_SCENARIO                                          :Shrani scenarij
 STR_0293_LOAD_SCENARIO                                          :Naloži scenarij
-STR_LOAD_HEIGHTMAP                                              :Naloži višinsko karto
+STR_MENU_LOAD_HEIGHTMAP                                         :Naloži višinsko karto
 STR_0294_QUIT_EDITOR                                            :Izhod iz urejevalnika
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Izhod
@@ -810,9 +810,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Možnosti igre
-STR_02C5_DIFFICULTY_SETTINGS                                    :Nastavitve težavnosti
-STR_02C7_CONFIG_PATCHES                                         :Urejanje popravkov
+STR_02C4_GAME_OPTIONS                                           :Možnosti igre
+STR_02C6_DIFFICULTY_SETTINGS                                    :Nastavitve težavnosti
+STR_MENU_CONFIG_PATCHES                                         :Urejanje popravkov
 STR_NEWGRF_SETTINGS                                             :NewGRF nastavitve
 STR_TRANSPARENCY_OPTIONS                                        :Nastavitve prozornega pogleda
 STR_GAMEOPTMENU_0A                                              :
@@ -912,8 +912,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Shranjevanje poteka,{}Prosim počakaj, da se zaključi!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Izberi 'Poulični' glasbeni program
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Angleška (Originalna)
@@ -1687,42 +1687,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Najprej odstrani cesto
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Cestna dela napredujejo
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Cestne gradnje
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Gradnja tramvaj proge
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Gradnja tramvaj proge
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Izberi cestni most
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... enosmerne poti ne morejo imeti odcepov
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Nemogoča gradnja ceste ...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Nemogoča gradnja tramvaja tukaj...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Nemogoča gradnja tramvaja tukaj...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Nemogoča odstranitev ceste ...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Nemogoče odstraniti tramvaja od tukaj...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Nemogoče odstraniti tramvaja od tukaj...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Smer garaže
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orijentacija tramvaj garaže
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orijentacija tramvaj garaže
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nemogoča gradnja garaže tukaj ...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Nemogoča gradnja tramvaj garaže tukaj...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Nemogoča gradnja tramvaj garaže tukaj...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nemogoča gradnja avtobusne postaje ...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nemogoča gradnja tovorne postaje tukaj ...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Nemogoča gradnja potniške tramvaj postaje...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Nemogoča gradnja tovorne tramvaj postaje...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Nemogoča gradnja potniške tramvaj postaje...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Nemogoča gradnja tovorne tramvaj postaje...
 STR_180A_ROAD_CONSTRUCTION                                      :Gradnja ceste
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Gradnja tramvaj proge
+STR_TRAMWAY_CONSTRUCTION                                        :Gradnja tramvaj proge
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Zgradi cestni odsek
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Gradnja cestnega odseka v avtomatskem načinu
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Zgradi odsek proge
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Zgradi odsek proge
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Gradnja tramvaj proge v avtomatskem načinu
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Zgradi garažo (za izdelavo in servis vozil)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Zgradi tramvaj garažo (za izdelavo in servisiranje vozil)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Zgradi tramvaj garažo (za izdelavo in servisiranje vozil)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Zgradi avtobusno postajo
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Zgradi tovorno postajo
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Zgradi potniško tramvaj postajo
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Zgradi tovorno tramvaj postajo
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Zgradi potniško tramvaj postajo
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Zgradi tovorno tramvaj postajo
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Zgradi cestni most
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Zgradi most za tramvaj
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Zgradi most za tramvaj
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Zgradi cestni predor
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Zgradi predor za tramvaj
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Zgradi predor za tramvaj
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Omogoči/onemogoči enosmerne ceste
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Preklopi gradnja/rušenje cestnih konstrukcij
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Preklop gradi/odstrani za tramvaj progo
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Preklop gradi/odstrani za tramvaj progo
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Izberi smer garaže
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Izberi orijentacijo tramvaj garaže
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Izberi orijentacijo tramvaj garaže
 STR_1814_ROAD                                                   :Cesta
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Cesta z razsvetljavo
 STR_1816_TREE_LINED_ROAD                                        :Drevored
@@ -1866,8 +1866,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Združi dve ali več postaj
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Preveč postaj v tem mestu
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Preveč postaj na zemljevidu
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Preveč avtobusnih postaj
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Preveč tovornih postaj
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Preveč avtobusnih postaj
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Preveč tovornih postaj
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Preblizu druge postaje
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Najprej je potrebno porušiti postajo
@@ -1898,12 +1898,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} sedaj sprejema {STRING.t} in {STRING.t}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientacija avtobusne postaje
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientacija tovorne postaje
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orijentacija potniške postaje
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orijentacija tovorne postaje
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orijentacija potniške postaje
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orijentacija tovorne postaje
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Najprej moraš porušiti avtobusno postajo
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Najprej moraš porušiti tovorno postajo
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Najprej poruši potniško tramvaj postajo
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Najprej poruši tovorno tramvaj postajo
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Najprej poruši potniško tramvaj postajo
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Najprej poruši tovorno tramvaj postajo
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Postaj{P a i e ""}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Brez -
@@ -1915,8 +1915,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Izberi dolžino železniške postaje
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Izberi orientacijo železniške postaje
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Izberi orientacijo tovorne postaje
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Izbor orijentacije potniške tramvaj postaje
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Izbor orijentacije tovorne tramvaj postaje
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Izbor orijentacije potniške tramvaj postaje
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Izbor orijentacije tovorne tramvaj postaje
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Pogled na postajo
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Prikaz ocen postaje
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Spremeni ime postaje
@@ -1938,7 +1938,7 @@
 STR_3069_BUOY                                                   :Boja
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE} ... boja na poti
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE} ... postaja preveč razširjena
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE} ... nehomogene postaje izklopljene
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE} ... nehomogene postaje izklopljene
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Drži CTRL za izbor več stvari
 
 STR_UNDEFINED                                                   :(nedefinirana vrstica)
@@ -1979,7 +1979,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Izberi tip nove igre
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Izberi scenarij (zeleno), prednastavljeno igro (modro) ali naključno novo igro
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Ustvari naključno novo igro
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Naloži višinsko karto
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Naloži višinsko karto
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} na poti
@@ -2220,10 +2220,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomija: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Obračanje vlakov: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastrofe: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Odnos mestnega sveta do prestrukturiranja območja: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Odnos mestnega sveta do prestrukturiranja območja: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Brez
+STR_NONE                                                        :Brez
 STR_NUM_VERY_LOW                                                :Zelo malo
 STR_6816_LOW                                                    :Malo
 STR_6817_NORMAL                                                 :Normalno
@@ -2261,9 +2261,9 @@
 STR_6836_OFF                                                    :Izklopljeno
 STR_6837_ON                                                     :Vklopljeno
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Pokaži tabelo najboljših
-STR_6839_PERMISSIVE                                             :Dopustno
-STR_683A_TOLERANT                                               :Tolerantno
-STR_683B_HOSTILE                                                :Sovražno
+STR_PERMISSIVE                                                  :Dopustno
+STR_TOLERANT                                                    :Tolerantno
+STR_HOSTILE                                                     :Sovražno
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2400,7 +2400,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Ni mogoče prodati 25% delnic tega podjetja ...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% v lasti podjetja {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :Podjetje {BLACK}{BIGFONT}{COMPANY} je bilo prevzeto s strani podjetja {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Podjetje še ni dovolj staro, da bi lahko trgovalo z lastnimi delnicami ...
+STR_PROTECTED                                                   :{WHITE}Podjetje še ni dovolj staro, da bi lahko trgovalo z lastnimi delnicami ...
 
 STR_LIVERY_DEFAULT                                              :Standardni pogon
 STR_LIVERY_STEAM                                                :Parna lokomotiva
@@ -2707,17 +2707,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING}{STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
 STR_8806_GO_TO                                                  :Pojdi do {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Pojdi do {STATION} (Pretovori in vzemi tovor)
-STR_8808_GO_TO_UNLOAD                                           :Pojdi do {STATION} (Raztovori)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Pojdi do {STATION} (Pretovori in pusti prazno)
-STR_880A_GO_TO_LOAD                                             :Pojdi do  {STATION} (Naloži)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Pojdi do {STATION} (Prenesi in počakaj na polno breme)
-STR_880C_GO_NON_STOP_TO                                         :Pojdi brez postanka do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Pojdi brez postanka do {STATION} (Prenesi in vzemi tovor)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Pojdi brez postanka do {STATION} (Raztovori)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Pojdi brez postanka do {STATION} (Pretovori in pusti prazno)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Pojdi brez postanka do {STATION} (Naloži)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Pojdi brez postanka do {STATION} (Prenesi in počakaj na polno breme)
+STR_GO_TO_TRANSFER                                              :Pojdi do {STATION} (Pretovori in vzemi tovor)
+STR_8807_GO_TO_UNLOAD                                           :Pojdi do {STATION} (Raztovori)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Pojdi do {STATION} (Pretovori in pusti prazno)
+STR_8808_GO_TO_LOAD                                             :Pojdi do  {STATION} (Naloži)
+STR_GO_TO_TRANSFER_LOAD                                         :Pojdi do {STATION} (Prenesi in počakaj na polno breme)
+STR_880A_GO_NON_STOP_TO                                         :Pojdi brez postanka do {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Pojdi brez postanka do {STATION} (Prenesi in vzemi tovor)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Pojdi brez postanka do {STATION} (Raztovori)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Pojdi brez postanka do {STATION} (Pretovori in pusti prazno)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Pojdi brez postanka do {STATION} (Naloži)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Pojdi brez postanka do {STATION} (Prenesi in počakaj na polno breme)
 STR_GO_TO_TRAIN_DEPOT                                           :Pojdi v {TOWN} železniško garažo
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Na servis v {TOWN} železniško garažo
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Pojdi brez postanka do garaže {TOWN}
@@ -2821,7 +2821,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Pokaži podrobnosti tovora na vlaku
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Pokaži podrobnosti o vagonih
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Prikaži zmogljivosti vsakega vagona
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Prikaži polno zmogljivost vlaka, razdeli glede na tip tovora
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Prikaži polno zmogljivost vlaka, razdeli glede na tip tovora
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Seznam navodil - klikni na ukaz, da ga izbereš. CTRL+klik prikaže postajo
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Preskoči trenutni ukaz in začni naslednjega. CTRL + klik preskoči na izbran ukaz
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Zbriši izbran ukaz
@@ -2852,8 +2852,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Ni mogoče spremeniti smeri vlaka ...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Preimenuj železniško vozilo
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Ni mogoče preimenovati železniškega vozila ...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Nastavi označen ukaz, naj prisili vozilo, da se raztovori
-STR_886F_TRANSFER                                               :{BLACK}Pretovori
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Nastavi označen ukaz, naj prisili vozilo, da se raztovori
+STR_TRANSFER                                                    :{BLACK}Pretovori
 STR_CLEAR_TIME                                                  :{BLACK}Počisti čas
 STR_RESET_LATENESS                                              :{BLACK}Resetiraj  Late Counter
 
@@ -2931,8 +2931,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Poimenuj cestno vozilo
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prihod prvega avtobusa na postajo {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Prebivalci praznujejo . . .{}Prihod prvega tovornjaka na postajo {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Meščani proslavljajo . . .{}Prvi potniški tramvaj je prispel na postajo {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Proslava meščanov . . .{}Prvi tovorni tramvaj je pripeljal na postajo {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Meščani proslavljajo . . .{}Prvi potniški tramvaj je prispel na postajo {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Proslava meščanov . . .{}Prvi tovorni tramvaj je pripeljal na postajo {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Prometna nesreča!{}Voznik umrl v plamenih po trku z vlakom.
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Prometna nesreča!{}{COMMA} mrt{P ev va vi vih} v plamenih ob trku z vlakom.
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Ni mogoče obrniti smeri vozila ...
@@ -2941,7 +2941,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Preimenuj cestno vozilo
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Preimenuj cestno vozilo
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Ni mogoče preimenovati cestnega vozila ...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Pojdi v garažo v mestu {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Pojdi v garažo v mestu {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Na servis v {TOWN} cestno garažo
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Predelaj vozilo za prevoz druge vrste tovora
--- a/src/lang/spanish.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/spanish.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -273,9 +273,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Demasiados nombres definidos
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}El nombre elegido está en uso
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -286,11 +286,11 @@
 STR_013C_CARGO                                                  :{BLACK}Carga
 STR_013D_INFORMATION                                            :{BLACK}Información
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
-STR_013E_TOTAL_CARGO                                            :{BLACK}Carga total
+STR_TOTAL_CARGO                                                 :{BLACK}Carga total
 STR_013F_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacidad: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carga total (capacidad) de este tren:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Carga total (capacidad) de este tren:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nuevo Juego
 STR_0141_LOAD_GAME                                              :{BLACK}Cargar Juego
@@ -729,7 +729,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Borrar esta población completamente
 STR_0292_SAVE_SCENARIO                                          :Guardar escenario
 STR_0293_LOAD_SCENARIO                                          :Cargar escenario
-STR_LOAD_HEIGHTMAP                                              :Cargar mapa de alturas
+STR_MENU_LOAD_HEIGHTMAP                                         :Cargar mapa de alturas
 STR_0294_QUIT_EDITOR                                            :Salir del editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Salir
@@ -769,9 +769,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Opciones de juego
-STR_02C5_DIFFICULTY_SETTINGS                                    :Configuración de dificultad
-STR_02C7_CONFIG_PATCHES                                         :Configurar parches
+STR_02C4_GAME_OPTIONS                                           :Opciones de juego
+STR_02C6_DIFFICULTY_SETTINGS                                    :Configuración de dificultad
+STR_MENU_CONFIG_PATCHES                                         :Configurar parches
 STR_NEWGRF_SETTINGS                                             :Configuración Newgrf
 STR_TRANSPARENCY_OPTIONS                                        :Opciones de transparencia
 STR_GAMEOPTMENU_0A                                              :
@@ -871,8 +871,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}El grabado está en progreso,{}por favor espere hasta que termine!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Elegir el programa musical de estilo 'Ezy Street'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Inglés
@@ -1647,42 +1647,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Ha de retirar carretera primero
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Trabajos en la carretera en progreso
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construcción de carretera
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Construcción de tranvía
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Construcción de tranvía
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Elige puente de carretera
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... carreteras de un sentido no pueden tener intersecciones
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}No se puede construir carretera aquí...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}No se puede construir un tranvía aquí...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}No se puede construir un tranvía aquí...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}No se puede retirar carretera de aquí...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}No se puede quitar el tranvía de aquí...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}No se puede quitar el tranvía de aquí...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientación del depósito
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Orientación del depósito de tranvía
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientación del depósito de tranvía
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}No se puede construir depósito de carretera aquí...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}No se puede construir depósito de tranvía aquí...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}No se puede construir depósito de tranvía aquí...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}No se puede construir estación de autobuses...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}No se puede construir estación de camiones...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}No se puede construir estación de tranvía de pasajeros...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}No puede construir estación de tranvía de carga...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}No se puede construir estación de tranvía de pasajeros...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}No puede construir estación de tranvía de carga...
 STR_180A_ROAD_CONSTRUCTION                                      :Construcción de carretera
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Construcción de tranvía
+STR_TRAMWAY_CONSTRUCTION                                        :Construcción de tranvía
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Construir sección de carretera
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Construir carretera usando el modo de Autocarretera
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Construir sección de tranvía
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Construir sección de tranvía
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Construir metro usando el modo de Autometro
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Construir depósito de carretera (para construir y despachar vehículos)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Construir depósito de tranvías (para vehículos de contrucción y servicio)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Construir depósito de tranvías (para vehículos de contrucción y servicio)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Construir estación de autobús
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Construir estación de carga para camiones
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Construir estación de tranvía de pasajeros
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Construir estación de tranvía de carga
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Construir estación de tranvía de pasajeros
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Construir estación de tranvía de carga
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Construir puente de carretera
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Construir puente de tranvía
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Construir puente de tranvía
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Construir túnel de carretera
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Construir tunel de tranvía
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Construir tunel de tranvía
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Activar/Desactivar carreteras de un sentido
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Cambiar entre construir/retirar carretera
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Activar construir/quitar para construcciones de tranvía
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Activar construir/quitar para construcciones de tranvía
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Elegir orientación del depósito de carretera
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Seleccione orientación del depósito de tranvías
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Seleccione orientación del depósito de tranvías
 STR_1814_ROAD                                                   :Road
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Carretera con farolas
 STR_1816_TREE_LINED_ROAD                                        :Carretera arbolada
@@ -1825,8 +1825,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}djunta más de una estación/zona de carga existente
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Demasiadas estaciones/zonas de carga en esta población
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Demasiadas estaciones/zonas de carga
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Demasiadas paradas de Autobús
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Demasiadas zonas de carga
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Demasiadas paradas de Autobús
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Demasiadas zonas de carga
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Demasiado cerca de otra estación/zona de carga
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Primero debe demolerse estación de tren
@@ -1857,12 +1857,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} acepta ahora {STRING} y {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Or. estación de autobús
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Or. estación de camiones
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Orientación Tranvía Pasajeros
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Orientación Tranvía de Carga
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Orientación Tranvía Pasajeros
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Orientación Tranvía de Carga
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Primero debe demolerse estación de autobús
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Primero debe demolerse estación de camiones
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Debe demoler la estación del tranvía de pasajeros primero
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Debe demoler la estación del tranvía de carga primero
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Debe demoler la estación del tranvía de pasajeros primero
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Debe demoler la estación del tranvía de carga primero
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Estaciones
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ninguna -
@@ -1874,8 +1874,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Elige longitud de la estación de tren
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Elige la orientación de la estación de autobús
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Elige la orientación de la estación de camiones
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Seleccione la orientación de la estación del tranvía de pasajeros
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Seleccione la orientación de la estación del tranvía de carga
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Seleccione la orientación de la estación del tranvía de pasajeros
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Seleccione la orientación de la estación del tranvía de carga
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centrar vista en la posición de la estación
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Ver calificación de la estación
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Cambiar nombre de la estación
@@ -1897,7 +1897,7 @@
 STR_3069_BUOY                                                   :Boya
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...boya en medio
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...estación demasiado extendida
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...desactivada estaciones no uniformes
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...desactivada estaciones no uniformes
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Manten pulsado CTRL para seleccionar varios elementos
 
 STR_UNDEFINED                                                   :(cadena sin determinar)
@@ -1938,7 +1938,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Seleccione Nuevo Tipo de Juego
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Seleccione escenario (verde), juegos preestablecidos-set (azul), o juego al azar
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Generar juego nuevo al azar
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Cargar Mapas de altura
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Cargar Mapas de altura
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} en medio
@@ -2142,10 +2142,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Economía: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Marcha atrás trenes: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Actitud de la autoridades sobre reestructuraciones: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Actitud de la autoridades sobre reestructuraciones: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Ninguno
+STR_NONE                                                        :Ninguno
 STR_NUM_VERY_LOW                                                :Muy bajo
 STR_6816_LOW                                                    :Baja
 STR_6817_NORMAL                                                 :Normal
@@ -2183,9 +2183,9 @@
 STR_6836_OFF                                                    :No
 STR_6837_ON                                                     :Si
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Ver gráfica de altas puntuaciones
-STR_6839_PERMISSIVE                                             :Permisiva
-STR_683A_TOLERANT                                               :Tolerante
-STR_683B_HOSTILE                                                :Hostil
+STR_PERMISSIVE                                                  :Permisiva
+STR_TOLERANT                                                    :Tolerante
+STR_HOSTILE                                                     :Hostil
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2322,7 +2322,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}No se puede vender el 25% de acciones...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% propiedad de {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} ha sido comprada por {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Esta empresa todavía no dispone acciones a la venta...
+STR_PROTECTED                                                   :{WHITE}Esta empresa todavía no dispone acciones a la venta...
 
 STR_LIVERY_DEFAULT                                              :Estación normal
 STR_LIVERY_STEAM                                                :Locomotora a Vapor
@@ -2631,17 +2631,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING}{STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
 STR_8806_GO_TO                                                  :Ir a {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Ir a {STATION} (Transferir y cargar)
-STR_8808_GO_TO_UNLOAD                                           :Ir a {STATION} (Descargar)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Ir a {STATION} (Transferir y dejar vacío)
-STR_880A_GO_TO_LOAD                                             :Ir a {STATION} (Cargar)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Ir a {STATION} (Transferir y esperar a carga completa)
-STR_880C_GO_NON_STOP_TO                                         :Ir sin paradas a {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Ir sin paradas a {STATION} (Transferir y cargar)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Ir sin paradas a {STATION} (Descargar)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Ir sin paradas a {STATION} (Transferir y dejar vacío)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Ir sin paradas a  {STATION} (Cargar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ir sin paradas a {STATION} (Transferir y esperar a carga completa)
+STR_GO_TO_TRANSFER                                              :Ir a {STATION} (Transferir y cargar)
+STR_8807_GO_TO_UNLOAD                                           :Ir a {STATION} (Descargar)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Ir a {STATION} (Transferir y dejar vacío)
+STR_8808_GO_TO_LOAD                                             :Ir a {STATION} (Cargar)
+STR_GO_TO_TRANSFER_LOAD                                         :Ir a {STATION} (Transferir y esperar a carga completa)
+STR_880A_GO_NON_STOP_TO                                         :Ir sin paradas a {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Ir sin paradas a {STATION} (Transferir y cargar)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Ir sin paradas a {STATION} (Descargar)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Ir sin paradas a {STATION} (Transferir y dejar vacío)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Ir sin paradas a  {STATION} (Cargar)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Ir sin paradas a {STATION} (Transferir y esperar a carga completa)
 STR_GO_TO_TRAIN_DEPOT                                           :Ir al depósito del tren de {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Ir al depósito de {TOWN} para mantenimiento
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ir sin parar al depósito de {TOWN}
@@ -2745,7 +2745,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Mostrar detalles de mercancía transportada
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Mostrar detalles de los vehículos
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Mostrar capacidades de cada vehículo
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Mostrar capacidad total del tren, dividida por tipo de carga
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Mostrar capacidad total del tren, dividida por tipo de carga
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Lista de órdenes - click en orden para resaltarla
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Saltar orden actual y comenzar la siguiente
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Borrar orden resaltada
@@ -2776,8 +2776,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}No se puede revertir la dirección...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renombrar tipo de vehículo
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}No se puede renombrar tipo de vehículo...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Hacer que la orden marcada fuerce al vehículo a descargar
-STR_886F_TRANSFER                                               :{BLACK}Transferir
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Hacer que la orden marcada fuerce al vehículo a descargar
+STR_TRANSFER                                                    :{BLACK}Transferir
 STR_CLEAR_TIME                                                  :{BLACK}Limpiar Horario
 STR_RESET_LATENESS                                              :{BLACK}Resetear Retrasos
 
@@ -2855,8 +2855,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Nombrar vehículo
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer autobús llega a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Los ciudadanos celebran . . .{}¡Primer camión llega a {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Ciudadanos celebran . . .{}Llega primer tranvía de pasajeros a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Ciudadanos celebran . . .{}Llega primer tranvía de carga a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Ciudadanos celebran . . .{}Llega primer tranvía de pasajeros a {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Ciudadanos celebran . . .{}Llega primer tranvía de carga a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}¡Accidente de tráfico!{}El conductor fallece en la explosión tras la colisión con el tren
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accidente de tráfico!{}{COMMA} fallecidos en la explosión tras la colisión con el tren
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}No se puede hacer girar al vehículo...
@@ -2865,7 +2865,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renombrar tipo de vehículo
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renombrar tipo de vehículo
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}No se puede renombrar tipo de vehículo....
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Ir al depósito de {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Ir al depósito de {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Ir al depósito de {TOWN} para mantenimiento
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Reparar vehículo de carretera para transportar otro tipo de cargas
--- a/src/lang/swedish.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/swedish.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}För många namn definerade
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Namnet används redan
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Gods
 STR_013D_INFORMATION                                            :{BLACK}Information
 STR_013E_CAPACITIES                                             :{BLACK}Kapaciteter
-STR_013E_TOTAL_CARGO                                            :{BLACK}Gods Totalt
+STR_TOTAL_CARGO                                                 :{BLACK}Gods Totalt
 STR_013F_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Tågets totala kapacitet:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}{CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Tågets totala kapacitet:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}{CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nytt spel
 STR_0141_LOAD_GAME                                              :{BLACK}Ladda spel
@@ -728,7 +728,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Ta bort staden helt och hållet
 STR_0292_SAVE_SCENARIO                                          :Spara scenario
 STR_0293_LOAD_SCENARIO                                          :Öppna scenario
-STR_LOAD_HEIGHTMAP                                              :Ladda höjdkarta
+STR_MENU_LOAD_HEIGHTMAP                                         :Ladda höjdkarta
 STR_0294_QUIT_EDITOR                                            :Avsluta editor
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Avsluta
@@ -768,9 +768,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Spelinställningar
-STR_02C5_DIFFICULTY_SETTINGS                                    :Svårighetsgrad
-STR_02C7_CONFIG_PATCHES                                         :Ändra Patchar
+STR_02C4_GAME_OPTIONS                                           :Spelinställningar
+STR_02C6_DIFFICULTY_SETTINGS                                    :Svårighetsgrad
+STR_MENU_CONFIG_PATCHES                                         :Ändra Patchar
 STR_NEWGRF_SETTINGS                                             :NewGRF inställningar
 STR_TRANSPARENCY_OPTIONS                                        :Genomskinlighetsinställningar
 STR_GAMEOPTMENU_0A                                              :
@@ -870,8 +870,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Sparar fortfarande,{}vänta tills det är slutfört!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Välj 'Ezy Street style music'-program
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Engelska
@@ -1646,42 +1646,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Måste ta bort väg först
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vägarbete pågår
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Bygg väg
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Byggnation av spårvagn
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Byggnation av spårvagn
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Välj vägbro
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... enkelriktade vägar kan inte ha korsningar
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kan inte bygga väg här...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Kan inte bygga spårvagnsräls här...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Kan inte bygga spårvagnsräls här...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Kan inte ta bort väg här...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Kan inte ta bort spårvagnsrälsen härifrån...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Kan inte ta bort spårvagnsrälsen härifrån...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Riktning för bussgarage
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Spårvagnsdepåns orientering
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Spårvagnsdepåns orientering
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan inte bygga bussgarage här...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Kan inte bygga spårvagnsdepå här...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Kan inte bygga spårvagnsdepå här...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Kan inte bygga busshållplats...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kan inte bygga lastbilsstation...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Kan inte bygga passagerar-spårvagnsstation...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Kan inte bygga frakt-spårvagnsstation...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Kan inte bygga passagerar-spårvagnsstation...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Kan inte bygga frakt-spårvagnsstation...
 STR_180A_ROAD_CONSTRUCTION                                      :Bygg väg
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Spårvagnskonstruktion
+STR_TRAMWAY_CONSTRUCTION                                        :Spårvagnskonstruktion
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Bygg väg
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Använd Automatvägläge för att bygga vägsektion
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Bygg spårvagnssektion
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Bygg spårvagnssektion
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Använd Automatspårläge för att bygga spårväg
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bygg bussgarage (för att bygga eller reparera vägfordon)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Bygg spårvagnsdepå (för att konstruera och serva fordon)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Bygg spårvagnsdepå (för att konstruera och serva fordon)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Bygg busshållplats
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bygg lastbilsstation
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Bygg passagerar-spårvagnsstation
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Bygg frakt-spårvagnsstation
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Bygg passagerar-spårvagnsstation
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Bygg frakt-spårvagnsstation
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bygg vägbro
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Bygg spårvagnsbro
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Bygg spårvagnsbro
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Bygg vägtunnel
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Bygg spårvagnstunnel
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Bygg spårvagnstunnel
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Aktivera/Deaktivera enkelriktade vägar
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Växla mellan att bygga/ta bort väg
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Växla byggande/rivande av spårvagnskonstruktion
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Växla byggande/rivande av spårvagnskonstruktion
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Välj riktning för bussgarage
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Välj spårvagnsdepåns orientering
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Välj spårvagnsdepåns orientering
 STR_1814_ROAD                                                   :Väg
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Väg med gatubelysning
 STR_1816_TREE_LINED_ROAD                                        :Väg med träd
@@ -1824,8 +1824,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Angränsar till mer än en station/hållplats
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}För många stationer/hållplatser i staden
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}För många stationer/hållplatser
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}För många busshållplatser
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}För många lastbilsstationer
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}För många busshållplatser
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}För många lastbilsstationer
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}För nära en annan stationer/hållplatser
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Måste riva järnvägsstation först
@@ -1856,12 +1856,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} tar nu emot {STRING} och {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Busshållplatsriktning
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Lastbilsbryggsriktning
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Passagerar-spårvagns riktning
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Frakt-spårvagns riktning
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Passagerar-spårvagns riktning
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Frakt-spårvagns riktning
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Måste riva busshållplats först
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Måste riva lastbilsbrygga först
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Måste ta bort passagerar-spårvagnsstation först
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Måste ta bort frakt-spårvagnsstation först
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Måste ta bort passagerar-spårvagnsstation först
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Måste ta bort frakt-spårvagnsstation först
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Station{P "" er}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Inga -
@@ -1873,8 +1873,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Välj längden på järnvägsstation
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Välj riktning för busshållplats
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Välj riktning för lastbilsbrygga
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Välj passagerar-spårvagnsstationens orientering
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Välj frakt-spårvagnsstationens orientering
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Välj passagerar-spårvagnsstationens orientering
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Välj frakt-spårvagnsstationens orientering
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centrera vyn på stationen
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Visa stationens klassificering
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Byt namn på stationen
@@ -1896,7 +1896,7 @@
 STR_3069_BUOY                                                   :Boj
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...boj i vägen
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...station för utspridd
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ej enhetliga stationer inaktiverade
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ej enhetliga stationer inaktiverade
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Håll nere CTRL för att markera mer än en sak
 
 STR_UNDEFINED                                                   :(oidentifierad sträng)
@@ -1937,7 +1937,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Välj typ av nytt spel
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Välj scenario (grön), förbestämt spel (blå), eller slumpmässigt nytt spel
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Skapa slumpmässigt nytt spel
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Läs höjdkarta
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Läs höjdkarta
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} i vägen
@@ -2141,10 +2141,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomi: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Tåg kan vända: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Katastrofer: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Stadens attityd mot områdesombyggnad: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Stadens attityd mot områdesombyggnad: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Ingen
+STR_NONE                                                        :Ingen
 STR_NUM_VERY_LOW                                                :Väldigt låg
 STR_6816_LOW                                                    :Låg
 STR_6817_NORMAL                                                 :Normal
@@ -2182,9 +2182,9 @@
 STR_6836_OFF                                                    :Av
 STR_6837_ON                                                     :På
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Visa highscore-lista
-STR_6839_PERMISSIVE                                             :Eftergiven
-STR_683A_TOLERANT                                               :Tolerant
-STR_683B_HOSTILE                                                :Fientlig
+STR_PERMISSIVE                                                  :Eftergiven
+STR_TOLERANT                                                    :Tolerant
+STR_HOSTILE                                                     :Fientlig
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2321,7 +2321,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Kan inte sälja 25% andelar i detta företag...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% ägs av {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} har tagits över av {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Det här företaget bedriver inte aktiehandel ännu....
+STR_PROTECTED                                                   :{WHITE}Det här företaget bedriver inte aktiehandel ännu....
 
 STR_LIVERY_DEFAULT                                              :Normalt Färgschema
 STR_LIVERY_STEAM                                                :Ånglok
@@ -2628,17 +2628,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Åk till {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Åk till {STATION} (Lasta om och på)
-STR_8808_GO_TO_UNLOAD                                           :Åk till {STATION} (Lasta av)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Åk till {STATION} (Lasta om men inte på)
-STR_880A_GO_TO_LOAD                                             :Åk till {STATION} (Lasta på)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Åk till {STATION} (Lasta om och vänta på full last)
-STR_880C_GO_NON_STOP_TO                                         :Åk nonstop till {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Åk nonstop till {STATION} (Lasta om och på)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Åk nonstop till {STATION} (Lasta av)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Åk nonstop till {STATION} (Lasta om men inte på)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Åk nonstop till {STATION} (Lasta på)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Åk nonstop till {STATION} (Lasta om och vänta på full last)
+STR_GO_TO_TRANSFER                                              :Åk till {STATION} (Lasta om och på)
+STR_8807_GO_TO_UNLOAD                                           :Åk till {STATION} (Lasta av)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Åk till {STATION} (Lasta om men inte på)
+STR_8808_GO_TO_LOAD                                             :Åk till {STATION} (Lasta på)
+STR_GO_TO_TRANSFER_LOAD                                         :Åk till {STATION} (Lasta om och vänta på full last)
+STR_880A_GO_NON_STOP_TO                                         :Åk nonstop till {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Åk nonstop till {STATION} (Lasta om och på)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Åk nonstop till {STATION} (Lasta av)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Åk nonstop till {STATION} (Lasta om men inte på)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Åk nonstop till {STATION} (Lasta på)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Åk nonstop till {STATION} (Lasta om och vänta på full last)
 STR_GO_TO_TRAIN_DEPOT                                           :Åk till {TOWN}s tågdepå
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Servning vid {TOWN} tågdepå
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Åk non-stop till {TOWN}s tågdepå
@@ -2742,7 +2742,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Visa detaljer för lastat gods
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Visa detaljer för tågfordon
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Visa kapaciteter för varje fordon
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Visa tågets totala kapacitet, separera för typ av gods
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Visa tågets totala kapacitet, separera för typ av gods
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Orderlista - klicka på order för att markera det
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Hoppa över nuvarande order och starta nästa. CTRL + klick hoppar över till vald order
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Ta bort markerad order
@@ -2773,8 +2773,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan inte byta tågets riktning...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Byt namn på tågets fordonstyp
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan inte byta namn på tågets fordonstyp...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Gör så att den markerade ordern tvingar fordonet att lasta av
-STR_886F_TRANSFER                                               :{BLACK}Lasta om
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Gör så att den markerade ordern tvingar fordonet att lasta av
+STR_TRANSFER                                                    :{BLACK}Lasta om
 STR_CLEAR_TIME                                                  :{BLACK}Rensa tid
 STR_RESET_LATENESS                                              :{BLACK}Rensa räknaren för sen ankomst
 
@@ -2852,8 +2852,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Byt namn på vägfordon
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Invånarna firar . . .{}Första bussen ankommer till {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Invånarna firar . . .{}Första lastbilen ankommer till {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Invånarna firar . . .{}Första passagerar-spårvagnen anländer på {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Invånarna firar . . .{}Första frakt-spårvagnen anländer på {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Invånarna firar . . .{}Första passagerar-spårvagnen anländer på {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Invånarna firar . . .{}Första frakt-spårvagnen anländer på {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Vägfordonskrash!{}förare dör i eldklot efter kollision med tåg
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Vägfordonskrash!{}{COMMA} dör i eldklot efter kollision med tåg
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan inte tvinga fordonet att vända om...
@@ -2862,7 +2862,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Byt namn på vägfordon typ
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Byt namn på vägfordon typ
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan inte byta namn på vägfordon typ...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Gå till {TOWN} vägfordonsdepå
+STR_GO_TO_ROADVEH_DEPOT                                         :Gå till {TOWN} vägfordonsdepå
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servning vid {TOWN} vägfordonsdepå Depot
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Anpassa vägfordon till att bära en annan sorts last
--- a/src/lang/traditional_chinese.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/traditional_chinese.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}已定義過多名稱
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}所選名稱已被使用
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}貨物
 STR_013D_INFORMATION                                            :{BLACK}資訊
 STR_013E_CAPACITIES                                             :{BLACK}載量
-STR_013E_TOTAL_CARGO                                            :{BLACK}總貨物量
+STR_TOTAL_CARGO                                                 :{BLACK}總貨物量
 STR_013F_CAPACITY                                               :{BLACK}載量:{LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}載量:{LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}此列車的總載量:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}此列車的總載量:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}開新遊戲
 STR_0141_LOAD_GAME                                              :{BLACK}載入遊戲
@@ -725,7 +725,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}完全移除這個市鎮
 STR_0292_SAVE_SCENARIO                                          :儲存場景
 STR_0293_LOAD_SCENARIO                                          :載入場景
-STR_LOAD_HEIGHTMAP                                              :載入高度圖
+STR_MENU_LOAD_HEIGHTMAP                                         :載入高度圖
 STR_0294_QUIT_EDITOR                                            :離開編輯器
 STR_0295                                                        :
 STR_0296_QUIT                                                   :離開
@@ -765,9 +765,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :遊戲選項
-STR_02C5_DIFFICULTY_SETTINGS                                    :難易設定
-STR_02C7_CONFIG_PATCHES                                         :設置修正
+STR_02C4_GAME_OPTIONS                                           :遊戲選項
+STR_02C6_DIFFICULTY_SETTINGS                                    :難易設定
+STR_MENU_CONFIG_PATCHES                                         :設置修正
 STR_NEWGRF_SETTINGS                                             :NewGRF 設定
 STR_TRANSPARENCY_OPTIONS                                        :透明度選項
 STR_GAMEOPTMENU_0A                                              :
@@ -867,8 +867,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}遊戲仍在儲存,{}請稍候!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}選擇「輕鬆街頭音樂」歌單
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :英國 (原版)
@@ -1642,42 +1642,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}必須先移除道路
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}道路施工中
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}鋪設道路
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}鋪設電車軌
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}鋪設電車軌
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}選擇道路橋樑
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... 單向的道路不能有交叉點
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}不能在此鋪設道路...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}不可以在這裏鋪設電車軌...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}不可以在這裏鋪設電車軌...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}不能從此移除道路...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}不可以移除這裏的電車軌...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}不可以移除這裏的電車軌...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}車庫方向
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}電車
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}電車
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}不能在此設置車庫...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}不可以在這裏興建電車維修廠...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}不可以在這裏興建電車維修廠...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}無法設置公車站...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}無法設置貨運站...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}不可以興建電車站...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}不可興建載貨電車站...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}不可以興建電車站...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}不可興建載貨電車站...
 STR_180A_ROAD_CONSTRUCTION                                      :鋪設道路
-STR_180A_TRAMWAY_CONSTRUCTION                                   :鋪設電車軌
+STR_TRAMWAY_CONSTRUCTION                                        :鋪設電車軌
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}鋪設一段公路
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}鋪設道路區段時使用自動模式
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}興建電車站
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}興建電車站
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}鋪設輕軌區段時使用自動模式
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}設置車庫 (用來購置與維護公路車輛)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}興建電車維修廠 (供製造及維修用)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}興建電車維修廠 (供製造及維修用)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}設置公車站
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}設置貨運站
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}興建載客電車站
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}興建載貨電車站
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}興建載客電車站
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}興建載貨電車站
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}建築公路橋樑
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}架設電車橋
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}架設電車橋
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}挖掘公路隧道
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}開鐅電車隧道
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}開鐅電車隧道
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}切換單行道/雙向道
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}切換鋪設/移除公路
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}鋪設電車軌開關
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}鋪設電車軌開關
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}選擇車庫方向
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}選擇電車維修廠方向
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}選擇電車維修廠方向
 STR_1814_ROAD                                                   :公路
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :有路燈的公路
 STR_1816_TREE_LINED_ROAD                                        :有行道樹的公路
@@ -1820,8 +1820,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}鄰接超過一個現有車站/載貨區
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}這個城鎮已有太多車站/載貨區 (可先修改現有車站/載貨區的名稱再試看看)
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}太多車站/載貨區
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}太多工車站
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}太多貨運站
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}太多工車站
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}太多貨運站
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}太靠近另一個車站/載貨區
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}必須先摧毀鐵道車站
@@ -1852,12 +1852,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} 現在接受 {STRING} 與 {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}公車站方向
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}貨運站方向
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}載客電車方向
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}載貨電車方向
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}載客電車方向
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}載貨電車方向
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}必須先摧毀公車站
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}必須先摧毀貨運站
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}必須先移除載客電車車站
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}必須先移除載貨電車車站
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}必須先移除載客電車車站
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}必須先移除載貨電車車站
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} 座車站
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- 無 -
@@ -1869,8 +1869,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}選擇鐵道車站的長度
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}選擇公車站方向
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}選擇貨運站方向
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}選擇載客電車方向
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}選擇載貨電車方向
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}選擇載客電車方向
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}選擇載貨電車方向
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}將主視野帶到車站位置
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}顯示車站評價
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}變更車站名稱
@@ -1892,7 +1892,7 @@
 STR_3069_BUOY                                                   :浮標
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...被浮標擋住
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...車站範圍太大
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...未啟動不規則車站外型功能
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...未啟動不規則車站外型功能
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}按住 CTRL 選擇多重項目
 
 STR_UNDEFINED                                                   :(未定義字串)
@@ -1933,7 +1933,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}選擇新遊戲類型
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}選擇劇本 (綠色),預設遊戲 (藍),或隨機產生場景
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :隨機產生新場景
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}載入高度圖
+STR_LOAD_HEIGHTMAP                                              :{WHITE}載入高度圖
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}被 {STRING} 擋住
@@ -2137,10 +2137,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}經濟:{ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}列車倒轉:{ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}災難:{ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}市議會對區域重建的態度:{ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}市議會對區域重建的態度:{ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :無
+STR_NONE                                                        :無
 STR_NUM_VERY_LOW                                                :非常少
 STR_6816_LOW                                                    :低
 STR_6817_NORMAL                                                 :普通
@@ -2178,9 +2178,9 @@
 STR_6836_OFF                                                    :關
 STR_6837_ON                                                     :開
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}顯示排行榜
-STR_6839_PERMISSIVE                                             :寬容
-STR_683A_TOLERANT                                               :能忍受
-STR_683B_HOSTILE                                                :抱敵意
+STR_PERMISSIVE                                                  :寬容
+STR_TOLERANT                                                    :能忍受
+STR_HOSTILE                                                     :抱敵意
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2317,7 +2317,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}無法出售這間公司的股份...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% 由 {COMPANY} 擁有)
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} 被 {COMPANY} 收購!
-STR_7080_PROTECTED                                              :{WHITE}這間公司才剛成立,還不能交易股票...
+STR_PROTECTED                                                   :{WHITE}這間公司才剛成立,還不能交易股票...
 
 STR_LIVERY_DEFAULT                                              :標準配色
 STR_LIVERY_STEAM                                                :蒸汽機車
@@ -2624,17 +2624,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}:{STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}:{STRING} {STRING}
 STR_8806_GO_TO                                                  :前往 {STATION}
-STR_8807_GO_TO_TRANSFER                                         :前往 {STATION} (轉運,僅載不卸)
-STR_8808_GO_TO_UNLOAD                                           :前往 {STATION} (卸客貨)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :前往 {STATION} (轉運,卸客貨清空離站)
-STR_880A_GO_TO_LOAD                                             :前往 {STATION} (滿載)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :前往 {STATION} (轉運,等待滿載)
-STR_880C_GO_NON_STOP_TO                                         :前往 {STATION} 不停靠/中途不停
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :前往 {STATION} (轉運 [僅載不卸]) 中途不停
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :前往 {STATION} (卸載) 中途不停
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :前往 {STATION} (轉運 [卸載清空離站]) 中途不停
-STR_8810_GO_NON_STOP_TO_LOAD                                    :前往 {STATION} (滿載) 中途不停
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :前往 {STATION} (轉運 [等待滿載]) 中途不停
+STR_GO_TO_TRANSFER                                              :前往 {STATION} (轉運,僅載不卸)
+STR_8807_GO_TO_UNLOAD                                           :前往 {STATION} (卸客貨)
+STR_GO_TO_TRANSFER_UNLOAD                                       :前往 {STATION} (轉運,卸客貨清空離站)
+STR_8808_GO_TO_LOAD                                             :前往 {STATION} (滿載)
+STR_GO_TO_TRANSFER_LOAD                                         :前往 {STATION} (轉運,等待滿載)
+STR_880A_GO_NON_STOP_TO                                         :前往 {STATION} 不停靠/中途不停
+STR_GO_TO_NON_STOP_TRANSFER                                     :前往 {STATION} (轉運 [僅載不卸]) 中途不停
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :前往 {STATION} (卸載) 中途不停
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :前往 {STATION} (轉運 [卸載清空離站]) 中途不停
+STR_880C_GO_NON_STOP_TO_LOAD                                    :前往 {STATION} (滿載) 中途不停
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :前往 {STATION} (轉運 [等待滿載]) 中途不停
 STR_GO_TO_TRAIN_DEPOT                                           :前往 {TOWN} 機廠
 STR_SERVICE_AT_TRAIN_DEPOT                                      :在 {TOWN} 機廠維護
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :前往 {TOWN} 機廠 中途不停
@@ -2738,7 +2738,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}顯示載貨詳細資料
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}顯示車輛詳細資料
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}顯示車輛的容量
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}顯示列車的總容量,照貨物分類
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}顯示列車的總容量,照貨物分類
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}指令清單 - 點選指令可選擇。按住 CTRL 點選可跳到車站位置
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}跳過目前的命令,從下一個開始。CTRL + 左鍵 可直接跳至所選的命令
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}刪除選定指令
@@ -2769,8 +2769,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}無法到轉列車方向...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}重新命名鐵道車輛
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}無法修改鐵道車輛名稱...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}讓列車在選定的指令強制卸載
-STR_886F_TRANSFER                                               :{BLACK}轉運
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}讓列車在選定的指令強制卸載
+STR_TRANSFER                                                    :{BLACK}轉運
 STR_CLEAR_TIME                                                  :{BLACK}清除時刻
 STR_RESET_LATENESS                                              :{BLACK}歸零誤點/慢分
 
@@ -2847,8 +2847,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}為車輛命名
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛公車抵達 {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛貨車抵達 {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛客運輕軌抵達 {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛貨運輕軌抵達 {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛客運輕軌抵達 {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛貨運輕軌抵達 {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}車禍!{}駕駛在與列車對撞後罹難
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}車禍!{}車輛在與列車對撞後, 造成 {COMMA} 人罹難
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}無法使車輛掉頭...
@@ -2857,7 +2857,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}為車輛類型更名
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}為車輛類型更名
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}無法為車輛類型更名...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :前往 {TOWN} 車庫
+STR_GO_TO_ROADVEH_DEPOT                                         :前往 {TOWN} 車庫
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :在 {TOWN} 車庫維護
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}改裝車輛以運送不同的酬載
--- a/src/lang/turkish.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/turkish.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -272,9 +272,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Çok fazla adlandırma
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Seçilen isim kullanımda
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -285,11 +285,11 @@
 STR_013C_CARGO                                                  :{BLACK}Kargo
 STR_013D_INFORMATION                                            :{BLACK}Bilgi
 STR_013E_CAPACITIES                                             :{BLACK}Kapasite
-STR_013E_TOTAL_CARGO                                            :{BLACK}Toplam Kargo
+STR_TOTAL_CARGO                                                 :{BLACK}Toplam Kargo
 STR_013F_CAPACITY                                               :{BLACK}Kapasite: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Kapasite: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Bu trenin toplam kapasitesi:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Bu trenin toplam kapasitesi:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Yeni Oyun
 STR_0141_LOAD_GAME                                              :{BLACK}Oyun Yükle
@@ -728,7 +728,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Sehri tamamen sil
 STR_0292_SAVE_SCENARIO                                          :Kaydet
 STR_0293_LOAD_SCENARIO                                          :Yükle
-STR_LOAD_HEIGHTMAP                                              :Yükseklik haritası yükle
+STR_MENU_LOAD_HEIGHTMAP                                         :Yükseklik haritası yükle
 STR_0294_QUIT_EDITOR                                            :Editörden Çık
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Oyundan Çık
@@ -768,9 +768,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Seçenekler
-STR_02C5_DIFFICULTY_SETTINGS                                    :Zorluk Ayarları
-STR_02C7_CONFIG_PATCHES                                         :Yamaları Düzenle
+STR_02C4_GAME_OPTIONS                                           :Seçenekler
+STR_02C6_DIFFICULTY_SETTINGS                                    :Zorluk Ayarları
+STR_MENU_CONFIG_PATCHES                                         :Yamaları Düzenle
 STR_NEWGRF_SETTINGS                                             :Newgrf ayarları
 STR_TRANSPARENCY_OPTIONS                                        :Şeffaflık seçenekleri
 STR_GAMEOPTMENU_0A                                              :
@@ -870,8 +870,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Kayıt işlemi sürüyor,{}lütfen bitene kadar bekleyin!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}'Ezy Sokagi stili muzik' programını seç
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :İngilizce (Orjinal)
@@ -1644,42 +1644,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Önce yol silinmeli
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Yol çalışmaları
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Yol Yapımı
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Tramvay Yapımı
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Tramvay Yapımı
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Köprü Seç
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}...tek yönlü yollar kesişemez
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Yol yapılamıyor...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Buraya tramvay yapılamaz...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Buraya tramvay yapılamaz...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Yol kaldırılamıyor...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Tramvay kaldırılamaz...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Tramvay kaldırılamaz...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Garaj Yönü
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Tramvay Garı Yönü
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Tramvay Garı Yönü
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Buraya Garaj yapılamaz...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Buraya tramvay garı yapılamaz...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Buraya tramvay garı yapılamaz...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Otobüs durağı yapılamaz...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kamyon durağı yapılamaz...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Yolcu tramvayı istasyonu yapılamaz...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Yük tramvayı istasyonu yapılamaz...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Yolcu tramvayı istasyonu yapılamaz...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Yük tramvayı istasyonu yapılamaz...
 STR_180A_ROAD_CONSTRUCTION                                      :Yol yapımı
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Tramvay yapımı
+STR_TRAMWAY_CONSTRUCTION                                        :Tramvay yapımı
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Yol bölmesi yap
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Otoyol modunu kullanarak yol yap
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Tramvay yolu yap
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Tramvay yolu yap
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Otoray modunu kullanarak tramvay yolu yap
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Garaj yap (araç alımı ve bakımlar için)
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Tramvay garı yap (araç alımı ve tamiri için)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Tramvay garı yap (araç alımı ve tamiri için)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Otobüs durağı yap
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Kamyon yükleme bölgesi yap
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Yolcu tramvayı istasyonu yap
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Yük tramvayı istasyonu yap
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Yolcu tramvayı istasyonu yap
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Yük tramvayı istasyonu yap
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Köprü yap
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Tramvay köprüsü yap
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Tramvay köprüsü yap
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Tünel Yap
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Tramvay tüneli yap
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Tramvay tüneli yap
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Tek yönlü yolları etkinleştir/kapat
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Yol yap/sil arasında geçiş yap
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Tramvay yapımı/yıkımı
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Tramvay yapımı/yıkımı
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Garaj yönünü seç
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Tramvay garı yönü
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Tramvay garı yönü
 STR_1814_ROAD                                                   :Yol
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Lambali yol
 STR_1816_TREE_LINED_ROAD                                        :Ağaçli yol
@@ -1822,8 +1822,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Birden fazla istasyona bitişik
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Bu şehirde çok fazla istasyon var
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Haritada çok fazla istasyon var
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Çok fazla durak var
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Çok fazla kamyon yükleme yeri var
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Çok fazla durak var
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Çok fazla kamyon yükleme yeri var
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Başka bir istasyona çok yakın
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Önce tren istasyonu yıkılmalı
@@ -1854,12 +1854,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} artık {STRING} ve {STRING} istiyor
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Otobüs Durağı Yönü
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Kamyon Durağı Yönü
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Yolcu Tramvayı Yönü
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Yük Tramvayı Yönü
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Yolcu Tramvayı Yönü
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Yük Tramvayı Yönü
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Önce otobüs durağı yıkılmalı
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Önce kamyon durağı yıkılmalı
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Önce yolcu tramvayı istasyonu yıkılmalı
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Önce yük tramvayı istasyonu kaldırılmalı
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Önce yolcu tramvayı istasyonu yıkılmalı
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Önce yük tramvayı istasyonu kaldırılmalı
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} istasyonları
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Yok -
@@ -1871,8 +1871,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Tren istasyonu uzunluğu seç
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Otobüs durağı yönünü seç
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Kamyon durağı yönünü seç
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Yolcu tramvayı istasyonu yönünü seçin
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Yük tramvayı istasyonu yönünü seçin
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Yolcu tramvayı istasyonu yönünü seçin
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Yük tramvayı istasyonu yönünü seçin
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Durağın oldugu yere git
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}İstasyonun reytinglerini göster
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}İstasyonun ismini değiştir
@@ -1894,7 +1894,7 @@
 STR_3069_BUOY                                                   :Şamandıra
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...yolda şamandıra var
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...istasyon çok yayılmış
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...özel istasyon ayarı kapalı
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...özel istasyon ayarı kapalı
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Birden fazla şey seçmek için CTRL'yi basılı tutun
 
 STR_UNDEFINED                                                   :(tanımlanmamış sözcük)
@@ -1935,7 +1935,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Yeni oyun türü seç
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Senaryo (yeşil), kurulu oyun (mavi) veya yeni oyun seç
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Rastgele haritada oyna
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Yükseklik haritası yükle
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Yükseklik haritası yükle
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}yolda {STRING} var
@@ -2139,10 +2139,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomi: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Tren ters dönüşü: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Felaketler: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Belediyenin töleransi: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Belediyenin töleransi: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Hiç
+STR_NONE                                                        :Hiç
 STR_NUM_VERY_LOW                                                :Çok az
 STR_6816_LOW                                                    :Düşük
 STR_6817_NORMAL                                                 :Normal
@@ -2180,9 +2180,9 @@
 STR_6836_OFF                                                    :Kapalı
 STR_6837_ON                                                     :Açik
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Punaları Göster
-STR_6839_PERMISSIVE                                             :İzin verici
-STR_683A_TOLERANT                                               :Töleransli
-STR_683B_HOSTILE                                                :Katı
+STR_PERMISSIVE                                                  :İzin verici
+STR_TOLERANT                                                    :Töleransli
+STR_HOSTILE                                                     :Katı
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2319,7 +2319,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Şirketin %25'i satılamıyor...
 STR_707D_OWNED_BY                                               :{WHITE}(%{COMMA} ortağı {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY}, {COMPANY} tarafından alındı!
-STR_7080_PROTECTED                                              :{WHITE}Bu şirket hisselerini satacak kadar eski değil...
+STR_PROTECTED                                                   :{WHITE}Bu şirket hisselerini satacak kadar eski değil...
 
 STR_LIVERY_DEFAULT                                              :Şirket Rengi
 STR_LIVERY_STEAM                                                :Buharlı Lokomotif
@@ -2626,17 +2626,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Git: {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Aktar: {STATION} (Kargoyu al)
-STR_8808_GO_TO_UNLOAD                                           :Git: {STATION} (Boşalt)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Aktar: {STATION} (Boş dön)
-STR_880A_GO_TO_LOAD                                             :Git: {STATION} (Doldur)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Aktar: {STATION} (Tam doldur)
-STR_880C_GO_NON_STOP_TO                                         :Durmadan git: {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Durmadan aktar: {STATION} (Kargoyu al)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Durmadan git: {STATION} (Boşalt)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Durmadan aktar: {STATION} (Boş dön)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Durmadan git: {STATION} (Doldur)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Durmadan aktar: {STATION} (Tam doldur)
+STR_GO_TO_TRANSFER                                              :Aktar: {STATION} (Kargoyu al)
+STR_8807_GO_TO_UNLOAD                                           :Git: {STATION} (Boşalt)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Aktar: {STATION} (Boş dön)
+STR_8808_GO_TO_LOAD                                             :Git: {STATION} (Doldur)
+STR_GO_TO_TRANSFER_LOAD                                         :Aktar: {STATION} (Tam doldur)
+STR_880A_GO_NON_STOP_TO                                         :Durmadan git: {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Durmadan aktar: {STATION} (Kargoyu al)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Durmadan git: {STATION} (Boşalt)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Durmadan aktar: {STATION} (Boş dön)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Durmadan git: {STATION} (Doldur)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Durmadan aktar: {STATION} (Tam doldur)
 STR_GO_TO_TRAIN_DEPOT                                           :Git: {TOWN} Tren Garı
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Bakıma git: {TOWN} Tren Garı
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Durmadan git: {TOWN} Tren Garı
@@ -2740,7 +2740,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Taşınan kargonun ayrıntıları
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Trenin ayrıntıları
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Her aracın kapasitesi
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Trenin kargo türlerine ayrilmis toplam kapasitesini göster
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Trenin kargo türlerine ayrilmis toplam kapasitesini göster
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Talimat listesi - seçmek için komutu tıklayın. CTRL + tıklama istasyona kaydırir
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Şimdiki talimatı atla ve sonrakine geç. CTRL ile tıklanırsa seçili talimata geçilir
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Seçili talimatı sil
@@ -2771,8 +2771,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Tren çevrilemez...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Tren yeniden adlandırılamaz
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Tren yeniden adlandırılamaz...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Seçili talimatta aracı kargoyu boşaltmaya zorla
-STR_886F_TRANSFER                                               :{BLACK}Aktar
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Seçili talimatta aracı kargoyu boşaltmaya zorla
+STR_TRANSFER                                                    :{BLACK}Aktar
 STR_CLEAR_TIME                                                  :{BLACK}Zamanı Temizle
 STR_RESET_LATENESS                                              :{BLACK}Gecikme sayacını sıfırla
 
@@ -2849,8 +2849,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Arabayı adlandır
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}Şuraya ilk kez otobüs geldi: {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}Şuraya ilk kez kamyon geldi: {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}{STATION} istasyonuna ilk kez yolcu tramvayı geldi!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}{STATION} istasyonuna ilk kez yük tramvayı geldi!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}{STATION} istasyonuna ilk kez yolcu tramvayı geldi!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Kutlama yapıldı . . .{}{STATION} istasyonuna ilk kez yük tramvayı geldi!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Trafik kazasi!{}Trenle çarpisan aracın soförü feci şekilde can verdi
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Trafik kazasi!{}{COMMA} kişi patlamadan kurtulamadı
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Araç döndürülemiyor...
@@ -2859,7 +2859,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Araç türünü yeniden adlandır
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Araç türünü yeniden adlandır
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Araç türü yeniden adlandırılamıyor...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Garaja git: {TOWN}
+STR_GO_TO_ROADVEH_DEPOT                                         :Garaja git: {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servise git: {TOWN} Garaji
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Kamyonu başka türde kargo taşıyabilmesi için modifiye et
--- a/src/lang/ukrainian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/ukrainian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -398,9 +398,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Дуже багато імен
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Таке ім'я вже є
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -411,11 +411,11 @@
 STR_013C_CARGO                                                  :{BLACK}Вантаж
 STR_013D_INFORMATION                                            :{BLACK}Інформація
 STR_013E_CAPACITIES                                             :{BLACK}Місткість
-STR_013E_TOTAL_CARGO                                            :{BLACK}Повна місткість
+STR_TOTAL_CARGO                                                 :{BLACK}Повна місткість
 STR_013F_CAPACITY                                               :{BLACK}Місткість: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Місткість:{LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Повна місткість цього поїзду:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Повна місткість цього поїзду:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Нова гра
 STR_0141_LOAD_GAME                                              :{BLACK}Завантажити гру
@@ -854,7 +854,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Видалити місто повністю
 STR_0292_SAVE_SCENARIO                                          :Зберегти сценарій
 STR_0293_LOAD_SCENARIO                                          :Завантажити сценарій
-STR_LOAD_HEIGHTMAP                                              :Завантажити карту висот
+STR_MENU_LOAD_HEIGHTMAP                                         :Завантажити карту висот
 STR_0294_QUIT_EDITOR                                            :Вийти з редактору
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Вихід
@@ -894,9 +894,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Налаштування гри
-STR_02C5_DIFFICULTY_SETTINGS                                    :Налаштування складності
-STR_02C7_CONFIG_PATCHES                                         :Розширені налаштування
+STR_02C4_GAME_OPTIONS                                           :Налаштування гри
+STR_02C6_DIFFICULTY_SETTINGS                                    :Налаштування складності
+STR_MENU_CONFIG_PATCHES                                         :Розширені налаштування
 STR_NEWGRF_SETTINGS                                             :Нова графіка
 STR_TRANSPARENCY_OPTIONS                                        :Опції прозорості
 STR_GAMEOPTMENU_0A                                              :
@@ -996,8 +996,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Збереження...,{}зачекайте поки завершиться!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Вибрати програму 'Дорожні теми'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Англійські(Оригінальні)
@@ -1772,42 +1772,42 @@
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Спочатку зруйнуйте дорогу
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Дорога ремонтується
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Будівництво дороги
-STR_1802_TRAMWAY_CONSTRUCTION                                   :{WHITE}Будівництво трамвайної колії
+STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Будівництво трамвайної колії
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Виберіть дорожний міст
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... односторонні дороги не можуть перетинатись
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Неможливо тут побудувати дорогу ...
-STR_1804_CAN_T_BUILD_TRAMWAY_HERE                               :{WHITE}Тут не можна побудувати трамвайну колію...
+STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Тут не можна побудувати трамвайну колію...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Неможливо прибрати дорогу звідси...
-STR_1805_CAN_T_REMOVE_TRAMWAY_FROM                              :{WHITE}Не можна прибрати трамвайну колію звідси...
+STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Не можна прибрати трамвайну колію звідси...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Орієнтація депо
-STR_1806_TRAM_DEPOT_ORIENTATION                                 :{WHITE}Орієнтація трамвайного депо
+STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Орієнтація трамвайного депо
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Неможливо будувати депо тут...
-STR_1807_CAN_T_BUILD_TRAM_VEHICLE                               :{WHITE}Тут не можна побудувати трамвайне депо...
+STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Тут не можна побудувати трамвайне депо...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Неможливо будувати зупинку тут...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Неможливо будувати вантажну станцію тут...
-STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION                     :{WHITE}Не можна побудувати пасажирську трамвайну станцію...
-STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION                         :{WHITE}Не можна побудувати вантажну трамвайну станцію...
+STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Не можна побудувати пасажирську трамвайну станцію...
+STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Не можна побудувати вантажну трамвайну станцію...
 STR_180A_ROAD_CONSTRUCTION                                      :Будувати дороги
-STR_180A_TRAMWAY_CONSTRUCTION                                   :Будівництво трамвайної колії
+STR_TRAMWAY_CONSTRUCTION                                        :Будівництво трамвайної колії
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Будувати дорогу
 STR_BUILD_AUTOROAD_TIP                                          :{BLACK}Будувати дорогу в режимі Автобудування
-STR_180B_BUILD_TRAMWAY_SECTION                                  :{BLACK}Будувати трамвайну колію
+STR_BUILD_TRAMWAY_SECTION                                       :{BLACK}Будувати трамвайну колію
 STR_BUILD_AUTOTRAM_TIP                                          :{BLACK}Будувати трамвайну лінію в режимі Автобудування
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Будувати автомобільне депо
-STR_180C_BUILD_TRAM_VEHICLE_DEPOT                               :{BLACK}Будувати трамвайне депо (для будівництва та обслуговування трамваїв)
+STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}Будувати трамвайне депо (для будівництва та обслуговування трамваїв)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Будувати зупинку
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Будувати вантажну станцію
-STR_180D_BUILD_PASSENGER_TRAM_STATION                           :{BLACK}Побудувати пасажирську трамвайну станцію
-STR_180E_BUILD_CARGO_TRAM_STATION                               :{BLACK}Побудувати вантажну трамвайну станцію
+STR_BUILD_PASSENGER_TRAM_STATION                                :{BLACK}Побудувати пасажирську трамвайну станцію
+STR_BUILD_CARGO_TRAM_STATION                                    :{BLACK}Побудувати вантажну трамвайну станцію
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Будувати міст
-STR_180F_BUILD_TRAMWAY_BRIDGE                                   :{BLACK}Побудувати трамвайний міст
+STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Побудувати трамвайний міст
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Будувати тунель
-STR_1810_BUILD_TRAMWAY_TUNNEL                                   :{BLACK}Побудувати трамвайний тунель
+STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Побудувати трамвайний тунель
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Вкл./відкл. односторонні дороги
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Будувати/зруйнувати дорогу
-STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                       :{BLACK}Будувати/демонтувати колію
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Будувати/демонтувати колію
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Виберіть направлення депо
-STR_1813_SELECT_TRAM_VEHICLE_DEPOT                              :{BLACK}Виберіть орієнтацію трамвайного депо
+STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Виберіть орієнтацію трамвайного депо
 STR_1814_ROAD                                                   :Дорога
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Дорога з вуличними ліхтарями
 STR_1816_TREE_LINED_ROAD                                        :Дорога з насадженнями
@@ -1950,8 +1950,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Граничить з іншою станцією
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Дуже багато станцій в цьому місті
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Дуже багато станцій
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Дуже багато зупинок
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Дуже багато вантажних станцій
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Дуже багато зупинок
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Дуже багато вантажних станцій
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Дуже близько до іншої станції
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Спочатку зруйнуйте залізничну станцію
@@ -1982,12 +1982,12 @@
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} тепер приймає {STRING} і {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Орієнтація зупинки
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Орієнтація станції
-STR_3042_PASSENGER_TRAM_STATION_ORIENTATION                     :{WHITE}Орієнтація пасажирської трамвайної станції
-STR_3043_CARGO_TRAM_STATION_ORIENT                              :{WHITE}Орієнтація вантажної трамвайної станції
+STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Орієнтація пасажирської трамвайної станції
+STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Орієнтація вантажної трамвайної станції
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Спочатку зруйнуйте зупинку
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Спочатку зруйнуйте вантажну станцію
-STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION                   :{WHITE}Спочатку треба знести пасажирську трамвайну станцію
-STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION                       :{WHITE}Спочатку треба знести вантажну трамвайну станцію
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Спочатку треба знести пасажирську трамвайну станцію
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Спочатку треба знести вантажну трамвайну станцію
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} станці{P я ї й}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- нема -
@@ -1999,8 +1999,8 @@
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Виберіть довжину залізничної станції
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Виберіть орієнтацію зупинки
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Виберіть орієнтацію вантажної станції
-STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION              :{BLACK}Виберіть орієнтацію пасажирської трамвайної станції
-STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION                  :{BLACK}Виберіть орієнтацію вантажної трамвайної станції
+STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Виберіть орієнтацію пасажирської трамвайної станції
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Виберіть орієнтацію вантажної трамвайної станції
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Показати станцію в центрі екрану
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Показати рейтинг станції
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Перейменувати станцію
@@ -2022,7 +2022,7 @@
 STR_3069_BUOY                                                   :Бакен
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...бакен на шляху
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...станція занадто велика
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...неоднорідні станції відключені
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...неоднорідні станції відключені
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Утримуйте CTRL для вибору більш ніж одного пункту
 
 STR_UNDEFINED                                                   :(невизначено)
@@ -2063,7 +2063,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Виберіть новий тип гри
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Виберіть сценарій (зелений), встановлена гра (синій), або випадкова нова гра
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Генерувати випадкову нову гру
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Завантажити ландшафт
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Завантажити ландшафт
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} на шляху
@@ -2304,10 +2304,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Економіка: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Поїзди розвертаються: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Стихійні лиха/катастрофи: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Відношення влади до перебудови території міста: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Відношення влади до перебудови території міста: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Нема
+STR_NONE                                                        :Нема
 STR_NUM_VERY_LOW                                                :дуже мало
 STR_6816_LOW                                                    :МалО
 STR_6817_NORMAL                                                 :Нормально
@@ -2345,9 +2345,9 @@
 STR_6836_OFF                                                    :ВиКл
 STR_6837_ON                                                     :Вкл
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Показати таблицю рекордів
-STR_6839_PERMISSIVE                                             :Допустиме
-STR_683A_TOLERANT                                               :Терпиме
-STR_683B_HOSTILE                                                :Вороже
+STR_PERMISSIVE                                                  :Допустиме
+STR_TOLERANT                                                    :Терпиме
+STR_HOSTILE                                                     :Вороже
 
 ##id 0x7000
 STR_7000                                                        :
@@ -2484,7 +2484,7 @@
 STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Неможливо продати 25% акцій цієї компанії...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% у власності {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} викуплено {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Ця компанія поки ще не продається...
+STR_PROTECTED                                                   :{WHITE}Ця компанія поки ще не продається...
 
 STR_LIVERY_DEFAULT                                              :Стандартний колір
 STR_LIVERY_STEAM                                                :Паровози
@@ -2791,17 +2791,17 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING}{STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}{STRING}
 STR_8806_GO_TO                                                  :Прямувати до {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Прямувати до {STATION} (Пересадити і забрати вантаж)
-STR_8808_GO_TO_UNLOAD                                           :Прямувати до {STATION} (розвантажитися)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Прямувати до {STATION} (Пересадити і залишити вантаж)
-STR_880A_GO_TO_LOAD                                             :Прямувати до {STATION} (Завантажитися)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Прямувати до {STATION} (Пересадити і завантажити повністю)
-STR_880C_GO_NON_STOP_TO                                         :Прямувати без зупинок до {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Прямувати без зупинок до {STATION} (Пересадити і забрати вантаж)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Прямувати без зупинок до {STATION} (розвантажитися)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Прямувати без зупинок до {STATION} (Пересадити і залишити вантаж)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Прямувати без зупинок до {STATION} (Завантажити)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Прямувати без зупинок до {STATION} (Пересадити і завантажити повністю)
+STR_GO_TO_TRANSFER                                              :Прямувати до {STATION} (Пересадити і забрати вантаж)
+STR_8807_GO_TO_UNLOAD                                           :Прямувати до {STATION} (розвантажитися)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Прямувати до {STATION} (Пересадити і залишити вантаж)
+STR_8808_GO_TO_LOAD                                             :Прямувати до {STATION} (Завантажитися)
+STR_GO_TO_TRANSFER_LOAD                                         :Прямувати до {STATION} (Пересадити і завантажити повністю)
+STR_880A_GO_NON_STOP_TO                                         :Прямувати без зупинок до {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Прямувати без зупинок до {STATION} (Пересадити і забрати вантаж)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Прямувати без зупинок до {STATION} (розвантажитися)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Прямувати без зупинок до {STATION} (Пересадити і залишити вантаж)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Прямувати без зупинок до {STATION} (Завантажити)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Прямувати без зупинок до {STATION} (Пересадити і завантажити повністю)
 STR_GO_TO_TRAIN_DEPOT                                           :Прямувати до {TOWN} депо
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Ремонтуватись в {TOWN} депо
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Прямувати без зупинок до {TOWN} депо
@@ -2905,7 +2905,7 @@
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Показати інформацію про вантаж
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Показати інформацію про вагони
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Показати місткість кожного вагону
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Показати загальну місткість поїзда, розділену за типом вантажу
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Показати загальну місткість поїзда, розділену за типом вантажу
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Маршрутний лист - клікніть на завданні для його вибору. CTRL + клік показати станцію
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Пропустити поточний наказ, і виконувати наступний. CTRL + клік переходить до вибраного наказу
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Видалити виділене завдання
@@ -2936,8 +2936,8 @@
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Неможливо розвернути поїзд...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Перейменувати тип поїзду
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Неможливо перейменувати тип поїзду...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Наказати транспорту примусово відвантажити вантаж
-STR_886F_TRANSFER                                               :{BLACK}Пересадка
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Наказати транспорту примусово відвантажити вантаж
+STR_TRANSFER                                                    :{BLACK}Пересадка
 STR_CLEAR_TIME                                                  :{BLACK}Очистити час
 STR_RESET_LATENESS                                              :{BLACK}Очистити лічильник запізнення
 
@@ -3015,8 +3015,8 @@
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Назвати авто
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший автобус з'явився на {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Жителі святкують . . .{}Перша вантажівка з'явилася на {STATION}!
-STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший пасажирський трамвай прибув на {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM                          :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший вантажний трамвай прибув на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший пасажирський трамвай прибув на {STATION}!
+STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший вантажний трамвай прибув на {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Аварія!{}Водій загинув при зіткненні авто з поїздом
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Аварія!{}{COMMA} загинуло при зіткненні авто з поїздом
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Неможливо розвернути авто...
@@ -3025,7 +3025,7 @@
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Перейменувати тип авто
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Перейменувати тип авто
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Неможливо перейменувати тип авто...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Їхати в {TOWN} депо
+STR_GO_TO_ROADVEH_DEPOT                                         :Їхати в {TOWN} депо
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Ремонтуватись в {TOWN} депо
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Переобладнати авто для перевезення інших вантажів
--- a/src/lang/unfinished/frisian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/unfinished/frisian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -216,17 +216,17 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Te folle nammen definearre
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Dizze namme wurd al brûkt
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 
 STR_013B_OWNED_BY                                               :{WHITE}...is fan {STRING}
 STR_013C_CARGO                                                  :{BLACK}Fracht
 STR_013D_INFORMATION                                            :{BLACK}Ynformaasje
 STR_013E_CAPACITIES                                             :{BLACK}Kapasiteit
-STR_013E_TOTAL_CARGO                                            :{BLACK}Totale Fracht
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Totale kapasiteit fan dizze trein:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CARGO                                                 :{BLACK}Totale Fracht
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Totale kapasiteit fan dizze trein:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Nei Spul
 STR_0141_LOAD_GAME                                              :{BLACK}Laad Spul
 
@@ -597,9 +597,9 @@
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Sla eigen reau ûntwerp nammen op
 
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Spul Opsjes
-STR_02C5_DIFFICULTY_SETTINGS                                    :Swierrichheid ynstellings
-STR_02C7_CONFIG_PATCHES                                         :Patches Ynstellings
+STR_02C4_GAME_OPTIONS                                           :Spul Opsjes
+STR_02C6_DIFFICULTY_SETTINGS                                    :Swierrichheid ynstellings
+STR_MENU_CONFIG_PATCHES                                         :Patches Ynstellings
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Stêd nammen sjen litte
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Stasjon nammen sjen litte
 STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Buordsjes sjen litte
@@ -678,8 +678,8 @@
 STR_032F_AUTOSAVE                                               :{RED}AUTOSAVE
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Selektear 'Ezy Street' musyk programma
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 ############ end of townname region
@@ -982,8 +982,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Ferbynt mear dan ien stasjon
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Te folle stasjons yn dizze stêd
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Te folle stasjons
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Te folle bushaltes
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Te folle frachtstasjons
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Te folle bushaltes
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Te folle frachtstasjons
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Te ticht by in oar stasjon
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Treinspoar moat earst fuorthelle wurde
@@ -1044,7 +1044,7 @@
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Kin triem net fuortsmite
 STR_4009_GAME_LOAD_FAILED                                       :{WHITE}Laden Mislearre{}{STRING}
 STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}List fan skiven, mappen en triemen
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Laad Hichtemap
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Laad Hichtemap
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} yn it paad
@@ -1136,7 +1136,7 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomy: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Gjin
+STR_NONE                                                        :Gjin
 STR_6816_LOW                                                    :Leech
 STR_6817_NORMAL                                                 :Gewoan
 STR_6818_HIGH                                                   :Heech
--- a/src/lang/unfinished/greek.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/unfinished/greek.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -271,9 +271,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Καθορίστηκαν πάρα πολλά ονόματα
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Το όνομα που διαλέξατε υπάρχει ήδη
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -284,11 +284,11 @@
 STR_013C_CARGO                                                  :{BLACK}Φορτίο
 STR_013D_INFORMATION                                            :{BLACK}Πληροφορίες
 STR_013E_CAPACITIES                                             :{BLACK}Χωρητικότητες
-STR_013E_TOTAL_CARGO                                            :{BLACK}Συνολικό Φορτίο
+STR_TOTAL_CARGO                                                 :{BLACK}Συνολικό Φορτίο
 STR_013F_CAPACITY                                               :{BLACK}Χωρητικότητα: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Χωριτηκότητα: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Συνολική χωρητικότητα φορτίου του τραίνου:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Συνολική χωρητικότητα φορτίου του τραίνου:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Νέο Παιχνίδι
 STR_0141_LOAD_GAME                                              :{BLACK}Φόρτωση Παιχνιδιού
@@ -722,7 +722,7 @@
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Πλήρης διαγραφή πόλεως
 STR_0292_SAVE_SCENARIO                                          :Απποθήκευση σεναρίου
 STR_0293_LOAD_SCENARIO                                          :Φόρτωση σεναρίου
-STR_LOAD_HEIGHTMAP                                              :Φόρτωση heightmap
+STR_MENU_LOAD_HEIGHTMAP                                         :Φόρτωση heightmap
 STR_0294_QUIT_EDITOR                                            :Έξοδος από το πρόγραμμα επεξεργασίας
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Έξοδος
@@ -761,9 +761,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Επιλογές παιχνιδιού
-STR_02C5_DIFFICULTY_SETTINGS                                    :Ρυθμίσεις δυσκολίας
-STR_02C7_CONFIG_PATCHES                                         :Ρύθμιση διορθώσεων
+STR_02C4_GAME_OPTIONS                                           :Επιλογές παιχνιδιού
+STR_02C6_DIFFICULTY_SETTINGS                                    :Ρυθμίσεις δυσκολίας
+STR_MENU_CONFIG_PATCHES                                         :Ρύθμιση διορθώσεων
 STR_NEWGRF_SETTINGS                                             :Ρυθμίσεις NewGRF
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Ονόματα πόλεων που εμφανίζονται
@@ -861,8 +861,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Η αποθήκευση είναι σε εξέλιξη,{}παρακαλώ περιμένετε να τελειώσει!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Επιλογή προγράμματος 'Ezy Street στυλ μουσικής'
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Αγγλικά (Αυθεντικά)
@@ -1460,8 +1460,8 @@
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Γειτονεύει με περισσότερες από μια υπάρχουσες περιοχές σταθμών/φόρτωσης
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Πάρα πολλές περιοχές σταθμών/φόρτωσης σε αυτή την πόλη
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Πάρα πολλές περιοχές σταθμών/φόρτωσης
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Πάρα πολλές στάσεις λεωφορείου
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Πάρα πολλοί σταθμοί φορτηγών
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Πάρα πολλές στάσεις λεωφορείου
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Πάρα πολλοί σταθμοί φορτηγών
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Πολύ κοντά σε μιά άλλη περιοχή σταθμού/φόρτωσης
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Πρέπει να κατεδαφιστεί ο σιδηροδρομικός σταθμός πρώτα
@@ -1525,7 +1525,7 @@
 STR_3069_BUOY                                                   :Σημαδούρα
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...σημαδούρα στη μέση
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...ο σταθμός είναι υπερβολικά απλωμένος
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ανομοιόμορφοι σταθμοί απενεργοποιημένοι
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ανομοιόμορφοι σταθμοί απενεργοποιημένοι
 
 
 ##id 0x3800
@@ -1556,7 +1556,7 @@
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Επιλογή Τύπου Νέου Παιχνιδιού
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Επιλογή σεναρίου (πράσινο), προεπιλεγμένου παιχνιδιού (μπλε), ή τυχαίου νέου παιχνιδιού
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Δημιουργία τυχαίου νέου παιχνιδιού
-STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Φόρτωση Heightmap
+STR_LOAD_HEIGHTMAP                                              :{WHITE}Φόρτωση Heightmap
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} στη μέση
@@ -1707,10 +1707,10 @@
 STR_6813_ECONOMY                                                :{LTBLUE}Οικονομικά: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Περιστροφή τρένων: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Καταστροφές: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL                                         :{LTBLUE}Θέση δημαρχιακού συμβουλίου σχετικά με την αναδόμηση της πόλης: {ORANGE}{STRING}
+STR_CITY_APPROVAL                                               :{LTBLUE}Θέση δημαρχιακού συμβουλίου σχετικά με την αναδόμηση της πόλης: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
-STR_26816_NONE                                                  :Κανένα
+STR_NONE                                                        :Κανένα
 STR_6816_LOW                                                    :Χαμηλό
 STR_6817_NORMAL                                                 :Κανονικό
 STR_6818_HIGH                                                   :Υψηλό
@@ -1746,9 +1746,9 @@
 STR_6836_OFF                                                    :Ανενεργό
 STR_6837_ON                                                     :Ενεργό
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Εμφάνιση γραφήματος καλύτεων βαθμολογιών
-STR_6839_PERMISSIVE                                             :Ανεκτικό
-STR_683A_TOLERANT                                               :Υπομονετικό
-STR_683B_HOSTILE                                                :Εχθρικό
+STR_PERMISSIVE                                                  :Ανεκτικό
+STR_TOLERANT                                                    :Υπομονετικό
+STR_HOSTILE                                                     :Εχθρικό
 
 ##id 0x7000
 STR_7000                                                        :
@@ -1869,7 +1869,7 @@
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% είναι ιδιοκτησία της {COMPANY})
 STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% είναι ιδιοκτησία της εταιρείας {COMPANY}{}   {COMMA}% ιδιοκτησία της {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}Η {COMPANY} εξαγοράστηκε από την {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}Αυτή η εταιρεία δεν είναι αρκετά ώριμη για συναλλαγή μετοχών ακόμα...
+STR_PROTECTED                                                   :{WHITE}Αυτή η εταιρεία δεν είναι αρκετά ώριμη για συναλλαγή μετοχών ακόμα...
 
 
 
--- a/src/lang/unfinished/latvian.txt	Sun Jan 27 17:32:12 2008 +0000
+++ b/src/lang/unfinished/latvian.txt	Sun Jan 27 17:34:08 2008 +0000
@@ -274,9 +274,9 @@
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Define'ti pa'ra'k daudz nosaukumi
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Izve'le'tais nosaukums jau tiek lietots
 
-STR_0133_WINDOWS                                                :Windows
-STR_0134_UNIX                                                   :Unix
-STR_0135_OSX                                                    :OS X
+STR_OSNAME_WINDOWS                                              :Windows
+STR_OSNAME_UNIX                                                 :Unix
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -287,11 +287,11 @@
 STR_013C_CARGO                                                  :{BLACK}Krava
 STR_013D_INFORMATION                                            :{BLACK}Informa'cija
 STR_013E_CAPACITIES                                             :{BLACK}Ietilpi'ba
-STR_013E_TOTAL_CARGO                                            :{BLACK}Krava kopa'
+STR_TOTAL_CARGO                                                 :{BLACK}Krava kopa'
 STR_013F_CAPACITY                                               :{BLACK}Ietilpi'ba: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Ietilpība: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Kope'ja' vilciena kravas ietilpi'ba:
-STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Kope'ja' vilciena kravas ietilpi'ba:
+STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Jauna spe'le
 STR_0141_LOAD_GAME                                              :{BLACK}Iela'de't spe'li
@@ -758,9 +758,9 @@
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C3_GAME_OPTIONS                                           :Spe'les rez'i'mi
-STR_02C5_DIFFICULTY_SETTINGS                                    :Gru'ti'bas paka'pes
-STR_02C7_CONFIG_PATCHES                                         :Konfigure't labojumus (pac'us)
+STR_02C4_GAME_OPTIONS                                           :Spe'les rez'i'mi
+STR_02C6_DIFFICULTY_SETTINGS                                    :Gru'ti'bas paka'pes
+STR_MENU_CONFIG_PATCHES                                         :Konfigure't labojumus (pac'us)
 STR_NEWGRF_SETTINGS                                             :Newgrf rez'i'mi
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Ra'di't pilse'tu nosaukumus
@@ -858,8 +858,8 @@
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Notiek saglabas'ana,{}lu'dzu uzgaidiet!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}izve'lies 'Ez'u Ielas muzikas stila' programmu
 
-STR_0335_6                                                      :{BLACK}6
-STR_0336_7                                                      :{BLACK}7
+STR_6                                                           :{BLACK}6
+STR_7                                                           :{BLACK}7
 
 ############ start of townname region
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglijas (orig'ina'lie)
@@ -1468,8 +1468,8 @@
 STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}Pārāk tuvu citai dzelzceļa stacijai
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Pārāk daudz staciju/iekrašanas zonu šajā pilsētā
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Pārāk daudz stacijas/iekraušanas zonas
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Pa'ra'k daudz autobusa pieturu
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}pa'ra'k daudz kravas auto staciju
+STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Pa'ra'k daudz autobusa pieturu
+STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}pa'ra'k daudz kravas auto staciju
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Pārāk tuvu citai stacijai/iekraušanas zonai
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Jānojauc dzelzsceļa stacija vispirms
@@ -1523,7 +1523,7 @@
 STR_3062_BUS_STATION                                            :Autoosta
 STR_3063_SHIP_DOCK                                              :Osta
 STR_3068_DOCK                                                   :{WHITE}Osta
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...neregula'ras stacijas nav atl'autas
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...neregula'ras stacijas nav atl'autas
 
 STR_UNDEFINED                                                   :(nedefinēta rinda)
 
@@ -1676,7 +1676,7 @@
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrots!
 STR_7065                                                        :{BLACK}{TINYFONT}{STRING}
 STR_COMPANY_PASSWORD                                            :{BLACK}Parole
-STR_7080_PROTECTED                                              :{WHITE}S'i' kompa'nija ir pa'ra'k jauna lai tirgotu akcijas...
+STR_PROTECTED                                                   :{WHITE}S'i' kompa'nija ir pa'ra'k jauna lai tirgotu akcijas...
 
 
 
@@ -1780,17 +1780,17 @@
 ##id 0x8800
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
-STR_8807_GO_TO_TRANSFER                                         :Uz {STATION} (Pa'rvest un pan'emt kravu)
-STR_8808_GO_TO_UNLOAD                                           :Uz {STATION} (Nokraut)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Uz {STATION} (Pa'rvest un atsta't tuks'u)
-STR_880A_GO_TO_LOAD                                             :Uz {STATION} (Piekraut)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Go to {STATION} (Pa'rvest un gaidi't pilnu kravu)
-STR_880C_GO_NON_STOP_TO                                         :Bez pieturam uz {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Bez pieturam uz {STATION} (Pa'rvest un pan'emt kravu)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Bez pieturam uz {STATION} (Nokraut)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Bez pieturam uz {STATION} (Pa'rvest un atsta't tuks'u)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Bez pieturam uz {STATION} (Piekraut)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Bez pieturam uz {STATION} (Pa'rvest un gaidi't pilnu kravu)
+STR_GO_TO_TRANSFER                                              :Uz {STATION} (Pa'rvest un pan'emt kravu)
+STR_8807_GO_TO_UNLOAD                                           :Uz {STATION} (Nokraut)
+STR_GO_TO_TRANSFER_UNLOAD                                       :Uz {STATION} (Pa'rvest un atsta't tuks'u)
+STR_8808_GO_TO_LOAD                                             :Uz {STATION} (Piekraut)
+STR_GO_TO_TRANSFER_LOAD                                         :Go to {STATION} (Pa'rvest un gaidi't pilnu kravu)
+STR_880A_GO_NON_STOP_TO                                         :Bez pieturam uz {STATION}
+STR_GO_TO_NON_STOP_TRANSFER                                     :Bez pieturam uz {STATION} (Pa'rvest un pan'emt kravu)
+STR_880B_GO_NON_STOP_TO_UNLOAD                                  :Bez pieturam uz {STATION} (Nokraut)
+STR_GO_TO_NON_STOP_TRANSFER_UNLOAD                              :Bez pieturam uz {STATION} (Pa'rvest un atsta't tuks'u)
+STR_880C_GO_NON_STOP_TO_LOAD                                    :Bez pieturam uz {STATION} (Piekraut)
+STR_GO_TO_NON_STOP_TRANSFER_LOAD                                :Bez pieturam uz {STATION} (Pa'rvest un gaidi't pilnu kravu)
 STR_GO_TO_TRAIN_DEPOT                                           :Uz {TOWN} Vilcienu Depo
 
 
@@ -1808,8 +1808,8 @@
 
 STR_8865_NAME_TRAIN                                             :{WHITE}Nosaukt vilcienu
 STR_8867_NAME_TRAIN                                             :{BLACK}Nosaukt vilcienu
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Uzsve'rtai pa'velei spiest tansportli'dzekl'im nomest kravu
-STR_886F_TRANSFER                                               :{BLACK}Tranzi'ts
+STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Uzsve'rtai pa'velei spiest tansportli'dzekl'im nomest kravu
+STR_TRANSFER                                                    :{BLACK}Tranzi'ts
 
 
 
@@ -1821,7 +1821,7 @@
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Atrums: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
 
 STR_9034_RENAME                                                 :{BLACK}Pârsaukt
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Dodas uz {TOWN} ceļa mašīnu depo
+STR_GO_TO_ROADVEH_DEPOT                                         :Dodas uz {TOWN} ceļa mašīnu depo
 
 
 ##id 0x9800