diff options
| author | frosch <frosch@openttd.org> | 2012-12-26 17:48:25 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2012-12-26 17:48:25 +0000 |
| commit | 2161747eb756e3129739c66673308ab02ad3a6da (patch) | |
| tree | 682a8871dbf64f88498ce29c1a1c4f4f40cdb4be | |
| parent | c4c3d00578a777f6782cc0478096266148402aac (diff) | |
| download | openttd-2161747eb756e3129739c66673308ab02ad3a6da.tar.xz | |
(svn r24863) -Remove: Now redundant method to filter for non-local settings differing from default settings.
31 files changed, 1 insertions, 39 deletions
diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 55d414661..e1831165e 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -1080,7 +1080,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Oinarrizko ezar STR_CONFIG_SETTING_RESTRICT_ADVANCED :Ezarpen aurreratuak STR_CONFIG_SETTING_RESTRICT_ALL :Adituentzako ezarpenak / Ezarpen guztiak STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Ezarpenak lehenetsitakoen balio ezberdinarekin -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Bezero-eza ezarpenak lehenetsitakoen balio ezberdinarekin STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Balio ezberdinak dituzten ezarpenak zure joko berriaren ezarpenekin alderatuta STR_CONFIG_SETTING_OFF :Itzalita diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index c28a0c96c..62fa476db 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -1393,7 +1393,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Базавыя STR_CONFIG_SETTING_RESTRICT_ADVANCED :Пашыраныя наладкі STR_CONFIG_SETTING_RESTRICT_ALL :Спэцыяльныя наладкі / усе наладкі STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Наладкі са значэньнямі, якія адрозьніваюцца ад значэньняў па змоўчаньні -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Някліенцкія наладкi са значэньнямі, адрознымі ад значэньняў па змоўчаньні STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Наладкі са значэньнямі, якія адрозьніваюцца ад наладак новай гульні STR_CONFIG_SETTING_OFF :не diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 38ba79c17..825163999 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1078,7 +1078,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Configs. básic STR_CONFIG_SETTING_RESTRICT_ADVANCED :Configs. avançadas STR_CONFIG_SETTING_RESTRICT_ALL :Configs. expert / todas as configs. STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Configs. com valor diferente do padrão -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Configs. baseados no servidor com um valor dif. do padrão STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Configs. com um valor diferente das configs. para novos jogos STR_CONFIG_SETTING_OFF :Desl. diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index ce9ce5b2a..ec61875b3 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1061,7 +1061,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Paràmetres bà STR_CONFIG_SETTING_RESTRICT_ADVANCED :Paràmetres avançats STR_CONFIG_SETTING_RESTRICT_ALL :Paràmetres per experts / tots els paràmetres STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Paràmetres amb un valor diferent del predeterminat -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Paràmetres aliens al client amb un valor diferent del predeterminat STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Paràmetres amb un valor diferent dels paràmetres del joc nou STR_CONFIG_SETTING_OFF :Inactiu diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 2fcb709d4..03d2297b1 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1156,7 +1156,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Osnovne postavk STR_CONFIG_SETTING_RESTRICT_ADVANCED :Napredne postavke STR_CONFIG_SETTING_RESTRICT_ALL :Postavke za napredne korisnike / sve postavke STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Postavke sa drugačijim vrijednostima od osnovnih -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Postavke ne-klijenta sa drugačijim vrijednostima od osnovnih STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Postavke sa drugačijim vrijednostima od postavki vaše nove igre STR_CONFIG_SETTING_OFF :Isključeno diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 8a98c2834..7b4e29801 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1161,7 +1161,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Základní nast STR_CONFIG_SETTING_RESTRICT_ADVANCED :Pokročilé nastavení STR_CONFIG_SETTING_RESTRICT_ALL :Expertní nastavení / všechna nastavení STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Nastavení s jinou než defaultní hodnotou -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Ne-klientské nastavení s jinou než defaultní hodnotou STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Nastavení s jinou hodnotou než tvé nastavení nových her STR_CONFIG_SETTING_OFF :vypnuto diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 69acc7fce..3034c079b 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1079,7 +1079,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Grund Indstilli STR_CONFIG_SETTING_RESTRICT_ADVANCED :Avancerede indstillinger STR_CONFIG_SETTING_RESTRICT_ALL :Ekspert indstillinger / alle indstillinger STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Indstillinger med en anden værdi end standard -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Ikke-klient indstillinger med en anden værdi end standard STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Indstillinger med en anden værdi end dine nyt-spil indstillinger STR_CONFIG_SETTING_OFF :Fra diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index c0006a097..bf0fb088c 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1080,7 +1080,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Gewone instelli STR_CONFIG_SETTING_RESTRICT_ADVANCED :Geavanceerde instellingen STR_CONFIG_SETTING_RESTRICT_ALL :Geavanceerde instellingen / Alle instellingen STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Instellingen met een andere waarde dan de standaard -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Non-client instellingen met een andere waarde dan de standaard STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Instellingen met een andere waarde dan je 'nieuw spel' instellingen STR_CONFIG_SETTING_OFF :Uit diff --git a/src/lang/english.txt b/src/lang/english.txt index 894474706..30cad2f5d 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1060,7 +1060,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Basic settings STR_CONFIG_SETTING_RESTRICT_ADVANCED :Advanced settings STR_CONFIG_SETTING_RESTRICT_ALL :Expert settings / all settings STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Settings with a different value than the default -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Non-client settings with a different value than the default STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Settings with a different value than your new-game settings STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT :{BLACK}Restricts the list below to certain setting types diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 9f01e3330..5b6057e72 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1060,7 +1060,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Basic settings STR_CONFIG_SETTING_RESTRICT_ADVANCED :Advanced settings STR_CONFIG_SETTING_RESTRICT_ALL :Expert settings / all settings STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Settings with a different value than the default -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Non-client settings with a different value than the default STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Settings with a different value than your new-game settings STR_CONFIG_SETTING_OFF :Off diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index c7fd32a8f..6adcef7ba 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1048,7 +1048,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Bazniveloj agor STR_CONFIG_SETTING_RESTRICT_ADVANCED :Altnivelaj agordoj STR_CONFIG_SETTING_RESTRICT_ALL :Altnivelaj agordoj / ĉiu agordoj STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :agordoj kiuj malsimilas al la originala -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Ne-klientaj agordoj kiu malsimilas al la originalaj STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Agordoj kiu malsimilas al via novajuldaj agordoj STR_CONFIG_SETTING_OFF :Malaktiva diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 0f200e500..0bfb77c09 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1060,7 +1060,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Perusasetukset STR_CONFIG_SETTING_RESTRICT_ADVANCED :Lisäasetukset STR_CONFIG_SETTING_RESTRICT_ALL :Kehittyneet asetukset / kaikki asetukset STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Asetukset, joiden arvo poikkeaa oletusarvosta -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Ei-paikalliset asetukset, joiden arvo poikkeaa oletusarvosta STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Asetukset, joiden arvo poikkeaa uusille peleille määritellystä arvosta STR_CONFIG_SETTING_OFF :pois diff --git a/src/lang/french.txt b/src/lang/french.txt index c57d15133..1c17d12d3 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1061,7 +1061,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Options de base STR_CONFIG_SETTING_RESTRICT_ADVANCED :Options avancées STR_CONFIG_SETTING_RESTRICT_ALL :Paramètres expert / Tous les paramètres STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Paramètres avec une valeur différente du défaut -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Paramètre non-client avec une valeur différente du défaut STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Paramètres avec une valeur différente des paramètres de nouvelle partie STR_CONFIG_SETTING_OFF :Désactivé diff --git a/src/lang/german.txt b/src/lang/german.txt index 9156ada2b..c86ea6a2b 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1061,7 +1061,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Grundlegende Ei STR_CONFIG_SETTING_RESTRICT_ADVANCED :Erweiterte Einstellungen STR_CONFIG_SETTING_RESTRICT_ALL :Alle Einstellungen STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Einstellungen mit Werten verschieden von OpenTTDs Standardwerten -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Karten-spezifische Einstellungen mit Werten verschieden von OpenTTDs Standardwerten STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Einstellungen mit einem Wert verschieden von den eigenen Einstellungen für neue Spiele STR_CONFIG_SETTING_OFF :Aus diff --git a/src/lang/greek.txt b/src/lang/greek.txt index f510d8de5..c3c764526 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1172,7 +1172,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Βασικές STR_CONFIG_SETTING_RESTRICT_ADVANCED :Προχωρημένες ρυθμίσεις STR_CONFIG_SETTING_RESTRICT_ALL :Προχωρημένες ρυθμίσεις / όλες οι ρυθμίσεις STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Ρυθμίσεις με διαφορετική τιμή από την προκαθωρισμένη -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Ρυθμίσεις όχι του πελάτη με διαφορετική τιμή από την προκαθωρισμένη STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Ρυθμίσεις με διαφορετική τιμή από τις ρυθμίσεις νέου παιχνιδιού σας STR_CONFIG_SETTING_OFF :Ανενεργό diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 42fb169af..f2b6ac32f 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1063,7 +1063,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Pengaturan dasa STR_CONFIG_SETTING_RESTRICT_ADVANCED :Pengaturan lanjut STR_CONFIG_SETTING_RESTRICT_ALL :Pengaturan mahir / semua aturan STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Pengaturan dengan nilai berbeda dari nilai asli -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Pengaturan non-klien dengan nilai berbeda dari nilai asli STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Pengaturan dengan nilai berbeda dari pengaturan permainan baru STR_CONFIG_SETTING_OFF :Tidak diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 24403b946..6d10b3304 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1062,7 +1062,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Impostazioni di STR_CONFIG_SETTING_RESTRICT_ADVANCED :Impostazioni avanzate STR_CONFIG_SETTING_RESTRICT_ALL :Tutte le impostazioni (utenti esperti) STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Impostazioni con un valore diverso da quello predefinito -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Impostazioni non relative ai client con un valore diverso da quello predefinito STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Impostazioni con un valore diverso di quello impostato a inizio partita STR_CONFIG_SETTING_OFF :No diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 7e42daa0e..897aa50cb 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1061,7 +1061,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :기본 설정 STR_CONFIG_SETTING_RESTRICT_ADVANCED :고급 설정 STR_CONFIG_SETTING_RESTRICT_ALL :전문가 설정 / 모든 설정 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :기본값과 다른 값을 가진 설정 -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :기본값과 다른 값을 가진 (게임 저장 파일에 저장되는) 설정 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :이 게임 내에서 다른 값을 가진 설정 STR_CONFIG_SETTING_OFF :아니오 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 77d73f9de..25938b8e5 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1082,7 +1082,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Pamatiestatīju STR_CONFIG_SETTING_RESTRICT_ADVANCED :Papildu iestatījumi STR_CONFIG_SETTING_RESTRICT_ALL :Lietpratēju iestatījumi / visi iestatījumi STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Iestatījumi ar atšķirīgu vērtību nekā noklusējuma -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Uz klienta programmu neattiecošies iestatījumi ar atšķirīgu vērtību nekā noklusējuma STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Iestatījumi ar atšķirīgu vērtību nekā jūsu jaunajai spēlei STR_CONFIG_SETTING_OFF :izslēgts diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 744b5630c..56214253e 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1274,7 +1274,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :pagrindines nuo STR_CONFIG_SETTING_RESTRICT_ADVANCED :sudėtingesnes nuostatos STR_CONFIG_SETTING_RESTRICT_ALL :visas nuostatas STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :nuostatas, kurių reikšmės skiriasi nuo numatytųjų -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :ne kliento nuostatas, kurių reikšmės skiriasi nuo numatytųjų STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :nuostatas, kurių reikšmės skiriasi nuo naujai pradedamo žaidimo nuostatų STR_CONFIG_SETTING_OFF :Ne diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index f71acb27f..ca0019725 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1079,7 +1079,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Basic Astellung STR_CONFIG_SETTING_RESTRICT_ADVANCED :Erweidert Astellungen STR_CONFIG_SETTING_RESTRICT_ALL :Expertenastellungen / All Astellungen STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Astellungen mat engem aneren Wäert wéi den Standardwäert -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Net-Client Astellungen mat engem aneren Wäert wéi den Standardwäert STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Astellungen mat engem aneren Wäert wéi d'Neit-Spill-Astellungen STR_CONFIG_SETTING_OFF :Aus diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 647384225..df0c8628c 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -1080,7 +1080,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Tetapan asas STR_CONFIG_SETTING_RESTRICT_ADVANCED :Tetapan tambahan STR_CONFIG_SETTING_RESTRICT_ALL :Pakar tetapan / semua tetapan STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Tetapan dengan nilai berbeza dari yang lalai -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Jumlah pinjaman maksimum yang boleh dipinjam oleh syarikat (tanpa mengambil kira inflasi) STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Tetapan dengan nilai yang berbeza daripada tetapan baru permainananda STR_CONFIG_SETTING_OFF :Matikan diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 43c1f9fcc..8fa55926c 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1079,7 +1079,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Grunnleggende i STR_CONFIG_SETTING_RESTRICT_ADVANCED :Avanserte innstillinger STR_CONFIG_SETTING_RESTRICT_ALL :Avanserte innstillinger / alle innstillinger STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Innstillinger med annen verdi enn standarden -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Innstillinger hos andre enn klienten som har annen verdi enn standard STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Innstillinger med annen verdi enn innstillingene dine for nye spill STR_CONFIG_SETTING_OFF :Av diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 7dd24d8cf..34644d4ac 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1460,7 +1460,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Ustawienia pods STR_CONFIG_SETTING_RESTRICT_ADVANCED :Ustawienia zaawansowane STR_CONFIG_SETTING_RESTRICT_ALL :Ustawienia eksperta / wszystkie ustawienia STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Ustawienie z inną wartością niż domyślna -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Ustawienia inne niż klienta z wartością inną niż domyślna STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Ustawienia z wartościami innymi niż twoje ustawienia dla nowej gry STR_CONFIG_SETTING_OFF :wył. diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index c77d7c48a..7686b3b8b 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1079,7 +1079,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Opções Básic STR_CONFIG_SETTING_RESTRICT_ADVANCED :Opções Avançadas STR_CONFIG_SETTING_RESTRICT_ALL :Opções Avançadas / Todas as Opções STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Opções com um valor diferente das de origem -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Opções não-cliente com um valor diferente das originais STR_CONFIG_SETTING_OFF :Desligado STR_CONFIG_SETTING_ON :Ligado diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index f06fe38af..5f551d50f 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1077,7 +1077,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Setări de baz STR_CONFIG_SETTING_RESTRICT_ADVANCED :Setări avansate STR_CONFIG_SETTING_RESTRICT_ALL :Setări expert / toate setările STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Setări cu altă valoare decît cea prestabilită -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Setări non-client cu altă valoare decît cea prestabilită STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Setări cu valori diferite față de cele setate de tine pentru joc nou STR_CONFIG_SETTING_OFF :Inactiv diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 2dc4cf0a2..f226574f7 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1210,7 +1210,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Основны STR_CONFIG_SETTING_RESTRICT_ADVANCED :Расширенные настройки STR_CONFIG_SETTING_RESTRICT_ALL :Специальные настройки / все настройки STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Настройки со значениями, отличающимися от значений по умолчанию -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Неклиентские настройки со значениями, отличающимися от значений по умолчанию STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Настройки со значениями, отличающимися от настроек новой игры STR_CONFIG_SETTING_OFF :нет diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index ddbc2d2f4..a42b30887 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1061,7 +1061,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Opciones básic STR_CONFIG_SETTING_RESTRICT_ADVANCED :Opciones avanzadas STR_CONFIG_SETTING_RESTRICT_ALL :Opciones de experto / todas las opciones STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Opciones con un valor diferente al valor por defecto -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Opciones de servidor con un valor diferente al de por defecto STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Opciones con un valor diferente a las opciones de partida nueva STR_CONFIG_SETTING_OFF :No diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index d11f3823a..12803601d 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1205,7 +1205,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Основні STR_CONFIG_SETTING_RESTRICT_ADVANCED :Розширені налаштування STR_CONFIG_SETTING_RESTRICT_ALL :Всі / експертні налаштування STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Налаштування, що відрізняються від дефолтних -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Неклієнтскі налаштування, що відрізняються від дефолтних STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Налаштування, що відрізняються від налаштувань нової гри STR_CONFIG_SETTING_OFF :ні diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 0ddfff517..e3fe79095 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -1060,7 +1060,6 @@ STR_CONFIG_SETTING_RESTRICT_BASIC :Tùy chọn cơ STR_CONFIG_SETTING_RESTRICT_ADVANCED :Tùy chọn nâng cao STR_CONFIG_SETTING_RESTRICT_ALL :Thiết lập chuyên gia/tất cả thiết lập STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT :Thiết lập khác với giá trị mặc định -STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL :Thiết lập chung với giá trị khác giá trị mặc định STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :THiết lập giá trị mới khác với giá trị cho ván chơi mới STR_CONFIG_SETTING_OFF :Tắt diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 0c3ecbccd..616e8d6e1 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -725,7 +725,6 @@ enum RestrictionMode { RM_ADVANCED, ///< Display settings associated to the "advanced" list. RM_ALL, ///< List all settings regardless of the default/newgame/... values. RM_CHANGED_AGAINST_DEFAULT, ///< Show only settings which are different compared to default values. - RM_CHANGED_AGAINST_DEFAULT_WO_LOCAL, ///< Show only non-local settings which are different compared to default values. RM_CHANGED_AGAINST_NEW, ///< Show only settings which are different compared to the user's new game setting values. RM_END, ///< End for iteration. }; @@ -1030,11 +1029,6 @@ bool SettingEntry::IsVisibleByRestrictionMode(RestrictionMode mode) const assert((this->flags & SEF_KIND_MASK) == SEF_SETTING_KIND); const SettingDesc *sd = this->d.entry.setting; - if (mode == RM_CHANGED_AGAINST_DEFAULT_WO_LOCAL && (sd->save.conv & SLF_NO_NETWORK_SYNC) != 0) { - /* Hide local settings when comparing our settings against those of the server. */ - return false; - } - if (mode == RM_BASIC) return (this->d.entry.setting->desc.cat & SC_BASIC_LIST) != 0; if (mode == RM_ADVANCED) return (this->d.entry.setting->desc.cat & SC_ADVANCED_LIST) != 0; @@ -1044,7 +1038,7 @@ bool SettingEntry::IsVisibleByRestrictionMode(RestrictionMode mode) const int64 filter_value; - if (mode == RM_CHANGED_AGAINST_DEFAULT || mode == RM_CHANGED_AGAINST_DEFAULT_WO_LOCAL) { + if (mode == RM_CHANGED_AGAINST_DEFAULT) { /* This entry shall only be visible, if the value deviates from its default value. */ /* Read the default value. */ @@ -1721,7 +1715,6 @@ static const StringID _game_settings_restrict_dropdown[] = { STR_CONFIG_SETTING_RESTRICT_ADVANCED, // RM_ADVANCED STR_CONFIG_SETTING_RESTRICT_ALL, // RM_ALL STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT, // RM_CHANGED_AGAINST_DEFAULT - STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT_WO_LOCAL, // RM_CHANGED_AGAINST_DEFAULT_WO_LOCAL STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW, // RM_CHANGED_AGAINST_NEW }; assert_compile(lengthof(_game_settings_restrict_dropdown) == RM_END); @@ -2134,7 +2127,6 @@ struct GameSettingsWindow : Window { case WID_GS_RESTRICT_DROPDOWN: this->filter.mode = (RestrictionMode)index; if (this->filter.mode == RM_CHANGED_AGAINST_DEFAULT || - this->filter.mode == RM_CHANGED_AGAINST_DEFAULT_WO_LOCAL || this->filter.mode == RM_CHANGED_AGAINST_NEW) { if (!this->manually_changed_folding) { |