diff options
48 files changed, 99 insertions, 100 deletions
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 024695aec..86c8bb73c 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -1002,6 +1002,8 @@ static inline StringID GetPerformanceTitleFromValue(uint value) class CompanyLeagueWindow : public Window { private: GUIList<const Company*> companies; + uint ordinal_width; ///< The width of the ordinal number + uint text_width; ///< The width of the actual text /** * (Re)Build the company league list @@ -1048,19 +1050,63 @@ public: if (widget != CLW_BACKGROUND) return; uint y = r.top + WD_FRAMERECT_TOP; + int icon_y_offset = 1 + (FONT_HEIGHT_NORMAL - 10) / 2; + + bool rtl = _dynlang.text_dir == TD_RTL; + uint ordinal_left = rtl ? r.right - WD_FRAMERECT_LEFT - this->ordinal_width : r.left + WD_FRAMERECT_LEFT; + uint ordinal_right = rtl ? r.right - WD_FRAMERECT_LEFT : r.left + WD_FRAMERECT_LEFT + this->ordinal_width; + uint icon_left = r.left + WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT + (rtl ? this->text_width : this->ordinal_width); + uint text_left = rtl ? r.left + WD_FRAMERECT_LEFT : r.right - WD_FRAMERECT_LEFT - this->text_width; + uint text_right = rtl ? r.left + WD_FRAMERECT_LEFT + this->text_width : r.right - WD_FRAMERECT_LEFT; + for (uint i = 0; i != this->companies.Length(); i++) { const Company *c = this->companies[i]; - SetDParam(0, i + STR_ORDINAL_NUMBER_1ST); - SetDParam(1, c->index); - SetDParam(2, c->index); - SetDParam(3, GetPerformanceTitleFromValue(c->old_economy[1].performance_history)); + DrawString(ordinal_left, ordinal_right, y, i + STR_ORDINAL_NUMBER_1ST, i == 0 ? TC_WHITE : TC_YELLOW); + + DrawCompanyIcon(c->index, icon_left, y + icon_y_offset); - DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, i == 0 ? STR_COMPANY_LEAGUE_FIRST : STR_COMPANY_LEAGUE_OTHER); - DrawCompanyIcon(c->index, _dynlang.text_dir == TD_RTL ? r.right - 43 : r.left + 27, y + 1); + SetDParam(0, c->index); + SetDParam(1, c->index); + SetDParam(2, GetPerformanceTitleFromValue(c->old_economy[1].performance_history)); + DrawString(text_left, text_right, y, STR_COMPANY_LEAGUE_COMPANY_NAME); y += FONT_HEIGHT_NORMAL; } } + virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) + { + if (widget != CLW_BACKGROUND) return; + + this->ordinal_width = 0; + for (uint i = 0; i < MAX_COMPANIES; i++) { + this->ordinal_width = max(this->ordinal_width, GetStringBoundingBox(STR_ORDINAL_NUMBER_1ST + i).width); + } + this->ordinal_width += 5; // Keep some extra spacing + + uint widest_width = 0; + uint widest_title = 0; + for (uint i = 0; i < lengthof(_performance_titles); i++) { + uint width = GetStringBoundingBox(_performance_titles[i]).width; + if (width > widest_width) { + widest_title = i; + widest_width = width; + } + } + + const Company *c; + FOR_ALL_COMPANIES(c) { + SetDParam(0, c->index); + SetDParam(1, c->index); + SetDParam(2, widest_title); + widest_width = max(widest_width, GetStringBoundingBox(STR_COMPANY_LEAGUE_COMPANY_NAME).width); + } + + this->text_width = widest_width + 30; // Keep some extra spacing + + size->width = WD_FRAMERECT_LEFT + this->ordinal_width + WD_FRAMERECT_RIGHT + 16 + WD_FRAMERECT_LEFT + this->text_width + WD_FRAMERECT_RIGHT; + } + + virtual void OnTick() { if (this->companies.NeedResort()) { diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index cbcc18c63..34647e9ea 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -524,8 +524,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Kliek hi # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Maatskappy Liga Tabel -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingenieur STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Verkeer Bestuurder STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Vervoer Koordineerder diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index a684b3d78..b3da99f1f 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}اضغط # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}ترتيب الشركات -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :مهندس STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :مدير طرق STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :منظم نقل diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index fc5cbafbd..0e66e12a8 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Clique a # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Classificação de Empresas -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Engenheiro STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Gestor de Tráfego STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Coordenador de Transportes diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 35c64dbcf..50b0f4aa8 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -526,8 +526,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Клик # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Класиране на Компаниите -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Инженер STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Ръководител на Трафика STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Транспортен Координатор diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index e45e61fc1..21d1f548f 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Clica aq # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Taula de la Lliga d'Empreses -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Enginyer STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Director de Trànsit STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Coordinador de Transport diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 6319c966e..c7fea82b6 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -594,8 +594,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klikni o # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tablica lige tvrtki -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inženjer STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Prijevozni upravitelj STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Prijevozni koordinator diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 822487c9e..827b7c984 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -595,8 +595,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klepni z # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tabulka pořadí společností -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Strojvůdce STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Manažer dopravy STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Koordinátor dopravy diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 0a60a3c4e..80b410038 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -528,8 +528,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klik her # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Selskabsoversigt -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingeniør STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Trafikbestyrer STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Trafikkoordinator diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index f3869b217..3877cdb34 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klik hie # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Bedrijfscompetitietabel -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingenieur STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Verkeersleider STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transportcoördinator diff --git a/src/lang/english.txt b/src/lang/english.txt index 5807a966f..3558323bf 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Click he # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Company League Table -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Engineer STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Traffic Manager STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transport Coordinator diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index ac9fb8b17..1b07a8158 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -528,8 +528,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Click he # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Company League Table -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Engineer STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Traffic Manager STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transport Coordinator diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index ef6da1d0c..fe3b531f8 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -524,8 +524,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klaku ĉ # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Kompaniara tabelo -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inĝeniero STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Trafikkontrolisto STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transportmanaĝanto diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 391436158..4d519cb95 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -585,8 +585,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klõpsa, # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Ettevõtete edetabel -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Insener STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Liiklusmänedžer STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transpordi koordineerija diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 6740a3c1f..8a9f6b0b8 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Napsauta # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Yhtiökilpataulukko -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Insinööri STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Liikennepäällikkö STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Kuljetusjohtaja diff --git a/src/lang/french.txt b/src/lang/french.txt index 8965ede68..3aef85c84 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -530,8 +530,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Cliquer # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Classement des compagnies -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingénieur STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Gestionnaire de traffic STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Coordinateur de trafic diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 533c3c533..27a73fe85 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -521,8 +521,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Pincha a # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tabla da Liga de Compañías -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Enxeñeiro STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Xestor de Tráfico STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Coordinador de Transporte diff --git a/src/lang/german.txt b/src/lang/german.txt index 8d73ee0b5..77c52b8d0 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -530,8 +530,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Graph de # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Firmentabelle -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingenieur STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Verkehrsmanager STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Fuhrparkleiter diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 128ad0455..22c06aa49 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -624,8 +624,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Κάντ # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Πίνακας Πρωταθλήματος Εταιρειών -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Μηχανικός STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Διαχειριστής Κυκλοφορίας STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Συντονιστής Μεταφορών diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 5443de311..a80771321 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}לחץ # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}טבלת ליגת החברות -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :מהנדס זוטר STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :מהנדס בכיר STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :מנהל תחבורה זוטר diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index ab5803373..2458bdcc0 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -562,8 +562,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}A válla # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}A cégek helyezése -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Mérnök STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Forgalomigazgató STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Szállításszervező diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 0091cc519..7ac85cc4a 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -524,8 +524,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Smelltu # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Fyrirtækjalisti -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Verkfræðingur STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Umferðarstjórnandi STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Flutningaskipuleggjandi diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index c796bcbb6..a9bf7f37f 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klik dis # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tabel Liga Perusahaan -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Insinyur STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Manajer Lalu lintas STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Koordinator trasportasi diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 665567563..311bdbc84 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -531,8 +531,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Fare cli # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Classifica compagnie -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingegnere STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Direttore del traffico STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Coordinatore dei trasporti diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 6cdb60b6c..ecc6e8083 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -519,8 +519,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}この # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}交通会社成績表 -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :技術者 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :交通部長 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :運送調整者 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 367875e25..03cad6fde 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -530,8 +530,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}특정 # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}회사 성취도 순위 -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :{G=f}엔지니어 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :{G=f}교통망 관리자 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :{G=f}수송 조정자 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 83d48e8be..753adcc34 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klik še # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Vadošo kompāniju saraksts -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inženieris STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Satiksmes vadītājs STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Satiksmes koordinators diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index b24fd7706..b1c4bd625 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -563,8 +563,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Paspausk # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Kompanijų lentelė -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inžinierius STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Eismo reguliuotojas STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transporto koordinatorius diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index e939e44ec..59709a1dc 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -523,8 +523,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klickt h # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Firmenliga Tabell -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Techniker STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Verkéiersmanager STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transportkoordinator diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 1a5fd4deb..9880c558b 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -528,8 +528,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Trykk he # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Firmarangering -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingeniør STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Trafikkleder STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transportkoordinator diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 12caf6384..d67ebde64 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -521,8 +521,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Trykk he # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Firmarangering -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingeniør STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Trafikkleiar STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transportkoordinator diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 073a8f912..03acc7fa6 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -908,8 +908,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Kliknij # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tabela Ligi Firm -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inżynier STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Administrator Ruchu STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Koordynator Transportu diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index ea9fff6ad..ed38ea8a4 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Clique a # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Classificação de Empresas -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Engenheiro STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Gestor de Tráfego STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Coordenador de Transportes diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 65b97737e..63d695956 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Clic aic # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Clasamentul companiilor -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inginer STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Manager de trafic STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Coordonator transporturi diff --git a/src/lang/russian.txt b/src/lang/russian.txt index d0bf3e2fc..0e0c2c0dd 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -666,8 +666,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Вклю # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Сравнительная таблица компаний -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} «{STRING}» -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} «{STRING}» +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} «{STRING}» STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Машинист STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Регулировщик STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Диспетчер diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index a0bedf45c..9dd0c91a5 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -707,8 +707,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Kliknite # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tabela lige preduzeća -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inženjer STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Šef saobraćaja STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Koordinator prevoza diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index dc68328af..ce46b8c1a 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -528,8 +528,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}点击 # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}公司评价排名 -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :工程师 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :交通经理 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :运输总监 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index d6ad942ce..a427ffdf7 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -592,8 +592,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Kliknut # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Hodnotenie spolocnosti -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inzinier STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Manazer dopravy STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Koordinator dopravy diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index c054bf0aa..cf092472f 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -565,8 +565,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klikni s # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Seznam najboljših podjetij -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inženir STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Vodja prometa STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Koordinator transporta diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 8c5751034..0c7991f71 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -530,8 +530,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Click aq # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Ranking de Empresas -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingeniero STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Gerente de tráfico STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Coordinador de transporte diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index b578be52e..82dc2ed31 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klicka h # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Företagstabell -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingenjör STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Trafikledare STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transportkoordinator diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 38efe4103..b7195e276 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}點選 # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}公司排行榜 -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :維修技工 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :交通管制員 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :運輸管理師 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index b5d7a1d10..c3a411b44 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Grafikte # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Şirketler Ligi -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Mühendis STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Trafik Müdürü STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Nakliyeci diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index e2023003c..b99301931 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -654,8 +654,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Нати # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Таблиця компаній -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Інженер STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Регулювальник STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Диспетчер diff --git a/src/lang/unfinished/basque.txt b/src/lang/unfinished/basque.txt index 113704698..d24584796 100644 --- a/src/lang/unfinished/basque.txt +++ b/src/lang/unfinished/basque.txt @@ -526,8 +526,7 @@ STR_GRAPH_KEY_CAPTION :{WHITE}Giltza k # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Konpaniako Liga Tabloia -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Ingienaria STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Trafiko Zuzendaria STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Garraio Koordinatzailea diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index bd7e5eefc..f40c7ac35 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -470,8 +470,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klik hji # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Bedriuwskompetysjetabel -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Inzjenieur STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Ferkearsbehearder STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Transportcoördinator diff --git a/src/lang/unfinished/vietnamese.txt b/src/lang/unfinished/vietnamese.txt index e44fba849..b01f13010 100644 --- a/src/lang/unfinished/vietnamese.txt +++ b/src/lang/unfinished/vietnamese.txt @@ -529,8 +529,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Click v # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Bảng liên đoàn công ty -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Kỹ sư STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Quản Lý Giao Thông STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Người Phối Hợp Vận Chuyển diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 3ee1bf512..6b2aa0c48 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -523,8 +523,7 @@ STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Cliciwch # Company league window STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tablau Cynghrair Cwmnïau -STR_COMPANY_LEAGUE_FIRST :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' -STR_COMPANY_LEAGUE_OTHER :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' +STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}' STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER :Peiriannydd STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER :Rheolwr Traffig STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR :Cydlynydd Trafnidiaeth |