From 4435a790efaf55286d2f5c322e9f78322c251e55 Mon Sep 17 00:00:00 2001
From: kruks23 <scardenas@openmailbox.org>
Date: Wed, 24 Sep 2014 11:14:47 +0200
Subject: [PATCH 1/4] Update Spanish Translations

---
 res/values-es/strings.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d6fbc7cb7..85d1d7842 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

From 642a70765ce028419a0577d730a009bfbbf6ffb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Wei=C3=9F?= <holger@zedat.fu-berlin.de>
Date: Wed, 24 Sep 2014 22:52:02 +0200
Subject: [PATCH 2/4] Add missing German translations

---
 res/values-de/arrays.xml  | 7 +++++++
 res/values-de/strings.xml | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index e468f478b..9b429c5a7 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 14397e163..0c230ec64 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>

From 9fef0d1a997f9b70403f11560814f260e354bf1a Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Fri, 26 Sep 2014 21:06:36 +0200
Subject: [PATCH 3/4] fix lint-warning: Wrong locale name

The Hebrew ("he") language code is rewritten as "iw"
---
 res/{values-he => values-iw}/arrays.xml  | 0
 res/{values-he => values-iw}/strings.xml | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename res/{values-he => values-iw}/arrays.xml (100%)
 rename res/{values-he => values-iw}/strings.xml (100%)

diff --git a/res/values-he/arrays.xml b/res/values-iw/arrays.xml
similarity index 100%
rename from res/values-he/arrays.xml
rename to res/values-iw/arrays.xml
diff --git a/res/values-he/strings.xml b/res/values-iw/strings.xml
similarity index 100%
rename from res/values-he/strings.xml
rename to res/values-iw/strings.xml

From 1d42385e0e1e3da85f22125a11e39d32d09bebf4 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Fri, 26 Sep 2014 21:21:58 +0200
Subject: [PATCH 4/4] fix lint-warning: Hardcoded text

---
 res/layout/dialog_verify_otr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
index 831f06edc..499ef6cde 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" />