sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development' of github.com:siacs/Conversations into development

This commit is contained in:
iNPUTmice 2014-08-06 18:36:55 +02:00
parent 2b4d9e8b60 705445cd77
commit 313f9db1ec
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/values-es/strings.xml
View File

@ -268,4 +268,10 @@
<string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string> <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="add_back">Añadir contacto</string>
<string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</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="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>
</resources> </resources>

2
res/values/strings.xml
View File

@ -269,7 +269,7 @@
<string name="add_back">Add back</string> <string name="add_back">Add back</string>
<string name="contact_has_read_up_to_this_point">%s has read up to this point</string> <string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
<string name="publish_avatar">Publish avatar</string> <string name="publish_avatar">Publish avatar</string>
<string name="touch_to_choose_picture">Touch avatar to select picture from gallary</string> <string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string>
<string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string> <string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
<string name="publishing">Publishing&#8230;</string> <string name="publishing">Publishing&#8230;</string>
<string name="error_publish_avatar_server_reject">The server rejected your publication</string> <string name="error_publish_avatar_server_reject">The server rejected your publication</string>