From 35a123f53c87d2ff6130d44c2bed3c421775b9dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 8 Feb 2014 15:44:18 +0100
Subject: [PATCH] Update from transifex

---
 .../src/main/res/raw-de/help_changelog.html   |   2 +-
 .../src/main/res/raw-de/help_start.html       |   4 +-
 .../main/res/raw-es-rCO/help_changelog.html   |   4 +-
 .../src/main/res/raw-es-rCO/help_start.html   |   4 +-
 .../src/main/res/raw-es/help_about.html       |   2 +-
 .../src/main/res/raw-es/help_changelog.html   | 112 +++++++-------
 .../src/main/res/raw-es/help_nfc_beam.html    |  10 +-
 .../src/main/res/raw-es/help_start.html       |  18 +--
 .../src/main/res/raw-es/nfc_beam_share.html   |   8 +-
 .../src/main/res/raw-fr/help_start.html       |  14 +-
 .../main/res/raw-it-rIT/help_changelog.html   |   4 +-
 .../src/main/res/raw-it-rIT/help_start.html   |   4 +-
 .../main/res/raw-nl-rNL/help_changelog.html   |   4 +-
 .../src/main/res/raw-nl-rNL/help_start.html   |   4 +-
 .../main/res/raw-pt-rBR/help_changelog.html   |   4 +-
 .../src/main/res/raw-pt-rBR/help_start.html   |   4 +-
 .../src/main/res/raw-ru/help_changelog.html   |   4 +-
 .../src/main/res/raw-ru/help_start.html       |  14 +-
 .../main/res/raw-sl-rSI/help_changelog.html   |   4 +-
 .../src/main/res/raw-sl-rSI/help_start.html   |   4 +-
 .../src/main/res/raw-tr/help_changelog.html   |   4 +-
 .../src/main/res/raw-tr/help_start.html       |   4 +-
 .../src/main/res/raw-uk/help_start.html       |  14 +-
 .../src/main/res/raw-zh/help_changelog.html   |   4 +-
 .../src/main/res/raw-zh/help_start.html       |   4 +-
 .../src/main/res/values-de/strings.xml        |  14 --
 .../src/main/res/values-es-rCO/strings.xml    |   4 -
 .../src/main/res/values-es/strings.xml        |  24 +--
 .../src/main/res/values-fr/strings.xml        |  19 ++-
 .../src/main/res/values-nl-rNL/strings.xml    |   4 -
 .../src/main/res/values-ru/strings.xml        |  20 +--
 .../src/main/res/values-tr/strings.xml        |   6 -
 .../src/main/res/values-uk/strings.xml        |  13 +-
 .../src/main/res/values-zh/strings.xml        | 139 ++++++++++++++++++
 34 files changed, 315 insertions(+), 186 deletions(-)
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
index 0faf0eb5e..56dcf0c8b 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html
@@ -46,7 +46,7 @@
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>Einfacher Schlüsselserversupport</li>
+<li>basic keyserver support</li>
 <li>app2sd</li>
 <li>mehr Auswahlmöglichkeiten für den Passwortcache: 1, 2, 4, 8, Stunden</li>
 <li>Übersetzungen: norwegisch (Danke, Sander Danielsen), chinesisch (danke, Zhang Fredrick)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
index 2f7a788e1..198dfe64f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html
@@ -2,9 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenPGP Keychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
index 28d025a9f..abf660ba8 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html
@@ -6,7 +6,7 @@
 <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
 <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
 <li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>querying key servers directly from the import screen</li>
+<li>querying keyservers directly from the import screen</li>
 <li>fix layout and dialog style on Android 2.2-3.0</li>
 <li>fix crash on keys with empty user ids</li>
 <li>fix crash and empty lists when coming back from signing screen</li>
@@ -46,7 +46,7 @@
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>basic key server support</li>
+<li>basic keyserver support</li>
 <li>app2sd</li>
 <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li>
 <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html
index 2f7a788e1..198dfe64f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html
@@ -2,9 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenPGP Keychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html
index a8ff31283..a81789cec 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html
@@ -8,7 +8,7 @@
 <h2>Desarrolladores de OpenPGP Keychain</h2>
 <ul>
 <li>Dominik Schürmann (Desarrollador principal)</li>
-<li>Ash Hughes (parches cryptográficos)</li>
+<li>Ash Hughes (Parches cryptográficos)</li>
 <li>Brian C. Barnes</li>
 <li>Bahtiar 'kalkin' Gadimov (UI)</li>
 
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
index d42a1fbfd..18b42a296 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
@@ -3,105 +3,105 @@
 <body>
 <h2>2.3</h2>
 <ul>
-<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
-<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
-<li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>querying keyservers directly from the import screen</li>
-<li>fix layout and dialog style on Android 2.2-3.0</li>
-<li>fix crash on keys with empty user ids</li>
-<li>fix crash and empty lists when coming back from signing screen</li>
-<li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
-<li>fix upload of key from signing screen</li>
+<li>elimina la exportación innecesaria de claves públicas cuando se exporta la clave secreta (gracias a Ash Hughes)</li>
+<li>corrige la configuración de la fecha de caducidad en las claves (gracias a Ash Hughes)</li>
+<li>más correcciones internas cuando se editan claves (gracias a Ash Hughes)</li>
+<li>consultar los servidores de claves directamente desde la ventana de importación</li>
+<li>corrige el diseño y estilo de mensajes en Android 2.2-3.0</li>
+<li>corrige error en claves con IDs de usuario vacías</li>
+<li>corrige fallo y listados vacíos cuando se regresa desde la pantalla de firma</li>
+<li>Bouncy Castle (librería criptográfica) actualizada de 1.47 a 1.50 y compilada desde la fuente</li>
+<li>corrige la carga de la clave desde la pantalla de firma</li>
 </ul>
 <h2>2.2</h2>
 <ul>
-<li>new design with navigation drawer</li>
-<li>new public key list design</li>
-<li>new public key view</li>
-<li>bug fixes for importing of keys</li>
-<li>key cross-certification (thanks to Ash Hughes)</li>
-<li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
-<li>first version with new languages (thanks to the contributors on Transifex)</li>
-<li>sharing of keys via QR Codes fixed and improved</li>
-<li>package signature verification for API</li>
+<li>nuevo diseño con Navigation Drawer</li>
+<li>nuevo diseño de la lista de clave pública</li>
+<li>nueva vista de la clave pública</li>
+<li>correcciones en la importación de claves</li>
+<li>clave de certificación cruzada (gracias a Ash Hughes)</li>
+<li>manejo correcto de las contraseñas UTF-8 (gracias a Ash Hughes)</li>
+<li>primera versión con nuevos idiomas (gracias a los colaboradores en Transifex)</li>
+<li>compartir claves a través de códigos QR corregido y mejorado</li>
+<li>verificación por API del paquete de firma</li>
 </ul>
 <h2>2.1.1</h2>
 <ul>
-<li>API Updates, preparation for K-9 Mail integration</li>
+<li>Actualizaciones de la API, preparación para la integración con K-9 Mail</li>
 </ul>
 <h2>2.1</h2>
 <ul>
-<li>lots of bug fixes</li>
-<li>new API for developers</li>
-<li>Bug PRNG corregido por Google</li>
+<li>corrección de muchos bugs</li>
+<li>nueva API para desarrolladores</li>
+<li>corrección del bug PRNG por Google</li>
 </ul>
 <h2>2.0</h2>
 <ul>
-<li>complete redesign</li>
-<li>share public keys via qr codes, nfc beam</li>
-<li>sign keys</li>
-<li>upload keys to server</li>
-<li>fixes import issues</li>
-<li>new AIDL API</li>
+<li>completo rediseño</li>
+<li>compartir claves públicas a través de códigos QR, NFC, Beam</li>
+<li>claves de firma</li>
+<li>cargar claves al servidor</li>
+<li>corrige problemas importantes</li>
+<li>nueva API AIDL</li>
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>compatibilidad básica de servidor de claves</li>
-<li>app2sd</li>
+<li>compatibilidad básica de los servidores de claves</li>
+<li>app-a-sd</li>
 <li>más opciones para la caché de la frase de contraseña: 1, 2, 4, 8 horas</li>
