diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e3022d1c..f104eefa 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -23,7 +23,6 @@
     <string name="http_server">HTTP-Server</string>
     <string name="no_dump">Keiner</string>
     <string name="http_server_info">Starte einen HTTP-Server für den PCAP download</string>
-    <string name="dump_mode">Dump-Modus</string>
     <string name="user_guide">Benutzerhandbuch</string>
     <string name="open_telegram_group">Telegram-Gruppe</string>
     <string name="source_code">Quellcode</string>
@@ -99,7 +98,6 @@
     <string name="older_connections_notice">%1$d älter Verbindungen werden nicht angezeigt</string>
     <string name="tls_how_to">So richtest du die TLS-Entschlüsselung ein</string>
     <string name="unknown_app">Unbekannt</string>
-    <string name="enable_ipv6">IPv6 aktivieren</string>
     <string name="enable_ipv6_summary">IPv6-Verbindungen zum Internet zulassen. Verwende dies nur in Netzwerken mit einem IPv6-Gateway</string>
     <string name="error">Fehler</string>
     <string name="conn_status_unreachable">Unerreichbar</string>
@@ -113,7 +111,6 @@
     <string name="no_activity_file_selection">Keine App für die Dateiauswahl gefunden</string>
     <string name="about_text">PCAPdroid ist ein Open-Source-Netzwerkaufnahme- und Überwachungswerkzeug, das ohne Root-Rechte funktioniert</string>
     <string name="app_theme">Thema</string>
-    <string name="enable_socks5_proxy">SOCKS5-Proxy aktivieren</string>
     <string name="proxy">Proxy</string>
     <string name="proxy_ip_address">Proxy-IP-Adresse</string>
     <string name="proxy_port">Proxy-Port</string>
@@ -207,7 +204,6 @@
     <string name="block">Blockieren…</string>
     <string name="firewall">Firewall</string>
     <string name="firewall_rules">Firewall-Regeln</string>
-    <string name="firewall_help">Diese Liste enthält Regeln zum Blockieren von Verbindungen</string>
     <string name="blocked_pkts">Blockiert</string>
     <string name="n_pkts">%1$s Pkt</string>
     <string name="show_only_blocked">Blockiert durch Firewall</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 73d89664..964f3139 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -210,7 +210,6 @@
     <string name="can_use_purchased_feature">Ahora puedes utilizar la función comprada</string>
     <string name="save_ok">Guardado</string>
     <string name="loading_apps">Cargando apps…</string>
-    <string name="firewall_help">Esta lista contiene reglas para bloquear conexiones</string>
     <string name="decryption_no_filter_warn">Selecciona una aplicación de destino al descifrar TLS para evitar perder la conexión a Internet</string>
     <string name="file_saved_with_name">Archivo guardado como \"%1$s\"</string>
     <string name="loading">Cargando…</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1dc83795..2f7aaa50 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -215,7 +215,6 @@
     <string name="firewall_rules">Règles du par-feu</string>
     <string name="paid_features">Fonctionnalités payantes</string>
     <string name="unlock_code">Code de déverrouillage</string>
-    <string name="firewall_help">Cette liste contient des règles pour bloquer les connexions</string>
     <string name="show_only_blocked">Bloqué par le par-feu</string>
     <string name="no_intent_handler_found">Aucune application pour cette action</string>
     <string name="decryption_no_filter_warn">Sélectionnez une application cible lors du décryptage TLS pour éviter de perdre votre connexion internet</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index d681363b..d6995255 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -51,7 +51,6 @@
     <string name="malware_detection_learn_more">Pelajari lebih lanjut tentang fitur deteksi malware</string>
     <string name="block">Blokir…</string>
     <string name="firewall">Firewall</string>
-    <string name="firewall_help">Daftar ini berisi aturan untuk memblokir koneksi</string>
     <string name="show_only_blocked">Diblokir oleh firewall</string>
     <string name="blocked_connection_filter">diblokir</string>
     <string name="invalid">Tidak sah</string>
