diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java index 3dafc61fe..1b405784b 100644 --- a/app/src/main/java/org/fdroid/fdroid/Preferences.java +++ b/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); } /** diff --git a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java index 6ed519855..9fbb8c28a 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java +++ b/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 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 b5478c086..e02dd0dc9 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 @@ -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: diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 3db20ee92..6ec51fa07 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -15,9 +15,6 @@ Ander Automatiese opdaterings interval - Slegs op Wi-Fi - Opdateer slegs automaties wanneer gekoppel aan ongemete netwerke soos Wi-Fi - Automatise opdaterings Opdateerings word outomaties afgelaai en jy word in kennis gestel om dit self te installeer Installeer opdaterings automaties diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index bf448548b..f277f63a4 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -67,10 +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 acc435d9c..d89e4c0a0 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -9,8 +9,6 @@ Anovamientos Otru Intervalu automáticu d\'anovamientu - Namái na Wi-Fi - Auto-anovar namái en redes non midíes como Wi-Fi Ver los anovamientos disponibles Amuesa un avisu cuando tán disponibles anovamientos Estensión con privilexos diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 60812f0ad..ea3eaa5a8 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -19,8 +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 416f4f19d..8ceeb1ad7 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -12,10 +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 83fdc0f78..68a3f10fc 100644 --- a/app/src/main/res/values-bo/strings.xml +++ b/app/src/main/res/values-bo/strings.xml @@ -85,8 +85,6 @@ གཞན། རང་འགུལ་ངང་ནས་གསར་བསྒྱུར་བར་མཚམས། - ཝཡེ་ཕྷཡེ་ཁོ་ནའི་སྒང་ལ། - ཝཡེ་ཕཡེ་ལྟ་བུ་ཚད་འཇལ་མི་ཐུབ་པའི་རིགས་ལ་རང་འགུལ་གྱི་གསར་བསྒྱུར་ཁོ་ན་བྱེད་དགོས། རང་འགུལ་ངང་ནས་གསར་བསྒྱར་ལེན། རང་འགུལ་གྱི་ངང་ནས་གསར་བསྒྱུར་དང་ཕབ་ལེན་བྱས་པ་དང་ཁྱེད་རང་ལ་བརྡ་ལན་འབྱོར་སྐབས་དེ་དག་འགྲིག་བཅུག་བྱེད། རང་འགུལ་གྱི་ཐོག་ནས་གསར་བསྒྱུར་རྣམས་འགྲིག་བཅུག་བྱེད། diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 7f1810a45..e33f703b1 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -8,8 +8,6 @@ Actualitzacions Altres Període d\'actualització automàtica - 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 Ensenya una notificació quan hi hagi actualitzacions disponibles Extensió Privilegiada diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7bbbe6792..5d4da6331 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -8,9 +8,6 @@ Aktualizace Ostatní Interval automatických aktualizací - Pouze přes Wi-Fi - Automaticky aktualizovat jen na nezpoplatněných sítích, jako např. Wi-Fi - Zobrazit dostupné aktualizace Upozornit, pokud jsou dostupné aktualizace Privilegovaná rozšíření diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index cbb817057..4e3864c0f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -14,8 +14,6 @@ Andet Automatisk opdateringsinterval - Kun på Wi-Fi - Opdater kun automatisk på ubegrænsede netværk som WI-FI Vis tilgængelige opdateringer Vis en notifikation når opdateringer er tilgængelige Privilegeret Udvidelse diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 95f8f3a4b..b58ec41bf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -9,10 +9,6 @@ Aktualisierungen Andere Automatisches Aktualisierungsintervall - Nur über WLAN - Anwendungsliste nur über gebührenfreie Netze wie WLAN automatisch - aktualisieren - Aktualisierungsbenachrichtigung Benachrichtigen, wenn Aktualisierungen verfügbar sind Rechteerweiterung diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 173781866..dae391b68 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -9,8 +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 69de26503..9732e03f2 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -4,7 +4,6 @@ Forigi Ĝisdatigoj Aliaj - Nur per vifio Montri disponeblajn ĝisdatigojn Sciigi kiam ĝisdatigoj estas disponeblaj Aplikaĵaj detaloj @@ -99,7 +98,6 @@ Aktivigi sendadon tra NFC… Kaŝmemorigi apk-dosierojn Proponi ĝisdatigojn al nestabilaj versioj - Ĝ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 496c8e8bb..89a6f8a07 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -9,9 +9,6 @@ Avisos Otros Intervalo de actualización automática - Sólo con Wi-Fi - Actualizar automáticamente solo con Wi-Fi y otras redes de tarifa plana - Mostrar actualizaciones disponibles Muestra una notificación cuando hay actualizaciones Extensión con permisos de sistema diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 07318ab99..dbfae9551 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -14,8 +14,6 @@ Muu Automaatne värskendusintervall - Ainult Wi-Fi ühendusega - Värskenda rakenduste loendit automaatselt piiramatu andmemahuga võrkudes nagu Wi-Fi Värskenduste automaatne hankimine Värskendused laaditakse automaatselt ja sind teavitatakse, et neid paigaldada Kuva saadaolevad värskendused diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 10eddaea8..a4af244b0 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -9,10 +9,6 @@ Gaitu NFC bidez bidaltzea… Gorde aplikazioak cachean Eguneraketak - Wi-Fi bidez soilik - Eguneratu aplikazioen zerrendak automatikoki Wi-Fi bezalako mugatu gabeko - sareen bidez soilik - Erakutsi eguneraketa eskuragarriak Bistarazi jakinarazpena eguneraketak eskuragarri daudenean Aplikazioaren xehetasunak diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 69f17b6d8..2bd8f5d84 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -6,8 +6,6 @@ به‌روزرسانی‌ها دیگر به‌روزرسانی دوره‌ای خودکار - فقط روی وای‌فای - به‌روز رسانی خودکار فقط روی شبکه‌های اندازه‌گیری نشده مثل وای‌فای نمایش یک اعلان هنگام موجود بودن به‌روز رسانی‌ها چنین کاره‌ای پیدا نشد. دربارهٔ F-Droid diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index db3c1b7cc..9d273e44d 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -9,8 +9,6 @@ Päivitykset Muu Automaattisen päivityksen tiheys - Vain Wi-Fi -yhteydellä - Päivitä automaattisesti vain rajoittamattomissa verkoissa, kuten Wi-Fi Päivitysimoitukset Näytä iIlmoitus, kun päivityksiä on saatavilla Etuoikeutettu laajennus diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index be4c0287f..f0cf51f98 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -9,8 +9,6 @@ Mises à jour Autres Intervalle de mise à jour automatique - Uniquement via Wi-Fi - Mise à jour automatique uniquement sur des réseaux sans restriction, comme le Wi-Fi Afficher les mises à jour disponibles Afficher une notification quand des mises à jour sont disponibles Permissions étendues diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index a0cf754d4..7f20f3d52 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -6,7 +6,6 @@ Manter apps na caché Actualizacións Outro - Só mediante wifi Amosar actualizacións disponíbeis Detalles da ap Non se atopou ese aplicativo. @@ -64,7 +63,6 @@ Activar envío NFC… Actualizacións inestables Intervalo de actualización automática - Actualizar automáticamente só en redes con acceso ilimitado, como as Wi-Fi Amosar unha notificación cando hai actualizacións dispoñibles Utiliza F-Droid Privileged Extension para instalar, actualizar e eleminar paquetes diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index bc106a1a0..e52efa120 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -9,8 +9,6 @@ אחר תדירות עדכון אוטומטי - רק על גבי רשת אלחוטית - עדכון רשימות יישומונים אוטומטית רק על גבי רשת אלחוטית הצגת עדכונים זמינים הצגת התרעה כאשר יש עדכונים הרחבה מועדפת diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 85bf55e4d..c6e90646f 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -9,8 +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 096465b58..0fa66975d 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -19,8 +19,6 @@ Ostalo Interval automatskog ažuriranja - Samo na Wi-Fi - Ažuriraj popis aplikacija automatski samo na Wi-Fi Automatski preuzmi ažuriranja Preuzmi datoteke ažuriranja u pozadini Obavijesti ažuriranja diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 01c7a2164..5383b8cb9 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -7,8 +7,6 @@ Frissítések Egyéb Automatikus frissítés időköze - 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 Értesítés megjelenítése, ha frissítés érhető el Alkalmazás részletei diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml index e3e79a05a..4e320f6f2 100644 --- a/app/src/main/res/values-hy/strings.xml +++ b/app/src/main/res/values-hy/strings.xml @@ -135,7 +135,6 @@ Տեղադրել Պահել տեղադրման և ապատեղադրման լոգերը F-Droidում - Միայն Wi-Fiով Թարմացման ծանուցումներ Երբ թարմացում է հասանելի՝ ցույց տալ ծանուցում Այդպիսի ափփ չի գտնվել diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index c078e0c39..26a376ded 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -13,9 +13,6 @@ Lainnya Selang waktu pembaruan otomatis - Hanya pada Wi-Fi - Hanya perbarui secara otomatis pada jaringan tak terbatas seperti Wi-Fi - Tampilkan pembaruan yang tersedia Beri tahu jika pembaruan aplikasi tersedia Gunakan F-Droid Privileged Extension untuk memasang, memperbarui, dan mencopot diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 3ef53a5c5..eaae1bc3d 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -12,7 +12,6 @@ Annað Bil milli sjálfvirkra uppfærslna - Aðeins á þráðlausu neti Ná sjálfkrafa í uppfærslur Sækja uppfærsluskrárnar í bakgrunni og þú færð tilkynningu um að setja þær upp Setja uppfærslur upp sjálfkrafa @@ -264,9 +263,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. - Einungis uppfæra sjálfvirkt þegar tengst er kostnaðarlausum netkerfum á borð - við Wi-Fi netum - Nota forgangsviðbót F-Droid (privileged extension) til að setja upp, uppfæra og fjarlægja pakka diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 64663591d..299868716 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -12,8 +12,6 @@ Aggiornamenti Altro Intervallo degli aggiornamenti automatici - Solo via Wi-Fi - Aggiorna automaticamente gli elenchi applicazioni solo via Wi-Fi Mostra aggiornamenti disponibili Mostra una notifica quando sono disponibili aggiornamenti Estensione priviliegiata diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e5c1e79c7..1971078c0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -9,8 +9,6 @@ アップデート その他 自動更新の間隔 - Wi-Fi接続時のみ - Wi-Fiなどの従量課金制ではないネットワークのみで自動更新を行います 利用可能な更新を表示 アップデートが利用可能になると通知を表示します 特権拡張機能 diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 6af7e20b4..e131678fb 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -201,7 +201,6 @@ Rmed Tuzna NFC … Ileqman ur yerkiden ara Ḥrez amazray n usebded - Ala γef Wi-Fi Sken ileqman yellan Isiγzaf Yettwasirgen Leqqem/Kkes asiγzef yettwasirgen diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7ec2216a2..9a076096a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -9,8 +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 7ec6205d3..03c0d33ad 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -6,7 +6,6 @@ Atnaujinimai Kita Automatinis programų sąrašų naujinimas - Tik prisijungus prie belaidžio (WiFi) Informuoti Pranešti, kai atsiras atnaujinimų Šio įrenginio saugyklos pavadinimas diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index ad0158595..dbc943ed0 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -7,8 +7,6 @@ Atjauninājumi Cits Automātisko atjauninājumu intervāls - Tikai pa Wi-Fi - Atjaunināt automātiski tikai tīklos bez limitiem, kā, piemēram, Wi-Fi Parādīt pieejamos atjauninājumus Ziņot, kad atjauninājumi pieejami Priviliģētais Pievienojums diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index cfe9eaad1..8bcd4056e 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -20,5 +20,4 @@ Други Автоматско ажурирање временски интервал - Само на Wi-Fi diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 57086c1da..5be46bee0 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -93,8 +93,6 @@ മറ്റുള്ളവ സ്വതവേ പുതുക്കലിന്റെ ഇടവേള - വൈ-ഫൈ യിൽ മാത്രം - വൈഫൈ പോലെ പരിധിയില്ലാത്ത ശൃഖലകളിൽ മാത്രം സ്വതവേ പുതുക്കുക പുതുക്കലുകള്‍ സ്വതവേ ലഭ്യമാക്കുക പുതുക്കലുകള്‍ സ്വതവേ ഡൗൺലോഡ് ചെയ്യുകയും അവ സ്ഥാപിക്കാന്‍ നിങ്ങളെ വിവരം അറിയിക്കുകയും ചെയ്യുക പുതുക്കലുകള്‍ സ്വതവേ സ്ഥാപിക്കുക diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index 97f175cd2..4eb88bdcd 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -17,8 +17,6 @@ တျခား အလိုအေလ်ာက္ အသစ္မြမ္းမံမႈ interval - ဝိုင္ဖိုင္ျဖင့္သာ - ဝိုင္ဖိုင္ျဖင့္သာ app စာရင္းမ်ားကိုအလိုအေလ်ာက္ျပဳလုပ္မည္ အသစ္မြမ္းမံမႈမ်ားကိုအလိုအေလ်ာက္ေဒါင္းလုတ္ဆြဲမည္ အေနာက္ပိုင္းတြင္ အသစ္မြမ္းမံမႈမ်ားကိုေဒါင္းလုတ္ဆြဲမည္ အသစ္မြမ္းမံမႈ အသိေပးခ်က္မ်ား diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 9d160f3c9..e78551098 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -8,8 +8,6 @@ Oppdateringer Andre Intervall for automatisk oppdatering - Bare på trådløst - Bare oppdater automatisk når tilknyttet Wi-Fi Vis tilgjengelig oppdateringer Varsle når nye oppdateringer er tilgjengelige Priviligert tillegg diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml index f99dda3bf..7fdc9bc8b 100644 --- a/app/src/main/res/values-nl-rBE/strings.xml +++ b/app/src/main/res/values-nl-rBE/strings.xml @@ -95,8 +95,6 @@ Overig Automatisch update-interval - Alleen via wifi - Alleen automatisch bijwerken op verbindingen zonder datalimiet gelijk wifi Download updates automatisch Updates worden automatisch gedownload in de achtergrond en der wordt een melding weergegeven voor ze te installeren Installeer updates automatisch diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index aba233e32..e92128f54 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -9,8 +9,6 @@ Updates Overig Automatisch update-interval - Alleen via wifi - Update alleen automatisch op verbinding zonder datalimiet zoals wifi Toon beschikbare updates Toon een melding wanneer er updates beschikbaar zijn Systeemrechtenextensie diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 697089591..ca382946a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -123,9 +123,6 @@ usunięcie jej danych i ustawień) Okres pomiędzy sprawdzaniem aktualizacji - Aktualizuj tylko przez Wi-Fi - Aktualizuj listę aplikacji tylko przez nietaryfowe połączenia, np. Wi-Fi - Wyświetlaj powiadomienie gdy znalezione zostaną nowe aktualizacje Aktualizuj/odinstaluj uprzywilejowany dodatek F-Droida Pokaż szczegóły uprzywilejowanego dodatku diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4100c8848..e93d3c90d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -12,9 +12,6 @@ Atualizações Outros Intervalo de atualização automática - Apenas com Wi-Fi - Atualizar automaticamente apenas em redes com acesso ilimitado, como Wi-Fi - Mostras atualizações disponíveis Mostrar uma notificação quando atualizações estiverem disponíveis Extensão privilegiada diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 4d38fa60d..4744ce870 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -17,9 +17,6 @@ Outro Intervalo de atualização automática - Apenas por Wi-Fi - Apenas atualizar a lista de aplicações se estiver ligado a redes Wi-Fi - Mostrar atualizações disponíveis Mostrar uma notificação se existirem atualizações disponíveis Extensão privilegiada diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index f4d6039a4..9492680e2 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -42,7 +42,6 @@ Activează trimiterea prin NFC… Interval actualizări automate - Doar prin Wi-Fi Actualizări instabile Nume utilizator Parola @@ -54,7 +53,6 @@ Nume utilizator gol, autentificare neschimbată Schimbă parola - Actualizează automat doar prin rețele necontorizate precum Wi-Fi Numele depozitului local Titlu depozitului local folosit la anunțare: %s Arată o notificare atunci când există actualizări ale aplicațiilor diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6ed1eae8c..9c44b9c01 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -9,10 +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 c19f69536..eeac107af 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -9,10 +9,6 @@ Agiornamentos Àteru Intervallu agiornamentu automàticu - Cun su Wi-Fi ebbia - Agiorna automaticamente sa lista de sas aplicatziones petzi si b\'est su - wifi - Ammustra sos agiornamentos disponìbiles Averte cando bi sunt agiornamentos disponìbiles Estensione cun permissos de sistema diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 21379fbde..c5b96c18b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -14,9 +14,6 @@ Obnovy Iné Interval automat. aktualizácií - Iba cez Wi-Fi - Automaticky aktualizovať len na nespoplatnených sieťach, ako napr. Wi-Fi - Zobraziť dostupné aktualizácie Upozorniť na dostupnosť aktualizácií Ukladať balíky do vyr. pamäte diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 22e9cd234..e737f7314 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -47,8 +47,6 @@ Ostalo Interval samodejnega posodabljanja - Samo na Wi-Fi - Posodobi seznam aplikacij samo na Wi-Fi Prikaži obvestilo, ko so na voljo posodobitve Nazaj Nastavitve diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml index 066b77bb5..4f52a9cfa 100644 --- a/app/src/main/res/values-sn/strings.xml +++ b/app/src/main/res/values-sn/strings.xml @@ -11,8 +11,6 @@ meF-Droid Chimirwa chakanatswa chiri automatic - Pamasaisai eWi-Fi chete - Natsa zviriautomatic pamasaisai asiri metered kunge Wi-Fi chete Tutunura zvekunatsa zviri automatic Tutunura faira rekunatsa kuseri kwezvaurikuita iyezvino Vakirira zvekunatsa zviri automatic diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index f63c7790f..b8c61bd0f 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -13,7 +13,6 @@ Tjetër Intervali i përditësimeve automatike - Vetëm me Wi-Fi Rreth F-Droid Verzioni: Burimi i kodit: @@ -122,7 +121,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 - Freskoje vetëm në rrjete të pamatura si Wi-Fi Merr freskimet automatikisht Freskimet shkarkohen automatikisht dhe ti njoftohesh për të instaluar ato Automatikisht instaloje freskimet diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 4aa3f40d1..84ee88ec2 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -11,8 +11,6 @@ Надоградње Остало Међувреме самосталног освежавања - Само на бежичној мрежи - Самостално освежавање само на бесплатним мрежама као што је бежична Прикажи доступне надоградње Приказ обавештења о доступним надоградњама Повлашћено проширење diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 9ff0dfe42..8f67a7cf4 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -9,8 +9,6 @@ Uppdateringar Andra Automatiskt uppdateringsintervall - Endast via Wi-Fi - Uppdatera endast automatiskt på obegränsade nätverk som Wi-Fi Visa tillgängliga uppdateringar Visa avisering när uppdateringar finns tillgängliga Privilegierad utökning diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 3a7d8cc5f..74a9d8cce 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -10,8 +10,6 @@ உறுதியற்ற மேம்பாடுகள் பிற - Wi-Fi-யில் மட்டும் - செயலி பட்டியலை Wi-Fi-யில் மட்டும் தானாக புதுப்பி மேம்பாடுகளை தானாக தறவிறக்கு மேம்படுத்தலுக்கான அறிவிப்புகள் மேம்படுத்தல்கள் கிடைக்கப்பெறும் பொழுது அறிவிப்புகளை காண்பி diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index f6ae4761f..657e97b8b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -10,7 +10,6 @@ อื่นๆ อัพเดตข้อมูลอัตโนมัติทุกๆ - เฉพาะตอนมีสัญญาณ WiFi ดาวน์โหลดอัพเดตโดยอัตโนมัติ ชื่อที่ตั้งให้แหล่งโปรแกรมจากเครื่องคุณ ชื่อผู้ใช้ @@ -241,7 +240,6 @@ อัพเดต อัพเดตที่ไม่เสถียร แนะนำการอัพเดตไปรุ่นที่ไม่เสถียร - อัพเดตข้อมูลรายการโปรแกรมเฉพาะตอนที่ใช้ WiFi ทำการดาวน์โหลดอัพเดตโปรแกรมแบบเบื้องหลัง การแจ้งเตือนอัพเดต แสดงการแจ้งเตือนเมื่อมีอัพเดตให้ดาวน์โหลด diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 2f8390cee..a9a186b96 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -9,8 +9,6 @@ Güncellemeler Diğer Kendiliğinden güncelleme aralığı - 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 Güncellemeler varsa bir bildirim göster Ayrıcalıklı Uzantı diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml index a9e242f83..f3ddee1b6 100644 --- a/app/src/main/res/values-ug/strings.xml +++ b/app/src/main/res/values-ug/strings.xml @@ -10,7 +10,6 @@ ئەپلەر غەملەككە چۈشۈرۈلدى يېڭىلانمىلار باشقا - wifi دىلا ئۇقتۇرۇش ئەپ تەپسىلاتلىرى بۇنداق ئەپ تېپىلمىدى diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5273b0eca..bc11a231d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -38,8 +38,6 @@ Видалити Інше Інтервал автооновлення - Тільки через Wi-Fi - Автоматично оновлювати тільки через нелімітовані мережі, такі як Wi-Fi Показувати сповіщення коли є доступні оновлення Привілейоване розширення Використовувати привілейоване розширення F-Droid для встановлення, оновлення та diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 2657202a3..681a3cbbd 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -19,8 +19,6 @@ دیگر خودکار تازہ کاری کرنے کا وقفہ - صرف وائی فائی پر - اپلی کیشن کی فہرست صرف وائی فائی پر خود بخود اپڈیٹ کریں تازہ کاریوں کی اطلاعات اگر تازہ کاری دستیاب ہیں تو اطلاع دیں پریولجڈ ایکس ٹینشن diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 83f086283..1c23f07b1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -11,8 +11,6 @@ Cập nhật Khác Tự động cập nhật định kì - 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 Hiện thông báo khi có bản cập nhật Phần mở rộng được cấp quyền diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 789dfd21a..9f627641c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -9,8 +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 72bd6fec0..8436ca84e 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -7,8 +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 7d736fd01..513341a50 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -14,8 +14,6 @@ 其它設定 自動更新間隔 - 僅使用 Wi-Fi 更新 - 僅在未計量的網路例如 Wi-Fi 上自動更新 顯示可用的更新 當有可用更新時顯示通知 本地端軟體庫名稱 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ca2dd8636..f8181bc7f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,8 +23,11 @@ Other Automatic update interval - Only on Wi-Fi - Only update automatically on unmetered networks like Wi-Fi + Over Wi-Fi + Over data + Always use this connection when available + Only use this connection when I click to download + Never download anything using this connection Automatically fetch updates Updates are downloaded automatically and you are notified to install them diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 66bee0892..efe9b853b 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -28,18 +28,22 @@ + - +