From 56b1317e7050a4d1dc399b1fe00fb0608eca309f Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 15 Nov 2007 17:49:50 +0000 Subject: (svn r11435) -Codechange: show all players who have shares, not just the first two. Patch by SmatZ. --- src/lang/afrikaans.txt | 1 - src/lang/american.txt | 1 - src/lang/brazilian_portuguese.txt | 1 - src/lang/bulgarian.txt | 1 - src/lang/catalan.txt | 1 - src/lang/croatian.txt | 1 - src/lang/czech.txt | 1 - src/lang/danish.txt | 1 - src/lang/dutch.txt | 1 - src/lang/english.txt | 1 - src/lang/esperanto.txt | 1 - src/lang/estonian.txt | 1 - src/lang/finnish.txt | 1 - src/lang/french.txt | 1 - src/lang/galician.txt | 1 - src/lang/german.txt | 1 - src/lang/hungarian.txt | 1 - src/lang/icelandic.txt | 1 - src/lang/italian.txt | 1 - src/lang/japanese.txt | 1 - src/lang/korean.txt | 1 - src/lang/lithuanian.txt | 1 - src/lang/norwegian_bokmal.txt | 1 - src/lang/norwegian_nynorsk.txt | 1 - src/lang/piglatin.txt | 1 - src/lang/polish.txt | 1 - src/lang/portuguese.txt | 1 - src/lang/romanian.txt | 1 - src/lang/russian.txt | 1 - src/lang/simplified_chinese.txt | 1 - src/lang/slovak.txt | 1 - src/lang/slovenian.txt | 1 - src/lang/spanish.txt | 1 - src/lang/swedish.txt | 1 - src/lang/traditional_chinese.txt | 1 - src/lang/turkish.txt | 1 - src/lang/ukrainian.txt | 1 - src/player_gui.cpp | 15 ++++++--------- 38 files changed, 6 insertions(+), 46 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index b427e6105..4f60777ce 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -2316,7 +2316,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Verkoop STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kan nie 25% aandeel in die maatskappy koop nie... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan nie 25% aandeel in die maatskappy verkoop nie... STR_707D_OWNED_BY :{WHITE}({COMMA}% besit by {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% besit by {COMPANY}{} {COMMA}% besit by {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} is deur {COMPANY} oorgevat! STR_7080_PROTECTED :{WHITE}Die maatskappy is nie oud genoeg om aandeele te handel nie... diff --git a/src/lang/american.txt b/src/lang/american.txt index 3f8f00175..08baa9591 100644 --- a/src/lang/american.txt +++ b/src/lang/american.txt @@ -2314,7 +2314,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Sell 25% STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Can't buy 25% share in this company... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Can't sell 25% share in this company... STR_707D_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY}{} {COMMA}% owned by {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}! STR_7080_PROTECTED :{WHITE}This company is not old enough to trade shares yet... diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index e35faacd5..b6fba3ef9 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -2320,7 +2320,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Vender 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Impossível comprar 25% das ações desta empresa... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Impossível vender 25% das ações desta empresa... STR_707D_OWNED_BY :{WHITE}({COMMA}% propriedade de {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% propriedade de {COMPANY}{} {COMMA}% propriedade de {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} foi comprada por {COMPANY}! STR_7080_PROTECTED :{WHITE}Esta empresa ainda não troca ações... diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 535b39cdf..bdaba27db 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2314,7 +2314,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Прод STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Не може да купиш 25% от акциите на тази компания... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Не може да продадеш 25% от акциите на тази компания... STR_707D_OWNED_BY :{WHITE}({COMMA}% е притежание на {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% е притежание на {COMPANY}{} {COMMA}% е притежание на {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} бе закупена от {COMPANY}! STR_7080_PROTECTED :{WHITE}Тази компания все още не е достатъчно стара да предлага акции... diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index a178eb5cb..e5c23a668 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -2316,7 +2316,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Ven un 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}No pots comprar el 25% de participació en aquesta empresa... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}No pots vendre el 25% de participació en aquesta empresa... STR_707D_OWNED_BY :{WHITE}({COMMA}% propietat de {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% propietat de {COMPANY}{} {COMMA}% propietat de {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} ha estat absorbida per {COMPANY}! STR_7080_PROTECTED :{WHITE}Aquesta empresa ja no negocia participacions... diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 5702c39f9..9357f00b1 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2318,7 +2318,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Prodaj 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Nije moguće kupiti 25% udjela u ovoj tvrtci... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Nije moguće prodati 25% udjela u ovoj tvrtci... STR_707D_OWNED_BY :{WHITE}({COMMA}% u vlasništvu {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% u vlasništvu {COMPANY}{} {COMMA}% u vlasništvu {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} je preuzeta od strane tvrtke {COMPANY}! STR_7080_PROTECTED :{WHITE}Ova tvrka još nije dovoljno stara da bi trgovala udjelima... diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 3260b7d19..ff1f2f707 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2374,7 +2374,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Prodat 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Nemohu koupit podíl v této společnosti... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Nemohu prodat podíl v této společnosti... STR_707D_OWNED_BY :{WHITE}({COMMA}% vlastněno {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% vlastněno {COMPANY}{} {COMMA}% vlastněno {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} byla převzata {COMPANY}! STR_7080_PROTECTED :{WHITE}Tato společnost zatím neobchoduje s akciemi... diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 25af1188a..a918a0036 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -2316,7 +2316,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Sælg 25 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kan ikke købe 25% aktier i dette selskab... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan ikke sælge 25% aktier i dette selskab... STR_707D_OWNED_BY :{WHITE}({COMMA}% ejes af {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% ejes af {COMPANY}{} {COMMA}% ejes af {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} er blevet overtaget af {COMPANY}! STR_7080_PROTECTED :{WHITE}Dette selskab sælger ikke aktier endnu... diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 8dbf72dac..e0df120c1 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -2316,7 +2316,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Verkoop STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kan geen 25% aandeel in dit bedrijf kopen... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan geen 25% aandeel in dit bedrijf verkopen... STR_707D_OWNED_BY :{WHITE}({COMMA}% eigendom van {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% eigendom van {COMPANY}{} {COMMA}% eigendom van {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} is overgenomen door {COMPANY}! STR_7080_PROTECTED :{WHITE}Dit bedrijf verhandelt nog geen aandelen... diff --git a/src/lang/english.txt b/src/lang/english.txt index 78c9ba23a..8a488e247 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2316,7 +2316,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Sell 25% STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Can't buy 25% share in this company... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Can't sell 25% share in this company... STR_707D_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY}{} {COMMA}% owned by {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}! STR_7080_PROTECTED :{WHITE}This company is not old enough to trade shares yet... diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index a32ac92fa..67b88636c 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2201,7 +2201,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Vendu 25 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Ne povas aĉeti 25%-an dividaĵon... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Ne povas vendi 25%-an dividaĵon... STR_707D_OWNED_BY :{WHITE}({COMMA}% posedataj de {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% posedataj de {COMPANY}{} {COMMA}% posedataj de {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} estas transprenita de {COMPANY}! STR_7080_PROTECTED :{WHITE}Ĉi tiu kompanio ne sufiĉe aĝas por jam komerci dividaĵojn... diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 3695b89e0..3de208419 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -2416,7 +2416,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Müü 25 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Selle ettevõtte aktsiatest ei saa 25% osta... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Selle ettevõtte aktsiatest ei saa 25% müüa... STR_707D_OWNED_BY :{WHITE}({COMMA}% on ettevõtte {COMPANY} käes) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% on ettevõtte {COMPANY} käes{} {COMMA}% on ettevõtte {COMPANY} käes) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} võeti üle ettevõtte {COMPANY} poolt! STR_7080_PROTECTED :{WHITE}See ettevõtte pole veel piisavalt vana, et aktsiaid vahetada... diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 1b84ec804..c759a98c3 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2307,7 +2307,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Myy 25{N STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Tästä yhtiöstä ei voi ostaa 25{NBSP}%:n osuutta... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Tästä yhtiöstä ei voi myydä 25{NBSP}%:n osuutta... STR_707D_OWNED_BY :{WHITE}({COMMA}{NBSP}%:n omistus: {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}{NBSP}%:n omistus: {COMPANY}{} {COMMA}{NBSP}%:n omistus {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}Yhtiön {COMPANY} on ottanut haltuun {COMPANY}! STR_7080_PROTECTED :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita... diff --git a/src/lang/french.txt b/src/lang/french.txt index f44893a90..360532d7c 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -2317,7 +2317,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Vendre 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Impossible d'acheter des parts... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Impossible de vendre des parts... STR_707D_OWNED_BY :{WHITE}({COMMA}% détenus par {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% détenus par {COMPANY}{} {COMMA}% détenus par {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} a été rachetée par {COMPANY}! STR_7080_PROTECTED :{WHITE}Cette compagnie ne vend pas d'actions pour le moment... diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 1060e3236..3a140a1ff 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2144,7 +2144,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Vender u STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Non se pode comprar un 25% das accións nesta compañía... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Non se pode vender un 25% das accións desta compañía... STR_707D_OWNED_BY :{WHITE}({COMMA}% propiedade de {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% propiedade de {COMPANY}{} {COMMA}% propiedade de {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} comprada por {COMPANY}! STR_7080_PROTECTED :{WHITE}Esta compañía todavía non comercia con accións... diff --git a/src/lang/german.txt b/src/lang/german.txt index d8aeab895..d520d62a0 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -2317,7 +2317,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}25% der STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kauf von 25% der Aktien dieser Firma nicht möglich... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Verkauf von 25% der Aktien dieser Firma nicht möglich... STR_707D_OWNED_BY :{WHITE}({COMMA}% Eigentum von {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% Eigentum von {COMPANY}{} {COMMA}% Eigentum von {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} wurde von {COMPANY} übernommen! STR_7080_PROTECTED :{WHITE}Dieses Unternehmen ist noch nicht an der Börse... diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index e98aabf72..3726814ce 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2416,7 +2416,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}25% elad STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Nem vehetsz 25%-ot ebből a cégből... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Nem adhatsz el 25%-ot ebből a cégből... STR_707D_OWNED_BY :{WHITE}({COMMA}% {COMPANY} tulajdona) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% {COMPANY} tulajdona{} {COMMA}% {COMPANY} tulajdona) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} céget felvásárolta {COMPANY}! STR_7080_PROTECTED :{WHITE}Ez a cég egyelőre még nem rendelkezik részvényekkel... diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index db2606e61..a6ae7571b 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2166,7 +2166,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Selja 25 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Get ekki keypt 25% hlut í þessu fyrirtæki... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Get ekki selt 25% hlut í þessu fyrirtæki... STR_707D_OWNED_BY :{WHITE}({COMMA}% í eigu {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% í eigu {COMPANY}{} {COMMA}% í eigu {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} hefur verið yfirtekið af {COMPANY}! STR_7080_PROTECTED :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ... diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 4f293d04d..0a5bb617c 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2318,7 +2318,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Vende il STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Impossibile comprare il 25% delle azioni... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Impossibile vendere il 25% delle azioni... STR_707D_OWNED_BY :{WHITE}({COMMA}% posseduto dalla {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% posseduto dalla {COMPANY}{} {COMMA}% posseduto dalla {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}La {COMPANY} è stata rilevata dalla {COMPANY}! STR_7080_PROTECTED :{WHITE}Questa compagnia non è abbastanza vecchia per scambiare azioni... diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index ebea12ecd..5ff38f5b9 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -2316,7 +2316,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}この STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}この会社の２５％の株が買収できません... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}この会社の２５％の株が販売できません... STR_707D_OWNED_BY :{WHITE}（{1:COMPANY}が{0:COMMA}％株式保有） -STR_707E_OWNED_BY_OWNED_BY :{WHITE}（{1:COMPANY}が{0:COMMA}％株式保有）{}　（{3:COMPANY}が{2:COMMA}％株式保有） STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY}が{COMPANY}に買収！ STR_7080_PROTECTED :{WHITE}まだ早いため、この会社は株式取引できません... diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 9557724bc..b7b47fc4b 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2302,7 +2302,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}이 회 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}이 회사 주식의 25%를 매입할 수 없습니다... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}이 회사 주식의 25%를 매도할 수 없습니다... STR_707D_OWNED_BY :{WHITE}({COMMA}% {COMPANY}의 소유) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% {COMPANY}의 소유{} {COMMA}% {COMPANY}의 소유) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY}의 관리권이 {COMPANY}(으)로 넘어갔습니다! STR_7080_PROTECTED :{WHITE}이 회사는 주식을 거래할 만큼 오래되지 않았습니다... diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 194504d2a..b81b322a0 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2196,7 +2196,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Parduoti STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Negalima nusipirkti 25% sios kompanijos akciju... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Negalima parduoti 25% sios kompanijos akciju... STR_707D_OWNED_BY :{WHITE}({COMMA}% priklauso {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% priklauso {COMPANY}{} {COMMA}% priklauso {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} buvo perimta {COMPANY}! STR_7080_PROTECTED :{WHITE}Si kompanija dar pernelyg jauna, kad galetu pardavineti savo akcijas... diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 5bd7eda45..897678f99 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -2317,7 +2317,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Selg 25{ STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kan ikke kjøpe 25{NBSP}% av aksjene... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan ikke selge 25{NBSP}% av aksjene... STR_707D_OWNED_BY :{WHITE}({COMMA}{NBSP}% eies av {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}{NBSP}% eies av {COMPANY}{} {COMMA}{NBSP}% eies av {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} har blitt kjøpt opp av {COMPANY}! STR_7080_PROTECTED :{WHITE}Dette selskapet selger ikke aksjer enda... diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 85f258b7b..4df61bc64 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2317,7 +2317,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Sel 25 % STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kan ikkje kjøpe 25 % av aksjane... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan ikkje selje 25 % av aksjane... STR_707D_OWNED_BY :{WHITE}({COMMA} % eigast av {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA} % eigast av {COMPANY}{} {COMMA} % eigast av {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} har vorte kjøpt opp av {COMPANY}! STR_7080_PROTECTED :{WHITE}Dette selskapet sel ikkje aksjer enno... diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index 3d229cfae..74bcb7ad7 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -2307,7 +2307,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Ellsay 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}An'tcay uybay 25% areshay inway isthay ompanycay... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}An'tcay ellsay 25% areshay inway isthay ompanycay... STR_707D_OWNED_BY :{WHITE}({COMMA}% ownedway ybay {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% ownedway ybay {COMPANY}{} {COMMA}% ownedway ybay {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} ashay eenbay akentay overway ybay {COMPANY}! STR_7080_PROTECTED :{WHITE}Isthay ompanycay isway otnay oldway enoughway otay adetray aresshay etyay... diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 867800289..82d855442 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2418,7 +2418,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Sprzedaj STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Nie można kupić 25% udziałów w tej firmie... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}nie można sprzedać 25% udziałów tej firmy... STR_707D_OWNED_BY :{WHITE}({COMMA}% w posiadaniu przez {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% w posiadaniu przez {COMPANY}{} {COMMA}% w posiadaniu przez {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} zostało przejęte przez {COMPANY}! STR_7080_PROTECTED :{WHITE}Ta firma jeszcze nie sprzedaje akcji... diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index a72ffb0bf..6a5ac89ca 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -2297,7 +2297,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Vender 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Não é possível comprar 25% de acções nesta empresa... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Não é possível vender 25% de acções nesta empresa... STR_707D_OWNED_BY :{WHITE}({COMMA}% propriedade de {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% propriedade de {COMPANY}{} {COMMA}% propriedade de {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} foi comprada por {COMPANY}! STR_7080_PROTECTED :{WHITE}Esta empresa ainda não troca acções... diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index ba7f562fa..c5d3eabd5 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -2316,7 +2316,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Vinde 25 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Nu pot cumpăra 25% din acţiunile acestei companii... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Nu pot vinde 25% din acţiunile acestei companii... STR_707D_OWNED_BY :{WHITE}({COMMA}% deţinute de {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% deţinute de {COMPANY}{} {COMMA}% deţinute de {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} a fost preluată de {COMPANY}! STR_7080_PROTECTED :{WHITE}Această companie încă nu vinde acţiuni... diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 548d59568..b9b488a5a 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2329,7 +2329,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Прод STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Не могу купить 25% акций этой компании... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Не могу продать 25% акций этой компании... STR_707D_OWNED_BY :{WHITE}({COMMA}% владеет {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% владеет {COMPANY}{} {COMMA}% владеет {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} выкуплена {COMPANY}! STR_7080_PROTECTED :{WHITE}Эта компания еще не может торговать акциями... diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 6ab5468dc..b3a0b6196 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -2189,7 +2189,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}出售 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}不能购买此公司的股份…… STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}不能出售此公司的股份…… STR_707D_OWNED_BY :{WHITE}({COMMA}% 由 {COMPANY} 所有) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% 由 {COMPANY} 所有{} {COMMA}% 由 {COMPANY} 所有) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} 被 {COMPANY} 收购！ STR_7080_PROTECTED :{WHITE}这个公司刚刚开业，还不能进行股权交易…… diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 74cd196d7..5b100256d 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2380,7 +2380,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Predat 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}25% podiel v tejto spolocnosti sa neda kupit ... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}25% podiel v tejto spolocnosti sa neda predat ... STR_707D_OWNED_BY :{WHITE}({COMMA}% vlastnene {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% vlastnene {COMPANY}{} {COMMA}% vlastnene {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} bola kupena spolocnostou {COMPANY}! STR_7080_PROTECTED :{WHITE}S akciami tejto spolocnosti nie je zatial mozne obchodovat ... diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 1d3ca3bbe..937eb77a4 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2396,7 +2396,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Prodaj 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Ni mogoče kupiti 25% delnic tega podjetja ... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Ni mogoče prodati 25% delnic tega podjetja ... STR_707D_OWNED_BY :{WHITE}({COMMA}% v lasti podjetja {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% v lasti podjetja {COMPANY}{} {COMMA}% v lasti podjetja {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :Podjetje {BLACK}{BIGFONT}{COMPANY} je bilo prevzeto s strani podjetja {COMPANY}! STR_7080_PROTECTED :{WHITE}Podjetje še ni dovolj staro, da bi lahko trgovalo z lastnimi delnicami ... diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 1896cb20f..d87153e93 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2317,7 +2317,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Vender 2 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}No se puede comprar el 25% de acciones... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}No se puede vender el 25% de acciones... STR_707D_OWNED_BY :{WHITE}({COMMA}% propiedad de {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% propiedad de {COMPANY}{} {COMMA}% propiedad de {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} ha sido comprada por {COMPANY}! STR_7080_PROTECTED :{WHITE}Esta empresa todavía no dispone acciones a la venta... diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 07efa7bdc..f71643bc8 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -2314,7 +2314,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Sälj 25 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kan inte köpa 25% andelar i detta företag... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Kan inte sälja 25% andelar i detta företag... STR_707D_OWNED_BY :{WHITE}({COMMA}% ägs av {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% ägs av {COMPANY}{} {COMMA}% ägs av {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} har tagits över av {COMPANY}! STR_7080_PROTECTED :{WHITE}Det här företaget bedriver inte aktiehandel ännu.... diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 0d2c21f29..005e262a3 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2316,7 +2316,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}出售 STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}無法購買這間公司的股份... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}無法出售這間公司的股份... STR_707D_OWNED_BY :{WHITE}({COMMA}% 由 {COMPANY} 擁有) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% 由 {COMPANY} 擁有{} {COMMA}% 由 {COMPANY} 擁有) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} 被 {COMPANY} 收購！ STR_7080_PROTECTED :{WHITE}這間公司才剛成立，還不能交易股票... diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 0b2a5e525..22a608b61 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -2315,7 +2315,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Şirketi STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Şirketin %25'i alınamıyor... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Şirketin %25'i satılamıyor... STR_707D_OWNED_BY :{WHITE}(%{COMMA} ortağı {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}(%{COMMA} ortağı {COMPANY}{} %{COMMA} ortağı {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY}, {COMPANY} tarafından alındı! STR_7080_PROTECTED :{WHITE}Bu şirket hisselerini satacak kadar eski değil... diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 81c263cfd..13aa0a2bb 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2479,7 +2479,6 @@ STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Прод STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Неможливо купити 25% акцій цієї компанії... STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Неможливо продати 25% акцій цієї компанії... STR_707D_OWNED_BY :{WHITE}({COMMA}% у власності {COMPANY}) -STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% у власності {COMPANY}{} {COMMA}% у власності {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} викуплено {COMPANY}! STR_7080_PROTECTED :{WHITE}Ця компанія поки ще не продається... diff --git a/src/player_gui.cpp b/src/player_gui.cpp index 8180b7b1b..e71d25b0b 100644 --- a/src/player_gui.cpp +++ b/src/player_gui.cpp @@ -1038,21 +1038,18 @@ int GetAmountOwnedBy(const Player *p, PlayerID owner) static void DrawCompanyOwnerText(const Player *p) { const Player *p2; - int num = -1; + uint num = 0; + const byte height = GetCharacterHeight(FS_NORMAL); FOR_ALL_PLAYERS(p2) { uint amt = GetAmountOwnedBy(p, p2->index); if (amt != 0) { - num++; + SetDParam(0, amt * 25); + SetDParam(1, p2->index); - SetDParam(num * 2 + 0, amt * 25); - SetDParam(num * 2 + 1, p2->index); - - if (num != 0) break; + DrawString(120, (num++) * height + 116, STR_707D_OWNED_BY, TC_FROMSTRING); } } - - if (num >= 0) DrawString(120, 124, STR_707D_OWNED_BY + num, TC_FROMSTRING); } /** @@ -1119,7 +1116,7 @@ static void PlayerCompanyWndProc(Window *w, WindowEvent *e) DrawStringMultiCenter(48, 141, STR_7037_PRESIDENT, 94); SetDParam(0, CalculateCompanyValue(p)); - DrawString(110, 114, STR_7076_COMPANY_VALUE, TC_FROMSTRING); + DrawString(110, 106, STR_7076_COMPANY_VALUE, TC_FROMSTRING); DrawCompanyOwnerText(p); -- cgit v1.2.3-54-g00ecf