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

This commit is contained in:
iNPUTmice 2014-07-22 18:58:38 +02:00
commit eacf56bf37

View file

@ -272,4 +272,7 @@
<string name="action_edit_subject">Editar asunto de la conferencia</string> <string name="action_edit_subject">Editar asunto de la conferencia</string>
<string name="conference_not_found">Conferencia no encontrada</string> <string name="conference_not_found">Conferencia no encontrada</string>
<string name="leave">Salir</string> <string name="leave">Salir</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="contact_has_read_up_to_this_point">Tu contacto ha leído hasta aquí</string>
</resources> </resources>