(svn r13820) -Update: WebTranslator2 update to 2008-07-25 00:59:06
authormiham
Thu, 24 Jul 2008 22:59:29 +0000
changeset 9708 1b0c04ba1d9a
parent 9707 55728bd4d33e
child 9709 fc8c47cbfcf2
(svn r13820) -Update: WebTranslator2 update to 2008-07-25 00:59:06
brazilian_portuguese - 3 fixed by tucalipe (3)
catalan - 10 fixed by arnaullv (10)
czech - 12 fixed, 3 changed by Hadez (15)
danish - 21 fixed by ThomasA (21)
dutch - 16 fixed by habell (16)
estonian - 37 fixed by kristjans (37)
french - 19 fixed by glx (19)
italian - 19 fixed by lorenzodv (19)
korean - 10 fixed by leejaeuk5 (10)
simplified_chinese - 97 fixed, 17 changed by ww9980 (114)
slovak - 87 fixed by lengyel (87)
spanish - 10 fixed by eusebio (10)
ukrainian - 2 fixed by mad (2)
src/lang/brazilian_portuguese.txt
src/lang/catalan.txt
src/lang/czech.txt
src/lang/danish.txt
src/lang/dutch.txt
src/lang/estonian.txt
src/lang/french.txt
src/lang/italian.txt
src/lang/korean.txt
src/lang/simplified_chinese.txt
src/lang/slovak.txt
src/lang/spanish.txt
src/lang/ukrainian.txt
--- a/src/lang/brazilian_portuguese.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/brazilian_portuguese.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -1384,6 +1384,10 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes ligados / max. clientes{}Empresas ligados / max, empresas
+
+
+
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAÇÃO DO JOGO
 STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
@@ -2738,9 +2742,11 @@
 STR_CONDITIONAL_NUM                                             :Saltar para a ordem {COMMA} quando {STRING} {STRING} {COMMA}
 STR_CONDITIONAL_TRUE_FALSE                                      :Saltar para a ordem {COMMA} quando {STRING} {STRING}
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Não viajar
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Viajar (não progamado)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}Viajar para {STRING}
 STR_TIMETABLE_STAY_FOR                                          :e ficar durante {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viajar por {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} dia{P "" s}
 STR_TIMETABLE_TICKS                                             :{COMMA} tique{P "" s}
 
@@ -3198,6 +3204,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Arquivo(s) GRF faltantes
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Despausar pode travar OpenTTD. Não envie relatórios de erros sobre travas subseqüentes.{}Você realmente quer despausar?
 
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Jogo foi salvo numa versão sem suporte a bondes. Todos os bondes foram removidos.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda Modificada
--- a/src/lang/catalan.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/catalan.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -1383,6 +1383,17 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en línia / clients màxim
+
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Mida del Mapa
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Mida del mapa del joc{}Clica per ordenar l'àrea
+
+STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
+STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Data actual
+
+STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Anys
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nombre d'anys{}el joc està corrent
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMACIÓ DEL JOC
 STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
@@ -2737,9 +2748,11 @@
 STR_CONDITIONAL_NUM                                             :Salta a l'ordre {COMMA} quan {STRING} {STRING} {COMMA}
 STR_CONDITIONAL_TRUE_FALSE                                      :Salta a l'ordre {COMMA} quan {STRING} {STRING}
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Sense viatge
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Viatge (fora d'horari)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}Viatge a {STRING}
 STR_TIMETABLE_STAY_FOR                                          :i estigues {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :i viatge per {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} di{P a es}
 STR_TIMETABLE_TICKS                                             :{COMMA} mar{P ca ques}
 
@@ -3197,6 +3210,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Falten arxiu(s) GRF
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Treure la pausa pot provocar fallades d'OpenTTD. No informis d'errors a causa de fallades subseqüents.{}Estàs segur de voler treure la pausa?
 
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}El joc s'ha desat en una versió sense suport de tramvies. Tots els tramvies s'han eliminat.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalitzada
--- a/src/lang/czech.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/czech.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -1441,6 +1441,17 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Hráčů
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Hráčů online / maximálně
+
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Rozměry mapy
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Rozměry mapy ve hře{}Kliknutím hry seřadíš podle plochy
+
+STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
+STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Aktuální datum
+
+STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Roků
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Počet let,{}po které už hra běží
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HŘE
 STR_NETWORK_CLIENTS                                             :{SILVER}Klientů:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk:  {WHITE}{STRING}
@@ -2905,7 +2916,7 @@
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Jízdní řád - příkaz vybereš kliknutím.
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Změnit čas pro splnění jízdního příkazu
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Zrušit čas pro splnění jízdního příkazu
-STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Smazat ukazatel zpoždění, takže vozidlo pojede na čas
+STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Smazat zpoždění, takže vozidlo pojede na čas
 STR_SERVICE_HINT                                                :{BLACK}Přeskoč tento cíl, pokud není potřeba pravidelná údržba
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Hmotnost: {WEIGHT_S}{}Rychlost: {VELOCITY}  Výkon: {POWER}{}Cena provozu: {CURRENCY} ročně{}Kapacita: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Porucha
@@ -2926,7 +2937,7 @@
 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_CLEAR_TIME                                                  :{BLACK}Smazat čas
-STR_RESET_LATENESS                                              :{BLACK}Smazat ukazatel zpoždění
+STR_RESET_LATENESS                                              :{BLACK}Zapomenout zpoždění
 
 STR_TRAIN_STOPPING                                              :{RED}Zastavuje
 STR_TRAIN_STOPPING_VEL                                          :{RED}Zastavuje, {VELOCITY}
@@ -2958,7 +2969,7 @@
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} silniční{P "" "" ch} vozid{P lo la el}
 STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Garáže pro silniční vozidla {TOWN}
-STR_9004_NEW_VEHICLES                                           :{BLACK}Nová silniční vozidla
+STR_9004_NEW_VEHICLES                                           :{BLACK}Nová vozidla
 STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}Nová silniční vozidla
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Koupit silniční vozidlo
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nemohu koupit nové silniční vozidlo...
@@ -3020,6 +3031,9 @@
 STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vyber typ nákladu, který má vozidlo převážet
 
 ##id 0x9800
+STR_9800_WATERWAYS_CONSTRUCTION                                 :Výstavba vodních kanálů
+STR_9801_WATERWAYS_CONSTRUCTION                                 :{WHITE}Výstavba vodních kanálů
+STR_9801_WATERWAYS_CONSTRUCTION_SE                              :{WHITE}Vodní kanály
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Zde nelze postavit přístav...
 STR_9803_SHIP_DEPOT                                             :{WHITE}Lodní depo {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Nové lodě
@@ -3257,6 +3271,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Chybějící grafické soubory
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Spuštění hry může shodit OpenTTD. Nehlaš chybu kvůli pádům způsobeným touto akcí.{}Opravdu chceš rozjet hru?
 
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Hra byla uložena ve verzi bez podpory tramvají. Všechny tramvaje se odstraní.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastní měna
--- a/src/lang/danish.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/danish.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -486,6 +486,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Pris for at rydde: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
 STR_01A7_OWNER                                                  :{BLACK}Ejer: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Ejer af vej: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Ejer af sporvej: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Ejer af jernbane: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Lokal myndighed: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Ingen
 STR_01AA_NAME                                                   :{BLACK}Navn
@@ -1054,6 +1057,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Fly-hastighedsfaktor: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Tillad gennemkørsels-stop på veje ejet af en by: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Tillad bygning af tilstødende stationer: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Muliggør flere NewGRF køretøjssæt: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Tillad altid små lufthavne: {ORANGE}{STRING}
 
@@ -1287,6 +1291,9 @@
 STR_BUILD_LOCKS_TIP                                             :{BLACK}Byg sluser
 STR_LANDINFO_LOCK                                               :Sluse
 
+STR_CANT_PLACE_RIVERS                                           :{WHITE}Kan ikke placere floder her...
+STR_LANDINFO_RIVER                                              :Flod
+
 STR_BUOY_IS_IN_USE                                              :{WHITE}... bøjen er i brug!
 
 STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
@@ -1376,6 +1383,10 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter online / maks. klienter{}Selskaber online / maks. selskaber
+
+
+
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPIL INFO
 STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Sprog:  {WHITE}{STRING}
@@ -1712,6 +1723,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Vej med vejtræer
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Værksted
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Jernbaneoverskæring
+STR_TRAMWAY                                                     :Sporvej
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Kan ikke fjerne rutebilstation...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Kan ikke fjerne fragtcentral...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Kan ikke fjerne passager-sporvognsstation
@@ -1937,6 +1949,7 @@
 STR_3804_WATER                                                  :Vand
 STR_3805_COAST_OR_RIVERBANK                                     :Kyst eller flodbred
 STR_3806_SHIP_DEPOT                                             :Skibsdok
+STR_AQUEDUCT                                                    :Akvædukt
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...kan ikke bygge på vand
 STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanal må fjernes først
 
@@ -2656,14 +2669,17 @@
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tog i vejen
 STR_8804                                                        :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
+STR_ORDER_NON_STOP                                              :{BLACK}Uden stop
 STR_ORDER_GO_TO                                                 :Gå til
 STR_ORDER_GO_NON_STOP_TO                                        :Gå uden stop til
 STR_ORDER_GO_VIA                                                :Gå via
 STR_ORDER_GO_NON_STOP_VIA                                       :Gå uden stop via
+STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Fuld last af hvilken som helst type
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Åbn hvis tilgængelig
 STR_ORDER_DROP_FULL_LOAD_ALL                                    :Fuld last af alt gods
 STR_ORDER_DROP_FULL_LOAD_ANY                                    :Fuld last af hvilket som helst gods
 STR_ORDER_DROP_NO_LOADING                                       :Ingen lastning
+STR_ORDER_TOGGLE_UNLOAD                                         :{BLACK}Los alt
 STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Los hvis gods accepteres
 STR_ORDER_DROP_UNLOAD                                           :Aflæs alt
 STR_ORDER_DROP_TRANSFER                                         :Overfør
@@ -2944,6 +2960,9 @@
 STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg lasttype som lastbilen skal transportere
 
 ##id 0x9800
+STR_9800_WATERWAYS_CONSTRUCTION                                 :Bygning af vandveje
+STR_9801_WATERWAYS_CONSTRUCTION                                 :{WHITE}Bygning af vandveje
+STR_9801_WATERWAYS_CONSTRUCTION_SE                              :{WHITE}Vandveje
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan ikke bygge en havn her...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} skibsdok
 STR_9804_NEW_SHIPS                                              :{BLACK}Nye skibe
