summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2013-05-29 18:49:58 +0000
committerfrosch <frosch@openttd.org>2013-05-29 18:49:58 +0000
commit2547523c0f5a3ab09911f465b60721651d588eac (patch)
treeec3086634020a6ac5ebc09695422eebcddc75c87 /src
parent4c1e969a316ea6ce34f237a33c7507afb9e54739 (diff)
downloadopenttd-2547523c0f5a3ab09911f465b60721651d588eac.tar.xz
(svn r25304) -Change: Move the GS goals window from the subsidies to the league menu.
Diffstat (limited to 'src')
-rw-r--r--src/lang/afrikaans.txt2
-rw-r--r--src/lang/arabic_egypt.txt2
-rw-r--r--src/lang/basque.txt2
-rw-r--r--src/lang/belarusian.txt2
-rw-r--r--src/lang/brazilian_portuguese.txt2
-rw-r--r--src/lang/bulgarian.txt2
-rw-r--r--src/lang/catalan.txt2
-rw-r--r--src/lang/croatian.txt2
-rw-r--r--src/lang/czech.txt2
-rw-r--r--src/lang/danish.txt2
-rw-r--r--src/lang/dutch.txt2
-rw-r--r--src/lang/english.txt2
-rw-r--r--src/lang/english_AU.txt2
-rw-r--r--src/lang/english_US.txt2
-rw-r--r--src/lang/esperanto.txt2
-rw-r--r--src/lang/estonian.txt2
-rw-r--r--src/lang/faroese.txt2
-rw-r--r--src/lang/finnish.txt2
-rw-r--r--src/lang/french.txt2
-rw-r--r--src/lang/gaelic.txt2
-rw-r--r--src/lang/galician.txt2
-rw-r--r--src/lang/german.txt2
-rw-r--r--src/lang/greek.txt2
-rw-r--r--src/lang/hebrew.txt2
-rw-r--r--src/lang/hungarian.txt2
-rw-r--r--src/lang/icelandic.txt2
-rw-r--r--src/lang/indonesian.txt2
-rw-r--r--src/lang/irish.txt2
-rw-r--r--src/lang/italian.txt2
-rw-r--r--src/lang/japanese.txt2
-rw-r--r--src/lang/korean.txt2
-rw-r--r--src/lang/latvian.txt2
-rw-r--r--src/lang/lithuanian.txt2
-rw-r--r--src/lang/luxembourgish.txt2
-rw-r--r--src/lang/malay.txt2
-rw-r--r--src/lang/norwegian_bokmal.txt2
-rw-r--r--src/lang/norwegian_nynorsk.txt2
-rw-r--r--src/lang/polish.txt2
-rw-r--r--src/lang/portuguese.txt2
-rw-r--r--src/lang/romanian.txt2
-rw-r--r--src/lang/russian.txt2
-rw-r--r--src/lang/serbian.txt2
-rw-r--r--src/lang/simplified_chinese.txt2
-rw-r--r--src/lang/slovak.txt2
-rw-r--r--src/lang/slovenian.txt2
-rw-r--r--src/lang/spanish.txt2
-rw-r--r--src/lang/swedish.txt2
-rw-r--r--src/lang/tamil.txt2
-rw-r--r--src/lang/traditional_chinese.txt2
-rw-r--r--src/lang/turkish.txt2
-rw-r--r--src/lang/ukrainian.txt2
-rw-r--r--src/lang/unfinished/macedonian.txt2
-rw-r--r--src/lang/unfinished/persian.txt2
-rw-r--r--src/lang/unfinished/thai.txt2
-rw-r--r--src/lang/unfinished/urdu.txt2
-rw-r--r--src/lang/vietnamese.txt2
-rw-r--r--src/lang/welsh.txt2
-rw-r--r--src/toolbar_gui.cpp19
58 files changed, 67 insertions, 66 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index c80c202f5..72269129d 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -384,7 +384,7 @@ STR_TOWN_MENU_FOUND_TOWN :Stig dorp
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies
-STR_SUBSIDIES_MENU_GOAL :Huidige doelwitte
+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 fc533caca..89b93c4b7 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -382,7 +382,7 @@ STR_TOWN_MENU_FOUND_TOWN :جد المدي
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :العروض
-STR_SUBSIDIES_MENU_GOAL :الاهداف الحالية
+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 0e4b2ffac..dac066c6e 100644
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -383,7 +383,7 @@ STR_TOWN_MENU_FOUND_TOWN :Herria eraiki
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidioak
-STR_SUBSIDIES_MENU_GOAL :Oraingo helmugak
+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 1a575cb75..6e3763736 100644
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -697,7 +697,7 @@ STR_TOWN_MENU_FOUND_TOWN :Заснава
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Субсыдыі
-STR_SUBSIDIES_MENU_GOAL :Бягучыя задачы
+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 9c1138c9a..e8527c54c 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Fundar cidade
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsídios
-STR_SUBSIDIES_MENU_GOAL :{G=m}Objetivos atuais
+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 95531d189..26585185a 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Основи г
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Субсидии
-STR_SUBSIDIES_MENU_GOAL :Настоящи цели
+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 230ac87e1..bfca6cc29 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Funda un poble
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subvencions
-STR_SUBSIDIES_MENU_GOAL :Objectius actuals
+STR_GRAPH_MENU_GOAL :Objectius actuals
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index a9f58d163..9b3b028b9 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -481,7 +481,7 @@ STR_TOWN_MENU_FOUND_TOWN :Osnuj grad
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subvencije
-STR_SUBSIDIES_MENU_GOAL :Trenutni ciljevi
+STR_GRAPH_MENU_GOAL :Trenutni ciljevi
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index c3cfe821a..1fd7314c6 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -454,7 +454,7 @@ STR_TOWN_MENU_FOUND_TOWN :Založit město
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Dotace
-STR_SUBSIDIES_MENU_GOAL :Současné cíle
+STR_GRAPH_MENU_GOAL :Současné cíle
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index eecef3101..45b33badd 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -384,7 +384,7 @@ STR_TOWN_MENU_FOUND_TOWN :Stift by
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Tilskudsordninger
-STR_SUBSIDIES_MENU_GOAL :Nuværende mål
+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 2f1ec33f4..8f924718f 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -386,7 +386,7 @@ STR_TOWN_MENU_FOUND_TOWN :Sticht een stad
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies
-STR_SUBSIDIES_MENU_GOAL :Huidige doelen
+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 5d5d3e137..6c7f91baf 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -386,7 +386,6 @@ STR_TOWN_MENU_FOUND_TOWN :Found town
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies
-STR_SUBSIDIES_MENU_GOAL :Current goals
############ range ends here
############ range for graph menu starts
@@ -399,6 +398,7 @@ 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_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 3099be205..3547f0e9f 100644
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
@@ -386,7 +386,7 @@ STR_TOWN_MENU_FOUND_TOWN :Found town
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies
-STR_SUBSIDIES_MENU_GOAL :Current goals
+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 8594f9499..acf1221ae 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -386,7 +386,7 @@ STR_TOWN_MENU_FOUND_TOWN :Found town
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies
-STR_SUBSIDIES_MENU_GOAL :Current goals
+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 01b13fb65..0a518a41d 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -381,7 +381,7 @@ STR_TOWN_MENU_FOUND_TOWN :Urbo troviĝas.
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subvencioj
-STR_SUBSIDIES_MENU_GOAL :Aktualaj celoj
+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 c55a29ef9..2ecc6e296 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -440,7 +440,7 @@ STR_TOWN_MENU_FOUND_TOWN :Raja linn
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Toetused
-STR_SUBSIDIES_MENU_GOAL :Praegused eesmärgid
+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 968062236..bd349d05d 100644
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Funnar bygdir
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Stuðulsflutningur
-STR_SUBSIDIES_MENU_GOAL :Núverðandi mál
+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 e62e1b89a..4b82fe8c7 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -386,7 +386,7 @@ STR_TOWN_MENU_FOUND_TOWN :Perusta kaupunk
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Tuet
-STR_SUBSIDIES_MENU_GOAL :Nykyiset tavoitteet
+STR_GRAPH_MENU_GOAL :Nykyiset tavoitteet
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 0a728b234..2bfffe3b5 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -386,7 +386,7 @@ STR_TOWN_MENU_FOUND_TOWN :Fonder une vill
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subventions
-STR_SUBSIDIES_MENU_GOAL :Objectifs actuels
+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 792a24e8e..8e676e326 100644
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -574,7 +574,7 @@ STR_TOWN_MENU_FOUND_TOWN :Baile air a lor
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Tarrailean
-STR_SUBSIDIES_MENU_GOAL :Amasan an-dràsta
+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 e284b350a..62622811c 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Fundar poboaci
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subvencións
-STR_SUBSIDIES_MENU_GOAL :Metas actuais
+STR_GRAPH_MENU_GOAL :Metas actuais
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 0cdf2530d..bb82a8c69 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -387,7 +387,7 @@ STR_TOWN_MENU_FOUND_TOWN :Stadt gründen
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subventionen
-STR_SUBSIDIES_MENU_GOAL :Momentane Ziele
+STR_GRAPH_MENU_GOAL :Momentane Ziele
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index d04c0b37b..efa4f4ece 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -447,7 +447,7 @@ STR_TOWN_MENU_FOUND_TOWN :Ιδρύση π
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Χρηματοδοτήσεις
-STR_SUBSIDIES_MENU_GOAL :Τρέχοντες στόχοι
+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 9aa582d18..17c4fc39e 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -397,7 +397,7 @@ STR_TOWN_MENU_FOUND_TOWN :ייסד עיר
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :סובסידיות
-STR_SUBSIDIES_MENU_GOAL :מטרות נוכחיות
+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 d9588077b..669a7d472 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -448,7 +448,7 @@ STR_TOWN_MENU_FOUND_TOWN :Új város alap
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Támogatások
-STR_SUBSIDIES_MENU_GOAL :Jelenlegi célok
+STR_GRAPH_MENU_GOAL :Jelenlegi célok
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index d51bfef51..e58cdc5a4 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Fann bæ
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Samstarfssamningar
-STR_SUBSIDIES_MENU_GOAL :Markmið
+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 313b7cdb7..dffd77bca 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -384,7 +384,7 @@ STR_TOWN_MENU_FOUND_TOWN :Bangun Kota
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidi
-STR_SUBSIDIES_MENU_GOAL :Target saat ini
+STR_GRAPH_MENU_GOAL :Target saat ini
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/irish.txt b/src/lang/irish.txt
index a3b105214..e7b57ee09 100644
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -382,7 +382,7 @@ STR_TOWN_MENU_FOUND_TOWN :Aimsíodh baile
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Fordheontais
-STR_SUBSIDIES_MENU_GOAL :Spriocanna reatha
+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 92f794a57..bdfb84b19 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -388,7 +388,7 @@ STR_TOWN_MENU_FOUND_TOWN :Fonda città
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Sussidi
-STR_SUBSIDIES_MENU_GOAL :Obiettivi
+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 b3041da13..cee987069 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -384,7 +384,7 @@ STR_TOWN_MENU_FOUND_TOWN :町の新設に
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :助成金
-STR_SUBSIDIES_MENU_GOAL :現在の目的
+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 3edec0df3..deafe5bcd 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -387,7 +387,7 @@ STR_TOWN_MENU_FOUND_TOWN :도시 건설
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :보조금
-STR_SUBSIDIES_MENU_GOAL :현재 목표
+STR_GRAPH_MENU_GOAL :현재 목표
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index f24572cbf..230ccb50d 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -386,7 +386,7 @@ STR_TOWN_MENU_FOUND_TOWN :Dibināt pilsē
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsīdijas
-STR_SUBSIDIES_MENU_GOAL :Kārtējie mērķi
+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 9062033fd..68832301b 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -579,7 +579,7 @@ STR_TOWN_MENU_FOUND_TOWN :Įkurti miestą
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidijos
-STR_SUBSIDIES_MENU_GOAL :Dabartiniai tikslai
+STR_GRAPH_MENU_GOAL :Dabartiniai tikslai
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index cf713fb6b..b9c3926dc 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -384,7 +384,7 @@ STR_TOWN_MENU_FOUND_TOWN :Stad grënnen
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subventiounen
-STR_SUBSIDIES_MENU_GOAL :Aktuell Zieler
+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 df2baf46d..f3bd98b4e 100644
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -383,7 +383,7 @@ STR_TOWN_MENU_FOUND_TOWN :Binakan bandar
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidi
-STR_SUBSIDIES_MENU_GOAL :Matlamat semasa
+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 8c9e70e84..92db9fb54 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -386,7 +386,7 @@ STR_TOWN_MENU_FOUND_TOWN :Grunnlegg by
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidier
-STR_SUBSIDIES_MENU_GOAL :Nåværende mål
+STR_GRAPH_MENU_GOAL :Nåværende mål
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 06f9a8f55..e9f1211e0 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Grunnlegg by
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsidiar
-STR_SUBSIDIES_MENU_GOAL :Gjeldande mål
+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 3167b1c9b..5171dd3e3 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -765,7 +765,7 @@ STR_TOWN_MENU_FOUND_TOWN :Załóż miasto
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsydia
-STR_SUBSIDIES_MENU_GOAL :Bieżące cele
+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 59e23bee7..38512adfa 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Fundar cidade
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subsídios
-STR_SUBSIDIES_MENU_GOAL :Objetivos actuais
+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 0fca7a461..cd4ba5125 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -383,7 +383,7 @@ STR_TOWN_MENU_FOUND_TOWN :Fondează oraş
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subvenţii
-STR_SUBSIDIES_MENU_GOAL :Ţinte curente
+STR_GRAPH_MENU_GOAL :Ţinte curente
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 65b7dcb41..81629b5b0 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -512,7 +512,7 @@ STR_TOWN_MENU_FOUND_TOWN :Основат
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Субсидии
-STR_SUBSIDIES_MENU_GOAL :Текущие задачи
+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 6fff2b69a..c1a625210 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -572,7 +572,7 @@ STR_TOWN_MENU_FOUND_TOWN :Osnivanje nasel
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subvencije
-STR_SUBSIDIES_MENU_GOAL :Trenutni ciljevi
+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 df67bb6aa..2d650d16f 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -384,7 +384,7 @@ STR_TOWN_MENU_FOUND_TOWN :建立城镇
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :财政补贴
-STR_SUBSIDIES_MENU_GOAL :当前目标
+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 0e4dcb6f7..e9e718bc6 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -448,7 +448,7 @@ STR_TOWN_MENU_FOUND_TOWN :Založiť mesto
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Dotácie
-STR_SUBSIDIES_MENU_GOAL :Súčasné ciele
+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 4ef3468b5..868669b56 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -536,7 +536,7 @@ STR_TOWN_MENU_FOUND_TOWN :Ustanovi mesto
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subvencije
-STR_SUBSIDIES_MENU_GOAL :Trenutni cilji
+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 a7b83a590..0736f96b3 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -387,7 +387,7 @@ STR_TOWN_MENU_FOUND_TOWN :Fundar pueblo
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subvenciones
-STR_SUBSIDIES_MENU_GOAL :Metas actuales
+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 a67ab3435..dfc193456 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -386,7 +386,7 @@ STR_TOWN_MENU_FOUND_TOWN :Grunda stad
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Subventioner
-STR_SUBSIDIES_MENU_GOAL :Nuvarande mål
+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 fcdbacd5a..3a76843f8 100644
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -384,7 +384,7 @@ STR_TOWN_MENU_FOUND_TOWN :நகரம்
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :மானியங்கள்
-STR_SUBSIDIES_MENU_GOAL :தற்போதைய குறிக்கோள்கள்
+STR_GRAPH_MENU_GOAL :தற்போதைய குறிக்கோள்கள்
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index b09fc881b..365197971 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -384,7 +384,7 @@ STR_TOWN_MENU_FOUND_TOWN :興建市鎮
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :補助資訊
-STR_SUBSIDIES_MENU_GOAL :當前目標
+STR_GRAPH_MENU_GOAL :當前目標
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index d90d6d934..ef0c76727 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -387,7 +387,7 @@ STR_TOWN_MENU_FOUND_TOWN :Şehir başlat
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Teşvikler
-STR_SUBSIDIES_MENU_GOAL :Mevcut hedefler
+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 facfd6f99..8b46f4dca 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -509,7 +509,7 @@ STR_TOWN_MENU_FOUND_TOWN :Заснува
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Субсидії
-STR_SUBSIDIES_MENU_GOAL :Поточні цілі
+STR_GRAPH_MENU_GOAL :Поточні цілі
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 8801fc2f5..d1be382cc 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -383,7 +383,7 @@ STR_TOWN_MENU_FOUND_TOWN :Резулта
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :субвенции
-STR_SUBSIDIES_MENU_GOAL :Сега цели
+STR_GRAPH_MENU_GOAL :Сега цели
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 0c1f863bf..c2b87d2d2 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -382,7 +382,7 @@ STR_TOWN_MENU_FOUND_TOWN :ساخت شهر
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :یارانه ها
-STR_SUBSIDIES_MENU_GOAL :اهداف فعلی
+STR_GRAPH_MENU_GOAL :اهداف فعلی
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt
index ff5af686d..d5ecaeaff 100644
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
@@ -383,7 +383,7 @@ STR_TOWN_MENU_FOUND_TOWN :ตั้งเ
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :การสนับสนุน
-STR_SUBSIDIES_MENU_GOAL :เป้าหมายปัจจุบัน
+STR_GRAPH_MENU_GOAL :เป้าหมายปัจจุบัน
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt
index dca54366a..d19e39fbd 100644
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -383,7 +383,7 @@ STR_TOWN_MENU_FOUND_TOWN :قصبھ قائ
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :امداد
-STR_SUBSIDIES_MENU_GOAL :موجودہ اہداف
+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 0ec0b1786..8f121e2f5 100644
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Thị Xã
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Tiền trợ cấp
-STR_SUBSIDIES_MENU_GOAL :Các mục tiêu hiện tại
+STR_GRAPH_MENU_GOAL :Các mục tiêu hiện tại
############ range ends here
############ range for graph menu starts
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index 8ba83ef9b..f40c3fe66 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -385,7 +385,7 @@ STR_TOWN_MENU_FOUND_TOWN :Sefydlu tref
############ range for subsidies menu starts
STR_SUBSIDIES_MENU_SUBSIDIES :Cymorthdaliadau
-STR_SUBSIDIES_MENU_GOAL :Nodau presennol
+STR_GRAPH_MENU_GOAL :Nodau presennol
############ range ends here
############ range for graph menu starts
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 5f041a39f..2e1bcbad2 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -43,6 +43,7 @@
#include "hotkeys.h"
#include "engine_base.h"
#include "highscore.h"
+#include "game/game.hpp"
#include "widgets/toolbar_widget.h"
@@ -161,13 +162,13 @@ public:
/**
* Pop up a generic text only menu.
*/
-static void PopupMainToolbMenu(Window *w, int widget, StringID string, int count)
+static void PopupMainToolbMenu(Window *w, int widget, StringID string, int count, int skip = 0)
{
DropDownList *list = new DropDownList();
- for (int i = 0; i < count; i++) {
+ for (int i = skip; i < count; i++) {
list->push_back(new DropDownListStringItem(string + i, i, false));
}
- ShowDropDownList(w, list, 0, widget, 140, true, true);
+ ShowDropDownList(w, list, skip, widget, 140, true, true);
if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
}
@@ -476,7 +477,7 @@ static CallBackFunction MenuClickTown(int index)
static CallBackFunction ToolbarSubsidiesClick(Window *w)
{
- PopupMainToolbMenu(w, WID_TN_SUBSIDIES, STR_SUBSIDIES_MENU_SUBSIDIES, 2);
+ PopupMainToolbMenu(w, WID_TN_SUBSIDIES, STR_SUBSIDIES_MENU_SUBSIDIES, 1);
return CBF_NONE;
}
@@ -490,7 +491,6 @@ static CallBackFunction MenuClickSubsidies(int index)
{
switch (index) {
case 0: ShowSubsidiesList(); break;
- case 1: ShowGoalsList(); break;
}
return CBF_NONE;
}
@@ -615,7 +615,7 @@ static CallBackFunction MenuClickGraphs(int index)
static CallBackFunction ToolbarLeagueClick(Window *w)
{
- PopupMainToolbMenu(w, WID_TN_LEAGUE, STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE, _networking ? 2 : 3);
+ PopupMainToolbMenu(w, WID_TN_LEAGUE, STR_GRAPH_MENU_GOAL, _networking ? 3 : 4, Game::GetInstance() != NULL ? 0 : 1);
return CBF_NONE;
}
@@ -628,9 +628,10 @@ static CallBackFunction ToolbarLeagueClick(Window *w)
static CallBackFunction MenuClickLeague(int index)
{
switch (index) {
- case 0: ShowCompanyLeagueTable(); break;
- case 1: ShowPerformanceRatingDetail(); break;
- case 2: ShowHighscoreTable(); break;
+ case 0: ShowGoalsList(); break;
+ case 1: ShowCompanyLeagueTable(); break;
+ case 2: ShowPerformanceRatingDetail(); break;
+ case 3: ShowHighscoreTable(); break;
}
return CBF_NONE;
}