(svn r14441) -Update: WebTranslator2 update to 2008-10-05 17:45:23

catalan    - 6 fixed by arnaullv (6)
german     - 1 changed by sulai (1)
hungarian  - 1 fixed, 1 changed by alyr (2)
norwegian_bokmal - 6 fixed by christian (6)
simplified_chinese - 1 fixed by ww9980 (1)
traditional_chinese - 2 changed by josesun (2)

6 files changed, 18 insertions, 5 deletions

diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 08a8e4a5c..492d72999 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -595,8 +595,10 @@ STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informa
 STR_NEWS_INDUSTRY_OPEN                                          :{YELLOW}Obertura d'indústries
 STR_NEWS_INDUSTRY_CLOSE                                         :{YELLOW}Tancament d'indústries
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Canvis de l'Economia
+STR_INDUSTRY_CHANGES_SERVED_BY_COMPANY                          :{YELLOW}Canvis de producció de les indústries aprovisionades per la companyia
 STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Canvis de producció en indústries proveïdes pel competidor(s)
 STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Altres canvis de producció de l'indústria
+STR_020B_ADVICE_INFORMATION_ON_COMPANY                          :{YELLOW}Alertes / informació sobre els vehicles de la companyia
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nous vehicles
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Canvis en admisió de càrrega
 STR_020E_SUBSIDIES                                              :{YELLOW}Subvencions
@@ -1246,6 +1248,7 @@ STR_CHEATS                                                      :{WHITE}Trampes
 STR_CHEATS_TIP                                                  :{BLACK}Els quadres marcats indiquen que ja has fet servir aquesta trampa
 STR_CHEATS_WARNING                                              :{BLACK}Atenció! Estàs a punt d'enredar als teus companys competidors. Pensa que una cosa així serà recordada per tota la eternitat!.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementa els diners en {CURRENCY}
+STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Jugant com la companyia: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Eruga màgica (treu indústries, inamovibles): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Els túnels es poden creuar: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construeix mentre el joc està en pausa: {ORANGE}{STRING}
@@ -1577,6 +1580,7 @@ STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :s'ha rebut un p
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :revisió incorrecta
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nom ja utilitzat
 STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :contrasenya de joc incorrecta
+STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :id-companyia erroni en DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :tret pel servidor
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :s'ha intentat utilitzar una trampa
 STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor ple
@@ -2262,6 +2266,7 @@ STR_HOSTILE                                                     :Hostil
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
+STR_7002_COMPANY                                                :(Companyia {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME                                           :{BLACK}Esquema de color
 STR_7006_COLOR_SCHEME                                           :{GOLD}Esquema de color:
@@ -3540,6 +3545,7 @@ STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Clica pe
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
 STR_VEHICLE_NAME                                                :{VEHICLE}
 
diff --git a/src/lang/german.txt b/src/lang/german.txt
index e27851956..54d47cdda 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -2933,7 +2933,7 @@ STR_TIMETABLE_STATUS_LATE                                       :Dieses Fahrzeug
 STR_TIMETABLE_STATUS_EARLY                                      :Dieses Fahrzeug ist {STRING} zu früh
 STR_TIMETABLE_TOTAL_TIME                                        :Dieser Fahrplan benötigt {STRING}
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :Dieser Fahrplan benötigt mindestens {STRING} (nicht alle geplant)
-STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autom.
+STR_TIMETABLE_AUTOFILL                                          :{BLACK}Erfassen
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fahrplan automatisch mit den Ergebnissen der ersten Fahrt ergänzen
 
 ##id 0x9000
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 4e2850041..64d450a5d 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -2361,6 +2361,7 @@ STR_HOSTILE                                                     :Ellenséges
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
+STR_7002_COMPANY                                                :({COMMA}. vállalat)
 STR_7004_NEW_FACE                                               :{BLACK}Új arc
 STR_7005_COLOR_SCHEME                                           :{BLACK}Szín váltása
 STR_7006_COLOR_SCHEME                                           :{GOLD}Szín:
@@ -2805,7 +2806,7 @@ STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}A kijel�
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Menj a legközelebbi járműtelepre
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Menj a legközelebbi hangárba
 
-STR_ORDER_CONDITIONAL                                           :Feltételes ugrás utasításra
+STR_ORDER_CONDITIONAL                                           :Feltételes ugrás
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}A jármű adata ami alapján ugrani szeretnénk
 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Hogyan viszonyul a jármű kiválasztott adata a megadott értékhez
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Az érték amihez a jármű egy tulajdonságát hasonlítjuk
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 2b6fc787c..e2374c01d 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -2,7 +2,6 @@
 ##ownname Norsk (bokmål)
 ##isocode nb_NO
 ##plural 0
