# HG changeset patch # User rubidium # Date 1222809508 0 # Node ID a1e7417bf1b75bcd8c778d2b4a56a3c0e268e84d # Parent 72c00af5c95d04f002bb4a66489ce83ee3a39c78 (svn r14423) -Codechange: also do r14221 for the strings. diff -r 72c00af5c95d -r a1e7417bf1b7 src/cheat_gui.cpp --- a/src/cheat_gui.cpp Tue Sep 30 20:51:04 2008 +0000 +++ b/src/cheat_gui.cpp Tue Sep 30 21:18:28 2008 +0000 @@ -107,7 +107,7 @@ static const CheatEntry _cheats_ui[] = { {SLE_INT32, STR_CHEAT_MONEY, &_money_cheat_amount, &_cheats.money.been_used, &ClickMoneyCheat }, - {SLE_UINT8, STR_CHEAT_CHANGE_PLAYER, &_local_company, &_cheats.switch_company.been_used, &ClickChangeCompanyCheat }, + {SLE_UINT8, STR_CHEAT_CHANGE_COMPANY, &_local_company, &_cheats.switch_company.been_used, &ClickChangeCompanyCheat }, {SLE_BOOL, STR_CHEAT_EXTRA_DYNAMITE, &_cheats.magic_bulldozer.value, &_cheats.magic_bulldozer.been_used, NULL }, {SLE_BOOL, STR_CHEAT_CROSSINGTUNNELS, &_cheats.crossing_tunnels.value, &_cheats.crossing_tunnels.been_used, NULL }, {SLE_BOOL, STR_CHEAT_BUILD_IN_PAUSE, &_cheats.build_in_pause.value, &_cheats.build_in_pause.been_used, NULL }, @@ -164,9 +164,9 @@ case STR_CHEAT_CHANGE_DATE: SetDParam(0, _date); break; /* Draw colored flag for change company cheat */ - case STR_CHEAT_CHANGE_PLAYER: + case STR_CHEAT_CHANGE_COMPANY: SetDParam(0, val); - GetString(buf, STR_CHEAT_CHANGE_PLAYER, lastof(buf)); + GetString(buf, STR_CHEAT_CHANGE_COMPANY, lastof(buf)); DrawCompanyIcon(_current_company, 60 + GetStringBoundingBox(buf).width, y + 2); break; diff -r 72c00af5c95d -r a1e7417bf1b7 src/company_cmd.cpp --- a/src/company_cmd.cpp Tue Sep 30 20:51:04 2008 +0000 +++ b/src/company_cmd.cpp Tue Sep 30 21:18:28 2008 +0000 @@ -462,14 +462,14 @@ c->president_name_1 = SPECSTR_PRESIDENT_NAME; SetDParam(0, c->index); - GetString(buffer, STR_PLAYER_NAME, lastof(buffer)); + GetString(buffer, STR_PRESIDENT_NAME, lastof(buffer)); if (strlen(buffer) >= 32 || GetStringBoundingBox(buffer).width >= 94) continue; FOR_ALL_COMPANIES(cc) { if (c != cc) { SetDParam(0, cc->index); - GetString(buffer2, STR_PLAYER_NAME, lastof(buffer2)); + GetString(buffer2, STR_PRESIDENT_NAME, lastof(buffer2)); if (strcmp(buffer2, buffer) == 0) goto restart; } diff -r 72c00af5c95d -r a1e7417bf1b7 src/company_gui.cpp --- a/src/company_gui.cpp Tue Sep 30 20:51:04 2008 +0000 +++ b/src/company_gui.cpp Tue Sep 30 21:18:28 2008 +0000 @@ -1252,7 +1252,7 @@ case CW_WIDGET_PRESIDENT_NAME: this->query_widget = CW_WIDGET_PRESIDENT_NAME; SetDParam(0, this->window_number); - ShowQueryString(STR_PLAYER_NAME, STR_700B_PRESIDENT_S_NAME, MAX_LENGTH_PRESIDENT_NAME_BYTES, MAX_LENGTH_PRESIDENT_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); + ShowQueryString(STR_PRESIDENT_NAME, STR_700B_PRESIDENT_S_NAME, MAX_LENGTH_PRESIDENT_NAME_BYTES, MAX_LENGTH_PRESIDENT_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); break; case CW_WIDGET_COMPANY_NAME: diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/afrikaans.txt --- a/src/lang/afrikaans.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/afrikaans.txt Tue Sep 30 21:18:28 2008 +0000 @@ -585,10 +585,8 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Ongelukke / rampe STR_0209_COMPANY_INFORMATION :{YELLOW}Maatskappy informasie STR_020A_ECONOMY_CHANGES :{YELLOW}Ekonomie veranderings -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Produksie veranderings van nywerhede wat by die speler bedien word STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Produksie veranderings van nywerhede wat deur mededingers bedien word STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Ander nywerheid produksie veranderings -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Raad / informasie op speler se voertuie STR_020C_NEW_VEHICLES :{YELLOW}Nuwe voertuie STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Veranderings na vrag aanvarde STR_020E_SUBSIDIES :{YELLOW}Subsidiee @@ -606,10 +604,10 @@ STR_0217_MAGNATE :Magnaat STR_0218_MOGUL :Mongool STR_0219_TYCOON_OF_THE_CENTURY :Magnaat van die eeu -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} behaal '{STRING}' stand! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} van {COMPANY} behaal '{STRING}' stand! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} van {COMPANY} behaal '{STRING}' stand! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Draaiboek Redigeerder @@ -1205,7 +1203,6 @@ STR_CHEATS_TIP :{BLACK}Tikblokkies wys ann as jy die bedreig vroeë gebruik het STR_CHEATS_WARNING :{BLACK}Waarskuwing! U staan op die punt om jou mededinger te verrai. Hou in gedagte dat so 'n skande sal vir ewigheid onthou word. STR_CHEAT_MONEY :{LTBLUE}Vermeerder geld by {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Speel as speler: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Tower stootskraper (uitwis nywerhede, onbeweegbares): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tonnels mag vir mekaar kruis: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Bou terwyl in pouse modus: {ORANGE}{STRING} @@ -1515,7 +1512,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :verkeerde hersiening STR_NETWORK_ERR_CLIENT_NAME_IN_USE :naam reeds in gebruik STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :verkeerde wagwoord -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :verkeerde speler-id in DoCommand STR_NETWORK_ERR_CLIENT_KICKED :geskop by verskaffer STR_NETWORK_ERR_CLIENT_CHEATER :het probeer om 'n bedreig te gebruik STR_NETWORK_ERR_CLIENT_SERVER_FULL :verskaffer vol @@ -2182,7 +2178,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Speler {COMMA}) STR_7004_NEW_FACE :{BLACK}Nuwe Gesig STR_7005_COLOR_SCHEME :{BLACK}Kleur Skema STR_7006_COLOR_SCHEME :{GOLD}Kleur Skema @@ -2236,7 +2231,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Kliek op verkieste kleur skema STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Vermeer groote van lening STR_7036_REPAY_PART_OF_LOAN :{BLACK}Terugbetaal deel van lening -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Bestuurder) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Bestuurder) STR_7038_INAUGURATED :{GOLD}Bevestig: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Voertuie STR_TRAINS :{WHITE}{COMMA} trein{P "" e} @@ -2265,7 +2260,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Vervoer maatsappy in moelikheid! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} sal binnekort afverkoop of bankrospeler verklaar word tensy prestasie verbeter! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Bestuurder) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Bestuurder) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Vervoer maatskappy samesmelting! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} is na {STRING} vir {CURRENCY} verkoop! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Ons is opsoek na 'n vervoer maatskappy wat ons se maatskappy sal oorvat.{}{}Wil jy {COMPANY} koop vir {CURRENCY}? @@ -3339,7 +3334,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/brazilian_portuguese.txt --- a/src/lang/brazilian_portuguese.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/brazilian_portuguese.txt Tue Sep 30 21:18:28 2008 +0000 @@ -596,10 +596,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Abertura de indústrias STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Fechamento de indústrias STR_020A_ECONOMY_CHANGES :{YELLOW}Alterações econômicas -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Mudanças na produção de indústrias providas pelo jogador STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Mudanças na produção de indústrias providas pelo(s) competidor(es) STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Outras mudanças de produção das indústrias -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Avisos / informações dos veículos do jogador STR_020C_NEW_VEHICLES :{YELLOW}Novos veículos STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Alterações de aceitação de carga STR_020E_SUBSIDIES :{YELLOW}Subsídios @@ -617,10 +615,10 @@ STR_0217_MAGNATE :Magnata STR_0218_MOGUL :Grande magnata STR_0219_TYCOON_OF_THE_CENTURY :Magnata do século -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} conquista o status de '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} conquista o status de '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} conquista o status de '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Editor de Cenário @@ -1249,7 +1247,6 @@ STR_CHEATS_TIP :{BLACK}As caixas de verificação indicam se esta trapaça já foi usada antes STR_CHEATS_WARNING :{BLACK}Atenção! Você está prestes a trair os seus oponentes. Saiba que isto ficará registrado para sempre. STR_CHEAT_MONEY :{LTBLUE}Aumentar dinheiro em {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Jogar como jogador: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Bulldozer mágico (destrói indústrias, etc.): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Os túneis poderão cruzar-se: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Permitir construção quando em pausa: {ORANGE}{STRING} @@ -1581,7 +1578,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :versão incorreta STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nome já está em uso STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :senha incorreta -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :id do jogador incorreta em DoCommand STR_NETWORK_ERR_CLIENT_KICKED :expulso pelo servidor STR_NETWORK_ERR_CLIENT_CHEATER :estava tentando trapacear STR_NETWORK_ERR_CLIENT_SERVER_FULL :servidor cheio @@ -2267,7 +2263,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Jogador {COMMA}) STR_7004_NEW_FACE :{BLACK}Novo Rosto STR_7005_COLOR_SCHEME :{BLACK}Cores STR_7006_COLOR_SCHEME :{GOLD}Cores: @@ -2321,7 +2316,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Clique no novo esquema de cor STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Pedir empréstimo STR_7036_REPAY_PART_OF_LOAN :{BLACK}Pagar parte do empréstimo -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Presidente) STR_7038_INAUGURATED :{GOLD}Inaugurado: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Veículos: STR_TRAINS :{WHITE}{COMMA} tre{P m ns} @@ -2350,7 +2345,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Empresa de transportes em dificuldades! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} será vendida ou declarada falida a menos que melhore os seus rendimentos em breve! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Presidente) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Presidente) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Fusão de empresa de transportes! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} foi vendida a {STRING} por {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Estamos à procura de uma empresa de transportes para comprar a nossa empresa{}{}Deseja comprar {COMPANY} por {CURRENCY}? @@ -3546,7 +3541,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/bulgarian.txt --- a/src/lang/bulgarian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/bulgarian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -593,10 +593,8 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Инциденти / бедствия STR_0209_COMPANY_INFORMATION :{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}Промени в приемането на товари STR_020E_SUBSIDIES :{YELLOW}Субсидии @@ -614,10 +612,10 @@ STR_0217_MAGNATE :Магнат STR_0218_MOGUL :Завоевател STR_0219_TYCOON_OF_THE_CENTURY :Акула на века -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} достигна статус '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} от {COMPANY} достигна статус '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} от {COMPANY} достигна статус '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Редактор на сценарии @@ -1236,7 +1234,6 @@ STR_CHEATS_TIP :{BLACK}Кутийките показват дали този код е бил използван STR_CHEATS_WARNING :{BLACK}Внимание! По този начин ще измамите своите съперници. Имайте в предвид, че това безчестие ще бъде запомнено вовеки веков. STR_CHEAT_MONEY :{LTBLUE}Увеличаване на парите с {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Игра като: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Магически булдозер (премахва промишленост, неподвижни обекти): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Тунелите може да се пресичат: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Строене докато режима е Пауза: {ORANGE}{STRING} @@ -1564,7 +1561,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :грешна ревизия STR_NETWORK_ERR_CLIENT_NAME_IN_USE :името вече се използва STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :грешна парола -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :грешен играч № в DoCommand STR_NETWORK_ERR_CLIENT_KICKED :изхрърлен от сървъра STR_NETWORK_ERR_CLIENT_CHEATER :се опита да използва измама STR_NETWORK_ERR_CLIENT_SERVER_FULL :сървърът е пълен @@ -2238,7 +2234,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Играч {COMMA}) STR_7004_NEW_FACE :{BLACK}Ново лице STR_7005_COLOR_SCHEME :{BLACK}Цветове STR_7006_COLOR_SCHEME :{GOLD}Цветове: @@ -2292,7 +2287,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Кликни върху предпочитания цвят STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Увеличи размера на заема STR_7036_REPAY_PART_OF_LOAN :{BLACK}Изплати част от заема -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Управител) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Управител) STR_7038_INAUGURATED :{GOLD}Открита: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}МПС-та: STR_TRAINS :{WHITE}{COMMA} влак{P "" ове} @@ -2321,7 +2316,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Транспортна компания в беда! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} ще бъде продадена или обявена в банкрут освен ако представянето й не се подобри скоро! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Manager) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Manager) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Сливане на транспортни компании! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} беше продадена на {STRING} for {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Ние търсим транспортна компания, която да поеме нашата компания.{}{}Do you want to purchase {COMPANY} for {CURRENCY}? @@ -3491,7 +3486,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/catalan.txt --- a/src/lang/catalan.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/catalan.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,8 @@ 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_PLAYER :{YELLOW}Canvis de producció en indústries proveïdes pel jugador 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_PLAYER :{YELLOW}Avisos / informació dels teus vehicles 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 @@ -616,10 +614,10 @@ STR_0217_MAGNATE :Magnate STR_0218_MOGUL :Gran Magnate STR_0219_TYCOON_OF_THE_CENTURY :Magnate del Segle -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} asoleix l'estat '{STRING}' ! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} asoleix l'estat '{STRING}' ! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} asoleix l'estat '{STRING}' ! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Editor d'Escenaris @@ -1248,7 +1246,6 @@ 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_PLAYER :{LTBLUE}Juga com el jugador: {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} @@ -1580,7 +1577,6 @@ 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_PLAYER_MISMATCH :id de jugador incorrecta 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 @@ -2266,7 +2262,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Jugador {COMMA}) STR_7004_NEW_FACE :{BLACK}Nova Cara STR_7005_COLOR_SCHEME :{BLACK}Esquema de color STR_7006_COLOR_SCHEME :{GOLD}Esquema de color: @@ -2320,7 +2315,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Clica al nou esquema de color triat STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Augmenta l'import del préstec STR_7036_REPAY_PART_OF_LOAN :{BLACK}Amortitza part del préstec -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(President) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(President) STR_7038_INAUGURATED :{GOLD}Inaugurat: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vehicles: STR_TRAINS :{WHITE}{COMMA} tren{P "" s} @@ -2349,7 +2344,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Empresa de Transport en dificultats! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} ha de ser venuda o declarar-se en fallida a menys que el seu rendiment s'incrementi aviat! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(President) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(President) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Fusió d'Empreses de Transport! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} s'ha venut a {STRING} per {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Busquem empresa de transports per absorbir la nostra empresa{}{}Vols comprar a {COMPANY} per {CURRENCY}? @@ -3545,7 +3540,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/croatian.txt --- a/src/lang/croatian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/croatian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Otvaranje industrije STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Zatvaranje industrije STR_020A_ECONOMY_CHANGES :{YELLOW}Promjene u gospodarstvu -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Izmjene u produktivnosti industrija djelovanjem igrača STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Izmjene u produktivnosti industrija djelovanjem suparnika STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Ostale izmjene u produktivnosti industrija -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Savjet / informacija o vozilima igrača STR_020C_NEW_VEHICLES :{YELLOW}Nova vozila STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Promjene u prihvaćanju tereta STR_020E_SUBSIDIES :{YELLOW}Subvencije @@ -616,10 +614,10 @@ STR_0217_MAGNATE :Velikaš STR_0218_MOGUL :Bogataš STR_0219_TYCOON_OF_THE_CENTURY :Tajkun stoljeća -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}Tvrtka {COMPANY} postigla je status '{STRING}' ! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} iz tvrtke {COMPANY} postigao je status '{STRING}' ! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} iz tvrtke {COMPANY} postigao je status '{STRING}' ! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Uređivanje scenarija @@ -1238,7 +1236,6 @@ STR_CHEATS_TIP :{BLACK}Kvačice ukazuju na to jesi li koristio ovo varanje prije STR_CHEATS_WARNING :{BLACK}Upozorenje! Upravo se spremaš izdati svoj kolege natjecatelje. Imaj na umu da se takva sramota pamti zauvijek. STR_CHEAT_MONEY :{LTBLUE}Povećaj novce za iznos {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Igraj kao igrač: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Čudesni buldožer (uklanja industrije, nepokretne objekte): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tuneli se mogu ukrštavati međusobno: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Gradi dok je vrijeme zaustavljeno: {ORANGE}{STRING} @@ -1561,7 +1558,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :pogrešna revizija STR_NETWORK_ERR_CLIENT_NAME_IN_USE :ime se već koristi STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :pogrešna zaporka -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :pogrešan id igrača u DoCommand STR_NETWORK_ERR_CLIENT_KICKED :izbačen{G "" a o} od strane poslužitelja STR_NETWORK_ERR_CLIENT_CHEATER :je pokuša{G o la lo} varati STR_NETWORK_ERR_CLIENT_SERVER_FULL :poslužitelj je pun @@ -2234,7 +2230,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Igrač {COMMA}) STR_7004_NEW_FACE :{BLACK}Novo lice STR_7005_COLOR_SCHEME :{BLACK}Boja STR_7006_COLOR_SCHEME :{GOLD}Boja: @@ -2288,7 +2283,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Klikni na željenu boju STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Povećaj iznos zajma STR_7036_REPAY_PART_OF_LOAN :{BLACK}Otplati dio zajma -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Direktor) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Direktor) STR_7038_INAUGURATED :{GOLD}Na poziciji od: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vozila: STR_TRAINS :{WHITE}{COMMA} vlak{P "" a ova} @@ -2317,7 +2312,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Prijevozna tvrtka u nevoljama! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} će biti rasprodana ili objaviti bankrot ukoliko se učinak uskoro ne poboljša! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Direktor) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Direktor) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Spajanje prijevoznih tvrtki! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} je prodana tvrtki {STRING} za {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Tražimo prijevoznu tvrtku koja bi preuzela našu tvrtku.{}{}Želiš li kupiti tvrtku {COMPANY} za {CURRENCY}? @@ -3400,7 +3395,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/czech.txt --- a/src/lang/czech.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/czech.txt Tue Sep 30 21:18:28 2008 +0000 @@ -653,10 +653,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Otevírání průmyslu STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Zavírání průmyslu STR_020A_ECONOMY_CHANGES :{YELLOW}Změny v ekonomice -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Změny produkce průmyslu obsluhovaného hráčem STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Změny produkce průmyslu obsluhovaného konkurencí STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Jiné změny produkce průmyslu -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Rady a informace k hráčovým vozidlům STR_020C_NEW_VEHICLES :{YELLOW}Nový dopravní prostředek STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Změny příjmu zboží STR_020E_SUBSIDIES :{YELLOW}Dotace @@ -674,10 +672,10 @@ STR_0217_MAGNATE :Magnát STR_0218_MOGUL :Velemagnát STR_0219_TYCOON_OF_THE_CENTURY :Magnát století -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} získal titul '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} získal titul '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} z {COMPANY} získal titul '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Editor mapy @@ -1306,7 +1304,6 @@ STR_CHEATS_TIP :{BLACK}Zaškrtávací políčka ukazují, jestli jsi tento cheat už použil. STR_CHEATS_WARNING :{BLACK}Varování! Chystáš se podvést ostatní hráče. Pamatuj si, že tento podlý čin nebude nikdy zapomenut! STR_CHEAT_MONEY :{LTBLUE}Navýšit peníze o {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Hrát jako hráč: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magický buldozer (odstraní průmysl a neodstranitelné předměty): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunely se mohou křížit: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Povolit stavění v pauze: {ORANGE}{STRING} @@ -1638,7 +1635,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :špatná revize hry STR_NETWORK_ERR_CLIENT_NAME_IN_USE :jméno se už používá STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :špatné heslo -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :špatné ID hráče v DoCommand STR_NETWORK_ERR_CLIENT_KICKED :vyhozen serverem STR_NETWORK_ERR_CLIENT_CHEATER :se pokoušel podvádět STR_NETWORK_ERR_CLIENT_SERVER_FULL :na serveru je plno @@ -2324,7 +2320,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(hráč {COMMA}) STR_7004_NEW_FACE :{BLACK}Nový obličej STR_7005_COLOR_SCHEME :{BLACK}Barva STR_7006_COLOR_SCHEME :{GOLD}Barevné schéma: @@ -2378,7 +2373,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Stiskni vybrané barevné schéma STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Půjčit si více STR_7036_REPAY_PART_OF_LOAN :{BLACK}Splatit část dluhu -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Prezident) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Prezident) STR_7038_INAUGURATED :{GOLD}Založeno: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vozidla: STR_TRAINS :{WHITE}{COMMA} vlak{P "" y ů} @@ -2407,7 +2402,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Dopravní společnost má problémy! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} bude prodána nebo vyhlásí bankrot, pokud se brzy nezvýší výkonnost! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Prezident) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Prezident) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Sloučení dopravních společností! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} byla prodána {STRING} za {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Hledáme společnost, která převezme naši společnost.{}{}Chcete zakoupit {COMPANY} za {CURRENCY}? @@ -3609,7 +3604,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/danish.txt --- a/src/lang/danish.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/danish.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Åbning af industrier STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Lukning af industrier STR_020A_ECONOMY_CHANGES :{YELLOW}Økonomiændringer -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Produktionsændringer for industrier forsynet af spilleren STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Produktionsændringer for industrier forsynet af deltager(e) STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Andre produktionsændringer for industri -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Rådgivning / information om spillerens køretøjer STR_020C_NEW_VEHICLES :{YELLOW}Nye køretøjer STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Ændring i accepteret gods STR_020E_SUBSIDIES :{YELLOW}Tilskudsordninger @@ -616,10 +614,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Århundredes Matador -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} får '{STRING}' status! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} fra {COMPANY} får '{STRING}' status! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} fra {COMPANY} får '{STRING}' status! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scenarieeditor @@ -1248,7 +1246,6 @@ STR_CHEATS_TIP :{BLACK}Checkbokse viser, om du har brugt denne snydefunktion før STR_CHEATS_WARNING :{BLACK}Advarsel! Du er ved at forråde dine modstandere. Husk at dette vil blive husket i al evighed. STR_CHEAT_MONEY :{LTBLUE}Forøg kassebeholdning med {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Spil som spiller: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magisk bulldozer (nedriv ting, som normalt ikke kan fjernes): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunneler kan krydse hinanden: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Tillad at bygge mens pause er aktiveret: {ORANGE}{STRING} @@ -1580,7 +1577,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :forkert revision STR_NETWORK_ERR_CLIENT_NAME_IN_USE :navnet er allerede i brug STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :forkert spil password -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :forkert player-id i DoCommand STR_NETWORK_ERR_CLIENT_KICKED :smidt ud af serveren STR_NETWORK_ERR_CLIENT_CHEATER :prøvede at snyde STR_NETWORK_ERR_CLIENT_SERVER_FULL :serveren er fuld @@ -2266,7 +2262,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Spiller {COMMA}) STR_7004_NEW_FACE :{BLACK}Nyt ansigt STR_7005_COLOR_SCHEME :{BLACK}Farvetema STR_7006_COLOR_SCHEME :{GOLD}Farvetema: @@ -2320,7 +2315,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Klik på det nye farvetema STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Forøg lånet STR_7036_REPAY_PART_OF_LOAN :{BLACK}Tilbagebetal en del af lånet -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Direktør) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Direktør) STR_7038_INAUGURATED :{GOLD}Indviet: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Køretøjer: STR_TRAINS :{WHITE}{COMMA} tog{P "" e} @@ -2349,7 +2344,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportselskab i vanskeligheder! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} vil blive erklæret konkurs eller solgt, hvis ikke ydelsen stiger snart! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Direktør) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Direktør) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Fussion mellem transportselskaber! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} er blevet solgt til {STRING} for {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Vi leder efter et selskab til at overtage vores{}{}Vil du købe {COMPANY} for {CURRENCY}? @@ -3545,7 +3540,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/dutch.txt --- a/src/lang/dutch.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/dutch.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Openen van industriën STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Sluiten van industriën STR_020A_ECONOMY_CHANGES :{YELLOW}Veranderingen in de economie -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Productie veranderingen van industriën bezocht door speler STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Productie veranderingen van industriën bezocht door tegenstander(s) STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Andere productie aanpassingen van industriën -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Advies/informatie over voertuigen van de speler STR_020C_NEW_VEHICLES :{YELLOW}Nieuwe voertuigen STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Verandering geaccepteerde goederen STR_020E_SUBSIDIES :{YELLOW}Subsidies @@ -616,10 +614,10 @@ STR_0217_MAGNATE :Magnaat STR_0218_MOGUL :Mogol STR_0219_TYCOON_OF_THE_CENTURY :Tycoon van de Eeuw -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} bereikt '{STRING}' status! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} van {COMPANY} bereikt '{STRING}' status! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} van {COMPANY} bereikt '{STRING}' status! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scenario editor @@ -1248,7 +1246,6 @@ STR_CHEATS_TIP :{BLACK}Keuzevakjes geven aan of je deze cheat al ooit gebruikt hebt. STR_CHEATS_WARNING :{BLACK}Waarschuwing! Je staat op het punt je concurrenten te verraden. Bedenk dat zo'n schande eeuwig wordt onthouden. STR_CHEAT_MONEY :{LTBLUE}Verhoog geld met {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Spelend als speler: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magische bulldozer (industrieën en andere onverplaatsbare objecten verwijderen): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnels mogen elkaar kruisen: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Bouwen in gepauzeerde toestand: {ORANGE}{STRING} @@ -1580,7 +1577,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :foute revisie STR_NETWORK_ERR_CLIENT_NAME_IN_USE :naam al in gebruik STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :fout spel-wachtwoord -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :fout speler-nummer in DoCommand STR_NETWORK_ERR_CLIENT_KICKED :geschopt door server STR_NETWORK_ERR_CLIENT_CHEATER :probeerde vals te spelen STR_NETWORK_ERR_CLIENT_SERVER_FULL :server is vol @@ -2266,7 +2262,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Speler {COMMA}) STR_7004_NEW_FACE :{BLACK}Nieuw gezicht STR_7005_COLOR_SCHEME :{BLACK}Kleurenschema STR_7006_COLOR_SCHEME :{GOLD}Kleurenschema: @@ -2320,7 +2315,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Klik op geselecteerde nieuwe kleurenschema STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Vergroot lening STR_7036_REPAY_PART_OF_LOAN :{BLACK}Betaal deel van lening terug -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Directeur) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Directeur) STR_7038_INAUGURATED :{GOLD}Gesticht: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Voertuigen: STR_TRAINS :{WHITE}{COMMA} trein{P "" en} @@ -2349,7 +2344,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportbedrijf in de problemen! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} wordt verkocht of failliet verklaard tenzij financiële situatie snel verbetert! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Directeur) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Directeur) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Transportbedrijf overgenomen! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} is verkocht aan {STRING} voor {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}We zoeken voor een transportbedrijf dat ons bedrijf over kan nemen.{}{}Wil je {COMPANY} kopen voor {CURRENCY}? @@ -3545,7 +3540,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/english.txt --- a/src/lang/english.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/english.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,10 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Opening of industries STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Closing of industries STR_020A_ECONOMY_CHANGES :{YELLOW}Economy changes -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Production changes of industries served by the player +STR_INDUSTRY_CHANGES_SERVED_BY_COMPANY :{YELLOW}Production changes of industries served by the company STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Production changes of industries served by competitor(s) STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Other industry production changes -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Advice / information on player's vehicles +STR_020B_ADVICE_INFORMATION_ON_COMPANY :{YELLOW}Advice / information on company's vehicles STR_020C_NEW_VEHICLES :{YELLOW}New vehicles STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Changes to cargo acceptance STR_020E_SUBSIDIES :{YELLOW}Subsidies @@ -616,10 +616,10 @@ STR_0217_MAGNATE :Magnate STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Tycoon of the Century -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} of {COMPANY} achieves '{STRING}' status! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} of {COMPANY} achieves '{STRING}' status! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scenario Editor @@ -1248,7 +1248,7 @@ STR_CHEATS_TIP :{BLACK}Checkboxes indicate if you have used this cheat before STR_CHEATS_WARNING :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity. STR_CHEAT_MONEY :{LTBLUE}Increase money by {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Playing as player: {ORANGE}{COMMA} +STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Playing as company: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING1} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING1} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Build while in pause mode: {ORANGE}{STRING1} @@ -1580,7 +1580,7 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :wrong revision STR_NETWORK_ERR_CLIENT_NAME_IN_USE :name already in use STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :wrong password -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :wrong player-id in DoCommand +STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH :wrong company-id in DoCommand STR_NETWORK_ERR_CLIENT_KICKED :kicked by server STR_NETWORK_ERR_CLIENT_CHEATER :was trying to use a cheat STR_NETWORK_ERR_CLIENT_SERVER_FULL :server full @@ -2266,7 +2266,7 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Player {COMMA}) +STR_7002_COMPANY :(Company {COMMA}) STR_7004_NEW_FACE :{BLACK}New Face STR_7005_COLOR_SCHEME :{BLACK}Colour Scheme STR_7006_COLOR_SCHEME :{GOLD}Colour Scheme: @@ -2320,7 +2320,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Click on desired colour scheme STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Increase size of loan STR_7036_REPAY_PART_OF_LOAN :{BLACK}Repay part of loan -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manager) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manager) STR_7038_INAUGURATED :{GOLD}Inaugurated: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vehicles: STR_TRAINS :{WHITE}{COMMA} train{P "" s} @@ -2349,7 +2349,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transport company in trouble! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{RAW_STRING} will be sold off or declared bankrupt unless performance increases soon! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Manager) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Manager) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Transport company merger! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{RAW_STRING} has been sold to {RAW_STRING} for {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}We are looking for a transport company to take-over our company.{}{}Do you want to purchase {COMPANY} for {CURRENCY}? @@ -3545,7 +3545,7 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} +STR_PRESIDENT_NAME :{PRESIDENTNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/english_US.txt --- a/src/lang/english_US.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/english_US.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Opening of industries STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Closing of industries STR_020A_ECONOMY_CHANGES :{YELLOW}Economy changes -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Production changes of industries served by the player STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Production changes of industries served by competitor(s) STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Other industry production changes -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Advice / information on player's vehicles STR_020C_NEW_VEHICLES :{YELLOW}New vehicles STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Changes of cargo acceptance STR_020E_SUBSIDIES :{YELLOW}Subsidies @@ -616,10 +614,10 @@ STR_0217_MAGNATE :Magnate STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Tycoon of the Century -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} of {COMPANY} achieves '{STRING}' status! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} of {COMPANY} achieves '{STRING}' status! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scenario Editor @@ -1248,7 +1246,6 @@ STR_CHEATS_TIP :{BLACK}Checkboxes indicate if you have used this cheat before STR_CHEATS_WARNING :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity. STR_CHEAT_MONEY :{LTBLUE}Increase money by {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Playing as player: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magic bulldozer (remove industries, unmovables): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnels may cross each other: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Build while in pause mode: {ORANGE}{STRING} @@ -1580,7 +1577,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :wrong revision STR_NETWORK_ERR_CLIENT_NAME_IN_USE :name already in use STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :wrong game-password -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :wrong player-id in DoCommand STR_NETWORK_ERR_CLIENT_KICKED :kicked by server STR_NETWORK_ERR_CLIENT_CHEATER :was trying to use a cheat STR_NETWORK_ERR_CLIENT_SERVER_FULL :server full @@ -2266,7 +2262,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Player {COMMA}) STR_7004_NEW_FACE :{BLACK}New Face STR_7005_COLOR_SCHEME :{BLACK}Color Scheme STR_7006_COLOR_SCHEME :{GOLD}Color Scheme: @@ -2320,7 +2315,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Click on desired color scheme STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Increase size of loan STR_7036_REPAY_PART_OF_LOAN :{BLACK}Repay part of loan -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(President) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(President) STR_7038_INAUGURATED :{GOLD}Inaugurated: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vehicles: STR_TRAINS :{WHITE}{COMMA} train{P "" s} @@ -2349,7 +2344,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transport company in trouble! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} will be sold off or declared bankrupt unless performance increases soon! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(President) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(President) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Transport company merger! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} has been sold to {STRING} for {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}We are looking for a transport company to take-over our company{}{}Do you want to purchase {COMPANY} for {CURRENCY}? @@ -3545,7 +3540,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/esperanto.txt --- a/src/lang/esperanto.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/esperanto.txt Tue Sep 30 21:18:28 2008 +0000 @@ -586,7 +586,6 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Akcidentoj / katastrofoj STR_0209_COMPANY_INFORMATION :{YELLOW}Kompaniaj informoj STR_020A_ECONOMY_CHANGES :{YELLOW}Ekonomiaj ŝanĝoj -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Konsiloj / informoj pri propraj veturiloj STR_020C_NEW_VEHICLES :{YELLOW}Novaj veturiloj STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Ŝarĝakceptado ŝanĝiĝas STR_020E_SUBSIDIES :{YELLOW}Subvencioj @@ -604,10 +603,10 @@ STR_0217_MAGNATE :Manaĝisto STR_0218_MOGUL :Potenculo STR_0219_TYCOON_OF_THE_CENTURY :Plej potenca de la Jarcento -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} atingis staton de '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} atingis staton de '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} atingis staton de '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scenarkreilon @@ -1165,7 +1164,6 @@ STR_CHEATS_TIP :{BLACK}La kvadratetoj indikas ĉu vi jam uzis la filudaĵon antaŭe. STR_CHEATS_WARNING :{BLACK}Atentu! Vi perfidos viajn kunulajn konkurantojn. Memoru ke io tia rememoriĝos eterne. STR_CHEAT_MONEY :{LTBLUE}Altigu monkvanton per {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Ludu kiel ludanto: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magia forigilo (forviŝu industriojn, nemoveblaĵojn): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tuneloj rajtas kruciĝi unu kun la alia: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Konstruado eblas dum paŭzo: {ORANGE}{STRING} @@ -1439,7 +1437,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :malĝusta revidaĵo STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nomo jam uziĝas STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :malĝusta pasvorto -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :malĝusta ludant-id en FarKomando STR_NETWORK_ERR_CLIENT_KICKED :forbatite de servilo STR_NETWORK_ERR_CLIENT_CHEATER :provis uzi filudaĵon STR_NETWORK_ERR_CLIENT_SERVER_FULL :servilo plenas @@ -2055,7 +2052,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Ludanto {COMMA}) STR_7004_NEW_FACE :{BLACK}Nova Vizaĝo STR_7005_COLOR_SCHEME :{BLACK}Kolorskemo STR_7006_COLOR_SCHEME :{GOLD}Kolorskemo: @@ -2109,7 +2105,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Alklaku la deziratan kolorskemon STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Grandigu prunton STR_7036_REPAY_PART_OF_LOAN :{BLACK}Repagu pruntparton -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manaĝanto) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manaĝanto) STR_7038_INAUGURATED :{GOLD}Inaŭgurita: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Veturiloj: STR_TRAINS :{WHITE}{COMMA} trajno{P "" j} @@ -2138,7 +2134,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportkompanio en problemoj! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} forvendiĝos aŭ bankrotiĝos krom se ĝi pli bone faros! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Manaĝanto) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Manaĝanto) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Transportkompania kuniĝo! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} vendiĝis al {STRING} por {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Ni serĉas transportkompanion por transpreni nian kompanion.{}{}Ĉu vi volas aĉeti {COMPANY} por {CURRENCY}? diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/estonian.txt --- a/src/lang/estonian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/estonian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -649,10 +649,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Tööstuste avamine STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Tööstuste sulgemine STR_020A_ECONOMY_CHANGES :{YELLOW}Muutused majanduses -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Mängija poolt teenindavate tööstuste toodangumuutused STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Konkurentide poolt teenindavate tööstuste toodangumuutused STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Ülejäänud tööstuste toodangumuutused -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Soovitused ja teated mängija veovahendite kohta STR_020C_NEW_VEHICLES :{YELLOW}Uus veerem STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Veoste vastuvõtutingimuste muutumine STR_020E_SUBSIDIES :{YELLOW}Toetused @@ -670,10 +668,10 @@ STR_0217_MAGNATE :Magnaat STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Sajandi suurärimees -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} saavutas '{STRING}' staatuse! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} {COMPANY}'st saavutas '{STRING}' staatuse! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} {COMPANY}'st saavutas '{STRING}' staatuse! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Kaardiredaktor @@ -1302,7 +1300,6 @@ STR_CHEATS_TIP :{BLACK}Märgistatud kastid näitavad et, kas sa oled varem seda pettust kasutanud STR_CHEATS_WARNING :{BLACK}Hoiatus! Sa kavatsed oma konkurente reeta. Pea meeles, et sellisest häbist ei saa sa enam kunagi lahti. STR_CHEAT_MONEY :{LTBLUE}Suurenda raha hulka {CURRENCY} võrra -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Mängi, kui mängija: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Maagiline buldooser (eemaldamatute rajatiste lammutamine): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnelid võivad üksteist läbida: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Seisatuse ajal ehitamine: {ORANGE}{STRING} @@ -1634,7 +1631,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :vale versioon STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nimi on juba kasutusel STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :vale mängu parool -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :vale mängija-id DoCommand'is STR_NETWORK_ERR_CLIENT_KICKED :server viskas välja STR_NETWORK_ERR_CLIENT_CHEATER :üritas pettust kasutada STR_NETWORK_ERR_CLIENT_SERVER_FULL :server on täis @@ -2320,7 +2316,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY}{BLACK}{COMPANYNUM} -STR_7002_PLAYER : (mängija {COMMA}) STR_7004_NEW_FACE :{BLACK}Uus nägu STR_7005_COLOR_SCHEME :{BLACK}Värvivalik STR_7006_COLOR_SCHEME :{GOLD}Värvivalik: @@ -2374,7 +2369,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Värvil vajutades valib värvi STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Laena raha STR_7036_REPAY_PART_OF_LOAN :{BLACK}Maksa laen osaliselt tagasi -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(President) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(President) STR_7038_INAUGURATED :{GOLD}Asutatud: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Sõidukeid: STR_TRAINS :{WHITE}{COMMA} rong{P "" i} @@ -2403,7 +2398,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Ettevõttel on probleeme! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}Ettevõte {STRING} müüakse maha ja kuulutatakse pankrot, kui tulemused peatselt ei parane! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(President) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(President) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Ettevõtete ühinemine! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} müüdi ettevõttele {STRING} {CURRENCY} eest! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Otsime ettevõtet, kes võtaks meie firma üle.{}{}Kas soovite osta ettevõtte {COMPANY} {CURRENCY} eest? @@ -3599,7 +3594,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/finnish.txt --- a/src/lang/finnish.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/finnish.txt Tue Sep 30 21:18:28 2008 +0000 @@ -593,7 +593,6 @@ STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Lakkautettavaa teollisuutta STR_020A_ECONOMY_CHANGES :{YELLOW}Talouden muutokset STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Muita muutoksia tuotannossa -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Neuvoja/tietoja pelaajan ajoneuvoista STR_020C_NEW_VEHICLES :{YELLOW}Uudet ajoneuvot STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Rahdin vastaanottamisen muutokset STR_020E_SUBSIDIES :{YELLOW}Tuet @@ -611,10 +610,10 @@ STR_0217_MAGNATE :Magnaatti STR_0218_MOGUL :Moguli STR_0219_TYCOON_OF_THE_CENTURY :Vuosisadan pohatta -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} saavuttaa arvon '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} yhtiöstä {COMPANY} saavuttaa arvon '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} yhtiöstä {COMPANY} saavuttaa arvon '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Skenaariomuokkain @@ -1223,7 +1222,6 @@ STR_CHEATS_TIP :{BLACK}Valintaruudut osoittavat, oletko käyttänyt huijausta aiemmin. STR_CHEATS_WARNING :{BLACK}Varoitus! Olet juuri pettämässä kanssakilpailijoitasi. Pidä mielessä, että tällainen häväistys pidetään mielessä ikuisuuden ajan. STR_CHEAT_MONEY :{LTBLUE}Anna lisää rahaa: {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Pelaa pelaajana: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Taikapuskutraktori (siirrä teollisuutta yms.): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnelit voivat mennä ristiin: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Rakenna tauon aikana: {ORANGE}{STRING} @@ -1549,7 +1547,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :väärä revisio STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nimi on jo käytössä STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :väärä pelisalasana -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :väärä player-id DoCommand:ssa STR_NETWORK_ERR_CLIENT_KICKED :palvelin potki pihalle STR_NETWORK_ERR_CLIENT_CHEATER :yritti käyttää huijausta STR_NETWORK_ERR_CLIENT_SERVER_FULL :palvelin täynnä @@ -2213,7 +2210,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Pelaaja {COMMA}) STR_7004_NEW_FACE :{BLACK}Uudet kasvot STR_7005_COLOR_SCHEME :{BLACK}Väriteema STR_7006_COLOR_SCHEME :{GOLD}Väriteema: @@ -2267,7 +2263,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Valitse tunnusväri. STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Ota lisää lainaa. STR_7036_REPAY_PART_OF_LOAN :{BLACK}Lyhennä lainaa. -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(pääjohtaja) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(pääjohtaja) STR_7038_INAUGURATED :{GOLD}Avattu: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Liikennevälineet: STR_TRAINS :{WHITE}{COMMA} juna{P "" a} @@ -2296,7 +2292,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Kuljetusyhtiö vaikeuksissa! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} myydään tai julistetaan konkurssiin, ellei suorituskyky lisäänny pian! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(pääjohtaja) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(pääjohtaja) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Kuljetusyhtiöiden sulautuminen! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} on myyty yhtiölle {STRING} hintaan {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Etsimme kuljetusyhtiötä, joka ottaisi haltuunsa yhtiömme{}{}Haluatko ostaa yhtiön {COMPANY} hintaan {CURRENCY}? @@ -3389,7 +3385,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/french.txt --- a/src/lang/french.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/french.txt Tue Sep 30 21:18:28 2008 +0000 @@ -596,10 +596,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Ouvertures d'industries STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Fermetures d'industries STR_020A_ECONOMY_CHANGES :{YELLOW}Changements économiques -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Changements de production des industries desservies par vous STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Changements de production des industries desservies par les autres STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Changement de production des industries non desservies -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Conseils / information sur les véhicules du joueur STR_020C_NEW_VEHICLES :{YELLOW}Nouveaux véhicules STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Changements d'acceptation de marchandises STR_020E_SUBSIDIES :{YELLOW}Subventions @@ -617,10 +615,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Grand ponte STR_0219_TYCOON_OF_THE_CENTURY :Tycoon du Siècle -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} atteint le niveau de '{STRING}' ! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} atteint le niveau de '{STRING}' ! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} atteint le niveau de '{STRING}' ! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Éditeur de Scénario @@ -1249,7 +1247,6 @@ STR_CHEATS_TIP :{BLACK}Les cases à cocher indiquent que vous avez déjà utilisé cette triche auparavant STR_CHEATS_WARNING :{BLACK}Attention ! Vous êtes sur le point de trahir vos adversaires. Gardez en tête qu'une telle honte sera gardée en mémoire pour l'éternité. STR_CHEAT_MONEY :{LTBLUE}Augmenter l'argent de {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Jouer en tant que joueur n°: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Bulldozer magique (enlèvement industries et objets fixes): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Les tunnels peuvent se croiser: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Construire pendant le mode pause: {ORANGE}{STRING} @@ -1581,7 +1578,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :révision incorrecte STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nom déjà utilisé STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :mot de passe de partie incorrect -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :mauvais player-id dans DoCommand STR_NETWORK_ERR_CLIENT_KICKED :jeté par le serveur STR_NETWORK_ERR_CLIENT_CHEATER :a tenté de tricher STR_NETWORK_ERR_CLIENT_SERVER_FULL :Serveur complet @@ -2267,7 +2263,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Joueur {COMMA}) STR_7004_NEW_FACE :{BLACK}Nouveau visage STR_7005_COLOR_SCHEME :{BLACK}Couleur STR_7006_COLOR_SCHEME :{GOLD}Couleur: @@ -2321,7 +2316,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Cliquer pour choisir une couleur STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Augmenter le prêt STR_7036_REPAY_PART_OF_LOAN :{BLACK}Rembourser une partie du prêt -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Président) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Président) STR_7038_INAUGURATED :{GOLD}Inauguré en: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Véhicules: STR_TRAINS :{WHITE}{COMMA} train{P "" s} @@ -2350,7 +2345,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}La compagnie de transport à des ennuis! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} va être en banqueroute si ses performances ne s'améliorent pas! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Président) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Président) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Fusion de compagnies de transport! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} à été vendue à {STRING} pour {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Nous sommes à la recherche d'un acheteur pour notre compagnie{}{}Voulez vous acheter {COMPANY} pour {CURRENCY}? @@ -3546,7 +3541,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/galician.txt --- a/src/lang/galician.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/galician.txt Tue Sep 30 21:18:28 2008 +0000 @@ -596,10 +596,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Apertura de industrias STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Pecha unha industria STR_020A_ECONOMY_CHANGES :{YELLOW}Cambios económicos -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Cambios na producción das industrias servidas polo xogador STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Cambios na producción das industrias servidas polos competidores STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Cambios de producción doutras industrias -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Consellos/información sobre os teus vehículos STR_020C_NEW_VEHICLES :{YELLOW}Novos vehículos STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Cambios na admisión de carga STR_020E_SUBSIDIES :{YELLOW}Subsidios @@ -617,10 +615,10 @@ STR_0217_MAGNATE :Magnate STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Magnate da Centuria -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}¡{COMPANY} logra o status de '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}¡{PLAYERNAME} de {COMPANY} logra o status '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}¡{PRESIDENTNAME} de {COMPANY} logra o status '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Editor de Escenario @@ -1249,7 +1247,6 @@ STR_CHEATS_TIP :{BLACK}As caixas de confirmación indican se usaches esta trampa antes STR_CHEATS_WARNING :{BLACK}¡Advertencia! Estás a piques de traizoa-los teus opoñentes. Ten en conta que unha desgracia coma esta se lembrará eternamente. STR_CHEAT_MONEY :{LTBLUE}Incrementa-lo diñeiro en {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Xogar coma xogador: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Escavadora máxica(Elimina industrias, non eliminables): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Os tuneis poden cruzarse entre eles: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Permiti-la construcción en modo pausa: {ORANGE}{STRING} @@ -1581,7 +1578,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :revisión errónea STR_NETWORK_ERR_CLIENT_NAME_IN_USE :o nome xa está en uso STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :contrasinal incorrecta -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :id de xogador errónea en DoCommand STR_NETWORK_ERR_CLIENT_KICKED :pateado polo servidor STR_NETWORK_ERR_CLIENT_CHEATER :intentaba usar unha trampa STR_NETWORK_ERR_CLIENT_SERVER_FULL :servidor cheo @@ -2267,7 +2263,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Xogador {COMMA}) STR_7004_NEW_FACE :{BLACK}Nova Cara STR_7005_COLOR_SCHEME :{BLACK}Esquema de Cor STR_7006_COLOR_SCHEME :{GOLD}Esquema de Cor: @@ -2321,7 +2316,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Pincha no novo esquema de cor STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Incrementa-lo préstamo STR_7036_REPAY_PART_OF_LOAN :{BLACK}Pagar parte do préstamo -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Presidente) STR_7038_INAUGURATED :{GOLD}Inaugurado: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vehículos: STR_TRAINS :{WHITE}{COMMA} tren{P "" s} @@ -2350,7 +2345,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}¡Compañía de transporte en problemas! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} vai ser vendida ou declarada en bancarrota se non mellora o seu rendemento pronto! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Presidente) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Presidente) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}¡Fusión de compañías de transporte! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} foi vendida a {STRING} por {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Buscamos unha compañía de transporte para adquiri-la nosa compañía{}{}¿Queres comprar {COMPANY} por {CURRENCY}? @@ -3546,7 +3541,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/german.txt --- a/src/lang/german.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/german.txt Tue Sep 30 21:18:28 2008 +0000 @@ -596,10 +596,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Eröffnung von Industrien STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Schließung von Industrien STR_020A_ECONOMY_CHANGES :{YELLOW}Änderungen der Wirtschaftslage -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Produktionsänderung von Industrien, die der Spieler bedient STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Produktionsänderung von Industrien, die ein Gegner bedient STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Andere Produktionsänderungen -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Rat / Informationen zu Fahrzeugen des Spielers STR_020C_NEW_VEHICLES :{YELLOW}Neue Fahrzeuge STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Änderungen akzeptierter Fracht STR_020E_SUBSIDIES :{YELLOW}Subventionen @@ -617,10 +615,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Tycoon des Jahrhunderts -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} erreicht '{STRING}' Status! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} von {COMPANY} erreicht '{STRING}' Status! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} von {COMPANY} erreicht '{STRING}' Status! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Szenario Editor @@ -1249,7 +1247,6 @@ STR_CHEATS_TIP :{BLACK}Die Kontrollkästchen zeigen an, ob dieser Cheat schonmal verwendet worden ist. STR_CHEATS_WARNING :{BLACK}Achtung! Sie sind im Begriff, Ihre Mitspieler zu betrügen. Bedenken Sie, dass sie Ihnen das niemals verzeihen werden. STR_CHEAT_MONEY :{LTBLUE}Kontostand um {CURRENCY} erhöhen -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Folgenden Spieler steuern: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Mächtigeres Abrisswerkzeug: {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnel dürfen sich kreuzen {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Bauen im Pausenmodus: {ORANGE}{STRING} @@ -1581,7 +1578,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :Falsche Version STR_NETWORK_ERR_CLIENT_NAME_IN_USE :Name wird bereits verwendet STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :Falsches Spielpasswort -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :Falsche Spieler-ID in DoCommand (Verarbeitungsfehler) STR_NETWORK_ERR_CLIENT_KICKED :ausgeschlossen STR_NETWORK_ERR_CLIENT_CHEATER :hat versucht zu mogeln STR_NETWORK_ERR_CLIENT_SERVER_FULL :Server voll @@ -2267,7 +2263,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Spieler {COMMA}) STR_7004_NEW_FACE :{BLACK}Neues Gesicht STR_7005_COLOR_SCHEME :{BLACK}Farbauswahl STR_7006_COLOR_SCHEME :{GOLD}Farbauswahl: @@ -2321,7 +2316,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Auf die gewünschte Farbe klicken STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Kredit aufnehmen STR_7036_REPAY_PART_OF_LOAN :{BLACK}Kredit abzahlen -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manager) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manager) STR_7038_INAUGURATED :{GOLD}Gegründet: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Fahrzeuge: STR_TRAINS :{WHITE}{COMMA} Z{P ug üge} @@ -2350,7 +2345,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportfirma in der Krise! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} Falls die Firmenleitung sich nicht bessert, wird der Verkauf oder die Insolvenz eingeleitet! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Manager) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Manager) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Transportfirmen fusionieren! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} ist verkauft worden an {STRING} für {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Wir suchen jemanden, der die Firma übernimmt.{}{}Nehmen Sie das Angebot an und kaufen {COMPANY} für {CURRENCY}? @@ -3546,7 +3541,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/hungarian.txt --- a/src/lang/hungarian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/hungarian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -658,10 +658,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Új gazdasági épületek megjelenése STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Gazdasági épületek bezárása STR_020A_ECONOMY_CHANGES :{YELLOW}Gazdasági változások -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Termelésváltozások az általad szállított ipari cégeknél STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Termelésváltozások a konkurrenseid által szállított ipari cégeknél STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Más ipari termelési változások -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Tanácsok / információk a játékos járműveiről STR_020C_NEW_VEHICLES :{YELLOW}Új járművek STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Áruk elfogadásának változásai STR_020E_SUBSIDIES :{YELLOW}Támogatások @@ -679,10 +677,10 @@ STR_0217_MAGNATE :Mágnás STR_0218_MOGUL :Fejes STR_0219_TYCOON_OF_THE_CENTURY :Az évszázad iparmágnása -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} elérte a '{STRING}' rangot! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} - {COMPANY} elérte a '{STRING}' rangot! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} - {COMPANY} elérte a '{STRING}' rangot! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}pályaszerkesztő @@ -1307,7 +1305,6 @@ STR_CHEATS_TIP :{BLACK}A kijelölőnégyzetek jelzik a csalások eddigi használtságát STR_CHEATS_WARNING :{BLACK}Figyelem! Te épp a versenytársaidat készülöd elárulni. Sose felejtsd el, hogy egy ilyen szégyenletes tett sose merül feledésbe. STR_CHEAT_MONEY :{LTBLUE}Tőkeemelés {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Játszani mint játékos #{ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Csodabuldózer (lerombol gazdasági épületeket, stb): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}A csatornák keresztezhessék egymást: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Építés szünet módban: {ORANGE}{STRING} @@ -1637,7 +1634,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :rossz verzió STR_NETWORK_ERR_CLIENT_NAME_IN_USE :a név már használva van STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :rossz játék-jelszó -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :rossz játékos-id a DoCommand-ban STR_NETWORK_ERR_CLIENT_KICKED :a szerver kirúgott STR_NETWORK_ERR_CLIENT_CHEATER :csalni próbált STR_NETWORK_ERR_CLIENT_SERVER_FULL :a szerver megtelt @@ -2359,7 +2355,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :({COMMA}. játékos) STR_7004_NEW_FACE :{BLACK}Új arc STR_7005_COLOR_SCHEME :{BLACK}Szín váltása STR_7006_COLOR_SCHEME :{GOLD}Szín: @@ -2413,7 +2408,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Kattints az új színre STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}A kölcsön növelése STR_7036_REPAY_PART_OF_LOAN :{BLACK}A kölcsön egy részének törlesztése -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Elnök) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Elnök) STR_7038_INAUGURATED :{GOLD}Alapítás éve: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Járművek: STR_TRAINS :{WHITE}{COMMA} vonat @@ -2442,7 +2437,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Egy szállítási cég bajban van! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} csődöt jelent vagy el kell adni, ha teljesítménye nem nő hamarosan! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME} {}(Elnök) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME} {}(Elnök) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Szállítási cégek egyesülése! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} céget felvásárolta {STRING} {CURRENCY}-ért! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Egy olyan szállítási céget keresünk, aki tovább vezetné a cégünket{}{}Megveszed {COMPANY} céget {CURRENCY}-ért? @@ -3534,7 +3529,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/icelandic.txt --- a/src/lang/icelandic.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/icelandic.txt Tue Sep 30 21:18:28 2008 +0000 @@ -592,10 +592,8 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Slys / hamfarir STR_0209_COMPANY_INFORMATION :{YELLOW}Fyrirtækisupplýsingar STR_020A_ECONOMY_CHANGES :{YELLOW}Efnahagsbreytingar -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Framleiðslubreytingar fyrirtækja þjónustuð af leikmanni STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Framleiðslubreytingar fyrirtækja þjónustuð af mótherjum STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Aðrar framleiðslubreytingar -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Ráð / upplýsingar um farartæki leikmanns STR_020C_NEW_VEHICLES :{YELLOW}Ný farartæki STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Breyting á viðtöku farms STR_020E_SUBSIDIES :{YELLOW}Samstarfssamningar @@ -613,10 +611,10 @@ STR_0217_MAGNATE :Áhrifamaður STR_0218_MOGUL :Stórlax STR_0219_TYCOON_OF_THE_CENTURY :Viðskiptajöfur aldarinnar -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} öðlast '{STRING}' titil! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} úr {COMPANY} öðlast '{STRING}' titil! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} úr {COMPANY} öðlast '{STRING}' titil! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Kortagerð @@ -1228,7 +1226,6 @@ STR_CHEATS_TIP :{BLACK}Valreitur segir til um ef þú hefur notað þetta svindl áður STR_CHEATS_WARNING :{BLACK}Aðvörun! Þú ert í þann mund að svíkja keppinauta þína. Hafðu í huga að þess lags svívirðing mun ætíð höfð í minnum. STR_CHEAT_MONEY :{LTBLUE}Auka pening um {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Spila sem leikmaður: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Töfrajarðýta (eyða iðnaði og óeyðanlegu): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Göng mega skerast: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Byggja í bið: {ORANGE}{STRING} @@ -1544,7 +1541,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :röng útgáfa STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nafn nú þegar í notkun STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :rangt leikjalykilorð -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :rangt notandanúmer í DoCommand STR_NETWORK_ERR_CLIENT_KICKED :hent út af þjón STR_NETWORK_ERR_CLIENT_CHEATER :reyndi að svindla STR_NETWORK_ERR_CLIENT_SERVER_FULL :vefþjónn fullur @@ -2217,7 +2213,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Leikmaður {COMMA}) STR_7004_NEW_FACE :{BLACK}Nýtt Andlit STR_7005_COLOR_SCHEME :{BLACK}Litaskema STR_7006_COLOR_SCHEME :{GOLD}Litaskema: @@ -2271,7 +2266,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Smelltu á litinn sem þú vilt STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Auka lán STR_7036_REPAY_PART_OF_LOAN :{BLACK}Borga til baka hluta af láni -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manager) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manager) STR_7038_INAUGURATED :{GOLD}Hafið: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Farartæki: STR_TRAINS :{WHITE}{COMMA} lest{P "" ir} @@ -2300,7 +2295,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Flutningsfyrirtæki í vandræðum! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} mun vera selt eða skráð gjaldþrota nema það fari að taka sig á sem fyrst! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Forstöðumaður) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Forstöðumaður) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Samruni flutningsfyrirtækja! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} hefur verið selt {STRING} fyrir {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Við erum að leita að flutningsfyrirtæki til að taka yfir okkar rekstri.{}{}Viltu kaupa {COMPANY} fyrir {CURRENCY}? @@ -3450,7 +3445,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/italian.txt --- a/src/lang/italian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/italian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -597,10 +597,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Apertura di industrie STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Chiusura di industrie STR_020A_ECONOMY_CHANGES :{YELLOW}Cambiamenti economici -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Cambiamenti produzione industrie servite dal giocatore STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Cambiamenti produzione industrie servite dagli avversari STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Altri cambiamenti di produzione industrie -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Avvisi / informazioni sui veicoli del giocatore STR_020C_NEW_VEHICLES :{YELLOW}Nuovi veicoli STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Cambiamenti della merce accettata STR_020E_SUBSIDIES :{YELLOW}Sussidi @@ -618,10 +616,10 @@ STR_0217_MAGNATE :Magnate STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Magnate del secolo -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} raggiunge lo status di '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} della {COMPANY} raggiunge lo status di '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} della {COMPANY} raggiunge lo status di '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Editor di scenari @@ -1250,7 +1248,6 @@ STR_CHEATS_TIP :{BLACK}Le caselle indicano se un trucco è già stato usato una volta STR_CHEATS_WARNING :{BLACK}Attenzione! Stai per tradire i tuoi avversari. Ricordati che un così grande disonore sarà ricordato per l'eternità. STR_CHEAT_MONEY :{LTBLUE}Aumenta denaro di {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Controlla il giocatore: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Bulldozer magico (rimuove industrie e oggetti inamovibili): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}I tunnel possono incrociarsi tra loro: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Consenti costruzione in pausa: {ORANGE}{STRING} @@ -1582,7 +1579,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :revisione differente STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nome già in uso STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :password errata -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :id giocatore errato in DoCommand STR_NETWORK_ERR_CLIENT_KICKED :espulso dal server STR_NETWORK_ERR_CLIENT_CHEATER :ha provato a usare un trucco STR_NETWORK_ERR_CLIENT_SERVER_FULL :server pieno @@ -2268,7 +2264,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER : (Giocatore {COMMA}) STR_7004_NEW_FACE :{BLACK}Nuova faccia STR_7005_COLOR_SCHEME :{BLACK}Colori compagnia STR_7006_COLOR_SCHEME :{GOLD}Schema colori: @@ -2322,7 +2317,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Fare clic sullo schema di colori desiderato STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Aumenta l'ammontare del prestito STR_7036_REPAY_PART_OF_LOAN :{BLACK}Ripaga parte del prestito -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Presidente) STR_7038_INAUGURATED :{GOLD}Inaugurata nel: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Veicoli: STR_TRAINS :{WHITE}{COMMA} tren{P o i} @@ -2351,7 +2346,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Compagnia di trasporti in difficolta! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}La {STRING} verrà venduta o dichiarerà bancarotta a meno che le prestazioni non migliorino presto! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Presidente) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Presidente) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Fusione tra compagnie di trasporti! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}La {STRING} è stata venduta alla {STRING} per {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Stiamo cercando una compagnia di trasporti disposta a rilevare la nostra società.{}{} Vorrebbe acquistare la {COMPANY} per {CURRENCY}? @@ -3547,7 +3542,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/japanese.txt --- a/src/lang/japanese.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/japanese.txt Tue Sep 30 21:18:28 2008 +0000 @@ -586,10 +586,8 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}事故／災害 STR_0209_COMPANY_INFORMATION :{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}貨物の受入れの変化 STR_020E_SUBSIDIES :{YELLOW}助成金 @@ -607,10 +605,10 @@ STR_0217_MAGNATE :大立者 STR_0218_MOGUL :大御所 STR_0219_TYCOON_OF_THE_CENTURY :大将軍 -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}、{COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}、{COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}'（{COMMA}） STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} は「{STRING}」に当たった！ -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME}（{COMPANY}）は「{STRING}」に当たった！ +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME}（{COMPANY}）は「{STRING}」に当たった！ STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}シナリオエディタ @@ -1214,7 +1212,6 @@ STR_CHEATS_TIP :{BLACK}以前にこのチートを使用したことがあることを示します STR_CHEATS_WARNING :{BLACK}中位！チートすると、競争者の裏切りとして見られていて、永遠にのろわれる可能性があります！ STR_CHEAT_MONEY :{LTBLUE}残額に{CURRENCY}を追加 -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}プレヤーの変更：{ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}ゴジラブルドーザー（産業など何でも破壊できる）：{ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}トンネルが交差可能ようにする：{ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}ポーズ中に建設可能ようにする：{ORANGE}{STRING} @@ -1519,7 +1516,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :対応していないバージョン STR_NETWORK_ERR_CLIENT_NAME_IN_USE :プレヤー名がすでに使用中 STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :不正なパスワード -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :DoCommand にプレヤー名が不正 STR_NETWORK_ERR_CLIENT_KICKED :サーバに蹴られた STR_NETWORK_ERR_CLIENT_CHEATER :チートして試していた STR_NETWORK_ERR_CLIENT_SERVER_FULL :サーバ満員 @@ -2187,7 +2183,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :（プレヤー {COMMA}） STR_7004_NEW_FACE :{BLACK}新規顔 STR_7005_COLOR_SCHEME :{BLACK}カラースキーム STR_7006_COLOR_SCHEME :{GOLD}カラースキーム： @@ -2241,7 +2236,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}カラースキームを選択 STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}借入 STR_7036_REPAY_PART_OF_LOAN :{BLACK}返済 -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}（社長） +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}（社長） STR_7038_INAUGURATED :{GOLD}開業日付：{WHITE}{NUM} STR_7039_VEHICLES :{GOLD}車両数： STR_TRAINS :{WHITE}列車{COMMA}本 @@ -2270,7 +2265,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}交通会社が経営困難！ STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}もうすぐ{STRING}のパフォーマンスが改良なしで売却および破産のリスク！ -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}（社長） +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}（社長） STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}交通会社の合併！ STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING}が{STRING}に売却、価格：{CURRENCY}！ STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}経済の現状によって当社を他の交通会社へご売却いたします。{}{}{COMPANY}を{CURRENCY}で買収しますか？ @@ -3351,7 +3346,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/korean.txt --- a/src/lang/korean.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/korean.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}산업시설의 건설 STR_NEWS_INDUSTRY_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}역에서 받는 화물의 변경 STR_020E_SUBSIDIES :{YELLOW}보조금 @@ -616,10 +614,10 @@ STR_0217_MAGNATE :권력자 STR_0218_MOGUL :거물 STR_0219_TYCOON_OF_THE_CENTURY :금세기의 타이쿤! -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY}가 '{STRING}'를(을) 달성했습니다! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME}의 {COMPANY}, 드디어 {STRING}를(을) 달성했습니다! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME}의 {COMPANY}, 드디어 {STRING}를(을) 달성했습니다! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}시나리오 에디터 @@ -1248,7 +1246,6 @@ STR_CHEATS_TIP :{BLACK}체크박스는 이전에 사용한 치트를 나타냅니다. STR_CHEATS_WARNING :{BLACK}경고! 당신은 경쟁자를 속이고 있습니다. 그러한 창피는 영원히 지워지지 않으리란 것을 명심하십시오. STR_CHEAT_MONEY :{LTBLUE}재정을 {CURRENCY} 만큼 증가 -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}플레이어 {ORANGE}{COMMA} (으)로 플레이 STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}마법 불도저 (산업시설, 움직이지 못하는 것들 제거) : {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}터널 교차를 허용 : {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}일시정지 상태에서의 건설 허용 : {ORANGE}{STRING} @@ -1580,7 +1577,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :잘못된 버전 STR_NETWORK_ERR_CLIENT_NAME_IN_USE :이미 사용중인 이름 STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :잘못된 암호 -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :DoCommand에서 잘못된 플레이어 아이디 STR_NETWORK_ERR_CLIENT_KICKED :강제추방 STR_NETWORK_ERR_CLIENT_CHEATER :치트 사용 시도 STR_NETWORK_ERR_CLIENT_SERVER_FULL :서버 꽉참 @@ -2266,7 +2262,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(플레이어 {COMMA}) STR_7004_NEW_FACE :{BLACK}새 얼굴 STR_7005_COLOR_SCHEME :{BLACK}색상 STR_7006_COLOR_SCHEME :{GOLD}색상: @@ -2320,7 +2315,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}원하는 색상을 선택하세요. STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}돈을 빌립니다. STR_7036_REPAY_PART_OF_LOAN :{BLACK}돈을 갚습니다. -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(매니저) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(매니저) STR_7038_INAUGURATED :{GOLD}설립: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}차량: STR_TRAINS :{WHITE}열차 {COMMA}대 @@ -2349,7 +2344,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}운송회사에 문제가 생김! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING}이/가 퍼포먼스가 오르지 않아 곧 팔리거나 파산될 위기에 처했습니다! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(매니저) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(매니저) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}운송 회사 합병! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING}이/가 {STRING}에게 {CURRENCY}의 가격으로 인수합병되었습니다! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}저희 회사를 거두어주실 운송회사를 찾고있습니다.{}{}저희 {COMPANY} 회사를 {CURRENCY}의 가격으로 인수합병하시겠습니까? @@ -3545,7 +3540,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/lithuanian.txt --- a/src/lang/lithuanian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/lithuanian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -619,7 +619,6 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Avarijos / nelaimės STR_0209_COMPANY_INFORMATION :{YELLOW}Kompanijos informacija STR_020A_ECONOMY_CHANGES :{YELLOW}Ekonomikos pokyčiai -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Patarimai / informacija apie žaidėjo transporto priemones STR_020C_NEW_VEHICLES :{YELLOW}Naujos transporto priemonės STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Prekių supirkimo pokyčiai STR_020E_SUBSIDIES :{YELLOW}Subsidijos @@ -637,10 +636,10 @@ STR_0217_MAGNATE :Magnatas STR_0218_MOGUL :Didziausias magnatas STR_0219_TYCOON_OF_THE_CENTURY :Amžiaus magnatas -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} pasiekė „{STRING}“ statusą! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} iš {COMPANY} pasiekė „{STRING}“ statusą! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} iš {COMPANY} pasiekė „{STRING}“ statusą! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scenarijaus redaktorius @@ -1176,7 +1175,6 @@ STR_CHEATS_TIP :{BLACK}Laukeliai rodo ar jus naudojote si triuka pries tai STR_CHEATS_WARNING :{BLACK}Demesio! Tu bandai isduoti vargsus savo varzovus. Tai bus tavo geda visiems laikams ir niekada neuzmirsta. STR_CHEAT_MONEY :{LTBLUE}Padauginti pinigu {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Zaisti uz zaideja: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magiskas buldozeris (pasalina gamyklas ir kt.): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tuneliai gali susikirsti: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Galima statyti pauzes rezime: {ORANGE}{STRING} @@ -1449,7 +1447,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :bloga versija STR_NETWORK_ERR_CLIENT_NAME_IN_USE :toks vardas jau naudojamas STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :blogas zaidimo slaptazodis -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :blogas zaidejo ID (DoCommand) STR_NETWORK_ERR_CLIENT_KICKED :ismestas serverio STR_NETWORK_ERR_CLIENT_CHEATER :bande sukciauti STR_NETWORK_ERR_CLIENT_SERVER_FULL :serveris pilnas @@ -2064,7 +2061,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Zaidejas {COMMA}) STR_7004_NEW_FACE :{BLACK}Naujas veidas STR_7005_COLOR_SCHEME :{BLACK}Spalva STR_7006_COLOR_SCHEME :{GOLD}Spalva: @@ -2118,7 +2114,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Paspausk ant pasirinktos spalvos STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Padidina paskola STR_7036_REPAY_PART_OF_LOAN :{BLACK}Grazina paskolos dali -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Direktorius) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Direktorius) STR_7038_INAUGURATED :{GOLD}Eina pareigas nuo: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Transporto priemones: STR_TRAINS :{WHITE}{COMMA} traukin{P ys iai ių} @@ -2147,7 +2143,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transporto kompanija susidure su sunkumais! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} kompanija bus parduota arba bankrutuos nebent reikalai pasitaisys! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Valdytojas) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Valdytojas) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Transporto kompaniju susijungimas! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} buvo parduota {STRING} uz {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Mes ieskome, kas galetu perimti musu kompanija.{}{}Ar jus noretumete pirkti {COMPANY} uz {CURRENCY}? diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/norwegian_bokmal.txt --- a/src/lang/norwegian_bokmal.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/norwegian_bokmal.txt Tue Sep 30 21:18:28 2008 +0000 @@ -596,10 +596,8 @@ 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_PLAYER :{YELLOW}Produksjonsendringer hos industrier som får leveranser av spilleren 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_PLAYER :{YELLOW}Råd/informasjon om spillers kjøretøy 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 @@ -617,10 +615,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Århundrets finansfyrste -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} oppnår '{STRING}'-status! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} fra {COMPANY} oppnår '{STRING}'-status! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} fra {COMPANY} oppnår '{STRING}'-status! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scenarioredigerer @@ -1249,7 +1247,6 @@ 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_PLAYER :{LTBLUE}Spiller som spiller: {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} @@ -1581,7 +1578,6 @@ 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_PLAYER_MISMATCH :feil spiller-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 @@ -2267,7 +2263,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Spiller {COMMA}) STR_7004_NEW_FACE :{BLACK}Nytt ansikt STR_7005_COLOR_SCHEME :{BLACK}Firmafarge STR_7006_COLOR_SCHEME :{GOLD}Firmafarge: @@ -2321,7 +2316,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Trykk på fargen du har valgt STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Øk størrelsen på lånet STR_7036_REPAY_PART_OF_LOAN :{BLACK}Betal tilbake en del av lånet -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Sjef) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Sjef) STR_7038_INAUGURATED :{GOLD}Grunnlagt: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Kjøretøy: STR_TRAINS :{WHITE}{COMMA} tog @@ -2350,7 +2345,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportfirma har problemer! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} vil bli solgt eller nedlagt, hvis ikke firmaets økonomi tar seg opp! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Sjef) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Sjef) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Transportfirma fusjonerer! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} har blitt solgt til {STRING} for {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Vi ser etter et firma som er villig til å overta oss.{}{}Vil du kjøpe {COMPANY} for {CURRENCY}? @@ -3546,7 +3541,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/norwegian_nynorsk.txt --- a/src/lang/norwegian_nynorsk.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/norwegian_nynorsk.txt Tue Sep 30 21:18:28 2008 +0000 @@ -586,10 +586,8 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Ulykker/katastrofar STR_0209_COMPANY_INFORMATION :{YELLOW}Firma informasjon STR_020A_ECONOMY_CHANGES :{YELLOW}Økonomiske endringar -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Produksjonsendringar for industriar betente av spelaren sjølve STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Produksjonsendringar for industriar betente av konkurrent(ar) STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Produksonsendringar for andre industriar -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Råd/informasjon om køyretøya til spelaren STR_020C_NEW_VEHICLES :{YELLOW}Nye køyretøy STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Endringar i godtekne varer STR_020E_SUBSIDIES :{YELLOW}Subsidiar @@ -607,10 +605,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Hundreårets finansfyrste -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} oppnår status som '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} frå {COMPANY} oppnår status som '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} frå {COMPANY} oppnår status som '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scenarioredigering @@ -1204,7 +1202,6 @@ STR_CHEATS_TIP :{BLACK}Avkrysningsbokser fortel at du har nytta denne juksekoden tidlegare STR_CHEATS_WARNING :{BLACK}Åtvaring! Du skal vete at du er i ferd med å gjera motspelarane ein stor urett. Gud tilgjev, men det er ikkje sikkert at venene dine gjer det same. STR_CHEAT_MONEY :{LTBLUE}Auk lommeboka di med {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Spelar som speler: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magisk bulldoser (fjern industriar, ufjernbare ting): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnelar kan krysse kvarandre: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Tillat bygging i pausemodus: {ORANGE}{STRING} @@ -1509,7 +1506,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :feil versjon STR_NETWORK_ERR_CLIENT_NAME_IN_USE :namnet er brukt av nokon andre STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :feil passord for til spelet -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :feil spelar-id i DoCommand STR_NETWORK_ERR_CLIENT_KICKED :sparka ut av tenaren STR_NETWORK_ERR_CLIENT_CHEATER :freista å jukse STR_NETWORK_ERR_CLIENT_SERVER_FULL :tenaren er full @@ -2177,7 +2173,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Spelar {COMMA}) STR_7004_NEW_FACE :{BLACK}Nytt andlet STR_7005_COLOR_SCHEME :{BLACK}Firmafarge STR_7006_COLOR_SCHEME :{GOLD}Firmafarge: @@ -2231,7 +2226,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Trykk på fargen du ønskjer STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Auk storleiken på lånet STR_7036_REPAY_PART_OF_LOAN :{BLACK}Betal attende ein del av lånet -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Sjef) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Sjef) STR_7038_INAUGURATED :{GOLD}Grunnlagt: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Køyretøy: STR_TRAINS :{WHITE}{COMMA} tog @@ -2260,7 +2255,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportfirma har problemer! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} vil verte seld eller nedlagt, dersom ikkje økonomien til firmaet tek seg opp! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Sjef) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Sjef) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Transportfirma fusjonerer! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} har blitt selt til {STRING} for {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Vi ser etter eit firma som er villig til å overta for oss.{}{}Vil du kjøpe {COMPANY} for {CURRENCY}? @@ -3331,7 +3326,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/piglatin.txt --- a/src/lang/piglatin.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/piglatin.txt Tue Sep 30 21:18:28 2008 +0000 @@ -585,7 +585,6 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Accidentsway / isastersday STR_0209_COMPANY_INFORMATION :{YELLOW}Ompanycay informationway STR_020A_ECONOMY_CHANGES :{YELLOW}Economyway angeschay -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Adviceway / informationway onway ayer'splay ehiclesvay STR_020C_NEW_VEHICLES :{YELLOW}Ewnay ehiclesvay STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Angeschay otay argocay acceptanceway STR_020E_SUBSIDIES :{YELLOW}Ubsidiessay @@ -603,10 +602,10 @@ STR_0217_MAGNATE :Agnatemay STR_0218_MOGUL :Ogulmay STR_0219_TYCOON_OF_THE_CENTURY :Ycoontay ofway ethay Enturycay -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} achievesway '{STRING}' atusstay! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} ofway {COMPANY} achievesway '{STRING}' atusstay! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} ofway {COMPANY} achievesway '{STRING}' atusstay! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTDWAY STR_0222_SCENARIO_EDITOR :{YELLOW}Enarioscay Editorway @@ -1208,7 +1207,6 @@ STR_CHEATS_TIP :{BLACK}Eckboxeschay indicateway ifway ouyay avehay usedway isthay eatchay eforebay STR_CHEATS_WARNING :{BLACK}Arningway! Ouyay areway aboutway otay etraybay ouryay ellowfay ompetitorscay. Eepkay inway indmay atthay uchsay away isgraceday illway ebay ememberedray orfay eternityway. STR_CHEAT_MONEY :{LTBLUE}Increaseway oneymay ybay {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Ayingplay asway ayerplay: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Agicmay ulldozerbay (emoveray industriesway, unmovablesway): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Unnelstay aymay osscray eachway otherway: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Uildbay ilewhay inway ausepay odemay: {ORANGE}{STRING} @@ -1532,7 +1530,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :ongwray evisionray STR_NETWORK_ERR_CLIENT_NAME_IN_USE :amenay alreadyway inway useway STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :ongwray asswordpay -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :ongwray ayerplay-idway inway OCommandday STR_NETWORK_ERR_CLIENT_KICKED :ickedkay ybay erversay STR_NETWORK_ERR_CLIENT_CHEATER :asway yingtray otay useway away eatchay STR_NETWORK_ERR_CLIENT_SERVER_FULL :erversay ullfay @@ -2200,7 +2197,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Ayerplay {COMMA}) STR_7004_NEW_FACE :{BLACK}Ewnay Acefay STR_7005_COLOR_SCHEME :{BLACK}Olourcay Emeschay STR_7006_COLOR_SCHEME :{GOLD}Olourcay Emeschay: @@ -2254,7 +2250,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Ickclay onway esiredday olourcay emeschay STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Increaseway izesay ofway oanlay STR_7036_REPAY_PART_OF_LOAN :{BLACK}Epayray artpay ofway oanlay -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Anagermay) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Anagermay) STR_7038_INAUGURATED :{GOLD}Inauguratedway: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Ehiclesvay: STR_TRAINS :{WHITE}{COMMA} ain{P "" s}tray @@ -2283,7 +2279,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Ansporttray ompanycay inway oubletray! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} illway ebay oldsay offway orway eclaredday ankruptbay unlessway erformancepay increasesway oonsay! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Anagermay) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Anagermay) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Ansporttray ompanycay ergermay! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} ashay eenbay oldsay otay {STRING} orfay {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Eway areway ookinglay orfay away ansporttray ompanycay otay aketay-overway ourway ompanycay.{}{}Oday ouyay antway otay urchasepay {COMPANY} orfay {CURRENCY}? @@ -3363,7 +3359,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/polish.txt --- a/src/lang/polish.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/polish.txt Tue Sep 30 21:18:28 2008 +0000 @@ -646,10 +646,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Otwarcie obiektow przemyslowych STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Zamkniecie obiektow przemyslowych STR_020A_ECONOMY_CHANGES :{YELLOW}Zmiany ekonomiczne -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Zmiany produkcji przedsiębiorstw obsługiwanych przez gracza STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Zmiany produkcji przedsiębiorstw obsługiwanych przez przeciwników STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Zmiany produkcji pozostałych przedsiębiorstw -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Porady / informacje o pojazdach gracza STR_020C_NEW_VEHICLES :{YELLOW}Nowe pojazdy STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Zamiany w akceptowaniu ładunku STR_020E_SUBSIDIES :{YELLOW}Subsydia @@ -667,10 +665,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Potentat STR_0219_TYCOON_OF_THE_CENTURY :Tycoon Stulecia -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} osiąga status: '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} osiągnęło status '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} z {COMPANY} osiągnęło status '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Edytor Scenariuszy @@ -1313,7 +1311,6 @@ STR_CHEATS_TIP :{BLACK}Checkboxy pokazują czy używano już tego oszustwa STR_CHEATS_WARNING :{BLACK}Uwaga! Właśnie chcesz zdradzić swoich wspólników.{}Miej na uwadze, że zostanie to zapamiętane na wieki! STR_CHEAT_MONEY :{LTBLUE}Zwiększ ilość pieniędzy o {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Graj jako gracz: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magiczny buldożer (usuwanie przedsiębiorstw, itp.): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunele mogą się krzyżować: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Budowa w czasie pauzy: {ORANGE}{STRING} @@ -1626,7 +1623,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :zła wersja STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nazwa już w użyciu STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :złe hasło gry -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :błędne id gracza w DoCommand STR_NETWORK_ERR_CLIENT_KICKED :wyrzucony przez serwer STR_NETWORK_ERR_CLIENT_CHEATER :probował użyć ułatwień STR_NETWORK_ERR_CLIENT_SERVER_FULL :serwer jest pełny @@ -2330,7 +2326,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Gracz {COMMA}) STR_7004_NEW_FACE :{BLACK}Nowa Twarz STR_7005_COLOR_SCHEME :{BLACK}Schemat Koloru STR_7006_COLOR_SCHEME :{GOLD}Schemat koloru: @@ -2384,7 +2379,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Kliknij na nowym schemacie kolorów STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Zwiększ wielkość pożyczki STR_7036_REPAY_PART_OF_LOAN :{BLACK}Zwróć cześć pożyczki -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Prezes) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Prezes) STR_7038_INAUGURATED :{GOLD}Inauguracja: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Pojazdy: STR_TRAINS :{WHITE}{COMMA} pociąg{P "" i ów} @@ -2413,7 +2408,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Firma ma problemy! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} będzie odsprzedane lub ogłoszone upadłym jeżeli zysk firmy nie wzrośnie! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Prezes) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Prezes) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Połączenie firm transportowych! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} został sprzedany {STRING} za {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Szukamy firmy transportowej która przejęłaby naszą firmę{}{}Czy chcesz kupić {COMPANY} za {CURRENCY}? @@ -3499,7 +3494,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/portuguese.txt --- a/src/lang/portuguese.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/portuguese.txt Tue Sep 30 21:18:28 2008 +0000 @@ -586,10 +586,8 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Acidentes / desastres STR_0209_COMPANY_INFORMATION :{YELLOW}Informações da empresa STR_020A_ECONOMY_CHANGES :{YELLOW}Alterações económicas -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Mudanças na produção das industrias servidas pelo jogador STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Mudanças na produção das industrias servidas pelo(s) oponentes STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Mudanças na produção de outras industrias -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Avisos / informações dos veículos do jogador STR_020C_NEW_VEHICLES :{YELLOW}Novos veículos STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Alterações de aceitação de carga STR_020E_SUBSIDIES :{YELLOW}Subsídios @@ -607,10 +605,10 @@ STR_0217_MAGNATE :Magnata STR_0218_MOGUL :Grande magnata STR_0219_TYCOON_OF_THE_CENTURY :Magnata do século -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} conquista '{STRING}' desempenho! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} conquista '{STRING}' desempenho! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} conquista '{STRING}' desempenho! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Editor de Cenário @@ -1220,7 +1218,6 @@ STR_CHEATS_TIP :{BLACK}As caixas de verificação indicam se já usou este truque antes STR_CHEATS_WARNING :{BLACK}Atenção! Está prestes a trair os seus oponentes. Tenha em conta que isto ficará registado para sempre. STR_CHEAT_MONEY :{LTBLUE}Aumentar dinheiro em {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Jogar pelo jogador: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Bulldozer mágico (destrói indústrias, etc.): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Os túneis poderão cruzar-se: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Permitir construção quando em pausa: {ORANGE}{STRING} @@ -1530,7 +1527,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :revisão incorrecta STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nome já está a ser utilizado STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :palavra-chave do jogo está incorrecta -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :id do jogador incorrecta em DoCommand STR_NETWORK_ERR_CLIENT_KICKED :avisado pelo servidor STR_NETWORK_ERR_CLIENT_CHEATER :estava a tentar usar batota STR_NETWORK_ERR_CLIENT_SERVER_FULL :servidor cheio @@ -2202,7 +2198,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Jogador {COMMA}) STR_7004_NEW_FACE :{BLACK}Nova Cara STR_7005_COLOR_SCHEME :{BLACK}Cores STR_7006_COLOR_SCHEME :{GOLD}Cores: @@ -2256,7 +2251,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Clique no novo esquema de cor STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Aumentar empréstimo STR_7036_REPAY_PART_OF_LOAN :{BLACK}Pagar parte do empréstimo -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Presidente) STR_7038_INAUGURATED :{GOLD}Inaugurado: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Veículos: STR_TRAINS :{WHITE}{COMMA} comboio{P "" s} @@ -2285,7 +2280,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Empresa de transportes em dificuldades! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} será vendida ou declarada falida a menos que melhore os seus rendimentos em breve! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Presidente) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Presidente) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Fusão de empresa de transportes! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} foi vendida a {STRING} por {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Estamos à procura de uma empresa de transportes para comprar a nossa empresa{}{}Deseja comprar {COMPANY} por {CURRENCY}? @@ -3423,7 +3418,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/romanian.txt --- a/src/lang/romanian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/romanian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -593,10 +593,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Inaugurare industrii STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Inchidere industrii STR_020A_ECONOMY_CHANGES :{YELLOW}Schimbări economice -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Schimbări de producţie la industrii partenere cu jucătorul STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Schimbări de producţie la industrii partenere cu concurenţa STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Alte schimbări în producţia industrială -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Sfaturi/informatii despre vehiculele tale STR_020C_NEW_VEHICLES :{YELLOW}Vehicule noi STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Schimbări ale acceptării mărfurilor STR_020E_SUBSIDIES :{YELLOW}Subventii @@ -614,10 +612,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Magnatul Secolului -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} a dobandit titlul de '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} al {COMPANY} dobandeste titlul de '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} al {COMPANY} dobandeste titlul de '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Editor de scenarii @@ -1240,7 +1238,6 @@ STR_CHEATS_TIP :{BLACK}Bifa vă indică dacă aţi folosit anterior acest cheat STR_CHEATS_WARNING :{BLACK}Atenţie! Eşti pe cale să-ţi trădezi colegii de joc! Nu uita că această ruşine va rămâne înregistrată pentru totdeauna! STR_CHEAT_MONEY :{LTBLUE}Măreşte fondurile cu {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Joacă în locul jucătorului: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Buldozer magic (demolează industrii şi lucruri amovibile): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunelele se pot intersecta: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Construieşte în modul pauză: {ORANGE}{STRING} @@ -1572,7 +1569,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :versiune incorectă STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nume folosit deja STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :parola greşită -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :player-id greşit în DoCommand STR_NETWORK_ERR_CLIENT_KICKED :dat afară de pe server STR_NETWORK_ERR_CLIENT_CHEATER :a încercat să folosească un cheat STR_NETWORK_ERR_CLIENT_SERVER_FULL :server plin @@ -2258,7 +2254,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Jucătorul {COMMA}) STR_7004_NEW_FACE :{BLACK}Schimbă poza STR_7005_COLOR_SCHEME :{BLACK}Culoare STR_7006_COLOR_SCHEME :{GOLD}Culoare: @@ -2312,7 +2307,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Clic pe culoarea dorită STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Împrumută o nouă sumă de bani STR_7036_REPAY_PART_OF_LOAN :{BLACK}Plăteşte înapoi o parte din credite -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Preşedinte) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Preşedinte) STR_7038_INAUGURATED :{GOLD}Anul înfiinţării: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vehicule: STR_TRAINS :{WHITE}{COMMA} tren{P "" uri} @@ -2341,7 +2336,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Companie de transport cu probleme! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} va fi vândută dacă situaţia financiară nu se va îmbunătăţi curând! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Preşedinte) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Preşedinte) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Fuziune între companii de transport! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} a fost vândută companiei {STRING} la preţul de {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Căutăm o companie de transport care să preia societatea noastră {}{}Doriţi să cumpăraţi {COMPANY} la preţul de {CURRENCY}? @@ -3521,7 +3516,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/russian.txt --- a/src/lang/russian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/russian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Открытие производства STR_NEWS_INDUSTRY_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}Изменения в списке принимаемых грузов STR_020E_SUBSIDIES :{YELLOW}Субсидии @@ -616,10 +614,10 @@ STR_0217_MAGNATE :Магнат STR_0218_MOGUL :Транспортный король STR_0219_TYCOON_OF_THE_CENTURY :Магнат Века -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} достиг статуса '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} из {COMPANY} достиг статуса '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} из {COMPANY} достиг статуса '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Редактор сценариев @@ -1243,7 +1241,6 @@ STR_CHEATS_TIP :{BLACK}Галочка показывает, использовали ли Вы этот ЧИТ раньше STR_CHEATS_WARNING :{BLACK}Внимание, вы собираетесь предать своих соперников! Этого вам никогда не простят! STR_CHEAT_MONEY :{LTBLUE}Увеличить деньги на {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Играть за компанию: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Волшебный динамит (снос _ВСЕГО_): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Туннели могут пересекаться: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Строить в режиме паузы: {ORANGE}{STRING} @@ -1575,7 +1572,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :версии не совпадают STR_NETWORK_ERR_CLIENT_NAME_IN_USE :имя уже используется STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :неверный пароль -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :неверный id-игрока в DoCommand STR_NETWORK_ERR_CLIENT_KICKED :вас выкинул сервер STR_NETWORK_ERR_CLIENT_CHEATER :попытался применить чит STR_NETWORK_ERR_CLIENT_SERVER_FULL :сервер переполнен @@ -2272,7 +2268,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Игрок {COMMA}) STR_7004_NEW_FACE :{BLACK}Лицо STR_7005_COLOR_SCHEME :{BLACK}Цвет STR_7006_COLOR_SCHEME :{GOLD}Цвет: @@ -2326,7 +2321,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Выберите цветовую схему STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Взять/увеличить кредит STR_7036_REPAY_PART_OF_LOAN :{BLACK}Вернуть часть ссуды -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Директор) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Директор) STR_7038_INAUGURATED :{GOLD}В должности с: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Транспорт: STR_TRAINS :{WHITE}{COMMA} поезд{P "" а ов} @@ -2355,7 +2350,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Транспортная компания в опасном положении! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT} {STRING} будет продана или объявлена банкротом, если ситуация не изменится! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Директор) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Директор) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Объединение компаний! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} продана {STRING} за {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Мы ищем транспортную компанию для присоединения к ней.{}{}Вы хотите купить {COMPANY} за {CURRENCY}? @@ -3550,7 +3545,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/simplified_chinese.txt --- a/src/lang/simplified_chinese.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/simplified_chinese.txt Tue Sep 30 21:18:28 2008 +0000 @@ -594,10 +594,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}工业开业 STR_NEWS_INDUSTRY_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}货物接受情况变更 STR_020E_SUBSIDIES :{YELLOW}财政补贴 @@ -615,10 +613,10 @@ STR_0217_MAGNATE :商业巨子 STR_0218_MOGUL :巨擘 STR_0219_TYCOON_OF_THE_CENTURY :世纪大亨 -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} 达到 '{STRING}' 的状态！ -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} 在 {COMPANY} 达到 '{STRING}' 状态！ +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} 在 {COMPANY} 达到 '{STRING}' 状态！ STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}场景编辑器 @@ -1238,7 +1236,6 @@ STR_CHEATS_TIP :{BLACK}标志你是否用过此项作弊手段的单选框 STR_CHEATS_WARNING :{BLACK}警告！你将要背叛你的盟友，这将被永久记录！ STR_CHEAT_MONEY :{LTBLUE}增加 {CURRENCY} 现金 -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}作为玩家 {ORANGE}{COMMA} 进行游戏 STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}神奇推土机 (清除工业设施或不可移除物): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}隧道可以相交：{ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}可以在暂停模式进行建设：{ORANGE}{STRING} @@ -1569,7 +1566,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :错误的版本 STR_NETWORK_ERR_CLIENT_NAME_IN_USE :已经有人用这个名字了 STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :错误的密码 -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :在 DoCommand 中有同名的 ID STR_NETWORK_ERR_CLIENT_KICKED :被服务器踢出 STR_NETWORK_ERR_CLIENT_CHEATER :正在尝试作弊 STR_NETWORK_ERR_CLIENT_SERVER_FULL :服务器满员 @@ -2232,7 +2228,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Player {COMMA}) STR_7004_NEW_FACE :{BLACK}新的肖像 STR_7005_COLOR_SCHEME :{BLACK}配色方案 STR_7006_COLOR_SCHEME :{GOLD}配色方案： @@ -2286,7 +2281,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}请选择喜欢的配色方案 STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}增加贷款的额度 STR_7036_REPAY_PART_OF_LOAN :{BLACK}偿还部分贷款 -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manager) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manager) STR_7038_INAUGURATED :{GOLD}开业时间：{WHITE}{NUM} STR_7039_VEHICLES :{GOLD}车船概况： STR_TRAINS :{WHITE}{COMMA} 列火车 @@ -2315,7 +2310,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}运输公司陷入困境！ STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} 如果不能在短期摆脱困境，则将被收购或破产！ -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(总裁) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(总裁) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}运输公司合并！ STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} 被 {STRING} 以 {CURRENCY} 收购！ STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}我们正在寻找一家愿意收购我们的公司。{}{}您愿意收购 {COMPANY} ({CURRENCY}) 吗？ @@ -3488,7 +3483,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/slovak.txt --- a/src/lang/slovak.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/slovak.txt Tue Sep 30 21:18:28 2008 +0000 @@ -657,10 +657,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Vznik priemyslu STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Zánik priemyslu STR_020A_ECONOMY_CHANGES :{YELLOW}Zmeny v ekonomike -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Zmeny produkcie priemyslu obsluhovaného hrácom STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Zmeny produkcie priemyslu obsluhovaného konkurenciou STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Ostatné zmeny produkcie priemyslu -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Oznamenia / Informacie o vozidlach hraca STR_020C_NEW_VEHICLES :{YELLOW}Nove vozidla STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Zmeny prijmu nakladu STR_020E_SUBSIDIES :{YELLOW}Dotacie @@ -678,10 +676,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Tycoon -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} ziskal oznacenie '{STRING}' ! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} ziskal oznacenie '{STRING}' ! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} z {COMPANY} ziskal oznacenie '{STRING}' ! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Editor scenárov @@ -1294,7 +1292,6 @@ STR_CHEATS_TIP :{BLACK}Checkbox indikuje opakovane pouzite cheatu STR_CHEATS_WARNING :{BLACK}Varovanie! Chcete podviest vasich protihracov. Tento podvod sa navzdy zapameta. STR_CHEAT_MONEY :{LTBLUE}Zvysit hotovost o {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Hrat ako hrac: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magicky buldozer (odstrani priemysel, budovy): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunely sa mozu navzajom krizit: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Umoznit vystavbu v pauze: {ORANGE}{STRING} @@ -1624,7 +1621,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :chybna revizia hry STR_NETWORK_ERR_CLIENT_NAME_IN_USE :meno sa uz pouziva STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :nespravne heslo -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :chybne id hraca v DoCommand STR_NETWORK_ERR_CLIENT_KICKED :vyhodeny zo servera STR_NETWORK_ERR_CLIENT_CHEATER :sa pokusal cheatovat STR_NETWORK_ERR_CLIENT_SERVER_FULL :server je plny @@ -2299,7 +2295,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Hrac {COMMA}) STR_7004_NEW_FACE :{BLACK}Nová tvár STR_7005_COLOR_SCHEME :{BLACK}Farebna schema STR_7006_COLOR_SCHEME :{GOLD}Farebna schema: @@ -2353,7 +2348,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Kliknut pre vyber novej farby STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Zvysit velkost uveru STR_7036_REPAY_PART_OF_LOAN :{BLACK}Splatit cast uveru -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Prezident) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Prezident) STR_7038_INAUGURATED :{GOLD}Zvoleny: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Stroje: STR_TRAINS :{WHITE}{COMMA} vlak{P "" y ov} @@ -2382,7 +2377,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Dopravna spolocnost ma problemy! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} bude predana alebo vyhlasi bankrot pokial coskoro nezvysi produktivitu! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Prezident) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Prezident) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Dopravne spolocnosti sa zlucili! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} bola predana {STRING} za {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Hladame zaujemcu na kupu nasej spolocnosti{}{}Chcete kupit nasu spolocnost {COMPANY} za {CURRENCY}? @@ -3565,7 +3560,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/slovenian.txt --- a/src/lang/slovenian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/slovenian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -637,10 +637,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Odpiranje industrij STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Zapiranje industrij STR_020A_ECONOMY_CHANGES :{YELLOW}Ekonomske spremembe -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Proizvodne spremembe industrij v igralčevi oskrbi STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Proizvodne spremembe industrij v oskrbi tekmecev STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Spremembe proizvodnje drugih industrij -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Nasveti / informacije o igralčevem vozilu STR_020C_NEW_VEHICLES :{YELLOW}Nova vozila STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Spremebe v sprejemanju tovora STR_020E_SUBSIDIES :{YELLOW}Subvencije @@ -658,10 +656,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Glavar STR_0219_TYCOON_OF_THE_CENTURY :Velekapitalist stoletja -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} dosega naslov '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} iz podjetja {COMPANY} prejema naslov '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} iz podjetja {COMPANY} prejema naslov '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Urejevalnik scenarijev @@ -1290,7 +1288,6 @@ STR_CHEATS_TIP :{BLACK}Kljukice kažejo, če so bile goljufije že kdaj uporabljene STR_CHEATS_WARNING :{BLACK}Pozor! Nameravaš izdati svoje tekmece. Tako sramotno dejanje bo zabeleženo za vselej. STR_CHEAT_MONEY :{LTBLUE}Povečaj denar za {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Igra se kot igralec: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Čarobni buldožer (odstrani tovarne, neodstranljive objekte): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tuneli se lahko križajo pod zemljo: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Zgrajeno med pavzo: {ORANGE}{STRING} @@ -1622,7 +1619,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :napačna različica STR_NETWORK_ERR_CLIENT_NAME_IN_USE :ime je že v uporabi STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :napačno geslo -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :napačen ID igralca v DoCommand STR_NETWORK_ERR_CLIENT_KICKED :brcnjen od gostitelja STR_NETWORK_ERR_CLIENT_CHEATER :je poskusil/a uporabiti goljufanje STR_NETWORK_ERR_CLIENT_SERVER_FULL :gostitelj zaseden @@ -2346,7 +2342,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Igralec {COMMA}) STR_7004_NEW_FACE :{BLACK}Nov obraz STR_7005_COLOR_SCHEME :{BLACK}Barvna shema STR_7006_COLOR_SCHEME :{GOLD}Barvna shema: @@ -2400,7 +2395,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Kliknite na željeno barvo STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Povečaj višino posojila STR_7036_REPAY_PART_OF_LOAN :{BLACK}Odplačaj del posojila -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Lastnik) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Lastnik) STR_7038_INAUGURATED :{GOLD}Ustanovljeno: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vozila: STR_TRAINS :{WHITE}{COMMA} vlak{P "" a i ov} @@ -2429,7 +2424,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Podjetje v težavah! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :Podjetje {BLACK}{BIGFONT}{STRING} bo prodano ali prisiljeno v stečajni postopek, če se stanje kaj kmalu ne izboljša! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Lastnik) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Lastnik) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Združitev podjetij! STR_705A_HAS_BEEN_SOLD_TO_FOR :Podjetje {BLACK}{BIGFONT}{STRING} je bilo prodano podejtju {STRING} za ceno {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Iščemo novega lastnika, ki bi prevzel naše podjetje.{}{}Ali želiš odkupiti podjetje {COMPANY} za ceno {CURRENCY}? @@ -3625,7 +3620,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/spanish.txt --- a/src/lang/spanish.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/spanish.txt Tue Sep 30 21:18:28 2008 +0000 @@ -596,10 +596,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Apertura de industrias STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Cierre de industrias STR_020A_ECONOMY_CHANGES :{YELLOW}Cambios en la economía -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Cambios de producción en las industrias servidas por el jugador STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Cambios de producción en las industrias servidas por los competidores STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Cambios de producción de otras industrias -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Sugerencias/info. sobre vehículos del jugador STR_020C_NEW_VEHICLES :{YELLOW}Nuevos vehículos STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Cambios en la aceptación de carga STR_020E_SUBSIDIES :{YELLOW}Subvenciones @@ -617,10 +615,10 @@ STR_0217_MAGNATE :Magnate STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Magnate del siglo -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} logra el estado '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} logra el estado '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} de {COMPANY} logra el estado '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Editor de escenarios @@ -1249,7 +1247,6 @@ STR_CHEATS_TIP :{BLACK}Las casillas indican si ha usado este truco antes STR_CHEATS_WARNING :{BLACK}Atención! Usted está a punto de traicionar a sus competidores. Tenga presente que tal deshonra será recordada para toda la eternidad. STR_CHEAT_MONEY :{LTBLUE}Incrementar dinero en {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Jugar como el jugador: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Bulldozer mágico (elimina industrias, etc.): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Los túneles pueden cruzarse: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Construir mientras se está en pausa: {ORANGE}{STRING} @@ -1581,7 +1578,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :versión incorrecta STR_NETWORK_ERR_CLIENT_NAME_IN_USE :este nombre ya está en uso STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :contraseña de juego incorrecta -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :id de jugador incorrecto en DoCommand STR_NETWORK_ERR_CLIENT_KICKED :expulsado por el servidor STR_NETWORK_ERR_CLIENT_CHEATER :ha intentado usar un cheat (truco) STR_NETWORK_ERR_CLIENT_SERVER_FULL :servidor lleno @@ -2267,7 +2263,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Jugador {COMMA}) STR_7004_NEW_FACE :{BLACK}Nueva Cara STR_7005_COLOR_SCHEME :{BLACK}Esquema Color STR_7006_COLOR_SCHEME :{GOLD}Esquema color: @@ -2321,7 +2316,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Click en esquema de color elegido STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Incrementar préstamo STR_7036_REPAY_PART_OF_LOAN :{BLACK}Pagar parte del préstamo -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Presidente) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Presidente) STR_7038_INAUGURATED :{GOLD}Inaugurado: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Vehiculos: STR_TRAINS :{WHITE}{COMMA} tren{P "" es} @@ -2350,7 +2345,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}¡Empresa en problemas! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} debe ser vendida o declarada en bancarrota a no ser que mejore su actuación! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Presidente) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Presidente) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}¡Absorción de empresa de transportes! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}¡{STRING} ha sido vendida a {STRING} por {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Estamos buscando una empresa de transportes para adquirir la nuestra{}{}¿Deseas comprar {COMPANY} por {CURRENCY}? @@ -3546,7 +3541,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/swedish.txt --- a/src/lang/swedish.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/swedish.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Industriöppning STR_NEWS_INDUSTRY_CLOSE :{YELLOW}Industristängning STR_020A_ECONOMY_CHANGES :{YELLOW}Förändringar av ekonomin -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Förändringar i produktion vid industrier trafikerad av spelaren STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Förändringar i produktion vid industrier trafikerad av motståndare STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Andra förändringar i produktion vid industrier. -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Råd / information om spelarens fordon STR_020C_NEW_VEHICLES :{YELLOW}Nya fordon STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Ändringar i godsacceptans STR_020E_SUBSIDIES :{YELLOW}Subventioner @@ -616,10 +614,10 @@ STR_0217_MAGNATE :Magnat STR_0218_MOGUL :Mogul STR_0219_TYCOON_OF_THE_CENTURY :Århundradets Tycoon -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} uppnår '{STRING}' status! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} från {COMPANY} uppnår '{STRING}' status! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} från {COMPANY} uppnår '{STRING}' status! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scenario-editor @@ -1248,7 +1246,6 @@ STR_CHEATS_TIP :{BLACK}Checkboxar indikerar om du använt det här fusket förut STR_CHEATS_WARNING :{BLACK}Varning! Du är på väg att förråda dina motståndare. Kom ihåg att detta inte kommer glömmas. STR_CHEAT_MONEY :{LTBLUE}Öka pengar med {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Spela som Spelare: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magisk Bulldozer (ta bort industrier, fyrar etc.): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tunnlar kan korsa varandra: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Bygga i pause-läge: {ORANGE}{STRING} @@ -1580,7 +1577,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :fel revision STR_NETWORK_ERR_CLIENT_NAME_IN_USE :namnet används redan STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :fel lösenord -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :fel spelar-id i DoCommand STR_NETWORK_ERR_CLIENT_KICKED :utkastad av servern STR_NETWORK_ERR_CLIENT_CHEATER :försökte fuska STR_NETWORK_ERR_CLIENT_SERVER_FULL :servern är full @@ -2266,7 +2262,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Spelare {COMMA}) STR_7004_NEW_FACE :{BLACK}Nytt ansikte STR_7005_COLOR_SCHEME :{BLACK}Färgval STR_7006_COLOR_SCHEME :{GOLD}Färgval: @@ -2320,7 +2315,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Fälj ny färg STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Öka lånets storlek STR_7036_REPAY_PART_OF_LOAN :{BLACK}Återbetala en del av lånet -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(VD) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(VD) STR_7038_INAUGURATED :{GOLD}Etablerades: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Fordon: STR_TRAINS :{WHITE}{COMMA} tåg @@ -2349,7 +2344,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Transportföretag har problem! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} kommer att säljas eller gå bankrutt om det inte går bättre snart! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(VD) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(VD) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Transportföretag slås ihop! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} har sålts till {STRING} för {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Vi letar efter någon som vill köpa och ta över vårt företag{}{}Vill du köpa {COMPANY} för {CURRENCY}? @@ -3545,7 +3540,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/traditional_chinese.txt --- a/src/lang/traditional_chinese.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/traditional_chinese.txt Tue Sep 30 21:18:28 2008 +0000 @@ -595,10 +595,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}開放工業 STR_NEWS_INDUSTRY_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}可接收貨物的變動 STR_020E_SUBSIDIES :{YELLOW}補助資訊 @@ -616,10 +614,10 @@ STR_0217_MAGNATE :企業鉅子 STR_0218_MOGUL :商業龍頭 STR_0219_TYCOON_OF_THE_CENTURY :世紀大亨 -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}，{COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}，{COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} 達成「{STRING}」的地位！ -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} 的 {COMPANY} 達成「{STRING}」 的地位！ +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} 的 {COMPANY} 達成「{STRING}」 的地位！ STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}場景編輯器 @@ -1248,7 +1246,6 @@ STR_CHEATS_TIP :{BLACK}方塊被勾選代表您用過這個密技 STR_CHEATS_WARNING :{BLACK}警告！您正準備背叛您的競爭對手，請記住這種恥辱將永傳不朽。 STR_CHEAT_MONEY :{LTBLUE}增加金錢：{CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}切換玩家身分：{ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}無敵推土機 (可摧毀工業、所有東西)：{ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}允許隧道互相交叉：{ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}可在暫停時興建：{ORANGE}{STRING} @@ -1580,7 +1577,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :版本錯誤 STR_NETWORK_ERR_CLIENT_NAME_IN_USE :已有人使用相同名稱 STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :密碼錯誤 -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :DoCommand 的玩家編號不對 STR_NETWORK_ERR_CLIENT_KICKED :被伺服器踢除 STR_NETWORK_ERR_CLIENT_CHEATER :想試著作弊 STR_NETWORK_ERR_CLIENT_SERVER_FULL :伺服器已滿 @@ -2266,7 +2262,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(玩家 {COMMA}) STR_7004_NEW_FACE :{BLACK}新臉孔 STR_7005_COLOR_SCHEME :{BLACK}配色 STR_7006_COLOR_SCHEME :{GOLD}配色： @@ -2320,7 +2315,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}點選您想用的配色 STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}增加貸款 STR_7036_REPAY_PART_OF_LOAN :{BLACK}償還貸款 -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(經理) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(經理) STR_7038_INAUGURATED :{GOLD}成立於：{WHITE}{NUM} STR_7039_VEHICLES :{GOLD}交通工具： STR_TRAINS :{WHITE}列車 {COMMA} 列 @@ -2349,7 +2344,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}運輸公司有麻煩了！ STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} 將被拍賣或宣告破產，除非盡快提昇效率！ -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(經理) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(經理) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}運輸公司合併！ STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} 被 {STRING} 以 {CURRENCY} 收購！ STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}我們正在找一間運輸公司收購我們的公司。{}{}您想購買 {COMPANY} 付出 {CURRENCY} 嗎？ @@ -3542,7 +3537,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/turkish.txt --- a/src/lang/turkish.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/turkish.txt Tue Sep 30 21:18:28 2008 +0000 @@ -585,10 +585,8 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Kazalar / felaketler STR_0209_COMPANY_INFORMATION :{YELLOW}Şirket bilgisi STR_020A_ECONOMY_CHANGES :{YELLOW}Ekonomi değişimleri -STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Oyuncunun hizmet ettiği fabrikalardaki üretim değişiklikleri STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Rakiplerin hizmet ettiği fabrikalardaki üretim değişiklikleri STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Diğer fabrikalardaki üretim değişiklikleri -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Oyuncunun araçlarıyla ilgili ögüt / bilgi STR_020C_NEW_VEHICLES :{YELLOW}Yeni araçlar STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Kargo isteğindeki değişiklik STR_020E_SUBSIDIES :{YELLOW}İhaleler @@ -606,10 +604,10 @@ STR_0217_MAGNATE :Patron STR_0218_MOGUL :Uzman işadamı STR_0219_TYCOON_OF_THE_CENTURY :Asrın En Büyük işadamı -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} '{STRING}' ünvanını kazandı! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} - {COMPANY} '{STRING}' unvanını kazandı! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} - {COMPANY} '{STRING}' unvanını kazandı! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Senaryo Editörü @@ -1219,7 +1217,6 @@ STR_CHEATS_TIP :{BLACK}Onay kutuları bu hilenin daha önce kullanılıp kullanmadığını bildirir. STR_CHEATS_WARNING :{BLACK}Uyarı! Rakiplerine ihanet etmek üzeresin. Böyle bir davranışı sonsuza dek unutmayacaklarını akılda tut. STR_CHEAT_MONEY :{LTBLUE}Parayı {CURRENCY} kadar arttır -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Oyuncunun yerine geç: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Sihirli buldözer (normalde silinemeyen binaları siler): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Tüneller kesişebilir: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Duraklama zamanında inşaat yap: {ORANGE}{STRING} @@ -1538,7 +1535,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :yanlış düzeltme STR_NETWORK_ERR_CLIENT_NAME_IN_USE :isim kullanımda STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :yanlış oyun-parola -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :DoCommand'da yanlış oyuncu bilgisi STR_NETWORK_ERR_CLIENT_KICKED :sunucu tarafından atıldı STR_NETWORK_ERR_CLIENT_CHEATER :hile yapmaya çalıştı STR_NETWORK_ERR_CLIENT_SERVER_FULL :sunucu dolu @@ -2210,7 +2206,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :({COMMA}. Oyuncu) STR_7004_NEW_FACE :{BLACK}Yeni Surat STR_7005_COLOR_SCHEME :{BLACK}Renkler STR_7006_COLOR_SCHEME :{GOLD}Renk: @@ -2264,7 +2259,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}İstediginiz rengi seçin STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Kredi ödünç al STR_7036_REPAY_PART_OF_LOAN :{BLACK}Krediyi öde -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Yönetici) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Yönetici) STR_7038_INAUGURATED :{GOLD}Kuruluş: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Araçlar: STR_TRAINS :{WHITE}{COMMA} tren @@ -2293,7 +2288,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Şirket tehlikede! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING}, performansı artmazsa satılacak ya da yok olacak! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Yönetici) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Yönetici) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Şirketler birleşti! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING}, {STRING} tarafından {CURRENCY} fiyatıyla alındı! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Şirketimizi satın alacak birilerini arıyoruz.{}{} {COMPANY} şirketini şu fiyata almak ister misiniz: {CURRENCY}? @@ -3432,7 +3427,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/ukrainian.txt --- a/src/lang/ukrainian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/ukrainian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -720,10 +720,8 @@ STR_NEWS_INDUSTRY_OPEN :{YELLOW}Відкриття підприємств STR_NEWS_INDUSTRY_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}Зміни в попиті на перевезення STR_020E_SUBSIDIES :{YELLOW}Субсидії @@ -741,10 +739,10 @@ STR_0217_MAGNATE :Магнат STR_0218_MOGUL :Магнат року STR_0219_TYCOON_OF_THE_CENTURY :Магнат сторіччя -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} досягла статусу '{STRING}'! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}Гравець {PLAYERNAME} з {COMPANY} досяг статусу '{STRING}' +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}Гравець {PRESIDENTNAME} з {COMPANY} досяг статусу '{STRING}' STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Редактор сценарію @@ -1373,7 +1371,6 @@ STR_CHEATS_TIP :{BLACK}Галка показує, що Ви стали грати нечесно STR_CHEATS_WARNING :{BLACK}Попередження! Ви збираєтеся обманювати конкурентів. Зауважте, подібне безчестя запам'ятається назавжди. STR_CHEAT_MONEY :{LTBLUE}Збільшити кошти на {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Грати за гравця: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Супер бульдозер (руйнує все): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Тунелі перетинаються: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Будувати в режимі паузи: {ORANGE}{STRING} @@ -1705,7 +1702,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION :невірна версія гри STR_NETWORK_ERR_CLIENT_NAME_IN_USE :таке ім'я вже є STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :пароль невірний -STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :невірний ID гравця в DoCommand STR_NETWORK_ERR_CLIENT_KICKED :відключено сервером від гри STR_NETWORK_ERR_CLIENT_CHEATER :спроба грати нечесно STR_NETWORK_ERR_CLIENT_SERVER_FULL :сервер переповнений @@ -2428,7 +2424,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Гравець {COMMA}) STR_7004_NEW_FACE :{BLACK}Нове обличчя STR_7005_COLOR_SCHEME :{BLACK}Колір STR_7006_COLOR_SCHEME :{GOLD}Колір: @@ -2482,7 +2477,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Натисніть на колір, який вам до вподоби STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Збільшити розмір позики STR_7036_REPAY_PART_OF_LOAN :{BLACK}Повернути частину позики -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Керівник) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Керівник) STR_7038_INAUGURATED :{GOLD}Засновано у: {WHITE}{NUM} році STR_7039_VEHICLES :{GOLD}Транспорт: STR_TRAINS :{WHITE}{COMMA} поїзд{P "" и ів} @@ -2511,7 +2506,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Компанія у скруті! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}{STRING} буде продано або оголошено банкрутом, якщо найближчим часом не зросте продуктивність! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Керівник) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Керівник) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Компанії об'єдналися! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}{STRING} була викуплена {STRING} за {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Ми шукаємо нового власника нашої компанії.{}{}Чи бажаєте Ви купити {COMPANY} за {CURRENCY}? @@ -3707,7 +3702,6 @@ STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} -STR_PLAYER_NAME :{PLAYERNAME} STR_SIGN_NAME :{SIGN} STR_VEHICLE_NAME :{VEHICLE} diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/unfinished/frisian.txt --- a/src/lang/unfinished/frisian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/unfinished/frisian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -437,7 +437,6 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Ungemakken / rampen STR_0209_COMPANY_INFORMATION :{YELLOW}Bedriuwsynformaasje STR_020A_ECONOMY_CHANGES :{YELLOW}Feroarings yn 'e ekonomie -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Advys / ynformaasje foar reauen STR_020C_NEW_VEHICLES :{YELLOW}Nije reauen STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Feroarings yn akseptearen fan fracht STR_020E_SUBSIDIES :{YELLOW}Subsydzjes @@ -453,7 +452,7 @@ STR_0218_MOGUL :Mongoal STR_0219_TYCOON_OF_THE_CENTURY :Tycoon fan 'e Ieuw STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} behellet '{STRING}' status! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} fan {COMPANY} behellet '{STRING}' status! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} fan {COMPANY} behellet '{STRING}' status! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Lânskip Ferbouer @@ -1170,7 +1169,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Spyler {COMMA}) STR_7004_NEW_FACE :{BLACK}Nei Gesicht STR_7005_COLOR_SCHEME :{BLACK}Kleurenskema STR_7006_COLOR_SCHEME :{GOLD}Kleurenskema: @@ -1200,7 +1198,7 @@ STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT :{BLACK}Selektear nei gesicht foar de bedriuwslieder STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Lien mear jild STR_7036_REPAY_PART_OF_LOAN :{BLACK}Betelje in diel fan de liening werom -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Bedriuwslieder) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Bedriuwslieder) STR_7038_INAUGURATED :{GOLD}Oprjochte: {WHITE}{NUM} STR_7042_NONE :{WHITE}Gjin STR_7044_MALE :{BLACK}Man diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/unfinished/greek.txt --- a/src/lang/unfinished/greek.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/unfinished/greek.txt Tue Sep 30 21:18:28 2008 +0000 @@ -583,7 +583,6 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Ατυχήματα / καταστροφές STR_0209_COMPANY_INFORMATION :{YELLOW}Πληροφορίες εταιρείας STR_020A_ECONOMY_CHANGES :{YELLOW}Οικονομικές αλλαγές -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Συμβουλές / πληροφορίες για τα οχήματα του παίκτη STR_020C_NEW_VEHICLES :{YELLOW}Νέα οχήματα STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Αλλαγές στην αποδοχή φορτίου STR_020E_SUBSIDIES :{YELLOW}Επιχορηγήσεις @@ -601,10 +600,10 @@ STR_0217_MAGNATE :Μεγιστάνας STR_0218_MOGUL :Τυχοδιώκτης STR_0219_TYCOON_OF_THE_CENTURY :Μεγιστάνας του Αιώνα -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} έφτασε στο επίπεδο '{STRING}' -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} της εταιρείας {COMPANY} έφτασε στο επίπεδο '{STRING}'! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} της εταιρείας {COMPANY} έφτασε στο επίπεδο '{STRING}'! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Πρόγραμμα Επεξερτασίας Σεναρίου @@ -1139,7 +1138,6 @@ STR_CHEATS_TIP :{BLACK}Τα κουτάκια δείχνουν αν έχετε χρησιμοποιήσει αυτό το κόλπο πρίν STR_CHEATS_WARNING :{BLACK}Προσοχή! Είστε έτοιμος να προδώσετε τους φίλους ανταγωνιστές σας. Θυμηθείτε ότι αυτή η ντροπή θα μείνει για πάντα. STR_CHEAT_MONEY :{LTBLUE}Αύξηση χρημάτων κατά {CURRENCY} -STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Παίξτε σαν παίκτης: {ORANGE}{COMMA} STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Μαγική μπουλντόζα (αφαιρεί βιομηχανίες, αμετακίνητα): {ORANGE}{STRING} STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Τα τούνελ διασταυρώνονται: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Χτήσιμο ενώ βρίσκεστε σε παύση: {ORANGE}{STRING} @@ -1742,7 +1740,6 @@ ##id 0x7000 STR_7000 : STR_7001 :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_7002_PLAYER :(Παίκτης {COMMA}) STR_7004_NEW_FACE :{BLACK}Νέο Πρόσωπο STR_7005_COLOR_SCHEME :{BLACK}Χρωματισμός STR_7006_COLOR_SCHEME :{GOLD}Χρωματισμός: @@ -1793,7 +1790,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Κάντε κλικ στο χρωματισμό της επιλογής σας STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Αύξηση του μεγέθους του δανείου STR_7036_REPAY_PART_OF_LOAN :{BLACK}Αποπληρωμή μέρους του δανείου -STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manager) +STR_7037_PRESIDENT :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manager) STR_7038_INAUGURATED :{GOLD}Εγκαινιασμένος: {WHITE}{NUM} STR_7039_VEHICLES :{GOLD}Οχήματα: STR_7042_NONE :{WHITE}Κανένα @@ -1818,7 +1815,7 @@ STR_7055 :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_7056_TRANSPORT_COMPANY_IN_TROUBLE :{BLACK}{BIGFONT}Εταιρεία μεταφορών σε μπελάδες! STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED :{BLACK}{BIGFONT}Η εταιρεία {STRING} θα πωληθεί ή θα κυρήξει πτώχευση αν δεν αυξηθεί η απόδοσή της! -STR_7058_PRESIDENT :{BLACK}{PLAYERNAME}{}(Διευθυντής) +STR_7058_PRESIDENT :{BLACK}{PRESIDENTNAME}{}(Διευθυντής) STR_7059_TRANSPORT_COMPANY_MERGER :{BLACK}{BIGFONT}Συγχώνευση εταιρειών μεταφοράς! STR_705A_HAS_BEEN_SOLD_TO_FOR :{BLACK}{BIGFONT}Η εταιρεία {STRING} πουλήθηκε στην {STRING} για το ποσό των {CURRENCY}! STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Ψάχνουμε μία εταιρεία μεταφορών για να αναλάβει την εταιρεία μας.{}{}Θέλετε να αγοράσετε την {COMPANY} για {CURRENCY}? diff -r 72c00af5c95d -r a1e7417bf1b7 src/lang/unfinished/latvian.txt --- a/src/lang/unfinished/latvian.txt Tue Sep 30 20:51:04 2008 +0000 +++ b/src/lang/unfinished/latvian.txt Tue Sep 30 21:18:28 2008 +0000 @@ -583,7 +583,6 @@ STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Negadijumi / ava'rijas STR_0209_COMPANY_INFORMATION :{YELLOW}Kompa'nijas informa'cija STR_020A_ECONOMY_CHANGES :{YELLOW}Ekonomijas izmain'as -STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Padoms / informa'cija par spe'le'ta'ja transporta li'dzekl'iem STR_020C_NEW_VEHICLES :{YELLOW}Jaunie transporta li'dzekl'i STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Izmain'as kravas pien'ems'ana' STR_020E_SUBSIDIES :{YELLOW}Subsi'dijas @@ -601,10 +600,10 @@ STR_0217_MAGNATE :Magna'ts STR_0218_MOGUL :Moguls STR_0219_TYCOON_OF_THE_CENTURY :Gadsimta supervecis -STR_HIGHSCORE_NAME :{BIGFONT}{PLAYERNAME}, {COMPANY} +STR_HIGHSCORE_NAME :{BIGFONT}{PRESIDENTNAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_021B_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} sasniegus'i '{STRING}' statusu! -STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} no {COMPANY} sasniegusi '{STRING}' statusu! +STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} no {COMPANY} sasniegusi '{STRING}' statusu! STR_021F :{BLUE}{COMMA} STR_0221_OPENTTD :{YELLOW}OpenTTD STR_0222_SCENARIO_EDITOR :{YELLOW}Scena'riju redaktors diff -r 72c00af5c95d -r a1e7417bf1b7 src/misc_cmd.cpp --- a/src/misc_cmd.cpp Tue Sep 30 20:51:04 2008 +0000 +++ b/src/misc_cmd.cpp Tue Sep 30 21:18:28 2008 +0000 @@ -248,7 +248,7 @@ FOR_ALL_COMPANIES(c) { SetDParam(0, c->index); - GetString(buf, STR_PLAYER_NAME, lastof(buf)); + GetString(buf, STR_PRESIDENT_NAME, lastof(buf)); if (strcmp(buf, name) == 0) return false; } diff -r 72c00af5c95d -r a1e7417bf1b7 src/network/network.cpp --- a/src/network/network.cpp Tue Sep 30 20:51:04 2008 +0000 +++ b/src/network/network.cpp Tue Sep 30 21:18:28 2008 +0000 @@ -323,7 +323,7 @@ STR_NETWORK_ERR_CLIENT_WRONG_REVISION, STR_NETWORK_ERR_CLIENT_NAME_IN_USE, STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD, - STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH, + STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH, STR_NETWORK_ERR_CLIENT_KICKED, STR_NETWORK_ERR_CLIENT_CHEATER, STR_NETWORK_ERR_CLIENT_SERVER_FULL diff -r 72c00af5c95d -r a1e7417bf1b7 src/news_gui.cpp --- a/src/news_gui.cpp Tue Sep 30 20:51:04 2008 +0000 +++ b/src/news_gui.cpp Tue Sep 30 21:18:28 2008 +0000 @@ -975,10 +975,10 @@ NEWS_SETTINGS_LINE(26, NT_INDUSTRY_OPEN, STR_NEWS_INDUSTRY_OPEN), NEWS_SETTINGS_LINE(26, NT_INDUSTRY_CLOSE, STR_NEWS_INDUSTRY_CLOSE), NEWS_SETTINGS_LINE(26, NT_ECONOMY, STR_020A_ECONOMY_CHANGES), -NEWS_SETTINGS_LINE(26, NT_INDUSTRY_COMPANY, STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER), +NEWS_SETTINGS_LINE(26, NT_INDUSTRY_COMPANY, STR_INDUSTRY_CHANGES_SERVED_BY_COMPANY), NEWS_SETTINGS_LINE(26, NT_INDUSTRY_OTHER, STR_INDUSTRY_CHANGES_SERVED_BY_OTHER), NEWS_SETTINGS_LINE(26, NT_INDUSTRY_NOBODY, STR_OTHER_INDUSTRY_PRODUCTION_CHANGES), -NEWS_SETTINGS_LINE(26, NT_ADVICE, STR_020B_ADVICE_INFORMATION_ON_PLAYER), +NEWS_SETTINGS_LINE(26, NT_ADVICE, STR_020B_ADVICE_INFORMATION_ON_COMPANY), NEWS_SETTINGS_LINE(26, NT_NEW_VEHICLES, STR_020C_NEW_VEHICLES), NEWS_SETTINGS_LINE(26, NT_ACCEPTANCE, STR_020D_CHANGES_OF_CARGO_ACCEPTANCE), NEWS_SETTINGS_LINE(26, NT_SUBSIDIES, STR_020E_SUBSIDIES), diff -r 72c00af5c95d -r a1e7417bf1b7 src/strgen/strgen.cpp --- a/src/strgen/strgen.cpp Tue Sep 30 20:51:04 2008 +0000 +++ b/src/strgen/strgen.cpp Tue Sep 30 21:18:28 2008 +0000 @@ -507,7 +507,7 @@ {"VEHICLE", EmitSingleChar, SCC_VEHICLE_NAME, 1, 0}, {"COMPANY", EmitSingleChar, SCC_COMPANY_NAME, 1, 0}, {"COMPANYNUM", EmitSingleChar, SCC_COMPANY_NUM, 1, 0}, - {"PLAYERNAME", EmitSingleChar, SCC_PLAYER_NAME, 1, 0}, + {"PRESIDENTNAME", EmitSingleChar, SCC_PRESIDENT_NAME, 1, 0}, // 0x9D is used for the pseudo command SETCASE // 0x9E is used for case switching diff -r 72c00af5c95d -r a1e7417bf1b7 src/strings.cpp --- a/src/strings.cpp Tue Sep 30 20:51:04 2008 +0000 +++ b/src/strings.cpp Tue Sep 30 21:18:28 2008 +0000 @@ -978,12 +978,12 @@ if (IsValidCompanyID(company) && IsHumanCompany(company)) { int64 args[1]; args[0] = company + 1; - buff = GetStringWithArgs(buff, STR_7002_PLAYER, args, last); + buff = GetStringWithArgs(buff, STR_7002_COMPANY, args, last); } break; } - case SCC_PLAYER_NAME: { // {PLAYERNAME} + case SCC_PRESIDENT_NAME: { // {PRESIDENTNAME} const Company *c = GetCompany((CompanyID)GetInt32(&argv)); if (c->president_name != NULL) { diff -r 72c00af5c95d -r a1e7417bf1b7 src/table/control_codes.h --- a/src/table/control_codes.h Tue Sep 30 20:51:04 2008 +0000 +++ b/src/table/control_codes.h Tue Sep 30 21:18:28 2008 +0000 @@ -34,7 +34,7 @@ SCC_SIGN_NAME, SCC_COMPANY_NAME, SCC_COMPANY_NUM, - SCC_PLAYER_NAME, + SCC_PRESIDENT_NAME, SCC_ENGINE_NAME, SCC_CURRENCY_COMPACT,