-<li>traducciones: Noruego (gracias, Sander Danielsen), Chino (gracias, Zhang Fredrick)</li>
+<li>traducciones: noruego (gracias, Sander Danielsen), chino (gracias, Zhang Fredrick)</li>
 <li>correcciones de errores</li>
 <li>optimizaciones</li>
 </ul>
 <h2>1.0.7</h2>
 <ul>
-<li>fixed problem with signature verification of texts with trailing newline</li>
-<li>more options for pass phrase cache time to live (20, 40, 60 mins)</li>
+<li>corregido el problema con la verificación de firma de textos que arrastran a una nueva línea</li>
+<li>más opciones para el tiempo de la caché  de la frase de contraseña hasta ahora (20, 40, 60 mins)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
-<li>account adding crash on Froyo fixed</li>
-<li>secure file deletion</li>
-<li>option to delete key file after import</li>
-<li>stream encryption/decryption (gallery, etc.)</li>
-<li>new options (language, force v3 signatures)</li>
-<li>interface changes</li>
+<li>corregido el problema al añadir cuentas en Froyo</li>
+<li>borrado seguro de archivo</li>
+<li>opción para borrar el archivo de la clave después de importarlo</li>
+<li>flujo de cifrado/descifrado (galería, etc.)</li>
+<li>nuevas opciones (idioma, forzar firmas v3)</li>
+<li>cambios en la interfaz</li>
 <li>correcciones de errores</li>
 </ul>
 <h2>1.0.5</h2>
 <ul>
-<li>German and Italian translation</li>
-<li>much smaller package, due to reduced BC sources</li>
-<li>new preferences GUI</li>
-<li>layout adjustment for localization</li>
-<li>signature bugfix</li>
+<li>traducciones a alemán e italiano</li>
+<li>paquete de mucho menos tamaño, debido a fuentes BC reducidas</li>
+<li>nuevas preferencias en la GUI</li>
+<li>ajuste del diseño para localización</li>
+<li>corrección de error en la firma</li>
 </ul>
 <h2>1.0.4</h2>
 <ul>
-<li>fixed another crash caused by some SDK bug with query builder</li>
+<li>corregido otro error causado por algún bug en el SDK con el constructor de consultas</li>
 </ul>
 <h2>1.0.3</h2>
 <ul>
-<li>fixed crashes during encryption/signing and possibly key export</li>
+<li>corregidos los errores durante el cifrado/firma y probablemente en la exportación de la clave</li>
 </ul>
 <h2>1.0.2</h2>
 <ul>
-<li>filterable key lists</li>
-<li>smarter pre-selection of encryption keys</li>
-<li>new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li>
-<li>fixes and additional features (key preselection) for K-9 Mail, new beta build available</li>
+<li>listas de claves con filtro</li>
+<li>preselección de claves de cifrado más inteligente</li>
+<li>nuevo intento en el manejo para VER y ENVIAR, permite que los archivos sean cifrados/descifrados fuera de los gestores de archivos</li>
+<li>corrige y añade características (preselección de clave) para K-9 Mail, nueva compilación disponible</li>
 </ul>
 <h2>1.0.1</h2>
 <ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</li>
+<li>La enumeración de cuentas de GMail no funcionaba en 1.0.0, corregida de nuevo</li>
 </ul>
 <h2>1.0.0</h2>
 <ul>
-<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
-<li>support of more file managers (including ASTRO)</li>
-<li>Slovenian translation</li>
-<li>new database, much faster, less memory usage</li>
-<li>defined Intents and content provider for other apps</li>
+<li>integración con K-9 Mail, APG compatible con la compilación beta de K-9 Mail</li>
+<li>compatibilidad para más gestores de archivos (incluyendo ASTRO)</li>
+<li>traducción al esloveno</li>
+<li>nueva base de datos, más rápida, con menos demanda de memoria</li>
+<li>definidos los intentos y el proveedor de contenido para otras aplicaciones</li>
 <li>correcciones de errores</li>
 </ul>
 </body>
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html
index 88492731c..4a95680b5 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html
@@ -1,12 +1,12 @@
 <html>
 <head></head>
 <body>
-<h2>How to receive keys</h2>
+<h2>Cómo recibir las claves</h2>
 <ol>
-<li>Go to your partners contacts and open the contact you want to share.</li>
-<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
-<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
-<li>Tap the card and the content will then load on the your device.</li>
+<li>Vete a los contactos de tu compañero y abre el contacto con el que quieres compartir</li>
+<li>Mantén los dos dispositivos de con ambos reversos juntos (tienen que estar casi en contacto) y notarás una vibración.</li>
+<li>Después de que vibre, verás el contenido en el dispositivo de tu compañero convertirse en una especie de ficha con una animación de Star Trek de fondo.</li>
+<li>Toca la ficha y el contenido se cargará en tu dispositivo.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_start.html b/OpenPGP-Keychain/src/main/res/raw-es/help_start.html
index 2f7a788e1..d0eee8adb 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es/help_start.html
@@ -1,19 +1,19 @@
 <html>
 <head></head>
 <body>
-<h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<h2>Primeros pasos</h2>
+<p>Primero necesitas un par de claves personales. Crea una a través del menú "Mis claves" o importa un par de claves ya existentes a través de "Importar claves". Después, puedes descargar las claves de tus amigos o intercambiarlas a través de códigos QR o NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>Es recomendable que instales <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> para una mejor selección de archivos y <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> para escanear los códigos QR generados. Pulsando en los enlaces se abrirá Google Play o F-Droid.</p>
 
-<h2>I found a bug in OpenPGP Keychain!</h2>
-<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
+<h2>¡He encontrado un bug en OpenPGP Keychain!</h2>
+<p>Por favor, informa de errores usando el <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">seguimiento de incidencias de OpenPGP Keychain</a>.</p>
 
-<h2>Contribute</h2>
-<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+<h2>Aportar</h2>
+<p>Si quieres ayudarnos con el desarrollo de OpenPGP Keychain aportando código <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">sigue nuestra pequeña guía en Github</a>.</p>
 
-<h2>Translations</h2>
-<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p>
+<h2>Traducciones</h2>
+<p>¡Ayúdanos a traducir OpenPGP Keychain! Todo el mundo es bienvenido en <a href="https://www.transifex.com/projects/p/openpgp-keychain/">Transifex - OpenPGP Keychain</a>.</p>
 
 </body>
 </html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html
index 083e055c7..b6c2a2278 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html
@@ -2,10 +2,10 @@
 <head></head>
 <body>
 <ol>
-<li>Make sure that NFC is turned on in Settings &gt; More &gt; NFC and make sure that Android Beam is also on in the same section.</li>
-<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li>
-<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
-<li>Tap the card and the content will then load on the other person’s device.</li>
+<li>Asegúrate de que NFC está encendido en Ajustes &gt; Más &gt; NFC, y asegúrate de que Android Beam está también activado en ese mismo apartado.</li>
+<li>Mantén los dos dispositivos con ambos reversos juntos (deben estar casi en contacto) y notarás una vibración.</li>
+<li>Después de la vibración verás el contenido de tu dispositivo convertirse en una especie de ficha con una animación de Star Trek de fondo.</li>
+<li>Pulsa la ficha y el contenido será cargado en el dispositivo de la otra persona.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html
index d45a27f55..4be071ec9 100644
--- a/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html
@@ -2,18 +2,18 @@
 <head></head>
 <body>
 <h2>Commencer</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>Vous avez d'abord besoin d'une paire de clefs personelles. Créez-en une avec l'option du menu « Mes clefs » ou importez des paires de clefs existantes avec « Importer des clefs ». Ensuite vous pouvez télécharger les clefs de vos amis, ou les échanger par codes QR ou NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>Il vous est recommendé d'installer le <a href="market://details?id=org.openintents.filemanager">gestionnaire de fichiers OI</a> pour sa fonction améliorée de séléction des fichiers et le <a href="market://details?id=com.google.zxing.client.android">lecteur de codes à barres</a> pour balayer les codes QR générés. Cliquer sur les liens ouvrira Google Play Store ou F-Droid pour l'installation.</p>
 
 <h2>J'ai trouvé un bogue dans le Porte-clefs OpenPGP !</h2>
-<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
+<p>Veuillez rapporter le bogue en utilisant le <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">gestionnaire de bogues du Porte-clefs OpenPGP</a>.</p>
 