@@ -2996,6 +3015,8 @@
 STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første skib ankommer til {STATION}!
 STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Positionsbøje, kan bruges som yderligere navigationspunkt
 STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Kan ikke placere en bøje her...
+STR_BUILD_AQUEDUCT                                              :{BLACK}Byg akvædukt
+STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kan ikke bygge akvædukt her...
 STR_9836_RENAME                                                 :{BLACK}Omdøb
 STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Omdøb skibstypen
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Omdøb skibstypen
@@ -3148,6 +3169,7 @@
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{STRING} kræver OpenTTD version {STRING} eller højere.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF filen, som den er lavet til at oversætte,
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :For mange NewGRF sæt er indlæst.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Indlæsning af {STRING} som statisk NewGRF med {STRING} kan forårsage de-sykronisering.
 
 STR_NEWGRF_ADD                                                  :{BLACK}Tilføj
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Tilføj et NewGRF sæt til listen
@@ -3180,6 +3202,8 @@
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}OpenTTD kan gå ned, når spillet sættes i gang igen. Undlad at indsende fejlrapporter for efterfølgende nedbrud.{}Vil du virkelig sætte spillet i gang igen?
 
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spillet er gemt i en version uden sporveje. Alle sporveje er blevet fjernet.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Brugerdefineret møntfod
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurs: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Tilskuer:
@@ -3546,4 +3570,7 @@
 ########
 
 ############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Tillad byer at fastsætte støjgrænser for lufthavne: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Støjgrænse i byen: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Genereret støj: {GOLD}{COMMA}
 ########
--- a/src/lang/dutch.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/dutch.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -1383,6 +1383,17 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Spelers
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Spelers online / spelers maximaal
+
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kaart grootte
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Kaart grootte van het spel{}Klik om te sorteren per gebied
+
+STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
+STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Huidige datum
+
+STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Jaren
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Aantal jaren{}het spel draait
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPEL INFORMATIE
 STR_NETWORK_CLIENTS                                             :{SILVER}Spelers:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Taal:  {WHITE}{STRING}
@@ -2737,9 +2748,11 @@
 STR_CONDITIONAL_NUM                                             :Spring naar order {COMMA} wanneer {STRING} {STRING} {COMMA}
 STR_CONDITIONAL_TRUE_FALSE                                      :Spring naar order {COMMA} wanneer {STRING} {STRING}
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Niet rijden
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Reis (geen dienstregeling)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}Reis naar {STRING}
 STR_TIMETABLE_STAY_FOR                                          :en blijf voor {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :en rijdt naar {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} dag{P "" en}
 STR_TIMETABLE_TICKS                                             :{COMMA} tik{P "" ken}
 
@@ -3167,6 +3180,12 @@
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Er zijn teveel NewGRFs geladen.
 STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Laden {STRING} als statisch NewGRF met {STRING} kan desyncs veroorzaken.
 
+STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Laad de geselecteerd voorkeursinstelling
+STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Bewaar voorkeursinstelling
+STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Bewaar de huidige lijst als voorkeursinstelling
+STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Kies een naam voor deze voorkeursinstelling
+STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Verwijder voorkeursinstelling
+STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Verwijder de geselecteerde voorkeursinstelling
 STR_NEWGRF_ADD                                                  :{BLACK}Toevoegen
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Voeg een NewGRF bestand toe aan te lijst
 STR_NEWGRF_REMOVE                                               :{BLACK}Verwijderen
@@ -3197,6 +3216,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Ontbrekende GRF bestand(en)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Pauze uit zetten kan OpenTTD laten vastlopen. Geef geen fout rapporten bij herhaaldelijk vastlopen.{}Weet je zeker dat je pauze wilt uit zetten?
 
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spel was opgeslagen in een versie zonder tram ondersteuning. Alle trams zijn verwijderd.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Aangepaste valuta
--- a/src/lang/estonian.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/estonian.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -540,6 +540,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Puhastustasu: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :puudub
 STR_01A7_OWNER                                                  :{BLACK}Omanik: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Maantee omanik: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Trammitee omanik: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Rongitee omanik: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Kohalik omavalitsus: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :puudub
 STR_01AA_NAME                                                   :{BLACK}Nimi
@@ -701,72 +704,39 @@
 STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Ehita linn suvalisse kohta
 STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Tööstuste loomine
 STR_0240_COAL_MINE                                              :{BLACK}Kivisöekaevandus
-STR_0240_COAL_MINE.in                                           :{BLACK}Kivisöekaevanduses
 STR_0241_POWER_STATION                                          :{BLACK}Elektrijaam
-STR_0241_POWER_STATION.in                                       :{BLACK}Elektrijaamas
 STR_0242_SAWMILL                                                :{BLACK}Saeveski
-STR_0242_SAWMILL.in                                             :{BLACK}Saeveskis
 STR_0243_FOREST                                                 :{BLACK}Mets
 STR_0244_OIL_REFINERY                                           :{BLACK}Naftarafineerimistehas
-STR_0244_OIL_REFINERY.in                                        :{BLACK}Naftarafineerimistehases
 STR_0245_OIL_RIG                                                :{BLACK}Naftapuurplatvorm
-STR_0245_OIL_RIG.in                                             :{BLACK}Naftapuurplatvormis
 STR_0246_FACTORY                                                :{BLACK}Tehas
-STR_0246_FACTORY.in                                             :{BLACK}Tehases
 STR_0247_STEEL_MILL                                             :{BLACK}Terasetööstus
-STR_0247_STEEL_MILL.in                                          :{BLACK}Terasetööstuses
 STR_0248_FARM                                                   :{BLACK}Põllumajandusettevõte
-STR_0248_FARM.in                                                :{BLACK}Põllumajandusettevõttes
 STR_0249_IRON_ORE_MINE                                          :{BLACK}Rauamaagikaevandus
-STR_0249_IRON_ORE_MINE.in                                       :{BLACK}Rauamaagikaevanduses
 STR_024A_OIL_WELLS                                              :{BLACK}Naftapuuraugud
-STR_024A_OIL_WELLS.in                                           :{BLACK}Naftapuuraukudes
 STR_024B_BANK                                                   :{BLACK}Pank
-STR_024B_BANK.in                                                :{BLACK}Pangas
 STR_024C_PAPER_MILL                                             :{BLACK}Paberitehas
-STR_024C_PAPER_MILL.in                                          :{BLACK}Paberitehases
 STR_024D_FOOD_PROCESSING_PLANT                                  :{BLACK}Toidutöötlustehas
-STR_024D_FOOD_PROCESSING_PLANT.in                               :{BLACK}Toidutöötlustehases
 STR_024E_PRINTING_WORKS                                         :{BLACK}Trükikoda
-STR_024E_PRINTING_WORKS.in                                      :{BLACK}Trükikojas
 STR_024F_GOLD_MINE                                              :{BLACK}Kullakaevandus
-STR_024F_GOLD_MINE.in                                           :{BLACK}Kullakaevanduses
 STR_0250_LUMBER_MILL                                            :{BLACK}Saeveski
-STR_0250_LUMBER_MILL.in                                         :{BLACK}Saeveskis
 STR_0251_FRUIT_PLANTATION                                       :{BLACK}Puuviljaistandus
-STR_0251_FRUIT_PLANTATION.in                                    :{BLACK}Puuviljaistanduses
 STR_0252_RUBBER_PLANTATION                                      :{BLACK}Kummipuuistandus
-STR_0252_RUBBER_PLANTATION.in                                   :{BLACK}Kummipuuistanduses
 STR_0253_WATER_SUPPLY                                           :{BLACK}Veepumbad
-STR_0253_WATER_SUPPLY.in                                        :{BLACK}Veepumpades
 STR_0254_WATER_TOWER                                            :{BLACK}Veetorn
-STR_0254_WATER_TOWER.in                                         :{BLACK}Veetornis
 STR_0255_DIAMOND_MINE                                           :{BLACK}Teemantikaevandus
-STR_0255_DIAMOND_MINE.in                                        :{BLACK}Teemantikaevanduses
 STR_0256_COPPER_ORE_MINE                                        :{BLACK}Vasemaagikaevandus
-STR_0256_COPPER_ORE_MINE.in                                     :{BLACK}Vasemaagikaevanduses
 STR_0257_COTTON_CANDY_FOREST                                    :{BLACK}Suhkruvatimets
-STR_0257_COTTON_CANDY_FOREST.in                                 :{BLACK}Suhkruvatimetsas
 STR_0258_CANDY_FACTORY                                          :{BLACK}Maiustuste tehas
-STR_0258_CANDY_FACTORY.in                                       :{BLACK}Maiustuste tehases
 STR_0259_BATTERY_FARM                                           :{BLACK}Patareitalu
-STR_0259_BATTERY_FARM.in                                        :{BLACK}Patareitalus
 STR_025A_COLA_WELLS                                             :{BLACK}Koolapumbad
-STR_025A_COLA_WELLS.in                                          :{BLACK}Koolapumpades
 STR_025B_TOY_SHOP                                               :{BLACK}Mänguasjapood
-STR_025B_TOY_SHOP.in                                            :{BLACK}Mänguasjapoes
 STR_025C_TOY_FACTORY                                            :{BLACK}Mänguasjatehas
-STR_025C_TOY_FACTORY.in                                         :{BLACK}Mänguasjatehases
 STR_025D_PLASTIC_FOUNTAINS                                      :{BLACK}Plastmassiallikad
-STR_025D_PLASTIC_FOUNTAINS.in                                   :{BLACK}Plastmassiallikates
 STR_025E_FIZZY_DRINK_FACTORY                                    :{BLACK}Kihisevate jookide tehas
-STR_025E_FIZZY_DRINK_FACTORY.in                                 :{BLACK}Kihisevate jookide tehases
 STR_025F_BUBBLE_GENERATOR                                       :{BLACK}Mulligeneraator
-STR_025F_BUBBLE_GENERATOR.in                                    :{BLACK}Mulligeneraatoris
 STR_0260_TOFFEE_QUARRY                                          :{BLACK}Iirisekaevandus
-STR_0260_TOFFEE_QUARRY.in                                       :{BLACK}Iirisekaevanduses
 STR_0261_SUGAR_MINE                                             :{BLACK}Suhkrukaevandus
-STR_0261_SUGAR_MINE.in                                          :{BLACK}Suhkrukaevanduses
 STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}Ehita kivisöekaevandus
 STR_0263_CONSTRUCT_POWER_STATION                                :{BLACK}Ehita elektrijaam
 STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}Ehita saeveski
