From bc8d1d7b0de5719f97052551e596745d8658c362 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 10 Jan 2009 16:29:31 +0000 Subject: [PATCH] (svn r14961) -Update: remove the string from r14960 from the other languages too. --- src/lang/afrikaans.txt | 1 - src/lang/arabic_egypt.txt | 1 - src/lang/brazilian_portuguese.txt | 1 - src/lang/bulgarian.txt | 1 - src/lang/catalan.txt | 1 - src/lang/croatian.txt | 1 - src/lang/czech.txt | 1 - src/lang/danish.txt | 1 - src/lang/dutch.txt | 1 - src/lang/english_US.txt | 1 - src/lang/esperanto.txt | 1 - src/lang/estonian.txt | 1 - src/lang/finnish.txt | 1 - src/lang/french.txt | 1 - src/lang/galician.txt | 1 - src/lang/german.txt | 1 - src/lang/hungarian.txt | 1 - src/lang/icelandic.txt | 1 - src/lang/indonesian.txt | 1 - src/lang/italian.txt | 1 - src/lang/japanese.txt | 1 - src/lang/korean.txt | 1 - src/lang/latvian.txt | 1 - src/lang/lithuanian.txt | 1 - src/lang/norwegian_bokmal.txt | 1 - src/lang/norwegian_nynorsk.txt | 1 - src/lang/piglatin.txt | 1 - src/lang/polish.txt | 1 - src/lang/portuguese.txt | 1 - src/lang/romanian.txt | 1 - src/lang/russian.txt | 1 - src/lang/simplified_chinese.txt | 1 - src/lang/slovak.txt | 1 - src/lang/slovenian.txt | 1 - src/lang/spanish.txt | 1 - src/lang/swedish.txt | 1 - src/lang/traditional_chinese.txt | 1 - src/lang/turkish.txt | 1 - src/lang/ukrainian.txt | 1 - src/lang/unfinished/greek.txt | 1 - src/lang/welsh.txt | 1 - src/settings_gui.cpp | 269 +++++++++++++++--------------- 42 files changed, 139 insertions(+), 171 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 3efe241fa9..667716bcf6 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1215,7 +1215,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Verander stel waarde -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Sommige of almal van die verstek diens pouse(s) onder is onversoenbaar met die gekies stel! 5-90% en 30-800 dae is geldig STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Padvinder vir treine: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Nie aanbevole nie) diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 94de522375..e66fc540e4 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1221,7 +1221,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}عدل قيمة التغيير -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE} بعض او كل فترات الخدمة القياسية غير متوافقة مع الخيارات ! 5-90% و 30-800 يوم متاحة STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}موجد الطريق - قصاص الطريق - للقطارات: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(غير مفضل) diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index b9a57271ed..127dcd7ab2 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1207,7 +1207,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Alterar valor -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Alguns ou todos os intervalo(s) de serviço predefinidos abaixo são incompatíveis com o valor escolhido! São válidos 5-90% e 30-800 dias STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Pathfinder para trens: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Não recomendado) diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index af34680755..f13cb661c4 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1225,7 +1225,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Промяна стойноста на настройка -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Някои от стойностите за интервал(и) на сервиз са несъвместими с избраните настройки! 5-90% и 30-800 са валидни стойности STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Пътенамирач за влакове: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(не се препоръчва) diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 8b30208fb2..cc3163c2d9 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1224,7 +1224,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Canvia el valor de l'adjustament -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Alguns o tots els intervals de manteniment següents són incompatibles amb el valor triat! 5-90% i 30-800 dies són els vàlids STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Cerca de rutes per trens: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(No recomanat) diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index f38781c1d7..5266c4bae4 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1265,7 +1265,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Promijeni vrijednost postavke -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Neki ili svi od zadanih servisnih intervala ispod nisu kompatibilni s odabranim postavkama! Valjane vrijednosti su 5-90% ili 30-800 dana. STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Pronalaženje putanje za vlakove: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Nije preporučivo) diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 50887a051f..690e59fa64 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1267,7 +1267,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Změnit hodnotu nastavení -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Některé nebo všechny základní intervaly servisů níže nesouhlasí s vybraným nastavením! 5-90 % nebo 30-800 dní jsou platné hodnoty STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Hledač cesty pro vlaky: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(nedoporučuje se) diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 1eb21cca2a..b4ec454152 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1220,7 +1220,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Skift indstillingsværdi -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Nogle eller alle standard service intervaller nedenunder er uforenelige med den valgte opsætning! 5-90% og 30-800 dage er gyldige STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Stifinder til tog: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ikke anbefalet) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index a7c874411d..ecd3804500 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1223,7 +1223,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Verander waarde -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Sommige of alle van de standaard reparatie interval(len) hier onder zijn ongeldig met gekozen instelling! 5-90% en 30-800 dagen zijn geldig STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Routezoeker voor treinen: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Niet aanbevolen) diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index a173eb836d..4f0ae2b591 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1196,7 +1196,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Change setting value -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Some or all of the default service interval(s) below are incompatible with chosen setting! 5-90% and 30-800 days are valid STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Pathfinder for trains: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Not recommended) diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 9e15eac9df..8012404e0d 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1140,7 +1140,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Ŝanĝu agord-valoron -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Iuj aŭ ĉiuj defaŭltaj prizorgintervaloj ne validas laŭ la agordoj! 5-90% kaj 30-800 tagoj validas STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF :YAPF {RED}(malrekomenda) diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 71145178a6..67d7c472ed 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1250,7 +1250,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Muuda seadete väärtusi -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Mõni või kõik vaikimisi hooldusvahemikud on kõlbmatud! Lubatud on 5-90% või 30-800 päeva STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Rongide rajaleidja: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(ebasoovitatav) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 6e489cb44e..8f5fb57714 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1224,7 +1224,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Muuta asetusarvo -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Osa allaolevista oletushuoltoväleistä ei ole yhteensopivia valitun asetuksen kanssa! 5-90{NBSP}% ja 30-800 päivää ovat oikein. STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Junien käyttämä reitinetsijä: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ei suositeltu) diff --git a/src/lang/french.txt b/src/lang/french.txt index f72cd71566..560da91f28 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1225,7 +1225,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Changer valeur du paramètre -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Un ou plusieurs intervalles de service par défaut ci-dessous sont incompatibles avec le paramètre choisi! 5-90% et 30-800 jours sont valides STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Recherche de chemin des trains: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Non recommandé) diff --git a/src/lang/galician.txt b/src/lang/galician.txt index f834502137..47997faf73 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1199,7 +1199,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Cambia-lo valor -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}¡Algún ou tódolos intervalo(s) de servicio por defecto son incompatibles coa opción elixida! 5-90% e 30-800 días son válidos STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Buscador de ruta para trens: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Non recomendado) diff --git a/src/lang/german.txt b/src/lang/german.txt index 0c28f07256..46bcc0a53a 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1199,7 +1199,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Einstellungswert ändern -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Einige oder alle dieser Standardwartungsintervalle sind inkompatibel mit den gewählten Einstellungen! 5-90% und 30-800 Tage sind gültig. STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Pathfinder für Züge: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Not recommended) diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 71803aff1e..ec29a11d1d 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1286,7 +1286,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Válassz beállítási értéket -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}A lenti alap szervíz intervallum beállítások némelyike/mindegyike inkompatibilis a választott beállítással! Csak 5-90% és 30-800 napig elfogadható. STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Útvonalkereső vonatokhoz: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ellenjavallt) diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 7f5dea6177..a681ff51db 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1195,7 +1195,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Breyta gildi stillingar -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Einhver eða öll bil milli skoðana hér fyrir neðan eru ósamhæfanleg við valdar stillingar! 5-90% og 30-800 dagar er leyfilegt STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Leiðsagnarkerfi lesta: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Óráðlegt) diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 0d527de158..e43d75ab8c 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1220,7 +1220,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Ganti nilai tetapan -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Beberapa atau semua interval servis dibawah ini tidak diijinkan! Hanya 5-90% dan 30-800 hari yang diperbolehkan STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Pencari jejak untuk kereta api: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :{RED}(Tidak direkomendasikan) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 529a0c30b9..8201e4f840 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1225,7 +1225,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Cambia impostazione -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Alcuni degli intervalli sottostanti sono incompatibili con l'impostazione scelta! Valori ammessi: 5-90% e 30-800 giorni STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Pathfinder per i treni: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(non raccomandato) diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index e37e14bcbc..271fe9fa3f 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1196,7 +1196,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}設定を変更します -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}以下のデフォルトの修理間隔は選択した設定に対応していません！５〜９０％もしくは３０〜８００日が使用できます。 STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}電車の経路処理アルゴリズム：{ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP{RED}（すすめない） diff --git a/src/lang/korean.txt b/src/lang/korean.txt index c846423623..d7a6791dbd 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1223,7 +1223,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}설정값 변경 -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}아래 기본 점검간격의 일부 혹은 전체가 선택된 설정과 맞지 않습니다. 5-90%와 30-800일이 사용 가능합니다. STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}열차용 경로탐색: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(비추천) diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 422b7ca4f1..309d791382 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1197,7 +1197,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Mainīt iestatījuma vērtību -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Daži vai visi apkalpošanas intervāli ir nesavietojami ar izvēlētajiem iestatījumiem! Der 5-90% un 30-800 dienas STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Vilcienu virziena meklētājs: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Nav ieteicams) diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 485be11755..9b0a5b145b 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1229,7 +1229,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Keisti reiksmes -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Klaidingai nurodytas remonto intervalas. Intervalas dienomis: 30-800 d., procentais: 5-90%. STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Traukinių maršruto radėjas: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Nerekomenduojama) diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index cfbc975c20..7203091701 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1221,7 +1221,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Endre innstillingsverdi -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Noen eller alle av standard vedlikeholdsintervall(ene) under er inkompatible med valgte instillinger! 5-90{NBSP}% og 30-800 dager er gyldige STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Linjefinner for tog: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ikke anbefalt) diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index c1358a9969..2005993494 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1206,7 +1206,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Endre innstillingsverdi -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Nokon eller alle standard-vedlikehaldsintervalla under er ikkje kompatible med valde innstillingar! 5-90 % og 30-800 dagar er gyldige STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Vegfinnar for tog: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ikkje anbefalt) diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index f77b6c8a69..b2316e3e89 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -1223,7 +1223,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Angechay ettingsay aluevay -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Omesay orway allway ofway ethay efaultday ervicesay intervalway(say) elowbay areway incompatibleway ithway ethay osenchay ettingsay! 5-90% andway 30-800 aysday areway alidvay STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Athfinderpay orfay ainstray: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Otnay Ecommendedray) diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 4e5a1ec385..aa58c4f6e9 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1302,7 +1302,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Zmiana wartości -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Niektóre lub wszystkie domyślne okresy między serwisowania są sprzeczne z wybranymi! 5-90% i 30-800 dni są poprawne STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Wyszukiwanie tras dla pociagow: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Not recommended) diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 7f1fec09e7..fc785bb200 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1208,7 +1208,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Alterar valor -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Alguns ou todos os intervalo(s) de serviço predefinidos abaixo são incompatíveis com o valor escolhido! São válidos 5-90% e 30-800 dias STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Sistema de encontrar caminho para comboios: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Não recomendado) diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index e26f02f2e9..909db7baa2 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1220,7 +1220,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Schimbă valoarea setării -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Unele sau toate din intervalurile de service alese sunt incompatibile cu setarea aleasa! Valorile valide sunt cuprinse intre 5-90% si 30-800 zile STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Algoritm de rutare pentru trenuri: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Nerecomandat) diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 3511f4c808..8c30d81b59 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1200,7 +1200,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Изменить значение -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Некоторые интервалы не совместимы с выбранной установкой. Допускаются значения 5-90% или 30-800 дней STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Алгоритм поиска пути для поездов: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Не рекоменд.) diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 6b4d385386..3098f21e6d 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1198,7 +1198,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}改变设置值 -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}下面一个或多个保养周期的值设置不对，应当在 0%-90% 或 30-800 天之内。 STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}火车寻路: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(不推荐) diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 87960ffacd..75a2eea012 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1262,7 +1262,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Zmenit hodnotu nastavenia -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Niektore alebo vsetky implicitne servisne intervaly su nekompatibilne s vybranym nastavenim. 5-90% a 30-800 dni su platne. STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Algoritmus hladania cesty pre vlaky: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(neodporúca sa) diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index f50eb42bb0..75b8d322a5 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1248,7 +1248,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Spremeni vrednost -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Nekatera ali vsa privzeta obdobja servisiranja spodaj niso združljiva z izborom! 5-90% in 30-800 dni je veljavno STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Iskalnik poti za vlake: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ni priporočeno) diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index f267787a57..eab91765fe 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1203,7 +1203,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Cambiar valor de la opción -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Alguno o todos los intervalos de servicio por defecto mostrados son incompatibles con la configuración elegida! 5-90% y 30-800 días son válidos STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Pathfinder para trenes: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(No recomendado) diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index a01c540834..176f79c381 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1198,7 +1198,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Ändra inställningsvärde -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Några eller alla av standard serviceintervalls-inställningarna är felaktiga! (5-90% och 30-800 dagar är giltiga inställningar) STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Vägfinnare för tåg: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ej rekommenderad) diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 306c50bb73..fd8802e944 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1198,7 +1198,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}修改設定值 -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}下面有些預設維護間隔與選擇的設定不相容！5-90% 與 30-800 天是有效範圍 STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}列車的路徑搜尋方式：{ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(不建議) diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 196221c8a1..a31d78f00b 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1220,7 +1220,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Ayar değerini değiştir -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Bazi servis gecikmeleri aralık dışında: %5-%90 veya 30-800 gün arasında olmalı STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Trenler için yol bulucu: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Önerilmez) diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 4fa0bc4be3..db1e4eba1f 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1340,7 +1340,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Змініть значення -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Одне чи декілька значень інтервалів несумісні за даних умов! Дозволено 5-90% та 30-800 днів STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Шукач шляху для поїздів: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(не рекомендовано) diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt index 9380ce4cc1..ccacd1c505 100644 --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -1130,7 +1130,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Αλλαγή τιμής ρύθμισης -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Κάποια ή όλα τα προεπιλεγμένα διαστήματα επισκευών παρακάτω δεν είναι συμβατά με την επιλεγμένη ρύθμιση! 5-90% και 30-800 μέρες είναι τα αποδεκτά STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF :NPF STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF :NPF diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 672b216035..06410220ac 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1198,7 +1198,6 @@ STR_CONFIG_PATCHES_INT32 :{NUM} STR_CONFIG_PATCHES_CURRENCY :{CURRENCY} STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Newid gwerth gosodiad -STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}mae rhai o'r cyfnodau rhwng gwasanaeth isod yn anghydnaws gyda'r gosodiadau a ddewiswyd! Mae 5-90% a 30-800 diwrnod yn ddilys STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Llwybrwr ar gyfer trenau: {ORANGE}{STRING} STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ni argymhellir) diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 662831b6c2..339c5d824d 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -588,162 +588,172 @@ static const int SETTING_HEIGHT = 11; ///< Height of a single patch sett /** Data structure describing a single patch in a tab */ struct PatchEntry { - const SettingDesc *setting; ///< Setting description of the patch + const char *name; ///< Name of the setting + const SettingDesc *setting; ///< Setting description of the setting uint index; ///< Index of the setting in the settings table + + PatchEntry(const char *nm); }; -/** - * Data structure describing one page of patches in the patch settings window. - * - * The names of the patches to display are statically defined, and from this - * information, a dynamic array (with length \a num) of PatchEntry entries is - * constructed. - */ +/** Data structure describing one page of patches in the patch settings window. */ struct PatchPage { - const char **names; ///< Static list of strings with patch names that are settable from the tab - PatchEntry *entries; ///< Array of patch entries of the page. Initially \c NULL, filled in at run time + PatchEntry *entries; ///< Array of patch entries of the page. byte num; ///< Number of entries on the page (statically filled). }; -static const char *_patches_ui[] = { - "gui.vehicle_speed", - "gui.status_long_date", - "gui.date_format_in_default_names", - "gui.show_finances", - "gui.autoscroll", - "gui.reverse_scroll", - "gui.smooth_scroll", - "gui.errmsg_duration", - "gui.toolbar_pos", - "gui.measure_tooltip", - "gui.window_snap_radius", - "gui.window_soft_limit", - "gui.population_in_label", - "gui.link_terraform_toolbar", - "gui.liveries", - "gui.prefer_teamchat", +/* == PatchEntry methods == */ + +/** + * Constructor for a single setting in the 'advanced settings' window + * @param nm Name of the setting in the setting table + */ +PatchEntry::PatchEntry(const char *nm) +{ + this->name = nm; + this->setting = NULL; + this->index = 0; +} + + +static PatchEntry _patches_ui[] = { + PatchEntry("gui.vehicle_speed"), + PatchEntry("gui.status_long_date"), + PatchEntry("gui.date_format_in_default_names"), + PatchEntry("gui.show_finances"), + PatchEntry("gui.autoscroll"), + PatchEntry("gui.reverse_scroll"), + PatchEntry("gui.smooth_scroll"), + PatchEntry("gui.errmsg_duration"), + PatchEntry("gui.toolbar_pos"), + PatchEntry("gui.measure_tooltip"), + PatchEntry("gui.window_snap_radius"), + PatchEntry("gui.window_soft_limit"), + PatchEntry("gui.population_in_label"), + PatchEntry("gui.link_terraform_toolbar"), + PatchEntry("gui.liveries"), + PatchEntry("gui.prefer_teamchat"), /* While the horizontal scrollwheel scrolling is written as general code, only * the cocoa (OSX) driver generates input for it. * Since it's also able to completely disable the scrollwheel will we display it on all platforms anyway */ - "gui.scrollwheel_scrolling", - "gui.scrollwheel_multiplier", + PatchEntry("gui.scrollwheel_scrolling"), + PatchEntry("gui.scrollwheel_multiplier"), #ifdef __APPLE__ /* We might need to emulate a right mouse button on mac */ - "gui.right_mouse_btn_emulation", + PatchEntry("gui.right_mouse_btn_emulation"), #endif - "gui.pause_on_newgame", - "gui.advanced_vehicle_list", - "gui.loading_indicators", - "gui.timetable_in_ticks", - "gui.quick_goto", - "gui.default_rail_type", - "gui.always_build_infrastructure", - "gui.persistent_buildingtools", - "gui.show_track_reservation", - "gui.left_mouse_btn_scrolling", + PatchEntry("gui.pause_on_newgame"), + PatchEntry("gui.advanced_vehicle_list"), + PatchEntry("gui.loading_indicators"), + PatchEntry("gui.timetable_in_ticks"), + PatchEntry("gui.quick_goto"), + PatchEntry("gui.default_rail_type"), + PatchEntry("gui.always_build_infrastructure"), + PatchEntry("gui.persistent_buildingtools"), + PatchEntry("gui.show_track_reservation"), + PatchEntry("gui.left_mouse_btn_scrolling"), }; -static const char *_patches_construction[] = { - "construction.build_on_slopes", - "construction.autoslope", - "construction.extra_dynamite", - "construction.longbridges", - "construction.signal_side", - "station.always_small_airport", - "gui.enable_signal_gui", - "gui.drag_signals_density", - "game_creation.oil_refinery_limit", - "gui.semaphore_build_before", - "gui.default_signal_type", - "gui.cycle_signal_types", +static PatchEntry _patches_construction[] = { + PatchEntry("construction.build_on_slopes"), + PatchEntry("construction.autoslope"), + PatchEntry("construction.extra_dynamite"), + PatchEntry("construction.longbridges"), + PatchEntry("construction.signal_side"), + PatchEntry("station.always_small_airport"), + PatchEntry("gui.enable_signal_gui"), + PatchEntry("gui.drag_signals_density"), + PatchEntry("game_creation.oil_refinery_limit"), + PatchEntry("gui.semaphore_build_before"), + PatchEntry("gui.default_signal_type"), + PatchEntry("gui.cycle_signal_types"), }; -static const char *_patches_stations[] = { - "station.join_stations", - "order.improved_load", - "order.selectgoods", - "gui.new_nonstop", - "station.nonuniform_stations", - "station.station_spread", - "order.serviceathelipad", - "station.modified_catchment", - "order.gradual_loading", - "construction.road_stop_on_town_road", - "station.adjacent_stations", - "station.distant_join_stations", - "economy.station_noise_level", +static PatchEntry _patches_stations[] = { + PatchEntry("station.join_stations"), + PatchEntry("order.improved_load"), + PatchEntry("order.selectgoods"), + PatchEntry("gui.new_nonstop"), + PatchEntry("station.nonuniform_stations"), + PatchEntry("station.station_spread"), + PatchEntry("order.serviceathelipad"), + PatchEntry("station.modified_catchment"), + PatchEntry("order.gradual_loading"), + PatchEntry("construction.road_stop_on_town_road"), + PatchEntry("station.adjacent_stations"), + PatchEntry("station.distant_join_stations"), + PatchEntry("economy.station_noise_level"), }; -static const char *_patches_economy[] = { - "economy.inflation", - "construction.raw_industry_construction", - "economy.multiple_industry_per_town", - "economy.same_industry_close", - "economy.bribe", - "economy.exclusive_rights", - "economy.give_money", - "gui.colored_news_year", - "economy.smooth_economy", - "economy.allow_shares", - "economy.town_layout", - "economy.mod_road_rebuild", - "economy.town_growth_rate", - "economy.larger_towns", - "economy.initial_city_size", +static PatchEntry _patches_economy[] = { + PatchEntry("economy.inflation"), + PatchEntry("construction.raw_industry_construction"), + PatchEntry("economy.multiple_industry_per_town"), + PatchEntry("economy.same_industry_close"), + PatchEntry("economy.bribe"), + PatchEntry("economy.exclusive_rights"), + PatchEntry("economy.give_money"), + PatchEntry("gui.colored_news_year"), + PatchEntry("economy.smooth_economy"), + PatchEntry("economy.allow_shares"), + PatchEntry("economy.town_layout"), + PatchEntry("economy.mod_road_rebuild"), + PatchEntry("economy.town_growth_rate"), + PatchEntry("economy.larger_towns"), + PatchEntry("economy.initial_city_size"), }; -static const char *_patches_ai[] = { - "ai.ainew_active", - "ai.ai_in_multiplayer", - "ai.ai_disable_veh_train", - "ai.ai_disable_veh_roadveh", - "ai.ai_disable_veh_aircraft", - "ai.ai_disable_veh_ship", +static PatchEntry _patches_ai[] = { + PatchEntry("ai.ainew_active"), + PatchEntry("ai.ai_in_multiplayer"), + PatchEntry("ai.ai_disable_veh_train"), + PatchEntry("ai.ai_disable_veh_roadveh"), + PatchEntry("ai.ai_disable_veh_aircraft"), + PatchEntry("ai.ai_disable_veh_ship"), }; -static const char *_patches_vehicles[] = { - "vehicle.realistic_acceleration", - "pf.forbid_90_deg", - "vehicle.mammoth_trains", - "order.gotodepot", - "pf.roadveh_queue", - "pf.pathfinder_for_trains", - "pf.pathfinder_for_roadvehs", - "pf.pathfinder_for_ships", - "gui.vehicle_income_warn", - "gui.order_review_system", - "vehicle.never_expire_vehicles", - "gui.lost_train_warn", - "gui.autorenew", - "gui.autorenew_months", - "gui.autorenew_money", - "vehicle.max_trains", - "vehicle.max_roadveh", - "vehicle.max_aircraft", - "vehicle.max_ships", - "vehicle.servint_ispercent", - "vehicle.servint_trains", - "vehicle.servint_roadveh", - "vehicle.servint_ships", - "vehicle.servint_aircraft", - "order.no_servicing_if_no_breakdowns", - "vehicle.wagon_speed_limits", - "vehicle.disable_elrails", - "vehicle.freight_trains", - "vehicle.plane_speed", - "order.timetabling", - "vehicle.dynamic_engines", +static PatchEntry _patches_vehicles[] = { + PatchEntry("vehicle.realistic_acceleration"), + PatchEntry("pf.forbid_90_deg"), + PatchEntry("vehicle.mammoth_trains"), + PatchEntry("order.gotodepot"), + PatchEntry("pf.roadveh_queue"), + PatchEntry("pf.pathfinder_for_trains"), + PatchEntry("pf.pathfinder_for_roadvehs"), + PatchEntry("pf.pathfinder_for_ships"), + PatchEntry("gui.vehicle_income_warn"), + PatchEntry("gui.order_review_system"), + PatchEntry("vehicle.never_expire_vehicles"), + PatchEntry("gui.lost_train_warn"), + PatchEntry("gui.autorenew"), + PatchEntry("gui.autorenew_months"), + PatchEntry("gui.autorenew_money"), + PatchEntry("vehicle.max_trains"), + PatchEntry("vehicle.max_roadveh"), + PatchEntry("vehicle.max_aircraft"), + PatchEntry("vehicle.max_ships"), + PatchEntry("vehicle.servint_ispercent"), + PatchEntry("vehicle.servint_trains"), + PatchEntry("vehicle.servint_roadveh"), + PatchEntry("vehicle.servint_ships"), + PatchEntry("vehicle.servint_aircraft"), + PatchEntry("order.no_servicing_if_no_breakdowns"), + PatchEntry("vehicle.wagon_speed_limits"), + PatchEntry("vehicle.disable_elrails"), + PatchEntry("vehicle.freight_trains"), + PatchEntry("vehicle.plane_speed"), + PatchEntry("order.timetabling"), + PatchEntry("vehicle.dynamic_engines"), }; /** Array of pages (tabs), where each page holds a number of advanced settings. */ static PatchPage _patches_page[] = { - {_patches_ui, NULL, lengthof(_patches_ui)}, - {_patches_construction, NULL, lengthof(_patches_construction)}, - {_patches_vehicles, NULL, lengthof(_patches_vehicles)}, - {_patches_stations, NULL, lengthof(_patches_stations)}, - {_patches_economy, NULL, lengthof(_patches_economy)}, - {_patches_ai, NULL, lengthof(_patches_ai)}, + {_patches_ui, lengthof(_patches_ui)}, + {_patches_construction, lengthof(_patches_construction)}, + {_patches_vehicles, lengthof(_patches_vehicles)}, + {_patches_stations, lengthof(_patches_stations)}, + {_patches_economy, lengthof(_patches_economy)}, + {_patches_ai, lengthof(_patches_ai)}, }; /** Widget numbers of config patches window */ @@ -785,10 +795,9 @@ struct PatchesSelectionWindow : Window { /* Build up the dynamic settings-array only once per OpenTTD session */ if (first_time) { for (PatchPage *page = &_patches_page[0]; page != endof(_patches_page); page++) { - page->entries = MallocT(page->num); for (uint i = 0; i != page->num; i++) { uint index; - const SettingDesc *sd = GetPatchFromName(page->names[i], &index); + const SettingDesc *sd = GetPatchFromName(page->entries[i].name, &index); assert(sd != NULL); page->entries[i].setting = sd;