diff options
| author | zuu <zuu@openttd.org> | 2013-06-09 15:36:31 +0000 |
|---|---|---|
| committer | zuu <zuu@openttd.org> | 2013-06-09 15:36:31 +0000 |
| commit | be8645e13764d43a85f3f101897b74fa1545d359 (patch) | |
| tree | 9a5f43f5a453bdfc950e7a4778a5f85a9560df95 /src | |
| parent | 21d0f2e88394226bde98e1ce54e1052c1c31d8d5 (diff) | |
| download | openttd-be8645e13764d43a85f3f101897b74fa1545d359.tar.xz | |
(svn r25383) -Fix (r25376): Remove now redundant menu entries for story book and goals
Diffstat (limited to 'src')
54 files changed, 7 insertions, 64 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 72cadb143..849fa40dd 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -384,7 +384,6 @@ STR_TOWN_MENU_FOUND_TOWN :Stig dorp ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies -STR_GRAPH_MENU_GOAL :Huidige doelwitte ############ range ends here ############ range for graph menu starts diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index d3c52b266..8ff19659c 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -382,7 +382,6 @@ STR_TOWN_MENU_FOUND_TOWN :جد المدي ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :العروض -STR_GRAPH_MENU_GOAL :الاهداف الحالية ############ range ends here ############ range for graph menu starts diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 4c592f1e8..327021ef4 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -383,7 +383,6 @@ STR_TOWN_MENU_FOUND_TOWN :Herria eraiki ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsidioak -STR_GRAPH_MENU_GOAL :Oraingo helmugak ############ range ends here ############ range for graph menu starts diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index ddb0413df..81af78f72 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -697,7 +697,6 @@ STR_TOWN_MENU_FOUND_TOWN :Заснава ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Субсыдыі -STR_GRAPH_MENU_GOAL :Бягучыя задачы ############ range ends here ############ range for graph menu starts diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 09e48e4f3..a62e924cc 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -385,7 +385,6 @@ STR_TOWN_MENU_FOUND_TOWN :Fundar cidade ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsídios -STR_GRAPH_MENU_GOAL :{G=m}Objetivos atuais ############ range ends here ############ range for graph menu starts diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 63dc47097..b8c4db3a4 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -385,7 +385,6 @@ STR_TOWN_MENU_FOUND_TOWN :Основи г ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Субсидии -STR_GRAPH_MENU_GOAL :Настоящи цели ############ range ends here ############ range for graph menu starts diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 412cebbe9..f70c75d47 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -399,7 +399,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Tarifes de paga ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Objectius actuals STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Taula de la Lliga d'Empreses STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detall de ratis de rendiment STR_GRAPH_MENU_HIGHSCORE :Taula de rècords diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index cd125726a..6882416b0 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -494,7 +494,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Iznosi plaćanj ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Trenutni ciljevi STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tablica lige tvrtki STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljna ocjena učinka STR_GRAPH_MENU_HIGHSCORE :Tablica najboljih rezultata diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 069adf7bc..15d431a19 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -468,7 +468,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Graf přepravn ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Současné cíle STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabulka společností STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Podrobné hodnocení výkonu STR_GRAPH_MENU_HIGHSCORE :Nejlepší výsledky diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 5f2c86477..0e5946d45 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -384,7 +384,6 @@ STR_TOWN_MENU_FOUND_TOWN :Stift by ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Tilskudsordninger -STR_GRAPH_MENU_GOAL :Nuværende mål ############ range ends here ############ range for graph menu starts diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 6757347b8..e18282af0 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -386,7 +386,6 @@ STR_TOWN_MENU_FOUND_TOWN :Sticht een stad ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies -STR_GRAPH_MENU_GOAL :Huidige doelen ############ range ends here ############ range for graph menu starts diff --git a/src/lang/english.txt b/src/lang/english.txt index b75b83d5e..96e20dd21 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -399,8 +399,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Cargo payment r ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Current goals -STR_GRAPH_MENU_STORY_BOOK :Story book STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Company league table STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detailed performance rating STR_GRAPH_MENU_HIGHSCORE :Highscore table diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index a23e2174d..57460d567 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -386,7 +386,6 @@ STR_TOWN_MENU_FOUND_TOWN :Found town ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies -STR_GRAPH_MENU_GOAL :Current goals ############ range ends here ############ range for graph menu starts diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 50f9517b5..93745eae4 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -386,7 +386,6 @@ STR_TOWN_MENU_FOUND_TOWN :Found town ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies -STR_GRAPH_MENU_GOAL :Current goals ############ range ends here ############ range for graph menu starts diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index d02ffc2cd..a53c37aba 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -381,7 +381,6 @@ STR_TOWN_MENU_FOUND_TOWN :Urbo troviĝas. ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subvencioj -STR_GRAPH_MENU_GOAL :Aktualaj celoj ############ range ends here ############ range for graph menu starts diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 0faaf7718..f76c21c3e 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -440,7 +440,6 @@ STR_TOWN_MENU_FOUND_TOWN :Raja linn ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Toetused -STR_GRAPH_MENU_GOAL :Praegused eesmärgid ############ range ends here ############ range for graph menu starts diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 597af8e53..55987897e 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -385,7 +385,6 @@ STR_TOWN_MENU_FOUND_TOWN :Funnar bygdir ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Stuðulsflutningur -STR_GRAPH_MENU_GOAL :Núverðandi mál ############ range ends here ############ range for graph menu starts diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 63c6c2f03..e0d123103 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -398,7 +398,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Rahtitaksat ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Nykyiset tavoitteet STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Yhtiökilpataulukko STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Suoritearviointi STR_GRAPH_MENU_HIGHSCORE :Pistetaulukko diff --git a/src/lang/french.txt b/src/lang/french.txt index 14c6f2a08..68337aa72 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -386,7 +386,6 @@ STR_TOWN_MENU_FOUND_TOWN :Fonder une vill ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subventions -STR_GRAPH_MENU_GOAL :Objectifs actuels ############ range ends here ############ range for graph menu starts diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 3143c693d..b8e9a1a4f 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -574,7 +574,6 @@ STR_TOWN_MENU_FOUND_TOWN :Baile air a lor ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Tarrailean -STR_GRAPH_MENU_GOAL :Amasan an-dràsta ############ range ends here ############ range for graph menu starts diff --git a/src/lang/galician.txt b/src/lang/galician.txt index e8544441b..812ff26ae 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -399,7 +399,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Taxas de pago p ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Metas actuais STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Cadro da liga de compañías STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Puntuación de rendemento detallada STR_GRAPH_MENU_HIGHSCORE :Táboa de máximas puntuacións diff --git a/src/lang/german.txt b/src/lang/german.txt index b5d3d58b0..02e84048d 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -399,7 +399,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Frachtratendiag ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Momentane Ziele STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Firmentabelle STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Leistungsaufschlüsselung STR_GRAPH_MENU_HIGHSCORE :Bestenliste diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 62a8dbf8f..0b739460e 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -447,7 +447,6 @@ STR_TOWN_MENU_FOUND_TOWN :Ιδρύση π ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Χρηματοδοτήσεις -STR_GRAPH_MENU_GOAL :Τρέχοντες στόχοι ############ range ends here ############ range for graph menu starts diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 4a402c6cf..eca948718 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -397,7 +397,6 @@ STR_TOWN_MENU_FOUND_TOWN :ייסד עיר ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :סובסידיות -STR_GRAPH_MENU_GOAL :מטרות נוכחיות ############ range ends here ############ range for graph menu starts diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 83a2be733..d107a40d6 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -461,7 +461,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Rakományok sz ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Jelenlegi célok STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Vállalatok helyezései STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Teljesítményértékelések részletezése STR_GRAPH_MENU_HIGHSCORE :Rekord Tábla diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 4fb5adb51..6f95f13e9 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -385,7 +385,6 @@ STR_TOWN_MENU_FOUND_TOWN :Fann bæ ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Samstarfssamningar -STR_GRAPH_MENU_GOAL :Markmið ############ range ends here ############ range for graph menu starts diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index b1ac2c8cd..c442bd77d 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -396,7 +396,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Daftar biaya ka ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Target saat ini STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabel Perusahaan STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Rating kemampuan secara rinci STR_GRAPH_MENU_HIGHSCORE :Tabel Skor diff --git a/src/lang/irish.txt b/src/lang/irish.txt index fa46c09cb..123aca455 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -382,7 +382,6 @@ STR_TOWN_MENU_FOUND_TOWN :Aimsíodh baile ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Fordheontais -STR_GRAPH_MENU_GOAL :Spriocanna reatha ############ range ends here ############ range for graph menu starts diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 6afdb3c9c..c961c5d43 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -388,7 +388,6 @@ STR_TOWN_MENU_FOUND_TOWN :Fonda città ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Sussidi -STR_GRAPH_MENU_GOAL :Obiettivi ############ range ends here ############ range for graph menu starts diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 89994e9fc..fe738f1f0 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -384,7 +384,6 @@ STR_TOWN_MENU_FOUND_TOWN :町の新設に ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :助成金 -STR_GRAPH_MENU_GOAL :現在の目的 ############ range ends here ############ range for graph menu starts diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 2d9a2f9cb..1ec1b811a 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -399,7 +399,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :화물 운송 ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :현재 목표 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :회사 성취도 순위 STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :상세 성취도 STR_GRAPH_MENU_HIGHSCORE :고득점 순위표 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index ccb8604b3..720ebbdf8 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -386,7 +386,6 @@ STR_TOWN_MENU_FOUND_TOWN :Dibināt pilsē ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsīdijas -STR_GRAPH_MENU_GOAL :Kārtējie mērķi ############ range ends here ############ range for graph menu starts diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index af0e938f4..c9d8dea36 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -593,7 +593,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Krovinių apmok ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Dabartiniai tikslai STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Kompanijos užimama vieta STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Išsamus veiklos įvertinimas STR_GRAPH_MENU_HIGHSCORE :Nugalėtojų lentelė diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 8714ad366..85b943330 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -384,7 +384,6 @@ STR_TOWN_MENU_FOUND_TOWN :Stad grënnen ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subventiounen -STR_GRAPH_MENU_GOAL :Aktuell Zieler ############ range ends here ############ range for graph menu starts diff --git a/src/lang/malay.txt b/src/lang/malay.txt index b88ebf741..874f62375 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -383,7 +383,6 @@ STR_TOWN_MENU_FOUND_TOWN :Binakan bandar ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsidi -STR_GRAPH_MENU_GOAL :Matlamat semasa ############ range ends here ############ range for graph menu starts diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index c612c1082..94e6c1008 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -400,7 +400,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Varetakster ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Nåværende mål STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Firmarangeringstabell STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljert prestasjonrating STR_GRAPH_MENU_HIGHSCORE :Tavle med høyeste poengsummer diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 92481e7bb..de5223cdf 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -385,7 +385,6 @@ STR_TOWN_MENU_FOUND_TOWN :Grunnlegg by ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsidiar -STR_GRAPH_MENU_GOAL :Gjeldande mål ############ range ends here ############ range for graph menu starts diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 490ba1616..aa8da5059 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -765,7 +765,6 @@ STR_TOWN_MENU_FOUND_TOWN :Załóż miasto ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsydia -STR_GRAPH_MENU_GOAL :Bieżące cele ############ range ends here ############ range for graph menu starts diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index d119c014c..336e5e645 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -385,7 +385,6 @@ STR_TOWN_MENU_FOUND_TOWN :Fundar cidade ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subsídios -STR_GRAPH_MENU_GOAL :Objetivos actuais ############ range ends here ############ range for graph menu starts diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index fa58ea740..825e6ea18 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -397,7 +397,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Valorile plăţ ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Ţinte curente STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Clasamentul companiilor STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Rating de performanţă detaliat STR_GRAPH_MENU_HIGHSCORE :Tabela cu scoruri maxime diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 64e267947..19713dae8 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -512,7 +512,6 @@ STR_TOWN_MENU_FOUND_TOWN :Основат ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Субсидии -STR_GRAPH_MENU_GOAL :Текущие задачи ############ range ends here ############ range for graph menu starts diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 31c836bf4..cb33bfde9 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -572,7 +572,6 @@ STR_TOWN_MENU_FOUND_TOWN :Osnivanje nasel ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subvencije -STR_GRAPH_MENU_GOAL :Trenutni ciljevi ############ range ends here ############ range for graph menu starts diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 399c0721d..efd1ff49d 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -384,7 +384,6 @@ STR_TOWN_MENU_FOUND_TOWN :建立城镇 ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :财政补贴 -STR_GRAPH_MENU_GOAL :当前目标 ############ range ends here ############ range for graph menu starts diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index f5b4e2a37..7f1bf73b9 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -448,7 +448,6 @@ STR_TOWN_MENU_FOUND_TOWN :Založiť mesto ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Dotácie -STR_GRAPH_MENU_GOAL :Súčasné ciele ############ range ends here ############ range for graph menu starts diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 0a3cfea49..7352bf037 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -536,7 +536,6 @@ STR_TOWN_MENU_FOUND_TOWN :Ustanovi mesto ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subvencije -STR_GRAPH_MENU_GOAL :Trenutni cilji ############ range ends here ############ range for graph menu starts diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index dd5b5e9f2..96ef4339d 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -387,7 +387,6 @@ STR_TOWN_MENU_FOUND_TOWN :Fundar pueblo ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subvenciones -STR_GRAPH_MENU_GOAL :Metas actuales ############ range ends here ############ range for graph menu starts diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 218d18de8..24fef77de 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -386,7 +386,6 @@ STR_TOWN_MENU_FOUND_TOWN :Grunda stad ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Subventioner -STR_GRAPH_MENU_GOAL :Nuvarande mål ############ range ends here ############ range for graph menu starts diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 43ed8d7e9..8706e8776 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -396,7 +396,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :சரக்க ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :தற்போதைய குறிக்கோள்கள் STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :நிறுவனங்களின் பட்டியல் STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :விவரமான செயல்திறன் மதிப்பீடு STR_GRAPH_MENU_HIGHSCORE :புள்ளிகள் பட்டியல் diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 887fc2d83..67e364157 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -398,7 +398,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :貨物運費表 ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :當前目標 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :公司排行榜 STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :詳細營運評比 STR_GRAPH_MENU_HIGHSCORE :積分排行榜 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index c1491305d..b45286937 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -387,7 +387,6 @@ STR_TOWN_MENU_FOUND_TOWN :Şehir başlat ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Teşvikler -STR_GRAPH_MENU_GOAL :Mevcut hedefler ############ range ends here ############ range for graph menu starts diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index fa0c0df5b..d0310491c 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -509,7 +509,6 @@ STR_TOWN_MENU_FOUND_TOWN :Заснува ############ range for subsidies menu starts STR_SUBSIDIES_MENU_SUBSIDIES :Субсидії -STR_GRAPH_MENU_GOAL :Поточні цілі ############ range ends here ############ range for graph menu starts diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index f9253acba..9cb86817a 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -398,7 +398,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Bảng giá cư ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Các mục tiêu hiện tại STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Bảng tầm cỡ công ty STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Chi tiết hệ số năng suất STR_GRAPH_MENU_HIGHSCORE :Bảng điểm chơi cao nhất diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 5544b8c98..985ae5271 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -398,7 +398,6 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Cyfraddau Tâl ############ range ends here ############ range for company league menu starts -STR_GRAPH_MENU_GOAL :Nodau presennol STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabl Cynghrair Cwmnïau STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Graddfa Fanwl Perfformiad STR_GRAPH_MENU_HIGHSCORE :Tabl sgôr uchaf diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index d143f07ca..420079c53 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -178,15 +178,14 @@ static void PopupMainToolbMenu(Window *w, int widget, DropDownList *list, int de * @param widget Toolbar button * @param string String for the first item in the menu * @param count Number of items in the menu - * @param skip Hide first \a skip items in the menu */ -static void PopupMainToolbMenu(Window *w, int widget, StringID string, int count, int skip = 0) +static void PopupMainToolbMenu(Window *w, int widget, StringID string, int count) { DropDownList *list = new DropDownList(); - for (int i = skip; i < count; i++) { + for (int i = 0; i < count; i++) { list->push_back(new DropDownListStringItem(string + i, i, false)); } - PopupMainToolbMenu(w, widget, list, skip); + PopupMainToolbMenu(w, widget, list, 0); } /** Enum for the Company Toolbar's network related buttons */ @@ -682,7 +681,7 @@ static CallBackFunction MenuClickGraphs(int index) static CallBackFunction ToolbarLeagueClick(Window *w) { - PopupMainToolbMenu(w, WID_TN_LEAGUE, STR_GRAPH_MENU_GOAL, _networking ? 4 : 5, Game::GetInstance() != NULL ? 0 : 2); + PopupMainToolbMenu(w, WID_TN_LEAGUE, STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE, _networking ? 2 : 3); return CBF_NONE; } @@ -695,11 +694,9 @@ static CallBackFunction ToolbarLeagueClick(Window *w) static CallBackFunction MenuClickLeague(int index) { switch (index) { - case 0: ShowGoalsList(_local_company); break; - case 1: ShowStoryBook(_local_company); break; - case 2: ShowCompanyLeagueTable(); break; - case 3: ShowPerformanceRatingDetail(); break; - case 4: ShowHighscoreTable(); break; + case 0: ShowCompanyLeagueTable(); break; + case 1: ShowPerformanceRatingDetail(); break; + case 2: ShowHighscoreTable(); break; } return CBF_NONE; } |