@@ -946,6 +916,7 @@
 
 STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Uue tööstuse rahastamine
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_INT                                                    :{NUM}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...saab ehitada ainult linnadesse
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...saab ehitada ainult vihmametsadesse
@@ -1375,6 +1346,9 @@
 STR_BUILD_LOCKS_TIP                                             :{BLACK}Lüüsi ehitamine
 STR_LANDINFO_LOCK                                               :Lüüs
 
+STR_CANT_PLACE_RIVERS                                           :{WHITE}Jõgesid ei saa siia teha...
+STR_LANDINFO_RIVER                                              :Jõgi
+
 STR_BUOY_IS_IN_USE                                              :{WHITE}...poi on kasutusel!
 
 STR_LANDINFO_COORDS                                             :{BLACK}Koordinaadid: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
@@ -1464,6 +1438,17 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Kliendid
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Kliente sees / enim kliente{}Ettevõtteid sees / enim ettevõtteid
+
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kaardi suurus
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Mängu kaardisuurus{}Klõpsa pindala alusel järjestamiseks
+
+STR_NETWORK_DATE_CAPTION                                        :{BLACK}Kuupäev
+STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Kuupäev hetkel
+
+STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Aastaid
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Mitu aastat{}on mäng kestnud
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}MÄNGU ANDMED
 STR_NETWORK_CLIENTS                                             :{SILVER}Kliendid:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Keel:  {WHITE}{STRING}
@@ -1800,6 +1785,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Puiestee
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Depoo
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Raudteeületuskoht
+STR_TRAMWAY                                                     :Trammitee
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Siinset bussijaama ei saa lammutada...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Siinset laadimisplatsi ei saa lammutada...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Siinset reisitrammijaama ei saa lammutada...
@@ -1907,7 +1893,6 @@
 STR_INDUSTRY                                                    :{INDUSTRY}
 STR_TOWN                                                        :{TOWN}
 STR_INDUSTRY_FORMAT                                             :{TOWN} {STRING}
-STR_INDUSTRY_FORMAT.in                                          :{TOWN} {STRING.in}
 STR_STATION                                                     :{STATION}
 
 ##id 0x2800
@@ -2026,6 +2011,7 @@
 STR_3804_WATER                                                  :Vesi
 STR_3805_COAST_OR_RIVERBANK                                     :Kallas
 STR_3806_SHIP_DEPOT                                             :Laevaangaar
+STR_AQUEDUCT                                                    :Veejuhe
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...vette ei saa ehitada
 STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanali peab eelnevalt lammutama
 
@@ -2745,14 +2731,17 @@
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Rong on ees
 STR_8804                                                        :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
+STR_ORDER_NON_STOP                                              :{BLACK}Peatusteta
 STR_ORDER_GO_TO                                                 :Mine
 STR_ORDER_GO_NON_STOP_TO                                        :Mine peatumata
 STR_ORDER_GO_VIA                                                :Mine läbi
 STR_ORDER_GO_NON_STOP_VIA                                       :Mine peatumata läbi
+STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Laadi kõik kaubad täis
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Laadi, kui saadaval
 STR_ORDER_DROP_FULL_LOAD_ALL                                    :Laadi kõiki kaupu täis
 STR_ORDER_DROP_FULL_LOAD_ANY                                    :Laadi ühte kaupa täis
 STR_ORDER_DROP_NO_LOADING                                       :Mitte laadida
+STR_ORDER_TOGGLE_UNLOAD                                         :{BLACK}Laadi kõik maha
 STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Kui võetakse vastu, laadi maha
 STR_ORDER_DROP_UNLOAD                                           :Laadi kõik maha
 STR_ORDER_DROP_TRANSFER                                         :Laadi ümber
@@ -2814,9 +2803,11 @@
 STR_CONDITIONAL_NUM                                             :Mine sihtpunkti {COMMA}, kui {STRING} {STRING} {COMMA}
 STR_CONDITIONAL_TRUE_FALSE                                      :Mine sihtpunkti{COMMA}, kui {STRING} {STRING}
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Sõitu pole
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Sõitmine (sõiduplaanita)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}Sõida {STRING}
 STR_TIMETABLE_STAY_FOR                                          :ja oota {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :ja sõida {STRING} jaoks
 STR_TIMETABLE_DAYS                                              :{COMMA} päev{P "" a}
 STR_TIMETABLE_TICKS                                             :{COMMA} tiks{P "" u}
 
@@ -3033,6 +3024,9 @@
 STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali, millist tüüpi laadungit veovahend veab
 
 ##id 0x9800
+STR_9800_WATERWAYS_CONSTRUCTION                                 :Veeteede ehitus
+STR_9801_WATERWAYS_CONSTRUCTION                                 :{WHITE}Veeteede ehitus
+STR_9801_WATERWAYS_CONSTRUCTION_SE                              :{WHITE}Veeteed
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Siia ei saa sadamat ehitada
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Laevaangaar
 STR_9804_NEW_SHIPS                                              :{BLACK}Uus laev
@@ -3085,6 +3079,8 @@
 STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}{STATION} terminali saabus esimene laev!
 STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Raja teemärgisena kasutatav poi
 STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Poid ei saa siia asetada...
+STR_BUILD_AQUEDUCT                                              :{BLACK}Ehita veejuhe
+STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Siia ei saa veejuhet ehitada...
 STR_9836_RENAME                                                 :{BLACK}Nimevahetus
 STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Laeva tüübinime vahetamine
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Laeva tüübinime vahetamine
@@ -3237,7 +3233,14 @@
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{STRING} nõuab OpenTTD versiooni {STRING} või uuemat.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF fail, mis tehti tõlkimiseks,
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Liiga palju NewGRF-e on laaditud.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Laadides {STRING} staatilise NewGRF-na koos {STRING} võib põhjustada sünkrooni katkemist.
 
+STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Laadi valitud eelseadistused
+STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Salvesta eelseadistus
+STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Salvesta praegune loend eelseadistusena
+STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Sisesta eelseadistuse nimi
+STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Kustuta eelseadistus
+STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Kustuta aktiivne eelseadistus
 STR_NEWGRF_ADD                                                  :{BLACK}Lisa
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Lisa nimekirja NewGRF fail
 STR_NEWGRF_REMOVE                                               :{BLACK}Eemalda
@@ -3268,6 +3271,9 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Puuduolevad GRF failid
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Pausi lõpetamine võib põhjustada OpenTTD krahhi. Ära teavita järgnevatest krahhidest.{}Oled sa tõepoolest veendunud, et sa soovid pausi lõpetada?
 
+STR_NEWGRF_BROKEN                                               :{WHITE}NewGRF '{STRING}' käitumine põhjustab tõenäoliselt sünkrooni katkemisi ja/või mängu kokkujooksmiseid.
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Depoost väljas asudes muudab sõiduki '{1:ENGINE}' pikkust.
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Mäng salvestati trammide toetuseta versioonis. Kõik trammid eemaldati.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Isiklik valuuta
@@ -3636,4 +3642,7 @@
 ########
 
 ############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Luba linnades lennujaaamade mürapiirangud: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Mürapiirang linnas: {ORANGE}{COMMA}{BLACK}  suurim: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Tekitatud müra: {GOLD}{COMMA}
 ########
--- a/src/lang/french.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/french.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -863,6 +863,7 @@
 
 STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Financer une nouvelle industrie
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_INT                                                    :{NUM}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...peut seulement être construit en ville
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...peut seulement être construit en forêt tropicale
@@ -1384,6 +1385,17 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en ligne / clients max
+
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Taille
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Taille de la carte{}Cliquer pour trier par surface
+
+STR_NETWORK_DATE_CAPTION                                        :{BLACK}Date
+STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Date courante
+
+STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Années
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nombre d'années{}écoulées dans le jeu
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFOS SUR LE SERVEUR
 STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Langue:  {WHITE}{STRING}
@@ -2738,9 +2750,11 @@
 STR_CONDITIONAL_NUM                                             :Sauter à l'ordre {COMMA} quand {STRING} {STRING} {COMMA}
 STR_CONDITIONAL_TRUE_FALSE                                      :Sauter à l'ordre {COMMA} quand {STRING} {STRING}
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Pas de voyage
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Voyager (sans horaires)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}Voyager pendant {STRING}
 STR_TIMETABLE_STAY_FOR                                          :et rester pendant {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :and travel for {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} jour{P "" s}
 STR_TIMETABLE_TICKS                                             :{COMMA} tick{P "" s}
 
@@ -3168,6 +3182,12 @@
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Trop de NewGRFs sont chargés.
 STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Charger {STRING} comme NewGRF statique avec {STRING} peut provoquer des erreurs de synchronistation.
 
+STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Charger la liste sélectionnée
+STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Sauver la liste
+STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Sauver la liste courante
+STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Entrer un nom pour la liste
+STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Supprimer la liste
+STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Supprimer la liste sélectionnée
 STR_NEWGRF_ADD                                                  :{BLACK}Ajouter
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Ajouter un fichier NewGRF à la liste
 STR_NEWGRF_REMOVE                                               :{BLACK}Retirer
@@ -3198,6 +3218,10 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Fichier(s) GRF manquant(s)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Retirer la pause peut faire planter OpenTTD. Ne créez pas de rapport de bug pour ceux-ci.{}Voulez-vous vraiment retirer la pause?
 
+STR_NEWGRF_BROKEN                                               :{WHITE}Le comportement du NewGRF '{0:STRING}' peut causer des erreurs de synchronisation et/ou des plantages.
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Il modifie la longueur de vehicule pour '{1:ENGINE}' en dehors du dépot.
+STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Le train '{VEHICLE}' appartenant à '{COMPANY}' a une longueur invalide. Celà est probablement dû à des problèmes avec des NewGRFs. Le jeu peut avoir des erreurs de synchronisation ou planter.
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Partie sauvegardée avec une version sans support des tramways. Tous les tramways ont été supprimés.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Devise personnalisée
--- a/src/lang/italian.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/italian.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -864,6 +864,7 @@
 
 STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Finanzia nuova industria
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_INT                                                    :{NUM}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...può essere costruita solo in città
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...può essere costruita solo nella foresta pluviale
@@ -1385,6 +1386,17 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Client
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Client online / client max{}Compagnie online / compagnie max
+
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Dimensione mappa
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Dimensione della mappa in uso{}Fare clic per ordinare per area
+
+STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
+STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Data corrente
+
+STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Anni
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Numero di anni{}da cui la partita è in corso
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAZIONI PARTITA
 STR_NETWORK_CLIENTS                                             :{SILVER}Client:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Lingua:  {WHITE}{STRING}
@@ -2739,9 +2751,11 @@
 STR_CONDITIONAL_NUM                                             :Salta all'ordine {COMMA} se {STRING} {STRING} {COMMA}
 STR_CONDITIONAL_TRUE_FALSE                                      :Salta all'ordine {COMMA} se {STRING} {STRING}
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Nessun viaggio
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Viaggia senza orario
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}Viaggia per {STRING}
 STR_TIMETABLE_STAY_FOR                                          :e sosta per {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viaggia per {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} giorn{P o i}
 STR_TIMETABLE_TICKS                                             :{COMMA} tick
 
@@ -3169,6 +3183,12 @@
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Troppi file NewGRF caricati.
 STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Caricare {STRING} come NewGRF statico insieme a {STRING} può causare errori di sincronizzazione
 
+STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Carica il profilo selezionato
+STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Salva profilo
+STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Salva la lista corrente in un profilo
+STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Inserire il nome del profilo
+STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Elimina profilo
+STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Elimina il profilo attualmente selezionato
 STR_NEWGRF_ADD                                                  :{BLACK}Aggiungi
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Aggiunge un file NewGRF all'elenco
 STR_NEWGRF_REMOVE                                               :{BLACK}Rimuovi
@@ -3199,6 +3219,10 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}File GRF mancanti
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Uscire dalla pausa può causare un crash: nel caso, si prega di non inviare segnalazioni bug al riguardo.{}Uscire dalla pausa?
 
+STR_NEWGRF_BROKEN                                               :{WHITE}Le caratteristiche del NewGRF '{0:STRING}' possono causare errori di sincronizzazione e/o crash.
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}La lunghezza dei veicoli  '{1:ENGINE}' può cambiare al di fuori dei depositi.
+STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Il treno '{VEHICLE}' della '{COMPANY}' ha una lunghezza non valida, probabilmente a causa di problemi con un NewGRF. È possibile che si verifichino errori di sincronizzazione o crash.
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}La partita è stata salvata in una versione senza il supporto per i tram. Tutte le tranvie sono state rimosse.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Valuta personalizzata
--- a/src/lang/korean.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/korean.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -1383,6 +1383,17 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}클라이언트
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}클라이언트 온라인 / 최대 접속자수{}회사 온라인 / 최대 회사수
+
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}맵 크기
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}게임의 맵 사이즈{}크기별로 정렬하려면 클릭
+
+STR_NETWORK_DATE_CAPTION                                        :{BLACK}날짜
+STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}현재 날짜
+
+STR_NETWORK_YEARS_CAPTION                                       :{BLACK}연도
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}게임이 진행중인 연도 수
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}게임 정보
 STR_NETWORK_CLIENTS                                             :{SILVER}클라이언트:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}언어:  {WHITE}{STRING}
@@ -2737,9 +2748,11 @@
 STR_CONDITIONAL_NUM                                             :[조건 경로] {COMMA}번째 경로로 건너뛰기 ({STRING} {STRING} {COMMA} 일때)
 STR_CONDITIONAL_TRUE_FALSE                                      :[조건 경로] {COMMA}번째 경로로 건너뛰기 ({STRING} {STRING})
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}운행정보 없음
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}여행 (시간표 없음)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}{STRING}로 여행
 STR_TIMETABLE_STAY_FOR                                          :그리고 {STRING}에 머무름
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :그리고 {STRING}(으)로 이동
 STR_TIMETABLE_DAYS                                              :{COMMA} 일
 STR_TIMETABLE_TICKS                                             :{COMMA} 틱
 
@@ -3197,6 +3210,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}GRF 파일 손실
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}일시정지를 해제하면 오류가 발생할 수도 있습니다. 차후에 나오는 오류를 위해 버그 리포트를 보관하지 마십시오.{}일시정지를 해제하시겠습니까?
 
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}전차를 지원하지 않는 버전으로 게임이 저장되었습니다. 모든 전차는 제거되었습니다.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}사용자 화폐 단위
--- a/src/lang/simplified_chinese.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/simplified_chinese.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -9,7 +9,7 @@
 STR_NULL                                                        :
 STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}超过地图边界
 STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}距离地图边界过近
-STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}没有足够的现金 - 需要 {CURRENCY}
+STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}没有足够的资金 - 需要 {CURRENCY}
 STR_0004                                                        :{WHITE}{CURRENCY}
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}需要平坦的地面
@@ -17,6 +17,7 @@
 STR_0009                                                        :{WHITE}{CARGO}
 STR_000C_ACCEPTS                                                :{BLACK}接受:{WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}接受:{GOLD}
+STR_SUPPLIES                                                    :{BLACK}供给: {GOLD}
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :旅客
 STR_0010_COAL                                                   :煤炭
@@ -36,7 +37,7 @@
 STR_001E_FOOD                                                   :食品
 STR_001F_PAPER                                                  :纸张
 STR_0020_GOLD                                                   :金子
-STR_0021_WATER                                                  :水
+STR_0021_WATER                                                  :矿泉水
 STR_0022_WHEAT                                                  :小麦
 STR_0023_RUBBER                                                 :橡胶
 STR_0024_SUGAR                                                  :蔗糖
@@ -47,7 +48,7 @@
 STR_0029_BUBBLES                                                :泡泡
 STR_002A_TOFFEE                                                 :太妃糖
 STR_002B_BATTERIES                                              :电池
-STR_002C_PLASTIC                                                :塑料
+STR_002C_PLASTIC                                                :塑料块
 STR_002D_FIZZY_DRINKS                                           :跳跳水
 STR_002E                                                        :
 STR_002F_PASSENGER                                              :旅客
@@ -238,7 +239,7 @@
 STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}木材厂
 STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}棉花糖森林
 STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}糖果厂
-STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFONT}滇池农场
+STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFONT}电池农场
 STR_0113_COLA_WELLS                                             :{BLACK}{TINYFONT}可乐泉
 STR_0114_TOY_SHOP                                               :{BLACK}{TINYFONT}玩具店
 STR_0115_TOY_FACTORY                                            :{BLACK}{TINYFONT}玩具工厂
@@ -310,13 +311,13 @@
 STR_UNITS_METRIC                                                :度量
 STR_UNITS_SI                                                    :国际单位制
 
-STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} 英里/小时
+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} 英里/时
 STR_UNITS_VELOCITY_METRIC                                       :{COMMA} 千米/小时
 STR_UNITS_VELOCITY_SI                                           :{COMMA} 米/秒
 
 STR_UNITS_POWER_IMPERIAL                                        :{COMMA}马力
 STR_UNITS_POWER_METRIC                                          :{COMMA}马力
-STR_UNITS_POWER_SI                                              :{COMMA}前往
+STR_UNITS_POWER_SI                                              :{COMMA}千瓦
 
 STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}英吨
 STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}吨
@@ -376,6 +377,7 @@
 STR_SORT_BY_MAX_SPEED                                           :最大速度
 STR_SORT_BY_MODEL                                               :型号
 STR_SORT_BY_VALUE                                               :价值
+STR_SORT_BY_LENGTH                                              :长度
 STR_SORT_BY_FACILITY                                            :车站类型
 STR_SORT_BY_WAITING                                             :等待的货物价值
 STR_SORT_BY_RATING_MAX                                          :货物评价
@@ -549,8 +551,8 @@
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
-STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}轨道{SETX 88}题目
-STR_01E9_SHUFFLE                                                :{TINYFONT}随即播放
+STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}音轨{SETX 88}标题
+STR_01E9_SHUFFLE                                                :{TINYFONT}随机播放
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}列表播放
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}音乐选单
 STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
@@ -586,6 +588,9 @@
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}公司信息
 STR_NEWS_OPEN_CLOSE                                             :{YELLOW}开启/关闭工业设施
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}经济变化
+STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER                           :{YELLOW}对玩家有利的工业产量变化
+STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}对对手有利的工业产量变化
+STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}其他工业产量变化
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}玩家车辆的状况报告
 STR_020C_NEW_VEHICLES                                           :{YELLOW}新的车辆类型
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}货物接受情况变更
@@ -721,6 +726,7 @@
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}放置转播塔
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}定义沙漠区域。{}摁住 CTRL 可以去掉沙漠区域。
 STR_CREATE_LAKE                                                 :{BLACK}定义水域。{}修建运河,仅在CTRL被按下的情况下不会在海平面淹没周围的区域。
+STR_CREATE_RIVER                                                :{BLACK}放置河流
 STR_0290_DELETE                                                 :{BLACK}删除
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}完全删除这座城镇
 STR_0292_SAVE_SCENARIO                                          :保存场景
@@ -736,7 +742,7 @@
 STR_PLAY_HEIGHTMAP                                              :{BLACK}以高度图开始游戏
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}以高度图决定的地形开始一个新游戏。
 STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}你确定要退出当前场景吗?
-STR_029C_QUIT_EDITOR                                            :{WHITE}推出编辑器
+STR_029C_QUIT_EDITOR                                            :{WHITE}退出编辑器
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}只能在人口超过 1200 的城镇建造……
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}将开始年份向前调整 1 年
 STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}将开始年份向后调整 1 年
@@ -852,6 +858,7 @@
 
 STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}建设新的工业设施
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_INT                                                    :{NUM}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}只能在城镇中建设……
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}只能在雨林中建设……
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}只能在沙漠中建设……
@@ -875,14 +882,14 @@
 STR_TOWNNAME_GERMAN                                             :德国
 STR_TOWNNAME_ADDITIONAL_ENGLISH                                 :英国 (增强的)
 STR_TOWNNAME_LATIN_AMERICAN                                     :美式拉丁
-STR_TOWNNAME_SILLY                                              :愚蠢的
+STR_TOWNNAME_SILLY                                              :搞笑地名
 STR_TOWNNAME_SWEDISH                                            :瑞典
 STR_TOWNNAME_DUTCH                                              :荷兰
 STR_TOWNNAME_FINNISH                                            :芬兰
 STR_TOWNNAME_POLISH                                             :波兰
 STR_TOWNNAME_SLOVAKISH                                          :斯洛伐克
 STR_TOWNNAME_NORWEGIAN                                          :挪威
-STR_TOWNNAME_HUNGARIAN                                          :雄拉利
+STR_TOWNNAME_HUNGARIAN                                          :匈牙利
 STR_TOWNNAME_AUSTRIAN                                           :澳大利亚
 STR_TOWNNAME_ROMANIAN                                           :罗马尼亚
 STR_TOWNNAME_CZECH                                              :捷克
@@ -929,6 +936,7 @@
 
 STR_OPTIONS_FULLSCREEN                                          :{BLACK}全屏幕
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}选择此项可以在全屏幕模式下进行 OpenTTD 游戏
+STR_FULLSCREEN_FAILED                                           :{WHITE}无法切换到全屏模式
 
 STR_OPTIONS_RES                                                 :{BLACK}屏幕分辨率
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1024,6 +1032,10 @@
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}仅在车站接受此货物时卸货:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}允许建造超长桥梁:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}允许前往车库的计划任务:{ORANGE}{STRING}
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}原料工业建设方式: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :无
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :同其他工业
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :探矿式
 STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}允许在一个城镇中建设多个同类工业设施:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}工业设施可以相邻:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}永远在状态栏中显示长日期:{ORANGE}{STRING}
@@ -1033,9 +1045,14 @@
 STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}汽车自动排队 (有量子效应): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}当鼠标移动到屏幕边缘时移动屏幕:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}允许贿赂地方政府:{ORANGE}{STRING}
+STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE                              :{LTBLUE}允许买断经营权: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY                             :{LTBLUE}允许向其他公司转移资金: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}允许异形站台:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}根据装载货物的数量模拟超重列车:{ORANGE}{STRING}
+STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}飞机速度因数: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}允许在城镇所有的道路上穿过禁行标志 {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}允许建设临近站台: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}允许使用多GRF运输工具: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}总允许建设小型机场:{ORANGE}{STRING}
 
@@ -1075,6 +1092,7 @@
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}直升机在降落平台自动保养:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}将景观美化工具栏与铁路/公路/船只/机场工具栏连接:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}拖动方向与屏幕移动方向相反:{ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMOOTH_SCROLLING                             :{LTBLUE}平滑视角滚动: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}建设时显示测量数据:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}显示公司特别外观:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :不显示
@@ -1087,6 +1105,29 @@
 STR_CONFIG_PATCHES_SCROLLWHEEL_OFF                              :关闭
 STR_CONFIG_PATCHES_SCROLLWHEEL_MULTIPLIER                       :{LTBLUE}地图滚动速度:{ORANGE}{STRING}
 