-<h2>Contribute</h2>
-<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+<h2>Contribuer</h2>
+<p>Si vous voulez nous aider à développer le Porte-clefs OpenPGP en y contribuant par du code, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">veuillez suivre notre petit guide sur Github</a>.</p>
 
-<h2>Translations</h2>
-<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p>
+<h2>Traductions</h2>
+<p>Aidez-nous à traduire le Porte-clefs OpenPGP ! Tout le monde peut y participer sur la <a href="https://www.transifex.com/projects/p/openpgp-keychain/">page Transifex du Porte-clefs OpenPGP Keychain</a>.</p>
 
 </body>
 </html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
index 28d025a9f..abf660ba8 100644
--- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html
@@ -6,7 +6,7 @@
 <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
 <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
 <li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>querying key servers directly from the import screen</li>
+<li>querying keyservers directly from the import screen</li>
 <li>fix layout and dialog style on Android 2.2-3.0</li>
 <li>fix crash on keys with empty user ids</li>
 <li>fix crash and empty lists when coming back from signing screen</li>
@@ -46,7 +46,7 @@
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>basic key server support</li>
+<li>basic keyserver support</li>
 <li>app2sd</li>
 <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li>
 <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html
index 2f7a788e1..198dfe64f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html
@@ -2,9 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenPGP Keychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
index 28d025a9f..abf660ba8 100644
--- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html
@@ -6,7 +6,7 @@
 <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
 <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
 <li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>querying key servers directly from the import screen</li>
+<li>querying keyservers directly from the import screen</li>
 <li>fix layout and dialog style on Android 2.2-3.0</li>
 <li>fix crash on keys with empty user ids</li>
 <li>fix crash and empty lists when coming back from signing screen</li>
@@ -46,7 +46,7 @@
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>basic key server support</li>
+<li>basic keyserver support</li>
 <li>app2sd</li>
 <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li>
 <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html
index 2f7a788e1..198dfe64f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html
@@ -2,9 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenPGP Keychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
index 28d025a9f..abf660ba8 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html
@@ -6,7 +6,7 @@
 <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
 <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
 <li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>querying key servers directly from the import screen</li>
+<li>querying keyservers directly from the import screen</li>
 <li>fix layout and dialog style on Android 2.2-3.0</li>
 <li>fix crash on keys with empty user ids</li>
 <li>fix crash and empty lists when coming back from signing screen</li>
@@ -46,7 +46,7 @@
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>basic key server support</li>
+<li>basic keyserver support</li>
 <li>app2sd</li>
 <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li>
 <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html
index 2f7a788e1..198dfe64f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html
@@ -2,9 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenPGP Keychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
index 68c054917..688f07be4 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html
@@ -6,7 +6,7 @@
 <li>удален не требующийся экспорт публичного ключа при экспорте секретного ключа (спасибо, Ash Hughes)</li>
 <li>исправлена ошибка срока годности ключей (спасибо, Ash Hughes)</li>
 <li>исправления ошибок при изменении ключей (спасибо, Ash Hughes)</li>
-<li>запрос ключа прямо из окна импорта ключей</li>
+<li>querying keyservers directly from the import screen</li>
 <li>исправление внешнего вида для Android 2.2-3.0</li>
 <li>исправлено падение когда ключ не содержал имя пользователя</li>
 <li>исправлено падение и пустой список при возвращении из окна подписания</li>
@@ -46,7 +46,7 @@
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>поддержка серверов ключей</li>
+<li>basic keyserver support</li>
 <li>App2SD</li>
 <li>больше вариантов сохранения кэша пароля: 1, 2, 4, 8 часов</li>
 <li>переводы: норвежский (спасибо, Sander Danielsen), китайский (спасибо, Zhang Fredrick)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html
index 4b5ea0a0b..b47f3c741 100644
--- a/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html
@@ -2,18 +2,18 @@
 <head></head>
 <body>
 <h2>Приступая</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>Я нашел ошибку в OpenPGP Keychain!</h2>
-<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
+<p>Пожалуйста, сообщайте о возникших проблемах и найденных ошибках в разделе <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Решение проблем OpenPGP Keychain</a>.</p>
 
-<h2>Contribute</h2>
-<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+<h2>Вклад в развитие</h2>
+<p>Если Вы хотите помочь в разработке OpenPGP Keychain, обратитесь к <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">инструкции на Github</a>.</p>
 
-<h2>Translations</h2>
-<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p>
+<h2>Перевод</h2>
+<p>Помогите переводить OpenPGP Keychain! Каждый может принять участие в переводе <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain на Transifex</a>.</p>
 
 </body>
 </html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
index 28d025a9f..abf660ba8 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html
@@ -6,7 +6,7 @@
 <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
 <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
 <li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>querying key servers directly from the import screen</li>
+<li>querying keyservers directly from the import screen</li>
 <li>fix layout and dialog style on Android 2.2-3.0</li>
 <li>fix crash on keys with empty user ids</li>
 <li>fix crash and empty lists when coming back from signing screen</li>
@@ -46,7 +46,7 @@
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>basic key server support</li>
+<li>basic keyserver support</li>
 <li>app2sd</li>
 <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li>
 <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html
index 2f7a788e1..198dfe64f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html
@@ -2,9 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenPGP Keychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
index 28d025a9f..abf660ba8 100644
--- a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html
@@ -6,7 +6,7 @@
 <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
 <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
 <li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>querying key servers directly from the import screen</li>
+<li>querying keyservers directly from the import screen</li>
 <li>fix layout and dialog style on Android 2.2-3.0</li>
 <li>fix crash on keys with empty user ids</li>
 <li>fix crash and empty lists when coming back from signing screen</li>
@@ -46,7 +46,7 @@
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>basic key server support</li>
+<li>basic keyserver support</li>
 <li>app2sd</li>
 <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li>
 <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html
index 2f7a788e1..198dfe64f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html
@@ -2,9 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenPGP Keychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html
index c0dd0ae45..520224815 100644
--- a/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html
@@ -2,18 +2,18 @@
 <head></head>
 <body>
 <h2>Приступаючи до роботи</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>Спершу вам потрібна персональна в'язка ключів. Створіть одну через меню параметрів у "Мої Ключі" або імпортуйте наявні в'язки ключів через "Імпорт ключів". Після цього ви зможете завантажувати ключі ваших друзів чи обміняти їх через штрих-коди або NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>Рекомендуємо вам встановити <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> для поліпшеного виділення файлів та <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> для сканування згенерованих штрих-кодів. Натискання посилань відкриє Google Play або F-Droid для встановлення.</p>
 
 <h2>Я знайшов помилку в OpenPGP Keychain!</h2>
-<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
+<p>Будь ласка, повідомте про ваду за допомогою <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">відстежувача проблем OpenPGP Keychain</a>.</p>
 
-<h2>Contribute</h2>
-<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+<h2>Внесок</h2>
+<p>Якщо ви хочете допомогти нам у розробці OpenPGP Keychain через редагування коду програми <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">підпишіться на наш невеличкий посібник у Github</a>.</p>
 
-<h2>Translations</h2>
-<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p>
+<h2>Переклади</h2>
+<p>Допоможіть перекласти OpenPGP Keychain! Кожний може взяти участь у <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain на Transifex</a>.</p>
 
 </body>
 </html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
index 28d025a9f..abf660ba8 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html
@@ -6,7 +6,7 @@
 <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
 <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
 <li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>querying key servers directly from the import screen</li>
+<li>querying keyservers directly from the import screen</li>
 <li>fix layout and dialog style on Android 2.2-3.0</li>
 <li>fix crash on keys with empty user ids</li>
 <li>fix crash and empty lists when coming back from signing screen</li>
@@ -46,7 +46,7 @@
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>basic key server support</li>
+<li>basic keyserver support</li>
 <li>app2sd</li>
 <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li>
 <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
index 2f7a788e1..198dfe64f 100644
--- a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
+++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html
@@ -2,9 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download keys of your friends or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play or F-Droid for installation.</p>
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenPGP Keychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
diff --git a/OpenPGP-Keychain/src/main/res/values-de/strings.xml b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
index 9091936d5..d7b4ac89c 100644
--- a/OpenPGP-Keychain/src/main/res/values-de/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
@@ -12,7 +12,6 @@
   <string name="title_edit_key">Schlüssel bearbeiten</string>
   <string name="title_preferences">Einstellungen</string>
   <string name="title_api_registered_apps">Registrierte Anwendungen</string>
