diff options
46 files changed, 165 insertions, 75 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 4f60777ce..095a00c50 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -2304,7 +2304,7 @@ STR_7072_VIEW_HQ :{BLACK}Wys HK STR_RELOCATE_HQ :{BLACK}Beweeg HQ STR_COMPANY_PASSWORD :{BLACK}Wagwoord STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Wagwoord-beskerm jou maatskappy om onmagtig gebruikers te belet van verbinding -STR_SET_COMPANY_PASSWORD :Stel maatskappy wagwoord +STR_SET_COMPANY_PASSWORD :{BLACK}Stel maatskappy wagwoord STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}W�eld Insinking!{}{}Finansieel eksperte vrees ergste as ekonomie inmekaar sak! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Insinking Oor!{}{}Oplewing in sake gee vertroue na nywerhede as ekonomie versterk! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Tokkel groot/klein venster groote diff --git a/src/lang/american.txt b/src/lang/american.txt index 08baa9591..cdf9f840c 100644 --- a/src/lang/american.txt +++ b/src/lang/american.txt @@ -2302,7 +2302,7 @@ STR_7072_VIEW_HQ :{BLACK}View HQ STR_RELOCATE_HQ :{BLACK}Relocate HQ STR_COMPANY_PASSWORD :{BLACK}Password STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Password-protect your company to prevent unauthorized users from joining. -STR_SET_COMPANY_PASSWORD :Set company password +STR_SET_COMPANY_PASSWORD :{BLACK}Set company password STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}World Recession!{}{}Financial experts fear worst as economy slumps! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recession Over!{}{}Upturn in trade gives confidence to industries as economy strengthens! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Toggle large/small window size diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index ff7b59a60..2f69ae134 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -2313,7 +2313,7 @@ STR_7072_VIEW_HQ :{BLACK}Ver sede STR_RELOCATE_HQ :{BLACK}Mover sede STR_COMPANY_PASSWORD :{BLACK}Senha STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Usar senha na empresa para prevenir utilizadores não autorizados. -STR_SET_COMPANY_PASSWORD :Definir senha para empresa +STR_SET_COMPANY_PASSWORD :{BLACK}Definir senha para empresa STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Recesso Mundial!{}{}Economistas temem crise! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Fim do recesso!{}{}Melhoras no comércio inspiram confiança nas indústrias à medida que a economia se fortalece! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Alternar entre janela grande/pequena diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index bdaba27db..6b90a6187 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2302,7 +2302,7 @@ STR_7072_VIEW_HQ :{BLACK}Пока STR_RELOCATE_HQ :{BLACK}Преместване ЦК STR_COMPANY_PASSWORD :{BLACK}Парола STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Постави парола за да предпазиш компанията си от неоторизирани потребители. -STR_SET_COMPANY_PASSWORD :Поставяне парола на компанията +STR_SET_COMPANY_PASSWORD :{BLACK}Поставяне парола на компанията STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Световна икономическа криза!{}{}Финансовите експерти очакват най-лошото от сриващата се световна икономика! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Световната икономическа криза отмина!{}{}Възходът на търговията дава увереност на индустриите в новата засилваща се икономическа реалност! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Активирай голям/малък размер на прозореца diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index c73706680..a187005fe 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -2309,7 +2309,7 @@ STR_7072_VIEW_HQ :{BLACK}Veure Se STR_RELOCATE_HQ :{BLACK}Trasllada la Seu STR_COMPANY_PASSWORD :{BLACK}Contrasenya STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Protegeix la teva Empresa amb contrasenya per tal d'evitar que la utilitzin usuaris no autoritzats. -STR_SET_COMPANY_PASSWORD :Estableix la contrasenya de l'Empresa +STR_SET_COMPANY_PASSWORD :{BLACK}Estableix la contrasenya de l'Empresa STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Recessió Mundial!{}{}Economistes experts temen que l'economia es desplomi! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recessió Acabada!{}{}La millora als negocis dóna confiança a les indústries a la vegada que l'economia s'enforteix! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Intercanvia mida gran/petita de finestra diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 9357f00b1..e8ca0c589 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2306,7 +2306,7 @@ STR_7072_VIEW_HQ :{BLACK}Pogledaj STR_RELOCATE_HQ :{BLACK}Premjesti sjedište kompanije STR_COMPANY_PASSWORD :{BLACK}Zaporka STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Zaštiti svoju tvrtku od neovlaštenog korištenja pomoću zaporke. -STR_SET_COMPANY_PASSWORD :Postavi zaporku tvrtke +STR_SET_COMPANY_PASSWORD :{BLACK}Postavi zaporku tvrtke STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Svjetska recesija!{}{}Financijski stručnjaci očekuju najgore zbog ekonomske krize! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recesija završena!{}{}Obrat u trgovanu daje samopouzdanje gospodarstvu jer ekonomija jača! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Namjesti veliku/malu veličinu prozora diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 82063ddfb..1aa947be6 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2367,7 +2367,7 @@ STR_7072_VIEW_HQ :{BLACK}Ředitel STR_RELOCATE_HQ :{BLACK}Přesídlit STR_COMPANY_PASSWORD :{BLACK}Heslo STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Heslo - zabrání neautorizovaným uživatelům v připojení se k tvé společnosti. -STR_SET_COMPANY_PASSWORD :Nastav heslo společnosti. +STR_SET_COMPANY_PASSWORD :{BLACK}Nastav heslo společnosti. STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Celosvětový hospodářský úpadek!{}{}Finanční experti se kvůli prudkému poklesu ekonomiky obávají nejhoršího! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Konec hospodářského úpadku!{}{}Posílení trhu zvýšilo u průmyslu důvěru! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Přepnout velké/malé okno diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 37d0872f4..a22c36170 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -2308,7 +2308,7 @@ STR_7072_VIEW_HQ :{BLACK}Vis HK STR_RELOCATE_HQ :{BLACK}Flyt hovedkvarter STR_COMPANY_PASSWORD :{BLACK}Kodeord STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Beskyt dit selskab med et kodeord for at undgå, at fremmede slutter sig til spillet. -STR_SET_COMPANY_PASSWORD :Sæt selskabets kodeord +STR_SET_COMPANY_PASSWORD :{BLACK}Sæt selskabets kodeord STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Lavkonjuktur over hele verden!{}{}Vismændende frygter det værste, økonomien skrumper! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Økonomisk krise overvundet!{}{}Stigning i forbrug giver industrien selvtilliden tilbage, produktionen øges! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Skift mellem stort/lille vindue diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index f0514e4e8..bc1b382ba 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -2309,7 +2309,7 @@ STR_7072_VIEW_HQ :{BLACK}Bekijk H STR_RELOCATE_HQ :{BLACK}Verplaats HQ STR_COMPANY_PASSWORD :{BLACK}Wachtwoord STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Bescherm het bedrijf met een wachtwoord zodat niet geautoriseerde personen niet mee kunnen doen. -STR_SET_COMPANY_PASSWORD :Geef bedrijfswachtwoord op +STR_SET_COMPANY_PASSWORD :{BLACK}Geef bedrijfswachtwoord op STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Wereld Recessie!{}{}Financiële experts vrezen het ergste terwijl economie ineen stort! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recessie Voorbij!{}{}Stijgende handel geeft industrie vertrouwen terwijl economie verstevigt! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Schakel tussen groot/klein venster diff --git a/src/lang/english.txt b/src/lang/english.txt index 6b5a43990..c90dd01dc 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2310,7 +2310,12 @@ STR_7072_VIEW_HQ :{BLACK}View HQ STR_RELOCATE_HQ :{BLACK}Relocate HQ STR_COMPANY_PASSWORD :{BLACK}Password STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Password-protect your company to prevent unauthorised users from joining. -STR_SET_COMPANY_PASSWORD :Set company password +STR_SET_COMPANY_PASSWORD :{BLACK}Set company password +STR_COMPANY_PASSWORD_CANCEL :{BLACK}Do not save the entered password +STR_COMPANY_PASSWORD_OK :{BLACK}Give the company the new password +STR_COMPANY_PASSWORD_CAPTION :{WHITE}Company password +STR_MAKE_DEFAULT_COMPANY_PASSWORD :{BLACK}Default company password +STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP :{BLACK}Use this company password as default for new companies STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}World Recession!{}{}Financial experts fear worst as economy slumps! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recession Over!{}{}Upturn in trade gives confidence to industries as economy strengthens! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Toggle large/small window size diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 67b88636c..82f0fde7c 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2189,7 +2189,7 @@ STR_7072_VIEW_HQ :{BLACK}Vidu HQ STR_RELOCATE_HQ :{BLACK}Relokigu HQ STR_COMPANY_PASSWORD :{BLACK}Pasvorto STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Pasvorte protektu vian kompanion por eviti ke eksteruloj aliĝu. -STR_SET_COMPANY_PASSWORD :Agordu kompanian pasvorton +STR_SET_COMPANY_PASSWORD :{BLACK}Agordu kompanian pasvorton STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Monda Recesio!{}{}Financaj spertuloj timas ke malpliboniĝas treege! Ekonomio malboniĝadas! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recesio finiĝis!{}{}Komerca pliboniĝos donas konfidon al industrioj! Ekonomio pliboniĝas! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Ŝaltu inter granda kaj malgranda fenestro diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 52ab351da..bc780b49c 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -2404,7 +2404,7 @@ STR_7072_VIEW_HQ :{BLACK}Vaata pe STR_RELOCATE_HQ :{BLACK}Liiguta peakorterit STR_COMPANY_PASSWORD :{BLACK}Salasõna STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Ettevõtte kaitsmine salasõnaga, et võõrad ei saaks ilma loata ühineda. -STR_SET_COMPANY_PASSWORD :Vali ettevõttele salasõna +STR_SET_COMPANY_PASSWORD :{BLACK}Vali ettevõttele salasõna STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Majanduslik tagasilöök!{}{}Finantseksperdid ennustavad suurt majanduslangust! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Madalseis on läbi!{}{}Suurem kauplemine julgustab majanduse tugevnemisega ettevõtteid! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Lülita aken suureks/väikseks diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index c759a98c3..6803e2070 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2295,7 +2295,7 @@ STR_7072_VIEW_HQ :{BLACK}Näytä STR_RELOCATE_HQ :{BLACK}Sijoita päämaja STR_COMPANY_PASSWORD :{BLACK}Salasana STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Salasanalla voit suojata yhtiösi, jotta kukaan vieras ei pääse liittymään. -STR_SET_COMPANY_PASSWORD :Aseta yhtiön salasana +STR_SET_COMPANY_PASSWORD :{BLACK}Aseta yhtiön salasana STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Maailmanlaajuinen laskukausi!{}{}Rahoitusasiantuntijat pelkäävät pahinta talouden laskiessa! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Laskukausi ohi!{}{}Kaupankäynnin käänne parempaan lisää luottamusta teollisuuteen talouden vahvistuessa! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Suuri/pieni ikkunan koko diff --git a/src/lang/french.txt b/src/lang/french.txt index c6fb7c422..8218b7c98 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -2311,7 +2311,7 @@ STR_7072_VIEW_HQ :{BLACK}Voir le STR_RELOCATE_HQ :{BLACK}Déménager le QG STR_COMPANY_PASSWORD :{BLACK}Mot de passe STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Permet de protéger par mot de passe votre compagnie pour empêcher des utilisateurs non-autorisés de rejoindre. Utilisez '*' pour vider le mot de passe. -STR_SET_COMPANY_PASSWORD :Choisir le mot de passe de la compagnie +STR_SET_COMPANY_PASSWORD :{BLACK}Choisir le mot de passe de la compagnie STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Récession mondiale!{}{}Les experts financiers craignent le pire! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Fin de la récession!{}{}La reprise redonne confiance aux industries! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Bascule entre une grande/petite fenêtre diff --git a/src/lang/galician.txt b/src/lang/galician.txt index e6551886c..5d2354b2b 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2134,7 +2134,7 @@ STR_7072_VIEW_HQ :{BLACK}Ve-lo CX STR_RELOCATE_HQ :{BLACK}Reposicionar CX STR_COMPANY_PASSWORD :{BLACK}Contrasinal STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Protexe a atúa compañía cun contrasinal para evitar que usuarios non autorizados se unan -STR_SET_COMPANY_PASSWORD :Establece o contrasinal da compañía +STR_SET_COMPANY_PASSWORD :{BLACK}Establece o contrasinal da compañía STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}¡Recesión Mundial!{}{}¡Os expertos en finanzas témense o peor a medida que a economía afúndese! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}¡Fin da Recesión!{}{}¡A mellora no comercio inspira confianza nas industrias a media que a economía reforzase! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Intercambiar entre fiestra grande/pequena diff --git a/src/lang/german.txt b/src/lang/german.txt index d520d62a0..23b84a300 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -2305,7 +2305,7 @@ STR_7072_VIEW_HQ :{BLACK}Firmensi STR_RELOCATE_HQ :{BLACK}Firmensitz verlegen STR_COMPANY_PASSWORD :{BLACK}Passwort STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Sie können Ihre Firma mit einem Passwort schützen, sodass nur ausgewählte Spieler beitreten können. -STR_SET_COMPANY_PASSWORD :Firmenpasswort setzen +STR_SET_COMPANY_PASSWORD :{BLACK}Firmenpasswort setzen STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Weltwirtschaftskrise!{}{}Finanzexperten befürchten schlimmsten Zusammenbruch der Wirtschaft! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Wirtschaftskrise beendet!{}{}Aufschwung des Handels gibt Vertrauen in die Industrie und stärkt die Wirtschaft! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Schalter für großes/kleines Fenster diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 3726814ce..36f0ecdfc 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2404,7 +2404,7 @@ STR_7072_VIEW_HQ :{BLACK}Székhá STR_RELOCATE_HQ :{BLACK}FH áthelyezése STR_COMPANY_PASSWORD :{BLACK}Jelszó STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Védd le a vállalatodat jelszóval ha nem akarod hogy mások csatlakozzanak hozzá. -STR_SET_COMPANY_PASSWORD :Vállalati jelszó beállítása +STR_SET_COMPANY_PASSWORD :{BLACK}Vállalati jelszó beállítása STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Gazdasági visszaesés!{}{}A közgazdászok gazdasági válságtól tartanak! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Vége a visszaesésnek!{}{}A kereskedelem fellendül, ami önbizalmat ad az iparnak, és erősödik a gazdaság! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Kicsi/nagy ablakméret közötti váltás diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index a6ae7571b..4ca33b2f3 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2154,7 +2154,7 @@ STR_7072_VIEW_HQ :{BLACK}Skoða H STR_RELOCATE_HQ :{BLACK}Flytja HS STR_COMPANY_PASSWORD :{BLACK}Lykilorð STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Til að vernda fyrirtæki þitt frá óboðnum notendum geturðu sett lykilorð á það -STR_SET_COMPANY_PASSWORD :Setja lykilorð á fyrirtæki +STR_SET_COMPANY_PASSWORD :{BLACK}Setja lykilorð á fyrirtæki STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Heimssamdráttur!{}{}Hagfræðingar hræddir um efnahagshrun! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Samdráttur!{}{}Uppslag í viðskiptum gefur bjartari von um betri efnahag! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Stækka/smækka gluggastærð diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 2d441daf1..d119b9cf5 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2312,7 +2312,7 @@ STR_7072_VIEW_HQ :{BLACK}Vedi sed STR_RELOCATE_HQ :{BLACK}Sposta sede STR_COMPANY_PASSWORD :{BLACK}Password STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Protegge la compagnia con una password per impedire ad utenti non autorizzati di accedervi. -STR_SET_COMPANY_PASSWORD :Imposta password compagnia +STR_SET_COMPANY_PASSWORD :{BLACK}Imposta password compagnia STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Recessione mondiale!{}{}Il crollo dell'economia porta gli analisti finanziari a temere il peggio! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recessione finita!{}{}La ripresa del commercio da fiducia alle industrie e rafforza l'economia! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Seleziona dimensione grande/piccola della finestra diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index a9d3901ad..f220454a5 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -2308,7 +2308,7 @@ STR_7072_VIEW_HQ :{BLACK}本部 STR_RELOCATE_HQ :{BLACK}本部ビルを移動 STR_COMPANY_PASSWORD :{BLACK}パスワード STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}他のプレヤーがこの会社の経営に参加できないようにするには、パスワードで保護します -STR_SET_COMPANY_PASSWORD :会社のパスワードを設定 +STR_SET_COMPANY_PASSWORD :{BLACK}会社のパスワードを設定 STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}世界中不景気！{}{}経済がスランプに陥る、アナリストの不安説！ STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}スランプの終わり！{}{}経済が上昇気流、産業が好転！ STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}大きい／小さいウィンドウサイズを切り替えます diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 8f956b2b6..508611fe3 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2299,7 +2299,7 @@ STR_7072_VIEW_HQ :{BLACK}본사 STR_RELOCATE_HQ :{BLACK}본사 재위치 STR_COMPANY_PASSWORD :{BLACK}암호 STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}다른 참가자가 이 회사로의 플레이를 하지 못하도록 암호로 보호합니다 -STR_SET_COMPANY_PASSWORD :회사 암호 설정 +STR_SET_COMPANY_PASSWORD :{BLACK}회사 암호 설정 STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}세계 공황!{}{}경제 전문가들이 경제 슬럼프에 대해 우려를 표망하고 있습니다! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}공황 종료!{}{}무역량의 증대로 경제를 살려낸 결과 산업시설에 대한 신뢰를 가져왔습니다! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}대형/소형 창 크기 토글 diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 38e2558eb..e09227f31 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2197,7 +2197,7 @@ STR_7072_VIEW_HQ :{BLACK}Apziuret STR_RELOCATE_HQ :{BLACK}Perkelti bustine STR_COMPANY_PASSWORD :{BLACK}Slaptazodis STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Slaptazodis apsaugo tavo kompanija nuo neleistinu vartotoju prisijungimo. -STR_SET_COMPANY_PASSWORD :Ivesti slaptazodi +STR_SET_COMPANY_PASSWORD :{BLACK}Ivesti slaptazodi STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Pasauline krize!{}{}Ekonomikai griuvant, finansu ekspertai bijo paties blogiausio! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Krize iveikta!{}{}Prekybos pagyvejimas suteikia naujas viltis pramones imonems! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Pakeisti lango dydi diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index d4926e047..7e3155f43 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -2310,7 +2310,7 @@ STR_7072_VIEW_HQ :{BLACK}Se hoved STR_RELOCATE_HQ :{BLACK}Omplasser hovedkvarter STR_COMPANY_PASSWORD :{BLACK}Passord STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Passordbeskytt ditt firma for å forhindre uautoriserte brukere fra å bli med. Bruk '*' for å tømme passord. -STR_SET_COMPANY_PASSWORD :Velg firmapassord +STR_SET_COMPANY_PASSWORD :{BLACK}Velg firmapassord STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Verdenskrise!{}{}Økonomer frykter det verste. Nedgangstider i møte. STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Verdenskrise over!{}{}Opptur i markedet gir industrien selvsikkerheten tilbake. STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Bytte mellom stor/liten vindustørrelse diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 4df61bc64..e83710cd7 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2305,7 +2305,7 @@ STR_7072_VIEW_HQ :{BLACK}Sjå hov STR_RELOCATE_HQ :{BLACK}Omplasser hovudkvarter STR_COMPANY_PASSWORD :{BLACK}Passord STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Passordbeskytt firmaet ditt slik at ikkje alle og einkvar kan verte med. Bruk '*' for å tømme passord. -STR_SET_COMPANY_PASSWORD :Vel firmapassord +STR_SET_COMPANY_PASSWORD :{BLACK}Vel firmapassord STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Verdskrise!{}{}Økonomar fryktar det verste. Nedgangstider i kjømda. STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Verdskrise over!{}{}Opptur i marknaden gjer industrien sjølvkjensla attende. STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Byt mellom stor/liten storleik på vindauga diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index 74bcb7ad7..e47534d6d 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -2295,7 +2295,7 @@ STR_7072_VIEW_HQ :{BLACK}Iewvay H STR_RELOCATE_HQ :{BLACK}Elocateray HQay STR_COMPANY_PASSWORD :{BLACK}Asswordpay STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Asswordpay-otectpray ouryay ompanycay otay eventpray unauthorisedway usersway omfray oiningjay. -STR_SET_COMPANY_PASSWORD :Etsay ompanycay asswordpay +STR_SET_COMPANY_PASSWORD :{BLACK}Etsay ompanycay asswordpay STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Orldway Ecessionray!{}{}Inancialfay expertsway earfay orstway asway economyway umpsslay! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Ecessionray Overway!{}{}Upturnway inway adetray ivesgay onfidencecay otay industriesway asway economyway engthensstray! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Oggletay argelay/allsmay indowway izesay diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 82d855442..fc48a1ba6 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2406,7 +2406,7 @@ STR_7072_VIEW_HQ :{BLACK}Zobacz S STR_RELOCATE_HQ :{BLACK}Przenieś SG STR_COMPANY_PASSWORD :{BLACK}Hasło STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Ochrona hasłem Twojej firmy zapobiega nieautoryzowanemu przyłączeniu się -STR_SET_COMPANY_PASSWORD :Ustaw hasło firmy +STR_SET_COMPANY_PASSWORD :{BLACK}Ustaw hasło firmy STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Światowa recesja!{}{}Eksperci finansowi obawiają się najgorszego z powodu kryzysu! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Koniec recesji!{}{}Polepszenie się transakcji handlowych daje pewność przedsiębiorstwom dzięki umacniającej się ekonomii! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Przełącz duży/mały rozmiar okna diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 6a5ac89ca..64b33895e 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -2285,7 +2285,7 @@ STR_7072_VIEW_HQ :{BLACK}Ver sede STR_RELOCATE_HQ :{BLACK}Mover sede STR_COMPANY_PASSWORD :{BLACK}Palavra passe STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Usar palavra passe na empresa para prevenir utilizadores não autorizados. -STR_SET_COMPANY_PASSWORD :Definir palavra passe da empresa +STR_SET_COMPANY_PASSWORD :{BLACK}Definir palavra passe da empresa STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Retrocesso Mundial!{}{}Especialistas financeiros temem crise económica! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Fim do retrocesso!{}{}Melhoras no comércio inspiram confiança nas indústrias à medida que a economia se fortalece! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Alternar entre janela grande/pequena diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index c5d3eabd5..335d1a117 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -2304,7 +2304,7 @@ STR_7072_VIEW_HQ :{BLACK}Vezi sed STR_RELOCATE_HQ :{BLACK}Muta sediu STR_COMPANY_PASSWORD :{BLACK}Parola STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Protejeaza-ti compania cu o parola pentru a preveni accesul neautorizat. -STR_SET_COMPANY_PASSWORD :Alege parola companiei +STR_SET_COMPANY_PASSWORD :{BLACK}Alege parola companiei STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Recesiune mondială!{}{}Experţii financiari se tem de ceea ce e mai rău odată cu prăbuşirea economică! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recesiunea s-a încheiat!{}{}Creşterea comerţului dă încredere industriei, iar economia se redresează! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Comutator pentru mărimea ferestrei diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 513b4fcce..b18284e96 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2322,7 +2322,7 @@ STR_7072_VIEW_HQ :{BLACK}Осмо STR_RELOCATE_HQ :{BLACK}Переместить STR_COMPANY_PASSWORD :{BLACK}Пароль STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Защитить вашу компанию паролем, чтобы неавторизованные пользователи не могли присоединиться -STR_SET_COMPANY_PASSWORD :Установить пароль компании +STR_SET_COMPANY_PASSWORD :{BLACK}Установить пароль компании STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Мировой спад{}{}Финансовые эксперты дают ужасные прогнозы в связи с кризисом экономики! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Спад закончился!{}{}Увеличение объемов торговли внушает уверенность владельцам предприятий. Экономика укрепляет свои позиции. STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Большое/маленькое окно diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index b3a0b6196..f08ac5903 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -2177,7 +2177,7 @@ STR_7072_VIEW_HQ :{BLACK}查看 STR_RELOCATE_HQ :{BLACK}重置总部 STR_COMPANY_PASSWORD :{BLACK}密码 STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}设置密码可以防止未经授权的用户随意加入。 -STR_SET_COMPANY_PASSWORD :设置公司密码 +STR_SET_COMPANY_PASSWORD :{BLACK}设置公司密码 STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}大萧条！{}{}金融专家预测世界经济将全面倒退！ STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}大萧条结束！{}{}贸易复苏带动经济全面启动！ STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}切换窗口大小 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 0139b6cde..3960c1238 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2373,7 +2373,7 @@ STR_7072_VIEW_HQ :{BLACK}Pozriet STR_RELOCATE_HQ :{BLACK}Premiestnit sidlo STR_COMPANY_PASSWORD :{BLACK}Heslo STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Heslo-ochrana vasej spolocnosti proti neautorizovanemu pripojeniu hracov -STR_SET_COMPANY_PASSWORD :Nastavte heslo spolocnosti +STR_SET_COMPANY_PASSWORD :{BLACK}Nastavte heslo spolocnosti STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Svetova kriza!{}{}Financni experti maju obavy z prepadu ekonomiky! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Koniec krizy!{}{}Ocakava sa vzostup predaja a posilnenie ekonomiky! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Prepnut velkost okna diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 1dc947d2d..25ea355c2 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2389,7 +2389,7 @@ STR_7072_VIEW_HQ :{BLACK}Poglej s STR_RELOCATE_HQ :{BLACK}Preseli sedež STR_COMPANY_PASSWORD :{BLACK}Geslo STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Zaščiti svoje podjetje z geslom, da preprečiš priključitev drugih uporabnikov k podjetju. -STR_SET_COMPANY_PASSWORD :Nastavi geslo podjetja +STR_SET_COMPANY_PASSWORD :{BLACK}Nastavi geslo podjetja STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Svetovna recesija!{}{}Ekonomisti se bojijo najhujšega ob trenutnem poteku dogodkov! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Konec recesije!{}{}Izboljšanje trgovanja povečuje zaupanje domače industrije, gospodarstvo napreduje! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Preklopi veliko/majhno velikost okna diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 99d570c49..f470d130c 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2310,7 +2310,7 @@ STR_7072_VIEW_HQ :{BLACK}Ver Sede STR_RELOCATE_HQ :{BLACK}Reubicar Sede STR_COMPANY_PASSWORD :{BLACK}Contraseña STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Protege por contraseña tu empresa para prevenir que usuarios no autorizados se unan a ella. -STR_SET_COMPANY_PASSWORD :Configurar contraseña de empresa +STR_SET_COMPANY_PASSWORD :{BLACK}Configurar contraseña de empresa STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}¡Recesión Mundial!{}{}¡Los expertos financieros son pesimistas mientras la economía se hunde! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}¡Fin de la Recesión!{}{}¡Mejora en el comercio da ánimos a las industrias mientras la economía se fortalece! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Cambiar entre tamaño de ventana grande/pequeño diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index e995694ed..3743e84f6 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -2308,7 +2308,7 @@ STR_7072_VIEW_HQ :{BLACK}Visa hö STR_RELOCATE_HQ :{BLACK}Flytta högkvarter STR_COMPANY_PASSWORD :{BLACK}Lösenord STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Lösenordsskydda ditt företag för att förhindra att obehöriga spelare ansluter. -STR_SET_COMPANY_PASSWORD :Ange företagets lösenord +STR_SET_COMPANY_PASSWORD :{BLACK}Ange företagets lösenord STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Lågkonjuktur!{}{}Finansexperter befarar det värsta när ekonomin sjunker! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Lågkonjuktur Över!{}{}Uppsving i byteshandeln ger tillförsikt till industrier när ekonomin stärks! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Växla stor/liten fönsterstorlek diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 005e262a3..7d5039146 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2304,7 +2304,7 @@ STR_7072_VIEW_HQ :{BLACK}檢視 STR_RELOCATE_HQ :{BLACK}搬移總部 STR_COMPANY_PASSWORD :{BLACK}密碼 STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}以密碼保護您的公司，避免其他玩家隨意接手。 -STR_SET_COMPANY_PASSWORD :設定公司密碼 +STR_SET_COMPANY_PASSWORD :{BLACK}設定公司密碼 STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}世界不景氣！{}{}財務專家對經濟蕭條做出最壞打算！ STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}景氣回升！{}{}湧現的訂單讓工業對經濟熱絡充滿信心！ STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}切換大/小視窗 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 6534dd9af..c82a15d87 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -2307,7 +2307,7 @@ STR_7072_VIEW_HQ :{BLACK}Binaya B STR_RELOCATE_HQ :{BLACK}Binayı Taşı STR_COMPANY_PASSWORD :{BLACK}Parola STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Başkalarınin girmemesi için parola koy. -STR_SET_COMPANY_PASSWORD :Şirket parolası +STR_SET_COMPANY_PASSWORD :{BLACK}Şirket parolası STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Dünyada Kriz!{}{}Çok büyük bir ekonomik kriz yaşanacağı öngörüldü! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Kriz Atlatıldı!{}{}Ekonomi yine eski güzel günlerine döndü! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Pencere boyutunu büyült/küçült diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 8d8f80ae3..2f389e61a 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2472,7 +2472,7 @@ STR_7072_VIEW_HQ :{BLACK}Пока STR_RELOCATE_HQ :{BLACK}Перенести Офіс STR_COMPANY_PASSWORD :{BLACK}Пароль STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Пароль захищає вашу компанію від приєднання інших гравців. -STR_SET_COMPANY_PASSWORD :Встановлення паролю +STR_SET_COMPANY_PASSWORD :{BLACK}Встановлення паролю STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Світова економічна криза!{}{}Фінансисти очікують спад виробництва та попиту! STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Криза минула!{}{}Збільшення виробництва внаслідок стабілізації економіки надає впевненості підприємствам! STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Розмір вікна великий/малий diff --git a/src/network/network.h b/src/network/network.h index d582dbd68..2017d6b47 100644 --- a/src/network/network.h +++ b/src/network/network.h @@ -147,6 +147,7 @@ VARDEF bool _is_network_server; // Does this client wants to be a network-server VARDEF char _network_server_name[NETWORK_NAME_LENGTH]; VARDEF char _network_server_password[NETWORK_PASSWORD_LENGTH]; VARDEF char _network_rcon_password[NETWORK_PASSWORD_LENGTH]; +VARDEF char _network_default_company_pass[NETWORK_PASSWORD_LENGTH]; VARDEF uint16 _network_max_join_time; ///< Time a client can max take to join VARDEF bool _network_pause_on_join; ///< Pause the game when a client tries to join (more chance of succeeding join) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 84227c531..5e5cdfb9c 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1795,23 +1795,11 @@ static void ChatWindowWndProc(Window *w, WindowEvent *e) { switch (e->event) { case WE_CREATE: - SendWindowMessage(WC_NEWS_WINDOW, 0, WE_CREATE, w->height, 0); - SetBit(_no_scroll, SCROLL_CHAT); // do not scroll the game with the arrow-keys break; case WE_PAINT: { - static const StringID chat_captions[] = { - STR_NETWORK_CHAT_ALL_CAPTION, - STR_NETWORK_CHAT_COMPANY_CAPTION, - STR_NETWORK_CHAT_CLIENT_CAPTION - }; - StringID msg; - DrawWindowWidgets(w); - assert(WP(w, chatquerystr_d).caption < lengthof(chat_captions)); - msg = chat_captions[WP(w, chatquerystr_d).caption]; - DrawStringRightAligned(w->widget[2].left - 2, w->widget[2].top + 1, msg, TC_BLACK); DrawEditBox(w, &WP(w, chatquerystr_d), 2); } break; @@ -1887,4 +1875,95 @@ void ShowNetworkChatQueryWindow(DestType type, int dest) InitializeTextBuffer(&WP(w, chatquerystr_d).text, _edit_str_buf, lengthof(_edit_str_buf), 0); } +/** Enum for NetworkGameWindow, referring to _network_game_window_widgets */ +enum NetworkCompanyPasswordWindowWidgets { + NCPWW_CLOSE, ///< Close 'X' button + NCPWW_CAPTION, ///< Caption of the whole window + NCPWW_BACKGROUND, ///< The background of the interface + NCPWW_LABEL, ///< Label in front of the password field + NCPWW_PASSWORD, ///< Input field for the password + NCPWW_SAVE_AS_DEFAULT_PASSWORD, ///< Toggle 'button' for saving the current password as default password + NCPWW_CANCEL, ///< Close the window without changing anything + NCPWW_OK, ///< Safe the password etc. +}; + +static void NetworkCompanyPasswordWindowWndProc(Window *w, WindowEvent *e) +{ + switch (e->event) { + case WE_PAINT: + DrawWindowWidgets(w); + DrawEditBox(w, &WP(w, chatquerystr_d), 4); + break; + + case WE_CLICK: + switch (e->we.click.widget) { + case NCPWW_OK: { + if (w->IsWidgetLowered(NCPWW_SAVE_AS_DEFAULT_PASSWORD)) { + snprintf(_network_default_company_pass, lengthof(_network_default_company_pass), "%s", _edit_str_buf); + } + + /* empty password is a '*' because of console argument */ + if (StrEmpty(_edit_str_buf)) snprintf(_edit_str_buf, lengthof(_edit_str_buf), "*"); + char *password = _edit_str_buf; + NetworkChangeCompanyPassword(1, &password); + } + + /* FALL THROUGH */ + case NCPWW_CANCEL: + DeleteWindow(w); + break; + + case NCPWW_SAVE_AS_DEFAULT_PASSWORD: + w->ToggleWidgetLoweredState(NCPWW_SAVE_AS_DEFAULT_PASSWORD); + SetWindowDirty(w); + break; + } + break; + + case WE_MOUSELOOP: + HandleEditBox(w, &WP(w, chatquerystr_d), 4); + break; + + case WE_KEYPRESS: + switch (HandleEditBoxKey(w, &WP(w, chatquerystr_d), 4, e)) { + case 1: // Return + /* FALLTHROUGH */ + case 2: // Escape + DeleteWindow(w); + break; + } + break; + } +} + +static const Widget _ncp_window_widgets[] = { +{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, +{ WWT_CAPTION, RESIZE_NONE, 14, 11, 299, 0, 13, STR_COMPANY_PASSWORD_CAPTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, +{ WWT_PANEL, RESIZE_NONE, 14, 0, 299, 14, 50, 0x0, STR_NULL}, +{ WWT_TEXT, RESIZE_NONE, 14, 5, 100, 19, 30, STR_COMPANY_PASSWORD, STR_NULL}, +{ WWT_PANEL, RESIZE_NONE, 14, 101, 294, 19, 30, 0x0, STR_NULL}, +{ WWT_TEXTBTN, RESIZE_NONE, 14, 101, 294, 35, 46, STR_MAKE_DEFAULT_COMPANY_PASSWORD, STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP}, +{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 149, 51, 62, STR_012E_CANCEL, STR_COMPANY_PASSWORD_CANCEL}, +{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 150, 299, 51, 62, STR_012F_OK, STR_COMPANY_PASSWORD_OK}, +{ WIDGETS_END}, +}; + +static const WindowDesc _ncp_window_desc = { + WDP_AUTO, WDP_AUTO, 300, 63, 300, 63, + WC_COMPANY_PASSWORD_WINDOW, WC_NONE, + WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON, + _ncp_window_widgets, + NetworkCompanyPasswordWindowWndProc +}; + +void ShowNetworkCompanyPasswordWindow() +{ + DeleteWindowById(WC_COMPANY_PASSWORD_WINDOW, 0); + + _edit_str_buf[0] = '\0'; + Window *w = AllocateWindowDesc(&_ncp_window_desc); + WP(w, chatquerystr_d).afilter = CS_ALPHANUMERAL; + InitializeTextBuffer(&WP(w, chatquerystr_d).text, _edit_str_buf, min(lengthof(_network_default_company_pass), lengthof(_edit_str_buf)), 0); +} + #endif /* ENABLE_NETWORK */ diff --git a/src/network/network_gui.h b/src/network/network_gui.h index d71b0a339..34597b4bb 100644 --- a/src/network/network_gui.h +++ b/src/network/network_gui.h @@ -13,6 +13,7 @@ void ShowNetworkChatQueryWindow(DestType type, int dest); void ShowJoinStatusWindow(); void ShowNetworkGameWindow(); void ShowClientList(); +void ShowNetworkCompanyPasswordWindow(); #else /* ENABLE_NETWORK */ /* Network function stubs when networking is disabled */ @@ -20,6 +21,7 @@ void ShowClientList(); static inline void ShowNetworkChatQueryWindow(byte desttype, int dest) {} static inline void ShowClientList() {} static inline void ShowNetworkGameWindow() {} +static inline void ShowNetworkCompanyPasswordWindow() {} #endif /* ENABLE_NETWORK */ diff --git a/src/openttd.cpp b/src/openttd.cpp index 8ebcca502..ffcaeb127 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -724,6 +724,13 @@ static void MakeNewGameDone() SettingsDisableElrail(_patches.disable_elrails); SetDefaultRailGui(); + /* We are the server, we start a new player (not dedicated), + * so set the default password *if* needed. */ + if (_network_server && !StrEmpty(_network_default_company_pass)) { + char *password = _network_default_company_pass; + NetworkChangeCompanyPassword(1, &password); + } + MarkWholeScreenDirty(); } diff --git a/src/openttd.h b/src/openttd.h index 398469940..6ca6fc8a7 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -582,6 +582,7 @@ enum WindowClass { WC_TRANSPARENCY_TOOLBAR, WC_VEHICLE_TIMETABLE, WC_BUILD_SIGNAL, + WC_COMPANY_PASSWORD_WINDOW, }; diff --git a/src/player_gui.cpp b/src/player_gui.cpp index dd7262bc3..33bc61abf 100644 --- a/src/player_gui.cpp +++ b/src/player_gui.cpp @@ -25,6 +25,7 @@ #include "newgrf.h" #include "network/network_data.h" #include "network/network_client.h" +#include "network/network_gui.h" #include "player_face.h" static void DoShowPlayerFinances(PlayerID player, bool show_small, bool show_stickied); @@ -1200,15 +1201,11 @@ static void PlayerCompanyWndProc(Window *w, WindowEvent *e) DoCommandP(0, w->window_number, 0, NULL, CMD_SELL_SHARE_IN_COMPANY | CMD_MSG(STR_707C_CAN_T_SELL_25_SHARE_IN)); break; - #ifdef ENABLE_NETWORK +#ifdef ENABLE_NETWORK case PCW_WIDGET_COMPANY_PASSWORD: - if (w->window_number == _local_player) { - WP(w, def_d).byte_1 = 2; - ShowQueryString(BindCString(_network_player_info[_local_player].password), - STR_SET_COMPANY_PASSWORD, sizeof(_network_player_info[_local_player].password), 250, w, CS_ALPHANUMERAL); - } + if (w->window_number == _local_player) ShowNetworkCompanyPasswordWindow(); break; - #endif /* ENABLE_NETWORK */ +#endif /* ENABLE_NETWORK */ } break; @@ -1230,15 +1227,13 @@ static void PlayerCompanyWndProc(Window *w, WindowEvent *e) case WE_DESTROY: DeleteWindowById(WC_PLAYER_FACE, w->window_number); + if (w->window_number == _local_player) DeleteWindowById(WC_COMPANY_PASSWORD_WINDOW, 0); break; - case WE_ON_EDIT_TEXT: { - char *b = e->we.edittext.str; - - /* empty string is allowed for password */ - if (*b == '\0' && WP(w, def_d).byte_1 != 2) return; + case WE_ON_EDIT_TEXT: + if (StrEmpty(e->we.edittext.str)) return; - _cmd_text = b; + _cmd_text = e->we.edittext.str; switch (WP(w, def_d).byte_1) { case 0: /* Change president name */ DoCommandP(0, 0, 0, NULL, CMD_CHANGE_PRESIDENT_NAME | CMD_MSG(STR_700D_CAN_T_CHANGE_PRESIDENT)); @@ -1246,15 +1241,8 @@ static void PlayerCompanyWndProc(Window *w, WindowEvent *e) case 1: /* Change company name */ DoCommandP(0, 0, 0, NULL, CMD_CHANGE_COMPANY_NAME | CMD_MSG(STR_700C_CAN_T_CHANGE_COMPANY_NAME)); break; - #ifdef ENABLE_NETWORK - case 2: /* Change company password */ - if (*b == '\0') *b = '*'; // empty password is a '*' because of console argument - NetworkChangeCompanyPassword(1, &b); - break; - #endif /* ENABLE_NETWORK */ } break; - } } } diff --git a/src/players.cpp b/src/players.cpp index d1cb86fab..7f9b5ff7f 100644 --- a/src/players.cpp +++ b/src/players.cpp @@ -848,6 +848,10 @@ CommandCost CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (_local_player != _network_playas && _network_playas == p->index) { assert(_local_player == PLAYER_SPECTATOR); SetLocalPlayer(p->index); + if (!StrEmpty(_network_default_company_pass)) { + char *password = _network_default_company_pass; + NetworkChangeCompanyPassword(1, &password); + } MarkWholeScreenDirty(); } diff --git a/src/settings.cpp b/src/settings.cpp index e8eb9d0d1..e43951998 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1294,6 +1294,7 @@ static const SettingDescGlobVarList _network_settings[] = { SDTG_STR("player_name", SLE_STRB, S, 0, _network_player_name, NULL, STR_NULL, NULL), SDTG_STR("server_password", SLE_STRB, S, 0, _network_server_password, NULL, STR_NULL, NULL), SDTG_STR("rcon_password", SLE_STRB, S, 0, _network_rcon_password, NULL, STR_NULL, NULL), + SDTG_STR("default_company_pass", SLE_STRB, S, 0, _network_default_company_pass, NULL, STR_NULL, NULL), SDTG_STR("server_name", SLE_STRB, S, 0, _network_server_name, NULL, STR_NULL, NULL), SDTG_STR("connect_to_ip", SLE_STRB, S, 0, _network_default_ip, NULL, STR_NULL, NULL), SDTG_STR("network_id", SLE_STRB, S, 0, _network_unique_id, NULL, STR_NULL, NULL), diff --git a/src/window.cpp b/src/window.cpp index 6f03da0fd..33063fbeb 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1699,11 +1699,12 @@ void HandleKeypress(uint32 key) e.we.keypress.cont = true; /* check if we have a query string window open before allowing hotkeys */ - if (FindWindowById(WC_QUERY_STRING, 0) != NULL || - FindWindowById(WC_SEND_NETWORK_MSG, 0) != NULL || - FindWindowById(WC_GENERATE_LANDSCAPE, 0) != NULL || - FindWindowById(WC_CONSOLE, 0) != NULL || - FindWindowById(WC_SAVELOAD, 0) != NULL) { + if (FindWindowById(WC_QUERY_STRING, 0) != NULL || + FindWindowById(WC_SEND_NETWORK_MSG, 0) != NULL || + FindWindowById(WC_GENERATE_LANDSCAPE, 0) != NULL || + FindWindowById(WC_CONSOLE, 0) != NULL || + FindWindowById(WC_SAVELOAD, 0) != NULL || + FindWindowById(WC_COMPANY_PASSWORD_WINDOW, 0) != NULL) { query_open = true; } @@ -1717,7 +1718,8 @@ void HandleKeypress(uint32 key) w->window_class != WC_SEND_NETWORK_MSG && w->window_class != WC_GENERATE_LANDSCAPE && w->window_class != WC_CONSOLE && - w->window_class != WC_SAVELOAD) { + w->window_class != WC_SAVELOAD && + w->window_class != WC_COMPANY_PASSWORD_WINDOW) { continue; } w->wndproc(w, &e); |