# HG changeset patch # User glx # Date 1183483217 0 # Node ID 39823e423a72a7a2b7e2137b63b351f7b88deb83 # Parent 31e79bb57c5b193f30129642562158c34ed544e2 (svn r10415) -Revert (r10403), Fix (r10323): 'message from company' test must use {STRING1}, so pass it the correct params diff -r 31e79bb57c5b -r 39823e423a72 src/lang/american.txt --- a/src/lang/american.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/american.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Map - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Game Options STR_00B2_MESSAGE :{YELLOW}Message -STR_00B3_MESSAGE_FROM :{YELLOW}Message from {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Message from {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Caution! STR_00B4_CAN_T_DO_THIS :{WHITE}Can't do this.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Can't clear this area.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/brazilian_portuguese.txt --- a/src/lang/brazilian_portuguese.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/brazilian_portuguese.txt Tue Jul 03 17:20:17 2007 +0000 @@ -157,7 +157,7 @@ STR_00B0_MAP :{WHITE}Mapa - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Opções do Jogo STR_00B2_MESSAGE :{YELLOW}Mensagem -STR_00B3_MESSAGE_FROM :{YELLOW}Mensagem de {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Mensagem de {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Cuidado! STR_00B4_CAN_T_DO_THIS :{WHITE}Impossível fazer isto.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Impossível limpar esta área.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/bulgarian.txt --- a/src/lang/bulgarian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/bulgarian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -157,7 +157,7 @@ STR_00B0_MAP :{WHITE}Карта - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Настройки STR_00B2_MESSAGE :{YELLOW}Съобщение -STR_00B3_MESSAGE_FROM :{YELLOW}Съобщение от {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Съобщение от {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Внимание! STR_00B4_CAN_T_DO_THIS :{WHITE}Това е невъзможно.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Изчистването е невъзможно.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/catalan.txt --- a/src/lang/catalan.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/catalan.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Mapa - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Opcions del Joc STR_00B2_MESSAGE :{YELLOW}Missatge -STR_00B3_MESSAGE_FROM :{YELLOW}Missatge de {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Missatge de {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Alerta! STR_00B4_CAN_T_DO_THIS :{WHITE}No es pot fer això.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}No es pot netejar l'àrea.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/croatian.txt --- a/src/lang/croatian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/croatian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -156,7 +156,7 @@ STR_00B0_MAP :{WHITE}Karta - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Opcije za igru STR_00B2_MESSAGE :{YELLOW}Poruka -STR_00B3_MESSAGE_FROM :{YELLOW}Poruka od {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Poruka od {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Oprez! STR_00B4_CAN_T_DO_THIS :{WHITE}To nije moguće napraviti.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nije moguće očistiti ovo područje.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/czech.txt --- a/src/lang/czech.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/czech.txt Tue Jul 03 17:20:17 2007 +0000 @@ -213,7 +213,7 @@ STR_00B0_MAP :{WHITE}Mapa - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Možnosti hry STR_00B2_MESSAGE :{YELLOW}Zpráva -STR_00B3_MESSAGE_FROM :{YELLOW}Zpráva od {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Zpráva od {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Varování! STR_00B4_CAN_T_DO_THIS :{WHITE}Tohle neumůžeš udělat... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nemůžeš vyčistit tuto oblast... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/danish.txt --- a/src/lang/danish.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/danish.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Kort - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Spilvalg STR_00B2_MESSAGE :{YELLOW}Besked -STR_00B3_MESSAGE_FROM :{YELLOW}Besked fra {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Besked fra {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Advarsel! STR_00B4_CAN_T_DO_THIS :{WHITE}Det kan du ikke.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan ikke rydde området.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/dutch.txt --- a/src/lang/dutch.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/dutch.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Kaart - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Spelopties STR_00B2_MESSAGE :{YELLOW}Bericht -STR_00B3_MESSAGE_FROM :{YELLOW}Bericht van {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Bericht van {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Waarschuwing! STR_00B4_CAN_T_DO_THIS :{WHITE}Kan dit niet uitvoeren.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan gebied niet ontruimen.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/english.txt --- a/src/lang/english.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/english.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Map - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Game Options STR_00B2_MESSAGE :{YELLOW}Message -STR_00B3_MESSAGE_FROM :{YELLOW}Message from {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Message from {STRING1} STR_POPUP_CAUTION_CAPTION :{WHITE}Caution! STR_00B4_CAN_T_DO_THIS :{WHITE}Can't do this.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Can't clear this area.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/esperanto.txt --- a/src/lang/esperanto.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/esperanto.txt Tue Jul 03 17:20:17 2007 +0000 @@ -156,7 +156,7 @@ STR_00B0_MAP :{WHITE}Mapo - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Ludaj Opcioj STR_00B2_MESSAGE :{YELLOW}Mesaĝo -STR_00B3_MESSAGE_FROM :{YELLOW}Mesaĝo de {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Mesaĝo de {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Atentu! STR_00B4_CAN_T_DO_THIS :{WHITE}Ne eblas fari ĉi tion.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Ne eblas malplenigi la regionon.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/estonian.txt --- a/src/lang/estonian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/estonian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -255,7 +255,7 @@ STR_00B0_MAP :{WHITE}Kaart - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Mängu seaded STR_00B2_MESSAGE :{YELLOW}Sõnum -STR_00B3_MESSAGE_FROM :{YELLOW}{COMPANY} teatab +STR_00B3_MESSAGE_FROM :{YELLOW}{STRING} teatab STR_POPUP_CAUTION_CAPTION :{WHITE}Ettevaatust! STR_00B4_CAN_T_DO_THIS :{WHITE}Seda ei saa teha.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Seda ala ei saa puhastada.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/finnish.txt --- a/src/lang/finnish.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/finnish.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Kartta - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Pelin asetukset STR_00B2_MESSAGE :{YELLOW}Viesti -STR_00B3_MESSAGE_FROM :{YELLOW}Viesti: {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Viesti: {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Varoitus! STR_00B4_CAN_T_DO_THIS :{WHITE}Ei onnistu.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Aluetta ei voi tyhjentää.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/french.txt --- a/src/lang/french.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/french.txt Tue Jul 03 17:20:17 2007 +0000 @@ -156,7 +156,7 @@ STR_00B0_MAP :{WHITE}Carte - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Options STR_00B2_MESSAGE :{YELLOW}Message -STR_00B3_MESSAGE_FROM :{YELLOW}Message de {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Message de {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Attention! STR_00B4_CAN_T_DO_THIS :{WHITE}Impossible d'exécuter.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Impossible de démolir.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/galician.txt --- a/src/lang/galician.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/galician.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Mapa - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Opcións da Partida STR_00B2_MESSAGE :{YELLOW}Mensaxe -STR_00B3_MESSAGE_FROM :{YELLOW}Mensaxe de {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Mensaxe de {STRING} STR_00B4_CAN_T_DO_THIS :{WHITE}Non podes facer eso.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Non podes limpar esta área.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright Orixinal {COPYRIGHT} 1995 Chris Sawyer, Tódolos dereitos reservados diff -r 31e79bb57c5b -r 39823e423a72 src/lang/german.txt --- a/src/lang/german.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/german.txt Tue Jul 03 17:20:17 2007 +0000 @@ -156,7 +156,7 @@ STR_00B0_MAP :{WHITE}Karte - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Spieleinstellungen STR_00B2_MESSAGE :{YELLOW}Nachricht -STR_00B3_MESSAGE_FROM :{YELLOW}Nachricht von {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Nachricht von {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Achtung! STR_00B4_CAN_T_DO_THIS :{WHITE}Kann dies nicht tun.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kann das Gebiet nicht räumen.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/hungarian.txt --- a/src/lang/hungarian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/hungarian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -188,7 +188,7 @@ STR_00B0_MAP :{WHITE}Térkép - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Beállítások STR_00B2_MESSAGE :{YELLOW}Üzenet -STR_00B3_MESSAGE_FROM :{YELLOW}{COMPANY} üzenete +STR_00B3_MESSAGE_FROM :{YELLOW}{STRING} üzenete STR_POPUP_CAUTION_CAPTION :{WHITE}Figyelem! STR_00B4_CAN_T_DO_THIS :{WHITE}Nem teheted ezt... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nem tisztíthatod meg a területet... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/icelandic.txt --- a/src/lang/icelandic.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/icelandic.txt Tue Jul 03 17:20:17 2007 +0000 @@ -154,7 +154,7 @@ STR_00B0_MAP :{WHITE}Kort - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Stillingar STR_00B2_MESSAGE :{YELLOW}Skilaboð -STR_00B3_MESSAGE_FROM :{YELLOW}Skilaboð frá {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Skilaboð frá {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Varúð! STR_00B4_CAN_T_DO_THIS :{WHITE}Get ekki gert þetta.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Get ekki hreinsað þetta svæði.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/italian.txt --- a/src/lang/italian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/italian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -157,7 +157,7 @@ STR_00B0_MAP :{WHITE}Mappa - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Opzioni di gioco STR_00B2_MESSAGE :{YELLOW}Messaggio -STR_00B3_MESSAGE_FROM :{YELLOW}Messaggio dalla {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Messaggio dalla {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Attenzione! STR_00B4_CAN_T_DO_THIS :{WHITE}Non è possibile farlo.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Impossibile ripulire l'area.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/japanese.txt --- a/src/lang/japanese.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/japanese.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}地図 - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}ゲームの設定 STR_00B2_MESSAGE :{YELLOW}メッセージ -STR_00B3_MESSAGE_FROM :{YELLOW}{COMPANY}からのメッセージ +STR_00B3_MESSAGE_FROM :{YELLOW}{STRING}からのメッセージ STR_POPUP_CAUTION_CAPTION :{WHITE}注意！ STR_00B4_CAN_T_DO_THIS :{WHITE}これはできません... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}この土地が破壊できません diff -r 31e79bb57c5b -r 39823e423a72 src/lang/korean.txt --- a/src/lang/korean.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/korean.txt Tue Jul 03 17:20:17 2007 +0000 @@ -156,7 +156,7 @@ STR_00B0_MAP :{WHITE}지도 - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}게임 설정 STR_00B2_MESSAGE :{YELLOW}알림 -STR_00B3_MESSAGE_FROM :{YELLOW}{COMPANY}이(가) 보낸 메시지 +STR_00B3_MESSAGE_FROM :{YELLOW}{STRING}이(가) 보낸 메시지 STR_POPUP_CAUTION_CAPTION :{WHITE}경고! STR_00B4_CAN_T_DO_THIS :{WHITE}그렇게 할 수 없습니다.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}이 지역을 파괴할 수 없습니다.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/lithuanian.txt --- a/src/lang/lithuanian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/lithuanian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -187,7 +187,7 @@ STR_00B0_MAP :{WHITE}Žemėlapis - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Žaidimo nustatymai STR_00B2_MESSAGE :{YELLOW}Žinutė -STR_00B3_MESSAGE_FROM :{YELLOW}Žinutė nuo {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Žinutė nuo {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Įspėjimas! STR_00B4_CAN_T_DO_THIS :{WHITE}To daryti negalima.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Negalima griauti šios teritorijos.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/norwegian_bokmal.txt --- a/src/lang/norwegian_bokmal.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/norwegian_bokmal.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Kart - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Spillinnstillinger STR_00B2_MESSAGE :{YELLOW}Melding -STR_00B3_MESSAGE_FROM :{YELLOW}Melding fra {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Melding fra {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Advarsel! STR_00B4_CAN_T_DO_THIS :{WHITE}Kan ikke gjøre dette... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan ikke rydde dette området... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/norwegian_nynorsk.txt --- a/src/lang/norwegian_nynorsk.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/norwegian_nynorsk.txt Tue Jul 03 17:20:17 2007 +0000 @@ -156,7 +156,7 @@ STR_00B0_MAP :{WHITE}Kart - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Spelinstillingar STR_00B2_MESSAGE :{YELLOW}Melding -STR_00B3_MESSAGE_FROM :{YELLOW}Melding frå {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Melding frå {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Åtvaring! STR_00B4_CAN_T_DO_THIS :{WHITE}Kan ikkje gjere dette... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan ikkje rydde dette området... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/piglatin.txt --- a/src/lang/piglatin.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/piglatin.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Apmay - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Amegay Optionsway STR_00B2_MESSAGE :{YELLOW}Essagemay -STR_00B3_MESSAGE_FROM :{YELLOW}Essagemay omfray {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Essagemay omfray {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Autioncay! STR_00B4_CAN_T_DO_THIS :{WHITE}An'tcay oday isthay.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}An'tcay earclay isthay areaway.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/polish.txt --- a/src/lang/polish.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/polish.txt Tue Jul 03 17:20:17 2007 +0000 @@ -199,7 +199,7 @@ STR_00B0_MAP :{WHITE}Mapa - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Opcje Gry STR_00B2_MESSAGE :{YELLOW}Wiadomość -STR_00B3_MESSAGE_FROM :{YELLOW}Wiadomość od {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Wiadomość od {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Uwaga! STR_00B4_CAN_T_DO_THIS :{WHITE}Nie można tego zrobić... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nie można wyczyścić terenu... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/portuguese.txt --- a/src/lang/portuguese.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/portuguese.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Mapa - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Opções do Jogo STR_00B2_MESSAGE :{YELLOW}Mensagem -STR_00B3_MESSAGE_FROM :{YELLOW}Mensagem de {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Mensagem de {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Cuidado! STR_00B4_CAN_T_DO_THIS :{WHITE}Não é possível fazer isto.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Não é possível limpar esta área.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/romanian.txt --- a/src/lang/romanian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/romanian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Harta - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Opţiuni STR_00B2_MESSAGE :{YELLOW}Mesaj -STR_00B3_MESSAGE_FROM :{YELLOW}Mesaj de la {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Mesaj de la {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Atentie! STR_00B4_CAN_T_DO_THIS :{WHITE}Nu pot face asta.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nu pot curăţa terenul.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/russian.txt --- a/src/lang/russian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/russian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -157,7 +157,7 @@ STR_00B0_MAP :{WHITE}Карта - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Настройки игры STR_00B2_MESSAGE :{YELLOW}Сообщение -STR_00B3_MESSAGE_FROM :{YELLOW}Сообщение из {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Сообщение из {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Осторожно! STR_00B4_CAN_T_DO_THIS :{WHITE}Это невозможно STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Невозможно расчистить... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/simplified_chinese.txt --- a/src/lang/simplified_chinese.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/simplified_chinese.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}地图 - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}游戏选项 STR_00B2_MESSAGE :{YELLOW}消息 -STR_00B3_MESSAGE_FROM :{YELLOW}来自 {COMPANY} 的消息 +STR_00B3_MESSAGE_FROM :{YELLOW}来自 {STRING} 的消息 STR_POPUP_CAUTION_CAPTION :{WHITE}注意！ STR_00B4_CAN_T_DO_THIS :{WHITE}不能这样做…… STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}不能清除这个区域…… diff -r 31e79bb57c5b -r 39823e423a72 src/lang/slovak.txt --- a/src/lang/slovak.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/slovak.txt Tue Jul 03 17:20:17 2007 +0000 @@ -219,7 +219,7 @@ STR_00B0_MAP :{WHITE}Mapa - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Nastavenia hry STR_00B2_MESSAGE :{YELLOW}Správa -STR_00B3_MESSAGE_FROM :{YELLOW}Správa od {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Správa od {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Upozornenie! STR_00B4_CAN_T_DO_THIS :{WHITE}Nie je možné vykonat ... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Oblast nie je možné vycistit ... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/slovenian.txt --- a/src/lang/slovenian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/slovenian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -197,7 +197,7 @@ STR_00B0_MAP :{WHITE}Zemljevid - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Možnosti Igre STR_00B2_MESSAGE :{YELLOW}Sporočilo -STR_00B3_MESSAGE_FROM :{YELLOW}Sporočilo od/iz {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Sporočilo od/iz {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Pozor! STR_00B4_CAN_T_DO_THIS :{WHITE}Ni izvedljivo ... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nemogoče čiščenje tega področja ... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/spanish.txt --- a/src/lang/spanish.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/spanish.txt Tue Jul 03 17:20:17 2007 +0000 @@ -156,7 +156,7 @@ STR_00B0_MAP :{WHITE}Mapa - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Opciones del juego STR_00B2_MESSAGE :{YELLOW}Mensaje -STR_00B3_MESSAGE_FROM :{YELLOW}Mensaje de {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Mensaje de {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Precaución! STR_00B4_CAN_T_DO_THIS :{WHITE}No se puede hacer eso.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}No se puede desbrozar esta zona.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/swedish.txt --- a/src/lang/swedish.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/swedish.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Karta - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Spelinställningar STR_00B2_MESSAGE :{YELLOW}Meddelande -STR_00B3_MESSAGE_FROM :{YELLOW}Meddelande från {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Meddelande från {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Varning! STR_00B4_CAN_T_DO_THIS :{WHITE}Kan inte utföra detta... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan inte röja området... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/traditional_chinese.txt --- a/src/lang/traditional_chinese.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/traditional_chinese.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}地圖 - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}遊戲選項 STR_00B2_MESSAGE :{YELLOW}訊息 -STR_00B3_MESSAGE_FROM :{YELLOW}來自{COMPANY}的訊息 +STR_00B3_MESSAGE_FROM :{YELLOW}來自{STRING}的訊息 STR_POPUP_CAUTION_CAPTION :{WHITE}注意！ STR_00B4_CAN_T_DO_THIS :{WHITE}不能執行以下動作.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}不能清除這個地段.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/turkish.txt --- a/src/lang/turkish.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/turkish.txt Tue Jul 03 17:20:17 2007 +0000 @@ -155,7 +155,7 @@ STR_00B0_MAP :{WHITE}Harita - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Seçenekler STR_00B2_MESSAGE :{YELLOW}Mesaj -STR_00B3_MESSAGE_FROM :{YELLOW}Mesaj: {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Mesaj: {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Uyarı! STR_00B4_CAN_T_DO_THIS :{WHITE}Yapılamaz.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Burası temizlenemez.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/ukrainian.txt --- a/src/lang/ukrainian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/ukrainian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -281,7 +281,7 @@ STR_00B0_MAP :{WHITE}Карта - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Опції гри STR_00B2_MESSAGE :{YELLOW}Повідомлення -STR_00B3_MESSAGE_FROM :{YELLOW}Повідомлення від {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Повідомлення від {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Обережно! STR_00B4_CAN_T_DO_THIS :{WHITE}Неможливо зробити це... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Неможливо очистити цю ділянку... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/unfinished/afrikaans.txt --- a/src/lang/unfinished/afrikaans.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/unfinished/afrikaans.txt Tue Jul 03 17:20:17 2007 +0000 @@ -153,7 +153,7 @@ STR_00B0_MAP :{WHITE}Kaart - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Spel Opsies STR_00B2_MESSAGE :{YELLOW}Boodskap -STR_00B3_MESSAGE_FROM :{YELLOW}Boodskap van {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Boodskap van {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Waarskuwing! STR_00B4_CAN_T_DO_THIS :{WHITE}Kan nie dit doen nie.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan nie die area reinig nie.... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/unfinished/frisian.txt --- a/src/lang/unfinished/frisian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/unfinished/frisian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -100,7 +100,7 @@ STR_00B0_MAP :{WHITE}Map - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Spul Opsjes STR_00B2_MESSAGE :{YELLOW}Berjocht -STR_00B3_MESSAGE_FROM :{YELLOW}Berjocht fan {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Berjocht fan {STRING} STR_00B4_CAN_T_DO_THIS :{WHITE}Kin dit net dwaan.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kin dit gebiet net leech meitsje.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Orizjineel copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved diff -r 31e79bb57c5b -r 39823e423a72 src/lang/unfinished/greek.txt --- a/src/lang/unfinished/greek.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/unfinished/greek.txt Tue Jul 03 17:20:17 2007 +0000 @@ -154,7 +154,7 @@ STR_00B0_MAP :{WHITE}Χάρτης - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Επιλογές Παιχνιδιού STR_00B2_MESSAGE :{YELLOW}Μήνυμα -STR_00B3_MESSAGE_FROM :{YELLOW}Μήνυμα από {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Μήνυμα από {STRING} STR_POPUP_CAUTION_CAPTION :{WHITE}Προσχή! STR_00B4_CAN_T_DO_THIS :{WHITE}Αυτό δεν γίνεται.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Αυτή η περιοχή είναι αδύνατο να καθαριστεί... diff -r 31e79bb57c5b -r 39823e423a72 src/lang/unfinished/latvian.txt --- a/src/lang/unfinished/latvian.txt Tue Jul 03 16:14:29 2007 +0000 +++ b/src/lang/unfinished/latvian.txt Tue Jul 03 17:20:17 2007 +0000 @@ -151,7 +151,7 @@ STR_00B0_MAP :{WHITE}Karte - {STRING} STR_00B1_GAME_OPTIONS :{WHITE}Spe'les parametri STR_00B2_MESSAGE :{YELLOW}Zin'ojums -STR_00B3_MESSAGE_FROM :{YELLOW}Zin'ojums no {COMPANY} +STR_00B3_MESSAGE_FROM :{YELLOW}Zin'ojums no {STRING} STR_00B4_CAN_T_DO_THIS :{WHITE}Ta' nevar dari't.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}S'o laukumu nevar noli'dzina't.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Org'ìina'la's autortiesi'bas {COPYRIGHT} 1995 Chris Sawyer, Visas tiesi'bas rezerve'tas diff -r 31e79bb57c5b -r 39823e423a72 src/player_gui.cpp --- a/src/player_gui.cpp Tue Jul 03 16:14:29 2007 +0000 +++ b/src/player_gui.cpp Tue Jul 03 17:20:17 2007 +0000 @@ -935,7 +935,8 @@ switch (e->event) { case WE_PAINT: { Player *p = GetPlayer((PlayerID)w->window_number); - SetDParam(0, p->index); + SetDParam(0, STR_COMPANY_NAME); + SetDParam(1, p->index); DrawWindowWidgets(w); DrawPlayerFace(p->face, p->player_color, 2, 16);