diff --git a/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
index bd47c1cef..e335b8535 100644
--- a/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html
index 0e60c17a7..6c60c1778 100644
--- a/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
index b3906cb20..3692d05be 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-de/help_start.html b/OpenKeychain/src/main/res/raw-de/help_start.html
index 7a652682e..f21fc2141 100644
--- a/OpenKeychain/src/main/res/raw-de/help_start.html
+++ b/OpenKeychain/src/main/res/raw-de/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Los gehts</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-el/help_changelog.html b/OpenKeychain/src/main/res/raw-el/help_changelog.html
index bd47c1cef..e335b8535 100644
--- a/OpenKeychain/src/main/res/raw-el/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-el/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-el/help_start.html b/OpenKeychain/src/main/res/raw-el/help_start.html
index 0e60c17a7..6c60c1778 100644
--- a/OpenKeychain/src/main/res/raw-el/help_start.html
+++ b/OpenKeychain/src/main/res/raw-el/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html
index 6b7b7d975..41b9f1701 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-es/help_start.html b/OpenKeychain/src/main/res/raw-es/help_start.html
index d56399ef0..5ba0b9cb3 100644
--- a/OpenKeychain/src/main/res/raw-es/help_start.html
+++ b/OpenKeychain/src/main/res/raw-es/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Primeros pasos</h2>
-<p>Primero necesitas un par de claves personales. Crea una a través de las opciones del menú "Contactos" o importa un par de claves ya existentes a través de "Importar claves". Después, puedes descargar las claves de tus amigos o intercambiarlas a través de códigos QR o NFC.</p>
+<p>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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html
index bd47c1cef..e335b8535 100644
--- a/OpenKeychain/src/main/res/raw-et/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-et/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-et/help_start.html b/OpenKeychain/src/main/res/raw-et/help_start.html
index 0e60c17a7..6c60c1778 100644
--- a/OpenKeychain/src/main/res/raw-et/help_start.html
+++ b/OpenKeychain/src/main/res/raw-et/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
index bd47c1cef..e335b8535 100644
--- a/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html
index 93a305796..bf15b21f0 100644
--- a/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>شروع کار</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.html b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
index b682e3ff7..fdccca887 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>certifications des clefs (merci à Vincent Breitmoser)</li>
+<li>prends en charge les clefs secrètes partielles de GnuPG (merci à Vincent Breitmoser)</li>
 <li>nouvelle conception de la vérification des signatures</li>
 <li>longueur de clef personnalisée (merci à Greg Witczak)</li>
 <li>correction de la fonctionnalité partagée avec d'autres applis</li>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_start.html b/OpenKeychain/src/main/res/raw-fr/help_start.html
index ddaac44b1..5b8a062ba 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Commencer</h2>
-<p>Il vous faut d'abord une paire de clefs personnelles. Créez-en une avec le menu des options dans « Contacts » ou importez des paires de clefs existantes avec « Importer des clefs ». Ensuite vous pouvez télécharger les clefs de vos amis, ou les échanger par codes QR ou NFC.</p>
+<p>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>Il vous est recommendé d'installer le <a href="market://details?id=org.openintents.filemanager">gestionnaire de fichiers OI</a> pour sa fonction améliorée de séléction des fichiers et le <a href="market://details?id=com.google.zxing.client.android">lecteur de codes à barres</a> pour balayer les codes QR générés. Cliquer sur les liens ouvrira Google Play Store ou F-Droid pour l'installation.</p>
 
diff --git a/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html b/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
index bb65dc091..aaf94749f 100644
--- a/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-it-rIT/help_start.html b/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
index 0fd24178c..b3dbb5473 100644
--- a/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Per iniziare</h2>
-<p>In primo luogo è necessario una coppia di chiavi personale. Creane una tramite l'opzione nel menu "Contatti" o importando coppie di chiavi esistenti tramite "Importa Chiavi". Successivamente, è possibile scaricare le chiavi dei vostri amici o scambiarle con i codici QR o NFC.</p>
+<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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
index 45e0a4e95..a4867835f 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
@@ -3,10 +3,11 @@
 <body>
 <h2>2.6</h2>
 <ul>