+STR_CONFIG_PATCHES_RIGHT_MOUSE_BTN_EMU_OFF                      :关闭
+
+STR_CONFIG_PATCHES_PAUSE_ON_NEW_GAME                            :{LTBLUE}开始新游戏时自动暂停: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}使用高级车辆列表: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS_OFF                   :关闭
+STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS_OWN                   :玩家公司
+STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS_ALL                   :全体公司
+STR_CONFIG_PATCHES_LOADING_INDICATORS                           :{LTBLUE}使用装货进度指示: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LOADING_INDICATORS_OFF                       :关闭
+STR_CONFIG_PATCHES_LOADING_INDICATORS_OWN                       :玩家公司
+STR_CONFIG_PATCHES_LOADING_INDICATORS_ALL                       :全体公司
+STR_CONFIG_PATCHES_TIMETABLE_ALLOW                              :{LTBLUE}允许使用时间表: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS                           :{LTBLUE}使用ticks而不是天为单位: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE                            :{LTBLUE}默认铁路类型 (新建/读取游戏后): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL                       :普通铁轨
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL                     :电气化铁路
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL                   :单轨铁路
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MAGLEV                     :磁悬浮
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST                      :第一个可用的
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_LAST                       :第后一个可用的
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MOST_USED                  :最常用的
+
+STR_CONFIG_PATCHES_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}当没有合适的运输工具时显示建设工具: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}每位玩家最大火车数量:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}每位玩家最大汽车数量:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}每位玩家最大飞机数量:{ORANGE}{STRING}
@@ -1119,7 +1160,9 @@
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}允许购买其他公司的股份
 STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}当拖动的时候每 {ORANGE}{STRING} 个地块放置一个信号灯
 STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}在 {ORANGE}{STRING} 前自动设置旗帜信号
+STR_CONFIG_PATCHES_ENABLE_SIGNAL_GUI                            :{LTBLUE}使用信号GUI: {ORANGE}{STRING}
 
+STR_CONFIG_PATCHES_TOWN_LAYOUT_DEFAULT                          :默认
 
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}主工具栏位置:{ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :左侧
@@ -1151,6 +1194,18 @@
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}改变设置值
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}下面一个或多个保养周期的值设置不对,应当在 0%-90% 或 30-800 天之内。
 
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(不推荐)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF                    :NPF
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(推荐)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH                       :{LTBLUE}汽车寻路: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF                   :原始的 {RED}(不推荐)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF                   :NPF
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(推荐)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS                         :{LTBLUE}船只寻路: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF                     :原始 {BLUE}(推荐)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF                     :NPF
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(不推荐)
+
 STR_TEMPERATE_LANDSCAPE                                         :温带景观
 STR_SUB_ARCTIC_LANDSCAPE                                        :寒带景观
 STR_SUB_TROPICAL_LANDSCAPE                                      :沙漠景观
@@ -1219,8 +1274,12 @@
 STR_BUILD_LOCKS_TIP                                             :{BLACK}建设船闸
 STR_LANDINFO_LOCK                                               :船闸
 
+STR_CANT_PLACE_RIVERS                                           :{WHITE}不能在这里加设河流...
+STR_LANDINFO_RIVER                                              :河
+
 STR_BUOY_IS_IN_USE                                              :{WHITE}浮标正在被使用……
 
+STR_LANDINFO_COORDS                                             :{BLACK}坐标: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}不能拆除站台的一部分……
 STR_CANT_CONVERT_RAIL                                           :{WHITE}不能转换铁路的类型……
@@ -1284,6 +1343,7 @@
 
 STR_NETWORK_PLAYER_NAME                                         :{BLACK}玩家名称:
 STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}其他玩家将通过这个名字来认识你
+STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}请输入大名
 STR_NETWORK_CONNECTION                                          :{BLACK}连接:
 STR_NETWORK_CONNECTION_TIP                                      :{BLACK}选择一个 Internet 上的游戏或局域网 (LAN) 中的游戏
 
@@ -1294,6 +1354,8 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}游戏的名称
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}语言,服务器版本和其他信息
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}点击列表中的服务器可以选定它
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}上一次加入的服务器:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}点击选择您上次加入的服务器
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}搜索服务器
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}在网络上搜索服务器
@@ -1304,6 +1366,10 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}客户端
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}在线客户端 / 最多 - 在线公司 / 最多
+
+
+
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}游戏信息
 STR_NETWORK_CLIENTS                                             :{SILVER}客 户 端:   {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}语  言:   {WHITE}{STRING}
@@ -1326,22 +1392,25 @@
 
 STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}游戏名称:
 STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}游戏名称将显示在其他玩家的多用户游戏界面中
+STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}为您的联机游戏起名
 STR_NETWORK_SET_PASSWORD                                        :{BLACK}设置密码:
 STR_NETWORK_PASSWORD_TIP                                        :{BLACK}如果不希望你的游戏被外人加入,请设置一个密码
 STR_NETWORK_SELECT_MAP                                          :{BLACK}选择地图:
 STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}选择你要玩的地图
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}玩家数目:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}选择可以参加的玩家上限(达不到此数量仍然可以开始游戏)
+STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
 STR_NETWORK_LAN                                                 :局域网
 STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :局域网 / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (advertise)
+STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}玩家数目:
+STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}选择可以参加的玩家上限(达不到此数量仍然可以开始游戏)
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}公司数量:
 STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}限制服务器上可以创建的公司数量
 STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}旁观数量:
 STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}限制服务器上旁观者的数量
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}语言选项:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}其他玩家可以知道服务器的官方语言
+STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_START_GAME                                          :{BLACK}开始游戏
 STR_NETWORK_START_GAME_TIP                                      :{BLACK}以指定场景或随机地图开始游戏
 STR_NETWORK_LOAD_GAME                                           :{BLACK}读取游戏
@@ -1352,6 +1421,38 @@
 STR_NETWORK_LANG_ENGLISH                                        :英语
 STR_NETWORK_LANG_GERMAN                                         :德语
 STR_NETWORK_LANG_FRENCH                                         :法语
+STR_NETWORK_LANG_BRAZILIAN                                      :巴西语
+STR_NETWORK_LANG_BULGARIAN                                      :保加利亚语
+STR_NETWORK_LANG_CHINESE                                        :中文
+STR_NETWORK_LANG_CZECH                                          :捷克语
+STR_NETWORK_LANG_DANISH                                         :丹麦语
+STR_NETWORK_LANG_DUTCH                                          :荷兰语
+STR_NETWORK_LANG_ESPERANTO                                      :世界语
+STR_NETWORK_LANG_FINNISH                                        :芬兰语
+STR_NETWORK_LANG_HUNGARIAN                                      :匈牙利语
+STR_NETWORK_LANG_ICELANDIC                                      :冰岛语
+STR_NETWORK_LANG_ITALIAN                                        :意大利语
+STR_NETWORK_LANG_JAPANESE                                       :日语
+STR_NETWORK_LANG_KOREAN                                         :韩文
+STR_NETWORK_LANG_LITHUANIAN                                     :立陶宛语
+STR_NETWORK_LANG_NORWEGIAN                                      :挪威语
+STR_NETWORK_LANG_POLISH                                         :波兰语
+STR_NETWORK_LANG_PORTUGUESE                                     :葡萄牙语
+STR_NETWORK_LANG_ROMANIAN                                       :罗马尼亚语
+STR_NETWORK_LANG_RUSSIAN                                        :俄语
+STR_NETWORK_LANG_SLOVAK                                         :斯洛伐克语
+STR_NETWORK_LANG_SLOVENIAN                                      :斯洛文尼亚语
+STR_NETWORK_LANG_SPANISH                                        :西班牙语
+STR_NETWORK_LANG_SWEDISH                                        :瑞典语
+STR_NETWORK_LANG_TURKISH                                        :土耳其语
+STR_NETWORK_LANG_UKRAINIAN                                      :乌克兰语
+STR_NETWORK_LANG_AFRIKAANS                                      :南非荷兰语
+STR_NETWORK_LANG_CROATIAN                                       :克罗地亚语
+STR_NETWORK_LANG_CATALAN                                        :加泰罗尼亚语
+STR_NETWORK_LANG_ESTONIAN                                       :爱沙尼亚语
+STR_NETWORK_LANG_GALICIAN                                       :加利西亚语
+STR_NETWORK_LANG_GREEK                                          :希腊语
+STR_NETWORK_LANG_LATVIAN                                        :拉脱维亚语
 ############ End of leave-in-this-order
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}多用户通道
@@ -1450,6 +1551,7 @@
 STR_NETWORK_CHAT_TO_CLIENT                                      :[私聊] To {STRING}: {GRAY}{STRING}
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[全体] :
 STR_NETWORK_CHAT_ALL                                            :[全体] {STRING}: {GRAY}{STRING}
+STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}请输入联机聊天内容
 STR_NETWORK_NAME_CHANGE                                         :已将他/她的名字改为
 STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} 服务器关闭了进程
 STR_NETWORK_SERVER_REBOOT                                       :{WHITE} 服务器正在重新启动。{}请等待……
