Merge branch 'master' into playstore

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

@@ -74,7 +74,6 @@
     <string name="conn_status_unreachable">Inalcanzable</string>
     <string name="other_prefs">Otros</string>
     <string name="app_language">Idioma de la app</string>
-    <string name="lang_english">Inglés</string>
     <string name="system_default">Predeterminado del sistema</string>
     <string name="no_activity_file_selection">No se encontró una app como administrador de archivos</string>
     <string name="socks5_proxy">SOCKS5</string>
@@ -261,7 +260,6 @@
     <string name="warning">Advertencia</string>
     <string name="paid_features_unlocked">Funciones de pago desbloqueadas. Reinicia la captura si se está ejecutando</string>
     <string name="payload_truncated">La carga útil está truncada. Para mostrarla completa, detén la captura y activa \"%1$s\" desde los ajustes de PCAPdroid</string>
-    <string name="display_as">Mostrar como…</string>
     <string name="privacy_first">La privacidad es lo primero</string>
     <string name="permission_granted">El permiso %1$s fue concedido</string>
     <string name="rx_direction">RX</string>
@@ -288,7 +286,6 @@
     <string name="warn_no_app_data">No se han intercambiado datos</string>
     <string name="waiting_application_data">Esperando datos</string>
     <string name="text">Texto</string>
-    <string name="printable_text">Texto mostrable</string>
     <string name="hexdump">Hexadécimal</string>
     <string name="display_as_text">Mostrar como texto</string>
     <string name="display_as_hexdump">Mostrar como volcado hexadecimal</string>

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

@@ -51,7 +51,6 @@
     <string name="conn_status_unreachable">Injoignable</string>
     <string name="other_prefs">Autre</string>
     <string name="app_language">Langue</string>
-    <string name="lang_english">anglais</string>
     <string name="system_default">Paramètre par défaut du système</string>
     <string name="no_activity_file_selection">Aucune application trouvée pour gérer la sélection des fichiers</string>
     <string name="file_saved_with_name">Fichier enregistré sous le nom de « %1$s »</string>
@@ -232,9 +231,7 @@
     <string name="decryption_filter">Décryptage : %1$s</string>
     <string name="network_traffic">Trafic</string>
     <string name="warn_no_app_data">Aucune donnée de l\'app n\'a été echangée</string>
-    <string name="display_as">Afficher comme…</string>
     <string name="hexdump">En hexadécimal</string>
-    <string name="printable_text">En texte à imprimer</string>
     <string name="geolocation">Géolocalisation</string>
     <string name="downloading">Téléchargement…</string>
     <string name="database">Base de données</string>

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

@@ -74,7 +74,6 @@
     <string name="conn_status_unreachable">到達不能</string>
     <string name="other_prefs">その他</string>
     <string name="app_language">アプリの言語</string>
-    <string name="lang_english">英語</string>
     <string name="system_default">システム標準</string>
     <string name="no_activity_file_selection">ファイル選択を処理するアプリが見つかりません</string>
     <string name="file_saved_with_name">「%1$s」としてファイルを保存しました</string>

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

@@ -75,7 +75,6 @@
     <string name="error">에러</string>
     <string name="conn_status_unreachable">도달할 수 없음</string>
     <string name="app_language">앱 언어</string>
-    <string name="lang_english">English</string>
     <string name="no_activity_file_selection">선택한 파일을 처리할 수 있는 앱을 찾을 수 없습니다</string>
     <string name="socks5_proxy">SOCKS5</string>
     <string name="system_default">시스템</string>

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

@@ -116,7 +116,6 @@
     <string name="deny">Nekt</string>
     <string name="country">Land</string>
     <string name="other_prefs">Annet</string>
-    <string name="lang_english">Engelsk</string>
     <string name="system_default">System</string>
     <string name="socks5_proxy">Skru på SOCKS5-mellomtjener</string>
     <string name="blacklists">Svartelister</string>
@@ -303,8 +302,6 @@
     <string name="http">HTTP</string>
     <string name="not_decryptable">Ikke dekrypterbar</string>
     <string name="rx_direction">RX</string>
-    <string name="display_as">Vis som …</string>
-    <string name="printable_text">Utskrivbar tekst</string>
     <string name="hexdump">Heksadesimal dump</string>
     <string name="geolocation">Geoposisjon</string>
     <string name="geolocation_summary">Vis land og ASN-info ved å utføre frakoblet oppslag</string>