aboutsummaryrefslogtreecommitdiffstats
path: root/res/values-es
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-07 17:20:27 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-07 17:20:27 +0200
commit37a8b87235f8c85a851976f5995c8c8c00c83fa5 (patch)
tree73fa658a996bf175ff4ccdb68b59731891c6c226 /res/values-es
parent37eb8e4ed9d2ba4a9bc4e0afec65e2c5b455dcd7 (diff)
parent4427b6727b5a905e5167033da041b44491b68a3d (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/values-es')
-rw-r--r--res/values-es/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c47d7cf89..c6c6cd272 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -248,4 +248,6 @@
<string name="edit_conference_details">Pulsa para editar detalles de la conferencia</string>
<string name="openpgp_messages_found">Encontrado mensaje encriptado con OpenPGP</string>
<string name="openpgp_click_to_decrypt">Pulsa para introducir la contraseƱa y desencriptar el mensaje</string>
+ <string name="reception_failed">Error al recibir</string>
+ <string name="no_muc_server_found">No se ha encontrado un servidor de conferencias apropiado</string>
</resources> \ No newline at end of file