aboutsummaryrefslogtreecommitdiffstats
path: root/res/values-es
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-14 11:48:01 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-14 11:48:01 +0200
commit3fa3d5f02ba954d87179c64cd75bd2ae7a749770 (patch)
tree60c9f5d1a2de1507041a3876cb797fec3d25a4fa /res/values-es
parente2f886d121826df2a97d9f71bc7feab9f6dd52c2 (diff)
parent4c99d9e24289b383f632aa72742482bee11a38bb (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/values-es')
-rw-r--r--res/values-es/strings.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8dd17059..c8877534 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -258,9 +258,13 @@
<string name="conferences">Conferencias</string>
<string name="search">Buscar</string>
<string name="create_contact">Crear Contacto</string>
- <string name="create_conference">Crear Conferencia</string>
+ <string name="join_conference">Unirse a Conferencia</string>
<string name="delete_contact">Eliminar Contacto</string>
<string name="view_contact_details">Ver detalles del contacto</string>
<string name="create">Crear</string>
<string name="contact_already_exists">El contacto ya existe</string>
+ <string name="join">Unirse</string>
+ <string name="conference_address">Dirección de la Conferencia</string>
+ <string name="conference_address_example">nombre@conferencia.ejemplo.com</string>
+ <string name="save_as_bookmark">Guardar en marcadores</string>
</resources> \ No newline at end of file