From e1a81ae5cd677b66b7860ec6f9d8db0af00f15d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 30 Sep 2014 20:00:14 +0200
Subject: Update from transifex

---
 .../src/main/res/raw-cs/help_changelog.html        |  13 +
 .../src/main/res/raw-cs/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-cs/help_start.html   |   7 +-
 .../src/main/res/raw-de/help_changelog.html        |  13 +
 .../src/main/res/raw-de/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-de/help_start.html   |   9 +-
 .../src/main/res/raw-es/help_changelog.html        |  13 +
 .../src/main/res/raw-es/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-es/help_start.html   |   7 +-
 .../src/main/res/raw-et/help_changelog.html        |  13 +
 .../src/main/res/raw-et/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-et/help_start.html   |   7 +-
 .../src/main/res/raw-fi/help_changelog.html        |  13 +
 .../src/main/res/raw-fi/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-fi/help_start.html   |   7 +-
 .../src/main/res/raw-fr/help_changelog.html        |  13 +
 .../src/main/res/raw-fr/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-fr/help_start.html   |   7 +-
 .../src/main/res/raw-is/help_changelog.html        |  13 +
 .../src/main/res/raw-is/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-is/help_start.html   |   7 +-
 .../src/main/res/raw-it/help_changelog.html        |  13 +
 .../src/main/res/raw-it/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-it/help_start.html   |   7 +-
 .../src/main/res/raw-ja/help_changelog.html        |  13 +
 .../src/main/res/raw-ja/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-ja/help_start.html   |   7 +-
 .../src/main/res/raw-nl/help_changelog.html        |  13 +
 .../src/main/res/raw-nl/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-nl/help_start.html   |   7 +-
 .../src/main/res/raw-pl/help_changelog.html        |  13 +
 .../src/main/res/raw-pl/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-pl/help_start.html   |   7 +-
 .../src/main/res/raw-pt/help_changelog.html        |  13 +
 .../src/main/res/raw-pt/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-pt/help_start.html   |   7 +-
 .../src/main/res/raw-ru/help_changelog.html        |  13 +
 .../src/main/res/raw-ru/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-ru/help_start.html   |   7 +-
 .../src/main/res/raw-sl/help_changelog.html        |  13 +
 .../src/main/res/raw-sl/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-sl/help_start.html   |   7 +-
 .../src/main/res/raw-sr/help_changelog.html        | 247 +++++------
 .../src/main/res/raw-sr/help_nfc_beam.html         |  10 +-
 OpenKeychain/src/main/res/raw-sr/help_start.html   |  21 +-
 OpenKeychain/src/main/res/raw-sr/help_wot.html     |  16 +-
 .../src/main/res/raw-sr/nfc_beam_share.html        |   8 +-
 .../src/main/res/raw-tr/help_changelog.html        |  77 ++--
 .../src/main/res/raw-tr/help_nfc_beam.html         |  10 +-
 OpenKeychain/src/main/res/raw-tr/help_start.html   |  15 +-
 OpenKeychain/src/main/res/raw-tr/help_wot.html     |   6 +-
 .../src/main/res/raw-tr/nfc_beam_share.html        |   8 +-
 .../src/main/res/raw-uk/help_changelog.html        |  13 +
 .../src/main/res/raw-uk/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-uk/help_start.html   |   7 +-
 OpenKeychain/src/main/res/raw-zh/help_about.html   |   8 +-
 .../src/main/res/raw-zh/help_changelog.html        |  13 +
 .../src/main/res/raw-zh/help_nfc_beam.html         |  10 +-
 OpenKeychain/src/main/res/raw-zh/help_start.html   |  13 +-
 OpenKeychain/src/main/res/values-cs/strings.xml    |  15 +
 OpenKeychain/src/main/res/values-de/strings.xml    |  44 ++
 OpenKeychain/src/main/res/values-it/strings.xml    | 121 ++++++
 OpenKeychain/src/main/res/values-sr/strings.xml    | 467 +++++++++++++++++++++
 OpenKeychain/src/main/res/values-tr/strings.xml    | 106 +++++
 OpenKeychain/src/main/res/values-zh/strings.xml    |  98 ++++-
 65 files changed, 1332 insertions(+), 313 deletions(-)

(limited to 'OpenKeychain/src/main')

diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.html b/OpenKeychain/src/main/res/raw-cs/help_changelog.html
index 437aff638..9c4ee08c6 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html
index 61226894d..e40da69bf 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Jak přijmout klíče</h2>
 <ol>
-<li>Navigujte na kontakt vašeho partnera a otevřete ten který chcete sdílet.</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>Podržte dvě zařízení zády k sobě (musí se téměř dotýkat) a ucítíte vibraci.</li>
 <li>Po tom co ucítíte vibraci, uvidíte že se obsah na displeji zařízení vašeho partnera změní na objekt typu karta s animací na pozadí připomínající rychlost warpu ze Star Treku.</li>
 <li>Tapněte na kartu a obsah se nahraje do zařízení.</li>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_start.html b/OpenKeychain/src/main/res/raw-cs/help_start.html
index d6055c06b..58639f43a 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_start.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Začínáme</h2>
-<p>Nejprve potřebujete osobní tajný klíč. Vytvořte si ho pomocí volby v menu v sekci "Klíče" nebo importujte existující tajné klíče. Následně můžete stáhnout klíče vašich známých nebo si je vyměnit pomocí QR kódu případně NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>Doporučujeme instalaci <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> pro zlepšení práce se soubory a <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> pro skenování generovaných QR kódů. Kliknutí na odkazy otevře Google Play Store nebo F-Droid odkud můžete začít installovat.</p>
-
-<h2>Aplikace</h2>
-<p>Několik aplikací umožňuje šifrovat/podepsat privátní komunikaci pomocí OpenKeychain:<br><img src="apps_k9"><br>K-9 Mail: podpora OpenKeychain v aktualní verzi <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: Appka sloužící k odesílání požadavků podepsaných PGP na servery pro otevření nebo zavření něčeho, třeba dveří</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>Našel jsem chybu v OpenKeychain!</h2>
 <p>Nahlašte prosím chybu na <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">bug trackeru OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