-##gender masculinum neutrium femininum
 
 #
 
@@ -596,8 +595,10 @@ STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Firmain
 STR_NEWS_INDUSTRY_OPEN                                          :{YELLOW}Åpning av industrier
 STR_NEWS_INDUSTRY_CLOSE                                         :{YELLOW}Stengning av industrier
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Økonomiske endringer
+STR_INDUSTRY_CHANGES_SERVED_BY_COMPANY                          :{YELLOW}Produksjon endring av industrier servert av kompaniet
 STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Produksjonsendringer hos industrier som får leveranser av motspiller(e)
 STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Andre produksjonsendringer
+STR_020B_ADVICE_INFORMATION_ON_COMPANY                          :{YELLOW}Fåreslå / informasjon på kompaniets kjøretøyer
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nye kjøretøy
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Endringer i godtatte varer
 STR_020E_SUBSIDIES                                              :{YELLOW}Subsidier
@@ -1247,6 +1248,7 @@ STR_CHEATS                                                      :{WHITE}Juks
 STR_CHEATS_TIP                                                  :{BLACK}Avkrysningsbokser indikerer at du har brukt denne juksekoden tidligere.
 STR_CHEATS_WARNING                                              :{BLACK}Advarsel! Vær klar over at du er i ferd med å bedra dine motstandere og at straffen for slike handlinger er evig tid i skjærsilden.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Øk pengebeholdningen med {CURRENCY}
+STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spiller som kompani: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk bulldoser (fjern industrier, ufjernbare ting): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneller kan krysse hverandre: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Tillat bygging i pausemodus: {ORANGE}{STRING}
@@ -1578,6 +1580,7 @@ STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :mottok merkelig
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :feil versjon
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :navnet er brukt av noen andre
 STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :feil passord til spillet
+STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :feil kompani-id i DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :sparket ut av tjeneren
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :prøvde å jukse
 STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :serveren er full
@@ -2263,6 +2266,7 @@ STR_HOSTILE                                                     :Fientlig
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
+STR_7002_COMPANY                                                :(Kompani {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Nytt ansikt
 STR_7005_COLOR_SCHEME                                           :{BLACK}Firmafarge
 STR_7006_COLOR_SCHEME                                           :{GOLD}Firmafarge:
@@ -3541,6 +3545,7 @@ STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klikk fo
 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
 STR_GROUP_NAME                                                  :{GROUP}
+STR_PRESIDENT_NAME                                              :{PRESIDENTNAME}
 STR_SIGN_NAME                                                   :{SIGN}
 STR_VEHICLE_NAME                                                :{VEHICLE}
 
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index e4ea4b71b..ac96f4d85 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -2778,6 +2778,7 @@ STR_CONDITIONAL_UNCONDITIONAL                                   :跳至 {COMMA}
 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} 停留
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 772f3134c..25bbfbdfc 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -1995,7 +1995,7 @@ STR_4000_SAVE_GAME                                              :{WHITE}儲存�
 STR_4001_LOAD_GAME                                              :{WHITE}載入遊戲
 STR_4002_SAVE                                                   :{BLACK}儲存
 STR_4003_DELETE                                                 :{BLACK}刪除
-STR_4004                                                        :{COMPANY}，{DATE_LONG}
+STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}空間尚有 {COMMA} MB
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}無法讀取磁碟
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}遊戲儲存失敗{}{STRING}
@@ -2691,7 +2691,7 @@ STR_80FD_TRICARIO_HELICOPTER                                    :Tricario 直升
 STR_80FE_GURU_X2_HELICOPTER                                     :Guru X2 直升機
 STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut 直升機
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}交通工具製造商的訊息
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}我們剛設計了一種新{STRING} - 您有興趣獨家使用它一年，讓我們在正式上市之前先觀察它的表現嗎？
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}我們剛設計了一種新{STRING} - 您有興趣獨家使用它一年，讓我們在正式上市之前先 觀察它的表現嗎？
 STR_8102_RAILROAD_LOCOMOTIVE                                    :鐵路機車頭
 STR_8103_ROAD_VEHICLE                                           :車輛
 STR_8104_AIRCRAFT                                               :飛機