diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-08-06 18:36:55 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-08-06 18:36:55 +0200 |
| commit | 313f9db1ec68448bd7abb303922c8228ac9c128c (patch) | |
| tree | f8dc6f0e8f549e40796c5923898ff2ef2582d1b3 /res | |
| parent | 2b4d9e8b60bdec97cbeedf070188efd6380e2332 (diff) | |
| parent | 705445cd77e42fb12911a208803eb7a980c38e8d (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-es/strings.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 9141e726..be7e9584 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -268,4 +268,10 @@ <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="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…</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> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1d581293..2e0c2018 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -269,7 +269,7 @@ <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="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="publishing">Publishing…</string> <string name="error_publish_avatar_server_reject">The server rejected your publication</string> |