@@ -1513,6 +1615,7 @@
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}没有合适的铁轨
 STR_1007_ALREADY_BUILT                                          :{WHITE}已经建好了……
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}必须先拆除铁轨
+STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}这是单行道或堵死了
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}铁路建设
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}电气化铁路建设
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}单轨铁路建设
@@ -1543,7 +1646,9 @@
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}此区域由另一公司所有……
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :带有普通信号的铁路
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :带有入口信号的铁路
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :带有出口新乡的铁路
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :带有出口信号的铁路
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :双向信号灯的铁路
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :单信号灯的铁路
 
 
 
@@ -1592,7 +1697,7 @@
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}将屏幕中心移动到城镇所在的位置
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}城镇改名
 STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}上月旅客数量:{ORANGE}{COMMA}{BLACK}  最大值:{ORANGE}{COMMA}
-STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}上月有报数量:{ORANGE}{COMMA}{BLACK}  最大值:{ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}上月邮包数量:{ORANGE}{COMMA}{BLACK}  最大值:{ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :高层写字楼
 STR_2010_OFFICE_BLOCK                                           :写字楼
 STR_2011_SMALL_BLOCK_OF_FLATS                                   :底层住宅
@@ -1712,7 +1817,7 @@
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}必须先拆除火车站
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}距离另一机场过近
-STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}必须先拆出机场
+STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}您必须先拆除机场
 
 STR_3030_RENAME_STATION_LOADING                                 :重命名车站
 STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}不能重命名车站
@@ -1856,6 +1961,9 @@
 STR_4829_REQUIRES                                               :{BLACK}需要:{YELLOW}{STRING}{STRING}, {STRING}{STRING}, {STRING}{STRING}
 ############ range for requires ends
 
+############ range for produces starts
+############ range for produces ends
+
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}上月产量:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% 已运输)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}将屏幕中心移动到工厂所在的位置
@@ -2261,8 +2369,8 @@
 STR_8033_BATTERY_TRUCK                                          :电池挂车
 STR_8034_FIZZY_DRINK_TRUCK                                      :跳跳汁挂车
 STR_8035_PLASTIC_TRUCK                                          :塑料挂车
-STR_8036_X2001_ELECTRIC                                         :'X2001' (Electric)
-STR_8037_MILLENNIUM_Z1_ELECTRIC                                 :'Millennium Z1' (Electric)
+STR_8036_X2001_ELECTRIC                                         :'X2001' (电力)
+STR_8037_MILLENNIUM_Z1_ELECTRIC                                 :'Millennium Z1' (电力)
 STR_8038_WIZZOWOW_Z99                                           :Wizzowow Z99
 STR_8039_PASSENGER_CAR                                          :旅客车厢
 STR_803A_MAIL_VAN                                               :邮政车厢
@@ -2333,7 +2441,7 @@
 STR_807B_BALOGH_COAL_TRUCK                                      :Balogh 煤炭卡车
 STR_807C_UHL_COAL_TRUCK                                         :Uhl 煤炭卡车
 STR_807D_DW_COAL_TRUCK                                          :DW 煤炭卡车
-STR_807E_MPS_MAIL_TRUCK                                         :MPS 煤炭卡车
+STR_807E_MPS_MAIL_TRUCK                                         :MPS 邮政卡车
 STR_807F_REYNARD_MAIL_TRUCK                                     :Reynard 邮政卡车
 STR_8080_PERRY_MAIL_TRUCK                                       :Perry 邮政卡车
 STR_8081_MIGHTYMOVER_MAIL_TRUCK                                 :MightyMover 邮政卡车
@@ -2478,6 +2586,8 @@
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (详细信息)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}指定位置有列车
 
+
+
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}旅行 (无时间表)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}前往 {STRING} 旅行
 STR_TIMETABLE_STAY_FOR                                          :并且在 {STRING} 停留
@@ -2612,6 +2722,7 @@
 STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{ENGINE}
 STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}新 {STRING} 上市了!  -  {ENGINE}
 
+
 STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}不能给车辆编制时间表…
 STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}车辆只能在站内等候。
 STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}此车辆将不在本站停靠。
@@ -2918,6 +3029,8 @@
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}缺失的 GRF 文件已经被禁用
 STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}缺少使游戏运行所必需的 GRF 文件
 
+
+
 STR_CURRENCY_WINDOW                                             :{WHITE}自定义货币
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}兑换汇率: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}分隔符:
@@ -3040,6 +3153,9 @@
 STR_PURCHASE_INFO_ALL_BUT                                       :除了 {GOLD}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}最大牵引力:{GOLD}{FORCE}
 
+########### For showing numbers in widgets
+
+
 ########### String for New Landscape Generator
 
 STR_GENERATE                                                    :{WHITE}生成
@@ -3144,7 +3260,19 @@
 
 
 
-
 #### Improved sign GUI
 
 ########
+
+
+############ Face formatting
+########
+
+############ signal GUI
+########
+
+############ on screen keyboard
+########
+
+############ town controlled noise level
+########
--- a/src/lang/slovak.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/slovak.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -442,6 +442,7 @@
 STR_SORT_BY_MAX_SPEED                                           :Maximalna rychlost
 STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Hodnota
+STR_SORT_BY_LENGTH                                              :Dlžka
 STR_SORT_BY_FACILITY                                            :Typ stanice
 STR_SORT_BY_WAITING                                             :Mnozstvo cakajuceho nakladu
 STR_SORT_BY_RATING_MAX                                          :Hodnotenie prepravy
@@ -549,6 +550,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Náklady na odstránenie: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :Neznáme
 STR_01A7_OWNER                                                  :{BLACK}Vlastník: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Vlastník cesty: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Vlastník elektrickovej dráhy: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Vlastník železnice: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Miestna správa: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Neznáme
 STR_01AA_NAME                                                   :{BLACK}Meno
@@ -1117,6 +1121,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Faktor rýchlosti lietadiel: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Povolit prejazdné zastávky na mestských cestách: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Povolit stavbu oddelených staníc: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Povolit viaceré NewGRF sety s rušnami: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Vždy povolit stavbu malých letísk: {ORANGE}{STRING}
 
@@ -1350,6 +1355,9 @@
 STR_BUILD_LOCKS_TIP                                             :{BLACK}Postavit stavidla ...
 STR_LANDINFO_LOCK                                               :Stavidlo
 
+STR_CANT_PLACE_RIVERS                                           :{WHITE}Tu nie je možné umiestnit rieku ...
+STR_LANDINFO_RIVER                                              :Rieka
+
 STR_BUOY_IS_IN_USE                                              :{WHITE}... boja sa pouziva!
 
 STR_LANDINFO_COORDS                                             :{BLACK}Súradnice: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
@@ -1427,6 +1435,8 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nazov hry
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Jazyk, verzia serveru, atd.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Vyberte hru zo zoznamu
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}The server you joined last time:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Kliknite pre vyber servera na ktorom ste hrali naposledy
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Najst server
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Hladat po sieti servery
@@ -1437,6 +1447,17 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienti
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienti online / klienti max
+
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Velkost mapy
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Velkost mapy v hre{}Kliknite pre triedenie podla rozlohy
+
+STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dátum
+STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Aktuálny dátum
+
+STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Roky
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Pocet rokov,{}kolko hra beží
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HRE
 STR_NETWORK_CLIENTS                                             :{SILVER}Klienti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk:  {WHITE}{STRING}
@@ -1773,6 +1794,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Cesta v aleji
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Garaz
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Zeleznicne priecestie
+STR_TRAMWAY                                                     :Elektrickova dráha
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Nie je možné odstránit autobusovú stanicu ...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Nie je možné odstránit nakladaciu rampu ...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Nie je možné odstránit osobnú elektrickovú stanicu ...
@@ -1998,6 +2020,7 @@
 STR_3804_WATER                                                  :Voda
 STR_3805_COAST_OR_RIVERBANK                                     :Pobrezie alebo nabrezie
 STR_3806_SHIP_DEPOT                                             :Lodenica
+STR_AQUEDUCT                                                    :Akvadukt
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}... nemoze byt postavene na vode
 STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Najprv sa musí zbúrat kanál
 