@@ -81,7 +80,6 @@
     <string name="open_telegram_group">Grup telegram</string>
     <string name="source_code">Kode sumber</string>
     <string name="yes">Ya</string>
-    <string name="dump_mode">Mode dump</string>
     <string name="stats">Statistik</string>
     <string name="tot_connections">Jumlah koneksi</string>
     <string name="open_sockets">Buka soket</string>
@@ -104,14 +102,12 @@
     <string name="about_text">PCAPdroid adalah alat penangkapan dan pemantauan jaringan sumber terbuka yang bekerja tanpa hak akses root</string>
     <string name="get_app">Dapatkan:</string>
     <string name="tls_how_to">Cara mengatur dekripsi TLS</string>
-    <string name="enable_ipv6">Aktifkan IPv6</string>
     <string name="error">Kesalahan</string>
     <string name="app_language">Bahasa</string>
     <string name="no_activity_file_selection">Tidak ada aplikasi yang ditemukan untuk menangani pemilihan file</string>
     <string name="file_saved_with_name">File disimpan sebagai \"%1$s\"</string>
     <string name="theme_dark">Gelap</string>
     <string name="app_theme">Tema</string>
-    <string name="enable_socks5_proxy">Aktifkan proxy SOCKS5</string>
     <string name="enable_socks5_proxy_summary">Arahkan ulang semua koneksi TCP ke proxy SOCKS5 yang ditentukan</string>
     <string name="proxy_port">Port proksi</string>
     <string name="root_capture">Capture dengan akses root</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 80ff78c7..b2a49c9f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -197,7 +197,6 @@
     <string name="block">Blocca…</string>
     <string name="firewall">Firewall</string>
     <string name="firewall_rules">Regole del firewall</string>
-    <string name="firewall_help">Questa lista contiene regole per bloccare le connessioni</string>
     <string name="blocked_pkts">Bloccata</string>
     <string name="n_pkts">%1$s pacchetti</string>
     <string name="show_only_blocked">Bloccate dal firewall</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f5d41a90..9f5f481a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -201,7 +201,6 @@
     <string name="block">ブロック…</string>
     <string name="firewall">ファイアウォール</string>
     <string name="firewall_rules">ファイアウォール ルール</string>
-    <string name="firewall_help">このリストは接続をブロックするルールが含まれています</string>
     <string name="blocked_pkts">ブロック済み</string>
     <string name="n_pkts">%1$s パケット</string>
     <string name="show_only_blocked">ファイアウォールによるブロック</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 4ba075e1..98a1060d 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -168,7 +168,6 @@
     <string name="private_dns_message_notice">Privat DNS forhindrer PCAPdroid fra å inspisere DNS-trafikk. Du kan skru det av fra Android-nettverksinnstillingene.</string>
     <string name="n_pkts">%1$s pakker</string>
     <string name="private_dns_hinders_detection">Privat DNS forhindrer oppdagelse</string>
-    <string name="firewall_help">Denne listen inneholder regler for blokkering av tilkoblinger</string>
     <string name="decryption_no_filter_warn">Velg et målprogram når du dekrypterer TLS for å unngå å miste tilkoblingen din til Internett</string>
     <string name="billing_failure">Kunne ikke koble til Google Play. Prøv igjen om en stund.</string>
     <string name="item_redeemed">Anvendt</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ed6b6cb8..2c704ce5 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -30,16 +30,9 @@
     <string name="http_server_info">Inicia um servidor HTTP para o download do PCAP</string>
     <string name="udp_exporter_info">Envia o PCAP para um receptor UDP remoto</string>
     <string name="http_server_port">Porta do servidor HTTP</string>
-<<<<<<< HEAD
     <string name="receiver_ip_address">Endereço IP do coletor</string>
     <string name="receiver_port">Porta do coletor</string>
-    <string name="dump_mode">Modo de dados brutos</string>
     <string name="user_guide">Manual do usuário</string>
