Merge pull request #349 from kruks23/development

Update Spanish Translations + publish_avatar button and menu conflict

3 files changed, 10 insertions, 2 deletions

diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
index 774c0afa..103f95cc 100644
--- a/res/menu/manageaccounts_context.xml
+++ b/res/menu/manageaccounts_context.xml
@@ -27,7 +27,7 @@
     <item
         android:id="@+id/mgmt_account_publish_avatar"
         android:showAsAction="never"
-        android:title="@string/publish_avatar"/>
+        android:title="@string/mgmt_account_publish_avatar"/>
     <item
         android:id="@+id/mgmt_otr_key"
         android:showAsAction="never"
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index be7e9584..afeb6c8b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -187,6 +187,7 @@
     <string name="mgmt_account_edit">Editar cuenta</string>
     <string name="mgmt_account_delete">Eliminar cuenta</string>
     <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
+    <string name="mgmt_account_publish_avatar">Imagen de perfil</string>
     <string name="mgmt_account_enable">Habilitar</string>
     <string name="mgmt_account_are_you_sure">¿Estás seguro?</string>
     <string name="mgmt_account_delete_confirm_text">Si eliminas tu cuenta tu historial completo de conversaciones se perderá</string>
@@ -268,10 +269,16 @@
     <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
     <string name="add_back">Añadir contacto</string>
     <string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string>
-    <string name="publish_avatar">Imagen de perfil</string>
+    <string name="publish_avatar">Publicar imagen</string>
     <string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
     <string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
     <string name="publishing">Publicando&#8230;</string>
     <string name="error_publish_avatar_server_reject">El servidor rechazó la publicación</string>
     <string name="error_publish_avatar_converting">Se ha producido un error mientras se convertía la imagen</string>
+    <string name="error_saving_avatar">No se ha podido guardar la imagen de perfil en disco</string>
+    <string name="or_long_press_for_default">(O pulsación prolongada para volver a tu imagen de la agenda)</string>
+    <string name="error_publish_avatar_no_server_support">Tu servidor no soporta la publicación de imágenes de perfil</string>
+    <string name="private_message">en privado</string>
+    <string name="private_message_to">en privado para %s</string>
+    <string name="send_private_message_to">Enviar mensaje privado a %s</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89d1cc11..f7c7110b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -187,6 +187,7 @@
     <string name="mgmt_account_edit">Edit account</string>
     <string name="mgmt_account_delete">Delete</string>
     <string name="mgmt_account_disable">Temporarily disable</string>
+    <string name="mgmt_account_publish_avatar">Publish avatar</string>
     <string name="mgmt_account_enable">Enable</string>
     <string name="mgmt_account_are_you_sure">Are you sure?</string>
     <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string>