-  <string name="title_key_server_preference">Einstellung der Schlüsselserver</string>
   <string name="title_change_pass_phrase">Passwort ändern</string>
   <string name="title_set_passphrase">Passwort setzen</string>
   <string name="title_send_email">E-Mail senden...</string>
@@ -22,8 +21,6 @@
   <string name="title_export_key">Schlüssel exportieren</string>
   <string name="title_export_keys">Schlüssel exportieren</string>
   <string name="title_key_not_found">Schlüssel nicht gefunden</string>
-  <string name="title_key_server_query">Schlüssel-Server abfragen</string>
-  <string name="title_send_key">Auf Schlüsselserver hochladen</string>
   <string name="title_unknown_signature_key">Unbekannter Signaturschlüssel</string>
   <string name="title_certify_key">Schlüssel beglaubigen</string>
   <string name="title_key_details">Schlüsseldetails</string>
@@ -39,7 +36,6 @@
   <string name="section_actions">Aktionen</string>
   <string name="section_certification_key">Mit diesem Schlüssel beglaubigen</string>
   <string name="section_upload_key">Schlüssel hochladen</string>
-  <string name="section_key_server">Schlüsselserver</string>
   <string name="section_encrypt_and_or_sign">Verschlüsseln und/oder Signieren</string>
   <string name="section_decrypt_verify">Entschlüsseln und Verifizieren</string>
   <!--button-->
@@ -57,7 +53,6 @@
   <string name="btn_change_passphrase">Passwort ändern</string>
   <string name="btn_set_passphrase">Passwort setzen</string>
   <string name="btn_search">Suchen</string>
-  <string name="btn_export_to_server">Auf Schlüsselserver hochladen</string>
   <string name="btn_next">Weiter</string>
   <string name="btn_back">Zurück</string>
   <string name="btn_clipboard">Zwischenablage</string>
@@ -76,8 +71,6 @@
   <string name="menu_create_key">Schlüssel erstellen</string>
   <string name="menu_create_key_expert">Schlüssel erstellen (Experte)</string>
   <string name="menu_search">Suchen</string>
-  <string name="menu_key_server">Schlüsselserver</string>
-  <string name="menu_update_key">Von einem Schlüsselserver aktualisieren</string>
   <string name="menu_export_key_to_server">Auf Schlüsselserver hochladen</string>
   <string name="menu_share">Teilen</string>
   <string name="menu_share_title_fingerprint">Teile Fingerabdruck…</string>
@@ -112,7 +105,6 @@
   <string name="label_message_compression">Nachrichten-Komprimierung</string>
   <string name="label_file_compression">Datei-Komprimierung</string>
   <string name="label_force_v3_signature">OpenPGPv3-Signaturen erzwingen</string>
-  <string name="label_key_servers">Schlüsselserver</string>
   <string name="label_key_id">Schlüssel-ID</string>
   <string name="label_creation">Erstellungsdatum</string>
   <string name="label_expiry">Ablaufdatum</string>
@@ -122,7 +114,6 @@
   <string name="label_name">Name</string>
   <string name="label_comment">Kommentar</string>
   <string name="label_email">E-Mail</string>
-  <string name="label_send_key">Schlüssel nach Beglaubigung auf ausgewählten Schlüsselserver hochladen</string>
   <string name="label_fingerprint">Fingerabdruck</string>
   <string name="select_keys_button_default">Auswählen</string>
   <plurals name="select_keys_button">
@@ -137,10 +128,6 @@
   <string name="can_sign">kann signieren</string>
   <string name="expired">abgelaufen</string>
   <string name="revoked">zurückgezogen</string>
-  <plurals name="n_key_servers">
-    <item quantity="one">%d Schlüsselserver</item>
-    <item quantity="other">%d Schlüsselserver</item>
-  </plurals>
   <string name="fingerprint">Fingerabdruck:</string>
   <string name="secret_key">Privater Schlüssel:</string>
   <!--choice-->
@@ -371,7 +358,6 @@
   <string name="key_list_empty_button_import">existierende Schlüssel importierst.</string>
   <!--Key view-->
   <string name="key_view_action_encrypt">Für diesen Kontakt verschlüsseln</string>
-  <string name="key_view_action_certify">Schlüssel dieses Kontakts beglaubigen</string>
   <!--Navigation Drawer-->
   <string name="nav_contacts">Kontakte</string>
   <string name="nav_encrypt">Verschlüsseln</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
index 16217156e..587f884d0 100644
--- a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
@@ -10,7 +10,6 @@
   <string name="title_edit_key">Editar clave</string>
   <string name="title_preferences">Preferencias</string>
   <string name="title_api_registered_apps">Aplicaciones registradas</string>
-  <string name="title_key_server_preference">Preferencias del servidor de claves</string>
   <string name="title_change_pass_phrase">Cambiar contraseña</string>
   <string name="title_set_passphrase">Establecer contraseña</string>
   <string name="title_send_email">Enviar correo electrónico...</string>
@@ -20,7 +19,6 @@
   <string name="title_export_key">Exportar clave</string>
   <string name="title_export_keys">Exportar claves</string>
   <string name="title_key_not_found">Clave no encontrada</string>
-  <string name="title_key_server_query">Solicitar al servidor de claves</string>
   <string name="title_unknown_signature_key">Clave de firma desconocida</string>
   <string name="title_help">Ayuda</string>
   <!--section-->
@@ -55,7 +53,6 @@
   <string name="menu_create_key">Crear clave</string>
   <string name="menu_create_key_expert">Crear clave (experto)</string>
   <string name="menu_search">Buscar</string>
-  <string name="menu_key_server">Importar desde servidor de claves</string>
   <string name="menu_sign_key">Clave de firma</string>
   <!--label-->
   <string name="label_sign">Firmar</string>
@@ -75,7 +72,6 @@
   <string name="label_message_compression">Compresión de mensaje</string>
   <string name="label_file_compression">Compresión de archivo</string>
   <string name="label_force_v3_signature">Forzar firmas V3</string>
-  <string name="label_key_servers">Servidores de claves</string>
   <string name="label_key_id">ID de clave</string>
   <string name="label_creation">Creación</string>
   <string name="label_expiry">Expiración</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
index df870d9f0..cdcb44cd2 100644
--- a/OpenPGP-Keychain/src/main/res/values-es/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
@@ -15,7 +15,7 @@
   <string name="title_key_server_preference">Prioridad del servidor de claves</string>
   <string name="title_change_pass_phrase">Cambiar la frase de contraseña</string>
   <string name="title_set_passphrase">Establecer frase de contraseña</string>
-  <string name="title_send_email">Enviar correo electrónico...</string>
+  <string name="title_send_email">Enviar email...</string>
   <string name="title_encrypt_to_file">Cifrar hacia archivo</string>
   <string name="title_decrypt_to_file">Descifrar hacia archivo</string>
   <string name="title_import_keys">Importar claves</string>
@@ -77,7 +77,7 @@
   <string name="menu_create_key_expert">Crear clave (experto)</string>
   <string name="menu_search">Buscar</string>
   <string name="menu_key_server">Importar desde servidor de claves</string>
-  <string name="menu_update_key">Actualizar desde el servidor de claves</string>
+  <string name="menu_update_key">Actualizar desde servidor de claves</string>
   <string name="menu_export_key_to_server">Cargar al servidor de claves</string>
   <string name="menu_share">Compartir</string>
   <string name="menu_share_title_fingerprint">Compartir la huella digital...</string>
@@ -121,8 +121,8 @@
   <string name="label_main_user_id">ID del usuario principal</string>
   <string name="label_name">Nombre</string>
   <string name="label_comment">Comentario</string>
-  <string name="label_email">Correo electrónico</string>
-  <string name="label_send_key">Cargar la clave al servidor de claves seleccionado después de la certificación</string>
+  <string name="label_email">Email</string>
+  <string name="label_send_key">Cargar clave al servidor de claves seleccionado después de la certificación</string>
   <string name="label_fingerprint">Huella digital</string>
   <string name="select_keys_button_default">Seleccionar</string>
   <plurals name="select_keys_button">
