aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values-de/strings.xml2
-rw-r--r--src/main/res/values-el/strings.xml2
-rw-r--r--src/main/res/values-es/strings.xml2
-rw-r--r--src/main/res/values-eu/strings.xml2
-rw-r--r--src/main/res/values-fr/strings.xml2
-rw-r--r--src/main/res/values/arrays.xml8
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/xml/preferences.xml7
8 files changed, 0 insertions, 27 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 4fe210b35..651fe4a18 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -98,8 +98,6 @@
<string name="contact_has_no_pgp_key">Pix-Art Messenger ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil dein Kontakt seinen Schlüssel nicht preisgibt.\n\n<small>Bitte deinen Kontakt darum, OpenPGP zu installieren.</small> </string>
<string name="no_pgp_keys">Keine OpenPGP-Schlüssel gefunden</string>
<string name="pref_general">Allgemeines</string>
- <string name="pref_xmpp_resource">XMPP-Ressource</string>
- <string name="pref_xmpp_resource_summary">Der Name, mit dem sich der Client selbst identifiziert</string>
<string name="pref_accept_files_wifi">Dateien im WLAN annehmen</string>
<string name="pref_accept_files_summary_wifi">Im WLAN-Netz Dateien automatisch annehmen, die kleiner sind als …</string>
<string name="pref_accept_files_mobile">Dateien im Mobilen Netz annehmen</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index e2ba1c36f..e858b762d 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -81,8 +81,6 @@
<string name="contact_has_no_pgp_key">Το Pix-Art Messenger αδυνατεί να κρυπτογραφήσει τα μηνύματά σας γιατί η επαφή σας δεν ανακοινώνει το δημόσιο κλειδί της.\n\n<small>Παρακαλώ ζητήστε από την επαφή σας να εγκαταστήσει το OpenPGP.</small></string>
<string name="no_pgp_keys">Δεν βρέθηκαν κλειδιά OpenPGP</string>
<string name="pref_general">Γενικά</string>
- <string name="pref_xmpp_resource">πόρος XMPP</string>
- <string name="pref_xmpp_resource_summary">Το όνομα με το οποίο ταυτοποιείται αυτό το πρόγραμμα-πελάτης</string>
<string name="pref_notifications">Ειδοποιήσεις</string>
<string name="pref_notifications_summary">Ειδοποίηση όταν λαμβάνεται ένα νέο μήνυμα</string>
<string name="pref_vibrate">Δόνηση</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index c04989676..dbb41aa73 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -98,8 +98,6 @@
<string name="contact_has_no_pgp_key">Pix-Art Messenger no ha podido cifrar tus mensajes porque tu contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
<string name="no_pgp_keys">Claves OpenPGP no encontradas</string>
<string name="pref_general">General</string>
- <string name="pref_xmpp_resource">Recurso</string>
- <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string>
<string name="pref_accept_files_wifi">Aceptar archivos en conexiones WiFi</string>
<string name="pref_accept_files_summary_wifi">Cuando se conecta a wifi acepta automáticamente el descargo de archivos más pequeños que…</string>
<string name="pref_accept_files_mobile">Aceptar archivos en conexiones de red móvil</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 67de52095..8932df618 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -96,8 +96,6 @@
<string name="contact_has_no_pgp_key">Pix-Art Messenger ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\n<small>Mesedez eskatu ezaiozu zure kontaktuari openPGP konfigura dezan.</small></string>
<string name="no_pgp_keys">Ez da OpenPGP gakorik aurkitu</string>
<string name="pref_general">Orokorrak</string>
- <string name="pref_xmpp_resource">XMPP baliabidea</string>
- <string name="pref_xmpp_resource_summary">Bezero honek bere burua aurkezteko erabiltzen duen izena</string>
<string name="pref_attachments">Eranskinak</string>
<string name="pref_notification_settings">Jakinarazpena</string>
<string name="pref_notifications">Jakinarazpenak</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 703ae20d7..1187a3a6c 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -94,8 +94,6 @@
<string name="contact_has_no_pgp_key">Pix-Art Messenger ne peut pas chiffrer vos messages car votre contact n\'a pas communiqué sa clef publique.\n\n<small>Demandez-lui de configurer OpenPGP.</small></string>
<string name="no_pgp_keys">Aucune clef OpenPGP n\'a été trouvée.</string>
<string name="pref_general">Général</string>
- <string name="pref_xmpp_resource">Ressource XMPP</string>
- <string name="pref_xmpp_resource_summary">Nom utilisé par ce client pour s\'identifier</string>
<string name="pref_attachments">Pièces jointes</string>
<string name="pref_notifications_summary">Notifier lors de la réception d\'un message</string>
<string name="pref_vibrate">Vibration</string>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 6c0784aef..a8737275f 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
-
- <string-array name="resources">
- <item>Mobile</item>
- <item>Phone</item>
- <item>Tablet</item>
- <item>@string/app_name</item>
- <item>Android</item>
- </string-array>
<string-array name="filesizes">
<item>@string/never</item>
<item>256 KiB</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index cb267033e..6e65e6803 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -97,8 +97,6 @@
<string name="contact_has_no_pgp_key">Pix-Art Messenger is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string>
<string name="no_pgp_keys">No OpenPGP Keys found</string>
<string name="pref_general">General</string>
- <string name="pref_xmpp_resource">XMPP resource</string>
- <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
<string name="pref_accept_files_wifi">Accept files in WiFi connections</string>
<string name="pref_accept_files_summary_wifi">When connected to wifi automatically accept files smaller than…</string>
<string name="pref_accept_files_mobile">Accept files in mobile connections</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 70fbf4484..61120254a 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -265,13 +265,6 @@
</intent>
<PreferenceCategory android:title="@string/pref_general"
android:key="general">
- <ListPreference
- android:defaultValue="@string/default_resource"
- android:entries="@array/resources"
- android:entryValues="@array/resources"
- android:key="resource"
- android:summary="@string/pref_xmpp_resource_summary"
- android:title="@string/pref_xmpp_resource" />
<CheckBoxPreference
android:defaultValue="@bool/show_foreground_service"
android:key="show_foreground_service"