From 801d1693a769cc7919e04ac1241b1f5ae1e22bd5 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 24 Apr 2018 20:03:51 +0200 Subject: [PATCH] convert "Update Interval" preference to a SeekBar --- .../java/org/fdroid/fdroid/Preferences.java | 61 +++++++++++++++---- .../java/org/fdroid/fdroid/UpdateService.java | 2 +- .../views/fragments/PreferencesFragment.java | 36 +++++++---- .../main/res/layout/preference_seekbar.xml | 53 ++++++++++++++++ app/src/main/res/values-af/strings.xml | 1 - app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-ast/strings.xml | 1 - app/src/main/res/values-be/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-bo/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-eo/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-et/strings.xml | 1 - app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-gl/strings.xml | 1 - app/src/main/res/values-he/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-id/strings.xml | 1 - app/src/main/res/values-is/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-mk/strings.xml | 1 - app/src/main/res/values-ml/strings.xml | 1 - app/src/main/res/values-my/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl-rBE/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sc/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sn/strings.xml | 1 - app/src/main/res/values-sq/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-ur/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rHK/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/array.xml | 10 --- app/src/main/res/values/donottranslate.xml | 10 --- app/src/main/res/values/strings.xml | 15 +++-- app/src/main/res/xml/preferences.xml | 11 ++-- 64 files changed, 140 insertions(+), 114 deletions(-) create mode 100644 app/src/main/res/layout/preference_seekbar.xml diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java index f465100fc..3dafc61fe 100644 --- a/app/src/main/java/org/fdroid/fdroid/Preferences.java +++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Build; import android.support.v7.preference.PreferenceManager; +import android.text.format.DateUtils; import android.util.Log; import info.guardianproject.netcipher.NetCipher; import org.fdroid.fdroid.net.ConnectivityMonitorService; @@ -41,7 +42,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh } } - public static final String PREF_UPDATE_INTERVAL = "updateInterval"; + public static final String PREF_UPDATE_INTERVAL = "updateIntervalSeekBarPosition"; public static final String PREF_UPDATE_ON_WIFI_ONLY = "updateOnWifiOnly"; public static final String PREF_AUTO_DOWNLOAD_INSTALL_UPDATES = "updateAutoDownload"; public static final String PREF_UPDATE_NOTIFICATION_ENABLED = "updateNotify"; @@ -75,7 +76,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh private static final boolean DEFAULT_SHOW_INCOMPAT_VERSIONS = false; private static final boolean DEFAULT_SHOW_ROOT_APPS = true; private static final boolean DEFAULT_SHOW_ANTI_FEATURE_APPS = true; - private static final int DEFAULT_UPDATE_INTERVAL = 24; + public static final int DEFAULT_UPDATE_INTERVAL = 3; private static final boolean DEFAULT_PRIVILEGED_INSTALLER = true; //private static final boolean DEFAULT_LOCAL_REPO_BONJOUR = true; private static final long DEFAULT_KEEP_CACHE_TIME = TimeUnit.DAYS.toMillis(1); @@ -95,6 +96,9 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh private static final boolean DEFAULT_PANIC_EXIT = true; private static final boolean DEFAULT_HIDE_ON_LONG_PRESS_SEARCH = false; + @Deprecated + private static final String OLD_PREF_UPDATE_INTERVAL = "updateInterval"; + public enum Theme { light, dark, @@ -102,6 +106,16 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh lightWithDarkActionBar, // Obsolete } + private static final long[] UPDATE_INTERVAL_VALUES = { + Long.MAX_VALUE, // never + DateUtils.WEEK_IN_MILLIS * 2, + DateUtils.WEEK_IN_MILLIS, + DateUtils.DAY_IN_MILLIS, + DateUtils.HOUR_IN_MILLIS * 12, + DateUtils.HOUR_IN_MILLIS * 4, + DateUtils.HOUR_IN_MILLIS, + }; + private boolean showAppsRequiringRoot = DEFAULT_SHOW_ROOT_APPS; private boolean showAppsWithAntiFeatures = DEFAULT_SHOW_ANTI_FEATURE_APPS; @@ -161,16 +175,41 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh /** * Get the update interval in milliseconds. */ - public int getUpdateInterval() { - int hours; - try { - String value = preferences.getString(PREF_UPDATE_INTERVAL, - String.valueOf(DEFAULT_UPDATE_INTERVAL)); - hours = Integer.parseInt(value); - } catch (NumberFormatException e) { - hours = DEFAULT_UPDATE_INTERVAL; + public long getUpdateInterval() { + int position = preferences.getInt(PREF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL); + return UPDATE_INTERVAL_VALUES[position]; + } + + /** + * The original preference was a {@link String}, now it must be a {@link Integer} + * since {@link android.support.v7.preference.SeekBarPreference} uses it + * directly. + */ + public void migrateUpdateIntervalStringToInt() { + if (!preferences.contains(OLD_PREF_UPDATE_INTERVAL)) { + return; // already completed } - return hours * 60 * 60 * 1000; + int updateInterval = DEFAULT_UPDATE_INTERVAL; + String value = preferences.getString(OLD_PREF_UPDATE_INTERVAL, String.valueOf(24)); + if ("1".equals(value)) { // 1 hour + updateInterval = 6; + } else if ("4".equals(value)) { // 4 hours + updateInterval = 5; + } else if ("12".equals(value)) { // 12 hours + updateInterval = 4; + } else if ("24".equals(value)) { // 1 day + updateInterval = 3; + } else if ("168".equals(value)) { // 2 weeks + updateInterval = 2; + } else if ("336".equals(value)) { // 1 week + updateInterval = 1; + } else if ("0".equals(value)) { // never + updateInterval = 0; + } + preferences.edit() + .putInt(PREF_UPDATE_INTERVAL, updateInterval) + .remove(OLD_PREF_UPDATE_INTERVAL) + .apply(); } /** diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java index f96dbea91..d11811c6b 100644 --- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java +++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java @@ -130,7 +130,7 @@ public class UpdateService extends IntentService { * @see Project Volta: Scheduling jobs */ public static void schedule(Context context) { - int interval = Preferences.get().getUpdateInterval(); + long interval = Preferences.get().getUpdateInterval(); if (Build.VERSION.SDK_INT < 21) { Intent intent = new Intent(context, UpdateService.class); diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java index 7e29b366a..af255677c 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java @@ -11,9 +11,9 @@ import android.support.v7.preference.EditTextPreference; import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; +import android.support.v7.preference.SeekBarPreference; import android.text.TextUtils; import android.view.WindowManager; - import info.guardianproject.netcipher.NetCipher; import info.guardianproject.netcipher.proxy.OrbotHelper; import org.fdroid.fdroid.AppDetails2; @@ -29,6 +29,7 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller; public class PreferencesFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { + public static final String TAG = "PreferencesFragment"; private static final String[] SUMMARIES_TO_UPDATE = { Preferences.PREF_UPDATE_INTERVAL, @@ -49,7 +50,18 @@ public class PreferencesFragment extends PreferenceFragment Preferences.PREF_PROXY_PORT, }; + private static final int[] UPDATE_INTERVAL_NAMES = { + R.string.interval_never, + R.string.interval_2w, + R.string.interval_1w, + R.string.interval_1d, + R.string.interval_12h, + R.string.interval_4h, + R.string.interval_1h, + }; + private static final int REQUEST_INSTALL_ORBOT = 0x1234; + private SeekBarPreference updateIntervalSeekBar; private CheckBoxPreference enableProxyCheckPref; private CheckBoxPreference useTorCheckPref; private Preference updateAutoDownloadPref; @@ -58,12 +70,17 @@ public class PreferencesFragment extends PreferenceFragment @Override public void onCreatePreferences(Bundle bundle, String s) { + + Preferences.get().migrateUpdateIntervalStringToInt(); + addPreferencesFromResource(R.xml.preferences); useTorCheckPref = (CheckBoxPreference) findPreference(Preferences.PREF_USE_TOR); enableProxyCheckPref = (CheckBoxPreference) findPreference(Preferences.PREF_ENABLE_PROXY); updateAutoDownloadPref = findPreference(Preferences.PREF_AUTO_DOWNLOAD_INSTALL_UPDATES); updatePrivilegedExtensionPref = findPreference(Preferences.PREF_UNINSTALL_PRIVILEGED_APP); + updateIntervalSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_UPDATE_INTERVAL); + ListPreference languagePref = (ListPreference) findPreference(Preferences.PREF_LANGUAGE); if (Build.VERSION.SDK_INT >= 24) { PreferenceCategory category = (PreferenceCategory) findPreference("pref_category_display"); @@ -97,17 +114,12 @@ public class PreferencesFragment extends PreferenceFragment switch (key) { case Preferences.PREF_UPDATE_INTERVAL: - ListPreference listPref = (ListPreference) findPreference( - Preferences.PREF_UPDATE_INTERVAL); - int interval = Integer.parseInt(listPref.getValue()); - Preference onlyOnWifi = findPreference( - Preferences.PREF_UPDATE_ON_WIFI_ONLY); - onlyOnWifi.setEnabled(interval > 0); - if (interval == 0) { - listPref.setSummary(R.string.update_interval_zero); - } else { - listPref.setSummary(listPref.getEntry()); - } + updateIntervalSeekBar.setMax(Preferences.UPDATE_INTERVAL_VALUES.length - 1); + updateIntervalSeekBar.setDefaultValue(Preferences.DEFAULT_UPDATE_INTERVAL); + int seekBarPosition = updateIntervalSeekBar.getValue(); + Preference onlyOnWifi = findPreference(Preferences.PREF_UPDATE_ON_WIFI_ONLY); + onlyOnWifi.setEnabled(seekBarPosition > 0); + updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[seekBarPosition]); break; case Preferences.PREF_UPDATE_ON_WIFI_ONLY: diff --git a/app/src/main/res/layout/preference_seekbar.xml b/app/src/main/res/layout/preference_seekbar.xml new file mode 100644 index 000000000..87b4c0ccc --- /dev/null +++ b/app/src/main/res/layout/preference_seekbar.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index ba3a5f903..3db20ee92 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -15,7 +15,6 @@ Ander Automatiese opdaterings interval - Geen automatiese prgram lys opdaterings Slegs op Wi-Fi Opdateer slegs automaties wanneer gekoppel aan ongemete netwerke soos Wi-Fi diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 05f3587c1..bf448548b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -67,7 +67,6 @@ أخرى تحديث الفاصل الزمني التلقائي - لا توجد تحديثات لقائمة التطبيق التلقائي فقط على الشبكات اللاسلكية (Wi-Fi) تحديث قوائم التطبيق تلقائيا فقط على الشبكات غير المحدودة بمقدار البيانات مثل (Wi-Fi) diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index cc1889180..acc435d9c 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -9,7 +9,6 @@ Anovamientos Otru Intervalu automáticu d\'anovamientu - Nun anovar automáticamente\'l llistáu d\'aplicaciones Namái na Wi-Fi Auto-anovar namái en redes non midíes como Wi-Fi Ver los anovamientos disponibles diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index e97a2b4a3..60812f0ad 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -19,7 +19,6 @@ Іншае Інтэрвал аўтаматычнага абнаўлення - Не абнаўляць спіс праграм аўтаматычна Толькі праз Wi-Fi Аўтаматычна абнаўляць толькі праз нелімітаваныя сеткі, такія як Wi-Fi Аўтаматычна атрымліваць абнаўленні diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5fb00f9c4..416f4f19d 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -12,7 +12,6 @@ Обновления Други Проверка за актуализации - Без автоматично актуализиране на списъка с приложения Само през Wi-Fi Актуализирането на списъка с приложения ще става само през неограничени мрежи като Wi-Fi diff --git a/app/src/main/res/values-bo/strings.xml b/app/src/main/res/values-bo/strings.xml index 4506217c6..83fdc0f78 100644 --- a/app/src/main/res/values-bo/strings.xml +++ b/app/src/main/res/values-bo/strings.xml @@ -85,7 +85,6 @@ གཞན། རང་འགུལ་ངང་ནས་གསར་བསྒྱུར་བར་མཚམས། - རང་འགུལ་མ་ཡིན་པའི་མཉེས་ཆས་གསར་བསྒྱར་གྱི་ཐོ་གཞུང་། ཝཡེ་ཕྷཡེ་ཁོ་ནའི་སྒང་ལ། ཝཡེ་ཕཡེ་ལྟ་བུ་ཚད་འཇལ་མི་ཐུབ་པའི་རིགས་ལ་རང་འགུལ་གྱི་གསར་བསྒྱུར་ཁོ་ན་བྱེད་དགོས། རང་འགུལ་ངང་ནས་གསར་བསྒྱར་ལེན། diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 538d55ad4..7f1810a45 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -8,7 +8,6 @@ Actualitzacions Altres Període d\'actualització automàtica - No actualitzis automàticament la llista d\'aplicacions Només en Wi-Fi Actualitza la llista d\'aplicacions en xarxes sense limitació de tràfic, com ara Wi-Fi Mostreu les actualitzacions disponibles diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index cde7dcbb9..7bbbe6792 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -282,7 +282,6 @@ Světlý Tmavý Noc - Bez automatických aktualizací seznamu aplikací Privilegovaná oprávnění nebyla tomuto rozšíření udělena! Nahlašte prosím jako chybu! diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f6f1ff92e..cbb817057 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -14,7 +14,6 @@ Andet Automatisk opdateringsinterval - Ingen automatiske opdateringer til applikationslisten Kun på Wi-Fi Opdater kun automatisk på ubegrænsede netværk som WI-FI Vis tilgængelige opdateringer diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 503de28d6..95f8f3a4b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -9,7 +9,6 @@ Aktualisierungen Andere Automatisches Aktualisierungsintervall - Anwendungsliste nicht automatisch aktualisieren Nur über WLAN Anwendungsliste nur über gebührenfreie Netze wie WLAN automatisch aktualisieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 08a0dae50..173781866 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -9,7 +9,6 @@ Ενημερώσεις Άλλα Συχνότητα ενημέρωσης - Μη αυτόματη ενημέρωση της λίστας εφαρμογών Μόνο σε Wi-Fi Αυτόματη ενημέρωση μόνο σε δίκτυα Wi-Fi Εμφάνιση διαθέσιμων ενημερώσεων diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 342dfbe8a..69de26503 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -99,7 +99,6 @@ Aktivigi sendadon tra NFC… Kaŝmemorigi apk-dosierojn Proponi ĝisdatigojn al nestabilaj versioj - Neniam aŭtomate ĝisdatigi listojn de aplikaĵoj Ĝisdatigi listojn aŭtomate nur per netarifaj retoj kiel vifio Privilegia aldonaĵo Uzi privilegian F-Droid-aldonaĵon por instali, ĝisdatigi kaj forigi pakaĵojn diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 765380282..496c8e8bb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -9,7 +9,6 @@ Avisos Otros Intervalo de actualización automática - No actualizar la lista de aplicaciones automáticamente Sólo con Wi-Fi Actualizar automáticamente solo con Wi-Fi y otras redes de tarifa plana diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 9b2374d71..07318ab99 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -14,7 +14,6 @@ Muu Automaatne värskendusintervall - Ära värskenda rakenduste loendit automaatselt Ainult Wi-Fi ühendusega Värskenda rakenduste loendit automaatselt piiramatu andmemahuga võrkudes nagu Wi-Fi Värskenduste automaatne hankimine diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index adb61e044..10eddaea8 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -150,7 +150,6 @@ Biltegi guztiak egunean daude Beste biltegiek ez dute errorerik sortu. Errorea eguneratzean: %s - Ez eguneratu automatikoki aplikazio zerrenda Bitcoin Litecoin Flattr diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 95ccd1637..69f17b6d8 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -6,7 +6,6 @@ به‌روزرسانی‌ها دیگر به‌روزرسانی دوره‌ای خودکار - به‌روزرسانی‌ نکردن خودکار فهرست برنامه‌ ها فقط روی وای‌فای به‌روز رسانی خودکار فقط روی شبکه‌های اندازه‌گیری نشده مثل وای‌فای نمایش یک اعلان هنگام موجود بودن به‌روز رسانی‌ها diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 947a84f0e..db3c1b7cc 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -9,7 +9,6 @@ Päivitykset Muu Automaattisen päivityksen tiheys - Ei automaattisia sovellusluetteloiden päivityksiä Vain Wi-Fi -yhteydellä Päivitä automaattisesti vain rajoittamattomissa verkoissa, kuten Wi-Fi Päivitysimoitukset diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a3076947c..be4c0287f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -9,7 +9,6 @@ Mises à jour Autres Intervalle de mise à jour automatique - Aucune mise à jour automatique de la liste d\'applis Uniquement via Wi-Fi Mise à jour automatique uniquement sur des réseaux sans restriction, comme le Wi-Fi Afficher les mises à jour disponibles diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index b170bec90..a0cf754d4 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -212,7 +212,6 @@ Oscuro Nocturno Suxire actualizacións para versións inestables - Non actualizar automáticamente o listado de aplicativos Abre a pantalla de detalles da Privileged Extension para actualizala/desinstalala diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 438fdbd27..bc106a1a0 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -273,7 +273,6 @@ להתקין עדכון ליישומון מובנה זה? המידע הנוכחי שלך לא יאבד. היישומון העדכני יקבל גישה אל: להתקין עדכון ליישומון קיים זה? המידע הנוכחי שלך לא יאבד. פעולה זו אינה מצריכה הרשאת גישה מיוחדת. להתקין עדכון ליישומון מובנה זה? המידע הנוכחי שלך לא יאבד. פעולה זו אינה מצריכה גישה מיוחדת. - אין עדכוני רשימות יישומונים אוטומטית Bitcoin Litecoin Flattr diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 897f473e3..85bf55e4d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -9,7 +9,6 @@ अन्य स्वचालित अद्यतन अंतराल - कोई स्वचालित एप्लिकेशन अद्यतन नहीं केवल Wi-Fi एप्लिकेशन सूचि केवल Wi-Fi पे अपडेट करें नवीनतम सूचनाएं diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 04eba82e3..096465b58 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -19,7 +19,6 @@ Ostalo Interval automatskog ažuriranja - Bez automatskog ažuriranja popisa aplikacija Samo na Wi-Fi Ažuriraj popis aplikacija automatski samo na Wi-Fi Automatski preuzmi ažuriranja diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0df166b5b..01c7a2164 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -7,7 +7,6 @@ Frissítések Egyéb Automatikus frissítés időköze - Ne frissítsen automatikusan Csak Wi-Fin Automatikus frissítés csak forgalomkorlát nélküli kapcsolatokon, például Wi-Fin Elérhető frissítések megjelenítése diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index ff62f40b9..c078e0c39 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -13,7 +13,6 @@ Lainnya Selang waktu pembaruan otomatis - Jangan perbarui otomatis daftar aplikasi Hanya pada Wi-Fi Hanya perbarui secara otomatis pada jaringan tak terbatas seperti Wi-Fi diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index b965ab4b8..3ef53a5c5 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -264,7 +264,6 @@ Tengstu sama þráðlausa Wi-Fi netinu og vinur þinn Tengstu fólki í nágrenninu og skipstu á forritum við það. QR-kóðinn sem þú skannaðir lítur ekki út eins og býttikóði. - Engar sjálfvirkar uppfærslur forritalista Einungis uppfæra sjálfvirkt þegar tengst er kostnaðarlausum netkerfum á borð við Wi-Fi netum diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 12ca323aa..64663591d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -12,7 +12,6 @@ Aggiornamenti Altro Intervallo degli aggiornamenti automatici - Non aggiornare automaticamente l\'elenco delle applicazioni Solo via Wi-Fi Aggiorna automaticamente gli elenchi applicazioni solo via Wi-Fi Mostra aggiornamenti disponibili diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ee0391a03..e5c1e79c7 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -9,7 +9,6 @@ アップデート その他 自動更新の間隔 - アプリリストの自動更新を行わない Wi-Fi接続時のみ Wi-Fiなどの従量課金制ではないネットワークのみで自動更新を行います 利用可能な更新を表示 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 429e8c1b2..7ec2216a2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -9,7 +9,6 @@ 업데이트 기타 자동 업데이트 간격 - 자동으로 앱 목록을 업데이트하지 않기 Wi-Fi에서만 Wi-Fi와 같이 추가 요금이 부과되지 않는 네트워크에서만 자동으로 업데이트합니다 사용 가능한 업데이트 보이기 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 4d2bfcafa..7ec6205d3 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -133,6 +133,5 @@ Saugoti įdiegimų istoriją Saugoti log bylą visiems įdiegimams ir išdiegimams F-Droid programėlėje Priversti senąjį indeksavimo formatą - Nėra automatinio programėlių sąrašo atnaujinimų Atnaujinimai parsiunčiami automatiškai o Jūs perspėjami juos instaliuoti diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index b429f4356..ad0158595 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -7,7 +7,6 @@ Atjauninājumi Cits Automātisko atjauninājumu intervāls - Neatjaunināt aplikāciju sarakstu automātiski Tikai pa Wi-Fi Atjaunināt automātiski tikai tīklos bez limitiem, kā, piemēram, Wi-Fi Parādīt pieejamos atjauninājumus diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index b4018dc12..cfe9eaad1 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -20,6 +20,5 @@ Други Автоматско ажурирање временски интервал - Нема листа на автоматски ажурирања на апликацијата Само на Wi-Fi diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 3e2e4d5d9..57086c1da 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -93,7 +93,6 @@ മറ്റുള്ളവ സ്വതവേ പുതുക്കലിന്റെ ഇടവേള - പ്രയോഗ പട്ടിക സ്വതവേ പുതുക്കേണ്ട വൈ-ഫൈ യിൽ മാത്രം വൈഫൈ പോലെ പരിധിയില്ലാത്ത ശൃഖലകളിൽ മാത്രം സ്വതവേ പുതുക്കുക പുതുക്കലുകള്‍ സ്വതവേ ലഭ്യമാക്കുക diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index 470c24f08..97f175cd2 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -17,7 +17,6 @@ တျခား အလိုအေလ်ာက္ အသစ္မြမ္းမံမႈ interval - အလိုအေလ်ာက္ app စာရင္းအသစ္မြမ္းမံမႈမ်ားမေတြ႕ရပါ ဝိုင္ဖိုင္ျဖင့္သာ ဝိုင္ဖိုင္ျဖင့္သာ app စာရင္းမ်ားကိုအလိုအေလ်ာက္ျပဳလုပ္မည္ အသစ္မြမ္းမံမႈမ်ားကိုအလိုအေလ်ာက္ေဒါင္းလုတ္ဆြဲမည္ diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 93e5b6590..9d160f3c9 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -8,7 +8,6 @@ Oppdateringer Andre Intervall for automatisk oppdatering - Ingen automatisk oppdatering av pakkebrønner Bare på trådløst Bare oppdater automatisk når tilknyttet Wi-Fi Vis tilgjengelig oppdateringer diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml index d6e71eb03..f99dda3bf 100644 --- a/app/src/main/res/values-nl-rBE/strings.xml +++ b/app/src/main/res/values-nl-rBE/strings.xml @@ -95,7 +95,6 @@ Overig Automatisch update-interval - Geen automatische applijstupdates Alleen via wifi Alleen automatisch bijwerken op verbindingen zonder datalimiet gelijk wifi Download updates automatisch diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index eda4a9c56..aba233e32 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -9,7 +9,6 @@ Updates Overig Automatisch update-interval - Geen automatische app-lijstupdates Alleen via wifi Update alleen automatisch op verbinding zonder datalimiet zoals wifi Toon beschikbare updates diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b461ff3f0..697089591 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -198,7 +198,6 @@ Wymiana powiodła się! %1$s (Twój hostpot) Dotknij by połączyć się z tą inną siecią Wi-Fi - Wyłącz automatyczne aktualizacje Kod źródłowy Twoje urządzenie nie jest w tej samej sieci Wi-Fi co lokalne repozytorium które zostało dodane! Spróbuj połączyć się z siecią %s diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 883d4774b..4100c8848 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -12,7 +12,6 @@ Atualizações Outros Intervalo de atualização automática - Não atualizar a lista de aplicativos automaticamente Apenas com Wi-Fi Atualizar automaticamente apenas em redes com acesso ilimitado, como Wi-Fi diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 2b400aaec..4d38fa60d 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -17,7 +17,6 @@ Outro Intervalo de atualização automática - Não atualizar automaticamente a lista de aplicações Apenas por Wi-Fi Apenas atualizar a lista de aplicações se estiver ligado a redes Wi-Fi diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index f028ffb29..f4d6039a4 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -51,7 +51,6 @@ Necesită autentificare Extensie privilegiată Sugerează actualizări și la versiunile instabile - Nu actualiza automat lista de pachete Nume utilizator gol, autentificare neschimbată Schimbă parola diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9740f18b8..6ed1eae8c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -9,7 +9,6 @@ Обновления Прочее Интервал автоматического обновления - Не обновлять список приложений автоматически Только по Wi-Fi Обновлять автоматически только по нелимитированным соединениям (таким как Wi-Fi) diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 408213ca3..c19f69536 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -9,7 +9,6 @@ Agiornamentos Àteru Intervallu agiornamentu automàticu - Non che agiornes automaticamente sa lista de sas aplicatziones Cun su Wi-Fi ebbia Agiorna automaticamente sa lista de sas aplicatziones petzi si b\'est su wifi diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 42f2afa69..21379fbde 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -14,7 +14,6 @@ Obnovy Iné Interval automat. aktualizácií - Automaticky neobnovovať zoznam Iba cez Wi-Fi Automaticky aktualizovať len na nespoplatnených sieťach, ako napr. Wi-Fi diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 1146abade..22e9cd234 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -47,7 +47,6 @@ Ostalo Interval samodejnega posodabljanja - Samodejno osveževanje seznama aplikacij onemogočeno Samo na Wi-Fi Posodobi seznam aplikacij samo na Wi-Fi Prikaži obvestilo, ko so na voljo posodobitve diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml index 1fb85db94..066b77bb5 100644 --- a/app/src/main/res/values-sn/strings.xml +++ b/app/src/main/res/values-sn/strings.xml @@ -11,7 +11,6 @@ meF-Droid Chimirwa chakanatswa chiri automatic - Hapana mitara iri automatic yezvakanatswa zvema app Pamasaisai eWi-Fi chete Natsa zviriautomatic pamasaisai asiri metered kunge Wi-Fi chete Tutunura zvekunatsa zviri automatic diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 45e176d4b..f63c7790f 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -122,7 +122,6 @@ Mbaje raportin e të gjitha instalimeve dhe çinstalimeve mbrenda F-Droid Forcoje formën e vjetër të indeksit Në rast të gabimeve ose problemeve të pajtueshmërisë, përdoreni XML indeksin e aplikacioneve - Mos të freskohet lista e aplikacioneve Freskoje vetëm në rrjete të pamatura si Wi-Fi Merr freskimet automatikisht Freskimet shkarkohen automatikisht dhe ti njoftohesh për të instaluar ato diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 97dca789f..4aa3f40d1 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -11,7 +11,6 @@ Надоградње Остало Међувреме самосталног освежавања - Без самосталног освежавања списка надоградњи Само на бежичној мрежи Самостално освежавање само на бесплатним мрежама као што је бежична Прикажи доступне надоградње diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index dad729a02..9ff0dfe42 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -9,7 +9,6 @@ Uppdateringar Andra Automatiskt uppdateringsintervall - Inga automatiska applistuppdateringar Endast via Wi-Fi Uppdatera endast automatiskt på obegränsade nätverk som Wi-Fi Visa tillgängliga uppdateringar diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 166a185ba..f6ae4761f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -241,7 +241,6 @@ อัพเดต อัพเดตที่ไม่เสถียร แนะนำการอัพเดตไปรุ่นที่ไม่เสถียร - ไม่อัพเดตข้อมูลรายการโปรแกรมโดยอัตโนมัติ อัพเดตข้อมูลรายการโปรแกรมเฉพาะตอนที่ใช้ WiFi ทำการดาวน์โหลดอัพเดตโปรแกรมแบบเบื้องหลัง การแจ้งเตือนอัพเดต diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index b1541e6cd..2f8390cee 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -9,7 +9,6 @@ Güncellemeler Diğer Kendiliğinden güncelleme aralığı - Kendiliğinden uygulama listesi güncellemesi olmasın Yalnızca Wi-Fi ile Yalnızca Wi-Fi gibi ölçümsüz ağlarda kendiliğinden güncelle Kullanılabilir güncellemeleri göster diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 56a199e10..5273b0eca 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -38,7 +38,6 @@ Видалити Інше Інтервал автооновлення - Не оновлювати список застосунків автоматично Тільки через Wi-Fi Автоматично оновлювати тільки через нелімітовані мережі, такі як Wi-Fi Показувати сповіщення коли є доступні оновлення diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index ca49c918b..2657202a3 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -19,7 +19,6 @@ دیگر خودکار تازہ کاری کرنے کا وقفہ - کوئی خودکار ایپ فہرست تازہ کاریاں موجود نہیں صرف وائی فائی پر اپلی کیشن کی فہرست صرف وائی فائی پر خود بخود اپڈیٹ کریں تازہ کاریوں کی اطلاعات diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 3b03b47c5..83f086283 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -11,7 +11,6 @@ Cập nhật Khác Tự động cập nhật định kì - Không tự động cập nhật danh sách ứng dụng Chỉ khi dùng Wi-Fi Chỉ tự động cập nhật khi dùng các mạng không tính lưu lượng, ví dụ Wi-Fi Hiện các bản cập nhật có sẵn diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2bb4bb6e9..789dfd21a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -9,7 +9,6 @@ 更新 其他 自动更新频率 - 不要自动更新应用列表 仅在Wi-Fi上 仅在使用 Wi-Fi 等非计量网络时自动更新 显示可用更新 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index bfbbd4b64..72bd6fec0 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -7,7 +7,6 @@ 更新 其他 自動更新頻率 - 不要自動更新應用程式目錄 只透過 Wi-Fi 更新 只在使用如 Wi-Fi 等沒有限流量的連線時自動更新 顯示可更新的應用程式 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4aaf7dec6..7d736fd01 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -14,7 +14,6 @@ 其它設定 自動更新間隔 - 不要自動更新應用程式清單 僅使用 Wi-Fi 更新 僅在未計量的網路例如 Wi-Fi 上自動更新 顯示可用的更新 diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index c575ea5a4..7842fb2df 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -1,15 +1,5 @@ - - @string/interval_never - @string/interval_1h - @string/interval_4h - @string/interval_12h - @string/interval_1d - @string/interval_1w - @string/interval_2w - - @string/keep_hour @string/keep_day diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 1de33474f..09fe45d56 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -19,16 +19,6 @@ 1-THIS MEANS NO APP IS GRANTED ACCESS! @string/install_history_reader_packageName_UNSET - - 0 - 1 - 4 - 12 - 24 - 168 - 336 - - 3600000 86400000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 67f5475b9..be1a4aa70 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,7 +23,6 @@ Other Automatic update interval - No automatic app list updates Only on Wi-Fi Only update automatically on unmetered networks like Wi-Fi Automatically fetch updates @@ -497,13 +496,13 @@ This often occurs with apps installed via Google Play or other sources, if they Installing… Uninstalling… - Never - Hourly - Every 4 hours - Every 12 hours - Daily - Weekly - Every 2 weeks + No automatic app updates + Check for updates hourly + Check for updates every 4 hours + Check for updates every 12 hours + Check for updates daily + Check for updates weekly + Check for updates every 2 weeks 1 Hour 1 Day diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 4f6ebd311..5da3d282c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -1,5 +1,6 @@ - + - + android:layout="@layout/preference_seekbar"/>