diff options
| author | glx <glx@openttd.org> | 2007-07-03 17:20:17 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2007-07-03 17:20:17 +0000 |
| commit | 53ab57cbe4a068512b14b86028bf9b599426ce01 (patch) | |
| tree | d0d69c023c278dc9d2adbe495743574349689d1b | |
| parent | 95d2abf81d574d2897c06ca3278f3c6f4a9a8ba3 (diff) | |
| download | openttd-53ab57cbe4a068512b14b86028bf9b599426ce01.tar.xz | |
(svn r10415) -Revert (r10403), Fix (r10323): 'message from company' test must use {STRING1}, so pass it the correct params
41 files changed, 42 insertions, 41 deletions
diff --git a/src/lang/american.txt b/src/lang/american.txt index fc8f38228..0a6b0ec5a 100644 --- a/src/lang/american.txt +++ b/src/lang/american.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index e4c539c1f..c4475bfac 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -157,7 +157,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 350be4fbd..8d66835de 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -157,7 +157,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 27f9e981f..63f1cc45c 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 4fd01e1f5..617341a2d 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -156,7 +156,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/czech.txt b/src/lang/czech.txt index 848701e82..8d875f6fb 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -213,7 +213,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/danish.txt b/src/lang/danish.txt index 1e543bf84..7cba1577e 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/dutch.txt b/src/lang/dutch.txt index ec843eee6..a640ce446 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/english.txt b/src/lang/english.txt index 0f0747089..044942361 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 0bb2349f7..6fcc8ce6c 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -156,7 +156,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 20248c352..67d9d93bc 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -255,7 +255,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 3f1f148e6..0de86869b 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/french.txt b/src/lang/french.txt index 03877aa40..b012b971c 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -156,7 +156,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/galician.txt b/src/lang/galician.txt index 9541f2f93..c876ea57f 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/german.txt b/src/lang/german.txt index 272e0d894..6095b7437 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -156,7 +156,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index ff8ee2b3f..349e0ca99 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -188,7 +188,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 0691b4cb5..4766807bb 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -154,7 +154,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/italian.txt b/src/lang/italian.txt index b5535d2d7..6a44ba985 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -157,7 +157,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/japanese.txt b/src/lang/japanese.txt index e89b7415c..ff7b83528 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/korean.txt b/src/lang/korean.txt index 63f38571f..32c1ddb25 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -156,7 +156,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index c23f99abc..c48e589f1 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -187,7 +187,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 7c85f23fd..2ea45273f 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 15d35ad29..7b40cdd4c 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -156,7 +156,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index 7c45bbe43..04d63fac3 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/polish.txt b/src/lang/polish.txt index a69947935..3c5a98723 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -199,7 +199,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 0e9d2dff1..51d0dc363 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 2d5e0b719..657432751 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/russian.txt b/src/lang/russian.txt index 468a5bcef..07bc8a1a1 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -157,7 +157,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index bdc979f03..9572e0af1 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 8e8938d39..67cb6cd20 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -219,7 +219,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 677160d98..b6f322dd1 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -197,7 +197,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 1eeabac40..418bdfe51 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -156,7 +156,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 2f9aeec69..d83f6d780 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index f20cd900f..bbf3bf7ce 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/turkish.txt b/src/lang/turkish.txt index cf959e981..9ea854cfe 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -155,7 +155,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index e500dfe49..12e0783fa 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -281,7 +281,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/unfinished/afrikaans.txt b/src/lang/unfinished/afrikaans.txt index 1f8491333..a8255cc6b 100644 --- a/src/lang/unfinished/afrikaans.txt +++ b/src/lang/unfinished/afrikaans.txt @@ -153,7 +153,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index beab05f73..e66030108 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -100,7 +100,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt index f5ae3cb9d..63e338a4f 100644 --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -154,7 +154,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/lang/unfinished/latvian.txt b/src/lang/unfinished/latvian.txt index a888996e7..4d229ffd0 100644 --- a/src/lang/unfinished/latvian.txt +++ b/src/lang/unfinished/latvian.txt @@ -151,7 +151,7 @@ STR_00AF :{WHITE}{DATE_LO 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 --git a/src/player_gui.cpp b/src/player_gui.cpp index 9852f3b65..b753034b8 100644 --- a/src/player_gui.cpp +++ b/src/player_gui.cpp @@ -935,7 +935,8 @@ static void BuyCompanyWndProc(Window *w, WindowEvent *e) 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); |