Fix duplicate Server IP override string

Author: Rawa

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt

@@ -89,7 +89,7 @@ private fun FeatureIndicator.text(): String {
             FeatureIndicator.LAN_SHARING -> R.string.local_network_sharing
             FeatureIndicator.DNS_CONTENT_BLOCKERS -> R.string.dns_content_blockers
             FeatureIndicator.CUSTOM_DNS -> R.string.feature_custom_dns
-            FeatureIndicator.SERVER_IP_OVERRIDE -> R.string.feature_server_ip_override
+            FeatureIndicator.SERVER_IP_OVERRIDE -> R.string.server_ip_override
             FeatureIndicator.CUSTOM_MTU -> R.string.feature_custom_mtu
             FeatureIndicator.DAITA -> R.string.daita
             FeatureIndicator.MULTIHOP -> R.string.multihop

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt

@@ -179,7 +179,7 @@ fun ServerIpOverridesScreen(
     var showBottomSheet by remember { mutableStateOf(false) }
 
     ScaffoldWithMediumTopBar(
-        appBarTitle = stringResource(id = R.string.server_ip_overrides),
+        appBarTitle = stringResource(id = R.string.server_ip_override),
         navigationIcon = { NavigateBackIconButton(onNavigateBack = onBackClick) },
         actions = {
             TopBarActions(

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt

@@ -694,7 +694,7 @@ fun VpnSettingsScreen(
 @Composable
 private fun ServerIpOverrides(onServerIpOverridesClick: () -> Unit) {
     NavigationComposeCell(
-        title = stringResource(id = R.string.server_ip_overrides),
+        title = stringResource(id = R.string.server_ip_override),
         onClick = onServerIpOverridesClick,
     )
 }

android/lib/resource/src/main/res/values-da/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">%1$s mere...</string>
     <string name="feature_quantum_resistant">Kvantemodstand</string>
-    <string name="feature_server_ip_override">Server IP tilsidesættelse</string>
     <string name="feature_split_tunneling">Split tunneling</string>
     <string name="feature_udp_2_tcp">Tilsløring</string>
     <string name="filter">Filter</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Hvis det er nødvendigt, kontakter vi dig på %1$s</string>
     <string name="sent_thanks">Tak!</string>
     <string name="server">Server</string>
+    <string name="server_ip_override">Server IP tilsidesættelse</string>
     <string name="server_ip_overrides_active">Tilsidesættelser aktive</string>
     <string name="server_ip_overrides_import_by">Importer nye tilsidesættelser med</string>
     <string name="server_ip_overrides_import_by_file">Fil</string>

android/lib/resource/src/main/res/values-de/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">%1$s weitere …</string>
     <string name="feature_quantum_resistant">Quantenresistenz</string>
-    <string name="feature_server_ip_override">Server-IP überschreiben</string>
     <string name="feature_split_tunneling">Split Tunneling</string>
     <string name="feature_udp_2_tcp">Verschleierung</string>
     <string name="filter">Filter</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Bei Bedarf werden wir Sie über %1$s kontaktieren</string>
     <string name="sent_thanks">Danke!</string>
     <string name="server">Server</string>
+    <string name="server_ip_override">Server-IP überschreiben</string>
     <string name="server_ip_overrides_active">Überschreibungen aktiv</string>
     <string name="server_ip_overrides_import_by">Neue Überschreibungen importieren via</string>
     <string name="server_ip_overrides_import_by_file">Datei</string>

android/lib/resource/src/main/res/values-es/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">%1$s más...</string>
     <string name="feature_quantum_resistant">Resistencia cuántica</string>
-    <string name="feature_server_ip_override">Anulación de IP de servidor</string>
     <string name="feature_split_tunneling">«Split tunneling»</string>
     <string name="feature_udp_2_tcp">Ofuscación</string>
     <string name="filter">Filtrar</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Si es necesario, le enviaremos un correo electrónico a %1$s</string>
     <string name="sent_thanks">¡Gracias!</string>
     <string name="server">Servidor</string>
+    <string name="server_ip_override">Anulación de IP de servidor</string>
     <string name="server_ip_overrides_active">Anulaciones activas</string>
     <string name="server_ip_overrides_import_by">Importar nuevas anulaciones por</string>
     <string name="server_ip_overrides_import_by_file">Archivo</string>

android/lib/resource/src/main/res/values-fi/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">%1$s lisää...</string>
     <string name="feature_quantum_resistant">Kvanttihyökkäysten esto</string>
-    <string name="feature_server_ip_override">Palvelimen IP-osoitteen ohitus</string>
     <string name="feature_split_tunneling">Sovelluskohtainen yhdistäminen</string>
     <string name="feature_udp_2_tcp">Hämäysteknologia</string>
     <string name="filter">Suodatin</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Tarvittaessa otamme sinuun yhteyttä osoitteeseen %1$s</string>
     <string name="sent_thanks">Kiitos!</string>
     <string name="server">Palvelin</string>
+    <string name="server_ip_override">Palvelimen IP-osoitteen ohitus</string>
     <string name="server_ip_overrides_active">Ohituksia on käytössä</string>
     <string name="server_ip_overrides_import_by">Uusien ohitusten tuontitapa</string>
     <string name="server_ip_overrides_import_by_file">Tiedosto</string>

android/lib/resource/src/main/res/values-fr/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">%1$s autre(s)...</string>
     <string name="feature_quantum_resistant">Résistance quantique</string>
-    <string name="feature_server_ip_override">Substitution d\'IP de serveur</string>
     <string name="feature_split_tunneling">Split tunneling</string>
     <string name="feature_udp_2_tcp">Dissimulation</string>
     <string name="filter">Filtrer</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Si nécessaire, nous vous contacterons à l\'adresse %1$s</string>
     <string name="sent_thanks">Merci !</string>
     <string name="server">Serveur</string>
+    <string name="server_ip_override">Substitution d\'IP de serveur</string>
     <string name="server_ip_overrides_active">Substitutions actives</string>
     <string name="server_ip_overrides_import_by">Importer les nouvelles substitutions depuis</string>
     <string name="server_ip_overrides_import_by_file">Fichier</string>

android/lib/resource/src/main/res/values-it/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">Altri %1$s...</string>
     <string name="feature_quantum_resistant">Resistenza ad attacchi quantistici</string>
-    <string name="feature_server_ip_override">Sovrascritture IP server</string>
     <string name="feature_split_tunneling">Split tunneling</string>
     <string name="feature_udp_2_tcp">Offuscamento</string>
     <string name="filter">Filtra</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Se necessario, ti contatteremo all\'indirizzo %1$s</string>
     <string name="sent_thanks">Grazie!</string>
     <string name="server">Server</string>
+    <string name="server_ip_override">Sovrascritture IP server</string>
     <string name="server_ip_overrides_active">Sovrascritture attive</string>
     <string name="server_ip_overrides_import_by">Importa nuove sovrascritture tramite</string>
     <string name="server_ip_overrides_import_by_file">File</string>

android/lib/resource/src/main/res/values-ja/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">その他%1$s件…</string>
     <string name="feature_quantum_resistant">耐量子</string>
-    <string name="feature_server_ip_override">サーバーIPのオーバーライド</string>
     <string name="feature_split_tunneling">スプリットトンネリング</string>
     <string name="feature_udp_2_tcp">難読化</string>
     <string name="filter">絞り込み</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">必要に応じて %1$s 宛にご連絡します　</string>
     <string name="sent_thanks">ありがとうございます！</string>
     <string name="server">サーバー</string>
+    <string name="server_ip_override">サーバーIPのオーバーライド</string>
     <string name="server_ip_overrides_active">オーバーライドは有効です</string>
     <string name="server_ip_overrides_import_by">新しいオーバーライドのインポート</string>
     <string name="server_ip_overrides_import_by_file">ファイル</string>

android/lib/resource/src/main/res/values-ko/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">%1$s개 더 보기...</string>
     <string name="feature_quantum_resistant">양자 저항</string>
-    <string name="feature_server_ip_override">서버 IP 재정의</string>
     <string name="feature_split_tunneling">분할 터널링</string>
     <string name="feature_udp_2_tcp">난독 처리</string>
     <string name="filter">필터</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">필요한 경우 %1$s(으)로 연락드리겠습니다.</string>
     <string name="sent_thanks">감사합니다!</string>
     <string name="server">서버</string>
+    <string name="server_ip_override">서버 IP 재정의</string>
     <string name="server_ip_overrides_active">재정의 활성화</string>
     <string name="server_ip_overrides_import_by">다음으로 새로운 재정의 가져오기:</string>
     <string name="server_ip_overrides_import_by_file">파일</string>

android/lib/resource/src/main/res/values-my/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">နောက်ထပ် %1$s ခု...</string>
     <string name="feature_quantum_resistant">Quantum ခုခံမှု</string>
-    <string name="feature_server_ip_override">ဆာဗာ IP ကျော်လွန် ပယ်ဖျက်မှု</string>
     <string name="feature_split_tunneling">Split Tunneling</string>
     <string name="feature_udp_2_tcp">Obfuscation</string>
     <string name="filter">စစ်ထုတ်မှု</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">လိုအပ်ပါက %1$s မှတစ်ဆင့် ကျွန်ုပ်တို့ထံ ဆက်သွယ်ပါ</string>
     <string name="sent_thanks">ကျေးဇူးတင်ပါသည်။</string>
     <string name="server">ဆာဗာ</string>
+    <string name="server_ip_override">ဆာဗာ IP ကျော်လွန် ပယ်ဖျက်မှု</string>
     <string name="server_ip_overrides_active">ကျော်လွန် ပယ်ဖျက်မှုများ သက်ဝင်နေသည်</string>
     <string name="server_ip_overrides_import_by">ဖော်ပြပါဖြင့် ကျော်လွန် ပယ်ဖျက်မှုအသစ်များကို ထည့်သွင်းရန်</string>
     <string name="server_ip_overrides_import_by_file">ဖိုင်</string>

android/lib/resource/src/main/res/values-nb/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">%1$s til …</string>
     <string name="feature_quantum_resistant">Kvantemotstand</string>
-    <string name="feature_server_ip_override">Overstyring av server-IP</string>
     <string name="feature_split_tunneling">Delt tunnelering</string>
     <string name="feature_udp_2_tcp">Tilsløring</string>
     <string name="filter">Filter</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Vi vil kontakte deg på %1$s ved behov</string>
     <string name="sent_thanks">Takk!</string>
     <string name="server">Server</string>
+    <string name="server_ip_override">Overstyring av server-IP</string>
     <string name="server_ip_overrides_active">Overstyringer aktive</string>
     <string name="server_ip_overrides_import_by">Importer nye overstyringer via</string>
     <string name="server_ip_overrides_import_by_file">Fil</string>

android/lib/resource/src/main/res/values-nl/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">Nog %1$s...</string>
     <string name="feature_quantum_resistant">Kwantumbestendigheid</string>
-    <string name="feature_server_ip_override">Overschrijving van server-IP-adressen</string>
     <string name="feature_split_tunneling">Split tunneling</string>
     <string name="feature_udp_2_tcp">Obfuscatie</string>
     <string name="filter">Filter</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Indien nodig nemen we u contact op via %1$s</string>
     <string name="sent_thanks">Bedankt!</string>
     <string name="server">Server</string>
+    <string name="server_ip_override">Overschrijving van server-IP-adressen</string>
     <string name="server_ip_overrides_active">Overschrijvingen actief</string>
     <string name="server_ip_overrides_import_by">Nieuwe overschrijvingen importeren vanuit</string>
     <string name="server_ip_overrides_import_by_file">Bestand</string>

android/lib/resource/src/main/res/values-pl/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">Jeszcze %1$s...</string>
     <string name="feature_quantum_resistant">Odporność na ataki z użyciem komputerów kwantowych</string>
-    <string name="feature_server_ip_override">Zastąpienie adresu IP serwera</string>
     <string name="feature_split_tunneling">Dzielone tunelowanie</string>
     <string name="feature_udp_2_tcp">Zaciemnianie</string>
     <string name="filter">Filtruj</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">W razie potrzeby skontaktujemy się z Tobą pod adresem %1$s</string>
     <string name="sent_thanks">Dziękujemy!</string>
     <string name="server">Serwer</string>
+    <string name="server_ip_override">Zastąpienie adresu IP serwera</string>
     <string name="server_ip_overrides_active">Zastąpienia aktywne</string>
     <string name="server_ip_overrides_import_by">Importuj nowe zastąpienia z</string>
     <string name="server_ip_overrides_import_by_file">Plik</string>

android/lib/resource/src/main/res/values-pt/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">Mais %1$s...</string>
     <string name="feature_quantum_resistant">Resistência quântica</string>
-    <string name="feature_server_ip_override">Substituição de IP de servidor</string>
     <string name="feature_split_tunneling">Divisão do túnel</string>
     <string name="feature_udp_2_tcp">Ofuscação</string>
     <string name="filter">Filtrar</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Se necessário, iremos contactá-lo através de %1$s</string>
     <string name="sent_thanks">Obrigado!</string>
     <string name="server">Servidor</string>
+    <string name="server_ip_override">Substituição de IP de servidor</string>
     <string name="server_ip_overrides_active">Substituições ativas</string>
     <string name="server_ip_overrides_import_by">Importar novas substituições através de</string>
     <string name="server_ip_overrides_import_by_file">Ficheiro</string>

android/lib/resource/src/main/res/values-ru/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">Еще %1$s...</string>
     <string name="feature_quantum_resistant">Квантовая устойчивость</string>
-    <string name="feature_server_ip_override">Переопределение IP-адреса сервера</string>
     <string name="feature_split_tunneling">Раздельное туннелирование</string>
     <string name="feature_udp_2_tcp">Обфускация</string>
     <string name="filter">Фильтр</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">При необходимости мы свяжемся с вами по адресу %1$s</string>
     <string name="sent_thanks">Спасибо!</string>
     <string name="server">Сервер</string>
+    <string name="server_ip_override">Переопределение IP-адреса сервера</string>
     <string name="server_ip_overrides_active">Переопределения активны</string>
     <string name="server_ip_overrides_import_by">Импорт новых переопределений:</string>
     <string name="server_ip_overrides_import_by_file">Файл</string>

android/lib/resource/src/main/res/values-sv/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">%1$s till ...</string>
     <string name="feature_quantum_resistant">Kvantresistens</string>
-    <string name="feature_server_ip_override">Åsidosättning av server-IP</string>
     <string name="feature_split_tunneling">Split tunneling</string>
     <string name="feature_udp_2_tcp">Obfuskering</string>
     <string name="filter">Filtrera</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Om det behövs kontaktar vi dig på %1$s</string>
     <string name="sent_thanks">Tack!</string>
     <string name="server">Server</string>
+    <string name="server_ip_override">Åsidosättning av server-IP</string>
     <string name="server_ip_overrides_active">Åsidosättningar aktiva</string>
     <string name="server_ip_overrides_import_by">Importera nya åsidosättningar med</string>
     <string name="server_ip_overrides_import_by_file">Fil</string>

android/lib/resource/src/main/res/values-th/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">อีก %1$s...</string>
     <string name="feature_quantum_resistant">การต่อต้านควอนตัม</string>
-    <string name="feature_server_ip_override">โอเวอร์ไรด์ IP เซิร์ฟเวอร์</string>
     <string name="feature_split_tunneling">การแยกอุโมงค์</string>
     <string name="feature_udp_2_tcp">การทำให้ข้อมูลยุ่งเหยิง</string>
     <string name="filter">ตัวกรอง</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">เราจะติดต่อคุณไปทาง %1$s ในกรณีจำเป็น</string>
     <string name="sent_thanks">ขอบคุณ!</string>
     <string name="server">เซิร์ฟเวอร์</string>
+    <string name="server_ip_override">โอเวอร์ไรด์ IP เซิร์ฟเวอร์</string>
     <string name="server_ip_overrides_active">เปิดใช้โอเวอร์ไรด์อยู่</string>
     <string name="server_ip_overrides_import_by">นำเข้าโอเวอร์ไรด์ใหม่โดยใช้</string>
     <string name="server_ip_overrides_import_by_file">ไฟล์</string>

android/lib/resource/src/main/res/values-tr/strings.xml

@@ -177,7 +177,6 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_indicators_show_more">%1$s tane daha...</string>
     <string name="feature_quantum_resistant">Kuantum direnci</string>
-    <string name="feature_server_ip_override">Sunucu IP\'sini geçersiz kılma</string>
     <string name="feature_split_tunneling">Bölünmüş tünelleme</string>
     <string name="feature_udp_2_tcp">Gizleme</string>
     <string name="filter">Filtrele</string>
@@ -311,6 +310,7 @@
     <string name="sent_contact">Gerektiğinde sizinle %1$s adresinden iletişime geçeceğiz</string>
     <string name="sent_thanks">Teşekkürler!</string>
     <string name="server">Sunucu</string>
+    <string name="server_ip_override">Sunucu IP\'sini geçersiz kılma</string>
     <string name="server_ip_overrides_active">Geçersiz kılmalar etkin</string>
     <string name="server_ip_overrides_import_by">Şuradaki yeni geçersiz kılmaları içe aktar</string>
     <string name="server_ip_overrides_import_by_file">Dosya</string>