index abff5a6a4..485109010 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Volle Unterstützung für Yubikey Signatur Generierung und Entschlüsselung!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>Neues Design der Entschlüsselungsseite</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>Neue Suche in der Cloud (sucht über traditionelle Keyserver und über keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Defekte Schlüssel aus 2.9.1 behoben</li>
diff --git a/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
index 0526783cd..0ad3502f1 100644
--- a/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Wie kann man Schlüssel empfangen</h2>
 <ol>
-<li>Gehen Sie zu den Kontakten ihres Bekannten und öffnen Sie den Kontakt, den Sie teilen möchten.</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>Halten Sie die zwei Geräte rückseitig aneinander (sodass sie sich fast berühren) und es wird vibrieren</li>
 <li>Nachdem es vibriert sehen sie wie sich der Inhalt des Gerätes ihres Bekannten von einer Warp-Geschwindigkeit Animation umgeben wird</li>
 <li>Wenn sie die Karte antippen, wird der Inhalt auf ihr Gerät übertragen</li>
diff --git a/OpenKeychain/src/main/res/raw-de/help_start.html b/OpenKeychain/src/main/res/raw-de/help_start.html
index 0764c9ebb..735961dc9 100644
--- a/OpenKeychain/src/main/res/raw-de/help_start.html
+++ b/OpenKeychain/src/main/res/raw-de/help_start.html
@@ -2,14 +2,11 @@
 <head></head>
 <body>
 <h2>Los geht's</h2>
-<p>Zuerst benötigen Sie einen privaten Schlüssel. Erstellen Sie einen Schlüssel über den Eintrag "Schlüssel" im Menu oder importieren Sie bestehende private Schlüssel. Anschließend können Sie die Schlüssel ihrer Freunde runterladen oder Sie über QR-Codes oder NFC austauschen.</p>
+<p>Zuerst wird ein geheimer Schlüssel benötigt. Erstelle einen über das Menü "Keys" oder importiere einen bereits existierenden geheimen Schlüssel. Anschließend kannst du die Schlüssel deiner Freunde herunterladen oder über QR-Codes oder NFC austauschen.</p>
 
-<p>Es wird empfohlen, dass Sie den <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> für ein verbessertes Dateihandling installieren, sowie den <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> installieren um erstellte QR-Codes zu scannen. Die Links führen entweder zu Google Play oder zu F-Droid zur Installation.</p>
+<p>Auf Android-Geräte mit einer kleineren Versionsnummer als 4.4 wird empfohlen den Datei-Browser <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> zu installieren. Um QR-Codes zu scannen, wird der <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> benötigt. Ein Klick auf die Links öffnet den Google Play Store oder F-Droid, von wo die Programme installiert werden können.</p>
 
-<h2>Anwendungen</h2>
-<p>Etliche Anwendungen unterstützen OpenKeychain um private Kommunikation zu verschlüsseln/signieren:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychainUnterstützung in der aktuellenen <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha Version</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App zum senden von PGP-signierten Anfragen an einen Server um etwas zu öffnen oder zu schliessen, z.B. eine Tür.</p>
-
-<h2>Ich habe einen Fehler in der OpenKeychain gefunden!</h2>
+<h2>Ich habe einen Fehler in OpenKeychain gefunden!</h2>
 <p>Bitte berichten Sie Bugs mithilfe des <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Issue Trackers der OpenKeychain</a>.</p>
 
 <h2>Unterstützen</h2>
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html
index 94e4c0fa8..1c06123cf 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Repara claves dañadas en 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html
index 4a95680b5..a38cbfebc 100644
--- a/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Cómo recibir las claves</h2>
 <ol>
-<li>Vete a los contactos de tu compañero y abre el contacto con el que quieres compartir</li>
+<li>Go to your partners keys and open the key you want to share.</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>
diff --git a/OpenKeychain/src/main/res/raw-es/help_start.html b/OpenKeychain/src/main/res/raw-es/help_start.html
index 137b03c86..f390a8189 100644
--- a/OpenKeychain/src/main/res/raw-es/help_start.html
+++ b/OpenKeychain/src/main/res/raw-es/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Primeros pasos</h2>
-<p>Primero necesita una clave privada (secreta) personal. Cree una mediante las opciones de menú en "Claves", o importe claves privadas existentes. En adelante puede descargar las claves de sus amigos, o intercambiarlas mediante códigos QR o vía NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</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>Aplicaciones</h2>
-<p>Varias aplicaciones soportan OpenKeychain para cifrar/firmar sus comunicaciones privadas:<br><img src="apps_k9"><br>K-9 Mail: Soporte para OpenKeychain disponible en la actual ¡<a href="https://github.com/k9mail/k-9/releases/tag/4.904">versión alfa</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversaciones</a>: Cliente Jabber/XMPP<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: Aplicación para enviar una petición firmada-con-PGP a un servidor para abrir o cerrar algo, ej: una puerta</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>¡He encontrado un bug en OpenKeychain!</h2>
 <p>Por favor, informa de errores usando el <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">seguimiento de incidencias de OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html
index acea5d0f7..118c6c48d 100644
--- a/OpenKeychain/src/main/res/raw-et/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-et/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html
index 88492731c..966fb554a 100644
--- a/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>How to receive keys</h2>
 <ol>
-<li>Go to your partners contacts and open the contact you want to share.</li>
+<li>Go to your partners keys and open the key 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>
diff --git a/OpenKeychain/src/main/res/raw-et/help_start.html b/OpenKeychain/src/main/res/raw-et/help_start.html
index 51a76c01e..4f029ab37 100644
--- a/OpenKeychain/src/main/res/raw-et/help_start.html
+++ b/OpenKeychain/src/main/res/raw-et/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret 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 Store or F-Droid for installation.</p>
-
-<h2>Applications</h2>
-<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.html b/OpenKeychain/src/main/res/raw-fi/help_changelog.html
index acea5d0f7..118c6c48d 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fi/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-fi/help_nfc_beam.html
index 88492731c..966fb554a 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-fi/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>How to receive keys</h2>
 <ol>
-<li>Go to your partners contacts and open the contact you want to share.</li>
+<li>Go to your partners keys and open the key 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>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_start.html b/OpenKeychain/src/main/res/raw-fi/help_start.html
index 51a76c01e..4f029ab37 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fi/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret 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 Store or F-Droid for installation.</p>
-
-<h2>Applications</h2>
-<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.html b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
index 562edde13..9545f41d9 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Correctif - Clefs brisées dans 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html
index 673e5b224..2dac8cc24 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Comment recevoir des clefs</h2>
 <ol>
-<li>Allez aux contacts de votre partenaire et ouvrez le contact que vous voulez partager.</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>Tenir les deux appareils dos à dos (se touchant presque) et une vibration sera ressentie.</li>
 <li>Après la vibration, le contenu de l'appareil de votre partenaire deviendra un objet en forme de carte avec une animation à la Star Trek en arrière-plan.</li>
 <li>Toquer la carte et le contenu se chargera alors sur votre appareil.</li>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_start.html b/OpenKeychain/src/main/res/raw-fr/help_start.html
index 01a4baa81..717651c6a 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Commencer</h2>
-<p>Il vous faut d'abord une clef personnelle secrète. Créez-en une avec l'option du menu dans « Clefs » ou importer des clefs secrètes existantes. Ensuite vous pourrez télécharger les clefs de vos amis ou les échanger avec des codes QR ou par la NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>Il vous est recommandé d'installer le <a href="market://details?id=org.openintents.filemanager">gestionnaire de fichiers OI</a> pour sa fonction améliorée de sélection 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>Applications</h2>
-<p>Plusieurs applications prennent en charge OpenKeychain pour chiffrer/signer vos communications privées :<br><img src="apps_k9"><br>K-9 Mail : OpenKeychain est pris en charge dans la <a href="https://github.com/k9mail/k-9/releases/tag/4.904">version alpha</a>actuelle !<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a> : clilent Jabber/XMPP<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a> : appli pour envoyer une demande signée par PGP à un serveur pour ouvrir ou fermer quelque chose, par exemple une porte</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>J'ai trouvé un bogue dans OpenKeychain !</h2>
 <p>Veuillez rapporter le bogue en utilisant le <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">gestionnaire de bogue d'OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-is/help_changelog.html b/OpenKeychain/src/main/res/raw-is/help_changelog.html
index acea5d0f7..118c6c48d 100644
--- a/OpenKeychain/src/main/res/raw-is/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-is/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-is/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-is/help_nfc_beam.html
index 88492731c..966fb554a 100644
--- a/OpenKeychain/src/main/res/raw-is/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-is/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>How to receive keys</h2>
 <ol>
-<li>Go to your partners contacts and open the contact you want to share.</li>
+<li>Go to your partners keys and open the key 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>
diff --git a/OpenKeychain/src/main/res/raw-is/help_start.html b/OpenKeychain/src/main/res/raw-is/help_start.html
index 51a76c01e..4f029ab37 100644
--- a/OpenKeychain/src/main/res/raw-is/help_start.html
+++ b/OpenKeychain/src/main/res/raw-is/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret 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 Store or F-Droid for installation.</p>
-
-<h2>Applications</h2>
-<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-it/help_changelog.html b/OpenKeychain/src/main/res/raw-it/help_changelog.html
index acea5d0f7..029a8f5a3 100644
--- a/OpenKeychain/src/main/res/raw-it/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-it/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Supporto completo per la generazione della firma e la decifratura Yubikey!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>Nuova grafica per le scermate di decifratura</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-it/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-it/help_nfc_beam.html
index 6ff56194e..2ac1c7901 100644
--- a/OpenKeychain/src/main/res/raw-it/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-it/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Come ricevere le chiavi</h2>
 <ol>
-<li>Vai ai contatti dei tuoi partner e apri il contatto che si desidera condividere.</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>Mantieni i due dispositivi vicini (devono quasi toccarsi) e sentirai una vibrazione.</li>
 <li>Dopo che ha vibrato, vedrai il contenuto del tuo dispositivo diventare come una scheda e nello sfondo apparirà una animazione come la propulsione a curvatura di Star Trek.</li>
 <li>Tocca la scheda e il contenuto dopo si trasferira' nel dispositivo dell'altra persona.</li>
diff --git a/OpenKeychain/src/main/res/raw-it/help_start.html b/OpenKeychain/src/main/res/raw-it/help_start.html
index 138e0ece2..ed9514739 100644
--- a/OpenKeychain/src/main/res/raw-it/help_start.html
+++ b/OpenKeychain/src/main/res/raw-it/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Per iniziare</h2>
-<p>In primo luogo è necessaria una chiave segreta personale. Creane una tramite il menu opzioni sotto la voce &quot;Chiavi&quot; o importa chiavi segrete già esistenti. Successivamente, è possibile scaricare le chiavi dei vostri amici o scambiarle con i codici QR o NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>Si raccomanda di installare <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> per una migliore selezione dei file e <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> per scansionare i codici QR. I collegamenti verranno aperti in Google Play Store o F-Droid per l'installazione.</p>
-
-<h2>Applicazioni</h2>
-<p>Diverse applicazioni supportano OpenKeychain per codificare/firmare le tue comunicazioni private:<br><img src="apps_k9"><br>K-9 Mail: Supporto per OpenKeychain disponibile nella attuale <a href="https://github.com/k9mail/k-9/releases/tag/4.904">versione alpha</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Client Jabber/XMPP<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>App per inviare una richiesta firmata PGP a un server per aprire o chiudere qualcosa, ad esempio, una porta</a></p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>Ho trovato un bug in OpenKeychain!</h2>
 <p>Per favore riporta i bug usando il <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker di OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
index baf609a85..b105badd0 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>2.9.1での鍵破壊問題修正</li>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html
index c19280fd1..c9c9f77ba 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>鍵の受信方法</h2>
 <ol>
-<li>パートナーの連絡先に行き、共有したい連絡先を開きます。</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>2つのデバイスを背中合せ(ほとんどすべてのタッチ方法)にしてバイブを感じるまで保持しておいてください。</li>
 <li>バイブの後、相手のデバイスでスタートレック風のバックグラウンドアニメーションしているカード風のコンテンツを見ると思います。</li>
 <li>カードをタップしコンテンツをあなたのデバイスにロードします。</li>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_start.html b/OpenKeychain/src/main/res/raw-ja/help_start.html
index 188fc2de6..9a170995d 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>入門</h2>
-<p>最初にあなたの個人用秘密鍵が必要になります。オプションメニューの"鍵"で生成するか、既存の秘密鍵をインポートします。その後、あなたの友人の鍵をダウンロード、もしくはQRコードやNFCで交換します。</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</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>を生成したQRコードのスキャンのため、それぞれのインストールを必要とします。 リンクをクリックして、Google Play Store上かF-Droidからインストールしてください。</p>
-
-<h2>アプリケーション</h2>
-<p>OpenKeychainはプライベートな通信での暗号化/署名をいくつかのアプリケーションでサポートしています:<br><img src="apps_k9"><br>K-9 Mail: 現在のOpenKeychain <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a> からサポートが有効です!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>やりとり</a>: Jabber/XMPP クライアント<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: このアプリはPGP署名されたリクエストをサーバに送り、なにかしらを開けたり閉じたりします、たとえばドアとか</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>OpenKeychainでバグを見付けた!</h2>
 <p><a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychainのIssueトラッカー</a>を使ってバグレポートを送ってください。</p>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.html b/OpenKeychain/src/main/res/raw-nl/help_changelog.html
index acea5d0f7..118c6c48d 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html
index ac5cebb4b..7ba0a2d1a 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Hoe sleutels te ontvangen</h2>
 <ol>
-<li>Ga naar uw partners contacten en open het contact dat u wilt delen.</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>Houd de twee apparaten met de achterkant tegen elkaar (ze moeten elkaar bijna aanraken) en u zult een trilling voelen.</li>
 <li>Nadat het trilt zult u de inhoud op uw partners apparaat in een soort kaart zien veranderen met Star Trek warp snelheid-eruitziende animatie op de achtergrond.</li>
 <li>Druk op de kaart en de inhoud zal dan laden op het apparaat.</li>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_start.html b/OpenKeychain/src/main/res/raw-nl/help_start.html
index 40c79e95f..d159c4cf0 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Aan de slag</h2>
-<p>Eerst heeft u een persoonlijke geheime sleutel nodig. Maak er een via het opties menu in &quot;Sleutels&quot; of importeer bestaande geheime sleutels. Daarna kunt u de sleutels van uw vrienden importeren of ze uitwisselen via QR Codes of NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>Het is aanbevolen dat u <a href="market://details?id=org.openintents.filemanager">OI Bestandsmanager</a> installeert voor betere bestandsselectie en <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> om gegenereerde QR codes te scannen. Door op de links te klikken zullen de Google Play Store of F-Droid openen voor installatie.</p>
-
-<h2>Applicaties</h2>
-<p>Verschillende applicaties ondersteunen OpenKeychain om uw privécommunicatie te coderen/signeren<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain ondersteuning beschikbaar in huidige <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversaties</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>Ik heb een bug in OpenKeychain gevonden!</h2>
 <p>Rapporteer de bug met de <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">problemen tracker van OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
index acea5d0f7..118c6c48d 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html
index 53db5e80c..3a1d34f0a 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Jak odbierać klucze</h2>
 <ol>
-<li>Wejdź do listy kontaktów Twojego partnera i otwórz kontakt, który chcesz przesłać.</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>Przytrzymaj oba urządzenia plecami do siebie (powinny się niemal dotykać) i poczujesz wibrację.</li>
 <li>Po zakończeniu wibracji zobaczysz, że zawartość urządzenia partnera zamienia się w obiekt zbliżony do wizytówki, z animacją rodem ze Star Treka w tle.</li>
 <li>Dotknij wizytówkę, a jej zawartość zostanie wysłana na Twoje urządzenie.</li>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_start.html b/OpenKeychain/src/main/res/raw-pl/help_start.html
index 3fb420fd9..d7a30ce4a 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Pierwsze kroki</h2>
-<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>Zalecana jest instalacja menadżera plików <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> w celu zapewnienia wygodniejszego wyboru plików oraz programu <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>, który jest w stanie skanować wygenerowane kody QR. Kliknięcie na powyższe linki przekieruje Cię do sklepu Google Play / F-Droid.</p>
-
-<h2>Applications</h2>
-<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>Znalazłem błąd w OpenKeychain!</h2>
 <p>Zgłoś błąd korzystając z <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">systemu śledzenia błędów OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_changelog.html b/OpenKeychain/src/main/res/raw-pt/help_changelog.html
index acea5d0f7..118c6c48d 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pt/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-pt/help_nfc_beam.html
index 88492731c..966fb554a 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-pt/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>How to receive keys</h2>
 <ol>
-<li>Go to your partners contacts and open the contact you want to share.</li>
+<li>Go to your partners keys and open the key 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>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_start.html b/OpenKeychain/src/main/res/raw-pt/help_start.html
index 51a76c01e..4f029ab37 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_start.html
+++ b/OpenKeychain/src/main/res/raw-pt/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret 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 Store or F-Droid for installation.</p>
-
-<h2>Applications</h2>
-<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
index acea5d0f7..118c6c48d 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
index fcf55cdaf..5ed10635d 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Как обменяться ключами</h2>
 <ol>
-<li>Нажмите и удерживайте ключ, который вы хотите передать.</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>Поднесите оба устройства вплотную обратными сторонами (до полного касания). Вы почувствуете небольшую вибрацию.</li>
 <li>Как только устройства завибрируют, на экране появится карточка с передаваемым содержимым.</li>
 <li>Нажмите на карточку, что бы передать данные (ключи) с одного устройства на другое.</li>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_start.html b/OpenKeychain/src/main/res/raw-ru/help_start.html
index e1b7b0876..a9c200abb 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Приступая</h2>
-<p>Для начала Вас нужен свой секретный ключ. Создайте его  в меню раздела "Ключи" или импортируйте ранее созданный ключ. Позже вы сможете поделиться данными своего ключа с друзьями с помощью QR кода или NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</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> для распознавания QR кодов. Перейдите по ссылкам на соответствующие страницы Google Play или F-Droid для дальнейшей установки.</p>
-
-<h2>Приложения</h2>
-<p>Некоторые приложения, поддерживающие интеграцию с OpenKeychain для шифрования:<br><img src="apps_k9"><br>K-9 Mail: поддержка OpenKeychain доступна в текущей <a href="https://github.com/k9mail/k-9/releases/tag/4.904">альфа-версии</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: клиент Jabber/XMPP<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: Приложение PGP-подписанных запросов на сервер для открытия или закрытия чего-либо.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>Я нашел ошибку в OpenKeychain!</h2>
 <p>Пожалуйста, сообщайте о возникших проблемах и найденных ошибках в разделе <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Решение проблем OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.html b/OpenKeychain/src/main/res/raw-sl/help_changelog.html
index 3a62c43bf..c508da6ec 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Popravek ključev, pokvarjenih v verziji 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sl/help_nfc_beam.html
index 8262a2bca..62599edc2 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-sl/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Kako pridobiti ključe</h2>
 <ol>
-<li>Na partnerjevi napravi med stiki poiščita tistega, ki bi si ga rada delila.</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>S hrbtoma približajte dve napravi (vašo ter vašega partnerja - morata se skoraj dotikati) in začutili boste vibracijo.</li>
 <li>Po vibraciji se bo vsebina na napravi vašega partnerja spremenila v vizitki podoben objekt s 'Star Trek' animacijo v ozadju.</li>
 <li>Tapnite vizitko in njena vsebnina se bo prenesla na vašo napravo.</li>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_start.html b/OpenKeychain/src/main/res/raw-sl/help_start.html
index 4b02415d5..276377723 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-sl/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Kako začeti</h2>
-<p>Najprej potrebujete zasebni šifrirni/podpisovalni ključ. Ustvarite si svojega v poglavju 'Ključi' ali uvozite že obstoječega. V naslednjem koraku lahko uvozite javne ključe svojih stikov ali jih pridobite s strežnika ključev, preko izmenjave kod QR, oziroma storitve NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>Priporočamo, da namestite aplikaciji <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> za boljše delo z datotekami in <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> za skeniranje kod QR. Klik na povezavi bo odprl trgovino Google Play Store ali F-Droid za namestitev.</p>
-
-<h2>Aplikacije</h2>
-<p>Razne aplikacije podpirajo OpenKeychain za šifriranje/podpisovanje vaših zasebnih komunikacij:<br><img src="apps_k9"><br>K-9 Mail: Podpora za OpenKeychain je na voljo v trenutni <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alfa različici</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Odjemalec za Jabber/XMPP<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: Aplikacija za pošiljanje PGP-podpisanih zahtevkov strežnikom za odpiranje ali zapiranje česa, npr vrat</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>Našel sem 'hrošča' v aplikaciji OpenKeychain!</h2>
 <p>Za poročanje o 'hroščih' uporabite <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">sledilnik težav za OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_changelog.html b/OpenKeychain/src/main/res/raw-sr/help_changelog.html
index acea5d0f7..a95ffdaa8 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-sr/help_changelog.html
@@ -1,194 +1,207 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Пуна подршка за прављење и дешифровање Јубикључ потписа!</li>
+<li>Предлози за инсталабилне компатибилне апликације у списку апликација</li>
+<li>Нови дизајн за екране дешифровања</li>
+<li>Много исправки за увоз кључа, такође исправљени огољени кључеви</li>
+<li>Поштовање и приказ заставица аутентификације кључа</li>
+<li>Корисничко сучеље за прављење прилагођених кључева</li>
+<li>Исправка корисничког ид-а сертификата опозива</li>
+<li>Нова клауд претрага (тражи преко традиционални сервера кључева и keybase.io)</li>
+<li>Подршка за огољивање кључева унутар OpenKeychain-а</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
-<li>Fix keys broken in 2.9.1</li>
-<li>Yubikey decryption now working via API</li>
+<li>Исправка кључева покварених у 2.9.1</li>
+<li>Јубикључ дешифровање сада ради преко АПИ-ја</li>
 </ul>
 <h2>2.9.1</h2>
 <ul>
-<li>Split encrypt screen into two</li>
-<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
-<li>Improved passphrase handling</li>
-<li>Key sharing via SafeSlinger</li>
-<li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
-<li>Fix usage of stripped keys</li>
-<li>SHA256 as default for compatibility</li>
-<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>OpenPGP API now handles revoked/expired keys and returns all user ids</li>
+<li>Подела екрана шифровања на два дела</li>
+<li>Исправка руковања заставицама кључа (подршка за Mailvelope 0.7 кључеве)</li>
+<li>Побољшано руковање лозинкама</li>
+<li>Дељење кључа преко Сејфслингера (SafeSlinger)</li>
+<li>Јубикључ: опција за дозволу осталих ПИН-ова, тренутно ради само потписивање преко ОпенПГП АПИ-ја, не унутар OpenKeychain-а</li>
+<li>Исправка употребе огољених кључева</li>
+<li>СХА256 подразумевано због компатибилности</li>
+<li>Интент АПИ је измењен, погледајте https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
+<li>ОпенПГП АПИ сада рукује опозваним/истеклим кључевима и враћа све корисничке ид-ове</li>
 </ul>
 <h2>2.9</h2>
 <ul>
-<li>Fixing crashes introduced in v2.8</li>
-<li>Experimental ECC support</li>
-<li>Experimental Yubikey support (signing-only with imported keys)</li>
+<li>Поправка рушења која су се појавила у в2.8</li>
+<li>Експериментална подршка за ЕЦЦ</li>
+<li>Експериментална подршка за Јубикључ (Yubikey) (само пријава са увезеним кључевима)</li>
 </ul>
 <h2>2.8</h2>
 <ul>
-<li>So many bugs have been fixed in this release that we focus on the main new features</li>
-<li>Key edit: awesome new design, key revocation</li>
-<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
-<li>New first time screen</li>
-<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
-<li>File encryption: awesome new design, support for encrypting multiple files</li>
-<li>New icons to show status of key (by Brennan Novak)</li>
-<li>Important bug fix: Importing of large key collections from a file is now possible</li>
-<li>Notification showing cached passphrases</li>
-<li>Keys are connected to Android's contacts</li>
-</ul>
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+<li>Толико много грешака је исправљено у овом издању па се базирамо на главне нове функције</li>
+<li>Уређивање кључа: сјајан нови дизајн, опозив кључа</li>
+<li>Увоз кључа: сјајан нови дизајн, сигурне везе на сервере кључева преко hkps, разлучивање сервера кључева преко ДНС СРВ записа</li>
+<li>Нови почетни екран</li>
+<li>Нови екран за прављење кључа: аутоматско довршавање имена и е-адресе на основу ваших личних Андроид налога</li>
+<li>Шифровање фајла: сјајан нови дизајн, подршка за шифровање више фајлова</li>
+<li>Нове иконе за приказ стања кључа (Бренан Новак (Brennan Novak))</li>
+<li>Важна исправка: увоз великих збирки кључева из фајла је сада могуће</li>
+<li>Обавештење које показује кеширане лозинке</li>
+<li>Кључеви су повезани са Андроидовим контактима</li>
+</ul>
+<p>Ово издање не би било могуће без рада Винсента Брајтмозера (ГСоЦ 2014), „mar-v-in“-а (ГСоЦ 2014), Данијела Алберта (Daniel Albert), Арта Катијана (Art O Cathain), Данијела Хаса, Тима Бреја, „Thialfihar“-а</p>
 
 <h2>2.7</h2>
 <ul>
-<li>Purple! (Dominik, Vincent)</li>
-<li>New key view design (Dominik, Vincent)</li>
-<li>New flat Android buttons (Dominik, Vincent)</li>
-<li>API fixes (Dominik)</li>
-<li>Keybase.io import (Tim Bray)</li>
+<li>Љубичасто! (Доминик, Винсент)</li>
+<li>Нови дизајн приказа кључа (Доминик, Винсент)</li>
+<li>Нова равна Андроид дугмад (Доминик, Винсент)</li>
+<li>АПИ исправке (Доминик)</li>
+<li>Keybase.io увоз (Тим Бреј (Tim Bray))</li>
 </ul>
 <h2>2.6.1</h2>
 <ul>
-<li>Some fixes for regression bugs</li>
+<li>Поправке неких регресивних грешака</li>
 </ul>
 <h2>2.6</h2>
 <ul>
-<li>Key certifications (thanks to Vincent Breitmoser)</li>
-<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
-<li>New design for signature verification</li>
-<li>Custom key length (thanks to Greg Witczak)</li>
-<li>Fix share-functionality from other apps</li>
+<li>Овере кључа (захваљујући Винсенту Брајтмозеру)</li>
+<li>Подршка за ГнуПГ деломично тајне кључеве (захваљујући Винсенту Брајтмозеру)</li>
+<li>Нови дизајн за оверу потписа</li>
+<li>Подесива дужина кључа (захваљујући Грегу Вичаку)</li>
+<li>Поправка функције дељења из других апликација</li>
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
-<li>Refactored key edit screen (thanks to Ash Hughes)</li>
-<li>New modern design for encrypt/decrypt screens</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
+<li>Поправка дешифровања симетричних пгп порука/фајлова</li>
+<li>Прерађен екран уређивања кључа (захваљујући Ешу Хјуџесу)</li>
+<li>Нови модерни дизајн за екране шифровања/дешифровања</li>
+<li>ОпенПГП АПИ издање 3 (вишеструки АПИ налози, унутрашње исправке, потрага кључа)</li>
 </ul>
 <h2>2.4</h2>
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
-Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-<ul>
-<li>New unified key list</li>
-<li>Colorized key fingerprint</li>
-<li>Support for keyserver ports</li>
-<li>Deactivate possibility to generate weak keys</li>
-<li>Much more internal work on the API</li>
-<li>Certify user ids</li>
-<li>Keyserver query based on machine-readable output</li>
-<li>Lock navigation drawer on tablets</li>
-<li>Suggestions for emails on creation of keys</li>
-<li>Search in public key lists</li>
-<li>And much more improvements and fixes…</li>
+<p>Хвала свим апликантима Гугловог Лета Ко̂да 2014 који су учинили ово издање богатим у могућностима и без грешака!
+Осим неколицине малих закрпа, значајан број закрпа направили су следећи људи (по абецедном реду):
+Данијел Хаман (Daniel Hammann), Данијел Хас (Daniel Haß), Грег Вичак (Greg Witczak), Мируђин Бакши (Miroojin Bakshi), Никил Питер Раж (Nikhil Peter Raj), Паул Сарбиновски (Paul Sarbinowski), Срирам Бујапати (Sreeram Boyapati), Винсент Брајтмозер (Vincent Breitmoser).</p>
+<ul>
+<li>Нови обједињени списак кључева</li>
+<li>Обојени отисак прста кључа</li>
+<li>Подршка за портове сервера кључева</li>
+<li>Искључи могућност стварања слабих кључева</li>
+<li>Много унутрашњег рада на АПИ-ју</li>
+<li>Овери корисничке ид</li>
+<li>Упит сервера кључева заснован на машински читљивом излазу</li>
+<li>Закључавање навигационе фиоке на таблетима</li>
+<li>Предлози за е-адресе на прављењу кључева</li>
+<li>Претрага спискова јавних кључева</li>
+<li>И још много побољшања и исправки…</li>
 </ul>
 <h2>2.3.1</h2>
 <ul>
-<li>Hotfix for crash when upgrading from old versions</li>
+<li>Брза исправка рушења приликом надоградње са претходних издања</li>
 </ul>
 <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>Уклоњен непотребан извоз јавних кључева приликом извоза тајног кључа (захваљујући Ешу Хјуџесу)</li>
+<li>Поправљено постављање датума истицања кључева (захваљујући Ешу Хјуџесу)</li>
+<li>Још унутрашњих исправки уређивања кључа (захваљујући Ешу Хјуџесу)</li>
+<li>Упит сервера кључева директно са екрана увоза</li>
+<li>Поправка распореда и стила дијалога на Андроиду 2.2-3.0</li>
+<li>Поправка рушења на кључевима са празним корисничким ид</li>
+<li>Поправка рушења и празних спискова након повратка са екрана потписа</li>
+<li>„Bouncy Castle“ (криптографска библиотека) ажурирана са 1.47 на издање 1.50 и изграђена од изворног ко̂да</li>
+<li>Поправка учитавања кључа са екрана потписа</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>Нови дизајн са навигационом фиоком</li>
+<li>Нови дизајн списка јавних кључева</li>
+<li>Нови приказ јавног кључа</li>
+<li>Поправке грешака увоза кључева</li>
+<li>Унакрсна сертификација кључева (захваљујући Ешу Хјуџесу)</li>
+<li>Исправно руковање УТФ-8 лозинкама (захваљујући Ешу Хјуџесу (Ash Hughes))</li>
+<li>Прво издање са новим језицима (захваљујући доприносиоцима са Трансифекса)</li>
+<li>Поправљено и побољшано дељење кључева преко QR ко̂дова</li>
+<li>Овера потписа пакета за АПИ</li>
 </ul>
 <h2>2.1.1</h2>
 <ul>
-<li>API Updates, preparation for K-9 Mail integration</li>
+<li>Ажурирања АПИ-ја, припрема за интеграцију у К-9 Пошту</li>
 </ul>
 <h2>2.1</h2>
 <ul>
-<li>Lots of bug fixes</li>
-<li>New API for developers</li>
-<li>PRNG bug fix by Google</li>
+<li>Много исправки грешака</li>
+<li>Нови АПИ за програмере</li>
+<li>Гуглова исправка ПРНГ грешке</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>Комплетан редизајн</li>
+<li>Подела кључева преко QR ко̂дова, НФЦ сноп</li>
+<li>Потпис кључева</li>
+<li>Учитавање кључева на сервер</li>
+<li>Поправке за проблеме увоза</li>
+<li>Нови АИДЛ АПИ</li>
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>Basic keyserver support</li>
+<li>Основна подршка за сервер кључева</li>
 <li>App2sd</li>
-<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
-<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
-<li>Bugfixes</li>
-<li>Optimizations</li>
+<li>Још избора за кеш лозинке: 1, 2, 4, 8 сати</li>
+<li>Преводи: норвешки (Сандер Даниелсен (Sander Danielsen)), кинески (Жанг Фредрик (Zhang Fredrick))</li>
+<li>Поправке грешака</li>
+<li>Оптимизације</li>
 </ul>
 <h2>1.0.7</h2>
 <ul>
-<li>Fixed problem with signature verification of texts with trailing newline</li>
-<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
+<li>Решен проблем овере потписа текста са пратећим новим редом</li>
+<li>Још опција за време живота кеша лозинке (20, 40, 60 минута)</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>Bugfixes</li>
+<li>Поправљено рушење при додавању налога на Фроју</li>
+<li>Сигурно брисање фајлова</li>
+<li>Опција за брисање фајла кључа након увоза</li>
+<li>Проточно шифровање/дешифровање (галерија, итд.)</li>
+<li>Нове опције (језик, форсирање в3 потписа)</li>
+<li>Промене сучеља</li>
+<li>Поправке грешака</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>Немачки и талијански преводи</li>
+<li>Много мањи пакет, захваљујући редукованим БЦ изворима</li>
+<li>Нови ГУИ за поставке</li>
+<li>Подешен распоред за локализацију</li>
+<li>Поправка грешке потписа</li>
 </ul>
 <h2>1.0.4</h2>
 <ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
+<li>Поправљено још једно рушење узроковано неком СДК грешком у креатору упита</li>
 </ul>
 <h2>1.0.3</h2>
 <ul>
-<li>Fixed crashes during encryption/signing and possibly key export</li>
+<li>Поправљено рушење током шифровања/потписивања и можда извоза кључева</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>Могућност филтрирања списка кључева</li>
+<li>Паметнији предизбор кључева за шифровање</li>
+<li>Ново Интент руковање за VIEW и SEND, дозвољава да фајлови буду шифровани/дешифровани унутар менаџера фајлова</li>
+<li>Поправке и додатне могућности (предизбор кључа) за К-9 Пошту, ново бета издање доступно</li>
 </ul>
 <h2>1.0.1</h2>
 <ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</li>
+<li>Испис налога ГМејла је био покварен у 1.0.0, исправљен поново</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>Bugfixes</li>
+<li>Интеграција у К-9 Пошту, АПГ подржава бета издања К-9 Поште</li>
+<li>Подршка за још менаџера фајлова (укључујући АСТРО)</li>
+<li>Словеначки превод</li>
+<li>Нова база података, много бржа, мањи утрошак меморије</li>
+<li>Дефинисани „Интент“ и давалац садржаја за друге апликације</li>
+<li>Поправке грешака</li>
 </ul>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html
index 88492731c..bef6f591e 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html
@@ -1,12 +1,12 @@
 <html>
 <head></head>
 <body>
-<h2>How to receive keys</h2>
+<h2>Како примити кључеве</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>Идите у кључеве вашег другара и отворите кључ којег желите да поделите.</li>
+<li>Држите оба уређаја леђа о леђа (треба да се скоро додирују) и осетићете вибрацију.</li>
+<li>Након вибрације видећете да се садржај на уређају вашег другара претвара у нешто што личи на картицу са анимацијом сличном ворп брзини из Звезданих Стаза у позадини.</li>
+<li>Додирните картицу и садржај ће се потом учитати на вашем уређају.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_start.html b/OpenKeychain/src/main/res/raw-sr/help_start.html
index 51a76c01e..238e75260 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-sr/help_start.html
@@ -1,22 +1,19 @@
 <html>
 <head></head>
 <body>
-<h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<h2>Први кораци</h2>
+<p>Најпре требате лични кључ. Направите један преко менија у „Кључеви“ или увезите постојеће тајне кључеве. Након тога, можете да преузмете пријатељеве кључеве или да их размените преко QR ко̂дова или НФЦ-а.</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>
+<p>За Андроид старији од 4.4 препоручује се да инсталирате <a href="market://details?id=org.openintents.filemanager">ОИ Менаџер Фајлова</a> за побољшани избор фаjлова. Да бисте делили преко QR ко̂дова инсталирајте <a href="market://details?id=com.google.zxing.client.android">Барко̂д Скенер</a>. Кликом на везе отворићете Гуглову Продавницу или Ф-Дроид за инсталацију.</p>
 
-<h2>Applications</h2>
-<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+<h2>Пронађох грешку у OpenKeychain!</h2>
+<p>Пријавите грешку на <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">пратиоцу проблема за OpenKeychain</a>.</p>
 
-<h2>I found a bug in OpenKeychain!</h2>
-<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
+<h2>Доприноси</h2>
+<p>Ако желите да нам помогнете у развоју OpenKeychain доприношењем ко̂да, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">пратите наш мали водич на Гитхабу</a>.</p>
 
-<h2>Contribute</h2>
-<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
-
-<h2>Translations</h2>
-<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
+<h2>Преводи</h2>
+<p>Помозите у превођењу OpenKeychain! Било ко може да учествује на <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain пројекту на Трансифексу</a>.</p>
 
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_wot.html b/OpenKeychain/src/main/res/raw-sr/help_wot.html
index 29790139b..e487a4aee 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-sr/help_wot.html
@@ -1,17 +1,17 @@
 <html>
 <head></head>
 <body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<h2>Веб Поверења</h2>
+<p>Веб Поверења описује део ПГП-а који се бави прављењем и спремањем сертификата. Пружа механизме који помажу кориснику у праћењу коме јавни кључ припада и дељењу ове информације са осталима; да би се осигурала приватност шифроване комуникације, нужно је знати да јавни кључ на који шифрујете припада особи којој и мислите да припада.</p>
 
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
+<h2>Подршка у OpenKeychain</h2>
+<p>Постоји само основна подршка за Веб Поверења у OpenKeychain. Ово је велики посао у току и подложан променама у наредним издањима.</p>
 
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
+<h2>Модел поверења</h2>
+<p>Евалуација поверења се заснива на једноставној претпоставци да су сви кључеви који имају доступне тајне кључеве, од поверења. Јавни кључеви који садрже најмање један кориснички ид оверен кључем од поверења биће означени зеленом тачком у исписима кључева. Није (још) могуће одредити нивое поверења за сертификате других познатих јавних кључева.</p>
 
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
+<h2>Сертификовање кључева</h2>
+<p>Подршка за сертификацију кључева је доступна, и кориснички ид-ови могу бити сертификовани појединачно. Још није могуће одредити ниво поверења или направити локалне и друге посебне врсте сертификата.</p>
 
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-sr/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-sr/nfc_beam_share.html
index 083e055c7..0c7e65353 100644
--- a/OpenKeychain/src/main/res/raw-sr/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-sr/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>Проверите у Подешавања &gt; Још &gt; НФЦ да ли је НФЦ укључен и уверите се да је „Андроид Сноп“ такође у истом одељку.</li>
+<li>Држите оба уређаја леђа о леђа (треба да се скоро додирују) и осетићете вибрацију.</li>
+<li>Након вибрације видећете да се садржај на вашем уређају претвара у нешто што личи на картицу са анимацијом сличном ворп брзини из Звезданих Стаза у позадини.</li>
+<li>Додирните картицу и садржај ће се потом учитати на уређај друге особе.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.html b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
index acea5d0f7..5578f7f47 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
@@ -1,17 +1,30 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Yubikey imza oluşturma ve şifre çözme için tam destek</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>Şifre çözme ekranları için yeni dizayn</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>Özel anahtarlar üretmek için kullanıcı arayüzü</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
-<li>Yubikey decryption now working via API</li>
+<li>Yubikey şifre çözme şimdi API aracılığıyla çalışıyor</li>
 </ul>
 <h2>2.9.1</h2>
 <ul>
-<li>Split encrypt screen into two</li>
+<li>Şifreleme ekranı iki kısma bölündü</li>
 <li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
 <li>Improved passphrase handling</li>
-<li>Key sharing via SafeSlinger</li>
+<li>SafeSlinger aracılığıyla anahtar paylaşımı</li>
 <li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
 <li>Fix usage of stripped keys</li>
 <li>SHA256 as default for compatibility</li>
@@ -85,7 +98,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 </ul>
 <h2>2.3.1</h2>
 <ul>
-<li>Hotfix for crash when upgrading from old versions</li>
+<li>Eski sürümden güncellenirken çökmeler düzeltildi</li>
 </ul>
 <h2>2.3</h2>
 <ul>
@@ -104,40 +117,40 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>Anahtar içe aktarmada hata düzeltmeleri</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>Yeni dillerle birlikte ilk sürüm (Transifex'teki katkı yapan herkese teşekkürler)</li>
+<li>Anahtarları QR Kodları ile paylaşma düzeltildi ve geliştirildi</li>
+<li>API için paket imza doğrulaması</li>
 </ul>
 <h2>2.1.1</h2>
 <ul>
-<li>API Updates, preparation for K-9 Mail integration</li>
+<li>API güncellemeleri, K-9 Mail entegrasyonuna hazırlık</li>
 </ul>
 <h2>2.1</h2>
 <ul>
-<li>Lots of bug fixes</li>
-<li>New API for developers</li>
-<li>PRNG bug fix by Google</li>
+<li>Birçok hata düzeltmesi</li>
+<li>Geliştiriciler için yeni API</li>
+<li>Google tarafından PRNG hata düzeltmesi</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>Tamamen yeniden dizayn edildi</li>
+<li>Genel anahtarları QR kodları ve NFC ile paylaşabilme</li>
+<li>İmza anahtarları</li>
+<li>Anahtarları sunucuya yükleme</li>
+<li>İçe aktarma sorunlarına düzeltme</li>
 <li>New AIDL API</li>
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>Basic keyserver support</li>
+<li>Temel keyserver desteği</li>
 <li>App2sd</li>
 <li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
-<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
-<li>Bugfixes</li>
-<li>Optimizations</li>
+<li>Çeviriler: Norveççe (Sander Danielsen'e teşekkürler), Çince (Zhang Fredrick'e teşekkürler)</li>
+<li>Hata Düzeltmeleri</li>
+<li>Optimizasyonlar</li>
 </ul>
 <h2>1.0.7</h2>
 <ul>
@@ -146,21 +159,21 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 </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>Froyo üzerinde hesap eklerken çökme düzeltildi</li>
+<li>Güvenli dosya silme</li>
+<li>İçe aktarmadan sonra anahtar silme seçeneği</li>
 <li>Stream encryption/decryption (gallery, etc.)</li>
 <li>New options (language, force v3 signatures)</li>
-<li>Interface changes</li>
-<li>Bugfixes</li>
+<li>Arayüz değişiklikleri</li>
+<li>Hata Düzeltmeleri</li>
 </ul>
 <h2>1.0.5</h2>
 <ul>
-<li>German and Italian translation</li>
+<li>Almanca ve İtalyanca çeviri</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>İmza hata düzetmesi</li>
 </ul>
 <h2>1.0.4</h2>
 <ul>
@@ -172,7 +185,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 </ul>
 <h2>1.0.2</h2>
 <ul>
-<li>Filterable key lists</li>
+<li>Filtrelenebilir anahtar listeleri</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>
@@ -185,10 +198,10 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>Slovence çeviri</li>
+<li>Yeni veritabanı, daha hızlı, daha az hafıza kullanımı</li>
 <li>Defined Intents and content provider for other apps</li>
-<li>Bugfixes</li>
+<li>Hata Düzeltmeleri</li>
 </ul>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html
index 88492731c..49f79e157 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html
@@ -1,12 +1,12 @@
 <html>
 <head></head>
 <body>
-<h2>How to receive keys</h2>
+<h2>Anahtarlar nasıl alınır</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>Eşleşecek cihazın anahtarlarına girin ve paylaşmak istediğiniz anahtarı açın.</li>
+<li>İki cihazı arka arkaya tutun (neredeyse temas edecek şekilde) ve bir titreşim hissedeceksiniz.</li>
+<li>Titreşimden sonra içeriğin eşleşecek cihazda arkaplanında Star Trek ışınlanma animasyonu olan kart'a benzer bir objeye dönüştüğünü göreceksiniz.</li>
+<li>Kart'a tıklayın ve içerik sizin cihazınıza yüklensin.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_start.html b/OpenKeychain/src/main/res/raw-tr/help_start.html
index c606b81ea..93674e794 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_start.html
@@ -1,22 +1,19 @@
 <html>
 <head></head>
 <body>
-<h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<h2>Başlarken</h2>
+<p>Öncelikle kişisel bir anahtara ihtiyacınız var. "Anahtarlar" içindeki menüden bir tane oluşturabilir veya var olan gizli anahtarınızı içe aktarabilirsiniz. Daha sonra arkadaşlarınızın anahtarlarını indirebilir ya da QR Kodları veya NFC aracılığıyla değiş tokuş edebilirsiniz.</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>Uygulamalar</h2>
-<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+<p>Android 4.4 altındaki sürümlere gelişmiş dosya seçimi için <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> yüklenmesi önerilir. QR Kodları ile paylaşmak için <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> yükleyin. Bağlantılara tıkladığınızda yükleme için Google Play Store veya F-Droid açılır.</p>
 
 <h2>OpenKeychain'de bir bug buldum!</h2>
-<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
+<p>Lütfen bulduğunuz hataları <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain sorun izleyici</a> kullanarak rapor edin.</p>
 
 <h2>Katkı</h2>
-<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+<p>OpenKeychain'i geliştirmede bize kod yardımı yapmak istiyorsan <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">Github üzerindeki küçük kılavuzumuzu</a> takip et.</p>
 
 <h2>Çeviriler</h2>
-<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
+<p>OpenKeychain'in tercüme edilmesine yardım et! Herkes katılabilir: <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
 
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_wot.html b/OpenKeychain/src/main/res/raw-tr/help_wot.html
index 29790139b..f80c1274f 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_wot.html
@@ -4,13 +4,13 @@
 <h2>Web of Trust</h2>
 <p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
-<h2>Support in OpenKeychain</h2>
+<h2>OpenKeychain Desteği</h2>
 <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
 
-<h2>Trust Model</h2>
+<h2>Güven Modeli</h2>
 <p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
 
-<h2>Certifying keys</h2>
+<h2>Anahtar Tasdikleme</h2>
 <p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
 
 </body>
diff --git a/OpenKeychain/src/main/res/raw-tr/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-tr/nfc_beam_share.html
index 083e055c7..038cc2c2d 100644
--- a/OpenKeychain/src/main/res/raw-tr/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-tr/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>NFC'nin Ayarlar &gt; Daha Fazla &gt; NFC menüsünde açık olduğundan emin olun ve aynı sekmede Android Beam'in de açık olduğundan emin olun.</li>
+<li>İki cihazı arka arkaya tutun (neredeyse temas edecek şekilde) ve bir titreşim hissedeceksiniz.</li>
+<li>Titreşimden sonra içeriğin sizin cihazda arkaplanında Star Trek ışınlanma animasyonu olan kart'a benzer bir objeye dönüştüğünü göreceksiniz.</li>
+<li>Kart'a tıklayın ve içerik diğer kişinin cihazına yüklensin.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
index acea5d0f7..118c6c48d 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html
index dc34048d3..fb4698b7f 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Як обмінятися ключами</h2>
 <ol>
-<li>Перейдіть до контактних даних ваших партнерів і відкрийте контакт, який ви хочете надіслати.</li>
+<li>Go to your partners keys and open the key you want to share.</li>
 <li>Піднесіть обидва пристрої впритул зворотними сторонами (до повного торкання). Ви відчуєте невелику вібрацію.</li>
 <li>Після вібрації пристроїв на екрані з'явиться картка з передаваним вмістом.</li>
 <li>Натисніть на картку, що б передати дані з одного пристрою на інший.</li>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_start.html b/OpenKeychain/src/main/res/raw-uk/help_start.html
index 0943beb92..f2d2fe6f7 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_start.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_start.html
@@ -2,12 +2,9 @@
 <head></head>
 <body>
 <h2>Приступаючи до роботи</h2>
-<p>Спершу вам потрібний особистий секретний ключ. Створіть один через меню параметрів у „Ключі" або імпортуйте наявні секретні ключі через "Імпорт ключів". Після цього ви зможете завантажувати ключі ваших друзів чи обміняти їх через штрих-коди або NFC.</p>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</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>Програми</h2>
-<p>Окремі програми підтримують OpenKeychain для шифрування/підписування вашо спілкування:<br><img src="apps_k9"><br>K-9 Mail: підтримка OpenKeychain доступна у поточній <a href="https://github.com/k9mail/k-9/releases/tag/4.904">альфа-збірці</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Спілкування</a>: клієнт Jabber/XMPP<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: програма надіслала запит, підписаний PGP, на сервер для відкриття чи закриття чогось на кшталт дверей</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
 
 <h2>Я знайшов помилку в OpenPGP Keychain!</h2>
 <p>Будь ласка, повідомте про ваду за допомогою <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">відстежувача проблем OpenPGP Keychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_about.html b/OpenKeychain/src/main/res/raw-zh/help_about.html
index e1ea9b323..7c3813133 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_about.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_about.html
@@ -1,11 +1,11 @@
 <html>
 <head></head>
 <body>
-<p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p>
-<p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p>
-<p>授權：GPLv3+</p>
+<p><a href="http://www.openkeychain.org">我们的网站</a></p>
+<p><a href="http://www.openkeychain.org">OpenKeychain</a>是一个符合 OpenPGP标准的安装应用程序</p>
+<p>授权：GPLv3+</p>
 
-<h2>Developers</h2>
+<h2>开发者们</h2>
 <ul>
 <li>Dominik Schürmann (Maintainer)</li>
 <li>Art O Cathain</li>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index acea5d0f7..9e078ba70 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
@@ -1,6 +1,19 @@
 <html>
 <head></head>
 <body>
+
+<h2>版本：3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>全新设计的解密界面</li>
+<li>修复了导入密钥时的错误, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
 <h2>2.9.2</h2>
 <ul>
 <li>Fix keys broken in 2.9.1</li>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html
index 7a90a794b..3f08fa6a2 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html
@@ -1,12 +1,12 @@
 <html>
 <head></head>
 <body>
-<h2>如何接收金要</h2>
+<h2>使用NFC功能接收和分享密钥</h2>
 <ol>
-<li>前往你夥伴裝置上的聯絡人清單，並點選你要分享的聯絡人。</li>
-<li>將兩部裝置背對背貼近(幾乎接觸)，你會感覺到一股震動。</li>
-<li>震動之後你會看見你夥伴的畫面變成卡片狀，並且背景帶有如 Star Trek 般的特效。</li>
-<li>輕觸卡片，內容隨即顯示在你的裝置上。</li>
+<li>选择并打开你想要分享的密钥。</li>
+<li>将两部手机背面接触，之后会感受到震动。</li>
+<li>震动后会发现界面变成卡片状，并有Star Trek 般的特效。</li>
+<li>轻触卡片，内容即可显示。</li>
 </ol>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_start.html b/OpenKeychain/src/main/res/raw-zh/help_start.html
index f37faec43..357f937c9 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_start.html
@@ -1,22 +1,19 @@
 <html>
 <head></head>
 <body>
-<h2>快速上手</h2>
-<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<h2>快速上手指南</h2>
+<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 Store or F-Droid for installation.</p>
-
-<h2>Applications</h2>
-<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</p>
+<p>安卓4.4一下版本可以通过该链接<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>. 点击链接可以从谷歌商店下载安装.</p>
 
 <h2>我在OpenKeychain發現問題！</h2>
 <p>請利用 <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain 項目回報系統</a>回報問題。</p>
 
 <h2>發布</h2>
-<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+<p>帮助我们开发 <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">Github</a>.</p>
 
 <h2>翻譯</h2>
-<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
+<p>帮助翻译 OpenKeychain。 <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
 
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 7076d2b83..9f676c6f9 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -44,6 +44,8 @@
   <string name="section_key_server">Keyserver</string>
   <string name="section_fingerprint">Otisk</string>
   <string name="section_key_to_certify">Klíče k ověření</string>
+  <string name="section_decrypt_files">Soubory</string>
+  <string name="section_decrypt_text">Text</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Dešifrovat, ověřit a uložit soubor</string>
   <string name="btn_decrypt_verify_message">Dešifrovat a ověřit zpávu</string>
@@ -62,6 +64,10 @@
   <string name="btn_view_cert_key">Zobrazit klíč certifikátu</string>
   <string name="btn_create_key">Vytvořit klíč</string>
   <string name="btn_add_files">Přidat soubor(y)</string>
+  <string name="btn_add_share_decrypted_text">Sdílet dešifrovaný text</string>
+  <string name="btn_decrypt_clipboard">Dešifrovat ze schránky</string>
+  <string name="btn_decrypt_and_verify">a ověřit podpisy</string>
+  <string name="btn_decrypt_files">Dešifrovat soubory</string>
   <!--menu-->
   <string name="menu_preferences">Nastavení</string>
   <string name="menu_help">Nápověda</string>
@@ -90,6 +96,7 @@
   <string name="label_ascii_armor">Soubor ASCII armor</string>
   <string name="label_file_ascii_armor">Povolit ASCII armor</string>
   <string name="label_write_version_header">Dát ostatním vědět, že používáte OpenKeychain</string>
+  <string name="label_write_version_header_summary">Zapisovat \'OpenKeychain v2.7\' do OpenPGP podpisů, šifrovaného textu a exportovaných klíčů</string>
   <string name="label_use_default_yubikey_pin">Použít výchozí Yubikey PIN</string>
   <string name="label_label_use_default_yubikey_pin_summary">Používá základní PIN (123456) pro přístup k Yubikey přes NFC</string>
   <string name="label_asymmetric_from">Podepsáno:</string>
@@ -193,6 +200,7 @@
   <string name="fingerprint_copied_to_clipboard">Fingerprint byl zkopírován do schránky!</string>
   <string name="select_key_to_certify">Prosím vyberte klíč pro ověření!</string>
   <string name="key_too_big_for_sharing">Klíč je příliš velký aby byl sdílen pomocí této metody!</string>
+  <string name="text_copied_to_clipboard">Text byl zkopírován do schránky!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
@@ -322,6 +330,11 @@
   <string name="import_error_nothing">Nic k importu</string>
   <string name="import_error_nothing_cancelled">Import zrušen.</string>
   <string name="import_with_warnings">, s varováními</string>
+  <plurals name="import_error">
+    <item quantity="one">Import selhal!</item>
+    <item quantity="few">Import %d klíčů selhal!</item>
+    <item quantity="other">Import %d klíčů selhal!</item>
+  </plurals>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Dešifrovat soubor pomocí OpenKeychain</string>
   <string name="intent_import_key">Importovat kíč pomocí OpenKeychain</string>
@@ -336,6 +349,7 @@
   <string name="api_settings_select_key">Vybrat klíč</string>
   <string name="api_settings_create_key">Vytvořit nový klíč pro tento účet</string>
   <string name="api_settings_save">Uložit</string>
+  <string name="api_settings_save_msg">Účet byl uložen</string>
   <string name="api_settings_cancel">Zrušit</string>
   <string name="api_settings_revoke">Zneplatnit přístup</string>
   <string name="api_settings_start">Spustit aplikaci</string>
@@ -403,6 +417,7 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">Tato identity byla zneplatněna. Toto není možné vzít zpět.</string>
   <string name="edit_key_edit_subkey_title">Vyberte akci!</string>
+  <string name="edit_key_new_subkey">nový podklíč</string>
   <!--Create key-->
   <string name="create_key_upload">Aktualizovat klíč na keyserver</string>
   <string name="create_key_empty">Toto pole je vyžadováno</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 8a5e392cc..1da444e49 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -362,11 +362,19 @@
     <item quantity="one">Schlüssel %2$s erfolgreich aktualisiert.</item>
     <item quantity="other">%1$d Schlüssel erfolgreich aktualisiert: %2$s.</item>
   </plurals>
+  <plurals name="import_keys_with_errors">
+    <item quantity="one">Importieren von einen Schlüssel fehlgeschlagen!</item>
+    <item quantity="other">Importieren von %d Schlüsseln fehlgeschlagen!</item>
+  </plurals>
   <string name="view_log">Log ansehen</string>
   <string name="import_error_nothing">Nichts zu importieren.</string>
   <string name="import_error_nothing_cancelled">Import abgebrochen.</string>
   <string name="import_with_warnings">, mit Warnungen</string>
   <string name="import_with_cancelled">. bis abgebrochen wurde</string>
+  <plurals name="import_error">
+    <item quantity="one">Importieren fehlgeschlagen!</item>
+    <item quantity="other">Importieren von %d Schlüsseln fehlgeschlagen!</item>
+  </plurals>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Datei entschlüsseln mit OpenKeychain</string>
   <string name="intent_import_key">Schlüssel importieren mit OpenKeychain</string>
@@ -382,6 +390,7 @@
   <string name="api_settings_select_key">Schlüssel auswählen</string>
   <string name="api_settings_create_key">Einen neuen Schlüssel für diesen Account erzeugen</string>
   <string name="api_settings_save">Speichern</string>
+  <string name="api_settings_save_msg">Benutzerkonto wurde gespeichert</string>
   <string name="api_settings_cancel">Abbrechen</string>
   <string name="api_settings_revoke">Zugriff widerufen</string>
   <string name="api_settings_start">Starte Anwendung</string>
@@ -513,9 +522,43 @@
   <string name="msg_ip_master">Hauptschlüssel %s wird verarbeitet</string>
   <string name="msg_ip_master_expired">Schlüsselbund abgelaufen am %s</string>
   <string name="msg_ip_master_expires">Schlüsselbund läuft ab am %s</string>
+  <string name="msg_ip_master_flags_unspecified">Haupt-Attribute: Unspezifiziert (alle angenommen)</string>
+  <string name="msg_ip_master_flags_cesa">Haupt-Attribute: beglaubigen, verschlüsseln, signieren, authentifizieren</string>
+  <string name="msg_ip_master_flags_cesx">Haupt-Attribute: beglaubigen, verschlüsseln, signieren</string>
+  <string name="msg_ip_master_flags_cexa">Haupt-Attribute: beglaubigen, verschlüsseln, authentifizieren</string>
+  <string name="msg_ip_master_flags_cexx">Haupt-Attribute: beglaubigen, verschlüsseln</string>
+  <string name="msg_ip_master_flags_cxsa">Haupt-Attribute: beglaubigen, signieren, authentifizieren</string>
+  <string name="msg_ip_master_flags_cxsx">Haupt-Attribute: beglaubigen, signieren</string>
+  <string name="msg_ip_master_flags_cxxa">Haupt-Attribute: beglaubigen, authentifizieren</string>
+  <string name="msg_ip_master_flags_cxxx">Haupt-Attribute: beglaubigen</string>
+  <string name="msg_ip_master_flags_xesa">Haupt-Attribute: verschlüsseln, signieren, authentifizieren</string>
+  <string name="msg_ip_master_flags_xesx">Haupt-Attribute: verschlüsseln, signieren</string>
+  <string name="msg_ip_master_flags_xexa">Haupt-Attribute: verschlüsseln, authentifizieren</string>
+  <string name="msg_ip_master_flags_xexx">Haupt-Attribute: verschlüsseln</string>
+  <string name="msg_ip_master_flags_xxsa">Haupt-Attribute: signieren, authentifizieren</string>
+  <string name="msg_ip_master_flags_xxsx">Haupt-Attribute: signieren</string>
+  <string name="msg_ip_master_flags_xxxa">Haupt-Attribute: authentifizieren</string>
+  <string name="msg_ip_master_flags_xxxx">Haupt-Attribute: Keine</string>
   <string name="msg_ip_subkey">Unterschlüssel %s wird bearbeitet</string>
   <string name="msg_ip_subkey_expired">Unterschlüssel am %s abgelaufen</string>
   <string name="msg_ip_subkey_expires">Unterschlüssel läuft am %s ab</string>
+  <string name="msg_ip_subkey_flags_unspecified">Unterschlüssel Attribute: Unspezifiziert (alle angenommen)</string>
+  <string name="msg_ip_subkey_flags_cesa">Unterschlüssel Attribute: beglaubigen, verschlüsseln, signieren, authentifizieren</string>
+  <string name="msg_ip_subkey_flags_cesx">Unterschlüssel Attribute: beglaubigen, verschlüsseln, signieren</string>
+  <string name="msg_ip_subkey_flags_cexa">Unterschlüssel Attribute: beglaubigen, verschlüsseln, authentifizieren</string>
+  <string name="msg_ip_subkey_flags_cexx">Unterschlüssel Attribute: beglaubigen, verschlüsseln</string>
+  <string name="msg_ip_subkey_flags_cxsa">Unterschlüssel Attribute: beglaubigen, signieren, authentifizieren</string>
+  <string name="msg_ip_subkey_flags_cxsx">Unterschlüssel Attribute: beglaubigen, signieren</string>
+  <string name="msg_ip_subkey_flags_cxxa">Unterschlüssel Attribute: beglaubigen, authentifizieren</string>
+  <string name="msg_ip_subkey_flags_cxxx">Unterschlüssel Attribute: beglaubigen</string>
+  <string name="msg_ip_subkey_flags_xesa">Unterschlüssel Attribute: verschlüsseln, signieren, authentifizieren</string>
+  <string name="msg_ip_subkey_flags_xesx">Unterschlüssel Attribute: verschlüsseln, signieren</string>
+  <string name="msg_ip_subkey_flags_xexa">Unterschlüssel Attribute: verschlüsseln, authentifizieren</string>
+  <string name="msg_ip_subkey_flags_xexx">Unterschlüssel Attribute: verschlüsseln</string>
+  <string name="msg_ip_subkey_flags_xxsa">Unterschlüssel Attribute: signieren, authentifizieren</string>
+  <string name="msg_ip_subkey_flags_xxsx">Unterschlüssel Attribute: signieren</string>
+  <string name="msg_ip_subkey_flags_xxxa">Unterschlüssel Attribute: authentifizieren</string>
+  <string name="msg_ip_subkey_flags_xxxx">Unterschlüssel Attribute: Keine</string>
   <string name="msg_ip_success">Öffentlicher Schlüsselbund erfolgreich importiert</string>
   <string name="msg_ip_success_identical">Schlüsselbund enthält keine neuen Daten, es gibt nichts zu tun.</string>
   <string name="msg_ip_reinsert_secret">Geheimen Schlüssel wiedereinfügen</string>
@@ -782,6 +825,7 @@
   <string name="info_no_manual_account_creation">Erstelle keine OpenKeychain-Accounts manuell.\n Für mehr Informationen sieh in die Hilfe.</string>
   <string name="contact_show_key">Schlüssel anzeigen (%s)</string>
   <string name="swipe_to_update">Nach unten wischen um von Schlüsselserver zu aktualisieren</string>
+  <string name="error_no_file_selected">Mindestens eine Datei zum Verschlüsseln auswählen!</string>
   <!--First Time-->
   <string name="first_time_text1">Hol dir deine Privatsphäre mit OpenKeychain zurück!</string>
   <string name="first_time_create_key">Erzeuge meinen Schlüssel</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 9d7c65d9a..221107bda 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -5,11 +5,14 @@
   <!--title-->
   <string name="title_select_recipients">Seleziona chiavi</string>
   <string name="title_select_secret_key">Seleziona la Tua Chiave</string>
+  <string name="title_encrypt_text">Testo Cifrato</string>
+  <string name="title_encrypt_files">File Cifrati</string>
   <string name="title_decrypt">Decodifica</string>
   <string name="title_authentication">Frase di accesso</string>
   <string name="title_add_subkey">Aggiungi Sottochiave</string>
   <string name="title_edit_key">Modifica Chiave</string>
   <string name="title_preferences">Preferenze</string>
+  <string name="title_cloud_search_preferences">Preferenze di ricerca</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">Preferenze Server delle Chiavi</string>
   <string name="title_change_passphrase">Cambia Frase Di Accesso</string>
@@ -32,6 +35,7 @@
   <!--section-->
   <string name="section_user_ids">Identità</string>
   <string name="section_keys">Sottochiavi</string>
+  <string name="section_cloud_search">Ricerca</string>
   <string name="section_general">Generale</string>
   <string name="section_defaults">Predefiniti</string>
   <string name="section_advanced">Avanzato</string>
@@ -42,6 +46,8 @@
   <string name="section_key_server">Server delle Chiavi</string>
   <string name="section_fingerprint">Impronta</string>
   <string name="section_key_to_certify">Chiave da certificare</string>
+  <string name="section_decrypt_files">Files</string>
+  <string name="section_decrypt_text">Testo</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Decodifica, verifica e salva su file</string>
   <string name="btn_decrypt_verify_message">Decodifica e verifica messaggio</string>
@@ -60,6 +66,10 @@
   <string name="btn_view_cert_key">Mostra chiave di certificazione</string>
   <string name="btn_create_key">Crea chiave</string>
   <string name="btn_add_files">Aggiungi file(s)</string>
+  <string name="btn_add_share_decrypted_text">Condividi testo decifrato</string>
+  <string name="btn_decrypt_clipboard">Decifra dalla lavagna</string>
+  <string name="btn_decrypt_and_verify">e verifica le firme</string>
+  <string name="btn_decrypt_files">Decifra files</string>
   <!--menu-->
   <string name="menu_preferences">Impostazioni</string>
   <string name="menu_help">Aiuto</string>
@@ -82,17 +92,32 @@
   <string name="label_file_colon">File:</string>
   <string name="label_no_passphrase">Nessuna Frase di Accesso</string>
   <string name="label_passphrase">Frase di Accesso</string>
+  <string name="label_unlock">Sbloccando...</string>
   <string name="label_passphrase_again">Ripeti Frase di Accesso</string>
   <string name="label_algorithm">Algortimo</string>
   <string name="label_ascii_armor">Documenti con Armatura ASCII</string>
   <string name="label_write_version_header">Fai sapere agli altri che utilizzi OpenKeychain</string>
   <string name="label_write_version_header_summary">Scrive \'OpenKeychain v2.7\' nelle firme OpenPGP, testi cifrati e chiavi esportate</string>
+  <string name="label_use_default_yubikey_pin">Utilizza PIN Yubikey</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Utilizza il PIN base (123456) per accedere a Yubikeys tramite NFC</string>
+  <string name="label_asymmetric_from">Firmato da:</string>
+  <string name="label_to">Codifica per:</string>
+  <string name="label_delete_after_encryption">Elimina file dopo la codifica</string>
+  <string name="label_delete_after_decryption">Elimina dopo la decodifica</string>
+  <string name="label_encryption_algorithm">Algoritmo di codifica</string>
+  <string name="label_hash_algorithm">Algoritmo Hash</string>
+  <string name="label_symmetric">Cifra con password</string>
+  <string name="label_passphrase_cache_ttl">Memorizza password</string>
+  <string name="label_passphrase_cache_subs">Memorizza password tramite sottochiave</string>
+  <string name="label_message_compression">Compressione messaggio</string>
+  <string name="label_file_compression">Compressione file</string>
   <string name="label_keyservers">Server Chiavi</string>
   <string name="label_key_id">ID Chiave</string>
   <string name="label_creation">Creazione</string>
   <string name="label_expiry">Scadenza</string>
   <string name="label_usage">Utilizzo</string>
   <string name="label_key_size">Dimensione Chiave</string>
+  <string name="label_ecc_curve">Curva Elittica</string>
   <string name="label_main_user_id">Identità Primaria</string>
   <string name="label_name">Nome</string>
   <string name="label_comment">Commento</string>
@@ -100,6 +125,7 @@
   <string name="label_send_key">Carica chiave nel server delle chiavi selezionati dopo la certificazione</string>
   <string name="label_fingerprint">Impronta</string>
   <string name="expiry_date_dialog_title">Impostare la data di scadenza</string>
+  <string name="label_preferred">preferiti</string>
   <string name="user_id_no_name">&lt;nessun nome&gt;</string>
   <string name="none">&lt;nessuno&gt;</string>
   <string name="no_key">&lt;nessuna chiave&gt;</string>
@@ -135,6 +161,8 @@
   <string name="dsa">DSA</string>
   <string name="elgamal">ElGamal</string>
   <string name="rsa">RSA</string>
+  <string name="ecdh">ECDH</string>
+  <string name="ecdsa">ECDSA</string>
   <string name="filemanager_title_open">Apri...</string>
   <string name="warning">Attenzione</string>
   <string name="error">Errore</string>
@@ -151,6 +179,8 @@
   <string name="passphrase_must_not_be_empty">Si prega di inserire una frase di accesso.</string>
   <string name="passphrase_for_symmetric_encryption">Codifica Simmetrica.</string>
   <string name="passphrase_for">Inserisci la frase di accesso per \'%s\'</string>
+  <string name="yubikey_pin">Inserisci il PIN per accedere a Yubikey con \'%s\'</string>
+  <string name="file_delete_confirmation">Sei sicuro di voler eliminare\n%s?</string>
   <string name="file_delete_successful">Eliminato correttamente.</string>
   <string name="no_file_selected">Seleziona un file prima.</string>
   <string name="encrypt_sign_successful">Firmato e/o codificato con successo.</string>
@@ -158,6 +188,18 @@
   <string name="enter_passphrase_twice">Inserisci la frase di accesso due volte.</string>
   <string name="select_encryption_key">Seleziona almeno una chiave di codifica.</string>
   <string name="select_encryption_or_signature_key">Seleziona almeno una chiave di codifica o di firma.</string>
+  <string name="specify_file_to_encrypt_to">Perfavore specifica il file da codificare.
+ATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
+  <string name="specify_file_to_decrypt_to">Perfavore specifica il file da decodificare.
+ATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
+  <string name="specify_file_to_export_to">Perfavore specifica il file da esportare.
+ATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
+  <string name="key_deletion_confirmation_multi">Vuoi veramente eliminare tutte le chiavi pubbliche selezionate?
+Non potrai annullare!</string>
+  <string name="secret_key_deletion_confirmation">Vuoi veramente eliminare la chiave PRIVATA \'%s\'?
+Non potrai annullare!</string>
+  <string name="public_key_deletetion_confirmation">Vuoi veramente eliminare la chiave pubblica \'%s\'?
+Non potrai annullare!</string>
   <string name="also_export_secret_keys">Esporta anche chiave segreta</string>
   <string name="key_exported">1 chiave esportata correttamente.</string>
   <string name="keys_exported">%d chiavi esportate correttamente.</string>
@@ -170,6 +212,7 @@
   <string name="fingerprint_copied_to_clipboard">Impronta copiata negli appunti!</string>
   <string name="select_key_to_certify">Per favore seleziona una chiave per la certificazione!</string>
   <string name="key_too_big_for_sharing">Chiave troppo grande per essere condivisa in questo modo!</string>
+  <string name="text_copied_to_clipboard">Il testo è stato copiato sulla lavagna!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
@@ -212,6 +255,7 @@
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Fatto.</string>
   <string name="progress_cancel">Annulla</string>
+  <string name="progress_cancelling">cancellando...</string>
   <string name="progress_saving">salvataggio...</string>
   <string name="progress_importing">importazione...</string>
   <string name="progress_exporting">esportazione...</string>
@@ -221,6 +265,8 @@
   <string name="progress_generating_rsa">generazione di una nuova chiave RSA...</string>
   <string name="progress_generating_dsa">generazione di una nuova chiave DSA...</string>
   <string name="progress_generating_elgamal">generazione di una nuova chiave ElGamal...</string>
+  <string name="progress_generating_ecdsa">generazione di una nuova chiave ECDSA...</string>
+  <string name="progress_generating_ecdh">generazione di una nuova chiave ECDH...</string>
   <string name="progress_modify">modifica portachiavi...</string>
   <string name="progress_modify_unlock">Sblocco portachiavi...</string>
   <string name="progress_modify_adduid">Aggiunta ID utente...</string>
@@ -255,6 +301,7 @@
   <string name="progress_con_reimport">consolidazione: reimportazione...</string>
   <!--action strings-->
   <string name="hint_keyserver_search_hint">Nome/Email/ID Chiave...</string>
+  <string name="hint_cloud_search_hint">Nome/Email/Certificato/Chiave...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -314,6 +361,7 @@
   </plurals>
   <string name="view_log">Mostra registro</string>
   <string name="import_error_nothing">Niente da importare</string>
+  <string name="import_error_nothing_cancelled">Importazione cancellata.</string>
   <string name="import_with_warnings">, con avvisi</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Decodifica File con OpenKeychain</string>
@@ -329,6 +377,7 @@
   <string name="api_settings_select_key">Seleziona chiave</string>
   <string name="api_settings_create_key">Crea una nuova chiave per questo account</string>
   <string name="api_settings_save">Salva</string>
+  <string name="api_settings_save_msg">L\'account è stato salvato</string>
   <string name="api_settings_cancel">Annulla</string>
   <string name="api_settings_revoke">Revoca accesso</string>
   <string name="api_settings_start">Avvia applicazione</string>
@@ -336,7 +385,13 @@
   <string name="api_settings_package_name">Nome Pacchetto</string>
   <string name="api_settings_package_signature">SHA-256 della Firma del Pacchetto</string>
   <string name="api_settings_accounts">Account</string>
+  <string name="api_settings_settings">Impostazioni</string>
+  <string name="api_settings_key">Chiave account:</string>
   <string name="api_settings_accounts_empty">Nessun account collegato a questa applicazione</string>
+  <string name="api_create_account_text">L\'applicazione richiede la creazione di un nuovo account. Si prega di selezionare una chiave esistente o crearne una nuova.\nLe applicazioni sono limitate all\'utilizzo delle chiavi selezionate qui!</string>
+  <string name="api_update_account_text">La chiave salvata per questo account è stata cancellata. Perfavore selezionane una diversa!\nLe applicazioni sono limitate all\'utilizzo delle chiavi qui selezionate!</string>
+  <string name="api_register_text">Le app visualizzate hanno richiesto l\'accesso a OpenKeychain.
+Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' apparsa, nega l\'accesso! Puoi revocare l\'accesso dopo, usando la schermata \'App Registrate\'.</string>
   <string name="api_register_allow">Permetti accesso</string>
   <string name="api_register_disallow">Nega accesso</string>
   <string name="api_register_error_select_key">Per favore selezionare una chiave!</string>
@@ -360,9 +415,13 @@
   <string name="key_list_empty_button_import">importazione di chiave esistente.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Modifica chiave</string>
+  <string name="key_view_action_encrypt">Codifica Testo</string>
+  <string name="key_view_action_encrypt_files">documenti</string>
   <string name="key_view_action_certify">Certifica identità</string>
   <string name="key_view_action_update">Aggiorna dal server delle chiavi</string>
   <string name="key_view_action_share_with">Condividi con...</string>
+  <string name="key_view_action_share_nfc">Condividi tramite NFC</string>
+  <string name="key_view_action_upload">Carica sul Server delle Chiavi</string>
   <string name="key_view_tab_main">Info Principale</string>
   <string name="key_view_tab_share">Condividi</string>
   <string name="key_view_tab_keys">Sottochiavi</string>
@@ -380,26 +439,49 @@
   <string name="edit_key_action_add_identity">Aggiungi Identità</string>
   <string name="edit_key_action_add_subkey">Aggiungi Sottochiave</string>
   <string name="edit_key_edit_user_id_title">Seleziona un azione!</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>Cambia in Identita\' Primaria</item>
+    <item>Revoca identita\'</item>
+  </string-array>
+  <string-array name="edit_key_edit_user_id_revert_revocation">
+    <item>Ripristina revoca</item>
+  </string-array>
   <string name="edit_key_edit_user_id_revoked">Questa identità è stata revocata. Ciò non può essere annullato.</string>
   <string name="edit_key_edit_subkey_title">Seleziona un azione!</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Cambia Scadenza</item>
+    <item>Revoca Sottochiave</item>
+    <item>Pulisci Sottochiave</item>
+  </string-array>
+  <string name="edit_key_new_subkey">nuova sottochiave</string>
   <string name="edit_key_select_flag">Per favore seleziona almeno una spunta!</string>
+  <string name="edit_key_error_add_identity">Aggiungi almeno una identità</string>
+  <string name="edit_key_error_add_subkey">Aggiungi almeno una sottochiave!</string>
   <!--Create key-->
   <string name="create_key_upload">Carica chiave nel server delle chiavi</string>
   <string name="create_key_empty">Questo campo è necessario</string>
   <string name="create_key_passphrases_not_equal">Le frasi di accesso non coincidono.</string>
   <string name="create_key_final_text">Hai inserito la seguente identità:</string>
+  <string name="create_key_final_robot_text">La creazione di una chiave richiede un po\' di tempo, prendi un caffè nel frattempo...</string>
+  <string name="create_key_rsa">(3 sottochiavi, RSA, 4096 bit)</string>
+  <string name="create_key_custom">(personalizza la configurazione della chiave)</string>
   <string name="create_key_text">Inserisci Nome Completo, Email e scegli una Frase di Accesso.</string>
   <string name="create_key_hint_full_name">Nome completo, es: Mario Rossi</string>
+  <string name="create_key_edit">Cambia configurazione della chiave</string>
   <!--View key-->
   <string name="view_key_revoked">Questa chiave è stata revocata!</string>
   <string name="view_key_expired">Questa chiave è scaduta</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Chiavi</string>
+  <string name="nav_encrypt_text">Codifica Testo</string>
+  <string name="nav_encrypt_files">Codifica documenti</string>
+  <string name="nav_decrypt">Decodifica</string>
   <string name="nav_apps">Apps</string>
   <string name="drawer_open">Apri drawer di navigazione</string>
   <string name="drawer_close">Chiudi drawer di navigazione</string>
   <string name="my_keys">Le Mie Chiavi</string>
   <!--hints-->
+  <string name="encrypt_content_edit_text_hint">Digita testo</string>
   <!--certs-->
   <string name="cert_default">predefiniti</string>
   <string name="cert_none">nessuno</string>
@@ -411,12 +493,17 @@
   <string name="cert_verify_error">errore!</string>
   <string name="cert_verify_unavailable">chiave non disponibile</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <string name="msg_internal_error">Errore interno!</string>
+  <string name="msg_cancelled">Operazione cancellata.</string>
   <!--Import Public log entries-->
   <string name="msg_ip_apply_batch">Applicazione inserimento operazioni in batch.</string>
   <string name="msg_ip_bad_type_secret">Ho cercato di importare portachiavi privato come pubblico. Questo è un bug, per cortesia inviateci un rapporto!</string>
   <string name="msg_ip_delete_old_fail">Nessuna vecchia chiave cancellata (stai creando una nuova?)</string>
   <string name="msg_ip_delete_old_ok">Cancellate vecchie chiavi dal database</string>
   <string name="msg_ip_encode_fail">Operazione fallita a causa di un errore di codifica</string>
+  <string name="msg_ip_error_io_exc">Operazione fallita a causa di un errore di i/o</string>
+  <string name="msg_ip_error_op_exc">Operazione fallita a causa di un errore della banca dati</string>
+  <string name="msg_ip_error_remote_ex">Operazione fallita a causa di un errore interno</string>
   <string name="msg_ip">Importazione portachiavi pubblico %s</string>
   <string name="msg_ip_insert_keyring">Codifica dati del portachiavi</string>
   <string name="msg_ip_insert_keys">Elaborazione chiavi</string>
@@ -424,9 +511,43 @@
   <string name="msg_ip_master">Elaborazione chiave principale %s</string>
   <string name="msg_ip_master_expired">Portachiavi scaduto il %s</string>
   <string name="msg_ip_master_expires">Il portachiavi scade il %s</string>
+  <string name="msg_ip_master_flags_unspecified">Caratteristiche chiave principale: non specificate (si assume tutte quante)</string>
+  <string name="msg_ip_master_flags_cesa">Caratteristiche chiave principale: certifica, codifica, firma, autentica</string>
+  <string name="msg_ip_master_flags_cesx">Caratteristiche chiave principale: certifica, codifica, firma</string>
+  <string name="msg_ip_master_flags_cexa">Caratteristiche chiave principale: certifica, codifica, firma</string>
+  <string name="msg_ip_master_flags_cexx">Caratteristiche chiave principale: certifica, codifica</string>
+  <string name="msg_ip_master_flags_cxsa">Caratteristiche chiave principale: certifica, firma, autentica</string>
+  <string name="msg_ip_master_flags_cxsx">Caratteristiche chiave principale: certifica, firma</string>
+  <string name="msg_ip_master_flags_cxxa">Caratteristiche chiave principale: certifica, autentica</string>
+  <string name="msg_ip_master_flags_cxxx">Caratteristiche chiave principale: certifica</string>
+  <string name="msg_ip_master_flags_xesa">Caratteristiche chiave principale: codifica, firma, autentica</string>
+  <string name="msg_ip_master_flags_xesx">Caratteristiche chiave principale: codifica, firma</string>
+  <string name="msg_ip_master_flags_xexa">Caratteristiche chiave principale: codifica, autentica</string>
+  <string name="msg_ip_master_flags_xexx">Caratteristiche chiave principale: codifica</string>
+  <string name="msg_ip_master_flags_xxsa">Caratteristiche chiave principale: firma, autentica</string>
+  <string name="msg_ip_master_flags_xxsx">Caratteristiche chiave principale: firma</string>
+  <string name="msg_ip_master_flags_xxxa">Caratteristiche chiave principale: autentica</string>
+  <string name="msg_ip_master_flags_xxxx">Caratteristiche chiave principale: nessuna</string>
   <string name="msg_ip_subkey">Elaborazione sottochiave %s</string>
   <string name="msg_ip_subkey_expired">Sottochiave scaduta il %s</string>
   <string name="msg_ip_subkey_expires">La sottochiave scade il %s</string>
+  <string name="msg_ip_subkey_flags_unspecified">Caratteristiche sottochiave: non specificate (si assume tutte quante) </string>
+  <string name="msg_ip_subkey_flags_cesa">Caratteristiche sottochiave: certifica, codifica, firma, autentica</string>
+  <string name="msg_ip_subkey_flags_cesx">Caratteristiche sottochiave: certifica, codifica, firma</string>
+  <string name="msg_ip_subkey_flags_cexa">Caratteristiche sottochiave: certifica, codifica, autentica</string>
+  <string name="msg_ip_subkey_flags_cexx">Caratteristiche sottochiave: certifica, codifica</string>
+  <string name="msg_ip_subkey_flags_cxsa">Caratteristiche sottochiave: certifica, firma, autentica</string>
+  <string name="msg_ip_subkey_flags_cxsx">Caratteristiche sottochiave: certifica, firma</string>
+  <string name="msg_ip_subkey_flags_cxxa">Caratteristiche sottochiave: certifica, autentica</string>
+  <string name="msg_ip_subkey_flags_cxxx">Caratteristiche sottochiave: certifica</string>
+  <string name="msg_ip_subkey_flags_xesa">Caratteristiche sottochiave: codifica, firma, autentica</string>
+  <string name="msg_ip_subkey_flags_xesx">Caratteristiche sottochiave: codifica, firma</string>
+  <string name="msg_ip_subkey_flags_xexa">Caratteristiche sottochiave: codifica, autentica</string>
+  <string name="msg_ip_subkey_flags_xexx">Caratteristiche sottochiave: codifica</string>
+  <string name="msg_ip_subkey_flags_xxsa">Caratteristiche sottochiave: firma, autentica</string>
+  <string name="msg_ip_subkey_flags_xxsx">Caratteristiche sottochiave: firma</string>
+  <string name="msg_ip_subkey_flags_xxxa">Caratteristiche sottochiave: autentica</string>
+  <string name="msg_ip_subkey_flags_xxxx">Caratteristiche sottochiave: nessuna</string>
   <string name="msg_ip_success">Portachiavi pubblico importato con successo</string>
   <string name="msg_ip_success_identical">Il portachiavi non contiene nuovi dati, nulla da eseguire</string>
   <string name="msg_ip_reinsert_secret">Reinserimento chiave segreta</string>
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
index 7e1ea2cfd..9f145ed46 100644
--- a/OpenKeychain/src/main/res/values-sr/strings.xml
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -3,53 +3,520 @@
   <!--GENERAL: Please put all strings inside quotes as described in example 1 on
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <!--title-->
+  <string name="title_select_recipients">Изаберите кључ</string>
+  <string name="title_select_secret_key">Изаберите ваш кључ</string>
+  <string name="title_encrypt_text">Шифруј текст</string>
+  <string name="title_encrypt_files">Шифруј фајлове</string>
+  <string name="title_decrypt">Дешифруј</string>
+  <string name="title_authentication">Лозинка</string>
+  <string name="title_add_subkey">Додај поткључ</string>
+  <string name="title_edit_key">Уреди кључ</string>
+  <string name="title_preferences">Поставке</string>
+  <string name="title_cloud_search_preferences">Поставке клауд претраге</string>
+  <string name="title_api_registered_apps">Апликације</string>
+  <string name="title_key_server_preference">Поставка сервера кључева</string>
+  <string name="title_change_passphrase">Измени лозинку</string>
+  <string name="title_share_fingerprint_with">Подели отисак прста са…</string>
+  <string name="title_share_key">Подели кључ са…</string>
+  <string name="title_share_file">Подели фајл са…</string>
+  <string name="title_share_message">Подели поруку са…</string>
+  <string name="title_encrypt_to_file">Шифруј у фајл</string>
+  <string name="title_decrypt_to_file">Дешифруј у фајл</string>
+  <string name="title_import_keys">Увези кључеве</string>
+  <string name="title_export_key">Извези кључ</string>
+  <string name="title_export_keys">Извези кључеве</string>
+  <string name="title_key_not_found">Кључ није нађен</string>
+  <string name="title_send_key">Отпреми на сервер кључева</string>
+  <string name="title_certify_key">Овери идентитете</string>
+  <string name="title_key_details">Детаљи кључа</string>
+  <string name="title_help">Помоћ</string>
+  <string name="title_log_display">Дневник</string>
+  <string name="title_create_key">Направи кључ</string>
   <!--section-->
+  <string name="section_user_ids">Идентитети</string>
+  <string name="section_keys">Поткључеви</string>
+  <string name="section_cloud_search">Претрага клауда</string>
+  <string name="section_general">Опште</string>
+  <string name="section_defaults">Подразумевано</string>
+  <string name="section_advanced">Напредно</string>
+  <string name="section_actions">Радње</string>
+  <string name="section_share_key">Цео кључ</string>
+  <string name="section_certification_key">Ваш кључ за оверу</string>
+  <string name="section_upload_key">Отпреми кључ</string>
+  <string name="section_key_server">Сервер кључева</string>
+  <string name="section_fingerprint">Отисак прста</string>
+  <string name="section_key_to_certify">Кључ за оверавање</string>
+  <string name="section_decrypt_files">Фајлови</string>
+  <string name="section_decrypt_text">Текст</string>
   <!--button-->
+  <string name="btn_decrypt_verify_file">Дешифруј, овери и сачувај фајл</string>
+  <string name="btn_decrypt_verify_message">Дешифруј и овери поруку</string>
+  <string name="btn_encrypt_file">Шифруј и сачувај фајл</string>
+  <string name="btn_encrypt_share_file">Шифруј и подели фајл</string>
+  <string name="btn_save">Сачувај</string>
+  <string name="btn_do_not_save">Одустани</string>
+  <string name="btn_delete">Обриши</string>
+  <string name="btn_no_date">Не истиче</string>
+  <string name="btn_okay">У реду</string>
+  <string name="btn_export_to_server">Отпреми на сервер кључева</string>
+  <string name="btn_next">Следеће</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_lookup_key">Потражи кључ</string>
+  <string name="btn_share_encrypted_signed">Шифруј и подели поруку</string>
+  <string name="btn_view_cert_key">Прикажи кључ за оверавање</string>
+  <string name="btn_create_key">Направи кључ</string>
+  <string name="btn_add_files">Додај фајл(ове)</string>
+  <string name="btn_add_share_decrypted_text">Подели дешифрован текст</string>
+  <string name="btn_decrypt_clipboard">Дешифруј са клипборда</string>
+  <string name="btn_decrypt_and_verify">и овери потписе</string>
+  <string name="btn_decrypt_files">Дешифруј фајлове</string>
   <!--menu-->
+  <string name="menu_preferences">Поставке</string>
+  <string name="menu_help">Помоћ</string>
+  <string name="menu_export_key">Извези у фајл</string>
+  <string name="menu_delete_key">Обриши кључ</string>
+  <string name="menu_create_key">Направи ми кључ</string>
+  <string name="menu_import_existing_key">Увези постојећи кључ</string>
+  <string name="menu_search">Претрага</string>
+  <string name="menu_beam_preferences">Поставке Снопа</string>
+  <string name="menu_key_edit_cancel">Одустани</string>
+  <string name="menu_encrypt_to">Шифруј у…</string>
+  <string name="menu_select_all">Изабери све</string>
+  <string name="menu_add_keys">Додај кључеве</string>
+  <string name="menu_export_all_keys">Извези све кључеве</string>
+  <string name="menu_advanced">Прикажи напредне податке</string>
   <!--label-->
+  <string name="label_message">Порука</string>
+  <string name="label_file">Фајл</string>
+  <string name="label_files">Фајл(ови)</string>
+  <string name="label_file_colon">Фајл:</string>
+  <string name="label_no_passphrase">Без лозинке</string>
+  <string name="label_passphrase">Лозинка</string>
+  <string name="label_unlock">Откључавам…</string>
+  <string name="label_passphrase_again">Лозинка поново</string>
+  <string name="label_algorithm">Алгоритам</string>
+  <string name="label_ascii_armor">ASCII оклоп фајла</string>
+  <string name="label_file_ascii_armor">Омогући ASCII оклоп</string>
+  <string name="label_write_version_header">Упиши да користим OpenKeychain</string>
+  <string name="label_write_version_header_summary">Уписује „OpenKeychain v3.0“ у ОпенПГП потписе, шифровани текст и извезене кључеве</string>
+  <string name="label_use_default_yubikey_pin">Користи подразумевани Јубикључ ПИН</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Користи подразумевани ПИН (123456) за приступ Јуби-кључевима преко НФЦ-а</string>
+  <string name="label_asymmetric_from">Потписник:</string>
+  <string name="label_to">Шифруј за:</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_symmetric">Шифровање са лозинком</string>
+  <string name="label_passphrase_cache_ttl">Кеширај лозинку</string>
+  <string name="label_passphrase_cache_subs">Кеширај по поткључу</string>
+  <string name="label_message_compression">Компресија поруке</string>
+  <string name="label_file_compression">Компресија фајла</string>
+  <string name="label_keyservers">Сервери кључева</string>
+  <string name="label_key_id">ИД кључа</string>
+  <string name="label_creation">Направљен</string>
+  <string name="label_expiry">Истиче</string>
+  <string name="label_usage">Употреба</string>
+  <string name="label_key_size">Величина кључа</string>
+  <string name="label_ecc_curve">Елиптичка крива</string>
+  <string name="label_main_user_id">Примарни идентитет</string>
+  <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="expiry_date_dialog_title">Датум истека</string>
+  <string name="label_first_keyserver_is_used">(Први сервер кључева на списку је приоритетан)</string>
+  <string name="label_preferred">приоритетан</string>
+  <string name="user_id_no_name">&lt;нема имена&gt;</string>
+  <string name="none">&lt;нема&gt;</string>
+  <string name="no_key">&lt;нема кључа&gt;</string>
+  <string name="can_encrypt">може да шифрује</string>
+  <string name="can_sign">може да потпише</string>
+  <string name="can_certify">може да овери</string>
+  <string name="can_certify_not">не може да овери</string>
+  <string name="expired">истекао</string>
+  <string name="revoked">опозван</string>
+  <string name="secret_key">Тајни кључ:</string>
   <!--choice-->
+  <string name="choice_none">Ништа</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="dsa">ДСА</string>
+  <string name="elgamal">ЕлГамал</string>
+  <string name="rsa">РСА</string>
+  <string name="ecdh">ЕЦДХ</string>
+  <string name="ecdsa">ЕЦДСА</string>
+  <string name="filemanager_title_open">Отвори…</string>
+  <string name="warning">Упозорење</string>
+  <string name="error">Грешка</string>
+  <string name="error_message">Грешка: %s</string>
   <!--key flags-->
+  <string name="flag_certify">Овера</string>
+  <string name="flag_sign">Потпис</string>
+  <string name="flag_encrypt">Шифровање</string>
+  <string name="flag_authenticate">Аутентификација</string>
   <!--sentences-->
+  <string name="wrong_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="passphrase_for">Унесите лозинку за „%s“</string>
+  <string name="yubikey_pin">Унесите ПИН за приступ Јубикључу за „%s“</string>
+  <string name="file_delete_confirmation">Желите ли заиста да обришете\n%s?</string>
+  <string name="file_delete_successful">Брисање је успело.</string>
+  <string name="no_file_selected">Најпре изаберите фајл.</string>
+  <string name="encrypt_sign_successful">Потписивање и/или шифровање је успело.</string>
+  <string name="encrypt_sign_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="specify_file_to_encrypt_to">Одредите у који фајл да шифрујем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји.</string>
+  <string name="specify_file_to_decrypt_to">Одредите у који фајл да дешифрујем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји.</string>
+  <string name="specify_file_to_export_to">Одредите у који фајл да извезем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји.</string>
+  <string name="key_deletion_confirmation_multi">Желите ли заиста да обришете све изабране јавне кључеве?\nОво не можете да поништите!</string>
+  <string name="secret_key_deletion_confirmation">Желите ли заиста да обришете ТАЈНИ кључ „%s“?\nОво не можете да поништите!</string>
+  <string name="public_key_deletetion_confirmation">Желите ли заиста да обришете јавни кључ „%s“??\nОво не можете да поништите!</string>
+  <string name="also_export_secret_keys">Такође извези тајне кључеве</string>
+  <string name="reinstall_openkeychain">Наишли сте на познату грешку у Андроиду. Поново инсталирајте OpenKeychain ако желите да повежете ваше контакте са кључевима.</string>
+  <string name="key_exported">Успешно извезен 1 кључ.</string>
+  <string name="keys_exported">Успешно извезено %d кључева.</string>
+  <string name="no_keys_exported">Ниједан кључ није извезен.</string>
+  <string name="key_creation_el_gamal_info">Напомена: само поткључеви подржавају ЕлГамал.</string>
+  <string name="key_not_found">Нисам могао да нађем кључ %08X.</string>
+  <string name="list_empty">Овај списак је празан!</string>
+  <string name="nfc_successful">Кључ је успешно послат преко НФЦ Снопа!</string>
+  <string name="key_copied_to_clipboard">Кључ је копиран на клипборд!</string>
+  <string name="fingerprint_copied_to_clipboard">Отисак прста је копиран на клипборд!</string>
+  <string name="select_key_to_certify">Изаберите кључ који ће бити коришћен за оверавање!</string>
+  <string name="key_too_big_for_sharing">Кључ је превелик да би се делио на овај начин!</string>
+  <string name="text_copied_to_clipboard">Текст је копиран на клипборд!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
+  <string name="error_file_delete_failed">брисање „%s“ није успело</string>
+  <string name="error_file_not_found">фајл није нађен</string>
+  <string name="error_no_secret_key_found">одговарајући тајни кључ није нађен</string>
+  <string name="error_external_storage_not_ready">спољашње складиште није спремно</string>
+  <string name="error_key_size_minimum512bit">величина кључа мора да буде најмање 512 бита</string>
+  <string name="error_unknown_algorithm_choice">непознат избор алгоритма</string>
+  <string name="error_user_id_no_email">није нађена е-адреса</string>
+  <string name="error_key_needs_a_user_id">потребан је бар један идентитет</string>
+  <string name="error_no_signature_passphrase">није задата лозинка</string>
+  <string name="error_no_signature_key">није задат кључ за потпис</string>
+  <string name="error_invalid_data">нема исправног шифрованог или потписаног ОпенПГП садржаја!</string>
+  <string name="error_integrity_check_failed">провера интегритета није успела! Подаци су измењени!</string>
+  <string name="error_wrong_passphrase">погрешна лозинка</string>
+  <string name="error_could_not_extract_private_key">нисам могао да извучем лични кључ</string>
   <!--errors without preceeding Error:-->
+  <string name="error_jelly_bean_needed">Потребан вам је Андроид 4.1 да бисте користили Андроидову могућност НФЦ Снопа!</string>
+  <string name="error_nfc_needed">НФЦ није доступан на вашем уређају!</string>
+  <string name="error_nothing_import">Нема нађених кључева!</string>
+  <string name="error_query_too_short">Упит за претрагу је прекратак. Прецизирајте упит!</string>
+  <string name="error_searching_keys">Дошло је до грешке приликом претраге кључева.</string>
+  <string name="error_too_many_responses">Претрага кључева је вратила превише кандидата. Прецизирајте упит!</string>
+  <string name="error_too_short_or_too_many_responses">Или није нађен ниједан кључ или их је нађено превише. Побољшајте ваш упит!</string>
+  <string name="error_import_no_valid_keys">Нема исправних кључева у фајлу/клипборду!</string>
+  <string name="error_generic_report_bug">Дошло је до опште грешке, направите нови извештај о грешци за OpenKeychain.</string>
   <!--results shown after decryption/verification-->
+  <string name="decrypt_result_invalid_signature">Неисправан потпис!</string>
+  <string name="decrypt_result_signature_unknown_pub_key">Непознат јавни кључ</string>
+  <string name="decrypt_result_signature_uncertified">Исправан потпис (неоверен)</string>
+  <string name="decrypt_result_signature_certified">Исправан потпис (оверен)</string>
+  <string name="decrypt_result_decrypted">Успешно дешифровано</string>
+  <string name="decrypt_result_decrypted_unknown_pub_key">Успешно дешифровано али непознат јавни кључ</string>
+  <string name="decrypt_result_decrypted_and_signature_uncertified">Успешно дешифровано и исправан потпис (неоверен)</string>
+  <string name="decrypt_result_decrypted_and_signature_certified">Успешно дешифровано и исправан потпис (оверен)</string>
   <!--progress dialogs, usually ending in '…'-->
+  <string name="progress_done">Завршено.</string>
+  <string name="progress_cancel">Одустани</string>
+  <string name="progress_cancelling">отказујем…</string>
+  <string name="progress_saving">успремам…</string>
+  <string name="progress_importing">увозим…</string>
+  <string name="progress_exporting">извозим…</string>
+  <string name="progress_uploading">отпремам…</string>
+  <string name="progress_building_key">градим кључ…</string>
+  <string name="progress_building_master_key">градим главни прстен…</string>
+  <string name="progress_generating_rsa">правим нови РСА кључ…</string>
+  <string name="progress_generating_dsa">правим нови ДСА кључ…</string>
+  <string name="progress_generating_elgamal">правим нови ЕлГамал кључ…</string>
+  <string name="progress_generating_ecdsa">правим нови ЕЦДСА кључ…</string>
+  <string name="progress_generating_ecdh">правим нови ЕЦДХ кључ…</string>
+  <string name="progress_modify">модификујем привезак…</string>
+  <string name="progress_modify_unlock">откључавам привезак…</string>
+  <string name="progress_modify_adduid">додајем корисничке ИД-ове…</string>
+  <string name="progress_modify_revokeuid">опозивам корисничке ИД-ове…</string>
+  <string name="progress_modify_primaryuid">мењам примарни кориснички ИД…</string>
+  <string name="progress_modify_subkeychange">модификујем поткључеве…</string>
+  <string name="progress_modify_subkeyrevoke">опозивам поткључеве…</string>
+  <string name="progress_modify_subkeystrip">огољавам поткључеве…</string>
+  <string name="progress_modify_subkeyadd">додајем поткључеве…</string>
+  <string name="progress_modify_passphrase">мењам лозинку…</string>
+  <string name="progress_extracting_signature_key">извлачим кључ потписа…</string>
+  <string name="progress_extracting_key">извлачим кључ…</string>
+  <string name="progress_preparing_streams">припремам токове…</string>
+  <string name="progress_encrypting">шифрујем податке…</string>
+  <string name="progress_decrypting">дешифрујем податке…</string>
+  <string name="progress_preparing_signature">припремам потпис…</string>
+  <string name="progress_generating_signature">правим потпис…</string>
+  <string name="progress_processing_signature">обрађујем потпис…</string>
+  <string name="progress_verifying_signature">оверавам потпис…</string>
+  <string name="progress_signing">потписујем…</string>
+  <string name="progress_certifying">оверавам…</string>
+  <string name="progress_reading_data">читам податке…</string>
+  <string name="progress_finding_key">тражим кључ…</string>
+  <string name="progress_decompressing_data">распакујем податке…</string>
+  <string name="progress_verifying_integrity">оверавам интегритет…</string>
+  <string name="progress_deleting_securely">бришем „%s“ сигурно…</string>
+  <string name="progress_deleting">бришем кључеве…</string>
+  <string name="progress_con_saving">учвршћивање: успремам у кеш…</string>
+  <string name="progress_con_reimport">учвршћивање: поново увозим…</string>
   <!--action strings-->
+  <string name="hint_keyserver_search_hint">Име/Е-пошта/ИД кључа…</string>
+  <string name="hint_cloud_search_hint">Име/Е-пошта/Доказ/Кључ…</string>
   <!--key bit length selections-->
+  <string name="key_size_512">512</string>
+  <string name="key_size_768">768</string>
+  <string name="key_size_1024">1024</string>
+  <string name="key_size_1536">1536</string>
+  <string name="key_size_2048">2048</string>
+  <string name="key_size_3072">3072</string>
+  <string name="key_size_4096">4096</string>
+  <string name="key_size_8192">8192</string>
+  <string name="key_size_custom">Посебна</string>
+  <string name="key_size_custom_info">Укуцајте посебну дужину кључа (у битима):</string>
+  <string name="key_size_custom_info_rsa">Дужина РСА кључа мора бити између 1024 и 16384 и дељива са 8.</string>
+  <string name="key_size_custom_info_dsa">Дужина ДСА кључа мора бити између 512 и 1024 и дељива са 64.</string>
   <!--elliptic curve names-->
+  <string name="key_curve_nist_p256">НИСТ П-256</string>
+  <string name="key_curve_nist_p384">НИСТ П-384</string>
+  <string name="key_curve_nist_p521">НИСТ П-521</string>
   <!--not in for now, see SaveKeyringParcel
     <string name="key_curve_bp_p256">"Brainpool P-256"</string>
     <string name="key_curve_bp_p384">"Brainpool P-384"</string>
     <string name="key_curve_bp_p512">"Brainpool P-512"</string>-->
   <!--compression-->
+  <string name="compression_fast">брзо</string>
+  <string name="compression_very_slow">веома споро</string>
   <!--Help-->
+  <string name="help_tab_start">Старт</string>
+  <string name="help_tab_faq">Честа питања</string>
+  <string name="help_tab_wot">Веб поверења</string>
+  <string name="help_tab_nfc_beam">НФЦ Сноп</string>
+  <string name="help_tab_changelog">Дневник измена</string>
+  <string name="help_tab_about">О програму</string>
+  <string name="help_about_version">Издање:</string>
   <!--Import-->
+  <string name="import_tab_keyserver">Сервер кључева</string>
+  <string name="import_tab_cloud">Клауд претрага</string>
+  <string name="import_tab_direct">Фајл/клипборд</string>
+  <string name="import_tab_qr_code">QR ко̂д/НФЦ</string>
+  <string name="import_import">Увези изабране кључеве</string>
+  <string name="import_qr_code_wrong">QR ко̂д деформисан! Покушајте поново!</string>
+  <string name="import_qr_code_too_short_fingerprint">Отисак прста је прекратак (&lt; 16 знакова)</string>
+  <string name="import_qr_code_button">Скенирај QR ко̂д…</string>
   <!--Import result toast-->
+  <string name="view_log">Прикажи дневник</string>
+  <string name="import_error_nothing">Нема ништа за увоз.</string>
+  <string name="import_error_nothing_cancelled">Увоз је отказан.</string>
+  <string name="import_with_warnings">, са упозорењима</string>
+  <string name="import_with_cancelled">, док није отказано</string>
   <!--Intent labels-->
+  <string name="intent_decrypt_file">Дешифруј фајл помоћу OpenKeychain</string>
+  <string name="intent_import_key">Увези кључ у OpenKeychain</string>
+  <string name="intent_send_encrypt">Шифруј помоћу OpenKeychain</string>
+  <string name="intent_send_decrypt">Дешифруј помоћу OpenKeychain</string>
   <!--Remote API-->
+  <string name="api_no_apps">Нема регистрованих апликација!\n\nСписак подржаних апликација треће стране можете наћи у одељку „Помоћ“!</string>
+  <string name="api_settings_show_info">Прикажи напредне податке</string>
+  <string name="api_settings_hide_info">Сакриј напредне податке</string>
+  <string name="api_settings_show_advanced">Прикажи напредне поставке</string>
+  <string name="api_settings_hide_advanced">Сакриј напредне поставке</string>
+  <string name="api_settings_no_key">Није изабран кључ</string>
+  <string name="api_settings_select_key">Изаберите кључ</string>
+  <string name="api_settings_create_key">Направи нови кључ за овај налог</string>
+  <string name="api_settings_save">Сачувај</string>
+  <string name="api_settings_save_msg">Налог је сачуван</string>
+  <string name="api_settings_cancel">Одустани</string>
+  <string name="api_settings_revoke">Опозови приступ</string>
+  <string name="api_settings_start">Покрени апликацију</string>
+  <string name="api_settings_delete_account">Обриши налог</string>
+  <string name="api_settings_package_name">Име пакета</string>
+  <string name="api_settings_package_signature">СХА-256 потписа пакета</string>
+  <string name="api_settings_accounts">Налози</string>
+  <string name="api_settings_settings">Поставке</string>
+  <string name="api_settings_key">Кључ за налог:</string>
+  <string name="api_settings_accounts_empty">Нема налога придружених овој апликацији.</string>
+  <string name="api_create_account_text">Апликација захтева нови налог. Изаберите један ваш кључ или направите нови.\nАпликације су ограничене на коришћење кључева које одредите овде!</string>
+  <string name="api_update_account_text">Кључ одређен за овај налог је обрисан. Изаберите други!\nАпликације су ограничене на коришћење кључева које одредите овде!</string>
+  <string name="api_register_text">Приказана апликација жели да шифрује/дешифрује поруке и потпише их у ваше име.\nДа дозволим приступ?\n\nУПОЗОРЕЊЕ: Ако не знате зашто се овај екран појавио, одбијте приступ! Приступ можете опозвати и касније користећи екран „Апликације“.</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_missing_text">Нема кључева за ове идентитете:</string>
+  <string name="api_select_pub_keys_dublicates_text">Постоји више кључева за ове идентитете:</string>
+  <string name="api_select_pub_keys_text">Ревидирајте списак прималаца!</string>
+  <string name="api_select_pub_keys_text_no_user_ids">Изаберите примаоце!</string>
+  <string name="api_error_wrong_signature">Провера потписа није успела! Да ли сте инсталирали ову апликацију са другог извора? Ако сте сигурни да ово није напад, опозовите регистрацију ове апликације у OpenKeychain и региструјте је поново.</string>
   <!--Share-->
+  <string name="share_qr_code_dialog_title">Поделите QR ко̂дом</string>
+  <string name="share_nfc_dialog">Поделите преко НФЦ-а</string>
   <!--Key list-->
+  <string name="key_list_empty_text1">Још нема кључева…</string>
+  <string name="key_list_empty_text2">Почните тако што ћете</string>
+  <string name="key_list_empty_text3">или</string>
+  <string name="key_list_empty_button_create">направити сопствени кључ</string>
+  <string name="key_list_empty_button_import">увести постојећи.</string>
   <!--Key view-->
+  <string name="key_view_action_edit">Уреди кључ</string>
+  <string name="key_view_action_encrypt">Шифруј текст</string>
+  <string name="key_view_action_encrypt_files">фајлови</string>
+  <string name="key_view_action_certify">Овери идентитете</string>
+  <string name="key_view_action_update">Ажурирај са сервера кључева</string>
+  <string name="key_view_action_share_with">Подели са…</string>
+  <string name="key_view_action_share_nfc">Подели преко НФЦ</string>
+  <string name="key_view_action_upload">Отпреми на сервер кључева</string>
+  <string name="key_view_tab_main">Главни подаци</string>
+  <string name="key_view_tab_share">Подели</string>
+  <string name="key_view_tab_keys">Поткључеви</string>
+  <string name="key_view_tab_certs">Сертификати</string>
+  <string name="user_id_info_revoked_title">Опозван</string>
+  <string name="user_id_info_revoked_text">Власник кључа је опозвао овај идентитет. Више није исправан.</string>
+  <string name="user_id_info_verified_title">Оверен</string>
+  <string name="user_id_info_verified_text">Овај идентитет није оверен.</string>
+  <string name="user_id_info_not_verified_title">Није оверен</string>
+  <string name="user_id_info_not_verified_text">Овај идентитет још није оверен. Не можете бити сигурни да идентитет заиста одговара одређеној особи.</string>
+  <string name="user_id_info_invalid_title">Неисправан</string>
+  <string name="user_id_info_invalid_text">Нешто није у реду са овим идентитетом!</string>
   <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">Измени лозинку</string>
+  <string name="edit_key_action_add_identity">Додај идентитет</string>
+  <string name="edit_key_action_add_subkey">Додај поткључ</string>
+  <string name="edit_key_edit_user_id_title">Изаберите радњу!</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>Постави за примарни идентитет</item>
+    <item>Опозови идентитет</item>
+  </string-array>
+  <string-array name="edit_key_edit_user_id_revert_revocation">
+    <item>Поништи опозив</item>
+  </string-array>
+  <string name="edit_key_edit_user_id_revoked">Идентитет је опозван. Ово не може да се поништи.</string>
+  <string name="edit_key_edit_subkey_title">Изаберите радњу!</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Измени истек</item>
+    <item>Опозови поткључ</item>
+    <item>Оголи поткључ</item>
+  </string-array>
+  <string name="edit_key_new_subkey">нови поткључ</string>
+  <string name="edit_key_select_flag">Изаберите бар једну заставицу!</string>
+  <string name="edit_key_error_add_identity">Додајте бар један идентитет!</string>
+  <string name="edit_key_error_add_subkey">Додајте бар један поткључ!</string>
   <!--Create key-->
+  <string name="create_key_upload">Отпреми кључ на сервер кључева</string>
+  <string name="create_key_empty">Ово поље је обавезно</string>
+  <string name="create_key_passphrases_not_equal">Лозинке се не поклапају</string>
+  <string name="create_key_final_text">Унели сте следећи идентитет:</string>
+  <string name="create_key_final_robot_text">Прављење кључа може да потраје, попијте кафу у међувремену…</string>
+  <string name="create_key_rsa">(3 поткључа, РСА, 4096 бита)</string>
+  <string name="create_key_custom">(прилагођена конфигурација кључа)</string>
+  <string name="create_key_text">Унесите пуно име, адресу е-поште и укуцајте лозинку.</string>
+  <string name="create_key_hint_full_name">Пуно име, нпр. Петар Петровић</string>
+  <string name="create_key_edit">Промени конфигурацију кључа</string>
   <!--View key-->
+  <string name="view_key_revoked">Овај кључ је опозван!</string>
+  <string name="view_key_expired">Овај кључ је истекао!</string>
   <!--Navigation Drawer-->
+  <string name="nav_keys">Кључеви</string>
+  <string name="nav_encrypt_text">Шифруј текст</string>
+  <string name="nav_encrypt_files">Шифруј фајлове</string>
+  <string name="nav_decrypt">Дешифруј</string>
+  <string name="nav_apps">Апликације</string>
+  <string name="drawer_open">Отвори навигациону фиоку</string>
+  <string name="drawer_close">Затвори навигациону фиоку</string>
+  <string name="my_keys">Моји кључеви</string>
   <!--hints-->
+  <string name="encrypt_content_edit_text_hint">Укуцајте текст</string>
   <!--certs-->
+  <string name="cert_default">подразумеван</string>
+  <string name="cert_none">ништа</string>
+  <string name="cert_casual">неформалан</string>
+  <string name="cert_positive">позитиван</string>
+  <string name="cert_revoke">опозван</string>
+  <string name="cert_verify_ok">У реду</string>
+  <string name="cert_verify_failed">неуспех!</string>
+  <string name="cert_verify_error">грешка!</string>
+  <string name="cert_verify_unavailable">кључ није доступан</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <string name="msg_internal_error">Унутрашња грешка!</string>
+  <string name="msg_cancelled">Радња отказана.</string>
   <!--Import Public log entries-->
   <!--Import Secret log entries-->
   <!--Keyring Canonicalization log entries-->
   <!--Keyring merging log entries-->
+  <string name="msg_mg_error_secret_dummy">Нађен је нови јавни поткључ, али прављење лажног тајног кључа није подржано!</string>
+  <string name="msg_mg_error_heterogeneous">Покушај спајања привезака са различитим отисцима!</string>
+  <string name="msg_mg_error_encode">Кобна грешка кодирања потписа!</string>
+  <string name="msg_mg_public">Спајам у јавни привезак %s</string>
+  <string name="msg_mg_secret">Спајам у тајни привезак %s</string>
+  <string name="msg_mg_new_subkey">Додајем нови поткључ %s</string>
+  <string name="msg_mg_found_new">Пронађено %s нових сертификата у привеску</string>
+  <string name="msg_mg_unchanged">Нема нових сертификата</string>
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
   <!--Consolidate-->
   <!--Other messages used in OperationLogs-->
+  <string name="msg_ek_error_divert">Уређивање НФЦ кључева (још) није подржано!</string>
+  <string name="msg_ek_error_dummy">Не могу да уредим кључ са огољеним главним кључем!</string>
+  <string name="msg_ek_error_not_found">Кључ није нађен!</string>
   <!--Messages for DecryptVerify operation-->
   <!--Messages for SignEncrypt operation-->
   <!--PassphraseCache-->
+  <string name="passp_cache_notif_click_to_clear">Кликните да уклоните лозинке из кеша</string>
+  <string name="passp_cache_notif_n_keys">OpenKeychain је кеширао %d лозинки</string>
+  <string name="passp_cache_notif_keys">Кеширане лозинке:</string>
+  <string name="passp_cache_notif_clear">Очисти кеш</string>
+  <string name="passp_cache_notif_pwd">Лозинка</string>
   <!--unsorted-->
+  <string name="section_certifier_id">Сертификатор</string>
+  <string name="section_cert">Детаљи сертификата</string>
+  <string name="label_user_id">Идентитет</string>
+  <string name="unknown_uid">&lt;непознат&gt;</string>
+  <string name="empty_certs">Нема сертификата за овај кључ</string>
+  <string name="certs_text">Приказани су само потврђени само-сертификати и потврђени сертификати направљени вашим кључем.</string>
+  <string name="section_uids_to_certify">Идентитети за оверавање</string>
+  <string name="label_revocation">Разлог опозива</string>
+  <string name="label_verify_status">Стање овере</string>
+  <string name="label_cert_type">Тип</string>
+  <string name="error_key_not_found">Кључ није нађен!</string>
+  <string name="error_key_processing">Грешка обраде кључа!</string>
+  <string name="key_stripped">огољен</string>
+  <string name="key_divert">преусмери на картицу/НФЦ</string>
+  <string name="key_no_passphrase">нема лозинке</string>
+  <string name="key_unavailable">недоступан</string>
+  <string name="secret_cannot_multiple">Сопствене кључеве можете брисати само појединачно!</string>
+  <string name="title_view_cert">Прикажи детаље сертификата</string>
+  <string name="unknown_algorithm">непознат</string>
+  <string name="can_sign_not">не могу да потпишем</string>
+  <string name="error_no_encrypt_subkey">Поткључ за шифровање није доступан!</string>
+  <string name="info_no_manual_account_creation">Не прави OpenKeychain налоге ручно.\nПогледајте Помоћ за више информација.</string>
+  <string name="contact_show_key">Прикажи кључ (%s)</string>
+  <string name="swipe_to_update">Превуците прстом доле да ажурирате са сервера кључева</string>
+  <string name="error_no_file_selected">Изаберите бар један фајл за шифровање!</string>
+  <string name="error_multi_not_supported">Упис више фајлова није подржан. Ово је ограничење у текућем издању Андроида.</string>
   <!--First Time-->
+  <string name="first_time_text1">Преузмите вашу приватност уз помоћ OpenKeychain!</string>
+  <string name="first_time_create_key">Направи ми кључ</string>
+  <string name="first_time_import_key">Увези постојећи кључ</string>
+  <string name="first_time_skip">Прескочи поставку</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 73b0be282..b089ebd13 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -12,6 +12,7 @@
   <string name="title_add_subkey">Alt anahtar ekle</string>
   <string name="title_edit_key">Anahtarı düzenle</string>
   <string name="title_preferences">Seçenekler</string>
+  <string name="title_cloud_search_preferences">Bulut Arama Seçenekleri</string>
   <string name="title_api_registered_apps">Uygulamalar</string>
   <string name="title_key_server_preference">Anahtar Sunucusu Seçenekleri</string>
   <string name="title_change_passphrase">Parolayı Değiştir</string>
@@ -25,6 +26,8 @@
   <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_send_key">Anahtar Sunucusuna Yükle</string>
+  <string name="title_certify_key">Kimlikleri Tasdikle</string>
   <string name="title_key_details">Anahtar Detayları</string>
   <string name="title_help">Yardım</string>
   <string name="title_log_display">Günlük</string>
@@ -32,15 +35,21 @@
   <!--section-->
   <string name="section_user_ids">Kimlikler</string>
   <string name="section_keys">Alt anahtarlar</string>
+  <string name="section_cloud_search">Bulut araması</string>
   <string name="section_general">Genel</string>
   <string name="section_defaults">Varsayılanlar</string>
   <string name="section_advanced">Gelişmiş</string>
   <string name="section_actions">Eylemler</string>
   <string name="section_share_key">Bütün anahtar</string>
+  <string name="section_certification_key">Sertifikalama için kullanılan anahtarınız</string>
   <string name="section_upload_key">Anahtar Yükle</string>
   <string name="section_key_server">Anahtar Sunucusu</string>
   <string name="section_fingerprint">Parmakizi</string>
+  <string name="section_key_to_certify">Tasdiklenecek anahtar</string>
+  <string name="section_decrypt_files">Dosyalar</string>
+  <string name="section_decrypt_text">Metin</string>
   <!--button-->
+  <string name="btn_decrypt_verify_file">Dosyayı çözümle, doğrula ve kaydet</string>
   <string name="btn_decrypt_verify_message">Mesajı çözümle ve doğrula</string>
   <string name="btn_encrypt_file">Dosyayı şifrele ve kaydet</string>
   <string name="btn_encrypt_share_file">Dosyayı şifrele ve paylaş</string>
@@ -48,19 +57,27 @@
   <string name="btn_do_not_save">İptal</string>
   <string name="btn_delete">Sil</string>
   <string name="btn_okay">Tamam</string>
+  <string name="btn_export_to_server">Anahtar Sunucusuna Yükle</string>
   <string name="btn_next">İleri</string>
   <string name="btn_back">Geri</string>
   <string name="btn_lookup_key">Anahtarı ara</string>
   <string name="btn_share_encrypted_signed">Mesajı şifrele ve paylaş</string>
+  <string name="btn_view_cert_key">Sertifikalama anahtarını görüntüle</string>
   <string name="btn_create_key">Anahtar oluştur</string>
   <string name="btn_add_files">Dosya(ları) ekle</string>
+  <string name="btn_add_share_decrypted_text">Çözümlenmiş metni paylaş</string>
+  <string name="btn_decrypt_clipboard">Panodan çözümle</string>
+  <string name="btn_decrypt_and_verify">ve imzaları doğrula</string>
+  <string name="btn_decrypt_files">Dosyaları çözümle</string>
   <!--menu-->
   <string name="menu_preferences">Ayarlar</string>
   <string name="menu_help">Yardım</string>
   <string name="menu_export_key">Dosyaya ver</string>
   <string name="menu_delete_key">Anahtar sil</string>
   <string name="menu_create_key">Anahtarımı oluştur</string>
+  <string name="menu_import_existing_key">Varolan anahtarı al</string>
   <string name="menu_search">Ara</string>
+  <string name="menu_beam_preferences">Beam ayarları</string>
   <string name="menu_key_edit_cancel">İptal</string>
   <string name="menu_select_all">Hepsini seç</string>
   <string name="menu_add_keys">Anahtar ekle</string>
@@ -75,7 +92,10 @@
   <string name="label_passphrase">Parola</string>
   <string name="label_passphrase_again">Parolayı Tekrarla</string>
   <string name="label_algorithm">Algoritma</string>
+  <string name="label_write_version_header">Diğerlerinin OpenKeychain kullandığını bilmesine izin ver</string>
   <string name="label_use_default_yubikey_pin">Varsayılan Yubikey PIN\'i kullan</string>
+  <string name="label_asymmetric_from">İmzalayan:</string>
+  <string name="label_to">Buraya şifrele:</string>
   <string name="label_delete_after_encryption">Şifreleme sonrası dosyayı sil</string>
   <string name="label_delete_after_decryption">Çözümleme sonrası sil</string>
   <string name="label_encryption_algorithm">Şifreleme algoritması</string>
@@ -90,14 +110,28 @@
   <string name="label_expiry">Bitiş</string>
   <string name="label_usage">Kullanım</string>
   <string name="label_key_size">Anahtar Boyutu</string>
+  <string name="label_ecc_curve">Eliptik Eğri</string>
+  <string name="label_main_user_id">Birincil kimlik</string>
   <string name="label_name">İsim</string>
   <string name="label_comment">Yorum</string>
   <string name="label_email">Eposta</string>
+  <string name="label_send_key">Sertifikalamadan sonra anahtarı seçilen anahtar sunucusuna yükle</string>
   <string name="label_fingerprint">Parmakizi</string>
+  <string name="expiry_date_dialog_title">Son kullanma tarihini ayarla</string>
+  <string name="can_encrypt">şifreleyebilir</string>
+  <string name="can_sign">imzalayabilir</string>
+  <string name="can_certify">tasdikleyebilir</string>
+  <string name="can_certify_not">tasdikleyemez</string>
+  <string name="expired">tarihi geçmiş</string>
+  <string name="revoked">yürürlükten kaldırılmış</string>
   <plurals name="n_keys">
     <item quantity="one">1 anahtar</item>
     <item quantity="other">%d anahtar</item>
   </plurals>
+  <plurals name="n_keyservers">
+    <item quantity="one">%d anahtar sunucusu</item>
+    <item quantity="other">%d anahtar sunucusu</item>
+  </plurals>
   <string name="secret_key">Özel Anahtar:</string>
   <!--choice-->
   <string name="choice_none">Hiç</string>
@@ -123,6 +157,7 @@
   <string name="error">Hata</string>
   <string name="error_message">Hata: %s</string>
   <!--key flags-->
+  <string name="flag_certify">Tasdikle</string>
   <string name="flag_sign">İmzala</string>
   <string name="flag_encrypt">Şifrele</string>
   <string name="flag_authenticate">Yetkilendir</string>
@@ -142,23 +177,39 @@
   <string name="select_encryption_key">En az bir şifreleme anahtarı seçiniz.</string>
   <string name="select_encryption_or_signature_key">En az bir adet şifreleme anahtarı veya imza anahtarı seçiniz.</string>
   <string name="key_deletion_confirmation_multi">Seçilen tüm açık anahtarları silmek istiyor musunuz?\nBu işlemi geri alamazsınız!</string>
+  <string name="public_key_deletetion_confirmation">\'%s\' genel anahtarını gerçekten silmek istiyor musunuz?\nBu geri alınamaz!</string>
+  <string name="key_exported">1 anahtar başarıyla verildi.</string>
+  <string name="keys_exported">%d anahtar başarıyla verildi.</string>
+  <string name="no_keys_exported">Hiç anahtar verilmedi.</string>
+  <string name="key_creation_el_gamal_info">Not: sadece alt anahtarlar ElGamal destekler.</string>
   <string name="key_not_found">Anahtar %08X bulunamadı.</string>
   <string name="list_empty">Liste boş!</string>
+  <string name="nfc_successful">Anahtar NFC Beam ile başarıyla gönderildi!</string>
   <string name="key_copied_to_clipboard">Anahtar panoya kopyalandı!</string>
   <string name="fingerprint_copied_to_clipboard">Parmakizi panoya kopyalandı!</string>
+  <string name="key_too_big_for_sharing">Anatar bu yolla paylaşılamayacak kadar büyük!</string>
+  <string name="text_copied_to_clipboard">Metin panoya kopyalandı!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
+  <string name="error_file_delete_failed">\'%s\' silme başarısız</string>
   <string name="error_file_not_found">dosya bulunamadı</string>
+  <string name="error_external_storage_not_ready">harici depolama hazır değil</string>
   <string name="error_key_size_minimum512bit">anahtar uzunluğu en az 512bit olmalı</string>
+  <string name="error_unknown_algorithm_choice">bilinmeyen algoritma seçimi</string>
   <string name="error_user_id_no_email">eposta bulunamadı</string>
+  <string name="error_key_needs_a_user_id">en az bir kimlik gerekli</string>
   <string name="error_no_signature_passphrase">parola verilmedi</string>
   <string name="error_no_signature_key">imza anahtarı verilmedi</string>
   <string name="error_integrity_check_failed">Bütünlük kontrolü başarısız! Veri değiştirilmiş!</string>
   <string name="error_wrong_passphrase">yanlış parola</string>
   <!--errors without preceeding Error:-->
+  <string name="error_jelly_bean_needed">Android\'in NFC Beam özelliğini kullanabilmek için Android 4.1 kullanmalısınız!</string>
+  <string name="error_nfc_needed">Cihazınız NFC desteklemiyor!</string>
   <string name="error_nothing_import">Anahtar bulunamadı!</string>
+  <string name="error_searching_keys">Anahtarlar aranırken bir hata oluştu.</string>
   <string name="error_import_no_valid_keys">Dosya/Panoda geçerli anahtar bulunamadı!</string>
+  <string name="error_generic_report_bug">Genel bir hata oluştu. Lütfen OpenKeychain için bir hata raporu oluşturun.</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Geçersiz imza!</string>
   <string name="decrypt_result_signature_unknown_pub_key">Bilinmeyen açık anahtar</string>
@@ -174,12 +225,18 @@
   <string name="progress_exporting">veriyor...</string>
   <string name="progress_uploading">yükleniyor...</string>
   <string name="progress_building_key">anahtar oluşturuluyor...</string>
+  <string name="progress_generating_rsa">yeni RSA anahtarı oluşturuluyor...</string>
+  <string name="progress_generating_dsa">yeni DSA anahtarı oluşturuluyor...</string>
+  <string name="progress_generating_elgamal">yeni ElGamal anahtarı oluşturuluyor...</string>
+  <string name="progress_generating_ecdsa">yeni ECDSA anahtarı oluşturuluyor...</string>
+  <string name="progress_generating_ecdh">yeni ECDH anahtarı oluşturuluyor...</string>
   <string name="progress_modify_subkeyadd">alt anahtar ekleniyor...</string>
   <string name="progress_modify_passphrase">parola değiştiriliyor...</string>
   <plurals name="progress_exporting_key">
     <item quantity="one">anahtar veriliyor...</item>
     <item quantity="other">anahtarlar veriliyor...</item>
   </plurals>
+  <string name="progress_extracting_signature_key">imza anahtarı veriliyor...</string>
   <string name="progress_extracting_key">anahtarlar veriliyor...</string>
   <string name="progress_encrypting">veri şifreleniyor...</string>
   <string name="progress_decrypting">veri çözümleniyor...</string>
@@ -188,11 +245,14 @@
   <string name="progress_processing_signature">imza işleniyor...</string>
   <string name="progress_verifying_signature">imza doğrulanıyor...</string>
   <string name="progress_signing">imzalanıyor...</string>
+  <string name="progress_certifying">tasdikleniyor...</string>
   <string name="progress_reading_data">veri okunuyor...</string>
   <string name="progress_finding_key">anahtar bulunuyor...</string>
   <string name="progress_verifying_integrity">bütünlük doğrulanıyor...</string>
   <string name="progress_deleting">anahtarlar siliniyor...</string>
   <!--action strings-->
+  <string name="hint_keyserver_search_hint">İsim/E-Posta/Anahtar Kimliği...</string>
+  <string name="hint_cloud_search_hint">İsim/E-Posta/Kanıt/Anahtar...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -204,6 +264,9 @@
   <string name="key_size_8192">8192</string>
   <string name="key_size_custom">Özel anahtar boyutu</string>
   <!--elliptic curve names-->
+  <string name="key_curve_nist_p256">NIST P-256</string>
+  <string name="key_curve_nist_p384">NIST P-384</string>
+  <string name="key_curve_nist_p521">NIST P-521</string>
   <!--not in for now, see SaveKeyringParcel
     <string name="key_curve_bp_p256">"Brainpool P-256"</string>
     <string name="key_curve_bp_p384">"Brainpool P-384"</string>
@@ -214,16 +277,31 @@
   <!--Help-->
   <string name="help_tab_start">Başla</string>
   <string name="help_tab_faq">SSS</string>
+  <string name="help_tab_wot">Web of Trust</string>
+  <string name="help_tab_nfc_beam">NFC Beam</string>
   <string name="help_tab_about">Hakkında</string>
   <string name="help_about_version">Sürüm:</string>
   <!--Import-->
+  <string name="import_tab_keyserver">Anahtar Sunucusu</string>
   <string name="import_tab_direct">Dosya/Pano</string>
+  <string name="import_tab_qr_code">QR Kod/NFC</string>
   <string name="import_import">Seçili anahtarları al</string>
   <string name="import_qr_code_button">QR Kod Tara</string>
   <!--Import result toast-->
+  <plurals name="import_keys_added_and_updated_1">
+    <item quantity="one">Anahtar başarıyla alındı</item>
+    <item quantity="other">%1$d anahtar başarıyla alındı</item>
+  </plurals>
+  <plurals name="import_keys_with_errors">
+    <item quantity="one">Bir anahtar için alma başarısız.</item>
+    <item quantity="other">%d anahtar için alma başarısız!</item>
+  </plurals>
   <string name="view_log">Günlüğü Görüntüle</string>
+  <string name="import_error_nothing">Alınacak bir şey yok.</string>
+  <string name="import_error_nothing_cancelled">Alma iptal edildi.</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">OpenKeychain ile Dosya Çözümle</string>
+  <string name="intent_import_key">OpenKeychain ile Anahtar Al</string>
   <string name="intent_send_encrypt">OpenKeychain ile Şifrele</string>
   <string name="intent_send_decrypt">OpenKeychain ile Çözümle</string>
   <!--Remote API-->
@@ -235,6 +313,7 @@
   <string name="api_settings_select_key">Anahtar seç</string>
   <string name="api_settings_create_key">Bu hesap için yeni anahtar oluştur</string>
   <string name="api_settings_save">Kaydet</string>
+  <string name="api_settings_save_msg">Hesap kaydedildi</string>
   <string name="api_settings_cancel">İptal</string>
   <string name="api_settings_start">Uygulamayı başlat</string>
   <string name="api_settings_delete_account">Hesabı sil</string>
@@ -245,6 +324,9 @@
   <string name="api_register_allow">Erişime izin ver</string>
   <string name="api_register_disallow">Erişime izin verme</string>
   <string name="api_register_error_select_key">Lütfen bir anahtar seçin!</string>
+  <string name="api_select_pub_keys_missing_text">Bu kimlikler için anahtar bulunamadı:</string>
+  <string name="api_select_pub_keys_dublicates_text">Bu kimlikler için birden fazla anahtar var:</string>
+  <string name="api_select_pub_keys_text">Lütfen alıcıların listesini gözden geçirin!</string>
   <string name="api_select_pub_keys_text_no_user_ids">Lütfen alıcıları seçin!</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">QR Kod ile Paylaş</string>
@@ -255,28 +337,47 @@
     <item quantity="other">%d anahtar seçildi.</item>
   </plurals>
   <string name="key_list_empty_text3">ya da</string>
+  <string name="key_list_empty_button_import">varolan bir anahtar alınıyor.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Anahtarı düzenle</string>
   <string name="key_view_action_encrypt">Metni şifrele</string>
   <string name="key_view_action_encrypt_files">dosyalar</string>
+  <string name="key_view_action_certify">Kimlikleri Tasdikle</string>
+  <string name="key_view_action_update">Anahtar sunucusundan güncelle</string>
   <string name="key_view_action_share_with">Şu şekilde paylaş...</string>
   <string name="key_view_action_share_nfc">NFC üzerinden Paylaş</string>
+  <string name="key_view_action_upload">Anahtar sunucusuna yükle</string>
   <string name="key_view_tab_main">Ana Bilgi</string>
   <string name="key_view_tab_share">Paylaş</string>
   <string name="key_view_tab_keys">Alt anahtarlar</string>
   <string name="key_view_tab_certs">Sertifikalar</string>
+  <string name="user_id_info_verified_title">Doğrulanmış</string>
+  <string name="user_id_info_verified_text">Kimlik doğrulandı.</string>
+  <string name="user_id_info_not_verified_title">Doğrulanmamış</string>
+  <string name="user_id_info_not_verified_text">Bu kimlik henüz doğrulanmadı. Bu kimliğin belirli bir kişiye ait olduğundan emin olamazsınız.</string>
+  <string name="user_id_info_invalid_title">Geçersiz</string>
+  <string name="user_id_info_invalid_text">Bu kimlikle ilgili yanlış olan bazı şeyler var!</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Parolayı Değiştir</string>
   <string name="edit_key_action_add_identity">Kimlik Ekle</string>
   <string name="edit_key_action_add_subkey">Alt anahtar Ekle</string>
   <string name="edit_key_edit_user_id_title">Bir eylem seç!</string>
   <string name="edit_key_edit_subkey_title">Bir eylem seç!</string>
+  <string name="edit_key_new_subkey">yeni alt anahtar</string>
   <string name="edit_key_select_flag">Lütfen en az bir bayrak seçiniz!</string>
+  <string name="edit_key_error_add_identity">En az bir kimlik ekleyin!</string>
+  <string name="edit_key_error_add_subkey">En az bir alt anahtar ekleyin!</string>
   <!--Create key-->
+  <string name="create_key_upload">Anahtarı anahtar sunucusuna yükle</string>
   <string name="create_key_empty">Bu alan zorunludur</string>
   <string name="create_key_passphrases_not_equal">Parolalar eşleşmedi</string>
+  <string name="create_key_final_text">Şu kimliği girdiniz:</string>
+  <string name="create_key_final_robot_text">Anahtar oluşturma biraz zaman alabilir, bu sırada bir çay için...</string>
+  <string name="create_key_rsa">(3 alt anahtar, RSA, 4096 bit)</string>
+  <string name="create_key_text">Tam isminizi, e-posta adresinizi girin ve bir parola seçin.</string>
   <string name="create_key_hint_full_name">Tam Ad, örneğin: Max Mustermann</string>
   <!--View key-->
+  <string name="view_key_expired">Bu anahtarın son kullanma tarihi geçmiş!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Anahtarlar</string>
   <string name="nav_encrypt_text">Metni şifrele</string>
@@ -295,6 +396,9 @@
   <string name="cert_verify_unavailable">anahtar mevcut değil</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
   <!--Import Public log entries-->
+  <string name="msg_ip_delete_old_ok">Eski anahtarları veritabanından sil</string>
+  <string name="msg_ip_prepare">Veritabanı işlemleri hazırlanıyor</string>
+  <string name="msg_ip_master">Ana anahtar %s işleniyor</string>
   <!--Import Secret log entries-->
   <string name="msg_is_db_exception">Veritabanı hatası!</string>
   <!--Keyring Canonicalization log entries-->
@@ -302,7 +406,9 @@
   <string name="msg_kc_sub">Alt anahtar %s işleniyor</string>
   <string name="msg_kc_sub_bad_type">Bilinmeyen alt anahtar sertifika tipi: %s</string>
   <!--Keyring merging log entries-->
+  <string name="msg_mg_unchanged">Yeni sertifika yok</string>
   <!--createSecretKeyRing-->
+  <string name="msg_cr">Yeni ana anahtar oluşturuluyor</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mf_subkey_new_id">Yeni alt anahtar ID: %s</string>
   <!--Consolidate-->
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 3431cd7a9..a68728ec7 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -3,11 +3,20 @@
   <!--GENERAL: Please put all strings inside quotes as described in example 1 on
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <!--title-->
+  <string name="title_select_secret_key">选择私钥</string>
+  <string name="title_encrypt_text">加密文本</string>
+  <string name="title_encrypt_files">加密文件</string>
   <string name="title_decrypt">解密</string>
-  <string name="title_authentication">密码短语</string>
+  <string name="title_authentication">密码</string>
   <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_passphrase">变更密码</string>
+  <string name="title_share_fingerprint_with">分享签名</string>
+  <string name="title_share_key">分享密钥</string>
+  <string name="title_share_file">分享文件</string>
+  <string name="title_share_message">分享信息</string>
   <string name="title_encrypt_to_file">加密至文件</string>
   <string name="title_decrypt_to_file">解密至文件</string>
   <string name="title_import_keys">导入密钥</string>
@@ -15,34 +24,89 @@
   <string name="title_export_keys">导出密钥</string>
   <string name="title_key_not_found">无法找到密钥</string>
   <string name="title_send_key">上传到密钥服务器</string>
+  <string name="title_certify_key">验证密钥</string>
+  <string name="title_key_details">密钥详情</string>
   <string name="title_help">帮助</string>
+  <string name="title_create_key">创建密钥</string>
   <!--section-->
+  <string name="section_user_ids">用户名</string>
+  <string name="section_keys">密钥</string>
+  <string name="section_cloud_search">在线搜索</string>
   <string name="section_general">常规</string>
   <string name="section_defaults">缺省</string>
   <string name="section_advanced">高级</string>
+  <string name="section_share_key">分享密钥</string>
+  <string name="section_certification_key">签署密钥</string>
+  <string name="section_upload_key">上传密钥</string>
   <string name="section_key_server">密钥服务器</string>
+  <string name="section_fingerprint">签名</string>
+  <string name="section_decrypt_files">解密文件</string>
+  <string name="section_decrypt_text">解密文本</string>
   <!--button-->
+  <string name="btn_decrypt_verify_file">解密并验证文件</string>
+  <string name="btn_decrypt_verify_message">解密并验证信息</string>
+  <string name="btn_encrypt_file">加密文件</string>
+  <string name="btn_encrypt_share_file">加密并分享文件</string>
   <string name="btn_save">保存</string>
   <string name="btn_do_not_save">取消</string>
   <string name="btn_delete">删除</string>
+  <string name="btn_no_date">没有日期</string>
+  <string name="btn_okay">确实</string>
+  <string name="btn_export_to_server">导出到服务器</string>
+  <string name="btn_next">下一步</string>
+  <string name="btn_back">返回</string>
+  <string name="btn_view_cert_key">显示密钥</string>
+  <string name="btn_create_key">创建密钥</string>
+  <string name="btn_add_files">添加密钥</string>
+  <string name="btn_add_share_decrypted_text">添加并分享加密后的文本</string>
+  <string name="btn_decrypt_clipboard">从剪贴板复制并解密</string>
+  <string name="btn_decrypt_and_verify">解密并验证</string>
+  <string name="btn_decrypt_files">解密文件</string>
   <!--menu-->
+  <string name="menu_preferences">参数设置</string>
   <string name="menu_help">帮助</string>
+  <string name="menu_export_key">导出密钥</string>
   <string name="menu_delete_key">删除密钥</string>
+  <string name="menu_create_key">创建密钥</string>
+  <string name="menu_import_existing_key">导入密钥</string>
   <string name="menu_search">搜索</string>
+  <string name="menu_beam_preferences">参数</string>
   <string name="menu_key_edit_cancel">取消</string>
   <string name="menu_encrypt_to">加密到...</string>
+  <string name="menu_select_all">选择全部</string>
+  <string name="menu_add_keys">添加密钥</string>
+  <string name="menu_export_all_keys">导出全部密钥</string>
+  <string name="menu_advanced">高级</string>
   <!--label-->
   <string name="label_message">讯息</string>
   <string name="label_file">文件</string>
-  <string name="label_no_passphrase">没有密语</string>
-  <string name="label_passphrase">密语</string>
+  <string name="label_files">多个文件</string>
+  <string name="label_no_passphrase">没有密码</string>
+  <string name="label_passphrase">密码</string>
+  <string name="label_passphrase_again">确认密码</string>
   <string name="label_algorithm">算法</string>
+  <string name="label_write_version_header">写入文件头信息</string>
+  <string name="label_delete_after_encryption">加密后删除原文件</string>
+  <string name="label_main_user_id">用户名</string>
+  <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="expiry_date_dialog_title">有效期</string>
+  <string name="label_first_keyserver_is_used">首选服务器</string>
   <string name="can_encrypt">可以加密</string>
   <string name="can_sign">可以签署</string>
+  <string name="can_certify">可以验证</string>
   <string name="expired">过期了</string>
+  <string name="revoked">已被废弃</string>
+  <plurals name="n_keys">
+    <item quantity="other">其他</item>
+  </plurals>
+  <plurals name="n_keyservers">
+    <item quantity="other">其他</item>
+  </plurals>
+  <string name="secret_key">私钥</string>
   <!--choice-->
   <string name="choice_none">没有</string>
   <string name="choice_15secs">15秒</string>
@@ -62,26 +126,48 @@
   <string name="error">错误</string>
   <!--key flags-->
   <!--sentences-->
+  <string name="wrong_passphrase">密码错误</string>
   <string name="no_filemanager_installed">安装了不匹配的文件管理器</string>
-  <string name="passphrases_do_not_match">密钥不匹配</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="passphrase_for">密码</string>
   <string name="file_delete_successful">删除成功</string>
   <string name="no_file_selected">先选择一个文件</string>
+  <string name="encrypt_sign_successful">加密并签名成功</string>
+  <string name="encrypt_sign_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="public_key_deletetion_confirmation">确认删除公钥</string>
+  <string name="also_export_secret_keys">同时导出密钥</string>
   <string name="key_exported">成功地导出了1个密钥</string>
+  <string name="keys_exported">成功导出多个密钥</string>
   <string name="no_keys_exported">没有密钥被导出</string>
+  <string name="key_not_found">没有找到密钥</string>
+  <plurals name="bad_keys_encountered">
+    <item quantity="other">其他</item>
+  </plurals>
   <string name="list_empty">这个列表是空的！</string>
+  <string name="nfc_successful">NFC成功</string>
+  <string name="key_copied_to_clipboard">复制密钥到剪贴板</string>
+  <string name="fingerprint_copied_to_clipboard">复制签名到剪贴板</string>
+  <string name="select_key_to_certify">选择验证密钥</string>
+  <string name="key_too_big_for_sharing">密钥太长</string>
+  <string name="text_copied_to_clipboard">复制文本到剪贴板</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
+  <string name="error_file_delete_failed">文件删除失败</string>
   <string name="error_file_not_found">没有找到文件</string>
+  <string name="error_no_secret_key_found">没有找到私钥</string>
   <string name="error_external_storage_not_ready">外置存储没有准备好</string>
   <string name="error_key_size_minimum512bit">密钥的大小必须至少512位</string>
   <string name="error_unknown_algorithm_choice">位置的算法选择</string>
-  <string name="error_no_signature_passphrase">没有提供密语</string>
-  <string name="error_no_signature_key">没有提供密钥</string>
+  <string name="error_user_id_no_email">缺少电子邮件</string>
+  <string name="error_no_signature_passphrase">没有提供密码</string>
+  <string name="error_no_signature_key">没有提供签名密钥</string>
+  <string name="error_integrity_check_failed">检查失败</string>
   <string name="error_wrong_passphrase">错误的密语</string>
   <!--errors without preceeding Error:-->
   <!--results shown after decryption/verification-->
-- 
cgit v1.2.3