From 322abc44e09088c12a3a92bf60224da014da3b4a Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 30 Jun 2013 08:58:35 +0000 Subject: [PATCH] (svn r25528) [1.3] -Backport from trunk: - Fix: strndup should not examine strings beyond its upper limit [FS#5621] (r25527) - Fix: SDL does not give an event when an application gets mouse focus while going to full screen, so manually force the mouse-is-in-window state [FS#5587] (r25523) - Fix: Reworked layouting (r25526, r25525, r25524, r25513, r25512, r25511) --- src/fontcache.cpp | 2 +- src/gfx_layout.cpp | 16 +++++++++------- src/highscore.cpp | 2 +- src/highscore.h | 9 +++++++-- src/highscore_gui.cpp | 3 ++- src/lang/afrikaans.txt | 2 +- src/lang/arabic_egypt.txt | 2 +- src/lang/basque.txt | 2 +- src/lang/belarusian.txt | 2 +- src/lang/brazilian_portuguese.txt | 2 +- src/lang/bulgarian.txt | 2 +- src/lang/catalan.txt | 2 +- src/lang/croatian.txt | 2 +- src/lang/czech.txt | 2 +- src/lang/danish.txt | 2 +- src/lang/dutch.txt | 2 +- src/lang/english.txt | 3 ++- src/lang/english_AU.txt | 2 +- src/lang/english_US.txt | 2 +- src/lang/esperanto.txt | 2 +- src/lang/estonian.txt | 2 +- src/lang/faroese.txt | 2 +- src/lang/finnish.txt | 2 +- src/lang/french.txt | 2 +- src/lang/gaelic.txt | 2 +- src/lang/galician.txt | 2 +- src/lang/german.txt | 2 +- src/lang/greek.txt | 2 +- src/lang/hebrew.txt | 2 +- src/lang/hungarian.txt | 2 +- src/lang/icelandic.txt | 2 +- src/lang/indonesian.txt | 2 +- src/lang/irish.txt | 2 +- src/lang/italian.txt | 2 +- src/lang/japanese.txt | 2 +- src/lang/korean.txt | 2 +- src/lang/latvian.txt | 2 +- src/lang/lithuanian.txt | 2 +- src/lang/luxembourgish.txt | 2 +- src/lang/malay.txt | 2 +- src/lang/norwegian_bokmal.txt | 2 +- src/lang/norwegian_nynorsk.txt | 2 +- src/lang/polish.txt | 2 +- src/lang/portuguese.txt | 2 +- src/lang/romanian.txt | 2 +- src/lang/russian.txt | 2 +- src/lang/serbian.txt | 2 +- src/lang/simplified_chinese.txt | 2 +- src/lang/slovak.txt | 2 +- src/lang/slovenian.txt | 2 +- src/lang/spanish.txt | 2 +- src/lang/swedish.txt | 2 +- src/lang/tamil.txt | 2 +- src/lang/thai.txt | 2 +- src/lang/traditional_chinese.txt | 2 +- src/lang/turkish.txt | 2 +- src/lang/ukrainian.txt | 2 +- src/lang/unfinished/chuvash.txt | 2 +- src/lang/unfinished/frisian.txt | 2 +- src/lang/unfinished/ido.txt | 2 +- src/lang/unfinished/macedonian.txt | 2 +- src/lang/unfinished/maltese.txt | 2 +- src/lang/unfinished/marathi.txt | 2 +- src/lang/unfinished/persian.txt | 2 +- src/lang/unfinished/urdu.txt | 2 +- src/lang/vietnamese.txt | 2 +- src/lang/welsh.txt | 2 +- src/string.cpp | 3 +-- src/video/sdl_v.cpp | 5 +++++ 69 files changed, 89 insertions(+), 76 deletions(-) diff --git a/src/fontcache.cpp b/src/fontcache.cpp index 2c1f7aafa2..b51cecaf6c 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -76,7 +76,7 @@ public: virtual const Sprite *GetGlyph(GlyphID key); virtual uint GetGlyphWidth(GlyphID key); virtual bool GetDrawGlyphShadow(); - virtual GlyphID MapCharToGlyph(WChar key) { return SPRITE_GLYPH | key; } + virtual GlyphID MapCharToGlyph(WChar key) { assert(IsPrintable(key)); return SPRITE_GLYPH | key; } virtual const void *GetFontTable(uint32 tag, size_t &length) { length = 0; return NULL; } }; diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp index 69b3077f27..6ce6078ebe 100644 --- a/src/gfx_layout.cpp +++ b/src/gfx_layout.cpp @@ -307,10 +307,11 @@ ParagraphLayout::Line *ParagraphLayout::nextLine(int max_width) } const FontCache *fc = iter->second->fc; - const WChar *next_run = this->buffer_begin + iter->first + 1; + const WChar *next_run = this->buffer_begin + iter->first; for (;;) { - WChar c = *this->buffer++; + WChar c = *this->buffer; + last_char = this->buffer; if (c == '\0') { this->buffer = NULL; @@ -322,14 +323,14 @@ ParagraphLayout::Line *ParagraphLayout::nextLine(int max_width) iter++; assert(iter != this->runs.End()); - next_run = this->buffer_begin + iter->first + 1; + next_run = this->buffer_begin + iter->first; begin = this->buffer; + + last_space = NULL; } if (IsWhitespace(c)) last_space = this->buffer; - last_char = this->buffer; - if (IsPrintable(c) && !IsTextDirectionChar(c)) { int char_width = GetCharacterWidth(fc->GetSize(), c); width += char_width; @@ -350,16 +351,17 @@ ParagraphLayout::Line *ParagraphLayout::nextLine(int max_width) * Korean. For other languages terminating mid-word might * not be the best, but terminating the whole string instead * of continuing the word at the next line is worse. */ - this->buffer--; last_char = this->buffer; } else { /* A space is found; perfect place to terminate */ this->buffer = last_space; - last_char = last_space - 1; + last_char = last_space; } break; } } + + this->buffer++; } if (l->Length() == 0 || last_char - begin != 0) { diff --git a/src/highscore.cpp b/src/highscore.cpp index 0a38acf2eb..2ce2d9bdad 100644 --- a/src/highscore.cpp +++ b/src/highscore.cpp @@ -172,7 +172,7 @@ void LoadFromHighScore() i = SP_SAVED_HIGHSCORE_END; break; } - *lastof(hs->company) = '\0'; + str_validate(hs->company, lastof(hs->company), SVS_NONE); hs->title = EndGameGetPerformanceTitleFromValue(hs->score); } } diff --git a/src/highscore.h b/src/highscore.h index 65c6aa40f7..5d4b919ee5 100644 --- a/src/highscore.h +++ b/src/highscore.h @@ -17,9 +17,14 @@ #include "settings_type.h" struct HighScore { - char company[100]; + /** + * The name of the company and president. + * The + 5 is for the comma and space or possibly other characters + * that join the two names in this single string and the '\0'. + */ + char company[(MAX_LENGTH_COMPANY_NAME_CHARS + MAX_LENGTH_PRESIDENT_NAME_CHARS + 5) * MAX_CHAR_LENGTH]; StringID title; ///< NOSAVE, has troubles with changing string-numbers. - uint16 score; ///< do NOT change type, will break hs.dat + uint16 score; ///< The score for this high score. Do NOT change type, will break hs.dat }; extern HighScore _highscore_table[SP_HIGHSCORE_END][5]; diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp index 768b32e496..667ef85da1 100644 --- a/src/highscore_gui.cpp +++ b/src/highscore_gui.cpp @@ -190,7 +190,8 @@ struct HighScoreWindow : EndGameHighScoreBaseWindow { if (hs[i].company[0] != '\0') { TextColour colour = (this->rank == i) ? TC_RED : TC_BLACK; // draw new highscore in red - DrawString(pt.x + 71, pt.x + 569, pt.y + 140 + (i * 55), hs[i].company, colour); + SetDParamStr(0, hs[i].company); + DrawString(pt.x + 71, pt.x + 569, pt.y + 140 + (i * 55), STR_JUST_BIG_RAW_STRING, colour); SetDParam(0, hs[i].title); SetDParam(1, hs[i].score); DrawString(pt.x + 71, pt.x + 569, pt.y + 140 + FONT_HEIGHT_LARGE + (i * 55), STR_HIGHSCORE_STATS, colour); diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 1dd66ec0ce..5f4f10c538 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalis STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnaat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Magnaat STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Magnaat van die Eeu -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} behaal '{STRING}' status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} van {COMPANY} behaal '{STRING}' status! diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index dd08bdd021..a60c48dd78 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -646,7 +646,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :عمدة الت STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :وزير التجارة و النقل STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :ملك التجارة و النقل STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :امبراطور القرن -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}. {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}. {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}حققت شركة {COMPANY} بجدارة'{STRING}' STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}حقق {PRESIDENT_NAME}مدير شركة {COMPANY} '{STRING}' بجدارة diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 5dc244f268..2dd75e3930 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalista STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnatea STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Handikia STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Mendeko Tycoona -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} lorpenak '{STRING}' estatusa! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} {COMPANY} lorpenak '{STRING}' estatusa! diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 2225cfe27d..2b5d38069e 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -963,7 +963,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Капітал STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Маґнат STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Транспартны кароль STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Аліґарх стагоддзя -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}«{STRING}» ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}Дырэктара кампаніі «{COMPANY}» называюць {STRING.abl}! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME}, прэзідэнт кампаніі «{COMPANY}», заслужыў тытул «{STRING}»! diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index b5a4cff955..816bb5ce2f 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalista STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnata STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mandachuva STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Magnata do Século -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} alcança o status de '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} de {COMPANY} alcança o status de '{STRING}'! diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 984cdb0787..2ef6caa8f3 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -652,7 +652,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Капитал STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Магнат STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Завоевател STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Акула на века -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} достигна статус '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} от {COMPANY} достигна статус '{STRING}'! diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index e14edc5875..82dc545cbf 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalista STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Gran Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Magnat del Segle -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} assoleix l'estat '{STRING}' ! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} de {COMPANY} assoleix l'estat '{STRING}' ! diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 91f080bb0c..628e348ac6 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -746,7 +746,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Velikaš STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Bogataš STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tajkun stoljeća -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}Tvrtka {COMPANY} postigla je status '{STRING}' ! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} iz tvrtke {COMPANY} postigao je status '{STRING}'! diff --git a/src/lang/czech.txt b/src/lang/czech.txt index f962d391c5..8ca290f6f7 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -732,7 +732,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalista STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnát STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Velemagnát STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Magnát století -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} získal titul '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} z {COMPANY} získal titul '{STRING}'! diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 16d1d08ade..529c98523d 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Århundredes Matador -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} får '{STRING}' status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} fra {COMPANY} får '{STRING}' status! diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index e604f2304e..fdafca7263 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnaat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon van de Eeuw -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} bereikt '{STRING}'-status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} van {COMPANY} bereikt '{STRING}'-status! diff --git a/src/lang/english.txt b/src/lang/english.txt index 7d1dd11579..b498866f16 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnate STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon of the Century -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} achieves '{STRING}' status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} of {COMPANY} achieves '{STRING}' status! @@ -4690,6 +4690,7 @@ STR_JUST_DATE_ISO :{DATE_ISO} STR_JUST_STRING :{STRING} STR_JUST_STRING_STRING :{STRING}{STRING} STR_JUST_RAW_STRING :{RAW_STRING} +STR_JUST_BIG_RAW_STRING :{BIG_FONT}{RAW_STRING} # Slightly 'raw' stringcodes with colour or size STR_BLACK_COMMA :{BLACK}{COMMA} diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 8b01489445..434a62ca85 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnate STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon of the Century -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} achieves '{STRING}' status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} of {COMPANY} achieves '{STRING}' status! diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 6f8e3ff0c9..dc7c107da5 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnate STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon of the Century -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} achieves '{STRING}' status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} of {COMPANY} achieves '{STRING}' status! diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 08b3067de2..c748fb6b61 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -646,7 +646,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalisto STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Manaĝisto STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Potenculo STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Plej potenca de la Jarcento -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} atingis staton de '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} de {COMPANY} atingis staton de '{STRING}'! diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index a8cad37a51..bdaebb49bc 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -707,7 +707,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnaat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Sajandi suurärimees -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} saavutas '{STRING}' staatuse! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} {COMPANY}'st saavutas '{STRING}' staatuse! diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index b20e14b50d..2d259aba52 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Peningamaður STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Ídnaðarkongur STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Máttmikil ídnaðar kongur STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Aldarinnar Tycoon -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} røkkur '{STRING}' støði! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} frá {COMPANY} røkkur '{STRING}' støði! diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index de3d16312b..03010859b1 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalisti STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnaatti STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Moguli STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Vuosisadan pohatta -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} saavuttaa arvon '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} yhtiöstä {COMPANY} saavuttaa arvon '{STRING}'! diff --git a/src/lang/french.txt b/src/lang/french.txt index c39adcab69..24f0e6d49d 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitaliste STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Grand ponte STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon du siècle -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} atteint le statut de «{NBSP}{STRING}{NBSP}»{NBSP}! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} de {COMPANY} atteint le statut de «{NBSP}{STRING}{NBSP}»{NBSP}! diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 2493f7aa9a..543d68e2f7 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -848,7 +848,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Neach-calpachai STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Baran STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Taidhcùn na linne -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}“{STRING}" ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}Bhuannaich {COMPANY} an rang “{STRING}"! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}Bhuannaich {PRESIDENT_NAME} aig {COMPANY} an rang “{STRING}"! diff --git a/src/lang/galician.txt b/src/lang/galician.txt index f0ce5c522b..2c7e19f635 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalista STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnate STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Magnate do Século -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} logra o status de '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} de {COMPANY} logra o status '{STRING}'! diff --git a/src/lang/german.txt b/src/lang/german.txt index 8f1acb4828..f73e4b4aee 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon des Jahrhunderts -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} erreicht '{STRING}' Status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} von {COMPANY} erreicht '{STRING}' Status! diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 191103fa5f..4f67b5d075 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -744,7 +744,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Κεφαλαι STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Μεγιστάνας STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Τυχοδιώκτης STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Μεγιστάνας του Αιώνα -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}«{STRING}» ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} έφτασε στο επίπεδο «{STRING}» STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{G Ο Η ""} {PRESIDENT_NAME} της εταιρίας {COMPANY} έφτασε στο επίπεδο «{STRING}»! diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 02d79b3d0c..d5af6d8414 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -664,7 +664,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :קפיטליס STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :איל הון STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :איל הון STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :טיקון המאה -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} הגיעה למעמד '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}'{2:STRING}' הגיע לדרגת {NBSP}{1:COMPANY} מ {NBSP}{0:PRESIDENT_NAME} diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 87bb42517d..1bfc97dc4e 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -713,7 +713,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Tőkés STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Nagytőkés STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mágnás STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Az évszázad iparmágnása -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} elérte a '{STRING}' rangot! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} - {COMPANY} elérte a '{STRING}' rangot! diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 8db1d70549..68437a459f 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapítalisti STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Áhrifamaður STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Stórlax STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Viðskiptajöfur aldarinnar -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} öðlast '{STRING}' titil! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} úr {COMPANY} öðlast '{STRING}' titil! diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index f1ee24d152..d3438ebb98 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalis STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Tokoh terkemuka STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Jutawan STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon abad ini -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} mencapai status '{STRING}' ! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} dari {COMPANY} mencapai status '{STRING}' ! diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 90a505c9a3..18e9a2c6c1 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -647,7 +647,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Caipitlí STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Móruasal STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mógal STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Toicí an Chéid -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}Baineann {COMPANY} an stádas '{STRING}' amach! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}Baineann {PRESIDENT_NAME} ó {COMPANY} an stádas '{STRING}' amach! diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 7320da803c..7856e283f5 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -652,7 +652,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalista STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Finanziere STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Magnate STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Magnate del secolo -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} raggiunge lo status di '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} della {COMPANY} raggiunge lo status di '{STRING}'! diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index b267d7a420..eacf46f4d2 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :資本家 STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :大事業家 STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :権力者 STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :世紀の富豪 -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}、{COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}、{COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' （{COMMA}） STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} は '{STRING}' の称号を獲得した！ STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} の {COMPANY} は '{STRING}' の称号を獲得した！ diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 2d43b8d249..2b9afea674 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :{G=f}자본가 STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :{G=f}권력자 STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :{G=m}거물 STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :{G=m}금세기의 타이쿤! -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} 회사가 '{STRING}' 등급을 달성했습니다! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{1:COMPANY}의 {0:PRESIDENT_NAME}이(가) 드디어 '{2:STRING}' 등급을 달성했습니다! diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 9ae17a93b3..6849aff7d3 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -652,7 +652,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitālists STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnāts STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Moguls STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Gadsimta biržas magnāts -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} sasniedzis '{STRING}' stāvokli! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} no {COMPANY} sasnieguši '{STRING}' stāvokli! diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index d78491ae6d..382ba350b9 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -845,7 +845,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalistas STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnatas STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Didžiausias magnatas STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Amžiaus magnatas -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} pasiekė „{STRING}“ statusą! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} iš {COMPANY} pasiekė „{STRING}“ statusą! diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index cb365ed919..e41894c8af 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon vum Jorhonnert -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} ereescht den Status '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} vun {COMPANY} ereescht den Status '{STRING}'! diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 42d72203e4..356faf1f8d 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalis STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Hartawan STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Taikun abad semasa -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} mencapai status '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} dari {COMPANY} mencapai status '{STRING}'! diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 4eeea16c48..b80d61f9ae 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -652,7 +652,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Århundrets finansfyrste -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} oppnår '{STRING}'-status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} fra {COMPANY} oppnår '{STRING}'-status! diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 3b4cf2b8c4..085be9de8b 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -652,7 +652,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Hundreårets finansfyrste -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} oppnår status som '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} frå {COMPANY} oppnår status som '{STRING}'! diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 650b796a79..881926a7d5 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1029,7 +1029,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalista STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Potentat STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon Stulecia -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} osiąga status: '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} z {COMPANY} osiągnęło status '{STRING}'! diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 2617ac6c88..f965a69b30 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalista STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnata STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Grande magnata STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Magnata do século -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} conquista o estatuto de '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} de {COMPANY} conquista o estatuto de '{STRING}'! diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 92d7089250..b73a1a940c 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Magnatul Secolului -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} a dobândit titlul de '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} al {COMPANY} dobândeşte titlul de '{STRING}'! diff --git a/src/lang/russian.txt b/src/lang/russian.txt index bd6c984926..347309ed5d 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -795,7 +795,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Транспо STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL.abl :транспортным королём STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Магнат Века STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY.abl :Магнатом Века -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}«{STRING}» ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}Директора компании «{COMPANY}» называют {STRING.abl}! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME}, президент компании «{COMPANY}», заслужил титул «{STRING}»! diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 7ecc84ee46..5a08ec46a1 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -845,7 +845,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL.gen :mogula STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tajkun veka STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY.gen :tajkuna veka -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} dostiže status '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME}, vlasnik preduzeća {COMPANY} je dostigao status '{STRING}'! diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 6b225f1c1a..a8c346b378 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :运输资本家 STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :运输行业巨子 STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :运输行业领袖 STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :世纪大亨 -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} 达到 '{STRING}' 的状态！ STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} 在 {COMPANY} 达到 '{STRING}' 状态！ diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index e6ad2d446a..31c6d2e4e2 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -715,7 +715,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :{G=m}Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :{G=m}Magnát STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon Storočia -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} získal označenie '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} z {COMPANY} získal označenie '{STRING}'! diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 0aa9e2c788..41b0e278aa 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -803,7 +803,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Glavar STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Velekapitalist stoletja -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} dosega naslov '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} iz podjetja {COMPANY} prejema naslov '{STRING}'! diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 00e40f832f..a880eb1c9e 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Capitalista STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnate STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Potentado STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Magnate del siglo -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}¡{COMPANY} logra el estado '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}¡{PRESIDENT_NAME} de {COMPANY} logra el estado '{STRING}'! diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 47eddb8e85..4477c127cc 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogul STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Århundradets pamp -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} uppnår '{STRING}'status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} från {COMPANY} uppnår '{STRING}'status! diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 4c5f5b5eb3..b94f0c7773 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -643,7 +643,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :முதலா STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :மேன்மையர் STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :மொகல் STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :நூற்றாண்டின் டைக்கூன் -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} '{STRING}' நிலையை அடைந்தது! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} {COMPANY} '{STRING}' நிலையை அடைந்தார்! diff --git a/src/lang/thai.txt b/src/lang/thai.txt index a6fa3bf790..143c6652e7 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :นักลง STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :เจ้าสัว STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :ผู้มีอำนาจ STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :นักธุรกิจผู้ร่ำรวยและมีอิทธิพลมากแห่งศตวรรษ -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} ได้ก้าวไปสู่ขั้น '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} จาก {COMPANY} ได้ก้าวไปสู่ขั้น '{STRING}'! diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index cc9794a03f..96ed236ec5 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :資本家 STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :企業鉅子 STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :商業龍頭 STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :世紀大亨 -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}，{COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}，{COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} 達成「{STRING}」的地位！ STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} 的 {COMPANY} 達成「{STRING}」 的地位！ diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index b8b5faedae..f32143d84b 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -651,7 +651,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Sermayedar STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Patron STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Önemli adam STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Yüzyılın Kodamanı -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} '{STRING}' ünvanını kazandı! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} - {COMPANY} '{STRING}' ünvanını kazandı! diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 1a6bb8e1d9..8734bcdcef 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -775,7 +775,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Капітал STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Магнат STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Магнат року STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Магнат сторіччя -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} досягла статусу '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}Гравець {PRESIDENT_NAME} з {COMPANY} досяг статусу '{STRING}' diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index 110e44c7e5..d3d919b278 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -389,7 +389,7 @@ STR_PLAYLIST_CLEAR :{TINY_FONT}{BLA # Highscore window STR_HIGHSCORE_POSITION :{BIG_FONT}{BLACK}{COMMA}. -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) # Smallmap window diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index ce6b451a27..f8abcaeddf 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -641,7 +641,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Kapitalist STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnaat STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mongoal STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Tycoon fan 'e Ieuw -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} berikt'{STRING}' status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} fan {COMPANY} berikt '{STRING}' status! diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt index a68dd613e0..bd45270433 100644 --- a/src/lang/unfinished/ido.txt +++ b/src/lang/unfinished/ido.txt @@ -376,7 +376,7 @@ STR_MUSIC_TITLE_NAME :{TINY_FONT}{DKG # Highscore window STR_HIGHSCORE_POSITION :{BIG_FONT}{BLACK}{COMMA}. -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) # Smallmap window diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 827a4f41e7..cff7f4d758 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -645,7 +645,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Капитал STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Магнат STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Могул STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Тајкун на векот -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} постигна статус на '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} од {COMPANY} постигна статус на'{STRING}'! diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt index 1b111b0215..75d3c3e34c 100644 --- a/src/lang/unfinished/maltese.txt +++ b/src/lang/unfinished/maltese.txt @@ -346,7 +346,7 @@ STR_MUSIC_TITLE_NAME :{TINY_FONT}{DKG # Highscore window STR_HIGHSCORE_POSITION :{BIG_FONT}{BLACK}{COMMA}. -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) # Smallmap window diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index 58bb3ef29f..418552d527 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -425,7 +425,7 @@ STR_PLAYLIST_TRACK_NAME :{TINY_FONT}{LTB # Highscore window STR_HIGHSCORE_POSITION :{BIG_FONT}{BLACK}{COMMA}. -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) # Smallmap window diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 0fb1e45fed..e92cb4082e 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :سرمایه د STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :نجیب زاده STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :بزرگ و با نفوذ STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :سرمایه دار مهم قرن -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} به وضعیت'{STRING}' دست یافت! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} از {COMPANY} به وضعیت '{STRING}' دست یافت! diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 3b1bbd2d5e..5f617c82c6 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -646,7 +646,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :سرمایہ د STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :امیر و اثر پزیر STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :مُغل STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :صدی کا ٹائیکون -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} '{STRING}' کا درجہ حاصل کرتا ہے STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} جو {COMPANY} سے تعلق رکھتا ہے۔ '{STRING}' کا درجہ حاصل کرتا ہے diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 07344f3611..af44e0ded2 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Nhà Tư Bản STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Kiệt Xuất STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Thế Lực STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Ông Trùm của Thế Kỷ -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}{COMPANY} đã nhận được giải '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}{PRESIDENT_NAME} từ {COMPANY} đã nhận được giải '{STRING}'! diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 21c11ba8ac..d1ad594ba3 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -650,7 +650,7 @@ STR_HIGHSCORE_PERFORMANCE_TITLE_CAPITALIST :Cyfalafwr STR_HIGHSCORE_PERFORMANCE_TITLE_MAGNATE :Magnad STR_HIGHSCORE_PERFORMANCE_TITLE_MOGUL :Mogwl STR_HIGHSCORE_PERFORMANCE_TITLE_TYCOON_OF_THE_CENTURY :Teicŵn -STR_HIGHSCORE_NAME :{BIG_FONT}{PRESIDENT_NAME}, {COMPANY} +STR_HIGHSCORE_NAME :{PRESIDENT_NAME}, {COMPANY} STR_HIGHSCORE_STATS :{BIG_FONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{BLACK}Mae {COMPANY} wedi cyrraedd statws '{STRING}'! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHITE}Mae {PRESIDENT_NAME} o gwmni {COMPANY} wedi cyrraedd statws '{STRING}'! diff --git a/src/string.cpp b/src/string.cpp index 7557f6d1d8..b543ab868e 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -560,10 +560,9 @@ size_t Utf8TrimString(char *s, size_t maxlen) } #ifdef DEFINE_STRNDUP -#include "core/math_func.hpp" char *strndup(const char *s, size_t len) { - len = min(strlen(s), len); + len = ttd_strnlen(s, len); char *tmp = CallocT(len + 1); memcpy(tmp, s, len); return tmp; diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index 736e069ce3..d66ad59a8b 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -393,6 +393,11 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h) _screen.dst_ptr = newscreen->pixels; _sdl_screen = newscreen; + /* When in full screen, we will always have the mouse cursor + * within the window, even though SDL does not give us the + * appropriate event to know this. */ + if (_fullscreen) _cursor.in_window = true; + Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); blitter->PostResize();