-<li>key certifications (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>鍵証明 (thanks to Vincent Breitmoser)</li>
+<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>新しいデザインでの署名の検証</li>
+<li>カスタムの鍵長 (thanks to Greg Witczak)</li>
+<li>他のアプリからの共有ファンクションの修正</li>
 </ul>
 <h2>2.5</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_start.html b/OpenKeychain/src/main/res/raw-ja/help_start.html
index 04ad31352..13154ce47 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>入門</h2>
-<p>最初にあなたの個人用鍵ペアが必要になります。オプションメニューの"連絡先"で生成するか、"鍵のインポート"から既存の鍵ペアをインポートします。その後、あなたの友人の鍵をダウンロード、もしくはQRコードやNFCで交換します。</p>
+<p>最初にあなたの個人用秘密鍵が必要になります。オプションメニューの"鍵"で生成するか、既存の秘密鍵をインポートします。その後、あなたの友人の鍵をダウンロード、もしくはQRコードや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>
 
diff --git a/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
index bd47c1cef..e335b8535 100644
--- a/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html
index 0e60c17a7..6c60c1778 100644
--- a/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
index 98b903355..baca16fc5 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_start.html b/OpenKeychain/src/main/res/raw-pl/help_start.html
index e88a1ad6d..de157b232 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Pierwsze kroki</h2>
-<p>Po pierwsze potrzebujesz swoją osobistą parę kluczy. Stwórz ją, korzystając z odpowiedniej opcji w sekcji "Kontakty" albo zainportuj istniejącą parę korzystając z sekcji "Inportuj klucze". Następnie możesz porać klucze Twoich znajomych lub wymieniać się z nimi za pośrednictwem kodów QR lub technologii NFC.</p>
+<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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
index f728e3d74..b19affb4d 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_start.html b/OpenKeychain/src/main/res/raw-ru/help_start.html
index 78db598ec..b73fff2d9 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Приступая</h2>
-<p>Для начала вам понадобится своя пара ключей. Создайте её через меню раздела "Контакты" или импортируйте ранее созданный секретный ключ через меню "Импорт ключей". После этого вы сможете скачать ключи ваших друзей или обменяться ключами посредством QR кодов или NFC.</p>
+<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>Рекомендуется установить <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>
 
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.html b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
index bd47c1cef..e335b8535 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_start.html b/OpenKeychain/src/main/res/raw-tr/help_start.html
index 0e60c17a7..6c60c1778 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>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>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>
 
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
index 0c23a2094..e7ac04d97 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>сертифікації ключів (завдяки Вінсенту Бреймозеру)</li>
+<li>support GnuPG partial secret keys (thanks to Vincent Breitmoser)</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 45a3edb6a..a3c112bd1 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_start.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Приступаючи до роботи</h2>
-<p>Спершу вам потрібна персональна в'язка ключів. Створіть одну через меню параметрів у "Контактах" або імпортуйте наявні в'язки ключів через "Імпорт ключів". Після цього ви зможете завантажувати ключі ваших друзів чи обміняти їх через штрих-коди або NFC.</p>
+<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>Рекомендуємо вам встановити <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>
 
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index bd47c1cef..e335b8535 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
@@ -4,6 +4,7 @@
 <h2>2.6</h2>
 <ul>
 <li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support 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>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_start.html b/OpenKeychain/src/main/res/raw-zh/help_start.html
index 22ac99882..52a8b6f7c 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_start.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>快速上手</h2>
-<p>First you need a personal key pair. Create one via the option menus in "Contacts" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>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>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>
 
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 4be92a88f..c38647b87 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -73,7 +73,7 @@
   <string name="menu_import_from_file">Importer depuis un fichier</string>
   <string name="menu_import_from_qr_code">Importer depuis un code QR</string>
   <string name="menu_import">Importer</string>
-  <string name="menu_import_from_nfc">Importer avec NFC</string>
+  <string name="menu_import_from_nfc">Importer avec la NFC</string>
   <string name="menu_export_key">Exporter vers un fichier</string>
   <string name="menu_delete_key">Supprimer la clef</string>
   <string name="menu_create_key">Créer une clef</string>
@@ -206,7 +206,7 @@
   <string name="specify_file_to_export_to">Veuillez spécifier vers quel fichier exporter.\nAVERTISSEMENT ! Le fichier sera écrasé s\'il existe.</string>
   <string name="specify_file_to_export_secret_keys_to">Veuillez spécifier vers quel fichier exporter.\nAVERTISSEMENT ! Vous allez exporter les clefs SECRÈTES.\nAVERTISSEMENT ! Le fichier sera écrasé s\'il existe.</string>
   <string name="key_deletion_confirmation">Voulez-vous vraiment supprimer la clef %s ?\nVous ne pourrez pas la restituer !</string>
-  <string name="key_deletion_confirmation_multi">Voulez-vous vraiment supprimer toutes les clefs choisies (incluant les clefs secrètes) ?\nCeci est irréversible !</string>
+  <string name="key_deletion_confirmation_multi">Voulez-vous vraiment supprimer toutes les clefs publiques choisies ?\nCeci est irréversible !</string>
   <string name="secret_key_deletion_confirmation">Voulez-vous vraiment supprimer la clef SECRÈTE %s ?\nVous ne pourrez pas la restituer !</string>
   <string name="ask_save_changed_key">Vous avez apporté des changements au trousseau, voulez-vous l\'enregistrer ?</string>
   <string name="ask_empty_id_ok">Vous avez ajouté un ID utilisateur vide, êtes-vous certain de vouloir continuer?</string>
@@ -286,7 +286,7 @@
   <!--errors without preceeding Error:-->
   <string name="error_only_files_are_supported">Les données binaires directes sans fichier dans le système de fichiers ne sont pas prises en charge. C\'est uniquement pris en charge par ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
   <string name="error_jelly_bean_needed">Vous devez avoir Android 4.1 Jelly Bean pour utiliser la fonction NFC Beam !</string>
-  <string name="error_nfc_needed">NFC n\'est pas disponible sur votre appareil !</string>
+  <string name="error_nfc_needed">La NFC n\'est pas disponible sur votre appareil !</string>
   <string name="error_nothing_import">Rien à importer !</string>
   <string name="error_keyserver_insufficient_query">Requête serveur insuffisante</string>
   <string name="error_keyserver_query">Échec lors de l\'interrogation du serveur de clefs</string>
@@ -387,7 +387,7 @@
   <string name="import_qr_code_finished">Balayage de code QR terminé !</string>
   <string name="import_qr_code_too_short_fingerprint">L\'empreinte est trop courte (&lt; 16 caractères)</string>
   <string name="import_qr_scan_button">Numériser le code QR avec le lecteur de code-barres</string>
-  <string name="import_nfc_text">Pour recevoir des clefs par NFC, les appareils doivent être déverrouillés.</string>
+  <string name="import_nfc_text">Pour recevoir des clefs par la NFC, les appareils doivent être déverrouillés.</string>
   <string name="import_nfc_help_button">Aide</string>
   <string name="import_clipboard_button">Obtenir la clef depuis le presse-papiers</string>
   <!--Intent labels-->
@@ -491,4 +491,8 @@
   <string name="can_certify_not">ne peut pas certifier</string>
   <string name="error_key_not_found">Clef introuvable !</string>
   <string name="error_key_processing">Erreur lors du traitement de la clef !</string>
+  <string name="no_subkey">sous-clef non disponible</string>
+  <string name="key_stripped">dépouillée</string>
+  <string name="secret_cannot_multiple">Les clefs secrètes ne peuvent être supprimées qu\'individuellement !</string>
+  <string name="title_view_cert">Voir les détails du certificat</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index 0c25f3eb3..9af6f6ea4 100644
--- a/OpenKeychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
@@ -204,7 +204,6 @@
   <string name="specify_file_to_export_to">Perfavore specifica su quale file esportare.\nATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
   <string name="specify_file_to_export_secret_keys_to">Perfavore specifica quale file esportare.\nATTENZIONE: Stai esportanto chiavi PRIVATE.\nATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
   <string name="key_deletion_confirmation">Vuoi veramente eliminare la chiave \'%s\'?\nNon potrai annullare!</string>
-  <string name="key_deletion_confirmation_multi">Vuoi veramente eliminare le chiavi selezionate (incluse quelle segrete)?\nNon potrai annullare!</string>
   <string name="secret_key_deletion_confirmation">Vuoi veramente eliminare la chiave PRIVATA \'%s\'?\nNon potrai annullare!</string>
   <string name="ask_save_changed_key">Hai apportato modifiche al tuo portachiavi, vuoi salvarlo?</string>
   <string name="ask_empty_id_ok">È stato aggiunto un ID utente vuoto, sei sicuro di voler continuare?</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index f7d8c7205..a62b5fe0a 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -203,7 +203,6 @@
   <string name="specify_file_to_export_to">どのファイルをエクスポートするか決めてください。\n注意: 既存のファイルがあると上書きされます。</string>
   <string name="specify_file_to_export_secret_keys_to">どのファイルをエクスポートするか決めてください。\n注意: 秘密鍵をエクスポートしています。\n注意: 既存のファイルがあると上書きされます。</string>
   <string name="key_deletion_confirmation">鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
-  <string name="key_deletion_confirmation_multi">選択した鍵(秘密鍵を含みます)を本当に削除してもよいですか?\nこれは元に戻せません!</string>
   <string name="secret_key_deletion_confirmation">秘密鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
   <string name="ask_save_changed_key">あなたは鍵輪に変更を加えました、これを保存しますか?</string>
   <string name="ask_empty_id_ok">あなたは空のユーザーIDを追加しました、このまま続けますか?</string>
@@ -292,6 +291,14 @@
   </plurals>
   <string name="error_change_something_first">あなたは鍵輪を保存する前に変更を加えなくてはなりません</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>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index d709c1abd..a6adbce20 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -207,7 +207,6 @@
   <string name="specify_file_to_export_to">Wskaż, do którego pliku wyeksportować dane.\nOSTRZEŻENIE: Plik zostanie nadpisany, jeżeli istnieje.</string>
   <string name="specify_file_to_export_secret_keys_to">Wskaż, do którego pliku zapisać eksportowane dane.\nOSTRZEŻENIE: Masz zamiar zapisać klucze PRYWATNE (tajne)\nOSTRZEŻENIE: Plik zostanie nadpisany, jeżeli istnieje.</string>
   <string name="key_deletion_confirmation">Czy na pewno chcesz usunąć klucz \'%s\'?\nNie można cofnąć tej operacji!</string>
-  <string name="key_deletion_confirmation_multi">Czy na pewno chcesz usunąć wszystkie zaznaczone klucze (włączając klucze prywatne)?\nTej operacji nie można cofnąć!</string>
   <string name="secret_key_deletion_confirmation">Czy na pewno chcesz usunąć klucz prywatny \'%s\'?\nNie można cofnąć tej operacji!</string>
   <string name="ask_save_changed_key">Zostały dokonane zmiany w pęku kluczy, czy chcesz je zachować?</string>
   <string name="ask_empty_id_ok">Dodałeś pusty identyfikator użytkownika, czy na pewno chcesz kontynuować?</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 49f70a16e..d607eb22b 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -209,7 +209,7 @@
   <string name="specify_file_to_export_to">Будь ласка, виберіть файл для експорту.\nУВАГА! Якщо файл існує, то він буде переписаний.</string>
   <string name="specify_file_to_export_secret_keys_to">Будь ласка, виберіть файл для експорту.\nУВАГА: Ви експортуєте СЕКРЕТНИЙ ключ.\nУВАГА: Якщо файл існує, то він буде переписаний.</string>
   <string name="key_deletion_confirmation">Ви справді хочете вилучити ключ \'%s\'?\nВи не зможете це відмінити!</string>
-  <string name="key_deletion_confirmation_multi">Ви справді хочете вилучити усі вибрані ключі (включаючи секретні)?\nВи не зможете це відмінити!</string>
+  <string name="key_deletion_confirmation_multi">Ви справді хочете вилучити усі вибрані відкриті ключі?\nВи не зможете це відмінити!</string>
   <string name="secret_key_deletion_confirmation">Ви справді хочете вилучити секретний ключ \'%s\'?\nВи не зможете це відмінити!</string>
   <string name="ask_save_changed_key">Ви внесли зміни до в\'язки ключів, ви б хотіли. Волієте їх зберегти?</string>
   <string name="ask_empty_id_ok">Ви вже додали порожній ідентифікатор користувача. Справді хочете продовжити?</string>
@@ -506,4 +506,7 @@
   <string name="can_certify_not">не можна сертифікувати</string>
   <string name="error_key_not_found">Ключ не знайдено!</string>
   <string name="error_key_processing">Помилка опрацювання ключа!</string>
+  <string name="no_subkey">підключ недоступний</string>
+  <string name="secret_cannot_multiple">Секретні ключі можна вилучити лише окремо!</string>
+  <string name="title_view_cert">Переглянути дані сертифікату</string>
 </resources>
