From 2a3c6ff1e42c2ce7c7634eb523709526db6d40ba Mon Sep 17 00:00:00 2001 From: Kushal Date: Mon, 26 May 2014 15:04:11 -0500 Subject: [PATCH 1/7] Update README.md just a spelling update... btw, what is a carbonated message? --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca423c004..8920fb669 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ more flexible. Before you continue reading you should notice that the openPGP support in Conversations is marked as experimental. This is not because it will make the app unstable but because the fundamental concepts of PGP aren't ready for a -widespread use. The way PGP works is that you trust Key IDs instead of XMPP- or email addresses. So in theory your contact list should consist of Public-Key-IDs instead of email addresses. But of course no email or xmpp client out there implements these concepts. Plus PGP in the context of instant messaging has a couple of downsides. It is vulnerable to replay attacs, it is rather verbose, decryping and encrypting takes longer than OTR. It is however asynchronous and works well with carbonated messages. +widespread use. The way PGP works is that you trust Key IDs instead of XMPP- or email addresses. So in theory your contact list should consist of Public-Key-IDs instead of email addresses. But of course no email or xmpp client out there implements these concepts. Plus PGP in the context of instant messaging has a couple of downsides. It is vulnerable to replay attacks, it is rather verbose, and decryping and encrypting takes longer than OTR. It is however asynchronous and works well with carbonated messages. To use openpgp you have to install the opensource app OpenKeychain (www.openkeychain.org) and then long press on the account in manage accounts and choose renew PGP announcement from the contextual menu. ###Development From 75b14a1d5c08d10b795b92e4f2b21035d773dc8c Mon Sep 17 00:00:00 2001 From: kruks23 Date: Thu, 29 May 2014 18:17:21 +0200 Subject: [PATCH 2/7] More harcoded translations + updated Spanish --- res/layout/server_info.xml | 20 ++++++++-------- res/layout/share_with.xml | 4 ++-- res/values-es/strings.xml | 21 ++++++++++++++-- res/values/strings.xml | 16 +++++++++++++ .../ui/ManageAccountActivity.java | 24 +++++++++---------- .../conversations/ui/ShareWithActivity.java | 2 +- 6 files changed, 60 insertions(+), 27 deletions(-) diff --git a/res/layout/server_info.xml b/res/layout/server_info.xml index 25e5a4715..499a20def 100644 --- a/res/layout/server_info.xml +++ b/res/layout/server_info.xml @@ -12,14 +12,14 @@ android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" - android:text="Statistics" /> + android:text="@string/server_info_statistics" /> + android:text="@string/server_info_server_features" /> Detalles de Conferencia Detalles de Contacto Conversations + Compartir con Conversación ahora min conversaciones por leer @@ -61,6 +62,7 @@ No Ok Hecho + Ocultar Crear \u0026 Invitar ¿Quieres crear una nueva conferencia con una dirección generada aleatoriamente e invitar a los contactos seleccionados a ella? No hay conferencias existentes @@ -122,7 +124,7 @@ Recurso El nombre que identifica el cliente que estás utilizando Aceptar archivos - De forma automática aceptar archivos menores de… + De forma automática aceptar archivos menores que… Ajustes de notificación Notificaciones Notifica cuando llega un nuevo mensaje @@ -191,6 +193,7 @@ Habilitar ¿Estás seguro? Si eliminas tu cuenta tu historial completo de conversaciones se perderá + La cuenta está desconectada Grabar audio Configuración de cuenta Identificador Jabber: @@ -206,11 +209,25 @@ Disponible Hablador Ausente - Ausencia ext. + Ausencia extendida No molestar Desconectado Conferencia Ausnto de la Conferencia Tu apodo Otros Miembros + Cuenta desconectada. No se puede actualizar suscripciones + Conversaciones Activas + Estadísticas + Tiempo de conexión + Duración de la sesión + Paquetes enviados + Paquetes recibidos + Cuentas conectadas + Características del Servidor + Roster Versioning + Mensajes Carbon + Stream Management + horas + mins \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 13e43f5f3..50235c437 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -20,6 +20,7 @@ Conference Details Contact Details Conversations + Share with Conversation just now min ago unread Conversations @@ -61,6 +62,7 @@ No Ok Done + Hide Create \u0026 Invite Do you want to create a new conference with a randomly generated address and invite the selected contacts to it? No existing conferences @@ -191,6 +193,7 @@ Enable Are you sure? If you delete your account your entire conversation history will be lost + Account is offline Record voice Account Settings Jabber ID: @@ -214,4 +217,17 @@ Your nickname Other Members Account offline. Could not update subscription + Active Conversations + Statistics + Connection age + Session age + Packets sent + Packets received + Connected accounts + Server Features + Roster Versioning + Carbon Messages + Stream Management + hours + mins \ No newline at end of file diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java index 70af44e0f..d1c9c7f72 100644 --- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -317,36 +317,36 @@ public class ManageAccountActivity extends XmppActivity { pcks_received.setText(""+xmpp.getReceivedStanzas()); pcks_sent.setText(""+xmpp.getSentStanzas()); if (connectionAgeHours >= 2) { - connection.setText(connectionAgeHours+" hours"); + connection.setText(connectionAgeHours+" " + getString(R.string.hours)); } else { - connection.setText(connectionAge+" mins"); + connection.setText(connectionAge+" " + getString(R.string.mins)); } if (xmpp.hasFeatureStreamManagment()) { if (sessionAgeHours >= 2) { - session.setText(sessionAgeHours+" hours"); + session.setText(sessionAgeHours+" " + getString(R.string.hours)); } else { - session.setText(sessionAge+" mins"); + session.setText(sessionAge+" " + getString(R.string.mins)); } - stream.setText("Yes"); + stream.setText(getString(R.string.yes)); } else { - stream.setText("No"); + stream.setText(getString(R.string.no)); session.setText(connection.getText()); } if (xmpp.hasFeaturesCarbon()) { - carbon.setText("Yes"); + carbon.setText(getString(R.string.yes)); } else { - carbon.setText("No"); + carbon.setText(getString(R.string.no)); } if (xmpp.hasFeatureRosterManagment()) { - roster.setText("Yes"); + roster.setText(getString(R.string.yes)); } else { - roster.setText("No"); + roster.setText(getString(R.string.no)); } builder.setView(view); } else { - builder.setMessage("Account is offline"); + builder.setMessage(getString(R.string.mgmt_account_account_offline)); } - builder.setPositiveButton("Hide", null); + builder.setPositiveButton(getString(R.string.hide), null); builder.create().show(); } return true; diff --git a/src/eu/siacs/conversations/ui/ShareWithActivity.java b/src/eu/siacs/conversations/ui/ShareWithActivity.java index 6dbb20c96..0a8ee1a70 100644 --- a/src/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/eu/siacs/conversations/ui/ShareWithActivity.java @@ -34,7 +34,7 @@ public class ShareWithActivity extends XmppActivity { super.onCreate(savedInstanceState); setContentView(R.layout.share_with); - setTitle("Share with Conversation"); + setTitle(getString(R.string.title_activity_sharewith)); contacts = (LinearLayout) findViewById(R.id.contacts); conversations = (LinearLayout) findViewById(R.id.conversations); From 732848fc0ec96b9c41a0d11f317c32313380dc01 Mon Sep 17 00:00:00 2001 From: Alethea Butler Date: Fri, 30 May 2014 02:03:24 -0400 Subject: [PATCH 3/7] Added question mark to remove_contact_text --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 13e43f5f3..abfdf306e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -34,7 +34,7 @@ Participant Visitor Enter a new name: - Do you want to delete %s from your roster. The conversation associated with this account will not be removed. + Do you want to delete %s from your roster? The conversation associated with this account will not be removed. The server %s presented you with an untrusted, possible self signed, certificate. Server Info Register new account on server From cb127add56cc34126e7c5527b6299f7a7c2e3aaf Mon Sep 17 00:00:00 2001 From: Alethea Butler Date: Fri, 30 May 2014 02:04:24 -0400 Subject: [PATCH 4/7] Changed "unsuccessful delivery" to "delivery failed" --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index abfdf306e..b345fc810 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -77,7 +77,7 @@ Attach file The contact is not in your roster. Would you like to add it? Add contact - unsuccessful delivery + delivery failed rejected Receiving image file. Please wait… Preparing image for transmission From 78686e9bce44d6279cb1475945309325888f0fc3 Mon Sep 17 00:00:00 2001 From: Alethea Butler Date: Fri, 30 May 2014 23:18:50 -0400 Subject: [PATCH 5/7] Disabled the Home button when it's not the Up button --- src/eu/siacs/conversations/ui/ConversationActivity.java | 2 ++ src/eu/siacs/conversations/ui/ConversationFragment.java | 1 + src/eu/siacs/conversations/ui/ManageAccountActivity.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index c696fa45f..232d46f80 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -262,6 +262,7 @@ public class ConversationActivity extends XmppActivity { public void onPanelOpened(View arg0) { paneShouldBeOpen = true; getActionBar().setDisplayHomeAsUpEnabled(false); + getActionBar().setHomeButtonEnabled(false); getActionBar().setTitle(R.string.app_name); invalidateOptionsMenu(); hideKeyboard(); @@ -273,6 +274,7 @@ public class ConversationActivity extends XmppActivity { if ((conversationList.size() > 0) && (getSelectedConversation() != null)) { getActionBar().setDisplayHomeAsUpEnabled(true); + getActionBar().setHomeButtonEnabled(true); getActionBar().setTitle( getSelectedConversation().getName(useSubject)); invalidateOptionsMenu(); diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index a3cecfd48..3e1909d83 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -527,6 +527,7 @@ public class ConversationFragment extends Fragment { if (!activity.shouldPaneBeOpen()) { activity.getSlidingPaneLayout().closePane(); activity.getActionBar().setDisplayHomeAsUpEnabled(true); + activity.getActionBar().setHomeButtonEnabled(true); activity.getActionBar().setTitle( conversation.getName(useSubject)); activity.invalidateOptionsMenu(); diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java index d1c9c7f72..eae1196b7 100644 --- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -380,6 +380,7 @@ public class ManageAccountActivity extends XmppActivity { accountListViewAdapter.notifyDataSetChanged(); if ((this.accountList.size() == 0)&&(this.firstrun)) { getActionBar().setDisplayHomeAsUpEnabled(false); + getActionBar().setHomeButtonEnabled(false); addAccount(); this.firstrun = false; } @@ -429,6 +430,7 @@ public class ManageAccountActivity extends XmppActivity { public void onAccountEdited(Account account) { xmppConnectionService.createAccount(account); activity.getActionBar().setDisplayHomeAsUpEnabled(true); + activity.getActionBar().setHomeButtonEnabled(true); } }); dialog.show(getFragmentManager(), "add_account"); From 0edfd3619530f3ded673746d252b766c3001134e Mon Sep 17 00:00:00 2001 From: Alethea Butler Date: Fri, 30 May 2014 23:41:44 -0400 Subject: [PATCH 6/7] Up button goes to contacts after initial setup --- src/eu/siacs/conversations/ui/ManageAccountActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java index eae1196b7..6fd87473c 100644 --- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -398,6 +398,12 @@ public class ManageAccountActivity extends XmppActivity { case R.id.action_add_account: addAccount(); break; + case android.R.id.home: + if (xmppConnectionService.getConversations().size() == 0) { + startActivity(new Intent(getApplicationContext(), + ContactsActivity.class)); + } + break; default: break; } From 3e9627dc50ce4cb7be004fd07999ddb6c02e3f29 Mon Sep 17 00:00:00 2001 From: Alethea Butler Date: Sat, 31 May 2014 00:11:47 -0400 Subject: [PATCH 7/7] Capitalized openPGP -> OpenPGP --- res/values-ca/strings.xml | 10 +++++----- res/values-de/strings.xml | 12 ++++++------ res/values-es/strings.xml | 12 ++++++------ res/values-eu/strings.xml | 8 ++++---- res/values-fr/strings.xml | 12 ++++++------ res/values-gl/strings.xml | 12 ++++++------ res/values/strings.xml | 12 ++++++------ 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 4d7bc6cca..2b64d0b0a 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -63,7 +63,7 @@ Enviar missatge a conferència Enviar missatge de text Enviar missatge xifrat amb OTR - Enviar missatge xifrat amb openPGP + Enviar missatge xifrat amb OpenPGP El teu sobrenom s\'ha modificat Descarregar imatge Error carregant imatge (Fitxer no trobat) @@ -84,14 +84,14 @@ Reiniciar Instal·lar oferint… - Clau openPGP no trobada - Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\nSi us plau, demana al teu contacte que configuri openPGP. + Clau OpenPGP no trobada + Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\nSi us plau, demana al teu contacte que configuri OpenPGP. Missatge xifrat rebut. Prem per desxifrar i veure-ho. Imatge xifrada rebuda. Prem per desxifrar i veure-la. Imatge rebuda. Prem per veure Xifratge amb OTR no disponible - Malauradament el xifratge amb OTR no està disponible per transferència de fitxers. Pots seleccionar xifratge amb openPGP o no usar xifratge. - Usa xifratge amb openPGP + Malauradament el xifratge amb OTR no està disponible per transferència de fitxers. Pots seleccionar xifratge amb OpenPGP o no usar xifratge. + Usa xifratge amb OpenPGP Recursos XMPP El nom que identifica aquest client amb Acceptar fitxers diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 292a81e81..e5f095daa 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -66,7 +66,7 @@ Nachricht an Konferenz schicken Unverschlüsselt schreiben OTR-verschlüsselt schreiben - openPGP-verschlüsselt schreiben + OpenPGP-verschlüsselt schreiben Dein Nickname wurde geändert Bild herunter laden Fehler beim laden des Bildes. (Datei wurde nicht gefunden) @@ -87,14 +87,14 @@ Neustarten Installieren angeboten… - Kein openPGP Schlüssel gefunden - Conversations ist nicht in der Lage deine Nachrichten zu verschlüsseln weil dein Kontakt sein oder ihren Schlüssel nicht preis gibt.\n\nBitte sag deinem Kontakt er oder sie möge bitte openPGP einrichten. + Kein OpenPGP Schlüssel gefunden + Conversations ist nicht in der Lage deine Nachrichten zu verschlüsseln weil dein Kontakt sein oder ihren Schlüssel nicht preis gibt.\n\nBitte sag deinem Kontakt er oder sie möge bitte OpenPGP einrichten. Verschlüsselte Nachricht erhalten. Drücke hier um sie anzuzeigen und zu entschlüsseln. Verschlüsseltes Bild erhalten. Drücke hier um es anzuzeigen und zu entschlüsseln. Bild erhalten. Drücke hier um es anzuzeigen. OTR-Verschlüsselung nicht verfügbar - Es ist nicht möglich Datein mitels OTR zu verschlüsseln. Du kannst entweder openPGP wählen oder die Datei nicht verschlüsseln. - openPGP verwenden + Es ist nicht möglich Datein mitels OTR zu verschlüsseln. Du kannst entweder OpenPGP wählen oder die Datei nicht verschlüsseln. + OpenPGP verwenden XMPP resource Der Name mit dem sich der Client selber identifiziert Dateiannahme @@ -158,7 +158,7 @@ Dem Zertifikat vertrauen Klartext OTR - openPGP + OpenPGP Konto bearbeiten Löschen Vorübergehend abschalten diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c31f2da86..02e7bd277 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -92,7 +92,7 @@ Enviar mensaje a conferencia Enviar mensaje de texto Enviar mensaje encriptado con OTR - Enviar mensaje encriptado con openPGP + Enviar mensaje encriptado con OpenPGP Tu apodo se ha modificado Descargar imagen Error cargando imagen (Archivo no encontrado) @@ -113,14 +113,14 @@ Reiniciar Instalar ofreciendo… - Clave openPGP no encontrada - Conversations no ha podido encriptar tus mensajes porque el contacto no está anunciando su clave publica.\n\nPor favor, pide a tu contacto que configure openPGP. + Clave OpenPGP no encontrada + Conversations no ha podido encriptar tus mensajes porque el contacto no está anunciando su clave publica.\n\nPor favor, pide a tu contacto que configure OpenPGP. Mensaje encriptado recibido. Pulsa para ver. Imagen encriptada recibida. Pulsa para ver. Imagen recibida. Pulsa para ver Encriptación con OTR no disponible - Desafortunadamente la encriptación con OTR no está disponible para transferencia de archivos. Puedes selecionar encriptación con openPGP o no usar encriptación. - Usa encriptación con openPGP + Desafortunadamente la encriptación con OTR no está disponible para transferencia de archivos. Puedes selecionar encriptación con OpenPGP o no usar encriptación. + Usa encriptación con OpenPGP Recurso El nombre que identifica el cliente que estás utilizando Aceptar archivos @@ -186,7 +186,7 @@ Confiar en el certificado Texto plano OTR - openPGP + OpenPGP Editar cuenta Eliminar cuenta Deshabilitar temporalmente diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 71fd22b19..9c3db1de9 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -90,7 +90,7 @@ Mezua konferentziara bidali Testu mezua bidali OTRz enkriptatutako mezua bidali - openPGPz enkriptatutako mezua bidali + OpenPGPz enkriptatutako mezua bidali Zure ezizena aldatu da Irudia deskargatu Akatsa irudia kargatzen (fitxategia ez da aurkitu) @@ -111,8 +111,8 @@ Berrabiarazi Instalatu eskeintzen… - Ez da openPGP gakorik aurkitu - Conversations ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\nMesedez eskatu ezaiozu zure kontaktuari openPGP konfigura dezan. + Ez da OpenPGP gakorik aurkitu + Conversations ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\nMesedez eskatu ezaiozu zure kontaktuari OpenPGP konfigura dezan. Enkriptatutako mezua jaso da. Ukitu ikusi eta desenkriptatzeko. Enkriptatutako irudia jaso da. Ukitu ikusi eta desenkriptatzeko. Irudia jaso da. Ukitu ikusteko @@ -184,7 +184,7 @@ Ziurtagiriaz fidatu Testu laua OTR - openPGP + OpenPGP Kontua editatu Ezabatu Aldi baterako ezgaitu diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index daa4fa78a..0d721ac5c 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -66,7 +66,7 @@ Envoyer un message à la conférence Envoyer un message Envoyer un message sécurisé par OTR - Envoyer un message sécurisé par openPGP + Envoyer un message sécurisé par OpenPGP Votre identifiant a été changé Télécharger l\'image Impossible de télécharger l\'image (Fichier non trouvé) @@ -87,14 +87,14 @@ Redémarrer Installer Proposition… - Aucune clef openPGP trouvée. - Conversations ne peut chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\nMerci de demander à votre correspondant de configurer openPGP. + Aucune clef OpenPGP trouvée. + Conversations ne peut chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\nMerci de demander à votre correspondant de configurer OpenPGP. Message chiffré reçu. Appuyez pour le déchiffrer. Image chiffrée reçue. Appuyez pour la déchiffrer. Image reçue. Appuyez pour visualiser. Chiffrement OTR non disponible - Malheureusement le chiffrement OTR n\'est pas disponible pour le transfert de fichiers. Vous pouvez utiliser openPGP ou envoyer vos fichiers non chiffrés. - Utiliser le chiffrement openPGP + Malheureusement le chiffrement OTR n\'est pas disponible pour le transfert de fichiers. Vous pouvez utiliser OpenPGP ou envoyer vos fichiers non chiffrés. + Utiliser le chiffrement OpenPGP Ressource XMPP Nom permettant d\'identifier ce client XMPP Accepter les fichiers @@ -158,7 +158,7 @@ Croire ce certificat Texte clair OTR - openPGP + OpenPGP Modifier le compte Supprimer Désactiver temporairement diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index fe1d4fd46..512bef5c6 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -68,7 +68,7 @@ Enviar mensaxe a conferencia Enviar mensaxe de texto Enviar mensaxe cifrado con OTR - Enviar mensaxe cifrado con openPGP + Enviar mensaxe cifrado con OpenPGP Modificouse o teu apodo Descargar imaxe Erro na carga da imaxen (Arquivo non atopado) @@ -89,14 +89,14 @@ Reiniciar Instalar ofrecendo… - Clave openPGP non atopada - Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\nPor favor, pídelle ao teu contacto que configure openPGP. + Clave OpenPGP non atopada + Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\nPor favor, pídelle ao teu contacto que configure OpenPGP. Mensaxe cifrado recibido. Pulsa para ver. Imaxe cifrada recibida. Pulsa para ver. Imaxe recibida. Pulsa para ver Cifrado con OTR non disponible - É unha pena, pero o cifrado con OTR non está disponible para transferencia de arquivos. Podes selecionar cifrado con openPGP ou enviar os datos sen cifrar. - Usa cifrado con openPGP + É unha pena, pero o cifrado con OTR non está disponible para transferencia de arquivos. Podes selecionar cifrado con OpenPGP ou enviar os datos sen cifrar. + Usa cifrado con OpenPGP Recurso O nome que identifica o cliente que estás a empregar Aceptar arquivos @@ -160,7 +160,7 @@ Confiar no certificado Texto plano OTR - openPGP + OpenPGP Editar conta Eliminar conta Deshabilitar temporalmente diff --git a/res/values/strings.xml b/res/values/strings.xml index 9d6e5b388..fef874b02 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -92,7 +92,7 @@ Send message to conference Send plain text message Send OTR encrypted message - Send openPGP encrypted message + Send OpenPGP encrypted message Your nickname has been changed Download Image Error loading image (File not found) @@ -113,14 +113,14 @@ Restart Install offering… - No openPGP Key found - Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup openPGP. + No OpenPGP Key found + Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup OpenPGP. Encrypted message received. Touch to view and decrypt. Encrypted image received. Touch to view and decrypt. Image received. Touch to view OTR encryption not available - Unfortunaly OTR encryption is not available for file transfer. You can choose either openPGP or no encryption. - Use openPGP encryption + Unfortunaly OTR encryption is not available for file transfer. You can choose either OpenPGP or no encryption. + Use OpenPGP encryption XMPP resource The name this client identifies itself with Accept files @@ -186,7 +186,7 @@ Trust certificate Plain text OTR - openPGP + OpenPGP Edit account Delete Temporarily disable