@@ -2715,12 +2738,65 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prvy vlak dorazil do stanice {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Detaily)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Vlak v ceste
+STR_8804                                                        :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
+STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
+STR_ORDER_GO_TO                                                 :Chod do
+STR_ORDER_GO_NON_STOP_TO                                        :Chod non-stop do
+STR_ORDER_GO_VIA                                                :Chod cez
+STR_ORDER_GO_NON_STOP_VIA                                       :Chdo non-stop cez
+STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Plne nalož cokolvek
+STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Nalož pri dostupnosti
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Plne nalož všetko
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Plne nalož cokolvek
+STR_ORDER_DROP_NO_LOADING                                       :Nenakladaj
+STR_ORDER_TOGGLE_UNLOAD                                         :{BLACK}Vylož všetko
+STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Vylož pri prijímaní
+STR_ORDER_DROP_UNLOAD                                           :Vylož všetko
+STR_ORDER_DROP_TRANSFER                                         :Prelož
+STR_ORDER_DROP_NO_UNLOADING                                     :Nevykladaj
+STR_ORDER_FULL_LOAD                                             :(Plne nalož)
+STR_ORDER_FULL_LOAD_ANY                                         :(Plne nalož akýkolvek náklad)
+STR_ORDER_NO_LOAD                                               :(Nenakladaj)
+STR_ORDER_UNLOAD                                                :(Vylož a nalož náklad)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :(Vylož a pockaj na plné naloženie)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Vylož a pockaj na plné naloženie akéhokoľvek nákladu)
+STR_ORDER_UNLOAD_NO_LOAD                                        :(Vylož a nechaj prázdne)
+STR_ORDER_TRANSFER                                              :(Prelož a nalož)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :(Prelož a pockaj na plné naloženie)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Prelož a pockaj na plné naloženie akéhokolvek nákladu)
+STR_ORDER_TRANSFER_NO_LOAD                                      :(Prelož a nechaj prázdne)
+STR_ORDER_NO_UNLOAD                                             :(Nevykladaj a nalož)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Nevykladaj a pockaj na plné naloženie)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Nevykladaj a pockaj na plné naloženie akéhokolvek nákladu)
 
 
+STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Hodnota, s ktorou sa majú porovnat dáta vozidla
+STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Zadajte hodnotu voci ktorej sa ma porovnat
+STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Percento naplnenia
+STR_ORDER_CONDITIONAL_RELIABILITY                               :Spolahlivost
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maximálna rýchlost
+STR_ORDER_CONDITIONAL_AGE                                       :Vek vozidla (v rokoch)
+STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Vyžaduje servis
+STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Vždy
+STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :je rovné
+STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :nie je rovné
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :je menej ako
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS                    :je menej alebo rovné
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :je viac ako
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :je viac alebo rovné
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :je pravda
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :je nepravda
+STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_CONDITIONAL_UNCONDITIONAL                                   :Skok na príkaz {COMMA}
+STR_CONDITIONAL_NUM                                             :Skok na príkaz {COMMA} ak {STRING} {STRING} {COMMA}
+STR_CONDITIONAL_TRUE_FALSE                                      :Skok na príkaz {COMMA} ak {STRING} {STRING}
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Necestuj
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Cesta (neurcený cas)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}Cesta do {STRING}
 STR_TIMETABLE_STAY_FOR                                          :prestávka {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :a cestuj {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} d{P en ni ní}
 STR_TIMETABLE_TICKS                                             :{COMMA} tik{P "" y ov}
 
@@ -2774,6 +2850,7 @@
 STR_882D_VALUE                                                  :{LTBLUE}{ENGINE}{BLACK}   Hodnota: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Naklada/Vyklada
+STR_LEAVING                                                     :{LTBLUE}Opúšta
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak musi byt zastaveny v depe
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Vlak sa neda poslat do depa...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Nemozno zadat dalsie prikazy
@@ -2936,6 +3013,7 @@
 STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vyberte požadovaný typ nákladu pre cestné vozidlo
 
 ##id 0x9800
+STR_9800_WATERWAYS_CONSTRUCTION                                 :Waterways construction
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Tu nemozno postavit pristav ...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Lodenica
 STR_9804_NEW_SHIPS                                              :{BLACK}Nove lode
@@ -2988,6 +3066,8 @@
 STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Mesto oslavuje . . .{}Prva lod dorazila do {STATION}!
 STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Postavit boju pouzitelnu pre vyznacenie trasy
 STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Tu nemozno postavit boju ...
+STR_BUILD_AQUEDUCT                                              :{BLACK}Postavit akvadukt
+STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Tu nie je možné postavit akvadukt ...
 STR_9836_RENAME                                                 :{BLACK}Premenovat
 STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Premenovat typ lode
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Premenovat typ lode
@@ -3141,6 +3221,12 @@
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF súbor bol navrhnutý na preklad
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Nahraných príliš vela NewGRF súborov.
 
+STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Nahrat vybraný zoznam
+STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Uložit zoznam
+STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Uložit aktuálne nastavenie ako zoznam
+STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Zadajte názov zoznamu
+STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Vymazat zoznam
+STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Vymazat vybraný zoznam
 STR_NEWGRF_ADD                                                  :{BLACK}Pridat
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Pridat NewGRF súbor do zoznamu
 STR_NEWGRF_REMOVE                                               :{BLACK}Odstránit
@@ -3171,6 +3257,9 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Chýba(jú) GRF súbor(y)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Odpauzovanie môže spôsobit pád OpenTTD. Nezaznamenávajte nasledujúce chyby.{}Naozaj chcete odpauzovat?
 
+
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Hra bola uložená vo verzii bez elektriciek. Vsetky elektricky boli odstránené.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastná mena
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz meny: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Oddelovac:
@@ -3535,3 +3624,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Povolit mestom urcené hlukové limity pre letiská: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Hlukový limit v meste: {ORANGE}{COMMA}{BLACK}  max.: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Vytváraný hluk: {GOLD}{COMMA}
+########
--- a/src/lang/spanish.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/spanish.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -1384,6 +1384,17 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes online / máx clientes{}Compañías online / máximo compañías
+
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Tamaño del mapa
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Tamaño del mapa del juego{}Pulsa para ordenar por area
+
+STR_NETWORK_DATE_CAPTION                                        :{BLACK}Fecha
+STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Fecha actual
+
+STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Años
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Número de años{}que el juego está ejecutado
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO JUEGO
 STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
@@ -2738,9 +2749,11 @@
 STR_CONDITIONAL_NUM                                             :Saltar a orden {COMMA} cuando {STRING} {STRING} {COMMA}
 STR_CONDITIONAL_TRUE_FALSE                                      :Saltar a orden{COMMA} cuando {STRING} {STRING}
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Sin viaje
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Viaje (sin horarios)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}Viaje para {STRING}
 STR_TIMETABLE_STAY_FOR                                          :y estancia en {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :y viajar por {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} días{P "" s}
 STR_TIMETABLE_TICKS                                             :{COMMA} señal{P "" s}
 
@@ -3198,6 +3211,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Fichero(s) GRF que faltan
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Quitar la pausa puede hacer que se cierre OpenTTD. No notifique este error.{}¿Desea realmente quitar la pausa?
 
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}El juego ha sido grabado en una versión sin soporte de tranvía. Todos los tranvías serán eliminados.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalizada
--- a/src/lang/ukrainian.txt	Thu Jul 24 20:29:40 2008 +0000
+++ b/src/lang/ukrainian.txt	Thu Jul 24 22:59:29 2008 +0000
@@ -35,8 +35,8 @@
 STR_0012_OIL.r                                                  :нафти
 STR_0012_OIL.z                                                  :нафту
 STR_0013_LIVESTOCK                                              :худоба
+STR_0013_LIVESTOCK.r                                            :худоби
 STR_0013_LIVESTOCK.z                                            :худобу
-STR_0013_LIVESTOCK.r                                            :худоби
 STR_0014_GOODS                                                  :товари
 STR_0014_GOODS.r                                                :товарів
 STR_0014_GOODS.z                                                :товари
@@ -128,8 +128,8 @@
 STR_0032_OIL.r                                                  :нафти
 STR_0032_OIL.z                                                  :нафту
 STR_0033_LIVESTOCK                                              :худоба
+STR_0033_LIVESTOCK.r                                            :худоби
 STR_0033_LIVESTOCK.z                                            :худобу
-STR_0033_LIVESTOCK.r                                            :худоби
 STR_0034_GOODS                                                  :товари
 STR_0034_GOODS.r                                                :товарів
 STR_0034_GOODS.z                                                :товари
@@ -1508,6 +1508,10 @@
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Клієнти
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Клієнти в мережі/макс.клієнтів{}Компанії в мережі/макс.компаній
+
+
+
+
 STR_NETWORK_GAME_INFO                                           :{SILVER}Інформація про гру
 STR_NETWORK_CLIENTS                                             :{SILVER}Клієнт:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Мова:  {WHITE}{STRING}
@@ -2899,9 +2903,11 @@
 STR_CONDITIONAL_NUM                                             :Перейти до наказу {COMMA}, якщо {STRING} {STRING} {COMMA}
 STR_CONDITIONAL_TRUE_FALSE                                      :Перейти до наказу {COMMA}, якщо {STRING} {STRING}
 
+STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Не прямувати
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Прямує (не за розкладом)
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}Прямує до {STRING}
 STR_TIMETABLE_STAY_FOR                                          :і стояти {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :і прямувати до {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} д{P ень ні нів}
 STR_TIMETABLE_TICKS                                             :{COMMA} одиниц{P ю і ь}
 
@@ -3359,6 +3365,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Відсутній GRF файл(и)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Зняття з паузи може привести до аварійної відмови OpenTTD. Не рапортуйте про наступні відмови.{}Ви дійсно хочете зняти з паузи?
 
+
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Гра була записана у версії без підтримки трамваїв. Усі трамваї були видалені.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Вибір грошової одиниці