aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/dialog_verify_otr.xml2
-rw-r--r--res/values-de/arrays.xml7
-rw-r--r--res/values-de/strings.xml2
-rw-r--r--res/values-es/strings.xml7
-rw-r--r--res/values-iw/arrays.xml (renamed from res/values-he/arrays.xml)0
-rw-r--r--res/values-iw/strings.xml (renamed from res/values-he/strings.xml)0
6 files changed, 17 insertions, 1 deletions
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
index 831f06ed..499ef6cd 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/res/layout/dialog_verify_otr.xml
@@ -11,7 +11,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
- android:text="Jabber ID"
+ android:text="@string/account_settings_jabber_id"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeHeadline" />
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index e468f478..9b429c5a 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -20,5 +20,12 @@
<item>524288</item>
<item>1048576</item>
</string-array>
+ <string-array name="mute_options_descriptions">
+ <item>30 Minuten</item>
+ <item>eine Stunde</item>
+ <item>2 Stunden</item>
+ <item>8 Stunden</item>
+ <item>bis auf Widerruf</item>
+ </string-array>
</resources> \ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 14397e16..0c230ec6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -259,5 +259,7 @@
<string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
<string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
<string name="pref_expert_options_other">Sonstiges</string>
+ <string name="pref_conference_name">Konferenz-Name</string>
+ <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Name verwenden</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d6fbc7cb..85d1d784 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -254,5 +254,12 @@
<string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
<string name="pref_use_larger_font">Incrementar tamaño de fuente</string>
<string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string>
+ <string name="pref_use_send_button_to_indicate_status">Botón enviar indica estado</string>
+ <string name="pref_use_indicate_received">Solicitar entrega de mensaje</string>
+ <string name="pref_use_indicate_received_summary">Cuando el contacto reciba el mensaje será indicado con una marca verde. Cuidado, esto podría no funcionar en todos los casos.</string>
+ <string name="pref_use_send_button_to_indicate_status_summary">El color del botón enviar indica el estado del contacto</string>
+ <string name="pref_expert_options_other">Otros</string>
+ <string name="pref_conference_name">Nombre de conferencia</string>
+ <string name="pref_conference_name_summary">Usar el asunto de la conferencia en lugar del identificador jabber como nombre de conferencia</string>
</resources> \ No newline at end of file
diff --git a/res/values-he/arrays.xml b/res/values-iw/arrays.xml
index 28768d6c..28768d6c 100644
--- a/res/values-he/arrays.xml
+++ b/res/values-iw/arrays.xml
diff --git a/res/values-he/strings.xml b/res/values-iw/strings.xml
index fd8eaa0b..fd8eaa0b 100644
--- a/res/values-he/strings.xml
+++ b/res/values-iw/strings.xml