-=======
-    <string name="receiver_ip_address">Endereço IP do receptor</string>
-    <string name="receiver_port">Porta do receptor</string>
-    <string name="user_guide">Guia do Usuário</string>
->>>>>>> dev
     <string name="open_telegram_group">Grupo no Telegram</string>
     <string name="source_code">Código-fonte</string>
     <string name="yes">Sim</string>
@@ -193,7 +186,6 @@
     <string name="malware_detection_learn_more">Saiba mais sobre o recurso de detecção de malware</string>
     <string name="firewall">Firewall</string>
     <string name="firewall_rules">Regras do Firewall</string>
-    <string name="firewall_help">Esta lista contém regras para bloquear conexões</string>
     <string name="blocked_pkts">Bloqueado</string>
     <string name="n_pkts">%1$s pcts</string>
     <string name="show_only_blocked">Bloqueado por firewall</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5d5d79bb..23463b7b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -210,7 +210,6 @@
     <string name="blocked_connection_filter">заблокировано</string>
     <string name="block">Заблокировать…</string>
     <string name="firewall_rules">Правила для файрвола</string>
-    <string name="firewall_help">Этот список содержит правила блокировки соединений</string>
     <string name="validate">Подтвердить</string>
     <string name="unlock_code">Код разблокировки</string>
     <string name="billing_failure">Не удалось подключиться к Google Play, пожалуйста повторите позже</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5657a5a8..d99cf947 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -5,7 +5,6 @@
     <string name="billing_connecting">Google Play bağlantısı devam ediyor, lütfen biraz sonra tekrar deneyin</string>
     <string name="private_dns_message_notice">Gizli DNS, PCAPdroid\'in DNS trafiğini denetlemesini engeller. Bunu Android ağ ayarlarından kapatabilirsiniz</string>
     <string name="firewall_rules">Güvenlik duvarı kuralları</string>
-    <string name="firewall_help">Bu liste, bağlantıları engellemek için kurallar içerir</string>
     <string name="blocked_pkts">Engellendi</string>
     <string name="learn_more">Daha fazla bilgi edin</string>
     <string name="buy_action">Satın al</string>
@@ -40,7 +39,6 @@
     <string name="http_server_info">PCAP indirmesi için bir HTTP sunucusu başlat</string>
     <string name="udp_exporter_info">PCAP dökümünü uzak bir UDP alıcısına gönderir</string>
     <string name="http_server_port">HTTP sunucusu bağlantı noktası</string>
-    <string name="dump_mode">Döküm modu</string>
     <string name="user_guide">Kullanıcı rehberi</string>
     <string name="stats">İstatistikler</string>
     <string name="active_connections">Etkin bağlantılar</string>
@@ -193,7 +191,6 @@
     <string name="capture_prefs">Yakala</string>
     <string name="pending_transaction">Bu özelliği kullanmak için lütfen işleminizi tamamlayın</string>
     <string name="packets_rcvd">Alınan paketler</string>
-    <string name="enable_ipv6">IPv6\'yı etkinleştir</string>
     <string name="unknown_app_info">\"Bilinmeyen\", uygulaması belirlenemeyen bağlantıları belirtir</string>
     <string name="edit_list">Listeyi düzenle</string>
     <string name="status_uptodate">Güncel</string>
@@ -216,7 +213,6 @@
     <string name="no_activity_file_selection">Dosya seçimini yapacak uygulama bulunamadı</string>
     <string name="theme_dark">Koyu</string>
     <string name="app_theme">Tema</string>
-    <string name="enable_socks5_proxy">SOCKS5 vekili kullanmayı etkinleştir</string>
     <string name="proxy">Vekil</string>
     <string name="proxy_port">Vekil bağlantı noktası</string>
     <string name="root_capture">Root olarak yakala</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9eb1bd1d..65c117ad 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -223,7 +223,6 @@
     <string name="block">拦截…</string>
     <string name="firewall">防火墙</string>
     <string name="firewall_rules">防火墙规则</string>
-    <string name="firewall_help">此列表包含拦截连接的规则</string>
     <string name="blocked_pkts">已拦截</string>
     <string name="n_pkts">%1$s 个数据包</string>
     <string name="show_only_blocked">由防火墙拦截</string>