diff options
Diffstat (limited to 'src/main')
6 files changed, 36 insertions, 12 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java index 5ed3b5b4..31006f0f 100644 --- a/src/main/java/eu/siacs/conversations/parser/IqParser.java +++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java @@ -141,12 +141,12 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived { .discoResponse(packet); account.getXmppConnection().sendIqPacket(response, null); } else if (packet.hasChild("ping", "urn:xmpp:ping")) { - final IqPacket response = packet.generateRespone(IqPacket.TYPE_RESULT); + final IqPacket response = packet.generateResponse(IqPacket.TYPE_RESULT); mXmppConnectionService.sendIqPacket(account, response, null); } else { if ((packet.getType() == IqPacket.TYPE_GET) || (packet.getType() == IqPacket.TYPE_SET)) { - final IqPacket response = packet.generateRespone(IqPacket.TYPE_ERROR); + final IqPacket response = packet.generateResponse(IqPacket.TYPE_ERROR); final Element error = response.addChild("error"); error.setAttribute("type", "cancel"); error.addChild("feature-not-implemented", diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java index 3a1ba778..d578ca38 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -191,10 +191,10 @@ public class JingleConnection implements Downloadable { } IqPacket response; if (returnResult) { - response = packet.generateRespone(IqPacket.TYPE_RESULT); + response = packet.generateResponse(IqPacket.TYPE_RESULT); } else { - response = packet.generateRespone(IqPacket.TYPE_ERROR); + response = packet.generateResponse(IqPacket.TYPE_ERROR); } account.getXmppConnection().sendIqPacket(response, null); } diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java index 72c960d8..b0a730b1 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java @@ -46,7 +46,7 @@ public class JingleConnectionManager extends AbstractConnectionManager { return; } } - IqPacket response = packet.generateRespone(IqPacket.TYPE_ERROR); + IqPacket response = packet.generateResponse(IqPacket.TYPE_ERROR); Element error = response.addChild("error"); error.setAttribute("type", "cancel"); error.addChild("item-not-found", diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java index 04b225d0..e25f7e65 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java @@ -208,15 +208,15 @@ public class JingleInbandTransport extends JingleTransport { established = true; connected = true; this.account.getXmppConnection().sendIqPacket( - packet.generateRespone(IqPacket.TYPE_RESULT), null); + packet.generateResponse(IqPacket.TYPE_RESULT), null); } else { this.account.getXmppConnection().sendIqPacket( - packet.generateRespone(IqPacket.TYPE_ERROR), null); + packet.generateResponse(IqPacket.TYPE_ERROR), null); } } else if (connected && payload.getName().equals("data")) { this.receiveNextBlock(payload.getContent()); this.account.getXmppConnection().sendIqPacket( - packet.generateRespone(IqPacket.TYPE_RESULT), null); + packet.generateResponse(IqPacket.TYPE_RESULT), null); } else { // TODO some sort of exception } diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java index 9eff4cbf..2481112b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java @@ -67,7 +67,7 @@ public class IqPacket extends AbstractStanza { } } - public IqPacket generateRespone(final int type) { + public IqPacket generateResponse(final int type) { final IqPacket packet = new IqPacket(type); packet.setTo(this.getFrom()); packet.setId(this.getId()); diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index ca588707..f53d5368 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -13,6 +13,10 @@ <string name="action_edit_contact">Editar contacto</string> <string name="action_delete_contact">Eliminar contacto de la lista</string> <string name="action_add_phone_book">Añadir a contactos del teléfono</string> + <string name="action_block_contact">Bloquear contacto</string> + <string name="action_unblock_contact">Desbloquear contacto</string> + <string name="action_block_domain">Bloquear dominio</string> + <string name="action_unblock_domain">Desbloquear dominio</string> <string name="title_activity_manage_accounts">Gestionar Cuentas</string> <string name="title_activity_settings">Ajustes</string> <string name="title_activity_conference_details">Detalles de Conversación en grupo</string> @@ -21,6 +25,7 @@ <string name="title_activity_sharewith">Compartir con Conversación</string> <string name="title_activity_start_conversation">Nueva Conversación</string> <string name="title_activity_choose_contact">Elegir Contacto</string> + <string name="title_activity_block_list">Lista contactos bloqueados</string> <string name="just_now">ahora</string> <string name="minute_ago">hace 1 min</string> <string name="minutes_ago">hace %d min</string> @@ -34,8 +39,14 @@ <string name="participant">Participante</string> <string name="visitor">Visitante</string> <string name="remove_contact_text">¿Quieres eliminar a %s de tu lista? La conversación asociada a esta cuenta no se eliminará.</string> + <string name="block_contact_text">¿Quieres bloquear a %s para que no pueda enviarte mensajes?</string> + <string name="unblock_contact_text">¿Quieres desbloquear a %s y permitirle que te envíe mensajes?</string> + <string name="block_domain_text">¿Bloquear todos los contactos de %s?</string> + <string name="unblock_domain_text">¿Desbloquear todos los contatos de %s?</string> + <string name="contact_blocked">Contacto bloqueado</string> <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación asociada con este marcador no se eliminará.</string> <string name="register_account">Registrar nueva cuenta en servidor</string> + <string name="change_password_on_server">Cambiar contraseña</string> <string name="share_with">Compartir con</string> <string name="start_conversation">Comenzar conversación</string> <string name="invite_contact">Invitar contactos</string> @@ -45,6 +56,8 @@ <string name="add">Añadir</string> <string name="edit">Editar</string> <string name="delete">Eliminar</string> + <string name="block">Bloquear</string> + <string name="unblock">Desbloquear</string> <string name="save">Guardar</string> <string name="ok">OK</string> <string name="crash_report_title">Conversations se ha detenido.</string> @@ -65,7 +78,7 @@ <string name="clear_conversation_history">Limpiar historial de conversación</string> <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string> <string name="delete_messages">Borrar mensajes</string> - <string name="also_end_conversation">Terminar esta conversación más tarde</string> + <string name="also_end_conversation">Además, terminar esta conversación</string> <string name="choose_presence">Selecciona recurso del contacto</string> <string name="send_plain_text_message">Enviar mensaje de texto</string> <string name="send_otr_message">Enviar mensaje cifrado con OTR</string> @@ -174,11 +187,16 @@ <string name="contact_status_offline">Desconectado</string> <string name="muc_details_conference">Conversación en grupo</string> <string name="muc_details_other_members">Otros Miembros</string> + <string name="server_info_show_more">Información de servidor</string> + <string name="server_info_mam">XEP-0313: MAM</string> <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> + <string name="server_info_csi">XEP-0352: Client State Indication</string> + <string name="server_info_blocking">XEP-0191: Blocking Command</string> + <string name="server_info_roster_version">XEP-0237: Roster Versioning</string> <string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_pep">XEP-0163: PEP (Avatars)</string> - <string name="server_info_available">Sí</string> - <string name="server_info_unavailable">No</string> + <string name="server_info_available">Disponible</string> + <string name="server_info_unavailable">No disponible</string> <string name="missing_public_keys">Se han perdido las claves de anuncio públicas</string> <string name="last_seen_now">Visto última vez ahora</string> <string name="last_seen_min">Visto última vez hace 1 minuto</string> @@ -202,6 +220,8 @@ <string name="join_conference">Unirse a Conversación en grupo</string> <string name="delete_contact">Eliminar Contacto</string> <string name="view_contact_details">Ver detalles del contacto</string> + <string name="block_contact">Bloquear contacto</string> + <string name="unblock_contact">Desbloquear contacto</string> <string name="create">Crear</string> <string name="contact_already_exists">El contacto ya existe</string> <string name="join">Unirse</string> @@ -294,6 +314,7 @@ <string name="image_transmission_failed">Falló la transferencia de la imagen</string> <string name="scan_qr_code">Escanear código QR</string> <string name="show_qr_code">Mostrar código QR</string> + <string name="show_block_list">Mostrar contactos bloqueados</string> <string name="account_details">Detalles de la cuenta</string> <string name="verify_otr">Verificar OTR</string> <string name="remote_fingerprint">Huella digital remota</string> @@ -344,4 +365,7 @@ <string name="copy_otr_clipboard_description">Copiar huella digital OTR al portapapeles</string> <string name="fetching_history_from_server">Buscar historial en servidor</string> <string name="no_more_history_on_server">No más historial del servidor</string> + <string name="updating">Actualizando…</string> + <string name="password_changed">!Contraseña cambiada!</string> + <string name="could_not_change_password">No se puede cambiar la contraseña</string> </resources> |