@@ -239,12 +239,12 @@
   <string name="error_no_secret_key_found">no se ha encontrado una clave secreta adecuada</string>
   <string name="error_no_known_encryption_found">se ha encontrado un tipo de cifrado no conocido</string>
   <string name="error_external_storage_not_ready">el almacenamiento externo no está preparado</string>
-  <string name="error_invalid_email">correo electrónico incorrecto \'%s\'</string>
+  <string name="error_invalid_email">email incorrecto \'%s\'</string>
   <string name="error_key_size_minimum512bit">el tamaño de clave debe ser de al menos 512bit</string>
   <string name="error_master_key_must_not_be_el_gamal">la clave maestra no puede ser una clave ElGamal</string>
   <string name="error_unknown_algorithm_choice">elegido algoritmo desconocido</string>
   <string name="error_user_id_needs_a_name">necesitas determinar un nombre</string>
-  <string name="error_user_id_needs_an_email_address">necesitas determinar una dirección de correo electrónica</string>
+  <string name="error_user_id_needs_an_email_address">tienes que determinar una dirección de email</string>
   <string name="error_key_needs_a_user_id">necesitas al menos una ID de usuario</string>
   <string name="error_main_user_id_must_not_be_empty">la ID del usuario principal no puede estar vacía</string>
   <string name="error_key_needs_master_key">necesitas al menos una clave maestra</string>
@@ -263,6 +263,8 @@
   <string name="error_nfc_needed">¡NFC no está disponible en tu dispositivo!</string>
   <string name="error_nothing_import">¡Nada que importar!</string>
   <string name="error_expiry_must_come_after_creation">la fecha de caducidad debe ser posterior a la fecha de creación</string>
+  <string name="error_can_not_delete_contact">no puedes eliminar este contacto porque eres tú mismo. ¡Por favor, bórralo desde la ventana \"Mis claves\"!</string>
+  <string name="error_can_not_delete_contacts">no puedes eliminar los siguientes contactos porque son tú mismo:\n%s¡Por favor, bórralos desde la ventana \"Mis claves\"!</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">hecho.</string>
   <string name="progress_saving">guardando...</string>
@@ -296,7 +298,7 @@
   <string name="progress_deleting_securely">borrando \'%s\' de forma segura…</string>
   <string name="progress_querying">consultando...</string>
   <!--action strings-->
-  <string name="hint_public_keys">Buscar las claves públicas</string>
+  <string name="hint_public_keys">Buscar claves públicas</string>
   <string name="hint_secret_keys">Buscar las claves secretas</string>
   <string name="action_share_key_with">Compartir la clave con...</string>
   <!--key bit length selections-->
@@ -364,14 +366,14 @@
     <item quantity="one">1 clave seleccionada.</item>
     <item quantity="other">%d claves seleccionadas.</item>
   </plurals>
-  <string name="key_list_empty_text1">No hay claves disponibles todavía...</string>
+  <string name="key_list_empty_text1">Aún no hay claves disponibles...</string>
   <string name="key_list_empty_text2">Puedes empezar por</string>
   <string name="key_list_empty_text3">o</string>
-  <string name="key_list_empty_button_create">creando tu propia clave</string>
-  <string name="key_list_empty_button_import">importando claves.</string>
+  <string name="key_list_empty_button_create">crear tu propia clave</string>
+  <string name="key_list_empty_button_import">importar claves</string>
   <!--Key view-->
   <string name="key_view_action_encrypt">Cifrar hacia este contacto</string>
-  <string name="key_view_action_certify">Certificar la ID de usuario de este contacto</string>
+  <string name="key_view_action_certify">Certificar la clave de este contacto</string>
   <!--Navigation Drawer-->
   <string name="nav_contacts">Contactos</string>
   <string name="nav_encrypt">Cifrar</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
index dc7bc172c..dbf47375c 100644
--- a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
@@ -12,7 +12,7 @@
   <string name="title_edit_key">Modifier une clef</string>
   <string name="title_preferences">Préférences</string>
   <string name="title_api_registered_apps">Applications enregistrées</string>
-  <string name="title_key_server_preference">Serveurs de clefs préférés</string>
+  <string name="title_key_server_preference">Préférences du serveur de clefs</string>
   <string name="title_change_pass_phrase">Changer la phrase de passe</string>
   <string name="title_set_passphrase">Définir la phrase de passe</string>
   <string name="title_send_email">Envoyer un courriel...</string>
@@ -25,6 +25,7 @@
   <string name="title_key_server_query">Interroger le serveur de clefs</string>
   <string name="title_send_key">Téléverser vers le serveur de clefs</string>
   <string name="title_unknown_signature_key">Clef de signature inconnue</string>
+  <string name="title_certify_key">Certifier la clef</string>
   <string name="title_key_details">Détails sur la clef</string>
   <string name="title_help">Aide</string>
   <!--section-->
@@ -36,12 +37,14 @@
   <string name="section_master_key">Clef maîtresse</string>
   <string name="section_master_user_id">ID utilisateur maître</string>
   <string name="section_actions">Actions</string>
+  <string name="section_certification_key">Votre clef utilisée pour la certification</string>
   <string name="section_upload_key">Téléverser la clef</string>
   <string name="section_key_server">Serveur de clefs</string>
   <string name="section_encrypt_and_or_sign">Chiffrer et/ou signer</string>
   <string name="section_decrypt_verify">Déchiffrer et vérifier</string>
   <!--button-->
   <string name="btn_sign">Signer</string>
+  <string name="btn_certify">Certifier</string>
   <string name="btn_decrypt">Déchiffrer</string>
   <string name="btn_decrypt_verify">Déchiffrer et vérifier</string>
   <string name="btn_select_encrypt_keys">Choisir les destinataires</string>
@@ -59,6 +62,7 @@
   <string name="btn_back">Retour</string>
   <string name="btn_clipboard">Presse-papiers</string>
   <string name="btn_share">Partager avec...</string>
+  <string name="btn_lookup_key">Rechercher la clef</string>
   <!--menu-->
   <string name="menu_preferences">Paramètres</string>
   <string name="menu_help">Aide</string>
@@ -118,6 +122,7 @@
   <string name="label_name">Nom</string>
   <string name="label_comment">Commentaire</string>
   <string name="label_email">Courriel</string>
+  <string name="label_send_key">Téléverser la clef vers le serveur de clefs choisi après certification</string>
   <string name="label_fingerprint">Empreinte</string>
   <string name="select_keys_button_default">Choisir</string>
   <plurals name="select_keys_button">
@@ -131,9 +136,10 @@
   <string name="can_encrypt">peut chiffrer</string>
   <string name="can_sign">peut signer</string>
   <string name="expired">expiré</string>
+  <string name="revoked">révoquée</string>
   <plurals name="n_key_servers">
-    <item quantity="one">%d serveur de clef</item>
-    <item quantity="other">%d serveurs de clef</item>
+    <item quantity="one">%d serveur de clefs</item>
+    <item quantity="other">%d serveurs de clefs</item>
   </plurals>
   <string name="fingerprint">Empreinte :</string>
   <string name="secret_key">Clef secrète :</string>
@@ -212,10 +218,12 @@
     <item quantity="one">%d clef trouvée.</item>
     <item quantity="other">%d clefs trouvées.</item>
   </plurals>
+  <string name="unknown_signature">Signature inconnue. Cliquer sur le bouton pour rechercher la clef manquante.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">%d mauvaise clef ignorée. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item>
     <item quantity="other">%d mauvaises clefs ignorées. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item>
   </plurals>
+  <string name="key_send_success">Clef téléversée vers le serveur avec succès</string>
   <string name="key_sign_success">Clef signée avec succès</string>
   <string name="list_empty">Cette liste est vide !</string>
   <string name="nfc_successfull">Clef envoyée par NFC BEAM avec succès !</string>
@@ -228,7 +236,7 @@
          they will be put after "error_message", e.g. "Error: file not found"-->
   <string name="error_file_delete_failed">échec lors de la suppression de « %s »</string>
   <string name="error_file_not_found">fichier introuvable</string>
