NetworkPreferences: Simplify proxy setup yet again

* Allow to view and edit proxy URL without turning it off and on
* Add a new disable button in proxy dialog
* Trim whitespace and disallow new lines in the proxy URL field
* Disable buttons when not applicable

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>

app/src/main/java/com/aurora/store/data/network/OkHttpClientModule.kt

@@ -27,7 +27,6 @@ import com.aurora.store.R
 import com.aurora.store.data.model.Algorithm
 import com.aurora.store.data.model.ProxyInfo
 import com.aurora.store.util.Preferences
-import com.aurora.store.util.Preferences.PREFERENCE_PROXY_ENABLED
 import com.aurora.store.util.Preferences.PREFERENCE_PROXY_INFO
 import com.google.gson.Gson
 import dagger.Module
@@ -97,10 +96,8 @@ object OkHttpClientModule {
     @Provides
     @Singleton
     fun providesProxyInstance(@ApplicationContext context: Context, gson: Gson): Proxy? {
-        val proxyEnabled = Preferences.getBoolean(context, PREFERENCE_PROXY_ENABLED)
         val proxyInfoString = Preferences.getString(context, PREFERENCE_PROXY_INFO)
-
+        if (proxyInfoString.isNotBlank() && proxyInfoString != "{}") {
-        if (proxyEnabled && proxyInfoString.isNotBlank() && proxyInfoString != "{}") {
             val proxyInfo = gson.fromJson(proxyInfoString, ProxyInfo::class.java)
 
             val proxy = Proxy(

app/src/main/java/com/aurora/store/util/Preferences.kt

@@ -46,7 +46,6 @@ object Preferences {
 
     const val PREFERENCE_PROXY_URL = "PREFERENCE_PROXY_URL"
     const val PREFERENCE_PROXY_INFO = "PREFERENCE_PROXY_INFO"
-    const val PREFERENCE_PROXY_ENABLED = "PREFERENCE_PROXY_ENABLED"
 
     const val PREFERENCE_MICROG_AUTH = "PREFERENCE_MICROG_AUTH"
 

app/src/main/java/com/aurora/store/view/ui/preferences/NetworkPreference.kt

@@ -19,7 +19,6 @@
 
 package com.aurora.store.view.ui.preferences
 
-import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
@@ -32,26 +31,17 @@ import com.aurora.store.R
 import com.aurora.store.util.PackageUtil
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_MICROG_AUTH
-import com.aurora.store.util.Preferences.PREFERENCE_PROXY_ENABLED
-import com.aurora.store.util.Preferences.PREFERENCE_PROXY_INFO
 import com.aurora.store.util.Preferences.PREFERENCE_PROXY_URL
-import com.aurora.store.util.remove
+import com.aurora.store.util.Preferences.PREFERENCE_VENDING_VERSION
 import com.aurora.store.util.save
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class NetworkPreference : BasePreferenceFragment(),
+class NetworkPreference : BasePreferenceFragment() {
-    SharedPreferences.OnSharedPreferenceChangeListener {
-
-    private lateinit var sharedPreferences: SharedPreferences
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preferences_network, rootKey)
 
-        val proxyURL = Preferences.getString(requireContext(), PREFERENCE_PROXY_URL)
-        sharedPreferences = Preferences.getPrefs(requireContext())
-        sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-
         findPreference<Preference>(Preferences.PREFERENCE_DISPENSER_URLS)?.apply {
             setOnPreferenceClickListener {
                 findNavController().navigate(R.id.dispenserFragment)
@@ -59,27 +49,14 @@ class NetworkPreference : BasePreferenceFragment(),
             }
         }
 
-        findPreference<Preference>(PREFERENCE_PROXY_URL)?.apply {
+        findPreference<Preference>(PREFERENCE_PROXY_URL)?.setOnPreferenceClickListener { _ ->
-            if (proxyURL.isNotBlank()) summary = proxyURL
+            findNavController().navigate(R.id.proxyURLDialog)
+            false
         }
 
-        findPreference<SwitchPreferenceCompat>(PREFERENCE_PROXY_ENABLED)?.apply {
+        findPreference<Preference>(PREFERENCE_VENDING_VERSION)?.let {
-            isChecked = proxyURL.isNotBlank()
-            setOnPreferenceChangeListener { _, newValue ->
-                if (newValue.toString().toBoolean()) {
-                    findNavController().navigate(R.id.proxyURLDialog)
-                } else {
-                    remove(PREFERENCE_PROXY_URL)
-                    remove(PREFERENCE_PROXY_INFO)
-                    findNavController().navigate(R.id.forceRestartDialog)
-                }
-                false
-            }
-        }
-
-        findPreference<Preference>(Preferences.PREFERENCE_VENDING_VERSION)?.let {
             it.setOnPreferenceChangeListener { _, newValue ->
-                save(Preferences.PREFERENCE_VENDING_VERSION, Integer.parseInt(newValue.toString()))
+                save(PREFERENCE_VENDING_VERSION, Integer.parseInt(newValue.toString()))
                 runOnUiThread {
                     requireContext().toast(R.string.insecure_anonymous_apply)
                 }
@@ -98,16 +75,4 @@ class NetworkPreference : BasePreferenceFragment(),
             setNavigationOnClickListener { findNavController().navigateUp() }
         }
     }
-
-    override fun onDestroyView() {
-        sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
-        super.onDestroyView()
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        if (key == PREFERENCE_PROXY_URL) {
-            findPreference<SwitchPreferenceCompat>(PREFERENCE_PROXY_ENABLED)?.isChecked =
-                Preferences.getString(requireContext(), PREFERENCE_PROXY_URL).isNotBlank()
-        }
-    }
 }

app/src/main/java/com/aurora/store/view/ui/preferences/ProxyURLDialog.kt

@@ -1,10 +1,10 @@
 package com.aurora.store.view.ui.preferences
 
-import android.annotation.SuppressLint
-import android.app.AlertDialog
 import android.app.Dialog
 import android.os.Bundle
 import android.view.WindowManager
+import androidx.appcompat.app.AlertDialog
+import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -15,6 +15,7 @@ import com.aurora.store.util.CommonUtil
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_PROXY_INFO
 import com.aurora.store.util.Preferences.PREFERENCE_PROXY_URL
+import com.aurora.store.util.remove
 import com.aurora.store.util.save
 import com.aurora.store.viewmodel.preferences.ProxyURLViewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -26,6 +27,8 @@ class ProxyURLDialog: DialogFragment() {
 
     private val viewModel: ProxyURLViewModel by viewModels()
 
+    private val currentProxyUrl: String
+        get() = Preferences.getString(requireContext(), PREFERENCE_PROXY_URL)
     private val textInputLayout: TextInputLayout?
         get() = dialog?.findViewById(R.id.textInputLayout)
 
@@ -35,31 +38,41 @@ class ProxyURLDialog: DialogFragment() {
             .setTitle(R.string.pref_network_proxy_url)
             .setMessage(R.string.pref_network_proxy_url_message)
             .setView(view)
-            .setPositiveButton(getString(R.string.add), null)
+            .setPositiveButton(getString(R.string.set), null)
+            .setNeutralButton(getString(R.string.disable), null)
             .setNegativeButton(getString(android.R.string.cancel)) { _, _ -> dialog?.dismiss()}
             .create()
 
         alertDialog.setOnShowListener {
-            alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { saveProxyUrl() }
+            val positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).apply {
+                isEnabled = currentProxyUrl.isNotBlank()
+                setOnClickListener { saveProxyUrl() }
+            }
+            textInputLayout?.editText?.doOnTextChanged { text, _, _, _ ->
+                positiveButton.isEnabled = !text.isNullOrBlank()
+            }
+
+            alertDialog.getButton(AlertDialog.BUTTON_NEUTRAL).apply {
+                isEnabled = currentProxyUrl.isNotBlank()
+                setOnClickListener { deleteProxyUrl() }
+            }
         }
         return alertDialog
     }
 
-    @SuppressLint("AuthLeak") // False-positive
     override fun onResume() {
         super.onResume()
         textInputLayout?.editText?.apply {
-            hint = "protocol://user:password@host:port"
+            setText(currentProxyUrl)
-            setText(Preferences.getString(context, PREFERENCE_PROXY_URL))
             showKeyboard()
         }
         dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
     }
 
     private fun saveProxyUrl() {
-        val url = textInputLayout?.editText?.text?.toString()
+        val url = textInputLayout?.editText?.text?.toString()?.trim()
         if (url.isNullOrEmpty()) {
-            toast(R.string.add_dispenser_error)
+            toast(R.string.toast_proxy_invalid)
             return
         }
 
@@ -74,4 +87,11 @@ class ProxyURLDialog: DialogFragment() {
             toast(R.string.toast_proxy_failed)
         }
     }
+
+    private fun deleteProxyUrl() {
+        remove(PREFERENCE_PROXY_URL)
+        remove(PREFERENCE_PROXY_INFO)
+        toast(R.string.toast_proxy_disabled)
+        findNavController().navigate(R.id.forceRestartDialog)
+    }
 }

app/src/main/res/layout/dialog_text_input_edit_text.xml

@@ -3,6 +3,7 @@
     android:id="@+id/textInputLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:hint="@string/pref_network_proxy_url_hint"
     android:paddingHorizontal="@dimen/padding_large"
     android:paddingTop="@dimen/padding_normal">
 
@@ -10,6 +11,7 @@
         android:id="@+id/textInputEditText"
         style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:inputType="text"
+        android:maxLines="1" />
 </com.google.android.material.textfield.TextInputLayout>
-

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

@@ -290,13 +290,10 @@
     <string name="pref_aurora_only_desc">تحقق فقط من تحديثات التطبيقات المثبتة بواسطة متجر أورورا</string>
     <string name="title_app_settings">إعدادات التطبيقات</string>
     <string name="pref_updates_check_frequency">تردد التحديثات التلقائية</string>
-    <string name="pref_network_proxy_enable">تفعيل الوكيل</string>
     <string name="pref_network_proxy_url">عنوان URL الوكيل</string>
-    <string name="pref_network_proxy_title">وكيل</string>
     <string name="toast_proxy_invalid">عنوان URL للوكيل غير صالح، تحقق من التنسيق!</string>
     <string name="toast_proxy_success">عينت الوكيل بنجاح</string>
     <string name="toast_proxy_failed">فشل في تعيين الوكيل</string>
-    <string name="pref_network_proxy_enable_desc">السماح لجميع حركة المرور من التطبيق بالمرور عبر الوكيل</string>
     <string name="pref_vending_version_device">الافتراضي (من تكوين الجهاز)</string>
     <string name="pref_vending_version_title">نُسخة Google Play</string>
     <string name="onboarding_permission_doze">تنزيلات الخلفية</string>

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

@@ -281,8 +281,6 @@
     <string name="notification_channel_updates">Updates notifications</string>
     <string name="server_unreachable">Server unreachable</string>
     <string name="details_no_favourites">Nun s\'atopó nenguna aplicación favorita</string>
-    <string name="pref_network_proxy_title">Proxy</string>
-    <string name="pref_network_proxy_enable_desc">Permite que tol tránsitu vaiga pel proxy</string>
     <string name="pref_updates_incompatible_desc">Show updates for incompatible or disabled apps that may fail to install</string>
     <string name="toast_app_unavailable">L\'aplicación nun ta disponible pa esti preséu</string>
     <string name="toast_import_success">Importóse la configuración del preséu</string>
@@ -376,7 +374,6 @@
     <string name="onboarding_permission_doze">Descargues en segundu planu</string>
     <string name="pref_vending_version_title">Versión de Google Play</string>
     <string name="pref_vending_version_device">La predeterminada (de la configuración del preséu)</string>
-    <string name="pref_network_proxy_enable">Activar el proxy</string>
     <string name="notification_updates_available_desc_4"><xliff:g id="app_one_name">%1$s</xliff:g>, <xliff:g id="app_two_name">%2$s</xliff:g>, <xliff:g id="app_three_name">%3$s</xliff:g> y <xliff:g id="apps_count">%4$d</xliff:g> más</string>
     <string name="failed_to_generate_session">Nun se pudo xenerar la sesión</string>
     <string name="app_links_desc">Permite qu\'Aurora abra los enllaces compatibles</string>

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

@@ -251,13 +251,10 @@
     <string name="pref_network_proxy_url">Proksi URL</string>
     <string name="pref_aurora_only">Yalnız Aurora Store tətbiqləri</string>
     <string name="action_favourite">Sevimli</string>
-    <string name="pref_network_proxy_enable">Proksi-ni aktivləşdir</string>
     <string name="action_request_analysis">Yeni araşdırma tələb et</string>
     <string name="details_ratings_title_hint">Rəy başlığı</string>
     <string name="download_clear_finished">Təmizləndi</string>
     <string name="onboarding_permission_installer_legacy_desc">Naməlum mənbələrdən tətbiqlər quraşdırmağa icazə ver</string>
-    <string name="pref_network_proxy_title">Proksi</string>
-    <string name="pref_network_proxy_enable_desc">Tətbiqdən gələn bütün prosesin proksidən keçməsinə icazə ver</string>
     <string name="action_home_screen">Əsas ekrana əlavə et</string>
     <string name="action_uninstall_success">Uğurla silindi</string>
     <string name="details_no_favourites">Sevimli tətbiqlər tapılmadı</string>

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

@@ -281,9 +281,6 @@
     <string name="pref_install_mode_native">Родны ўсталёўшчык (Састарэлы)</string>
     <string name="pref_vending_version_device">Па змаўчанні (праз налады прылады)</string>
     <string name="pref_network_title">Сетка</string>
-    <string name="pref_network_proxy_title">Проксі</string>
-    <string name="pref_network_proxy_enable">Задзейнічаць проксі</string>
-    <string name="pref_network_proxy_enable_desc">Дазволіць правадзіць увесь трафік з праграмы праз проксі</string>
     <string name="title_search_suggestion">Прапановы пошуку</string>
     <string name="title_search_results">Вынікі пошуку</string>
     <string name="title_updates">Абнаўленні</string>

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

@@ -290,13 +290,10 @@
     <string name="pref_aurora_only_desc">Kontrolovat pouze aktualizace aplikací nainstalovaných z aplikace Aurora Store</string>
     <string name="title_app_settings">Nastavení aplikace</string>
     <string name="pref_updates_check_frequency">Frekvence automatických aktualizací</string>
-    <string name="pref_network_proxy_enable">Zapnout proxy</string>
     <string name="pref_network_proxy_url">Adresa URL proxy</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="toast_proxy_invalid">Neplatná adresa URL proxy, zkontrolujte formát!</string>
     <string name="toast_proxy_success">Proxy úspěšně nastavena</string>
     <string name="toast_proxy_failed">Nepodařilo se nastavit proxy</string>
-    <string name="pref_network_proxy_enable_desc">Přesměrovat veškerý síťový provoz skrz proxy</string>
     <string name="pref_vending_version_device">Výchozí (z konfigurace zařízení)</string>
     <string name="pref_vending_version_title">Verze Google Play</string>
     <string name="onboarding_permission_doze">Stahování na pozadí</string>

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

@@ -229,7 +229,6 @@
     <string name="toast_export_success">Enhedskonfiguration eksporteret</string>
     <string name="app_updater_service_notif_title">Henter app i baggrund</string>
     <string name="app_updater_service_notif_text">Aktiverer baggrundsdownload af apps</string>
-    <string name="pref_network_proxy_enable">Aktivér proxy</string>
     <string name="about_wiki_title">Wiki</string>
     <string name="download_eta_sec">%1$ds tilbage</string>
     <string name="onboarding_permission_doze">Baggrundsdownloads</string>
@@ -249,7 +248,6 @@
     <string name="download_eta_hrs">%1$dt %2$dm %3$ds tilbage</string>
     <string name="download_eta_min">%1$dm %2$ds tilbage</string>
     <string name="onboarding_permission_notifications_desc">Send notifikationer om installationsstatus</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="pref_network_proxy_url">Proxy-URL</string>
     <string name="pref_network_proxy_url_message">Indtast en gyldig proxy-URL for at sende alle data gennem proxyen.</string>
     <string name="pref_aurora_only">Kun Aurora Store-apps</string>
@@ -346,7 +344,6 @@
     <string name="updates_available">opdateringer tilgængelige</string>
     <string name="made_with_love">Lavet med <xliff:g id="heart_emoji">%1$s</xliff:g> i Indien</string>
     <string name="android_market_desc">Android Market var en onlinebutik med softwareapplikationer designet til Android-enheder, som blev lukket i 2017.</string>
-    <string name="pref_network_proxy_enable_desc">Tillad al trafik fra appen at gå gennem proxyen</string>
     <string name="notification_updates_available"><xliff:g id="apps_count">%1$d</xliff:g> opdateringer tilgængelige</string>
     <string name="toast_proxy_failed">Kunne ikke indstille proxy</string>
     <string name="am_installer_desc">Kræver App Manager. Har brug for adb/root-tilstand for at installere, når MIUI-optimering er slået til</string>

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

@@ -290,13 +290,10 @@
     <string name="pref_aurora_only">Nur Aurora-Store-Apps</string>
     <string name="pref_aurora_only_desc">Nur nach Updates für Apps suchen, die von Aurora Store installiert wurden</string>
     <string name="pref_updates_check_frequency">Häufigkeit der automatischen Updates</string>
-    <string name="pref_network_proxy_enable">Proxy aktivieren</string>
     <string name="pref_network_proxy_url">URL des Proxyservers</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="toast_proxy_invalid">Ungültige Proxy-URL, bitte Aufbau der URL überprüfen!</string>
     <string name="toast_proxy_success">Proxy erfolgreich festgelegt</string>
     <string name="toast_proxy_failed">Fehler beim Festlegen des Proxys</string>
-    <string name="pref_network_proxy_enable_desc">Gesamten Netzwerkverkehr der App über den Proxyserver leiten</string>
     <string name="pref_vending_version_device">Standard (aus Gerätekonfiguration)</string>
     <string name="pref_vending_version_title">Google-Play-Version</string>
     <string name="onboarding_permission_doze">Downloads im Hintergrund</string>

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

@@ -244,15 +244,12 @@
     <string name="onboarding_permission_doze">Λήψεις Παρασκηνίου</string>
     <string name="onboarding_permission_doze_desc">Επιτρέψτε στο Aurora Store να κατεβάσει και να ενημερώσει εφαρμογές στο παρασκήνιο</string>
     <string name="pref_vending_version_title">Έκδοση Google Play</string>
-    <string name="pref_network_proxy_title">Μεσολάβηση</string>
     <string name="installer_shizuku_unavailable">Το Shizuku δεν έχει εγκατασταθεί ή ρυθμιστεί σωστά.</string>
     <string name="action_request_analysis">Αίτηση νέας ανάλυσης</string>
     <string name="download_clear_finished">Η εκκαθάριση ολοκληρώθηκε</string>
     <string name="pref_updates_incompatible">Μη συμβατές ενημερώσεις</string>
     <string name="pref_updates_incompatible_desc">Εμφάνιση ενημερώσεων από μη συμβατές ή απενεργοποιημένες εγαρμογές που μπορεί να αποτύχουν να εγκατασταθούν</string>
     <string name="pref_vending_version_device">Προεπιλογή (από καταγραφές συσκευής)</string>
-    <string name="pref_network_proxy_enable">Ενεργοποίηση μεσολάβησης</string>
-    <string name="pref_network_proxy_enable_desc">Επιτρέψτε όλη την κίνηση από την εφαρμογή να περνάει από τη μεσολάβηση</string>
     <string name="pref_network_proxy_url">URL μεσολάβησης</string>
     <string name="pref_aurora_only">Μόνο εφαρμογές Aurora Store</string>
     <string name="session_login_failed_google">Δεν ήταν δυνατή η σύνδεση μέσω Google</string>

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

@@ -346,12 +346,9 @@
     <string name="export_app_summary_success">Eksportis sukcese apkunligaĵon</string>
     <string name="export_app_summary_fail">Eksportado apkunligaĵon fiaskis</string>
     <string name="force_restart_title">Restarti Aurora Store</string>
-    <string name="pref_network_proxy_title">Prokura servilo (aŭ “proxy”)</string>
     <string name="toast_proxy_success">Prokuran servilon sukcese finaranĝis</string>
     <string name="toast_clipboard_copied">Kopita en la poŝon</string>
     <string name="toast_proxy_failed">Prokuran servilon agordado fiaskis</string>
-    <string name="pref_network_proxy_enable">Aktivigi prokuran servilon</string>
-    <string name="pref_network_proxy_enable_desc">Permisi tutan datumtrafikon pasi tra la prokura servilo</string>
     <string name="pref_network_proxy_url">Prokuran servilon URL</string>
     <string name="toast_proxy_invalid">Malvalida prokuran servilon URL, kontrolu la formaton!</string>
     <string name="pref_network_proxy_url_message">Enigu validan prokuran servilon URL por pasigi ĉiujn datuĵmojn tra la prokura servilo.</string>

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

@@ -290,13 +290,10 @@
     <string name="pref_aurora_only_desc">Solo comprobar actualizaciones de aplicaciones instaladas desde la Aurora Store</string>
     <string name="title_app_settings">Ajustes de la aplicación</string>
     <string name="pref_updates_check_frequency">Frecuencia de las actualizaciones automáticas</string>
-    <string name="pref_network_proxy_enable">Activar el proxy</string>
     <string name="pref_network_proxy_url">Dirección URL del proxy</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="toast_proxy_invalid">Dirección URL del proxy no válida, ¡compruebe el formato!</string>
     <string name="toast_proxy_success">Proxy configurado correctamente</string>
     <string name="toast_proxy_failed">Error al establecer el proxy</string>
-    <string name="pref_network_proxy_enable_desc">Permitir que todo el tráfico de la aplicación pase por el proxy</string>
     <string name="pref_vending_version_device">Por defecto (desde la configuración del dispositivo)</string>
     <string name="pref_vending_version_title">Versión para Google Play</string>
     <string name="onboarding_permission_doze">Descargas en segundo plano</string>

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

@@ -262,11 +262,9 @@
     <string name="installer_shizuku_unavailable">Shizuku ez dago instalatuta edo egoki konfiguratuta.</string>
     <string name="pref_vending_version_device">Lehenetsia (gailuko konfiguraziotik)</string>
     <string name="notification_updates_available_desc_4"><xliff:g id="app_one_name">%1$s</xliff:g>, <xliff:g id="app_two_name">%2$s</xliff:g>, <xliff:g id="app_three_name">%3$s</xliff:g> eta <xliff:g id="apps_count">%4$d</xliff:g> gehiago</string>
-    <string name="pref_network_proxy_enable">Gaitu proxy-a</string>
     <string name="pref_vending_version_title">Google Play-eko bertsioa</string>
     <string name="pref_network_proxy_url">Proxy-aren URLa</string>
     <string name="pref_aurora_only">Aurora Store-ko aplikazioak soilik</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="pref_install_mode_shizuku">Shizuku instalatzailea</string>
     <string name="notification_updates_available_desc_1"><xliff:g id="app_one_name">%1$s</xliff:g> aplikazioaren bertsio berri bat eskuragarri dago</string>
     <string name="onboarding_permission_doze">Atzeko planoko deskargak</string>
@@ -281,7 +279,6 @@
     <string name="toast_proxy_failed">Ezin izan da ezarri proxy-a</string>
     <string name="title_search_results">Bilaketa-emaitzak</string>
     <string name="notification_channel_updates">Eguneratzeen jakinarazpenak</string>
-    <string name="pref_network_proxy_enable_desc">Onartu aplikazioko trafiko guztia proxy-tik joan dadin</string>
     <string name="notification_updates_available_desc_2"><xliff:g id="app_one_name">%1$s</xliff:g> eta <xliff:g id="app_two_name">%2$s</xliff:g></string>
     <string name="notification_updates_available_1"><xliff:g id="apps_count">%1$d</xliff:g> eguneratze eskuragarri</string>
     <string name="about_wiki_title">Wiki</string>

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

@@ -286,9 +286,7 @@
     <string name="android_market_desc">Android Market oli vuonna 2017 toimintansa päättänyt verkkokauppa, joka tarjosi sovelluksia Android-laitteille.</string>
     <string name="details_ratings_title_hint">Arvostele sovellus</string>
     <string name="pref_aurora_only">Vain Aurora Storen sovellukset</string>
-    <string name="pref_network_proxy_title">Välityspalvelin</string>
     <string name="onboarding_permission_doze_desc">Salli Aurora Storen ladata ja päivittää sovelluksia taustalla</string>
-    <string name="pref_network_proxy_enable">Ota välityspalvelin käyttöön</string>
     <string name="pref_network_proxy_url">Välityspalvelimen URL-osoite</string>
     <string name="pref_vending_version_title">Google Play -versio</string>
     <string name="onboarding_permission_doze">Taustalla olevat lataukset</string>
@@ -416,7 +414,6 @@
     <string name="native_installer_desc">Parhaiten soveltuva alle Android 4.4:ää käyttäville laitteille</string>
     <string name="pref_updates_incompatible_desc">Näytä yhteensopimattomien tai käytöstä poistettujen sovellusten päivitykset, joiden asennus saattaa epäonnistua</string>
     <string name="pref_network_proxy_url_message">Syötä välityspalvelimen URL-osoite välittääksesi kaiken datan sen kautta.</string>
-    <string name="pref_network_proxy_enable_desc">Salli sovelluksen kaiken tiedonsiirron menevän välityspalvelimen kautta</string>
     <string name="title_more">Lisää</string>
     <string name="remove_dispenser_title">Poista jakelija</string>
     <string name="about_aurora_store_summary">Aurora Store mahdollistaa sovellusten etsimisen ja lataamisen virallisesta Google Play -kaupasta. Voit tutkia sovellusten kuvaksia, kuvankaappauksia, päivityksiä, muiden käyttäjien kommentteja ja ladata sovelluksia suoraan Google Play:stä laitteellesi. Käyttääksesi Aurora Store:a sinulla on oltava Google Play -tili sekä kirjauduttava sisään Google Play -tilillesi kun avaat ja asetat Aurora Store:n.\n\nToisin kuin perinteiset sovelluskaupat, Aurora Store ei omista, lisensoi tai jakele sovelluksia. Kaikki sovellukset, sovellusten kuvaukset, kuvankaappaukset ja muu sisältö Aurora Storessa ovat suoraan haettu, ladattu ja/tai näytetty Google Play -kaupasta. Aurora Store toimii kuten ovi tai selain, mahdollistaen sisäänkirjautumisen Google Play -tilillesi ja sovellusten hakemiseen Google Play -kaupasta.\n\nHuomaa, että Aurora Store ei ole Googlen tai Google Play:n hyväksymä, sponsoroima tai valtuuttama, eikä myöskään minkään Aurora Storen kautta ladatun sovelluksen tai sovelluksien kehittäjien hyväksymä; Aurora Store:lla ei myöskään ole mitään kytköstä, yhteistyötä tai yhteyttä niihin.</string>

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

@@ -283,19 +283,16 @@
     <string name="verifying_new_session">Vérification de la nouvelle session</string>
     <string name="app_links_title">Liens de l’appli</string>
     <string name="google_play_store_desc">Google Play, aussi connu sous le nom de Google Play Store, anciennement Android Market.</string>
-    <string name="pref_network_proxy_enable">Activer le mandataire</string>
     <string name="details_ratings_title_hint">Titre de l’avis</string>
     <string name="pref_network_proxy_url">URL du mandataire</string>
     <string name="pref_updates_check_frequency_desc">Configurer les intervalles des mises à jour automatiques et des automises à jours, en heures.</string>
     <string name="pref_aurora_only">Seulement les applis d’Aurora Store</string>
-    <string name="pref_network_proxy_title">Mandataire</string>
     <string name="toast_proxy_invalid">L’URL du mandataire est incorrecte. Vérifiez le format</string>
     <string name="pref_aurora_only_desc">Ne chercher les mises à jour que pour les applis installées par Aurora Store</string>
     <string name="toast_proxy_success">Le mandataire est défini</string>
     <string name="title_app_settings">Paramètres de l\'appli</string>
     <string name="pref_updates_check_frequency">Fréquence des mises à jour automatiques</string>
     <string name="toast_proxy_failed">Échec de paramétrage du mandataire</string>
-    <string name="pref_network_proxy_enable_desc">Faire transiter tout le trafic de l’appli par le mandataire</string>
     <string name="android_market_desc">L’Android Market était un magasin en ligne qui offrait des applications conçues pour les appareils Android, fermé en 2017.</string>
     <string name="pref_vending_version_device">Par défaut (selon la configuration de l’appareil)</string>
     <string name="pref_vending_version_title">Version de Google Play</string>

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

@@ -223,7 +223,6 @@
     <string name="server_unreachable">לא ניתן לגשת לשרת</string>
     <string name="notification_updates_available_desc_4"><xliff:g id="app_one_name">%1$s</xliff:g>, <xliff:g id="app_two_name">%2$s</xliff:g>, <xliff:g id="app_three_name">%3$s</xliff:g> ו <xliff:g id="apps_count">%4$d</xliff:g> ועוד</string>
     <string name="downloading_dep">מוריד קבצים נוספים בשביל <xliff:g id="app">%1$s</xliff:g></string>
-    <string name="pref_network_proxy_enable">הפעל פרוקסי</string>
     <string name="app_updater_service_notif_text">מאפשר הורדת יישום ברקע</string>
     <string name="check_connectivity">בדוק התחברות אינטרנט</string>
     <string name="failed_generating_session">לא הצליח ליצור כניסה, קוד תקלה: <xliff:g id="status_code">%1$d</xliff:g></string>
@@ -234,7 +233,6 @@
     <string name="pref_network_proxy_url">URL פרוקסי</string>
     <string name="pref_updates_check_frequency_desc">הגדר תכיפות עדכונים אוטומטיים ועדכון עצמי, כל שעה.</string>
     <string name="pref_aurora_only">יישומי חנות Aurora בלבד</string>
-    <string name="pref_network_proxy_title">פרוקסי</string>
     <string name="pref_install_mode_shizuku">מתקין Shizuku</string>
     <string name="action_post">פרסום</string>
     <string name="onboarding_permission_notifications">התראות</string>
@@ -286,7 +284,6 @@
     <string name="title_search_results">תוצאות חיפוש</string>
     <string name="notification_channel_updates">התראות עדכונים</string>
     <string name="download_progress">מוריד • <xliff:g id="completed_downloads">%1$d</xliff:g> / <xliff:g id="all_downloads">%2$d</xliff:g> • <xliff:g id="speed">%3$s</xliff:g></string>
-    <string name="pref_network_proxy_enable_desc">אפשר את כל התעבורה מהיישום שתעבור דרך פרוקסי</string>
     <string name="onboarding_permission_notifications_desc">שלח התראות לגבי מצב ההתקנה</string>
     <string name="android_market_desc">החנות של אנדרואיד הייתה חנות אונליין שמציעה אפליקציות שעוצבו למכשירי אנדרואיד, עד 2017.</string>
     <string name="about_xda_summary">הצג את העמוד של Aurora Store בפורום XDA לשוחח ולהציע הצעות.</string>

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

@@ -290,13 +290,10 @@
     <string name="title_app_settings">ऐप सेटिंग्स</string>
     <string name="pref_updates_check_frequency">स्वचालित अपडेट आवृत्ति</string>
     <string name="pref_updates_check_frequency_desc">स्वतः और स्वयं अपडेट के लिए अंतराल कॉन्फिगर करें, घंटे में।</string>
-    <string name="pref_network_proxy_enable">प्रॉक्सी चालू करें</string>
     <string name="pref_network_proxy_url">प्रॉक्सी URL</string>
-    <string name="pref_network_proxy_title">प्रॉक्सी</string>
     <string name="toast_proxy_invalid">अमान्य प्रॉक्सी URL, प्रारूप जांचें!</string>
     <string name="toast_proxy_success">प्रॉक्सी सफलतापूर्वक निर्धारित हो गई</string>
     <string name="toast_proxy_failed">प्रॉक्सी निर्धारित करने में विफल</string>
-    <string name="pref_network_proxy_enable_desc">ऐप से सभी ट्रैफिक को प्रॉक्सी के माध्यम से जाने की अनुमति दें</string>
     <string name="pref_vending_version_device">तयशुदा (डिवाइस विन्यास से)</string>
     <string name="pref_vending_version_title">गूगल प्ले संस्करण</string>
     <string name="onboarding_permission_doze">बेकग्राउंड डाउनलोड</string>

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

@@ -350,7 +350,6 @@
     <string name="login_rate_limited">Ups, učestalost tvojih prijava je ograničen</string>
     <string name="app_links_title">Poveznice aplikacija</string>
     <string name="google_play_store_desc">Google Play, poznat i kao Google Play Store, a prije Android Market.</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="notification_updates_available_desc_2"><xliff:g id="app_one_name">%1$s</xliff:g> i <xliff:g id="app_two_name">%2$s</xliff:g></string>
     <string name="pref_network_proxy_url_message">Upiši ispravni proxy URL za prosljeđivanje svih podataka kroz proxy.</string>
     <string name="toast_proxy_invalid">Neispravan proxy URL. Provjeri format!</string>
@@ -387,9 +386,7 @@
     <string name="privacy_policy_title">Politika privatnosti</string>
     <string name="notification_channel_export">Obavijest o izvozu aplikacija</string>
     <string name="notification_channel_install">Obavijest o instaliranjima</string>
-    <string name="pref_network_proxy_enable_desc">Dozvoli da sav promet aplikacije ide kroz proxy</string>
     <string name="notification_channel_downloads">Obavijest o preuzimanjima</string>
-    <string name="pref_network_proxy_enable">Aktiviraj proxy</string>
     <string name="pref_updates_incompatible">Nekompatibilna aktualiziranja</string>
     <string name="pref_updates_incompatible_desc">Prikaži aktualiziranja za nekompatibilne ili deaktivirane aplikacije koje se možda neće uspjeti instalirati</string>
     <string name="pref_updates_auto">Automatko aktualiziranje aplikacija</string>

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

@@ -283,18 +283,15 @@
     <string name="verifying_new_session">Új munkamenet ellenőrzése</string>
     <string name="app_language">Alkalmazás nyelve</string>
     <string name="app_links_title">Alkalmazáshivatkozások</string>
-    <string name="pref_network_proxy_enable">Proxy engedélyezése</string>
     <string name="pref_network_proxy_url">Proxy webcíme</string>
     <string name="pref_updates_check_frequency_desc">Automatikus frissítések intervallumának konfigurálása, órákban.</string>
     <string name="pref_aurora_only">Csak Aurora Store alkalmazások</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="toast_proxy_invalid">Érvénytelen proxy webcím, ellenőrizze a formátumot!</string>
     <string name="pref_aurora_only_desc">Csak az Aurora Store által telepített alkalmazások frissítéseinek ellenőrzése</string>
     <string name="toast_proxy_success">Proxy sikeresen beállítva</string>
     <string name="title_app_settings">Alkalmazásbeállítások</string>
     <string name="pref_updates_check_frequency">Automatikus frissítések gyakorisága</string>
     <string name="toast_proxy_failed">Proxy beállítása sikertelen</string>
-    <string name="pref_network_proxy_enable_desc">Alkalmazás forgalmának átirányítása proxyn keresztül</string>
     <string name="android_market_desc">Az Android Market egy online áruház volt, amely szoftveralkalmazásokat kínált androidos eszközökhöz, és 2017-ben megszűnt.</string>
     <string name="pref_vending_version_device">Alapértelmezett (eszközkonfiguráció)</string>
     <string name="pref_vending_version_title">Google Play verzió</string>

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

@@ -112,12 +112,10 @@
     <string name="details_no_permission">Sin permissiones</string>
     <string name="details_description">Description</string>
     <string name="downloading_dep">Discargante files additional pro <xliff:g id="app">%1$s</xliff:g></string>
-    <string name="pref_network_proxy_enable">Activar le proxy</string>
     <string name="tab_for_you">Pro te</string>
     <string name="check_connectivity">Verificar connexion a Internet</string>
     <string name="pref_network_proxy_url">URL de proxy</string>
     <string name="pref_aurora_only">Solmente applicationes de Aurora Store</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="notification_updates_available_desc_1">Un nove version de <xliff:g id="app_one_name">%1$s</xliff:g> es disponibile</string>
     <string name="update_available">actualisation disponibile</string>
     <string name="menu">Menu</string>

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

@@ -277,7 +277,6 @@
     <string name="server_unreachable">Server tidak dapat dijangkau</string>
     <string name="failed_generating_session">Gagal membuat sesi, kode kesalahan: <xliff:g id="status_code">%1$d</xliff:g></string>
     <string name="pref_vending_version_device">Bawaan (dari konfigurasi perangkat)</string>
-    <string name="pref_network_proxy_enable">Aktifkan proksi</string>
     <string name="check_connectivity">Periksa sambungan internet</string>
     <string name="pref_vending_version_title">Versi Google Play</string>
     <string name="failed_to_generate_session">Tidak dapat membuat sesi</string>
@@ -285,7 +284,6 @@
     <string name="pref_network_proxy_url">URL Proksi</string>
     <string name="pref_updates_check_frequency_desc">Atur selang waktu untuk pembaruan otomatis dan pembaruan mandiri, dalam jam.</string>
     <string name="pref_aurora_only">Hanya aplikasi Aurora Store</string>
-    <string name="pref_network_proxy_title">Proksi</string>
     <string name="app_links_desc">Izinkan Aurora Store untuk membuka tautan yang didukung</string>
     <string name="onboarding_permission_doze">Unduhan Latar Belakang</string>
     <string name="toast_proxy_invalid">URL proksi tidak sah, periksa format!</string>
@@ -298,7 +296,6 @@
     <string name="title_app_settings">Pengaturan Aplikasi</string>
     <string name="pref_updates_check_frequency">Frekuensi pembaruan otomatis</string>
     <string name="toast_proxy_failed">Gagal menyetel proksi</string>
-    <string name="pref_network_proxy_enable_desc">Izinkan semua lalu lintas dari aplikasi melewati proksi</string>
     <string name="android_market_desc">Android Market adalah toko online yang menyediakan aplikasi perangkat lunak yang dirancang untuk perangkat Android, dihentikan pada tahun 2017.</string>
     <string name="app_language">Bahasa Aplikasi</string>
     <string name="pref_updates_auto">Perbarui otomatis aplikasi</string>

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

@@ -285,10 +285,8 @@
     <string name="google_play_store_desc">Google Play, noto anche come Google Play Store e precedentemente Android Market.</string>
     <string name="details_ratings_title_hint">Titolo della recensione</string>
     <string name="android_market_desc">Android Market era un negozio online che offriva applicazioni software progettate per dispositivi Android, chiuso nel 2017.</string>
-    <string name="pref_network_proxy_enable">Abilita proxy</string>
     <string name="pref_network_proxy_url">URL del proxy</string>
     <string name="pref_updates_check_frequency_desc">Configura la frequenza degli aggiornamenti automatici (in ore)</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="toast_proxy_success">Proxy impostato con successo</string>
     <string name="title_app_settings">Impostazioni app</string>
     <string name="pref_updates_check_frequency">Frequenza degli aggiornamenti automatici</string>
@@ -300,7 +298,6 @@
     <string name="toast_proxy_invalid">URL proxy non valido, controlla il formato!</string>
     <string name="pref_aurora_only_desc">Controlla gli aggiornamenti solo per le app installate da Aurora Store</string>
     <string name="onboarding_permission_doze_desc">Consenti ad Aurora Store di scaricare e aggiornare le app in background</string>
-    <string name="pref_network_proxy_enable_desc">Permetti a tutti i dati di quest\'app di passare tramite proxy</string>
     <string name="pref_updates_auto">Aggiorna le app automaticamente</string>
     <string name="pref_updates_auto_notify">Controlla e segnala gli aggiornamenti disponibili</string>
     <string name="pref_updates_auto_off">Non aggiornare le app automaticamente</string>

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

@@ -285,18 +285,15 @@
     <string name="app_language">アプリの言語</string>
     <string name="title_app_settings">アプリ設定</string>
     <string name="android_market_desc">Android マーケットは、Android デバイス用にデザインされたソフトウェアアプリケーションを提供するオンラインストアでしたが、2017年に廃止されました。</string>
-    <string name="pref_network_proxy_enable">プロキシを有効化</string>
     <string name="details_ratings_title_hint">評価タイトル</string>
     <string name="pref_network_proxy_url">プロキシ URL</string>
     <string name="pref_updates_check_frequency_desc">自動/自己更新の間隔を時間単位で構成します。</string>
     <string name="pref_aurora_only">Aurora Store アプリのみ</string>
-    <string name="pref_network_proxy_title">プロキシ</string>
     <string name="toast_proxy_invalid">プロキシ URL が無効です。形式を確認してください！</string>
     <string name="pref_aurora_only_desc">Aurora Store でインストールしたアプリのみを更新とインストール済みアプリに表示</string>
     <string name="toast_proxy_success">プロキシの設定に成功しました</string>
     <string name="pref_updates_check_frequency">自動更新周期</string>
     <string name="toast_proxy_failed">プロキシの設定に失敗しました</string>
-    <string name="pref_network_proxy_enable_desc">アプリからのすべてのトラフィックをプロキシに通す</string>
     <string name="pref_updates_auto">アプリの自動更新</string>
     <string name="onboarding_permission_doze">バックグラウンドダウンロード</string>
     <string name="pref_updates_auto_desc">自動更新の動作を設定する</string>

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

@@ -179,11 +179,8 @@
     <string name="pref_install_mode_session">세션 설치기</string>
     <string name="pref_install_mode_title">설치 방식</string>
     <string name="pref_vending_version_title">Google Play 버전</string>
-    <string name="pref_network_proxy_enable">프록시 켜기</string>
-    <string name="pref_network_proxy_enable_desc">앱의 모든 트래픽이 프록시를 통과하도록 허용</string>
     <string name="pref_network_proxy_url">프록시 URL</string>
     <string name="pref_network_title">네트워킹</string>
-    <string name="pref_network_proxy_title">프록시</string>
     <string name="pref_ui_title">맞춤화</string>
     <string name="pref_ui_no_for_you">For You 페이지</string>
     <string name="pref_vending_version_device">기본값(장치 구성에서)</string>

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

@@ -216,12 +216,10 @@
     <string name="server_unreachable">Serveris nepasiekiamas</string>
     <string name="notification_updates_available_desc_4"><xliff:g id="app_one_name">%1$s</xliff:g>, <xliff:g id="app_two_name">%2$s</xliff:g>, <xliff:g id="app_three_name">%3$s</xliff:g> ir dar <xliff:g id="apps_count">%4$d</xliff:g></string>
     <string name="downloading_dep">Atsiunčiami papildomi failai, skirti <xliff:g id="app">%1$s</xliff:g></string>
-    <string name="pref_network_proxy_enable">Įjungti įgaliotąjį serverį</string>
     <string name="check_connectivity">Tikrinti interneto jungiamumą</string>
     <string name="failed_generating_session">Nepavyko sugeneruoti seanso, klaidos kodas: <xliff:g id="status_code">%1$d</xliff:g></string>
     <string name="failed_to_generate_session">Nepavyko sugeneruoti seanso</string>
     <string name="pref_network_proxy_url">Įgaliotojo serverio URL</string>
-    <string name="pref_network_proxy_title">Įgaliotasis serveris</string>
     <string name="onboarding_permission_notifications">Pranešimai</string>
     <string name="notification_updates_available_desc_1">Yra prieinama nauja <xliff:g id="app_one_name">%1$s</xliff:g> versija</string>
     <string name="toast_import_failed">Nepavyko importuoti įrenginio konfigūracijos</string>
@@ -244,7 +242,6 @@
     <string name="title_search_results">Paieškos rezultatai</string>
     <string name="notification_channel_updates">Pranešimai apie atnaujinimus</string>
     <string name="download_progress">Atsiunčiama • <xliff:g id="completed_downloads">%1$d</xliff:g> / <xliff:g id="all_downloads">%2$d</xliff:g> • <xliff:g id="speed">%3$s</xliff:g></string>
-    <string name="pref_network_proxy_enable_desc">Leisti visam interneto duomenų srautui iš programėlės eiti per įgaliotąjį serverį</string>
     <string name="onboarding_permission_notifications_desc">Siųsti pranešimus apie įdiegimo būseną</string>
     <string name="access_denied_using_vpn">Prieiga negalima! Ar jūs naudojate VPN arba Tor\?</string>
     <string name="app_language">Programėlės kalba</string>

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

@@ -285,18 +285,15 @@
     <string name="verifying_new_session">Pārbauda jauno sesiju</string>
     <string name="android_market_desc">Android Market bija tiešsaistes veikals, kas piedāvāja lietotnes, kas ir paredzētas Android ierīcēm, pārstāja darboties 2017. gadā.</string>
     <string name="details_ratings_title_hint">Apskata nosaukums</string>
-    <string name="pref_network_proxy_enable">Iespējot starpniekserveri</string>
     <string name="pref_network_proxy_url">Starpniekservera URL</string>
     <string name="pref_updates_check_frequency_desc">Norādīt starpposmu stundās automātiskajiem un pašatjauninājumiem.</string>
     <string name="pref_aurora_only">Tikai Aurora Store lietotnes</string>
-    <string name="pref_network_proxy_title">Starpniekserveris</string>
     <string name="toast_proxy_invalid">Nederīgs starpniekservera URL, jāpārbauda pieraksts.</string>
     <string name="pref_aurora_only_desc">Pārbaudīt atjauninājumus tikai lietotnēm, kuras ir uzstādītas ar Aurora Store</string>
     <string name="toast_proxy_success">Starpniekserveris veiksmīgi iestatīts</string>
     <string name="title_app_settings">Lietotnes iestatījumi</string>
     <string name="pref_updates_check_frequency">Automātisko atjauninājumu biežums</string>
     <string name="toast_proxy_failed">Neizdevās iestatīt starpniekserveri</string>
-    <string name="pref_network_proxy_enable_desc">Atļaut visu lietotnes datplūsmu sūtīt caur starpniekserveri</string>
     <string name="action_request_analysis">Pieprasīt jaunu izvērtējumu</string>
     <string name="onboarding_permission_doze">Fona lejupielādes</string>
     <string name="onboarding_permission_doze_desc">Ļaut Aurora Store lejupielādēt un atjaunināt lietotnes fonā</string>

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

@@ -290,13 +290,10 @@
     <string name="pref_aurora_only_desc">ਅੱਪਡੇਟਸ ਅਤੇ ਇੰਸਟਾਲ ਐਪ ਟੈਬ ਵਿੱਚ ਸਿਰਫ਼ ਔਰੋਰਾ ਸਟੋਰ ਇੰਸਟਾਲ ਐਪਾਂ ਵਿਖਾਓ</string>
     <string name="title_app_settings">ਐਪ ਸੈਟਿੰਗਾਂ</string>
     <string name="pref_updates_check_frequency">ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਆਵ੍ਰਿਤੀ</string>
-    <string name="pref_network_proxy_enable">ਪ੍ਰੌਕਸੀ ਚਾਲੂ ਕਰੋ</string>
     <string name="pref_network_proxy_url">ਪ੍ਰੌਕਸੀ URL</string>
-    <string name="pref_network_proxy_title">ਪ੍ਰੌਕਸੀ</string>
     <string name="toast_proxy_invalid">ਅਵੈਧ ਪ੍ਰੌਕਸੀ URL, ਫਾਰਮੈਟ ਦੀ ਜਾਂਚ ਕਰੋ!</string>
     <string name="toast_proxy_success">ਪ੍ਰੌਕਸੀ ਸਫਲਤਾਪੂਰਵਕ ਸੈੱਟ ਕੀਤੀ ਗਈ</string>
     <string name="toast_proxy_failed">ਪ੍ਰੌਕਸੀ ਸੈੱਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ</string>
-    <string name="pref_network_proxy_enable_desc">ਐਪ ਤੋਂ ਸਾਰੇ ਟ੍ਰੈਫਿਕ ਨੂੰ ਪ੍ਰੌਕਸੀ ਰਾਹੀਂ ਜਾਣ ਦਿਓ</string>
     <string name="pref_vending_version_device">ਪੂਰਵ-ਨਿਰਧਾਰਤ (ਡਿਵਾਈਸ ਸੰਰਚਨਾ ਤੋਂ)</string>
     <string name="pref_vending_version_title">ਗੂਗਲ ਪਲੇ ਸੰਸਕਰਣ</string>
     <string name="onboarding_permission_doze">ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਊਨਲੋਡ</string>

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

@@ -289,13 +289,10 @@
     <string name="pref_aurora_only">Tylko aplikacje Aurora Store</string>
     <string name="title_app_settings">Ustawienia aplikacji</string>
     <string name="pref_updates_check_frequency">Częstotliwość automatycznych aktualizacji</string>
-    <string name="pref_network_proxy_enable">Włącz proxy</string>
     <string name="pref_network_proxy_url">Adres URL serwera proxy</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="toast_proxy_invalid">Nieprawidłowy adres URL serwera proxy, sprawdź format!</string>
     <string name="toast_proxy_success">Ustawiono serwer proxy</string>
     <string name="toast_proxy_failed">Nie udało się ustawić serwera proxy</string>
-    <string name="pref_network_proxy_enable_desc">Zezwól, aby cały ruch z aplikacji przechodził przez serwer proxy</string>
     <string name="pref_aurora_only_desc">Sprawdzaj aktualizacje tylko dla aplikacji zainstalowanych przez Aurora Store</string>
     <string name="pref_vending_version_device">Domyślna (z konfiguracji urządzenia)</string>
     <string name="pref_vending_version_title">Wersja Google Play</string>

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

@@ -290,13 +290,10 @@
     <string name="pref_aurora_only_desc">Buscar atualizações somente para apps instalados pela Aurora Store</string>
     <string name="title_app_settings">Configurações do App</string>
     <string name="pref_updates_check_frequency">Frequência das atualizações automáticas</string>
-    <string name="pref_network_proxy_enable">Ativar proxy</string>
     <string name="pref_network_proxy_url">URL da proxy</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="toast_proxy_invalid">URL de proxy inválida, verifique o formato!</string>
     <string name="toast_proxy_success">Proxy definido com sucesso</string>
     <string name="toast_proxy_failed">Falhou em definir proxy</string>
-    <string name="pref_network_proxy_enable_desc">Permitir que todo o tráfego do app passe pela proxy</string>
     <string name="pref_vending_version_device">Padrão (da configuração do dispositivo)</string>
     <string name="pref_vending_version_title">Versão do Google Play</string>
     <string name="onboarding_permission_doze">Downloads em Segundo Plano</string>

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

@@ -284,19 +284,16 @@
     <string name="app_links_title">Ligações</string>
     <string name="google_play_store_desc">Google Play, também conhecida como Google Play Store e, anteriormente, Android Market.</string>
     <string name="android_market_desc">O Android Market foi uma loja online que oferecia aplicações para dispositivos Android, descontinuada em 2017.</string>
-    <string name="pref_network_proxy_enable">Ativar proxy</string>
     <string name="details_ratings_title_hint">Título da avaliação</string>
     <string name="pref_network_proxy_url">URL do proxy</string>
     <string name="pref_updates_check_frequency_desc">Configurar tempo de intervalo para procurar atualizações (em horas).</string>
     <string name="pref_aurora_only">Apenas aplicações Aurora Store</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="toast_proxy_invalid">URL inválido. Verifique o formato!</string>
     <string name="pref_aurora_only_desc">Verifique apenas atualizações de aplicativos instalados pela Aurora Store</string>
     <string name="toast_proxy_success">Proxy definido com sucesso</string>
     <string name="title_app_settings">Definições</string>
     <string name="pref_updates_check_frequency">Frequência das atualizações automáticas</string>
     <string name="toast_proxy_failed">Falha ao definir o proxy</string>
-    <string name="pref_network_proxy_enable_desc">Permitir que todo o tráfego da aplicação passe pelo proxy</string>
     <string name="pref_vending_version_device">Padrão (configuração do dispositivo)</string>
     <string name="pref_vending_version_title">Versão Google Play</string>
     <string name="onboarding_permission_doze">Descargas em segundo plano</string>

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

@@ -279,14 +279,12 @@
     <string name="server_unreachable">Server inaccesibil</string>
     <string name="failed_generating_session">Nu s-a reușit generarea sesiunii, cod de eroare: <xliff:g id="status_code">%1$d</xliff:g></string>
     <string name="pref_vending_version_device">Implicit (din configurația dispozitivului)</string>
-    <string name="pref_network_proxy_enable">Activează proxy-ul</string>
     <string name="pref_vending_version_title">Versiunea Google Play</string>
     <string name="failed_to_generate_session">Nu s-a putut genera sesiunea</string>
     <string name="details_ratings_title_hint">Titlul recenziei</string>
     <string name="pref_network_proxy_url">Adresa URL proxy</string>
     <string name="pref_updates_check_frequency_desc">Configurează intervale pentru actualizări, în ore.</string>
     <string name="pref_aurora_only">Numai aplicațiile Aurora Store</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="app_links_desc">Permite magazinului Aurora să deschidă linkuri acceptate</string>
     <string name="toast_proxy_invalid">Adresa URL proxy nevalidă, verifică formatul!</string>
     <string name="pref_aurora_only_desc">Se verifică doar actualizările pentru aplicațiile instalate de Aurora Store</string>
@@ -297,7 +295,6 @@
     <string name="title_app_settings">Setările aplicației</string>
     <string name="pref_updates_check_frequency">Frecvența actualizărilor automate</string>
     <string name="toast_proxy_failed">Nu s-a putut seta proxy</string>
-    <string name="pref_network_proxy_enable_desc">Permite întregului trafic din aplicație să treacă prin proxy</string>
     <string name="android_market_desc">Android Market a fost un magazin online care oferea aplicații software concepute pentru dispozitive Android, retras în 2017.</string>
     <string name="pref_updates_auto">Actualizări automate ale aplicațiilor</string>
     <string name="pref_updates_auto_notify">Verifică și notifică despre actualizările disponibile</string>

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

@@ -285,10 +285,8 @@
     <string name="google_play_store_desc">Google Play, также известный как Google Play Store, а ранее - Android Market.</string>
     <string name="android_market_desc">Android Market - магазин приложений для устройств под управлением ОС Android, закрытый в 2017 году.</string>
     <string name="details_ratings_title_hint">Заголовок отзыва</string>
-    <string name="pref_network_proxy_enable">Включить прокси</string>
     <string name="pref_network_proxy_url">URL прокси</string>
     <string name="pref_updates_check_frequency_desc">Настроить интервал автоматического и самостоятельного обновления в часах.</string>
-    <string name="pref_network_proxy_title">Прокси</string>
     <string name="toast_proxy_invalid">Неверный URL прокси, проверьте формат!</string>
     <string name="pref_aurora_only_desc">Проверять обновления для приложений, установленных только с Aurora Store</string>
     <string name="toast_proxy_success">Прокси успешно настроен</string>
@@ -296,7 +294,6 @@
     <string name="pref_updates_check_frequency">Частота автоматических обновлений</string>
     <string name="toast_proxy_failed">Не удалось настроить прокси</string>
     <string name="pref_aurora_only">Только приложения из Aurora Store</string>
-    <string name="pref_network_proxy_enable_desc">Разрешить трафику приложения проходить через прокси</string>
     <string name="pref_vending_version_device">По умолчанию (с конфигурации устройства)</string>
     <string name="pref_vending_version_title">Версия Google Play</string>
     <string name="onboarding_permission_doze">Фоновые загрузки</string>

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

@@ -308,8 +308,6 @@
     <string name="status_failed">අසමත් විය</string>
     <string name="checking_updates">යාවත්කාල සොයමින්</string>
     <string name="status_unavailable">නොතිබේ</string>
-    <string name="pref_network_proxy_title">ප්‍රතියුක්තය</string>
-    <string name="pref_network_proxy_enable">ප්‍රතියුක්තය සබල කරන්න</string>
     <string name="action_favourite">ප්‍රියතම</string>
     <string name="details_data_safety_title">දත්ත ආරක්‍ෂාව</string>
     <string name="check_updates">යාවත්කාල බලන්න</string>

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

@@ -118,7 +118,6 @@
     <string name="details_more_about_app">Viac o aplikácií</string>
     <string name="details_no_app_match">Nenašla sa žiadna zhoda aplikácie</string>
     <string name="pref_network_title">Sieť</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="app_updater_service_notif_title">Sťahovanie aplikácie na pozadí</string>
     <string name="app_updater_service_notif_text">Umožňuje sťahovanie aplikácie na pozadí</string>
     <string name="privacy_policy_title">Zásady ochrany osobných údajov</string>
@@ -141,8 +140,6 @@
     <string name="pref_install_mode_shizuku">Shizuku inštalátor</string>
     <string name="pref_install_mode_session">Inštalátor relácie</string>
     <string name="pref_vending_version_device">Predvolené (z konfigurácie zariadenia)</string>
-    <string name="pref_network_proxy_enable">Povoliť proxy</string>
-    <string name="pref_network_proxy_enable_desc">Povoliť všetku sieťovú prevádzku aplikácie cez server proxy</string>
     <string name="pref_ui_similar_apps_desc">Zobraziť podobné a súvisiace skupiny na stránke podrobností aplikácie</string>
     <string name="pref_updates_incompatible">Nekompatibilné aktualizácie</string>
     <string name="pref_updates_incompatible_desc">Zobraziť aktualizácie pre nekompatibilné alebo zakázané aplikácie, ktoré môžu zlyhať pri nštalovaní</string>

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

@@ -286,7 +286,6 @@
     <string name="toast_proxy_invalid">Neveljaven URL posrednika, preverite obliko!</string>
     <string name="app_links_desc">Dovoli Aurora Store odpiranje podprtih povezav</string>
     <string name="details_ratings_title_hint">Oceni naslov</string>
-    <string name="pref_network_proxy_enable_desc">Dovoli ves promet iz aplikacije skozi posrednika</string>
     <string name="pref_updates_incompatible_desc">Pokaži posodobitve za nezdružljive ali onemogočene aplikacije, katerih namestitev lahko spodleti</string>
     <string name="pref_updates_auto">Samodejno posodobi aplikacije</string>
     <string name="google_play_store_desc">Google Play, znan tudi kot Google Play Store in prej znan kot Android Market.</string>
@@ -314,9 +313,7 @@
     <string name="pref_aurora_only">Samo Aurora Store aplikacije</string>
     <string name="pref_updates_auto_notify">Preveri in obvesti za razpoložljivimi posodobitvami</string>
     <string name="pref_updates_check_frequency">Pogostost samodejnih posodobitev</string>
-    <string name="pref_network_proxy_title">Posrednik</string>
     <string name="onboarding_permission_installer_legacy_desc">Dovoli namestitev aplikacij iz neznanih virov</string>
-    <string name="pref_network_proxy_enable">Omogoči posrednika</string>
     <string name="pref_updates_incompatible">Nezdružljive posodobitve</string>
     <string name="onboarding_permission_doze_desc">Dovoli Aurora Store prenose in posodobitve aplikacij v ozadju</string>
     <string name="toast_permission_esm_caution">Morda boste morali ponovno odobriti dovoljenje zaradi hrošča v Storage Access Framework-u</string>

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

@@ -291,9 +291,6 @@
     <string name="download_eta_min">Edhe %1$dm %2$ds</string>
     <string name="download_eta_sec">Edhe %1$ds</string>
     <string name="onboarding_permission_notifications_desc">Dërgo njoftime lidhur me gjendje instalimesh</string>
-    <string name="pref_network_proxy_title">Ndërmjetës</string>
-    <string name="pref_network_proxy_enable">Aktivizo ndërmjetës</string>
-    <string name="pref_network_proxy_enable_desc">Lejo që krejt trafiku prej aplikacionesh të kalojë përmes ndërmjetësit</string>
     <string name="pref_updates_incompatible_desc">Shfaq përditësime për aplikacione të papërputhshëm, ose të çaktivizuar, për të cilët mund të dështojë instalimi</string>
     <string name="pref_aurora_only_desc">Kërko për përditësime vetëm për aplikacione të instaluar me Shitoren Aurora</string>
     <string name="session_good">Hyaaa! Gjithçka në rregull.</string>

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

@@ -314,13 +314,10 @@
     <string name="pref_aurora_only_desc">Проверавајте ажурирања само за апликације инсталиране помоћу Aurora Store</string>
     <string name="title_app_settings">Подешавања апликације</string>
     <string name="pref_updates_check_frequency">Учесталост аутоматског ажурирања</string>
-    <string name="pref_network_proxy_enable">Омогући прокси</string>
     <string name="pref_network_proxy_url">URL адреса проксија</string>
-    <string name="pref_network_proxy_title">Прокси</string>
     <string name="toast_proxy_invalid">Неважећи URL проксија, проверите формат!</string>
     <string name="toast_proxy_success">Прокси је успешно подешен</string>
     <string name="toast_proxy_failed">Подешавање проксија није успело</string>
-    <string name="pref_network_proxy_enable_desc">Дозволите да сав саобраћај из апликације пролази кроз прокси</string>
     <string name="pref_vending_version_device">Подразумевано (из конфигурације уређаја)</string>
     <string name="pref_vending_version_title">Верзија Google Play-а</string>
     <string name="onboarding_permission_doze">Преузимања у позадини</string>

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

@@ -285,18 +285,15 @@
     <string name="pref_install_mode_shizuku">Installationsprogrammet Shizuku</string>
     <string name="android_market_desc">Android Market var en nätbaserad butik som erbjöd mjukvaru-applikationer gjorda för Android-enheter, gick i pension 2017.</string>
     <string name="details_ratings_title_hint">Recensera titel</string>
-    <string name="pref_network_proxy_enable">Aktivera proxy</string>
     <string name="pref_network_proxy_url">Proxyn\'s URL</string>
     <string name="pref_updates_check_frequency_desc">Konfigurera intervall för automatiska själv-uppdateringar, i timmar.</string>
     <string name="pref_aurora_only">Enbart appar från Aurora-butiken</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="toast_proxy_invalid">Ogiltig URL för proxy, kontrollera formatet!</string>
     <string name="pref_aurora_only_desc">Visa endast installerade appar från Aurora-butiken i Uppdateringar och Installerade appar</string>
     <string name="toast_proxy_success">Inställningen av proxy lyckades</string>
     <string name="title_app_settings">Inställningar för app</string>
     <string name="pref_updates_check_frequency">Automatisk uppdateringsfrekvens</string>
     <string name="toast_proxy_failed">Inställningen av proxy\'n misslyckades</string>
-    <string name="pref_network_proxy_enable_desc">Tillåt all trafik från appen att gå genom proxyn</string>
     <string name="pref_vending_version_device">Standard (från enhetskonfiguration)</string>
     <string name="pref_vending_version_title">Google Play-version</string>
     <string name="onboarding_permission_doze">Hämtningar i bakgrunden</string>

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

@@ -243,8 +243,6 @@
     <string name="details_ratings_title_hint">மதிப்பாய்வு தலைப்பு</string>
     <string name="onboarding_permission_doze_desc">பயன்பாடுகளை பின்னணியில் பதிவிறக்கம் செய்து புதுப்பிக்க அரோரா கடையை அனுமதிக்கவும்</string>
     <string name="pref_install_mode_shizuku">சிசுகு உறுப்பினர்கள் கோ</string>
-    <string name="pref_network_proxy_enable">ப்ராக்சியை இயக்கவும்</string>
-    <string name="pref_network_proxy_enable_desc">பயன்பாட்டிலிருந்து அனைத்து போக்குவரத்தையும் பதிலாள் வழியாக செல்ல அனுமதிக்கவும்</string>
     <string name="pref_updates_incompatible_desc">நிறுவத் தவறிய பொருந்தாத அல்லது முடக்கப்பட்ட பயன்பாடுகளுக்கான புதுப்பிப்புகளைக் காட்டு</string>
     <string name="pref_aurora_only">அரோரா கடை பயன்பாடுகள் மட்டுமே</string>
     <string name="pref_aurora_only_desc">அரோரா கடை நிறுவிய பயன்பாடுகளுக்கான புதுப்பிப்புகளை மட்டுமே சரிபார்க்கவும்</string>
@@ -377,7 +375,6 @@
     <string name="bad_request">உள் பிழை! சிறிது நேரம் கழித்து மீண்டும் முயற்சிக்கவும்</string>
     <string name="export_app_summary_success">பயன்பாட்டு மூட்டை வெற்றிகரமாக ஏற்றுமதி செய்தது</string>
     <string name="action_uninstall_success">வெற்றிகரமாக நிறுவல் நீக்கப்பட்டது</string>
-    <string name="pref_network_proxy_title">பதிலாள்</string>
     <string name="about_aurora_store_subtitle">அரோரா கடை பற்றி மேலும் அறிக</string>
     <string name="action_home_screen">முகப்புத் திரையில் சேர்க்கவும்</string>
     <string name="remove">அகற்று</string>

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

@@ -290,13 +290,10 @@
     <string name="pref_aurora_only_desc">Yalnızca Aurora Store tarafından kurulan uygulamaları denetle</string>
     <string name="title_app_settings">Uygulama Ayarları</string>
     <string name="pref_updates_check_frequency">Kendiliğinden güncelleme sıklığı</string>
-    <string name="pref_network_proxy_enable">Vekili etkinleştir</string>
     <string name="pref_network_proxy_url">Vekil URL\'si</string>
-    <string name="pref_network_proxy_title">Vekil</string>
     <string name="toast_proxy_invalid">Geçersiz vekil URL\'si, biçimi denetle!</string>
     <string name="toast_proxy_success">Vekil belirleme başarılı</string>
     <string name="toast_proxy_failed">Vekil belirlenemedi</string>
-    <string name="pref_network_proxy_enable_desc">Uygulamadan tüm trafiğin vekilden gitmesini sağla</string>
     <string name="pref_vending_version_device">Varsayılan (cihaz yapılandırmasından)</string>
     <string name="pref_vending_version_title">Google Play Sürümü</string>
     <string name="onboarding_permission_doze">Arka Plan İndirmeleri</string>

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

@@ -290,13 +290,10 @@
     <string name="pref_aurora_only_desc">Перевіряйте оновлення лише для застосунків, встановлених з Aurora Store</string>
     <string name="title_app_settings">Налаштування застосунку</string>
     <string name="pref_updates_check_frequency">Частота автоматичних оновлень</string>
-    <string name="pref_network_proxy_enable">Увімкнути проксі</string>
     <string name="pref_network_proxy_url">URL проксі</string>
-    <string name="pref_network_proxy_title">Проксі</string>
     <string name="toast_proxy_invalid">Неправильна URL-адреса проксі, перевірте формат!</string>
     <string name="toast_proxy_success">Проксі успішно налаштовано</string>
     <string name="toast_proxy_failed">Не вдалося налаштувати проксі</string>
-    <string name="pref_network_proxy_enable_desc">Дозволити всьому трафіку із застосунку проходити через проксі</string>
     <string name="pref_vending_version_device">Типово (з конфігурації пристрою)</string>
     <string name="pref_vending_version_title">Версія Google Play</string>
     <string name="onboarding_permission_doze">Завантаження у фоні</string>

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

@@ -285,8 +285,6 @@
     <string name="failed_apk_export">Không xuất được APK</string>
     <string name="onboarding_permission_doze_desc">Cho phép Aurora Store tải xuống và cập nhật ứng dụng trong nền</string>
     <string name="pref_vending_version_device">Mặc định (từ cấu hình thiết bị)</string>
-    <string name="pref_network_proxy_enable">Bật proxy</string>
-    <string name="pref_network_proxy_enable_desc">Cho phép tất cả lưu lượng truy cập từ ứng dụng đi qua proxy</string>
     <string name="title_app_settings">Thiết đặt ứng dụng</string>
     <string name="toast_proxy_invalid">URL proxy không hợp lệ, hãy kiểm tra định dạng!</string>
     <string name="check_connectivity">Kiểm tra kết nối internet</string>
@@ -311,7 +309,6 @@
     <string name="details_ratings_title_hint">Tiêu đề đánh giá</string>
     <string name="onboarding_permission_doze">Tải xuống trong nền</string>
     <string name="pref_network_proxy_url">URL proxy</string>
-    <string name="pref_network_proxy_title">Proxy</string>
     <string name="services_installer_subtitle">Trình cài đặt để cài đặt nền</string>
     <string name="am_installer_subtitle">Trình quản lý gói nguồn mở đầy đủ tính năng</string>
     <string name="services_installer_desc">Yêu cầu cài đặt Dịch vụ Aurora dưới dạng ứng dụng hệ thống đặc quyền</string>

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

@@ -201,17 +201,14 @@
     <string name="app_language">個 App 用咩文</string>
     <string name="notification_updates_available_1"><xliff:g id="apps_count">%1$d</xliff:g> 個更新出咗喇</string>
     <string name="pref_common_extra">其他</string>
-    <string name="pref_network_proxy_enable">啟用代理伺服器</string>
     <string name="details_ratings_title_hint">評論標題</string>
     <string name="pref_network_proxy_url">代理伺服器 URL</string>
-    <string name="pref_network_proxy_title">代理伺服器</string>
     <string name="pref_ui_title">自訂</string>
     <string name="toast_proxy_invalid">代理伺服器 URL 無效，請睇過個格式！</string>
     <string name="toast_proxy_success">代理伺服器設定成功</string>
     <string name="session_scrapped">對上一個工作階段已經報銷</string>
     <string name="title_app_settings">App 設定</string>
     <string name="toast_proxy_failed">設定唔到代理伺服器</string>
-    <string name="pref_network_proxy_enable_desc">等個 app 所有網絡通訊都流經代理伺服器</string>
     <string name="pref_install_mode_title">安裝方法</string>
     <string name="pref_install_delete_summary">下載嘅 APK 一安裝完就即刻剷走</string>
     <string name="pref_install_delete_title">安裝之後剷走 APK</string>

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

@@ -290,13 +290,10 @@
     <string name="pref_aurora_only_desc">只检查 Aurora Store 安装应用的更新</string>
     <string name="title_app_settings">设置</string>
     <string name="pref_updates_check_frequency">自动更新频率</string>
-    <string name="pref_network_proxy_enable">启用代理</string>
     <string name="pref_network_proxy_url">代理 URL</string>
-    <string name="pref_network_proxy_title">代理</string>
     <string name="toast_proxy_invalid">无效的代理 URL,请检查格式！</string>
     <string name="toast_proxy_success">成功设置了代理</string>
     <string name="toast_proxy_failed">设置代理失败</string>
-    <string name="pref_network_proxy_enable_desc">允许本应用所有流量经代理服务器发出</string>
     <string name="pref_vending_version_device">默认（来自设备配置）</string>
     <string name="pref_vending_version_title">Google Play 版本</string>
     <string name="onboarding_permission_doze">后台下载</string>

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

@@ -269,8 +269,6 @@
     <string name="session_enjoy">登入並享用。</string>
     <string name="update_available">有更新可用</string>
     <string name="pref_vending_version_title">Google Play 版本</string>
-    <string name="pref_network_proxy_title">代理伺服器</string>
-    <string name="pref_network_proxy_enable">啟用代理伺服器</string>
     <string name="pref_updates_incompatible">不相容的更新</string>
     <string name="pref_updates_incompatible_desc">為不相容或已停用的應用程式，顯示可能安裝失敗的更新</string>
     <string name="pref_aurora_only_desc">僅檢查 Aurora Store 安裝的應用程式更新</string>
@@ -285,7 +283,6 @@
     <string name="app_language">應用程式語言</string>
     <string name="failed_apk_export">匯出 APK 失敗</string>
     <string name="pref_vending_version_device">預設（來自裝置配置）</string>
-    <string name="pref_network_proxy_enable_desc">允許所有來自於應用程式的網路活動經過代理伺服器</string>
     <string name="pref_network_proxy_url">代理伺服器網址</string>
     <string name="pref_aurora_only">僅限 Aurora Store 應用程式</string>
     <string name="pref_updates_auto_desc">設定自動更新行為</string>

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

@@ -224,9 +224,6 @@
     <string name="pref_vending_version_title">Google Play Version</string>
     <string name="pref_vending_version_device">Default (from device config)</string>
     <string name="pref_network_title">"Networking"</string>
-    <string name="pref_network_proxy_title">Proxy</string>
-    <string name="pref_network_proxy_enable">"Enable proxy"</string>
-    <string name="pref_network_proxy_enable_desc">"Allow all traffic from app to go through the proxy"</string>
     <string name="pref_network_proxy_url">"Proxy URL"</string>
     <string name="pref_network_proxy_url_message">Enter a valid proxy URL to pass all data through the proxy.</string>
     <string name="pref_ui_title">"Customization"</string>
@@ -493,4 +490,9 @@
     <!-- NetworkPreference -->
     <string name="pref_network_microg_login_title">Use microG to sign-in to accounts</string>
     <string name="pref_network_microg_login_desc">Authenticate using microG when signing into Google accounts for a simpler sign-in flow.</string>
+    <string name="set">Set</string>
+    <string name="disable">Disable</string>
+    <string name="toast_proxy_disabled">Proxy disabled successfully</string>
+    <string name="pref_network_proxy_desc">View and manage proxy configuration</string>
+    <string name="pref_network_proxy_url_hint" translatable="false">protocol://user:password@host:port</string>
 </resources>

app/src/main/res/xml/preferences_network.xml

@@ -25,19 +25,12 @@
         app:summary="@string/pref_dispenser_summary"
         app:title="@string/pref_dispenser_title" />
 
-    <PreferenceCategory
+    <Preference
-        app:iconSpaceReserved="false"
-        app:key="PREFERENCE_PROXY_URL"
-        app:singleLineTitle="false"
-        app:summary="protocol://user:password@host:port"
-        app:title="@string/pref_network_proxy_title" />
-
-    <SwitchPreferenceCompat
         app:disableDependentsState="false"
         app:iconSpaceReserved="false"
-        app:key="PREFERENCE_PROXY_ENABLED"
+        app:key="PREFERENCE_PROXY_URL"
-        app:summary="@string/pref_network_proxy_enable_desc"
+        app:summary="@string/pref_network_proxy_desc"
-        app:title="@string/pref_network_proxy_enable" />
+        app:title="@string/pref_network_proxy_url" />
 
     <PreferenceCategory
         app:iconSpaceReserved="false"