update "Only on WiFi" pref to handle very low bandwidth better

This gives a lot more flexibility to the user to cover bandwidth, power,
and privacy issues related to network traffic.  The current implementation
does not represent these prefs as well as it should.  For example, it does
not force the traffic over the preferred network type if the other type is
set to "never".  Instead it just tracks the "unmetered" status of the
active network, and acts based on that.

closes #1381

app/src/main/java/org/fdroid/fdroid/Preferences.java

@@ -42,8 +42,9 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
         }
     }
 
+    public static final String PREF_OVER_WIFI = "overWifi";
+    public static final String PREF_OVER_DATA = "overData";
     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";
     public static final String PREF_THEME = "theme";
@@ -73,9 +74,15 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
     public static final String PREF_PANIC_HIDE = "pref_panic_hide";
     public static final String PREF_HIDE_ON_LONG_PRESS_SEARCH = "hideOnLongPressSearch";
 
+    public static final int OVER_NETWORK_NEVER = 0;
+    public static final int OVER_NETWORK_ON_DEMAND = 1;
+    public static final int OVER_NETWORK_ALWAYS = 2;
+
     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;
+    public static final int DEFAULT_OVER_WIFI = OVER_NETWORK_ALWAYS;
+    public static final int DEFAULT_OVER_DATA = OVER_NETWORK_ON_DEMAND;
     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;
@@ -98,6 +105,8 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
 
     @Deprecated
     private static final String OLD_PREF_UPDATE_INTERVAL = "updateInterval";
+    @Deprecated
+    private static final String OLD_PREF_UPDATE_ON_WIFI_ONLY = "updateOnWifiOnly";
 
     public enum Theme {
         light,
@@ -106,7 +115,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
         lightWithDarkActionBar, // Obsolete
     }
 