-  <string name="error_no_secret_key_found">aucune clé secrète adéquate n\'a été trouvée</string>
+  <string name="error_no_secret_key_found">aucune clefs secrète adéquate n\'a été trouvée</string>
   <string name="error_no_known_encryption_found">aucune sorte de chiffrement connu n\'a été trouvé</string>
   <string name="error_external_storage_not_ready">le stockage externe n\'est pas prêt</string>
   <string name="error_invalid_email">courriel « %s » invalide</string>
@@ -255,6 +263,8 @@
   <string name="error_nfc_needed">NFC n\'est pas disponible sur votre appareil !</string>
   <string name="error_nothing_import">Rien à importer !</string>
   <string name="error_expiry_must_come_after_creation">la date d\'expiration doit venir après la date de création</string>
+  <string name="error_can_not_delete_contact">vous ne pouvez pas supprimer ce contact car c\'est le vôtre. Veuillez le supprimer depuis l\'écran « Mes Clefs »!</string>
+  <string name="error_can_not_delete_contacts">vous ne pouvez pas supprimer les contacts suivants car c\'est les vôtres.\n%sVeuillez les supprimer depuis l\'écran « Mes Clefs »!</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">fait.</string>
   <string name="progress_saving">sauvegarde...</string>
@@ -363,6 +373,7 @@
   <string name="key_list_empty_button_import">Importer des clefs.</string>
   <!--Key view-->
   <string name="key_view_action_encrypt">Chiffrer vers ce contact</string>
+  <string name="key_view_action_certify">Certifier la clef de ce contact</string>
   <!--Navigation Drawer-->
   <string name="nav_contacts">Contacts</string>
   <string name="nav_encrypt">Chiffrer</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
index fdc7ce082..3f1cd3cd2 100644
--- a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
@@ -10,7 +10,6 @@
   <string name="title_edit_key">Sleutel bewerken</string>
   <string name="title_preferences">Instellingen</string>
   <string name="title_api_registered_apps">Geregistreerde apps</string>
-  <string name="title_key_server_preference">Instellingen sleutelserver</string>
   <string name="title_change_pass_phrase">Wachtwoord wijzigen</string>
   <string name="title_set_passphrase">Wachtwoord instellen</string>
   <string name="title_send_email">E-mail verzenden...</string>
@@ -20,7 +19,6 @@
   <string name="title_export_key">Sleutels exporteren</string>
   <string name="title_export_keys">Sleutels exporteren</string>
   <string name="title_key_not_found">Sleutel niet gevonden</string>
-  <string name="title_key_server_query">Sleutelserver verzoek zenden</string>
   <string name="title_unknown_signature_key">Onbekende handtekeningssleutel</string>
   <string name="title_help">Help</string>
   <!--section-->
@@ -55,7 +53,6 @@
   <string name="menu_create_key">Sleutel aanmaken</string>
   <string name="menu_create_key_expert">Sleutel aanmaken (expert)</string>
   <string name="menu_search">Zoeken</string>
-  <string name="menu_key_server">Importeren uit sleutelserver</string>
   <string name="menu_sign_key">Sleutel ondertekenen</string>
   <string name="menu_beam_preferences">Beam-instellingen</string>
   <!--label-->
@@ -77,7 +74,6 @@
   <string name="label_message_compression">Berichtcompressie</string>
   <string name="label_file_compression">Bestandscompressie</string>
   <string name="label_force_v3_signature">V3-handtekeningen afdwingen</string>
-  <string name="label_key_servers">Sleutelservers</string>
   <string name="label_key_id">Sleutel-id</string>
   <string name="label_creation">Aanmaak</string>
   <string name="label_expiry">Verlopen</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
index eb4b248f4..ca9b9ec4d 100644
--- a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
@@ -12,7 +12,6 @@
   <string name="title_edit_key">Изменить ключ</string>
   <string name="title_preferences">Настройки</string>
   <string name="title_api_registered_apps">Связанные приложения</string>
-  <string name="title_key_server_preference">Настройки сервера ключей</string>
   <string name="title_change_pass_phrase">Изменить пароль</string>
   <string name="title_set_passphrase">Задать пароль</string>
   <string name="title_send_email">Отправить...</string>
@@ -22,9 +21,8 @@
   <string name="title_export_key">Экспортировать ключ</string>
   <string name="title_export_keys">Экспорт ключей</string>
   <string name="title_key_not_found">Ключ не найден</string>
-  <string name="title_key_server_query">Запросить сервер ключей</string>
-  <string name="title_send_key">Загрузить на сервер ключей</string>
   <string name="title_unknown_signature_key">Неизвестная подпись</string>
+  <string name="title_certify_key">Сертифицировать ключ</string>
   <string name="title_key_details">Сведения о ключе</string>
   <string name="title_help">Помощь</string>
   <!--section-->
@@ -36,12 +34,13 @@
   <string name="section_master_key">Основной ключ</string>
   <string name="section_master_user_id">Владелец</string>
   <string name="section_actions">Действия</string>
+  <string name="section_certification_key">Ваш ключ для сертификации</string>
   <string name="section_upload_key">Загрузить ключ</string>
-  <string name="section_key_server">Сервер ключей</string>
   <string name="section_encrypt_and_or_sign">Зашифровать и/или Подписать</string>
   <string name="section_decrypt_verify">Расшифровать и проверить</string>
   <!--button-->
   <string name="btn_sign">Подписать</string>
+  <string name="btn_certify">Сертифицировать</string>
   <string name="btn_decrypt">Расшифровать</string>
   <string name="btn_decrypt_verify">Расшифровать и проверить</string>
   <string name="btn_select_encrypt_keys">Выбрать получателей</string>
@@ -54,11 +53,11 @@
   <string name="btn_change_passphrase">Изменить пароль</string>
   <string name="btn_set_passphrase">Задать пароль</string>
   <string name="btn_search">Поиск</string>
-  <string name="btn_export_to_server">Загрузить на сервер ключей</string>
   <string name="btn_next">Далее</string>
   <string name="btn_back">Назад</string>
   <string name="btn_clipboard">Буфер обмена</string>
   <string name="btn_share">Поделиться...</string>
+  <string name="btn_lookup_key">Найти ключ</string>
   <!--menu-->
   <string name="menu_preferences">Настройки</string>
   <string name="menu_help">Помощь</string>
@@ -72,8 +71,6 @@
   <string name="menu_create_key">Создать ключ</string>
   <string name="menu_create_key_expert">Создать ключ (эксперт)</string>
   <string name="menu_search">Поиск</string>
-  <string name="menu_key_server">Импорт с сервера ключей</string>
-  <string name="menu_update_key">Обновить с сервера ключей</string>
   <string name="menu_export_key_to_server">Загрузить на сервер ключей</string>
   <string name="menu_share">Отправить...</string>
   <string name="menu_share_title_fingerprint">Отправить отпечаток...</string>
@@ -108,7 +105,6 @@
   <string name="label_message_compression">Сжатие сообщения</string>
   <string name="label_file_compression">Сжатие файла</string>
   <string name="label_force_v3_signature">Использовать V3 подписи</string>
-  <string name="label_key_servers">Серверы ключей</string>
   <string name="label_key_id">ID ключа</string>
   <string name="label_creation">Создан</string>
   <string name="label_expiry">Годен до...</string>
@@ -132,11 +128,7 @@
   <string name="can_encrypt">шифрование</string>
   <string name="can_sign">подпись</string>
   <string name="expired">годен до</string>
-  <plurals name="n_key_servers">
-    <item quantity="one">%d сервер ключей</item>
-    <item quantity="few">%d серверов ключей</item>
-    <item quantity="other">%d серверов ключей</item>
-  </plurals>
+  <string name="revoked">отозван</string>
   <string name="fingerprint">Отпечаток:</string>
   <string name="secret_key">Секретный ключ:</string>
   <!--choice-->
@@ -219,11 +211,13 @@
     <item quantity="few">Найдено %d ключей.</item>
     <item quantity="other">Найдено %d ключей.</item>
   </plurals>
+  <string name="unknown_signature">Неизвестная подпись. Нажмите кнопку, что бы найти ключ.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">%d плохой секретный ключ проигнорирован. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys</item>
     <item quantity="few">%d плохих секретных ключей проигнорировано. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys\n</item>
     <item quantity="other">%d плохих секретных ключей проигнорировано. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys\n</item>
   </plurals>
+  <string name="key_send_success">Ключ успешно загружен на сервер</string>
   <string name="key_sign_success">Ключ успешно подписан</string>
   <string name="list_empty">Список пуст!</string>
   <string name="nfc_successfull">Ключ успешно передан через NFC!</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
index 587373301..8ec698bb0 100644
--- a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml
@@ -7,12 +7,10 @@
   <string name="title_create_key">Anahtar oluştur</string>
   <string name="title_edit_key">Anahtarı düzenle</string>
   <string name="title_preferences">Seçenekler</string>
-  <string name="title_key_server_preference">Anahtar Sunucusu Seçenekleri</string>
   <string name="title_import_keys">Anahtarları Al</string>
   <string name="title_export_key">Anahtarı Ver</string>
   <string name="title_export_keys">Anahtarları Ver</string>
   <string name="title_key_not_found">Anahtar Bulunamadı</string>
-  <string name="title_key_server_query">Anahtar Sunucusunu Sorgula</string>
   <string name="title_unknown_signature_key">Bilinmeyen İmza Anahtarı</string>
   <string name="title_key_details">Anahtar Detayları</string>
   <string name="title_help">Yardım</string>
@@ -23,7 +21,6 @@
   <string name="section_defaults">Varsayılanlar</string>
   <string name="section_advanced">Gelişmiş</string>
   <string name="section_upload_key">Anahtar Yükle</string>
-  <string name="section_key_server">Anahtar Sunucusu</string>
   <!--button-->
   <string name="btn_sign">İmzala</string>
   <string name="btn_select_encrypt_keys">Alıcıları Seç</string>
@@ -32,7 +29,6 @@
   <string name="btn_delete">Sil</string>
   <string name="btn_okay">Tamam</string>
   <string name="btn_search">Ara</string>
-  <string name="btn_export_to_server">Sunucuya Anahtar Yükle</string>
   <string name="btn_next">İleri</string>
   <string name="btn_back">Geri</string>
   <!--menu-->
@@ -47,7 +43,6 @@
   <string name="menu_create_key">Anahtar oluştur</string>
   <string name="menu_create_key_expert">Anahtar oluştur (uzman)</string>
   <string name="menu_search">Ara</string>
-  <string name="menu_key_server">Anahtar sunucusundan al</string>
   <string name="menu_copy_to_clipboard">Panoya kopyala</string>
   <string name="menu_sign_key">Anahtarı imzala</string>
   <string name="menu_key_edit_cancel">İptal</string>
@@ -58,7 +53,6 @@
   <string name="label_passphrase_again">Tekrar</string>
   <string name="label_algorithm">Algoritma</string>
   <string name="label_asymmetric">Açık Anahtar</string>
-  <string name="label_key_servers">Anahtar Sunucuları</string>
   <string name="label_creation">Oluşturma</string>
   <string name="label_usage">Kullanım</string>
   <string name="label_key_size">Anahtar Boyutu</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
index 334dfca80..928c206c1 100644
--- a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
@@ -22,9 +22,10 @@
   <string name="title_export_key">Експортувати ключ</string>
   <string name="title_export_keys">Експортувати ключі</string>
   <string name="title_key_not_found">Ключ не знайдено</string>
-  <string name="title_key_server_query">Сервер запиту ключа</string>
+  <string name="title_key_server_query">Сервер ключа запиту</string>
   <string name="title_send_key">Завантажити на сервер ключів</string>
   <string name="title_unknown_signature_key">Невідомий підпис ключа</string>
+  <string name="title_certify_key">Сертифікувати ключ</string>
   <string name="title_key_details">Подробиці про ключ</string>
   <string name="title_help">Довідка</string>
   <!--section-->
@@ -36,12 +37,14 @@
   <string name="section_master_key">Основний ключ</string>
   <string name="section_master_user_id">ІД основного ключа</string>
   <string name="section_actions">Дії</string>
+  <string name="section_certification_key">Ваш ключ використаний для сертифікації</string>
   <string name="section_upload_key">Завантажити ключ</string>
   <string name="section_key_server">Сервер ключів</string>
   <string name="section_encrypt_and_or_sign">Шифрувати і/або підписати</string>
   <string name="section_decrypt_verify">Розшифрувати і Перевірити</string>
   <!--button-->
   <string name="btn_sign">Підписати</string>
+  <string name="btn_certify">Сертифікувати</string>
   <string name="btn_decrypt">Розшифрувати</string>
   <string name="btn_decrypt_verify">Розшифрувати і Перевірити</string>
   <string name="btn_select_encrypt_keys">Вибрати одержувачів</string>
@@ -59,6 +62,7 @@
   <string name="btn_back">Назад</string>
   <string name="btn_clipboard">Буфер обміну</string>
   <string name="btn_share">Поділитися через…</string>
+  <string name="btn_lookup_key">Шукати ключ</string>
   <!--menu-->
   <string name="menu_preferences">Параметри</string>
   <string name="menu_help">Довідка</string>
@@ -118,6 +122,7 @@
   <string name="label_name">Назва</string>
   <string name="label_comment">Коментар</string>
   <string name="label_email">Ел. пошта</string>
+  <string name="label_send_key">Завантажити ключ до вибраного сервера ключів після сертифікації</string>
   <string name="label_fingerprint">Відбиток</string>
   <string name="select_keys_button_default">Вибрати</string>
   <plurals name="select_keys_button">
@@ -132,6 +137,7 @@
   <string name="can_encrypt">можна зашифрувати</string>
   <string name="can_sign">можна підписати</string>
   <string name="expired">закінчився</string>
+  <string name="revoked">скасовано</string>
   <plurals name="n_key_servers">
     <item quantity="one">%d сервер ключів</item>
     <item quantity="few">%d сервери ключів</item>
@@ -219,11 +225,13 @@
     <item quantity="few">Знайдено %d ключі.</item>
     <item quantity="other">Знайдено %d ключів.</item>
   </plurals>
+  <string name="unknown_signature">Невідомий підпис, натисніть кнопку для пошуку втраченого ключа.</string>
   <plurals name="bad_keys_encountered">
     <item quantity="one">%d поганий секретний ключ проігнорований. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item>
     <item quantity="few">%d погані секретні ключі проігноровані. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item>
     <item quantity="other">%d поганих секретних ключів проігноровано. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item>
   </plurals>
+  <string name="key_send_success">Успішно завантажено ключ на сервер</string>
   <string name="key_sign_success">Успішно підписаний ключ</string>
   <string name="list_empty">Цей список - порожній!</string>
   <string name="nfc_successfull">Успішно відправлений ключ з NFC променем!</string>
@@ -263,6 +271,8 @@
   <string name="error_nfc_needed">NFC недоступний на вашому пристрої!</string>
   <string name="error_nothing_import">Нема що імпортувати!</string>
   <string name="error_expiry_must_come_after_creation">дата завершення дії має йти після дати створення</string>
+  <string name="error_can_not_delete_contact">ви не можете вилучити цей контакт, тому що він ваш власний:\n Будь ласка, вилучіть його із екрану „Мої ключі“</string>
+  <string name="error_can_not_delete_contacts">ви не можете вилучити наступні контакти, тому що вони - ваші власні:\n%s Будь ласка, вилучте їх із екрану „Мої ключі“</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">готово.</string>
   <string name="progress_saving">збереження…</string>
@@ -374,6 +384,7 @@
   <string name="key_list_empty_button_import">імпортуюся ключі.</string>
   <!--Key view-->
   <string name="key_view_action_encrypt">Зашифрувати у цей контакт</string>
+  <string name="key_view_action_certify">Сертифікувати ключ цього контакту</string>
   <!--Navigation Drawer-->
   <string name="nav_contacts">Контакти</string>
   <string name="nav_encrypt">Зашифрувати</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
index 6bb115049..4ff02c7ed 100644
--- a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml
@@ -1,26 +1,165 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
+  <string name="title_encrypt">加密</string>
+  <string name="title_decrypt">解密</string>
+  <string name="title_key_server_preference">密钥服务器偏好</string>
+  <string name="title_key_server_query">查询密钥服务器</string>
+  <string name="title_send_key">上传到密钥服务器</string>
   <!--section-->
+  <string name="section_master_key">主密钥</string>
+  <string name="section_key_server">密钥服务器</string>
+  <string name="section_decrypt_verify">解密并验证</string>
   <!--button-->