-    private static final long[] UPDATE_INTERVAL_VALUES = {
+    public static final long[] UPDATE_INTERVAL_VALUES = {
             Long.MAX_VALUE,  // never
             DateUtils.WEEK_IN_MILLIS * 2,
             DateUtils.WEEK_IN_MILLIS,
@@ -176,8 +185,12 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
      * Get the update interval in milliseconds.
      */
     public long getUpdateInterval() {
-        int position = preferences.getInt(PREF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL);
-        return UPDATE_INTERVAL_VALUES[position];
+        if (getOverData() == OVER_NETWORK_NEVER && getOverWifi() == OVER_NETWORK_NEVER) {
+            return UPDATE_INTERVAL_VALUES[0];
+        } else {
+            int position = preferences.getInt(PREF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL);
+            return UPDATE_INTERVAL_VALUES[position];
+        }
     }
 
     /**
@@ -206,6 +219,9 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
         } else if ("0".equals(value)) { // never
             updateInterval = 0;
         }
+
+        // TODO migrate OLD_PREF_UPDATE_ON_WIFI_ONLY
+
         preferences.edit()
                 .putInt(PREF_UPDATE_INTERVAL, updateInterval)
                 .remove(OLD_PREF_UPDATE_INTERVAL)
@@ -334,9 +350,29 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
      * downloaded in the background.
      */
     public boolean isBackgroundDownloadAllowed() {
-        return FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT ||
-                (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED
-                        && !preferences.getBoolean(PREF_UPDATE_ON_WIFI_ONLY, false));
+        if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT) {
+            return getOverWifi() == OVER_NETWORK_ALWAYS;
+        } else if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED) {
+            return getOverData() == OVER_NETWORK_ALWAYS;
+        }
+        return false;
+    }
+
+    public boolean isOnDemandDownloadAllowed() {
+        if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT) {
+            return getOverWifi() != OVER_NETWORK_NEVER;
+        } else if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED) {
+            return getOverData() != OVER_NETWORK_NEVER;
+        }
+        return false;
+    }
+
+    private int getOverWifi() {
+        return preferences.getInt(PREF_OVER_WIFI, DEFAULT_OVER_WIFI);
+    }
+
+    private int getOverData() {
+        return preferences.getInt(PREF_OVER_DATA, DEFAULT_OVER_DATA);
     }
 
     /**

app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java

@@ -71,7 +71,7 @@ public class ScreenShotsActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        IMAGE_LOADER.denyNetworkDownloads(false);
+        IMAGE_LOADER.denyNetworkDownloads(!Preferences.get().isOnDemandDownloadAllowed());
     }
 
     @Override

app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java

@@ -33,8 +33,9 @@ public class PreferencesFragment extends PreferenceFragment
     public static final String TAG = "PreferencesFragment";
 
     private static final String[] SUMMARIES_TO_UPDATE = {
+            Preferences.PREF_OVER_WIFI,
+            Preferences.PREF_OVER_DATA,
             Preferences.PREF_UPDATE_INTERVAL,
-            Preferences.PREF_UPDATE_ON_WIFI_ONLY,
             Preferences.PREF_UPDATE_NOTIFICATION_ENABLED,
             Preferences.PREF_SHOW_ROOT_APPS,
             Preferences.PREF_SHOW_ANTI_FEATURE_APPS,
@@ -62,6 +63,9 @@ public class PreferencesFragment extends PreferenceFragment
     };
 
     private static final int REQUEST_INSTALL_ORBOT = 0x1234;
+
+    private SeekBarPreference overWifiSeekBar;
+    private SeekBarPreference overDataSeekBar;
     private SeekBarPreference updateIntervalSeekBar;
     private SwitchPreference enableProxyCheckPref;
     private SwitchPreference useTorCheckPref;
@@ -80,6 +84,8 @@ public class PreferencesFragment extends PreferenceFragment
         updateAutoDownloadPref = findPreference(Preferences.PREF_AUTO_DOWNLOAD_INSTALL_UPDATES);
         updatePrivilegedExtensionPref = findPreference(Preferences.PREF_UNINSTALL_PRIVILEGED_APP);
 
+        overWifiSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_OVER_WIFI);
+        overDataSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_OVER_DATA);
         updateIntervalSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_UPDATE_INTERVAL);
 
         ListPreference languagePref = (ListPreference) findPreference(Preferences.PREF_LANGUAGE);
@@ -111,20 +117,53 @@ public class PreferencesFragment extends PreferenceFragment
         pref.setSummary(getString(resId, pref.getText()));
     }
 
+    private void setNetworkSeekBarSummary(SeekBarPreference seekBarPreference) {
+        int position = seekBarPreference.getValue();
+        if (position == 0) {
+            seekBarPreference.setSummary(R.string.over_network_never_summary);
+        } else if (position == 1) {
+            seekBarPreference.setSummary(R.string.over_network_on_demand_summary);
+        } else if (position == 2) {
+            seekBarPreference.setSummary(R.string.over_network_always_summary);
+        } else {
+            throw new IllegalArgumentException("No such " + seekBarPreference.getTitle() + " position: " + position);
+        }
+    }
+
+    private void enableUpdateInverval() {
+        if (overWifiSeekBar.getValue() == Preferences.OVER_NETWORK_NEVER
+                && overDataSeekBar.getValue() == Preferences.OVER_NETWORK_NEVER) {
+            updateIntervalSeekBar.setEnabled(false);
+            updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[0]);
+        } else {
+            updateIntervalSeekBar.setEnabled(true);
+            updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[updateIntervalSeekBar.getValue()]);
+        }
+    }
+
     private void updateSummary(String key, boolean changing) {
 
         switch (key) {
+
             case Preferences.PREF_UPDATE_INTERVAL:
                 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:
-                checkSummary(key, R.string.automatic_scan_wifi_on);
+            case Preferences.PREF_OVER_WIFI:
+                overWifiSeekBar.setMax(Preferences.OVER_NETWORK_ALWAYS);
+                overWifiSeekBar.setDefaultValue(Preferences.DEFAULT_OVER_WIFI);
+                setNetworkSeekBarSummary(overWifiSeekBar);
+                enableUpdateInverval();
+                break;
+
+            case Preferences.PREF_OVER_DATA:
+                overDataSeekBar.setMax(Preferences.OVER_NETWORK_ALWAYS);
+                overDataSeekBar.setDefaultValue(Preferences.DEFAULT_OVER_DATA);
+                setNetworkSeekBarSummary(overDataSeekBar);
+                enableUpdateInverval();
                 break;
 
             case Preferences.PREF_UPDATE_NOTIFICATION_ENABLED:

app/src/main/res/values-af/strings.xml

@@ -15,9 +15,6 @@
     <string name="other">Ander</string>
 
     <string name="update_interval">Automatiese opdaterings interval</string>
-    <string name="automatic_scan_wifi">Slegs op Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Opdateer slegs automaties wanneer gekoppel aan ongemete netwerke soos Wi-Fi
-    </string>
     <string name="update_auto_download">Automatise opdaterings</string>
     <string name="update_auto_download_summary">Opdateerings word outomaties afgelaai en jy word in kennis gestel om dit self te installeer</string>
     <string name="update_auto_install">Installeer opdaterings automaties</string>

app/src/main/res/values-ar/strings.xml

@@ -67,10 +67,6 @@
     <string name="other">أخرى</string>
 
     <string name="update_interval">تحديث الفاصل الزمني التلقائي</string>
-    <string name="automatic_scan_wifi">فقط على الشبكات اللاسلكية (Wi-Fi)</string>
-    <string name="automatic_scan_wifi_on">تحديث قوائم التطبيق تلقائيا فقط على الشبكات غير المحدودة بمقدار البيانات مثل
-        (Wi-Fi)
-    </string>
     <string name="update_auto_download">جلب التحديثات تلقائياً</string>
     <string name="update_auto_download_summary">التحديثات تُحمل تلقائياً و أنت تتلقي إشعار لتثبيتها</string>
     <string name="notify">إظهار التحديثات المتوفرة</string>

app/src/main/res/values-ast/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">Anovamientos</string>
     <string name="other">Otru</string>
     <string name="update_interval">Intervalu automáticu d\'anovamientu</string>
-    <string name="automatic_scan_wifi">Namái na Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Auto-anovar namái en redes non midíes como Wi-Fi</string>
     <string name="notify">Ver los anovamientos disponibles</string>
     <string name="notify_on">Amuesa un avisu cuando tán disponibles anovamientos</string>
     <string name="system_installer">Estensión con privilexos</string>

app/src/main/res/values-be/strings.xml

@@ -19,8 +19,6 @@
     <string name="other">Іншае</string>
 
     <string name="update_interval">Інтэрвал аўтаматычнага абнаўлення</string>
-    <string name="automatic_scan_wifi">Толькі праз Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Аўтаматычна абнаўляць толькі праз нелімітаваныя сеткі, такія як Wi-Fi</string>
     <string name="update_auto_download">Аўтаматычна атрымліваць абнаўленні</string>
     <string name="update_auto_download_summary">Абнаўленні спампуюцца аўтаматычна і вам будзе прапанавана ўсталяваць іх</string>
     <string name="update_auto_install">Аўтаматычна ўсталёўваць абнаўленні</string>

app/src/main/res/values-bg/strings.xml

@@ -12,10 +12,6 @@
     <string name="updates">Обновления</string>
     <string name="other">Други</string>
     <string name="update_interval">Проверка за актуализации</string>
-    <string name="automatic_scan_wifi">Само през Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Актуализирането на списъка с приложения ще става само през неограничени мрежи
-        като Wi-Fi
-    </string>
     <string name="notify">Покажи наличните актуализации</string>
     <string name="notify_on">Известява при наличие на актуализация</string>
     <string name="system_installer">Инсталиране чрез системни разрешения</string>

app/src/main/res/values-bo/strings.xml

@@ -85,8 +85,6 @@
     <string name="other">གཞན།</string>
 
     <string name="update_interval">རང་འགུལ་ངང་ནས་གསར་བསྒྱུར་བར་མཚམས།</string>
-    <string name="automatic_scan_wifi">ཝཡེ་ཕྷཡེ་ཁོ་ནའི་སྒང་ལ།</string>
-    <string name="automatic_scan_wifi_on">ཝཡེ་ཕཡེ་ལྟ་བུ་ཚད་འཇལ་མི་ཐུབ་པའི་རིགས་ལ་རང་འགུལ་གྱི་གསར་བསྒྱུར་ཁོ་ན་བྱེད་དགོས།</string>
     <string name="update_auto_download">རང་འགུལ་ངང་ནས་གསར་བསྒྱར་ལེན།</string>
     <string name="update_auto_download_summary">རང་འགུལ་གྱི་ངང་ནས་གསར་བསྒྱུར་དང་ཕབ་ལེན་བྱས་པ་དང་ཁྱེད་རང་ལ་བརྡ་ལན་འབྱོར་སྐབས་དེ་དག་འགྲིག་བཅུག་བྱེད།</string>
     <string name="update_auto_install">རང་འགུལ་གྱི་ཐོག་ནས་གསར་བསྒྱུར་རྣམས་འགྲིག་བཅུག་བྱེད།</string>

app/src/main/res/values-ca/strings.xml

@@ -8,8 +8,6 @@
     <string name="updates">Actualitzacions</string>
     <string name="other">Altres</string>
     <string name="update_interval">Període d\'actualització automàtica</string>
-    <string name="automatic_scan_wifi">Només en Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Actualitza la llista d\'aplicacions en xarxes sense limitació de tràfic, com ara Wi-Fi</string>
     <string name="notify">Mostreu les actualitzacions disponibles</string>
     <string name="notify_on">Ensenya una notificació quan hi hagi actualitzacions disponibles</string>
     <string name="system_installer">Extensió Privilegiada</string>

app/src/main/res/values-cs/strings.xml

@@ -8,9 +8,6 @@
     <string name="updates">Aktualizace</string>
     <string name="other">Ostatní</string>
     <string name="update_interval">Interval automatických aktualizací</string>
-    <string name="automatic_scan_wifi">Pouze přes Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Automaticky aktualizovat jen na nezpoplatněných sítích, jako např. Wi-Fi
-    </string>
     <string name="notify">Zobrazit dostupné aktualizace</string>
     <string name="notify_on">Upozornit, pokud jsou dostupné aktualizace</string>
     <string name="system_installer">Privilegovaná rozšíření</string>

app/src/main/res/values-da/strings.xml

@@ -14,8 +14,6 @@
     <string name="other">Andet</string>
 
     <string name="update_interval">Automatisk opdateringsinterval</string>
-    <string name="automatic_scan_wifi">Kun på Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Opdater kun automatisk på ubegrænsede netværk som WI-FI</string>
     <string name="notify">Vis tilgængelige opdateringer</string>
     <string name="notify_on">Vis en notifikation når opdateringer er tilgængelige</string>
     <string name="system_installer">Privilegeret Udvidelse</string>

app/src/main/res/values-de/strings.xml

@@ -9,10 +9,6 @@
     <string name="updates">Aktualisierungen</string>
     <string name="other">Andere</string>
     <string name="update_interval">Automatisches Aktualisierungsintervall</string>
-    <string name="automatic_scan_wifi">Nur über WLAN</string>
-    <string name="automatic_scan_wifi_on">Anwendungsliste nur über gebührenfreie Netze wie WLAN automatisch
-        aktualisieren
-    </string>
     <string name="notify">Aktualisierungsbenachrichtigung</string>
     <string name="notify_on">Benachrichtigen, wenn Aktualisierungen verfügbar sind</string>
     <string name="system_installer">Rechteerweiterung</string>

app/src/main/res/values-el/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">Ενημερώσεις</string>
     <string name="other">Άλλα</string>
     <string name="update_interval">Συχνότητα ενημέρωσης</string>
-    <string name="automatic_scan_wifi">Μόνο σε Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Αυτόματη ενημέρωση μόνο σε δίκτυα Wi-Fi</string>
     <string name="notify">Εμφάνιση διαθέσιμων ενημερώσεων</string>
     <string name="notify_on">Εμφάνιση ειδοποίησης όταν υπάρχουν διαθέσιμες ενημερώσεις</string>
     <string name="app_details">Λεπτομέρειες Εφαρμογής</string>

app/src/main/res/values-eo/strings.xml

@@ -4,7 +4,6 @@
     <string name="delete">Forigi</string>
     <string name="updates">Ĝisdatigoj</string>
     <string name="other">Aliaj</string>
-    <string name="automatic_scan_wifi">Nur per vifio</string>
     <string name="notify">Montri disponeblajn ĝisdatigojn</string>
     <string name="notify_on">Sciigi kiam ĝisdatigoj estas disponeblaj</string>
     <string name="app_details">Aplikaĵaj detaloj</string>
@@ -99,7 +98,6 @@
     <string name="enable_nfc_send">Aktivigi sendadon tra NFC…</string>
     <string name="cache_downloaded">Kaŝmemorigi apk-dosierojn</string>
     <string name="unstable_updates_summary">Proponi ĝisdatigojn al nestabilaj versioj</string>
-    <string name="automatic_scan_wifi_on">Ĝisdatigi listojn aŭtomate nur per netarifaj retoj kiel vifio</string>
     <string name="system_installer">Privilegia aldonaĵo</string>
     <string name="system_installer_on">Uzi privilegian F-Droid-aldonaĵon por instali, ĝisdatigi kaj forigi pakaĵojn
     </string>

app/src/main/res/values-es/strings.xml

@@ -9,9 +9,6 @@
     <string name="updates">Avisos</string>
     <string name="other">Otros</string>
     <string name="update_interval">Intervalo de actualización automática</string>
-    <string name="automatic_scan_wifi">Sólo con Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Actualizar automáticamente solo con Wi-Fi y otras redes de tarifa plana
-    </string>
     <string name="notify">Mostrar actualizaciones disponibles</string>
     <string name="notify_on">Muestra una notificación cuando hay actualizaciones</string>
     <string name="system_installer">Extensión con permisos de sistema</string>

app/src/main/res/values-et/strings.xml

@@ -14,8 +14,6 @@
     <string name="other">Muu</string>
 
     <string name="update_interval">Automaatne värskendusintervall</string>
-    <string name="automatic_scan_wifi">Ainult Wi-Fi ühendusega</string>
-    <string name="automatic_scan_wifi_on">Värskenda rakenduste loendit automaatselt piiramatu andmemahuga võrkudes nagu Wi-Fi</string>
     <string name="update_auto_download">Värskenduste automaatne hankimine</string>
     <string name="update_auto_download_summary">Värskendused laaditakse automaatselt ja sind teavitatakse, et neid paigaldada</string>
     <string name="notify">Kuva saadaolevad värskendused</string>

app/src/main/res/values-eu/strings.xml

@@ -9,10 +9,6 @@
     <string name="enable_nfc_send">Gaitu NFC bidez bidaltzea…</string>
     <string name="cache_downloaded">Gorde aplikazioak cachean</string>
     <string name="updates">Eguneraketak</string>
-    <string name="automatic_scan_wifi">Wi-Fi bidez soilik</string>
-    <string name="automatic_scan_wifi_on">Eguneratu aplikazioen zerrendak automatikoki Wi-Fi bezalako mugatu gabeko
-        sareen bidez soilik
-    </string>
     <string name="notify">Erakutsi eguneraketa eskuragarriak</string>
     <string name="notify_on">Bistarazi jakinarazpena eguneraketak eskuragarri daudenean</string>
     <string name="app_details">Aplikazioaren xehetasunak</string>

app/src/main/res/values-fa/strings.xml

@@ -6,8 +6,6 @@
     <string name="updates">به‌روزرسانی‌ها</string>
     <string name="other">دیگر</string>
     <string name="update_interval">به‌روزرسانی دوره‌ای خودکار</string>
-    <string name="automatic_scan_wifi">فقط روی وای‌فای</string>
-    <string name="automatic_scan_wifi_on">به‌روز رسانی خودکار  فقط روی شبکه‌های اندازه‌گیری نشده مثل وای‌فای</string>
     <string name="notify_on">نمایش یک اعلان هنگام موجود بودن به‌روز رسانی‌ها</string>
     <string name="no_such_app">چنین کاره‌ای پیدا نشد.</string>
     <string name="about_title">دربارهٔ F-Droid</string>

app/src/main/res/values-fi/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">Päivitykset</string>
     <string name="other">Muu</string>
     <string name="update_interval">Automaattisen päivityksen tiheys</string>
-    <string name="automatic_scan_wifi">Vain Wi-Fi -yhteydellä</string>
-    <string name="automatic_scan_wifi_on">Päivitä automaattisesti vain rajoittamattomissa verkoissa, kuten Wi-Fi</string>
     <string name="notify">Päivitysimoitukset</string>
     <string name="notify_on">Näytä iIlmoitus, kun päivityksiä on saatavilla</string>
     <string name="system_installer">Etuoikeutettu laajennus</string>

app/src/main/res/values-fr/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">Mises à jour</string>
     <string name="other">Autres</string>
     <string name="update_interval">Intervalle de mise à jour automatique</string>
-    <string name="automatic_scan_wifi">Uniquement via Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Mise à jour automatique uniquement sur des réseaux sans restriction, comme le Wi-Fi</string>
     <string name="notify">Afficher les mises à jour disponibles</string>
     <string name="notify_on">Afficher une notification quand des mises à jour sont disponibles</string>
     <string name="system_installer">Permissions étendues</string>

app/src/main/res/values-gl/strings.xml

@@ -6,7 +6,6 @@
     <string name="cache_downloaded">Manter apps na caché</string>
     <string name="updates">Actualizacións</string>
     <string name="other">Outro</string>
-    <string name="automatic_scan_wifi">Só mediante wifi</string>
     <string name="notify">Amosar actualizacións disponíbeis</string>
     <string name="app_details">Detalles da ap</string>
     <string name="no_such_app">Non se atopou ese aplicativo.</string>
@@ -64,7 +63,6 @@
     <string name="enable_nfc_send">Activar envío NFC…</string>
     <string name="unstable_updates">Actualizacións inestables</string>
     <string name="update_interval">Intervalo de actualización automática</string>
-    <string name="automatic_scan_wifi_on">Actualizar automáticamente só en redes con acceso ilimitado, como as Wi-Fi</string>
     <string name="notify_on">Amosar unha notificación cando hai actualizacións dispoñibles</string>
     <string name="system_installer_on">Utiliza F-Droid Privileged Extension para instalar, actualizar e eleminar
         paquetes

app/src/main/res/values-he/strings.xml

@@ -9,8 +9,6 @@
     <string name="other">אחר</string>
 
     <string name="update_interval">תדירות עדכון אוטומטי</string>
-    <string name="automatic_scan_wifi">רק על גבי רשת אלחוטית</string>
-    <string name="automatic_scan_wifi_on">עדכון רשימות יישומונים אוטומטית רק על גבי רשת אלחוטית</string>
     <string name="notify">הצגת עדכונים זמינים</string>
     <string name="notify_on">הצגת התרעה כאשר יש עדכונים</string>
     <string name="system_installer">הרחבה מועדפת</string>

app/src/main/res/values-hi/strings.xml

@@ -9,8 +9,6 @@
     <string name="other">अन्य</string>
 
     <string name="update_interval">स्वचालित अद्यतन अंतराल</string>
-    <string name="automatic_scan_wifi">केवल Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">एप्लिकेशन सूचि केवल Wi-Fi पे अपडेट करें</string>
     <string name="notify">नवीनतम सूचनाएं</string>
     <string name="notify_on">सूचित कर्रे जब नवीनतम उपलब्ध हो</string>
     <string name="local_repo_name">स्थानीय कोष का नाम</string>

app/src/main/res/values-hr/strings.xml

@@ -19,8 +19,6 @@
     <string name="other">Ostalo</string>
 
     <string name="update_interval">Interval automatskog ažuriranja</string>
-    <string name="automatic_scan_wifi">Samo na Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Ažuriraj popis aplikacija automatski samo na Wi-Fi</string>
     <string name="update_auto_download">Automatski preuzmi ažuriranja</string>
     <string name="update_auto_download_summary">Preuzmi datoteke ažuriranja u pozadini</string>
     <string name="notify">Obavijesti ažuriranja</string>

app/src/main/res/values-hu/strings.xml

@@ -7,8 +7,6 @@
     <string name="updates">Frissítések</string>
     <string name="other">Egyéb</string>
     <string name="update_interval">Automatikus frissítés időköze</string>
-    <string name="automatic_scan_wifi">Csak Wi-Fin</string>
-    <string name="automatic_scan_wifi_on">Automatikus frissítés csak forgalomkorlát nélküli kapcsolatokon, például Wi-Fin</string>
     <string name="notify">Elérhető frissítések megjelenítése</string>
     <string name="notify_on">Értesítés megjelenítése, ha frissítés érhető el</string>
     <string name="app_details">Alkalmazás részletei</string>

app/src/main/res/values-hy/strings.xml

@@ -135,7 +135,6 @@
     <string name="notification_action_install">Տեղադրել</string>
 
     <string name="keep_install_history_summary">Պահել տեղադրման և ապատեղադրման լոգերը F-Droidում</string>
-    <string name="automatic_scan_wifi">Միայն Wi-Fiով</string>
     <string name="notify">Թարմացման ծանուցումներ</string>
     <string name="notify_on">Երբ թարմացում է հասանելի՝ ցույց տալ ծանուցում</string>
     <string name="no_such_app">Այդպիսի ափփ չի գտնվել</string>

app/src/main/res/values-id/strings.xml

@@ -13,9 +13,6 @@
     <string name="other">Lainnya</string>
 
     <string name="update_interval">Selang waktu pembaruan otomatis</string>
-    <string name="automatic_scan_wifi">Hanya pada Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Hanya perbarui secara otomatis pada jaringan tak terbatas seperti Wi-Fi
-    </string>
     <string name="notify">Tampilkan pembaruan yang tersedia</string>
     <string name="notify_on">Beri tahu jika pembaruan aplikasi tersedia</string>
     <string name="system_installer_on">Gunakan F-Droid Privileged Extension untuk memasang, memperbarui, dan mencopot

app/src/main/res/values-is/strings.xml

@@ -12,7 +12,6 @@
     <string name="other">Annað</string>
 
     <string name="update_interval">Bil milli sjálfvirkra uppfærslna</string>
-    <string name="automatic_scan_wifi">Aðeins á þráðlausu neti</string>
     <string name="update_auto_download">Ná sjálfkrafa í uppfærslur</string>
     <string name="update_auto_download_summary">Sækja uppfærsluskrárnar í bakgrunni og þú færð tilkynningu um að setja þær upp</string>
     <string name="update_auto_install">Setja uppfærslur upp sjálfkrafa</string>
@@ -264,9 +263,6 @@
     <string name="swap_join_same_wifi">Tengstu sama þráðlausa Wi-Fi netinu og vinur þinn</string>
     <string name="swap_intro">Tengstu fólki í nágrenninu og skipstu á forritum við það.</string>
     <string name="swap_qr_isnt_for_swap">QR-kóðinn sem þú skannaðir lítur ekki út eins og býttikóði.</string>
-    <string name="automatic_scan_wifi_on">Einungis uppfæra sjálfvirkt þegar tengst er kostnaðarlausum netkerfum á borð
-        við Wi-Fi netum
-    </string>
     <string name="system_installer_on">Nota forgangsviðbót F-Droid (privileged extension) til að setja upp, uppfæra og
         fjarlægja pakka
     </string>

app/src/main/res/values-it/strings.xml

@@ -12,8 +12,6 @@
     <string name="updates">Aggiornamenti</string>
     <string name="other">Altro</string>
     <string name="update_interval">Intervallo degli aggiornamenti automatici</string>
-    <string name="automatic_scan_wifi">Solo via Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Aggiorna automaticamente gli elenchi applicazioni solo via Wi-Fi</string>
     <string name="notify">Mostra aggiornamenti disponibili</string>
     <string name="notify_on">Mostra una notifica quando sono disponibili aggiornamenti</string>
     <string name="system_installer">Estensione priviliegiata</string>

app/src/main/res/values-ja/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">アップデート</string>
     <string name="other">その他</string>
     <string name="update_interval">自動更新の間隔</string>
-    <string name="automatic_scan_wifi">Wi-Fi接続時のみ</string>
-    <string name="automatic_scan_wifi_on">Wi-Fiなどの従量課金制ではないネットワークのみで自動更新を行います</string>
     <string name="notify">利用可能な更新を表示</string>
     <string name="notify_on">アップデートが利用可能になると通知を表示します</string>
     <string name="system_installer">特権拡張機能</string>

app/src/main/res/values-kab/strings.xml

@@ -201,7 +201,6 @@
     <string name="enable_nfc_send">Rmed Tuzna NFC …</string>
     <string name="unstable_updates">Ileqman ur yerkiden ara</string>
     <string name="keep_install_history">Ḥrez amazray n usebded</string>
-    <string name="automatic_scan_wifi">Ala γef Wi-Fi</string>
     <string name="notify">Sken ileqman yellan</string>
     <string name="system_installer">Isiγzaf Yettwasirgen</string>
     <string name="uninstall_system">Leqqem/Kkes asiγzef yettwasirgen</string>

app/src/main/res/values-ko/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">업데이트</string>
     <string name="other">기타</string>
     <string name="update_interval">자동 업데이트 간격</string>
-    <string name="automatic_scan_wifi">Wi-Fi에서만</string>
-    <string name="automatic_scan_wifi_on">Wi-Fi와 같이 추가 요금이 부과되지 않는 네트워크에서만 자동으로 업데이트합니다</string>
     <string name="notify">사용 가능한 업데이트 보이기</string>
     <string name="notify_on">업데이트가 사용 가능할 때 알림을 보여줍니다</string>
     <string name="system_installer">특별 권한 확장 기능</string>

app/src/main/res/values-lt/strings.xml

@@ -6,7 +6,6 @@
     <string name="updates">Atnaujinimai</string>
     <string name="other">Kita</string>
     <string name="update_interval">Automatinis programų sąrašų naujinimas</string>
-    <string name="automatic_scan_wifi">Tik prisijungus prie belaidžio (WiFi)</string>
     <string name="notify">Informuoti</string>
     <string name="notify_on">Pranešti, kai atsiras atnaujinimų</string>
     <string name="local_repo_name">Šio įrenginio saugyklos pavadinimas</string>

app/src/main/res/values-lv/strings.xml

@@ -7,8 +7,6 @@
     <string name="updates">Atjauninājumi</string>
     <string name="other">Cits</string>
     <string name="update_interval">Automātisko atjauninājumu intervāls</string>
-    <string name="automatic_scan_wifi">Tikai pa Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Atjaunināt automātiski tikai tīklos bez limitiem, kā, piemēram, Wi-Fi</string>
     <string name="notify">Parādīt pieejamos atjauninājumus</string>
     <string name="notify_on">Ziņot, kad atjauninājumi pieejami</string>
     <string name="system_installer">Priviliģētais Pievienojums</string>

app/src/main/res/values-mk/strings.xml

@@ -20,5 +20,4 @@
     <string name="other">Други</string>
 
     <string name="update_interval">Автоматско ажурирање временски интервал</string>
-    <string name="automatic_scan_wifi">Само на Wi-Fi</string>
 </resources>

app/src/main/res/values-ml/strings.xml

@@ -93,8 +93,6 @@
     <string name="other">മറ്റുള്ളവ</string>
 
     <string name="update_interval">സ്വതവേ പുതുക്കലിന്റെ ഇടവേള</string>
-    <string name="automatic_scan_wifi">വൈ-ഫൈ യിൽ മാത്രം</string>
-    <string name="automatic_scan_wifi_on">വൈഫൈ പോലെ പരിധിയില്ലാത്ത ശൃഖലകളിൽ മാത്രം സ്വതവേ പുതുക്കുക</string>
     <string name="update_auto_download">പുതുക്കലുകള്‍ സ്വതവേ ലഭ്യമാക്കുക</string>
     <string name="update_auto_download_summary">പുതുക്കലുകള്‍ സ്വതവേ ഡൗൺലോഡ് ചെയ്യുകയും അവ സ്ഥാപിക്കാന്‍ നിങ്ങളെ വിവരം അറിയിക്കുകയും ചെയ്യുക</string>
     <string name="update_auto_install">പുതുക്കലുകള്‍ സ്വതവേ സ്ഥാപിക്കുക</string>

app/src/main/res/values-my/strings.xml

@@ -17,8 +17,6 @@
     <string name="other">တျခား</string>
 
     <string name="update_interval">အလိုအေလ်ာက္ အသစ္မြမ္းမံမႈ interval</string>
-    <string name="automatic_scan_wifi">ဝိုင္ဖိုင္ျဖင့္သာ</string>
-    <string name="automatic_scan_wifi_on">ဝိုင္ဖိုင္ျဖင့္သာ app စာရင္းမ်ားကိုအလိုအေလ်ာက္ျပဳလုပ္မည္</string>
     <string name="update_auto_download">အသစ္မြမ္းမံမႈမ်ားကိုအလိုအေလ်ာက္ေဒါင္းလုတ္ဆြဲမည္</string>
     <string name="update_auto_download_summary">အေနာက္ပိုင္းတြင္ အသစ္မြမ္းမံမႈမ်ားကိုေဒါင္းလုတ္ဆြဲမည္</string>
     <string name="notify">အသစ္မြမ္းမံမႈ အသိေပးခ်က္မ်ား</string>

app/src/main/res/values-nb/strings.xml

@@ -8,8 +8,6 @@
     <string name="updates">Oppdateringer</string>
     <string name="other">Andre</string>
     <string name="update_interval">Intervall for automatisk oppdatering</string>
-    <string name="automatic_scan_wifi">Bare på trådløst</string>
-    <string name="automatic_scan_wifi_on">Bare oppdater automatisk når tilknyttet Wi-Fi</string>
     <string name="notify">Vis tilgjengelig oppdateringer</string>
     <string name="notify_on">Varsle når nye oppdateringer er tilgjengelige</string>
     <string name="system_installer">Priviligert tillegg</string>

app/src/main/res/values-nl-rBE/strings.xml

@@ -95,8 +95,6 @@
     <string name="other">Overig</string>
 
     <string name="update_interval">Automatisch update-interval</string>
-    <string name="automatic_scan_wifi">Alleen via wifi</string>
-    <string name="automatic_scan_wifi_on">Alleen automatisch bijwerken op verbindingen zonder datalimiet gelijk wifi</string>
     <string name="update_auto_download">Download updates automatisch</string>
     <string name="update_auto_download_summary">Updates worden automatisch gedownload in de achtergrond en der wordt een melding weergegeven voor ze te installeren</string>
     <string name="update_auto_install">Installeer updates automatisch</string>

app/src/main/res/values-nl/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">Updates</string>
     <string name="other">Overig</string>
     <string name="update_interval">Automatisch update-interval</string>
-    <string name="automatic_scan_wifi">Alleen via wifi</string>
-    <string name="automatic_scan_wifi_on">Update alleen automatisch op verbinding zonder datalimiet zoals wifi</string>
     <string name="notify">Toon beschikbare updates</string>
     <string name="notify_on">Toon een melding wanneer er updates beschikbaar zijn</string>
     <string name="system_installer">Systeemrechtenextensie</string>

app/src/main/res/values-pl/strings.xml

@@ -123,9 +123,6 @@
         usunięcie jej danych i ustawień)
     </string>
     <string name="update_interval">Okres pomiędzy sprawdzaniem aktualizacji</string>
-    <string name="automatic_scan_wifi">Aktualizuj tylko przez Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Aktualizuj listę aplikacji tylko przez nietaryfowe połączenia, np. Wi-Fi
-    </string>
     <string name="notify_on">Wyświetlaj powiadomienie gdy znalezione zostaną nowe aktualizacje</string>
     <string name="uninstall_system">Aktualizuj/odinstaluj uprzywilejowany dodatek F-Droida</string>
     <string name="uninstall_system_summary">Pokaż szczegóły uprzywilejowanego dodatku</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -12,9 +12,6 @@
     <string name="updates">Atualizações</string>
     <string name="other">Outros</string>
     <string name="update_interval">Intervalo de atualização automática</string>
-    <string name="automatic_scan_wifi">Apenas com Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Atualizar automaticamente apenas em redes com acesso ilimitado, como Wi-Fi
-    </string>
     <string name="notify">Mostras atualizações disponíveis</string>
     <string name="notify_on">Mostrar uma notificação quando atualizações estiverem disponíveis</string>
     <string name="system_installer">Extensão privilegiada</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -17,9 +17,6 @@
     <string name="other">Outro</string>
 
     <string name="update_interval">Intervalo de atualização automática</string>
-    <string name="automatic_scan_wifi">Apenas por Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Apenas atualizar a lista de aplicações se estiver ligado a redes Wi-Fi
-    </string>
     <string name="notify">Mostrar atualizações disponíveis</string>
     <string name="notify_on">Mostrar uma notificação se existirem atualizações disponíveis</string>
     <string name="system_installer">Extensão privilegiada</string>

app/src/main/res/values-ro/strings.xml

@@ -42,7 +42,6 @@
 
     <string name="enable_nfc_send">Activează trimiterea prin NFC…</string>
     <string name="update_interval">Interval actualizări automate</string>
-    <string name="automatic_scan_wifi">Doar prin Wi-Fi</string>
     <string name="unstable_updates">Actualizări instabile</string>
     <string name="login_name">Nume utilizator</string>
     <string name="login_password">Parola</string>
@@ -54,7 +53,6 @@
     <string name="repo_error_empty_username">Nume utilizator gol, autentificare neschimbată</string>
 
     <string name="repo_edit_credentials">Schimbă parola</string>
-    <string name="automatic_scan_wifi_on">Actualizează automat doar prin rețele necontorizate precum Wi-Fi</string>
     <string name="local_repo_name">Numele depozitului local</string>
     <string name="local_repo_name_summary">Titlu depozitului local folosit la anunțare: %s</string>
     <string name="notify_on">Arată o notificare atunci când există actualizări ale aplicațiilor</string>

app/src/main/res/values-ru/strings.xml

@@ -9,10 +9,6 @@
     <string name="updates">Обновления</string>
     <string name="other">Прочее</string>
     <string name="update_interval">Интервал автоматического обновления</string>
-    <string name="automatic_scan_wifi">Только по Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Обновлять автоматически только по нелимитированным соединениям (таким как
-        Wi-Fi)
-    </string>
     <string name="notify">Показывать доступные обновления</string>
     <string name="notify_on">Отображать уведомление когда есть обновления</string>
     <string name="system_installer">Привилегированное расширение</string>

app/src/main/res/values-sc/strings.xml

@@ -9,10 +9,6 @@
     <string name="updates">Agiornamentos</string>
     <string name="other">Àteru</string>
     <string name="update_interval">Intervallu agiornamentu automàticu</string>
-    <string name="automatic_scan_wifi">Cun su Wi-Fi ebbia</string>
-    <string name="automatic_scan_wifi_on">Agiorna automaticamente sa lista de sas aplicatziones petzi si b\'est su
-        wifi
-    </string>
     <string name="notify">Ammustra sos agiornamentos disponìbiles</string>
     <string name="notify_on">Averte cando bi sunt agiornamentos disponìbiles</string>
     <string name="system_installer">Estensione cun permissos de sistema</string>

app/src/main/res/values-sk/strings.xml

@@ -14,9 +14,6 @@
     <string name="updates">Obnovy</string>
     <string name="other">Iné</string>
     <string name="update_interval">Interval automat. aktualizácií</string>
-    <string name="automatic_scan_wifi">Iba cez Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Automaticky aktualizovať len na nespoplatnených sieťach, ako napr. Wi-Fi
-    </string>
     <string name="notify">Zobraziť dostupné aktualizácie</string>
     <string name="notify_on">Upozorniť na dostupnosť aktualizácií</string>
     <string name="system_installer">Ukladať balíky do vyr. pamäte</string>

app/src/main/res/values-sl/strings.xml

@@ -47,8 +47,6 @@
     <string name="other">Ostalo</string>
 
     <string name="update_interval">Interval samodejnega posodabljanja</string>
-    <string name="automatic_scan_wifi">Samo na Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Posodobi seznam aplikacij samo na Wi-Fi</string>
     <string name="notify_on">Prikaži obvestilo, ko so na voljo posodobitve</string>
 <string name="back">Nazaj</string>
     <string name="menu_settings">Nastavitve</string>

app/src/main/res/values-sn/strings.xml

@@ -11,8 +11,6 @@
         meF-Droid
     </string>
     <string name="update_interval">Chimirwa chakanatswa chiri automatic</string>
-    <string name="automatic_scan_wifi">Pamasaisai eWi-Fi chete</string>
-    <string name="automatic_scan_wifi_on">Natsa zviriautomatic pamasaisai asiri metered kunge Wi-Fi chete</string>
     <string name="update_auto_download">Tutunura zvekunatsa zviri automatic</string>
     <string name="update_auto_download_summary">Tutunura faira rekunatsa kuseri kwezvaurikuita iyezvino</string>
     <string name="update_auto_install">Vakirira zvekunatsa zviri automatic</string>

app/src/main/res/values-sq/strings.xml

@@ -13,7 +13,6 @@
     <string name="other">Tjetër</string>
 
     <string name="update_interval">Intervali i përditësimeve automatike</string>
-    <string name="automatic_scan_wifi">Vetëm me Wi-Fi</string>
     <string name="about_title">Rreth F-Droid</string>
     <string name="about_version">Verzioni:</string>
     <string name="about_source">Burimi i kodit:</string>
@@ -122,7 +121,6 @@
     <string name="keep_install_history_summary">Mbaje raportin e të gjitha instalimeve dhe çinstalimeve mbrenda F-Droid</string>
     <string name="force_old_index">Forcoje formën e vjetër të indeksit</string>
     <string name="force_old_index_summary">Në rast të gabimeve ose problemeve të pajtueshmërisë, përdoreni XML indeksin e aplikacioneve</string>
-    <string name="automatic_scan_wifi_on">Freskoje vetëm në rrjete të pamatura si Wi-Fi</string>
     <string name="update_auto_download">Merr freskimet automatikisht</string>
     <string name="update_auto_download_summary">Freskimet shkarkohen automatikisht dhe ti njoftohesh për të instaluar ato</string>
     <string name="update_auto_install">Automatikisht instaloje freskimet</string>

app/src/main/res/values-sr/strings.xml

@@ -11,8 +11,6 @@
     <string name="updates">Надоградње</string>
     <string name="other">Остало</string>
     <string name="update_interval">Међувреме самосталног освежавања</string>
-    <string name="automatic_scan_wifi">Само на бежичној мрежи</string>
-    <string name="automatic_scan_wifi_on">Самостално освежавање само на бесплатним мрежама као што је бежична</string>
     <string name="notify">Прикажи доступне надоградње</string>
     <string name="notify_on">Приказ обавештења о доступним надоградњама</string>
     <string name="system_installer">Повлашћено проширење</string>

app/src/main/res/values-sv/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">Uppdateringar</string>
     <string name="other">Andra</string>
     <string name="update_interval">Automatiskt uppdateringsintervall</string>
-    <string name="automatic_scan_wifi">Endast via Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Uppdatera endast automatiskt på obegränsade nätverk som Wi-Fi</string>
     <string name="notify">Visa tillgängliga uppdateringar</string>
     <string name="notify_on">Visa avisering när uppdateringar finns tillgängliga</string>
     <string name="system_installer">Privilegierad utökning</string>

app/src/main/res/values-ta/strings.xml

@@ -10,8 +10,6 @@
     <string name="unstable_updates">உறுதியற்ற மேம்பாடுகள்</string>
     <string name="other">பிற</string>
 
-    <string name="automatic_scan_wifi">Wi-Fi-யில் மட்டும்</string>
-    <string name="automatic_scan_wifi_on">செயலி பட்டியலை Wi-Fi-யில் மட்டும் தானாக புதுப்பி</string>
     <string name="update_auto_download">மேம்பாடுகளை தானாக தறவிறக்கு</string>
     <string name="notify">மேம்படுத்தலுக்கான அறிவிப்புகள்</string>
     <string name="notify_on">மேம்படுத்தல்கள் கிடைக்கப்பெறும் பொழுது அறிவிப்புகளை காண்பி</string>

app/src/main/res/values-th/strings.xml

@@ -10,7 +10,6 @@
     <string name="other">อื่นๆ</string>
 
     <string name="update_interval">อัพเดตข้อมูลอัตโนมัติทุกๆ</string>
-    <string name="automatic_scan_wifi">เฉพาะตอนมีสัญญาณ WiFi</string>
     <string name="update_auto_download">ดาวน์โหลดอัพเดตโดยอัตโนมัติ</string>
     <string name="local_repo_name">ชื่อที่ตั้งให้แหล่งโปรแกรมจากเครื่องคุณ</string>
     <string name="login_name">ชื่อผู้ใช้</string>
@@ -241,7 +240,6 @@
     <string name="updates">อัพเดต</string>
     <string name="unstable_updates">อัพเดตที่ไม่เสถียร</string>
     <string name="unstable_updates_summary">แนะนำการอัพเดตไปรุ่นที่ไม่เสถียร</string>
-    <string name="automatic_scan_wifi_on">อัพเดตข้อมูลรายการโปรแกรมเฉพาะตอนที่ใช้ WiFi</string>
     <string name="update_auto_download_summary">ทำการดาวน์โหลดอัพเดตโปรแกรมแบบเบื้องหลัง</string>
     <string name="notify">การแจ้งเตือนอัพเดต</string>
     <string name="notify_on">แสดงการแจ้งเตือนเมื่อมีอัพเดตให้ดาวน์โหลด</string>

app/src/main/res/values-tr/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">Güncellemeler</string>
     <string name="other">Diğer</string>
     <string name="update_interval">Kendiliğinden güncelleme aralığı</string>
-    <string name="automatic_scan_wifi">Yalnızca Wi-Fi ile</string>
-    <string name="automatic_scan_wifi_on">Yalnızca Wi-Fi gibi ölçümsüz ağlarda kendiliğinden güncelle</string>
     <string name="notify">Kullanılabilir güncellemeleri göster</string>
     <string name="notify_on">Güncellemeler varsa bir bildirim göster</string>
     <string name="system_installer">Ayrıcalıklı Uzantı</string>

app/src/main/res/values-ug/strings.xml

@@ -10,7 +10,6 @@
     <string name="cache_downloaded">ئەپلەر غەملەككە چۈشۈرۈلدى</string>
     <string name="updates">يېڭىلانمىلار</string>
     <string name="other">باشقا</string>
-    <string name="automatic_scan_wifi">wifi دىلا</string>
     <string name="notify">ئۇقتۇرۇش</string>
     <string name="app_details">ئەپ تەپسىلاتلىرى</string>
     <string name="no_such_app">بۇنداق ئەپ تېپىلمىدى</string>

app/src/main/res/values-uk/strings.xml

@@ -38,8 +38,6 @@
     <string name="delete">Видалити</string>
     <string name="other">Інше</string>
     <string name="update_interval">Інтервал автооновлення</string>
-    <string name="automatic_scan_wifi">Тільки через Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Автоматично оновлювати тільки через нелімітовані мережі, такі як Wi-Fi</string>
     <string name="notify_on">Показувати сповіщення коли є доступні оновлення</string>
     <string name="system_installer">Привілейоване розширення</string>
     <string name="system_installer_on">Використовувати привілейоване розширення F-Droid для встановлення, оновлення та

app/src/main/res/values-ur/strings.xml

@@ -19,8 +19,6 @@
     <string name="other">دیگر</string>
 
     <string name="update_interval">خودکار تازہ کاری کرنے کا وقفہ</string>
-    <string name="automatic_scan_wifi">صرف وائی فائی پر</string>
-    <string name="automatic_scan_wifi_on">اپلی کیشن کی فہرست صرف وائی فائی پر خود بخود اپڈیٹ کریں</string>
     <string name="notify">تازہ کاریوں کی اطلاعات</string>
     <string name="notify_on">اگر تازہ کاری دستیاب ہیں تو اطلاع دیں</string>
     <string name="system_installer">پریولجڈ ایکس ٹینشن</string>

app/src/main/res/values-vi/strings.xml

@@ -11,8 +11,6 @@
     <string name="updates">Cập nhật</string>
     <string name="other">Khác</string>
     <string name="update_interval">Tự động cập nhật định kì</string>
-    <string name="automatic_scan_wifi">Chỉ khi dùng Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">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</string>
     <string name="notify">Hiện các bản cập nhật có sẵn</string>
     <string name="notify_on">Hiện thông báo khi có bản cập nhật</string>
     <string name="system_installer">Phần mở rộng được cấp quyền</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -9,8 +9,6 @@
     <string name="updates">更新</string>
     <string name="other">其他</string>
     <string name="update_interval">自动更新频率</string>
-    <string name="automatic_scan_wifi">仅在Wi-Fi上</string>
-    <string name="automatic_scan_wifi_on">仅在使用 Wi-Fi 等非计量网络时自动更新</string>
     <string name="notify">显示可用更新</string>
     <string name="notify_on">应用可供更新时显示通知</string>
     <string name="system_installer">特权扩展</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -7,8 +7,6 @@
     <string name="updates">更新</string>
     <string name="other">其他</string>
     <string name="update_interval">自動更新頻率</string>
-    <string name="automatic_scan_wifi">只透過 Wi-Fi 更新</string>
-    <string name="automatic_scan_wifi_on">只在使用如 Wi-Fi 等沒有限流量的連線時自動更新</string>
     <string name="notify">顯示可更新的應用程式</string>
     <string name="notify_on">應用程式發佈更新時通知我</string>
     <string name="system_installer">系統權限套件</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -14,8 +14,6 @@
     <string name="other">其它設定</string>
 
     <string name="update_interval">自動更新間隔</string>
-    <string name="automatic_scan_wifi">僅使用 Wi-Fi 更新</string>
-    <string name="automatic_scan_wifi_on">僅在未計量的網路例如 Wi-Fi 上自動更新</string>
     <string name="notify">顯示可用的更新</string>
     <string name="notify_on">當有可用更新時顯示通知</string>
     <string name="local_repo_name">本地端軟體庫名稱</string>

app/src/main/res/values/strings.xml

@@ -23,8 +23,11 @@
     <string name="other">Other</string>
 
     <string name="update_interval">Automatic update interval</string>
-    <string name="automatic_scan_wifi">Only on Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Only update automatically on unmetered networks like Wi-Fi</string>
+    <string name="over_wifi">Over Wi-Fi</string>
+    <string name="over_data">Over data</string>
+    <string name="over_network_always_summary">Always use this connection when available</string>
+    <string name="over_network_on_demand_summary">Only use this connection when I click to download</string>
+    <string name="over_network_never_summary">Never download anything using this connection</string>
     <string name="update_auto_download">Automatically fetch updates</string>
     <string name="update_auto_download_summary">Updates are downloaded automatically and you are notified to install
         them

app/src/main/res/xml/preferences.xml

@@ -28,18 +28,22 @@
 
     <android.support.v7.preference.PreferenceCategory android:title="@string/updates">
         <android.support.v7.preference.SeekBarPreference
-                android:key="updateIntervalSeekBarPosition"
-                android:title="@string/update_interval"
+                android:key="overWifi"
+                android:title="@string/over_wifi"
+                android:layout="@layout/preference_seekbar"/>
+        <android.support.v7.preference.SeekBarPreference
+                android:key="overData"
+                android:title="@string/over_data"
                 android:layout="@layout/preference_seekbar"/>
-        <android.support.v7.preference.CheckBoxPreference
-                android:title="@string/only_on_wifi"
-                android:defaultValue="false"
-                android:key="updateOnWifiOnly"/>
         <SwitchPreference
                 android:title="@string/update_auto_download"
                 android:summary="@string/update_auto_download_summary"
                 android:defaultValue="false"
                 android:key="updateAutoDownload"/>
+        <android.support.v7.preference.SeekBarPreference
+                android:key="updateIntervalSeekBarPosition"
+                android:title="@string/update_interval"
+                android:layout="@layout/preference_seekbar"/>
         <SwitchPreference
                 android:title="@string/notify"
                 android:defaultValue="true"