+  <string name="btn_decrypt_verify">解密并验证</string>
+  <string name="btn_clipboard">剪贴板</string>
   <!--menu-->
+  <string name="menu_help">帮助</string>
+  <string name="menu_import">导入</string>
+  <string name="menu_delete_key">删除密钥</string>
+  <string name="menu_create_key">创建密钥</string>
+  <string name="menu_create_key_expert">创建密钥(专家)</string>
+  <string name="menu_search">搜索</string>
+  <string name="menu_share">分享</string>
+  <string name="menu_copy_to_clipboard">复制到剪贴板</string>
+  <string name="menu_sign_key">签署密钥</string>
+  <string name="menu_key_edit_cancel">取消</string>
+  <string name="menu_encrypt_to">加密到...</string>
   <!--label-->
+  <string name="label_sign">签署</string>
+  <string name="label_message">讯息</string>
+  <string name="label_file">文件</string>
+  <string name="label_no_passphrase">没有密语</string>
+  <string name="label_passphrase">密语</string>
+  <string name="label_algorithm">算法</string>
+  <string name="label_select_public_keys">收件人</string>
+  <string name="label_delete_after_encryption">加密后删除</string>
+  <string name="label_delete_after_decryption">解密后删除</string>
+  <string name="label_encryption_algorithm">加密算法</string>
+  <string name="label_hash_algorithm">哈希算法</string>
+  <string name="label_asymmetric">公共密钥</string>
+  <string name="label_symmetric">密语</string>
+  <string name="label_passphrase_cache_ttl">密语缓存</string>
+  <string name="label_comment">注解</string>
+  <string name="label_email">电子邮件</string>
+  <string name="label_fingerprint">指纹</string>
   <string name="unknown_status"></string>
+  <string name="can_encrypt">可以加密</string>
+  <string name="can_sign">可以签署</string>
+  <string name="expired">过期了</string>
   <!--choice-->
+  <string name="choice_none">没有</string>
+  <string name="choice_sign_only">仅签署</string>
+  <string name="choice_encrypt_only">仅加密</string>
+  <string name="choice_sign_and_encrypt">签署并加密</string>
+  <string name="choice_15secs">15秒</string>
+  <string name="choice_1min">1分钟</string>
+  <string name="choice_3mins">3分钟</string>
+  <string name="choice_5mins">5分钟</string>
+  <string name="choice_10mins">10分钟</string>
+  <string name="choice_20mins">20分钟</string>
+  <string name="choice_40mins">40分钟</string>
+  <string name="choice_1hour">1小时</string>
+  <string name="choice_2hours">2小时</string>
+  <string name="choice_4hours">4小时</string>
+  <string name="choice_8hours">8小时</string>
+  <string name="choice_forever">永远</string>
+  <string name="filemanager_title_open">打开...</string>
+  <string name="warning">警告</string>
+  <string name="error">错误</string>
   <!--sentences-->
+  <string name="set_a_passphrase">先设置密钥</string>
+  <string name="no_filemanager_installed">安装了不匹配的文件管理器</string>
+  <string name="passphrases_do_not_match">密钥不匹配</string>
+  <string name="passphrase_must_not_be_empty">不允许空的密钥</string>
+  <string name="passphrase_for_symmetric_encryption">对称加密</string>
+  <string name="file_delete_successful">删除成功</string>
+  <string name="no_file_selected">先选择一个文件</string>
+  <string name="decryption_successful">解密成功</string>
+  <string name="encryption_successful">加密成功</string>
+  <string name="encryption_to_clipboard_successful">成功地加密到了剪贴板</string>
+  <string name="enter_passphrase_twice">输入两次密钥</string>
+  <string name="select_encryption_key">选择至少一个加密密钥</string>
+  <string name="select_encryption_or_signature_key">选择至少一个加密密钥或者签名密钥</string>
+  <string name="key_exported">成功地导出了1个密钥</string>
+  <string name="no_keys_exported">没有密钥被导出</string>
+  <string name="key_send_success">成功地上传了密钥到服务器</string>
+  <string name="list_empty">这个列表是空的！</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
+  <string name="error_file_not_found">没有找到文件</string>
+  <string name="error_external_storage_not_ready">外置存储没有准备好</string>
+  <string name="error_invalid_email">无效的email \'%s\'</string>
+  <string name="error_key_size_minimum512bit">密钥的大小必须至少512位</string>
+  <string name="error_unknown_algorithm_choice">位置的算法选择</string>
+  <string name="error_user_id_needs_a_name">你需要指定一个名字</string>
+  <string name="error_user_id_needs_an_email_address">你需要指定一个电子邮件地址</string>
+  <string name="error_key_needs_a_user_id">需要至少一个用户id</string>
+  <string name="error_main_user_id_must_not_be_empty">主用户id不能是空的</string>
+  <string name="error_key_needs_master_key">需要至少一个主密钥</string>
+  <string name="error_signature_failed">签名失败</string>
+  <string name="error_no_signature_passphrase">没有提供密语</string>
+  <string name="error_no_signature_key">没有提供密钥</string>
+  <string name="error_invalid_data">不是有效的加密数据</string>
+  <string name="error_corrupt_data">损坏的数据</string>
+  <string name="error_wrong_passphrase">错误的密语</string>
   <!--progress dialogs, usually ending in '…'-->
+  <string name="progress_done">完成。</string>
+  <string name="progress_saving">保存...</string>
+  <string name="progress_importing">导入中...</string>
+  <string name="progress_exporting">导出中...</string>
+  <string name="progress_generating">正在生成密钥，这可能需要一会</string>
+  <string name="progress_building_key">建立密钥</string>
+  <string name="progress_preparing_master_key">正在准备主密钥</string>
+  <string name="progress_verifying_signature">正在验证签名...</string>
+  <string name="progress_signing">正在签名...</string>
+  <string name="progress_reading_data">正在读取数据</string>
+  <string name="progress_finding_key">正在查找密钥</string>
+  <string name="progress_querying">正在查询</string>
   <!--action strings-->
   <!--key bit length selections-->
+  <string name="key_size_512">512</string>
+  <string name="key_size_1024">1024</string>
+  <string name="key_size_2048">2048</string>
+  <string name="key_size_4096">4096</string>
   <!--compression-->
+  <string name="compression_fast">快</string>
+  <string name="compression_very_slow">非常慢</string>
   <!--Help-->
+  <string name="help_tab_start">开始</string>
+  <string name="help_tab_changelog">更新日志</string>
+  <string name="help_tab_about">关于</string>
+  <string name="help_about_version">版本:</string>
   <!--Import-->
+  <string name="import_from_clipboard">从剪贴板导入</string>
+  <string name="import_qr_code_finished">二维码扫描完成！</string>
+  <string name="import_nfc_help_button">帮助</string>
   <!--Intent labels-->
+  <string name="intent_decrypt_file">OpenPGP: 解密文件</string>
+  <string name="intent_import_key">OpenPGP: 导入密钥</string>
+  <string name="intent_send_encrypt">OpenPGP: 加密</string>
+  <string name="intent_send_decrypt">OpenPGP: 解密</string>
   <!--Remote API-->
+  <string name="api_settings_show_advanced">显示高级设置</string>
+  <string name="api_settings_hide_advanced">隐藏高级设置</string>
+  <string name="api_settings_select_key">选择密钥</string>
+  <string name="api_settings_save">保存</string>
+  <string name="api_settings_cancel">取消</string>
+  <string name="api_settings_revoke">撤销访问</string>
+  <string name="api_register_allow">允许访问</string>
+  <string name="api_register_disallow">不允许访问</string>
+  <string name="api_register_error_select_key">请选择一个密钥</string>
+  <string name="api_select_pub_keys_text">请重审收件人列表</string>
   <!--Share-->
+  <string name="share_qr_code_dialog_fingerprint_text">指纹:</string>
+  <string name="share_nfc_dialog">使用NFC分享</string>
   <!--Key list-->
+  <string name="key_list_empty_text3">或者</string>
   <!--Key view-->
   <!--Navigation Drawer-->
+  <string name="nav_encrypt">加密</string>
+  <string name="nav_decrypt">解密</string>
+  <string name="nav_import">导入密钥</string>
+  <string name="nav_secret_keys">我的密钥</string>
 </resources>
