Use markdown for in-app help

83 files changed, 524 insertions, 7652 deletions

diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 97c8a6d5e..b5e9f7049 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -20,6 +20,7 @@ dependencies {
     compile 'it.neokree:MaterialNavigationDrawer:1.3.1'
     compile 'com.nispok:snackbar:2.9.1'
     compile 'com.getbase:floatingactionbutton:1.8.0'
+    compile 'org.commonjava.googlecode.markdown4j:markdown4j:2.2-cj-1.0'
     
     // libs as submodules
     compile project(':extern:openpgp-api-lib')
@@ -54,6 +55,7 @@ dependencyVerification {
         'com.getbase:floatingactionbutton:e63966148212e9685afad2370780ea239b6dbd2a06f6a3f919b98882318e6a32',
         'com.android.support:support-annotations:fdee2354787ef66b268e75958de3f7f6c4f8f325510a6dac9f49c929f83a63de',
         'com.balysv:material-ripple:587f19c1e27f16c7dc67ff9ac73838aa1451086ef05a15cee38bee3e4e1454ae',
+        'org.commonjava.googlecode.markdown4j:markdown4j:e952e825d29e1317d96f79f346bfb6786c7c5eef50bd26e54a80823704b62e13',
         //'OpenKeychain.extern:openpgp-api-lib:b17bb282321351e4b00b4cd6422a57aadc13decae264019a88707bcb556439ea',
         //'OpenKeychain.extern:openkeychain-api-lib:5f95f01c066069d4bde68992fd8da5faac21510d009b1fdae7a2e28e43e82cf4',
         //'OpenKeychain.extern:html-textview:b58e343cf4c145e91f888806d06a2a7770a9e9331a72f08cfcf1128db30dcff3',
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java
index 5909970af..912caf32f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java
@@ -27,11 +27,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import org.markdown4j.Markdown4jProcessor;
 import org.sufficientlysecure.htmltextview.HtmlTextView;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.util.Log;
 
+import java.io.IOException;
+
 
 public class HelpAboutFragment extends Fragment {
 
@@ -44,8 +47,14 @@ public class HelpAboutFragment extends Fragment {
 
         HtmlTextView aboutTextView = (HtmlTextView) view.findViewById(R.id.help_about_text);
 
-        // load html from raw resource (Parsing handled by HtmlTextView library)
-        aboutTextView.setHtmlFromRawResource(getActivity(), R.raw.help_about, true);
+        // load mardown from raw resource
+        try {
+            String html = new Markdown4jProcessor().process(
+                    getActivity().getResources().openRawResource(R.raw.help_about));
+            aboutTextView.setHtmlFromString(html, true);
+        } catch (IOException e) {
+            Log.e(Constants.TAG, "IOException", e);
+        }
 
         // no flickering when clicking textview for Android < 4
         aboutTextView.setTextColor(getResources().getColor(android.R.color.black));
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
index cd6cdf4d6..24136a4b8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
@@ -64,18 +64,23 @@ public class HelpActivity extends BaseActivity {
         }
 
         Bundle startBundle = new Bundle();
-        startBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_start);
-        mTabsAdapter.addTab(HelpHtmlFragment.class, startBundle,
+        startBundle.putInt(HelpMarkdownFragment.ARG_MARKDOWN_FILE, R.raw.help_start);
+        mTabsAdapter.addTab(HelpMarkdownFragment.class, startBundle,
                 getString(R.string.help_tab_start));
 
-        Bundle wotBundle = new Bundle();
-        wotBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_certification);
-        mTabsAdapter.addTab(HelpHtmlFragment.class, wotBundle,
+        Bundle certificationBundle = new Bundle();
+        certificationBundle.putInt(HelpMarkdownFragment.ARG_MARKDOWN_FILE, R.raw.help_certification);
+        mTabsAdapter.addTab(HelpMarkdownFragment.class, certificationBundle,
                 getString(R.string.help_tab_wot));
 
+        Bundle faqBundle = new Bundle();
+        faqBundle.putInt(HelpMarkdownFragment.ARG_MARKDOWN_FILE, R.raw.help_faq);
+        mTabsAdapter.addTab(HelpMarkdownFragment.class, faqBundle,
+                getString(R.string.help_tab_faq));
+
         Bundle changelogBundle = new Bundle();
-        changelogBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_changelog);
-        mTabsAdapter.addTab(HelpHtmlFragment.class, changelogBundle,
+        changelogBundle.putInt(HelpMarkdownFragment.ARG_MARKDOWN_FILE, R.raw.help_changelog);
+        mTabsAdapter.addTab(HelpMarkdownFragment.class, changelogBundle,
                 getString(R.string.help_tab_changelog));
 
         mTabsAdapter.addTab(HelpAboutFragment.class, null,
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpMarkdownFragment.java
index a3f0ef614..69ddf2e99 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpMarkdownFragment.java
@@ -26,24 +26,29 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ScrollView;
 
+import org.markdown4j.Markdown4jProcessor;
 import org.sufficientlysecure.htmltextview.HtmlTextView;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.util.Log;
 
-public class HelpHtmlFragment extends Fragment {
+import java.io.IOException;
+
+public class HelpMarkdownFragment extends Fragment {
     private Activity mActivity;
 
     private int mHtmlFile;
 
-    public static final String ARG_HTML_FILE = "htmlFile";
+    public static final String ARG_MARKDOWN_FILE = "htmlFile";
 
     /**
      * Create a new instance of HelpHtmlFragment, providing "htmlFile" as an argument.
      */
-    static HelpHtmlFragment newInstance(int htmlFile) {
-        HelpHtmlFragment f = new HelpHtmlFragment();
+    static HelpMarkdownFragment newInstance(int htmlFile) {
+        HelpMarkdownFragment f = new HelpMarkdownFragment();
 
         // Supply html raw file input as an argument.
         Bundle args = new Bundle();
-        args.putInt(ARG_HTML_FILE, htmlFile);
+        args.putInt(ARG_MARKDOWN_FILE, htmlFile);
         f.setArguments(args);
 
         return f;
@@ -53,7 +58,7 @@ public class HelpHtmlFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         mActivity = getActivity();
 
-        mHtmlFile = getArguments().getInt(ARG_HTML_FILE);
+        mHtmlFile = getArguments().getInt(ARG_MARKDOWN_FILE);
 
         ScrollView scroller = new ScrollView(mActivity);
         HtmlTextView text = new HtmlTextView(mActivity);
@@ -65,8 +70,13 @@ public class HelpHtmlFragment extends Fragment {
 
         scroller.addView(text);
 
-        // load html from raw resource (Parsing handled by HtmlTextView library)
-        text.setHtmlFromRawResource(getActivity(), mHtmlFile, true);
+        // load mardown from raw resource
+        try {
+            String html = new Markdown4jProcessor().process(getActivity().getResources().openRawResource(mHtmlFile));
+            text.setHtmlFromString(html, true);
+        } catch (IOException e) {
+            Log.e(Constants.TAG, "IOException", e);
+        }
 
         // no flickering when clicking textview for Android < 4
         text.setTextColor(getResources().getColor(android.R.color.black));
diff --git a/OpenKeychain/src/main/res/raw-bg/help_about.html b/OpenKeychain/src/main/res/raw-bg/help_about.html
deleted file mode 100644
index cf77cf11d..000000000
--- a/OpenKeychain/src/main/res/raw-bg/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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>License: GPLv3+</p>
-
-<h2>Developers</h2>
-<ul>
-<li>Dominik Schürmann (Maintainer)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-bg/help_changelog.html b/OpenKeychain/src/main/res/raw-bg/help_changelog.html
deleted file mode 100644
index 0cb7d5210..000000000
--- a/OpenKeychain/src/main/res/raw-bg/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-bg/help_start.html b/OpenKeychain/src/main/res/raw-bg/help_start.html
deleted file mode 100644
index 58f3fae40..000000000
--- a/OpenKeychain/src/main/res/raw-bg/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>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>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_about.html b/OpenKeychain/src/main/res/raw-cs/help_about.html
deleted file mode 100644
index e4ec46f0d..000000000
--- a/OpenKeychain/src/main/res/raw-cs/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> je OpenPGP implementace pro Android.</p>
-<p>Licence: GPLv3+</p>
-
-<h2>Vývojáři</h2>
-<ul>
-<li>Dominik Schürmann (Hlavní vývojář)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Knihovny</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.html b/OpenKeychain/src/main/res/raw-cs/help_changelog.html
deleted file mode 100644
index af9e49137..000000000
--- a/OpenKeychain/src/main/res/raw-cs/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>Nová obrazovka certifikace</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Lepší fungování importu většího množství klíčů</li>
-<li>Vylepšený výběr podklíčů</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>Vylepšené zacházení s hesly</li>
-<li>Sdílení klíčů přes 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>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li>Fixing crashes introduced in v2.8</li>
-<li>Experimentální podpora ECC</li>
-<li>Experimental Yubikey support (signing-only with imported keys)</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>Nová úvodní obrazovka</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>Klíče jsou připojeny ke kontaktům v Androidu</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>Obarvit otisk klíče</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>Certifikovat uživatelská ID</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Complete redesign</li>
-<li>Share public keys via QR codes, NFC beam</li>
-<li>Podepsat klíče</li>
-<li>Nahrát klíče na server</li>
-<li>Fixes import issues</li>
-<li>New AIDL API</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Základní podpora keyserverů</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>Opravy chyb</li>
-<li>Optimalizace</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>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Account adding crash on Froyo fixed</li>
-<li>Bezpečné mazání souborů</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>Opravy chyb</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Německý a Italský překlad</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>Opravy chyb</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_start.html b/OpenKeychain/src/main/res/raw-cs/help_start.html
deleted file mode 100644
index acbc80735..000000000
--- a/OpenKeychain/src/main/res/raw-cs/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>
-
-<h2>Přispět</h2>
-<p>Pokud chcete pomoci vyvíjet OpenKeychain tak, že přispějete svými kodérskými schopnostmi <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">přečtěte si naší malou příručku na Githubu</a>.</p>
-
-<h2>Překlady</h2>
-<p>Pomozte s překladem OpenKeychain! Každý se může zapojit na <a href="https://www.transifex.com/projects/p/openpgp-keychain/">Transifexu</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-de/help_about.html b/OpenKeychain/src/main/res/raw-de/help_about.html
deleted file mode 100644
index 7b613ec20..000000000
--- a/OpenKeychain/src/main/res/raw-de/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> ist eine OpenPGP-Implementierung für Android.</p>
-<p>Lizenz: GPLv3+</p>
-
-<h2>Entwickler</h2>
-<ul>
-<li>Dominik Schürmann (Leitender Entwickler)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Bibliotheken</h2>
-<ul>
-<li>
-<a href="https://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11-Lizenz)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT-Lizenz)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support-Bibliotheken</a> (Apache-Lizenz v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache-Lizenz v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache-Lizenz v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache-Lizenz v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache-Lizenz v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache-Lizenz v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache-Lizenz v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material-Design)</a> (Apache-Lizenz v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache-Lizenz v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT-Lizenz)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache-Lizenz v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
deleted file mode 100644
index a54052fef..000000000
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Behoben: Schlüsselexport in Datei (jetzt wirklich)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Behoben: Schlüsselexport in Datei (wurde nur teilweise geschrieben)</li>
-<li>Behoben: Absturz auf Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Behoben: Absturz auf Android 5</li>
-<li>Neuer Beglaubigungsbildschirm</li>
-<li>Sicherer Austausch direkt aus der Schlüsselliste (SafeSlinger-Bibliothek)</li>
-<li>Neuer Programmablauf für QR-Codes</li>
-<li>Neugestaltung des Entschlüsselungsbildschirms</li>
-<li>Verwendung neuer Icons und neuer Farben</li>
-<li>Behoben: Import geheimer Schlüssel von Symantec Encryption Desktop</li>
-<li>Unterschlüssel-IDs auf Yubikeys werden nun richtig geprüft</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Bessere Verarbeitung von großen Schlüsselimporten</li>
-<li>Verbesserte Unterschlüsselauswahl</li>
-</ul>
-<h2>3.0</h2>
-<ul>
-<li>Volle Unterstützung für Yubikey-Signaturerzeugung und Entschlüsselung!</li>
-<li>Kompatible, installierbare Apps in der App-Liste anzeigen</li>
-<li>Neues Design für den Entschlüsselungsbildschirm</li>
-<li>Viele Fehlerbehebungen für den Schlüsselimport, auch bei gekürzten Schlüsseln</li>
-<li>Schlüsselauthentifizierungs-Flags berücksichtigen und anzeigen</li>
-<li>Benutzeroberfläche zum Erzeugen benutzerdefinierter Schlüssel</li>
-<li>Behoben: Benutzer-ID-Widerrufszertifikate</li>
-<li>Neue Cloudsuche (sucht über traditionelle Schlüsselserver und über keybase.io)</li>
-<li>Unterstützung für das Kürzen von Schlüsseln innerhalb von OpenKeychain</li>
-</ul>
-<h2>2.9.2</h2>
-<ul>
-<li>Behoben: Beschädigung von Schlüsseln in 2.9.1</li>
-<li>Yubikey-Entschlüsselung funktioniert nun über die API</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<li>Verschlüsselungsbildschirm auf zwei aufgeteilt</li>
-<li>Behoben: Handhabung von Schlüsselflags (Unterstützt nun Mailvelope 0.7 Schlüssel)</li>
-<li>Handhabung von Passwörtern verbessert</li>
-<li>Schlüsselaustausch mit SafeSlinger</li>
-<li>Yubikey: neue Einstellung zur PIN-Änderung, zur Zeit funktioniert das Signieren nur mit der OpenPGP-API, nicht innerhalb von OpenKeychain</li>
-<li>Behoben: Verwendung von gekürzten Schlüsseln</li>
-<li>Standardmäßige Nutzung von SHA256 aus Kompatibilitätsgründen</li>
-<li>Änderungen an der Intent-API, siehe https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>OpenPGP-API kann nun mit widerrufenen/abgelaufenen Schlüsseln umgehen und liefert alle Benutzer-IDs zurück</li>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li>Behoben: Mit v2.8 eingeführte Abstürze</li>
-<li>Experimentelle ECC-Unterstützung</li>
-<li>Experimentelle Yubikey-Unterstützung (nur Signieren mit importierten Schlüsseln)</li>
-</ul>
-<h2>2.8</h2>
-<ul>
-<li>Es wurden in dieser Version so viele Fehler behoben, dass wir uns besser auf die neuen Funktionen konzentrieren</li>
-<li>Schlüsselbearbeitung: tolles neues Design und Schlüsselrückruf</li>
-<li>Schlüsselimport: tolles neues Design, gesicherte Verbindungen zum Schlüsselserver über HKPS, Namensauflösung der Schlüsselserver über DNS SRV-Einträge</li>
-<li>Neuer Bildschirm für ersten Start der App</li>
-<li>Neuer Schlüsselerzeugungsbildschirm: Automatische Vorschläge für Name und E-Mail basierend auf deinen persönlichen Android-Konten</li>
-<li>Dateiverschlüsselung: tolles neues Design, Unterstützung für Verschlüsselung mehrerer Dateien</li>
-<li>Neue Symbole zum Anzeigen des Schlüsselstatus (von Brennan Novak)</li>
-<li>Wichtige Fehlerbehebung: Importieren größerer Schlüsselsammlungen aus einer Datei ist nun möglich</li>
-<li>Benachrichtigung, die zwischengespeicherte Passwörter anzeigt</li>
-<li>Schlüssel sind mit den Android-Kontakten verbunden</li>
-</ul>
-<p>Diese Version wäre ohne die Arbeit von Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray und Thialfihar nicht möglich</p>
-
-<h2>2.7</h2>
-<ul>
-<li>Lila! (Dominik, Vincent)</li>
-<li>Neues Schlüsselansicht-Design (Dominik, Vincent)</li>
-<li>Neue flache Android-Schaltflächen (Dominik, Vincent)</li>
-<li>API-Fehlerbehebungen (Dominik)</li>
-<li>Import aus keybase.io (Tim Bray)</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Einige Korrekturen für Regressionsfehler</li>
-</ul>
-<h2>2.6</h2>
-<ul>
-<li>Schlüsselbeglaubigungen (danke an Vincent Breitmoser)</li>
-<li>Unterstützung für GnuPG-Teilschlüssel (Dank an Vincent Breitmoser)</li>
-<li>Neues Design für Signaturprüfung</li>
-<li>Benutzerdefinierte Schlüssellänge (Dank an Greg Witczak)</li>
-<li>Fehler bei der Teilen-Funktion von anderen Apps behoben</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Behoben: Entschlüsselung von symmetrischen OpenPGP-Nachrichten/-Dateien</li>
-<li>Umgestaltung des Schlüsselbearbeitungsbildschirms (Dank an Ash Hughes)</li>
-<li>Neues modernes Design für Verschlüsselungs-/Entschlüsselungsbildschirme</li>
-<li>OpenPGP-API Version 3 (mehrerer API-Konten, interne Fehlerbehebungen, Schlüsselsuche)</li>
-</ul>
-<h2>2.4</h2>
-<p>Danke an alle Bewerber des Google Summer of Code 2014, die diese Version funktionsreich und fehlerfrei gemacht haben.
-Neben mehreren kleinen Updates sind eine beachtliche Anzahl von Updates von den folgenden Personen gemacht worden (in alphabetischer Reihenfolge):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-<ul>
-<li>Neue einheitliche Schlüsselliste</li>
-<li>Eingefärbter Schlüsselfingerabdruck</li>
-<li>Unterstützung für Schlüsselserverports</li>
-<li>Möglichkeit zum Erzeugen von schwachen Schlüsseln deaktiviert</li>
-<li>Viel mehr interne Arbeit an der API</li>
-<li>Benutzerkennungen beglaubigen</li>
-<li>Schlüsselserver-Suchanfrage basierend auf maschinenlesbarer Ausgabe</li>
-<li>"Navigation Drawer" auf Tablets sperren</li>
-<li>Vorschläge für E-Mails bei Schlüsselerzeugung</li>
-<li>Suche in öffentlichen Schlüssellisten</li>
-<li>Und viele weitere Verbesserungen und Fehlerbehebungen...</li>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix für Absturz beim Aktualisieren von alten Versionen</li>
-</ul>
-<h2>2.3</h2>
-<ul>
-<li>Kein unnötiger Export öffentlicher Schlüssel beim Export der geheimen Schlüssel (Dank an Ash Hughes)</li>
-<li>Behoben: Setzen des Schlüsselablaufdatums (Dank an Ash Hughes)</li>
-<li>Weitere interne Fehlerbehebungen für das Editieren von Schlüsseln (Dank an Ash Hughes)</li>
-<li>Schlüsselserverabfrage direkt aus dem Importbildschirm</li>
-<li>Behoben: Layout und Dialogstil auf Android 2.2-3.0</li>
-<li>Behoben: Absturz bei leeren Benutzer-IDs</li>
-<li>Behoben: Absturz nach Rückkehr vom Signierenbildschirm, außerdem wurden die Listen nicht geleert</li>
-<li>Bouncy Castle (Kryptographie-Bibliothek) von 1.47 auf 1.50 aktualisiert und aus Quellcode kompiliert.</li>
-<li>Behoben: Hochladen des Schlüssels aus dem Signierenbildschirm</li>
-</ul>
-<h2>2.2</h2>
-<ul>
-<li>Neues Design mit "Navigation Drawer"</li>
-<li>Neues Design der Liste öffentlicher Schlüssel</li>
-<li>Neue Ansicht für öffentliche Schlüssel</li>
-<li>Behoben: Fehler beim Schlüsselimport</li>
-<li>Schlüsselbeglaubigungen über Kreuz, "Key cross-certification" (Dank an Ash Hughes)</li>
-<li>Korrekte Verarbeitung von UTF-8-Passwörtern (Dank an Ash Hughes)</li>
-<li>Erste Version mit neuen Sprachen (Dank an die Unterstützer auf Transifex)</li>
-<li>Behoben und verbessert: Teilen von Schlüsseln über QR-Codes</li>
-<li>Paket-Signaturprüfung für API</li>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API-Aktualisierungen, Vorbereitung für die "K-9 Mail"-Integration</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<li>Viele Fehlerbehebungen</li>
-<li>Neue API für Entwickler</li>
-<li>PRNG-Fehlerbehebung von Google</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Komplette Neugestaltung</li>
-<li>Öffentliche Schlüssel über QR-Codes oder NFC-Beam teilen</li>
-<li>Schlüssel signieren</li>
-<li>Schlüssel auf Server hochladen</li>
-<li>Behoben: Importprobleme</li>
-<li>Neue AIDL-API</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Grundlegende Schlüsselserverunterstützung</li>
-<li>App2sd</li>
-<li>Mehr Auswahlmöglichkeiten für den Passwortzwischenspeicher: 1, 2, 4, 8, Stunden</li>
-<li>Übersetzungen: Norwegisch (Dank an Sander Danielsen), Chinesisch (Dank an Zhang Fredrick)</li>
-<li>Fehlerbehebungen</li>
-<li>Optimierungen</li>
-</ul>
-<h2>1.0.7</h2>
-<ul>
-<li>Behoben: Problem mit Signaturprüfung von Texten mit angehängtem Zeilenvorschub</li>
-<li>Mehr Optionen für die Länge der Passwortzwischenspeicherung (20, 40, 60 Minuten)</li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Behoben: Absturz bei Kontenerstellung unter Froyo</li>
-<li>Sichere Dateilöschung</li>
-<li>Option zum Löschen der Schlüsseldatei nach dem Import</li>
-<li>Streamverschlüsselung/-entschlüsselung (Galerie, usw.)</li>
-<li>Neue Optionen (Sprache, v3-Signaturen erzwingen)</li>
-<li>Schnittstellenänderungen</li>
-<li>Fehlerbehebungen</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Deutsche und Italienische Übersetzung</li>
-<li>Viel kleineres Paket durch reduzierte BC-Quellen</li>
-<li>Neue Einstellungsoberfläche</li>
-<li>Layoutanpassungen für Übersetzungen</li>
-<li>Behoben: Signaturfehler</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Behoben: Absturz durch einen SDK-Fehler mit "query builder"</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Behoben: Abstürze während Verschlüsselung/Beglaubigung und möglicherweise Schlüsselexport</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>Filterbare Schlüsselliste</li>
-<li>Intelligentere Vorauswahl von Verschlüsselungsschlüsseln</li>
-<li>New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li>
-<li>Fehlerbehebungen und zusätzliche Funktionen für K-9-Mail (Schlüsselvorauswahl), neuer Beta-Build verfügbar</li>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>Behoben: GMail-Konto-Auflistung in 1.0.0 fehlerhaft</li>
-</ul>
-<h2>1.0.0</h2>
-<ul>
-<li>"K-9 Mail"-Integration, APG-unterstützendes Beta-Build von K-9 Mail</li>
-<li>Unterstützung weiterer Dateimanager (inklusive ASTRO)</li>
-<li>Slowenische Übersetzung</li>
-<li>Neue Datenbank, viel schneller, geringere Speichernutzung</li>
-<li>"Intents" und Inhaltsprovider für andere Apps definiert</li>
-<li>Fehlerbehebungen</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-de/help_start.html b/OpenKeychain/src/main/res/raw-de/help_start.html
deleted file mode 100644
index 676922dbf..000000000
--- a/OpenKeychain/src/main/res/raw-de/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>Wie kann ich OpenKeychain in K-9 Mail nutzen?</h2>
-<p>Um OpenKeychain in K-9 Mail nutzen zu können, sind folgende Schritte nötig:</p>
-<ol>
-<li>Öffne K-9 Mail und drücke lange auf den Account, mit dem du OpenKeychain nutzen willst.</li>
-    <li>Wähle "Kontoeinstellungen", blättere ganz nach unten und klicke auf "Kryptographie".</li>
-    <li>Klicke auf "OpenPGP-Provider" und wähle OpenKeychain aus der Liste.</li>
-</ol>
-<h2>Ich habe einen Fehler in OpenKeychain gefunden!</h2>
-<p>Bitte sende uns einen Fehlerbericht mithilfe des <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Problem-Trackers von OpenKeychain</a>.</p>
-
-<h2>Unterstützen</h2>
-<p>Wenn du uns bei der Entwicklung von OpenKeychain, z.B. durch das Beisteuern von Code, helfen willst, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">schau dir unsere kurze Anleitung auf GitHub an</a>.</p>
-
-<h2>Übersetzungen</h2>
-<p>Hilf mit OpenKeychain zu übersetzten! Jeder kann mitmachen, besuche<a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain auf Transifex</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-es/help_about.html b/OpenKeychain/src/main/res/raw-es/help_about.html
deleted file mode 100644
index 7ea723e76..000000000
--- a/OpenKeychain/src/main/res/raw-es/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> es una implementación de OpenPGP para Android.</p>
-<p>Licencia: GPLv3+</p>
-
-<h2>Desarrolladores</h2>
-<ul>
-<li>Dominik Schürmann (Mantenedor)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Librerías</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (Licencia MIT X11)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">Librería SafeSlinger Exchange</a> (Licencia MIT)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Suppor Libraries</a> (Licencia Apache v2) [librerías de soporte de Android]</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Licencia Apache v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Licencia Apache v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Licencia Apache v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licencia Apache v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Licencia Apache v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Licencia Apache v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip</a> (Licencia Apache v2) [indicador deslizante para paso de página estilo Material]</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Licencia Apache v2) [panel de navegación estilo Material]</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (Licencia MIT)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Licencia Apache v2) [botón de acción flotante]</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html
deleted file mode 100644
index e404fecf1..000000000
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Repara la exportación de claves hacia ficheros (ahora de verdad)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Repara la exportación de clave hacia ficheros (se guardaban parcialmente)</li>
-<li>Repara caída en Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Repara una caída en Android 5</li>
-<li>Nueva pantalla de certificación</li>
-<li>Intercambio seguro directamente desde de la lista de claves (librería SafeSlinger)</li>
-<li>Nuevo flujo de programa de Código QR</li>
-<li>Pantalla de descifrado rediseñada</li>
-<li>Nuevo uso del icono y colores</li>
-<li>Repara la importación de claves secretas (privadas) desde Symantec Encryption Desktop</li>
-<li>Las identificaciones de subclaves en Yubikeys ahora se comprueban correctamente</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Tratamiento mejorado para importación de claves grandes</li>
-<li>Selección de subclave mejorada</li>
-</ul>
-<h2>3.0</h2>
-<ul>
-<li>¡Soporte completo para generación y descifrado de firma de Yubikey!</li>
-<li>Proposición de aplicaciones compatibles instalables desde la lista de aplicaciones</li>
-<li>Nuevo diseño para pantallas de descifrado</li>
-<li>Muchas reparaciones para la importación de claves, también reparaciones para claves desnudas</li>
-<li>Muestra y acata los indicativos de autentificación de clave</li>
-<li>Interfaz de usuario para generar claves personalizadas</li>
-<li>Reacondicionado de los certifcados de revocación de identificación de usuario</li>
-<li>Nueva búsqueda en la nube (búsquedas sobre servidores de claves tradicionales y keybase.io)</li>
-<li>Soporte para claves desnudas dentro de OpenKeychain</li>
-</ul>
-<h2>2.9.2</h2>
-<ul>
-<li>Repara claves dañadas en 2.9.1</li>
-<li>El descifrado de Yubikey funcionando ahora vía API</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<li>Dividir pantalla de cifrado en dos</li>
-<li>Reparación del manejado de indicadores de clave (ahora soportando claves de Mailvelope 0.7)</li>
-<li>Manejado mejorado de frase-contraseña</li>
-<li>Compartición de clave mediante SafeSlinger</li>
-<li>Yubikey: opción para permitir otros PINs, actualmente sólo funciona firmando a través de la API OpenPGP, no dentro de OpenKeychain</li>
-<li>Reparación del uso de claves desnudas</li>
-<li>SHA256 se usa como predeterminado para compatibilidad</li>
-<li>La API de Intent ha cambiado, vea https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>La API de OpenPGP ahora maneja claves revocadas/expiradas y devuelve todas las identificación de usario</li>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li>Repara caídas introducidas en la v2.8</li>
-<li>Soporte ECC experimental</li>
-<li>Soporte experimental para Yubikey (firma-sólo con claves importadas)</li>
-</ul>
-<h2>2.8</h2>
-<ul>
-<li>Tantos fallos se han reparado en esta versión que nos centramos en las principales características nuevas</li>
-<li>Edición de clave: Tremendo diseño nuevo, revocación de clave</li>
-<li>Importación de clave: Tremendo diseño nuevo, conexiones seguras a servidor de claves vía hkps, resolución de servidor de claves vía registros SRV de DNS</li>
-<li>Nueva pantalla de primera vez</li>
-<li>Nueva pantalla de creación de clave: Autocompletado de un nombre o correo electrónico basado en sus cuentas personales de Android</li>
-<li>Cifrado de fichero: Tremendo diseño nuevo, soporte para cifrado de múltiples ficheros</li>
-<li>Nuevos iconos para mostrar estado de clave (por Brennan Novak)</li>
-<li>Reparación importante de fallo: La importación de grandes colecciones de claves desde un fichero ahora es posible</li>
-<li>Notificación mostrando frases-contraseña en caché</li>
-<li>Las claves están conectadas a los contactos de Android</li>
-</ul>
-<p>Esta versión no sería posible sin el trabajo de Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
-
-<h2>2.7</h2>
-<ul>
-<li>Purple! (Dominik, Vincent)</li>
-<li>Nuevo diseño de vista de clave (Dominik, Vincent)</li>
-<li>Nuevos botones de Android planos (Dominik, Vincent)</li>
-<li>Reparaciones de la API (Dominik)</li>
-<li>Importación de keybase.io (Tim Bray)</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Algunas reparaciones para fallos regresivos</li>
-</ul>
-<h2>2.6</h2>
-<ul>
-<li>Certificaciones de clave (gracias a Vincent Breitmoser)</li>
-<li>Soporte para claves secretas (privadas) parciales de GnuPG (gracias a Vincent Breitmoser)</li>
-<li>Nuevo diseño para verificación de firma</li>
-<li>Tamaño de clave personalizado (gracias a Greg Witczak)</li>
-<li>Repara funcionalidad-compartida desde otras aplicaciones</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Repara el descifrado de ficheros/mensajes OpenPGP simétricos</li>
-<li>Pantalla de edición de clave refactorizada (gracias a Ash Hughes)</li>
-<li>Nuevo diseño moderno para pantallas de cifrado/descifrado</li>
-<li>API de OpenPGP version 3 (múltiples cuentas api, reparaciones internas, búsqueda de clave)</li>
-</ul>
-<h2>2.4</h2>
-<p>¡Gracias a todos los aspirantes del Google Summer of Code 2014 que hicieron que esta versión sea rica en características y libre de fallos!
-Además de varios pequeños parches, un número notable de parches están hechos por las siguientes personas (en orden alfabético):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-<ul>
-<li>Nueva lista de claves unificada</li>
-<li>Huella de validación de clave (fingerprint) coloreada</li>
-<li>Soporte para puertos de servidor de claves</li>
-<li>Desactivar la posibilidad de generar claves débiles</li>
-<li>Mucho más trabajo interno en la API</li>
-<li>Certificar identificaciones de usuario</li>
-<li>Consulta al servidor de claves basada en salida legible-por-máquina</li>
-<li>Bloquear panel deslizante de navegación en tabletas</li>
-<li>Sugerencias para correos electrónicos en la creación de claves</li>
-<li>Buscar en listas de claves públicas</li>
-<li>Y muchas más mejoras y reparaciones...</li>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Reparación crucial para caídas al actualizar desde versiones antiguas</li>
-</ul>
-<h2>2.3</h2>
-<ul>
-<li>Eliminar exportación innecesaria de claves públicas al exportar clave secreta (gracias a Ash Hughes)</li>
-<li>Repara el establecimiento de fechas de expiración en las claves (gracias a Ash Hughes)</li>
-<li>Más reparaciones internas al editar claves (gracias a Ash Hughes)</li>
-<li>Consultando servidores de claves directamente desde la pantalla de importación</li>
-<li>Repara la composición y el estilo de diálogo de Android 2.2-3.0</li>
-<li>Repara caídas en claves con identificaciones de usuario vacías</li>
-<li>Repara caídas y listas vacías al volver desde la pantalla de firmado</li>
-<li>Bouncy Castle (librería de criptografía) actualizada desde 1,47 a 1.50 y and compilada desde la fuente</li>
-<li>Repara la clave de subida desde la pantalla de firmado</li>
-</ul>
-<h2>2.2</h2>
-<ul>
-<li>Nuevo diseño con panel deslizante de navegación</li>
-<li>Nuevo disño de lista de clave pública</li>
-<li>Nueva vista de clave pública</li>
-<li>Reparación de fallos para la importación de claves</li>
-<li>Certificación-cruzada de clave (gracias a Ash Hughes)</li>
-<li>Manejo adecuado de contraseñas UTF-8 (gracias a Ash Hughes)</li>
-<li>Primera versiónm con nuevos idiomas (gracias a los contribuidores en Transifex)</li>
-<li>Reparado y mejorado el compartido de claves mediante códigos QR </li>
-<li>Firma de verificación de paquete para la API</li>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>Actualizaciones de API, preparación para integrar K-9 Mail</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<li>Muchas reparaciones de fallos</li>
-<li>Nueva API para desarrolladores</li>
-<li>Reparación de fallo PRNG por Google</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Rediseño completo</li>
-<li>Compartido de claves públicas mediante códigos QR y transmisión NFC beam</li>
-<li>Firmar claves</li>
-<li>Subir claves al servidor</li>
-<li>Repara problemas con la importación</li>
-<li>New API AIDL</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Soporte básico de servidor de claves</li>
-<li>App2sd</li>
-<li>Más opciones para frase-contraseña en caché: 1, 2, 4, 8, horas</li>
-<li>Traducciones: Noruego (graciasa, Sander Danielsen), Chino (gracias a Zhang Fredrick)</li>
-<li>Reparaciones de fallos</li>
-<li>Optimizaciones</li>
-</ul>
-<h2>1.0.7</h2>
-<ul>
-<li>Problema reparado con la verificación de firma de textos que finalizan con caracter nueva-línea </li>
-<li>Más opciones para tiempo de vida en caché de frase-contraseña (20, 40, 60 min)</li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Reparada la caída al añadir cuenta en Froyo</li>
-<li>Borrado seguro de fichero</li>
-<li>Opción para borrar fichero de clave después de importar</li>
-<li>Cifrado/descifrado de stream (galería, etc.)</li>
-<li>Nuevas opciones (idioma, forzar firmas v3)</li>
-<li>Cambios de interfaz</li>
-<li>Reparaciones de fallos</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Traducción al alemán e italiano</li>
-<li>Paquete mucho más pequeño, debido a fuentes BC reducidas</li>
-<li>Nuevas preferencias de GUI</li>
-<li>Ajuste de composición para localización</li>
-<li>Reparación de fallo de firma</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Reparado otro fallo causado por algún fallo SDK con constructor de consultas</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Reparadas caídas durante el cifrado/firmado y posiblemente exportación de claves</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>Listas de claves filtrables</li>
-<li>Pre-selección más inteligente de claves de cifrado</li>
-<li>Nuevo objeto Intent que maneja VIEW y SEND (ver y enviar), permite que los ficheros sean cifrados/descifrados fuera de los administradores de ficheros</li>
-<li>Reparaciones y características adicionales (preselección de claves) para K-9 Mail, nueva compilación beta disponible</li>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>El listado de cuentas de GMail estaba roto en la 1.0.0, reparado de nuevo</li>
-</ul>
-<h2>1.0.0</h2>
-<ul>
-<li>Integración de K-9 Mail, compilación beta soportando APG de K-9 Mail</li>
-<li>Soporte para más administradores de ficheros (incluyendo ASTRO)</li>
-<li>Traducción al esloveno</li>
-<li>Nueva base de datos, mucho más rápidas, con menor uso de memoria</li>
-<li>Definidos objetos Intent, y proveedores de contenidos para otras aplicaciones</li>
-<li>Reparaciones de fallos</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-es/help_start.html b/OpenKeychain/src/main/res/raw-es/help_start.html
deleted file mode 100644
index b0df960ee..000000000
--- a/OpenKeychain/src/main/res/raw-es/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>¿Cómo activo OpenKeychain in K-9 Mail?</h2>
-<p>Para utilizar OpenKeychain con K-9 Mail, querrá seguir estos pasos:</p>
-<ol>
-<li>Abra K-9 Mail y realice una pulsación larga en la cuenta con la que quiera utilizar OpenKeychain.</li>
-    <li>Seleccione "Configuración de cuenta", deplácese al fondo del todo y haga clic en "Criptografía".</li>
-    <li>Haga clic en "Proveedor OpenPGP" y de la lista seleccione OpenKeychain.</li>
-</ol>
-<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>
-
-<h2>Aportar</h2>
-<p>Si quieres ayudarnos con el desarrollo de OpenKeychain aportando código <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">sigue nuestra pequeña guía en Github</a>.</p>
-
-<h2>Traducciones</h2>
-<p>¡Ayúdanos a traducir OpenKeychain! Todo el mundo es bienvenido en <a href="https://www.transifex.com/projects/p/openpgp-keychain/">Transifex - OpenKeychain</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-et/help_about.html b/OpenKeychain/src/main/res/raw-et/help_about.html
deleted file mode 100644
index cf77cf11d..000000000
--- a/OpenKeychain/src/main/res/raw-et/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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>License: GPLv3+</p>
-
-<h2>Developers</h2>
-<ul>
-<li>Dominik Schürmann (Maintainer)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html
deleted file mode 100644
index 0cb7d5210..000000000
--- a/OpenKeychain/src/main/res/raw-et/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-et/help_start.html b/OpenKeychain/src/main/res/raw-et/help_start.html
deleted file mode 100644
index 58f3fae40..000000000
--- a/OpenKeychain/src/main/res/raw-et/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>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>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/help_about.html b/OpenKeychain/src/main/res/raw-eu/help_about.html
deleted file mode 100644
index 6f19ccaad..000000000
--- a/OpenKeychain/src/main/res/raw-eu/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> Android-rako OpenPGP inplemetazio bat da.</p>
-<p>Baimena: GPLv3+</p>
-
-<h2>Garatzaileak</h2>
-<ul>
-<li>Dominik Schürmann (Mantentzailea)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Liburutegiak</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 Baimena)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT Baimena)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache Baimena v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache Baimena v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache Baimena v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache Baimena v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/help_changelog.html b/OpenKeychain/src/main/res/raw-eu/help_changelog.html
deleted file mode 100644
index 0cb7d5210..000000000
--- a/OpenKeychain/src/main/res/raw-eu/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/help_start.html b/OpenKeychain/src/main/res/raw-eu/help_start.html
deleted file mode 100644
index 0e05e3790..000000000
--- a/OpenKeychain/src/main/res/raw-eu/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<h2>Akats bat aurkitu dut OpenKeychain-en!</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>Lagundu</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>Itzulpenak</h2>
-<p>Lagundu OpenKeychain itzultzen! Edonork eskuhartu dezake hemen <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychainTransifex-en</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_about.html b/OpenKeychain/src/main/res/raw-fi/help_about.html
deleted file mode 100644
index cf77cf11d..000000000
--- a/OpenKeychain/src/main/res/raw-fi/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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>License: GPLv3+</p>
-
-<h2>Developers</h2>
-<ul>
-<li>Dominik Schürmann (Maintainer)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.html b/OpenKeychain/src/main/res/raw-fi/help_changelog.html
deleted file mode 100644
index 0cb7d5210..000000000
--- a/OpenKeychain/src/main/res/raw-fi/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_start.html b/OpenKeychain/src/main/res/raw-fi/help_start.html
deleted file mode 100644
index 58f3fae40..000000000
--- a/OpenKeychain/src/main/res/raw-fi/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>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>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_about.html b/OpenKeychain/src/main/res/raw-fr/help_about.html
deleted file mode 100644
index 82f86dc22..000000000
--- a/OpenKeychain/src/main/res/raw-fr/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> est une implémentation d'OpenPGP pour Android.</p>
-<p>Licence : GPLv3+</p>
-
-<h2>Développeurs</h2>
-<ul>
-<li>Dominik Schürmann (mainteneur)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar « kalkin » Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>« mar-v-in »</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>« 'Senecaso »</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Bibliothèques</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (Licence MIT X11)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">Bibliothèque d'échange SafeSlinger</a> (Licence MIT)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Bibliothèques de soutien Android</a> (Licence Apache v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Licence Apache v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (License Apache v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (License Apache v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licence Apache v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Licence Apache v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Licence Apache v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (conception matérielle )</a> (Licence Apache v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Licence Apache v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (Licence MIT)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Licence Apache v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.html b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
deleted file mode 100644
index 97b42c6a6..000000000
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Correctif - Exportation des clefs vers des fichiers (vraiment, maintenant)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Correctif - Exportation des clefs vers des fichiers (elles n'étaient écrites que partiellement)</li>
-<li>Correctif - Plantage sur Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Plantage corrigé sur Android 5</li>
-<li>Nouvel écran de certification</li>
-<li>Échange sécurisé directement depuis la liste des clefs (bibliothèque SafeSlinger)</li>
-<li>Nouveau flux de programme pour les codes QR</li>
-<li>Écran de déchiffrement redessiné</li>
-<li>Nouveaux agencement et couleurs d'icônes</li>
-<li>Importation des clefs secrètes corrigée depuis le bureau de chiffrement Symantec</li>
-<li>Les ID de sous-clefs des Yubikeys sont maintenant vérifiés correctement</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Meilleure gestion de l'importation de nombreuses clefs</li>
-<li>Sélection des sous-clefs améliorée</li>
-</ul>
-<h2>3.0</h2>
-<ul>
-<li>Prise en charge complète de la génération de signature par Yubikey et de leur déchiffrement !</li>
-<li>Des applis compatibles installables sont proposées dans la liste des applis</li>
-<li>Nouvelle conception pour les écrans de déchiffrement</li>
-<li>Nombreux correctifs d'importation des clefs, corrigent aussi les clefs dépouillées</li>
-<li>Accepter et afficher les drapeaux d'authentification des clefs</li>
-<li>Interface utilisateur pour générer des clefs personnalisées</li>
-<li>Corrigé - certificats de révocation des ID utilisateurs</li>
-<li>Nouvelle recherche nuagique (dans les serveurs traditionnels et dans keybase.io)</li>
-<li>Prise en charge du dépouillement des clefs dans OpenKeychain</li>
-</ul>
-<h2>2.9.2</h2>
-<ul>
-<li>Correctif - Clefs brisées dans 2.9.1</li>
-<li>Le déchiffrement des Yukukeys par l'API fonctionne maintenant</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<li>Partage de l'écran de chiffrement en deux</li>
-<li>Correctif - Gestion des drapeaux de clefs (prend maintenant en charge les clefs Mailvelope 0.7)</li>
-<li>Gestion des phrases de passe améliorée</li>
-<li>Partage de clefs par SafeSlinger</li>
-<li>Yubikey : préférence pour permette d'autre NIP, seule la signature par l'API OpenPGP fonctionne présentement, mais pas à l'intérieur d'OpenKeychain</li>
-<li>Correctif - Utilisation de clefs dépouillées</li>
-<li>SHA256 par défaut pour la compatibilité</li>
-<li>L'API des intentions a changé, voir https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>L'API d'OpenPGP gère maintenant les clefs révoquées/expirées et retourne tous les ID utilisateurs</li>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li>Correction des plantages présents dans v2.8</li>
-<li>Prise en charge expérimentale CCE</li>
-<li>Prise en charge expérimentale de Yubikey (signature seulement avec les clefs importées)</li>
-</ul>
-<h2>2.8</h2>
-<ul>
-<li>Tellement de bogues ont été réglés dans cette version que nous nous concentrons sur les nouvelles caractéristiques principales.</li>
-<li>Modification des clefs : nouvelle et superbe conception, révocations des clefs</li>
-<li>Importation des clefs : nouvelle et superbe conception, connexion sécurisé aux serveurs de clefs par hkps, résolution des serveurs de clefs par transactions DNS SRV</li>
-<li>Nouvel écran de premier lancement</li>
-<li>Nouvel écran de création de clef : auto-remplissage du nom et du courriel d'après vos coordonnées Android</li>
-<li>Chiffrement des fichiers : nouvelle et superbe conception, prise en charge du chiffrement de fichiers multiples</li>
-<li>Nouvelles icônes d'état des clefs (par Brennan Novak)</li>
-<li>Correctif important de bogue : l'importation de grandes collections de clefs à partir d'un fichier est maintenant possible</li>
-<li>Notification montrant les phrases de passe en cache</li>
-<li>Les clefs sont connectées aux contacts d'Android</li>
-</ul>
-<p>Cette version ne serait pas possible sans le travail de Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
-
-<h2>2.7</h2>
-<ul>
-<li>Violet ! (Dominik, Vincent)</li>
-<li>Nouvelle présentation de la visualisation des clefs (Dominik, Vincent)</li>
-<li>Nouveaux boutons Android plats (Dominik, Vincent)</li>
-<li>Correctifs de l'API (Dominik)</li>
-<li>Importation de Keybase.io (Tim Bray)</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Quelques correctifs de bogues de régression</li>
-</ul>
-<h2>2.6</h2>
-<ul>
-<li>Certifications des clefs (merci à Vincent Breitmoser)</li>
-<li>Prise en charge clefs secrètes partielles de GnuPG (merci à Vincent Breitmoser)</li>
-<li>Nouvelle conception de la vérification de signatures</li>
-<li>Longueur de clef personnalisée (merci à Greg Witczak)</li>
-<li>Correctif - Fonctionnalités partagées d'autres applis</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Correctif - Déchiffrement des messages/fichiers symétriques OpenPGP</li>
-<li>Écran de modification des clefs remanié (merci à Ash Hughes)</li>
-<li>Nouvelle conception moderne pour les écrans de chiffrement/déchiffrement</li>
-<li>API OpenPGP version 3 (comptes multiples d'api, correctifs internes, recherche de clefs)</li>
-</ul>
-<h2>2.4</h2>
-<p>Merci à tous les participants  de « Google Summer of Code 2014 » qui ont rendu cette version riche en fonctions et sans bogue !
-À part plusieurs petits correctifs, un nombre notable de correctifs ont été apportés par les personnes suivantes (par ordre alphabétique) :
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-<ul>
-<li>Nouvelle liste de clefs unifiée</li>
-<li>Empreintes de clefs colorées</li>
-<li>Prise en charge des ports des serveurs de clefs</li>
-<li>Désactiver la possibilité de générer des clefs faibles</li>
-<li>Encore plus de travail interne dans l'API</li>
-<li>Certifier les ID utilisateurs</li>
-<li>Requêtes des serveurs de clefs basées sur des sorties assimilables par la machine</li>
-<li>Verrouiller les tiroirs de navigation sur les tablettes</li>
-<li>Suggestion de courriels à la création de clefs</li>
-<li>Rechercher dans les listes de clefs publiques</li>
-<li>Et bien plus d'améliorations et de correctifs</li>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Correctif d'urgence pour le plantage lors de la mise à niveau à partir d'anciennes versions</li>
-</ul>
-<h2>2.3</h2>
-<ul>
-<li>Suppressions de l'exportation non nécessaire des clefs publiques lors de l'exportation de clefs secrètes (merci à Ash Hughes)</li>
-<li>Correctif - Définition de la date de péremption des clefs (merci à Ash Hughes)</li>
-<li>Plus de correctifs internes affectant la modifications des clefs (merci à Ash hughes)</li>
-<li>Interrogation des serveurs de clefs directement depuis l'écran d'importation</li>
-<li>Correctif - Mise en page et du style des fenêtres de dialogue sur Android 2.2-3.0</li>
-<li>Correctif - Plantage pour les clefs avec des ID utilisateur vides</li>
-<li>Correctif - Plantage et listes vides en revenant de l'écran de signature</li>
-<li>Bouncy Castle (bibliothèque cryptographique) mise à jour de 1.47 à 1.50 et compilée depuis la source</li>
-<li>Correctif - Téléversement d'une clef depuis l'écran de signature</li>
-</ul>
-<h2>2.2</h2>
-<ul>
-<li>Nouvelle conception avec tiroir de navigation</li>
-<li>Nouvelle conception de la liste des clefs publics</li>
-<li>Nouvelle vue des clefs publics</li>
-<li>Correctif de bogues d'importation de clefs</li>
-<li>Certification croisée des clefs (merci à Ash Hughes)</li>
-<li>Bonne gestion des mots de passe UTF-8 (merci à Ash Hughes)</li>
-<li>Première version avec de nouvelles langues (merci aux contributeurs sur Transifex)</li>
-<li>Correctif et amélioration du partage de clefs par codes QR</li>
-<li>Vérification de la signature des paquets pour l'API</li>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>mise à jour de l'API, préparation à l'intégration à K-9 Mail</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<li>Beaucoup de bogues corrigés</li>
-<li>Nouvelle API pour les développeurs</li>
-<li>Correctif du blogue PRNG par Google</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Conception complètement repensée</li>
-<li>Partage de clefs publiques par codes QR, faisceau NFC</li>
-<li>Signer les clefs</li>
-<li>Téléverser les clefs vers le serveur</li>
-<li>Corrige des problèmes d'importation</li>
-<li>Nouvelle API AIDL</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Prise en charge de base du serveur de clefs</li>
-<li>App2sd</li>
-<li>Plus de choix pour le cache de la phrase de passe : 1, 2, 4, 8 heures</li>
-<li>Traductions : norvégien (merci Sander Danielsen), chinois (merci Zhang Fredrick)</li>
-<li>Correctifs de bogues</li>
-<li>Optimisations</li>
-</ul>
-<h2>1.0.7</h2>
-<ul>
-<li>Problème corrigé avec la vérification de la signature des textes se terminant par un retour à la ligne</li>
-<li>Plus de choix pour la durée de vie de la phrase de passe (20, 40, 60 min)</li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Correctif - Plantage lors de l'ajout de compte sur Froyo</li>
-<li>Suppression sécurisée de fichiers</li>
-<li>Option de suppression du fichier de clef après l'importation</li>
-<li>Chiffrement/déchiffrement de flux (galerie, etc.)</li>
-<li>Nouvelles options (langue, forcer les signatures v3)</li>
-<li>Changements dans l'interface</li>
-<li>Correctifs de bogues</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Traduction allemande et italienne</li>
-<li>Paquet beaucoup plus petit grâce à des sources BC réduites</li>
-<li>Nouvelle IUG pour les préférences</li>
-<li>Ajustement de la mise en page pour les localisations</li>
-<li>Correctif de bogue de signature</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Correction d'un autre plantage causé par quelque bogue SDK avec le constructeur de requêtes</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Corrections de plantages durant le chiffrement/la signature et possiblement l'exportation de clefs</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>Listes de clefs filtrables</li>
-<li>Présélection plus intelligente des clefs de chiffrement</li>
-<li>Nouvelle gestion des intentions pour VIEW et SEND, permet le chiffrement/déchiffrement des fichiers depuis les gestionnaires de fichiers</li>
-<li>Correctifs et fonctions additionnelles (présélection des clefs) pour K-9-Mail, nouvelle version bêta proposée</li>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>Le listage des comptes Gmail ne fonctionnait pas dans 1.0.0, corrigé de nouveau</li>
-</ul>
-<h2>1.0.0</h2>
-<ul>
-<li>Intégration à K-9 Mail, APG prenant en charge la version bêta de K-9 Mail</li>
-<li>Prise en charge de plus de gestionnaires de fichiers (incluant ASTRO)</li>
-<li>Traduction slovène</li>
-<li>Nouvelle base de données, bien plus rapide, utilisation de la mémoire moindre</li>
-<li>Intentions définies et fournisseur de contenu pour d'autres applis</li>
-<li>Correctifs de bogues</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_start.html b/OpenKeychain/src/main/res/raw-fr/help_start.html
deleted file mode 100644
index 00d801e46..000000000
--- a/OpenKeychain/src/main/res/raw-fr/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>Comment puis-je activer OpenKeychain dans K-9 Mail ?</h2>
-<p>Pour utiliser OpenKeychain avec K-9 Mail, vous devez suivre ces étapes :</p>
-<ol>
-<li>Ouvrez K-9 Mail et toquez longuement sur le compte avec lequel vous voulez utiliser OpenKeychain. </li>
-    <li>Sélectionnez « Paramètres du compte », faite défiler vers le bas et cliquez sur « Cryptographie».</li>
-    <li>Cliquez sur « Fournisseur OpenPGP » et sélectionnez OpenKeychain dans la liste.</li>
-</ol>
-<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>
-
-<h2>Contribuer</h2>
-<p>Si vous voulez nous aider à développer OpenKeychain en y contribuant par du code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">veuillez suivre notre petit guide sur Github</a>.</p>
-
-<h2>Traductions</h2>
-<p>Aidez-nous à traduire le OpenKeychain ! Tout le monde peut y participer sur la <a href="https://www.transifex.com/projects/p/openpgp-keychain/">page d'OpenKeychain sur Transifex</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-is/help_about.html b/OpenKeychain/src/main/res/raw-is/help_about.html
deleted file mode 100644
index cf77cf11d..000000000
--- a/OpenKeychain/src/main/res/raw-is/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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>License: GPLv3+</p>
-
-<h2>Developers</h2>
-<ul>
-<li>Dominik Schürmann (Maintainer)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-is/help_changelog.html b/OpenKeychain/src/main/res/raw-is/help_changelog.html
deleted file mode 100644
index 0cb7d5210..000000000
--- a/OpenKeychain/src/main/res/raw-is/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-is/help_start.html b/OpenKeychain/src/main/res/raw-is/help_start.html
deleted file mode 100644
index 58f3fae40..000000000
--- a/OpenKeychain/src/main/res/raw-is/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>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>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-it/help_about.html b/OpenKeychain/src/main/res/raw-it/help_about.html
deleted file mode 100644
index 0f24b7918..000000000
--- a/OpenKeychain/src/main/res/raw-it/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> un implementazione OpenPGP per Android.</p>
-<p>Licenza: GPLv3+</p>
-
-<h2>Sviluppatori</h2>
-<ul>
-<li>Dominik Schürmann (Manutentore)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Librerie</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (Licenza MIT X11)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">Libreria SafeSlinger Exchange</a> (Licenza MIT)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Licenza Apache v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Licenza Apache v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Licenza Apache v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licenza Apache v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-it/help_changelog.html b/OpenKeychain/src/main/res/raw-it/help_changelog.html
deleted file mode 100644
index bbb765bc3..000000000
--- a/OpenKeychain/src/main/res/raw-it/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Corretta esportazione chiavi su file (ora per davvero)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Corretta esportazione chiavi su file (la scrittura era parziale)</li>
-<li>Corretto crash su Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Corretto crash su Android 5</li>
-<li>Nuova schermata di certificazione</li>
-<li>Scambio sicuro direttamente dalla lista delle chiavi (libreria SafeSlinger)</li>
-<li>Nuovo programma di flusso QR Code</li>
-<li>Schermata di decodifica ridisegnata</li>
-<li>Nuove icone e colori</li>
-<li>Corretta importazione di chiavi segrete da Symantec Encryption Desktop</li>
-<li>ID delle sottochiavi Yubikey sono controllati correttamente</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Migliorata la gestione delle importazioni di grosse chiavi</li>
-<li>Migliorata la selezione delle sottochiavi</li>
-</ul>
-<h2>3.0</h2>
-<ul>
-<li>Supporto completo per la generazione della firma e la decifratura Yubikey!</li>
-<li>Proposte di apps compatibili installabili nella lista apps</li>
-<li>Nuova grafica per le scermate di decifratura</li>
-<li>Molte correzioni per l'importazione delle chiavi, corrette anche le chiavi ripulite</li>
-<li>Caratteristiche di Stima e visualizzazione chiavi di autenticazione</li>
-<li>Interfaccia utente per la generazione di chiavi personalizzate</li>
-<li>Correzione certificati di revoca ID utente</li>
-<li>Nuova ricerca su cloud (ricerche su server delle chiavi tradizionali e keybase.io)</li>
-<li>Supporto di pulizia chiavi in OpenKeychain</li>
-</ul>
-<h2>2.9.2</h2>
-<ul>
-<li>Corretta chiave danneggiata in 2.9.1</li>
-<li>Decodifica Yubikey ora funzionante via API</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<li>Divisa la schermata di codifica in due parti</li>
-<li>Corretta la gestione delle caratteristiche delle chiavi (ora supporta le chiavi Mailvelope 0.7)</li>
-<li>Migliorata la gestione delle frasi di accesso</li>
-<li>Condivisione chiavi via SafeSlinger</li>
-<li>Yubikey: preferenza per ammettere altri PIN, attualmente solo la firma via OpenPGP API funziona, non all'interno di OpenKeychain</li>
-<li>Corretto l'utilizzo delle chiavi ripulite</li>
-<li>SHA256 come predefinito per compatibilità</li>
-<li>Intent API cambiato, vedete https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>Le OpenPGP API ora gestiscono le chiavi revocate/scadute e restituiscono tutti gli ID utente</li>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li> Correzione crash introdotti nella versione 2.8</li>
-<li>Supporto Sperimentale per ECC</li>
-<li>Supporto sperimentale Yubikey (solo firma con chiavi importate)</li>
-</ul>
-<h2>2.8</h2>
-<ul>
-<li>Così tanti bug sono stati corretti in questa versione che ci concentriamo sulle principali novità</li>
-<li>Modifica chiave: nuovo eccezionale design, revoca chiave</li>
-<li>Importa chiave: nuovo eccezionale design, connessioni sicure via keyserver HKPS,  risoluzione keyserver tramite record SRV DNS</li>
-<li>Nuova schermata di introduzione</li>
-<li>Nuova schermata di creazione chiave: autocompletamento di nomi e email basato sui tuoi account personali di Android</li>
-<li>Codifica File: nuovo eccezionale design, supporto per codifica di più documenti</li>
-<li>Nuove icone per mostrare lo stato delle chiavi (di Brennan Novak)</li>
-<li>Correzione bug importante: Importazione di grandi collezioni di chiavi da un file ora è possibile</li>
-<li>Notifiche mostrando la frase di accesso nella cache</li>
-<li>Le chiavi sono connesse ai contatti di Android</li>
-</ul>
-<p>Questo rilascio non sarebbe stato possibile senza il lavoro di Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
-
-<h2>2.7</h2>
-<ul>
-<li>Porpora! (Dominik, Vincent)</li>
-<li>Nuovo design della schermata chiavi (Dominik, Vincent)</li>
-<li>Nuovi pulsanti piatti Android (Dominik, Vincent)</li>
-<li>Correzioni API (Dominik)</li>
-<li>Importazione Keybase.io (Tim Bray)</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>alcune correzioni per i bug di regressione</li>
-</ul>
-<h2>2.6</h2>
-<ul>
-<li>Certificazioni chiave (grazie a Vincent Breitmoser)</li>
-<li>supporto per chiavi segrete parziali GnuPG (grazie a Vincent Breitmoser)</li>
-<li>nuovo design per la verifica della firma</li>
-<li>lunghezza chiave personalizzata (grazie a Greg Witczak)</li>
-<li>fix funzionalità di condivisione da altre app</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP messages/files</li>
-<li>Refactoring della schermata di modifica chiave (grazie a Ash Hughes)</li>
-<li>Nuovo design moderno per le schermate di codifica / decodifica</li>
-<li>OpenPGP API versione 3 (api account multipli, correzioni interne, ricerca chiavi)</li>
-</ul>
-<h2>2.4</h2>
-<p>Grazie a tutti i partecipanti di Google Summer of Code 2014 che hanno reso questo rilascio ricco di caratteristiche e privo di bug!
-Oltre a numerose piccole correzioni, un notevole numero di patch sono state fatte dalle seguenti persone (in ordine alfabetico):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paolo Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-<ul>
-<li>Nuova lista chiave unificata</li>
-<li>Impronta chiave colorata</li>
-<li>Supporto per le porte keyserver</li>
-<li>disattivata la possibilità di generare chiavi deboli</li>
-<li>Molto più lavoro interno sulle API</li>
-<li>Certificazione ID utente</li>
-<li>Interrogazione keyserver basate su output leggibile a livello macchina</li>
-<li>Blocco del menu di navigazione sui tablet</li>
-<li>Suggerimenti per e-mail sulla creazione di chiavi</li>
-<li>Ricerca nelle liste di chiavi pubbliche</li>
-<li>E molti altri miglioramenti e correzioni ...</li>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Correzione del crash quando si aggiorna da versioni precedenti</li>
-</ul>
-<h2>2.3</h2>
-<ul>
-<li>Rimossa esportazione non necessaria delle chiavi pubbliche quando si esportano le chiavi private (grazie a Ash Hughes)</li>
-<li>Corretto impostazione data di scadenza delle chiavi (grazie a Ash Hughes)</li>
-<li>Molte altre correzioni interne quando si modificano le chiavi (grazie a Ash Hughes)</li>
-<li>Interrogazione server delle chiavi direttamente dalla schermata di importazione</li>
-<li>Corretta impaginazione e stile di dialogo su Android 2.2-3.0</li>
-<li>Corretto crash su chiavi con id utente vuoto</li>
-<li>Corretto crash e liste vuote quando si torna dalla schermata di firma</li>
-<li>Bouncy Castle (libreria crittografica) aggiornata da 1.47 a 1.50 e compilata da sorgente</li>
-<li>Corretto caricamento delle chiavi dalla schermata di firma</li>
-</ul>
-<h2>2.2</h2>
-<ul>
-<li>Nuovo design con barra di navigazione</li>
-<li>Nuovo design per la lista chiavi pubbliche</li>
-<li>Nuova visuale chiavi pubbliche</li>
-<li>Correzione bug per importazione chiavi</li>
-<li>Chiave certificazione incrociata (grazie a Ash Hughes)</li>
-<li>Password UTF-8 gestite correttamente (grazie a Ash Hughes)</li>
-<li>Prima versione con nuove lingue (grazie ai contributori su Transifex)</li>
-<li>Condivisione di chiavi via Codici QR corretta e migliorata</li>
-<li>Verifica firma pacchetto per API</li>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>Aggiornamenti API, preparazione per integrazione con K-9 Mail</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<li>Molte correzioni di bug</li>
-<li>Nuove API per sviluppatori</li>
-<li>PRNG bug fix by Google</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Completo restyle</li>
-<li>Condivisione chiavi pubbliche via codici qr, nfc beam</li>
-<li>Firma chiavi</li>
-<li>Caricamento chiavi sul server</li>
-<li>Corrette caratteristiche di importazione</li>
-<li>Nuova API AIDL</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Supporto base per server delle chiavi</li>
-<li>App2sd</li>
-<li>Aggiunte opzioni per la cache della frase di accesso: 1, 2, 4, 8 ore</li>
-<li>Traduzioni: Norvegese (grazie, Sander Danielsen), Cinese (grazie, Zhang Fredrick)</li>
-<li>Correzione bug</li>
-<li>Ottimizzazioni</li>
-</ul>
-<h2>1.0.7</h2>
-<ul>
-<li>Corretto problema con la verifica firma di testi con capo finale</li>
-<li>Maggiori opzioni per il tempo di mantenimento della cache della frase di accesso  (20, 40, 60 minuti)</li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Crash della aggiunta degli account risolto su Froyo</li>
-<li>Cancellazione sicura dei file</li>
-<li>Opzione per cancellare file delle chiavi dopo l'importazione</li>
-<li>Flusso codifica/decodifica (galleria, ecc.)</li>
-<li>Nuove opzioni (lingua, forza firme v3)</li>
-<li>Cambiamenti interfaccia</li>
-<li>Correzione bug</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Traduzione Italiana e Tedesca</li>
-<li>Dimensioni pacchetto ridotte, a causa della riduzione dei sorgenti BC</li>
-<li>Nuove preferenze GUI</li>
-<li>Regolazione layout per la localizzazione</li>
-<li>Correzione bug firma</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Corretto altro crash causato da alcuni bug SDK con query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Corretto crash durante codifica/firma e possibilita' di esportare chiave</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>Liste chiavi filtrabili</li>
-<li>Preselezione di chiavi di codifica intelligente</li>
-<li>Nuovo gestore intent per VIEW e SEND, permette la codifica/decodifica file all'infuori di file manager</li>
-<li>Caratteristiche corrette e aggiunte (preselezione chiavi) per K-9 Mail. nuova build beta disponibile</li>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>elencazione account GMail corrotta in 1.0.0, corretta nuovamente</li>
-</ul>
-<h2>1.0.0</h2>
-<ul>
-<li>integrazione K-9 Mail, APG supporto beta build di K-9 Mail</li>
-<li>Supporto per altri file manager (incluso ASTRO)</li>
-<li>traduzione Slovena</li>
-<li>Nuovo database, piu' veloce, utilizzo memoria ridotto</li>
-<li>Definiti Intent e ContentProvider per le altre app</li>
-<li>Correzione bug</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-it/help_start.html b/OpenKeychain/src/main/res/raw-it/help_start.html
deleted file mode 100644
index 026690b5a..000000000
--- a/OpenKeychain/src/main/res/raw-it/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>
-
-<h2>Contribuire</h2>
-<p>Se vuoi aiutarci nello sviluppo di OpenKeychain contribuendo al codice <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">segui la nostra breve guida su Github</a>.</p>
-
-<h2>Traduzioni</h2>
-<p>Aiutaci a tradurre OpenKeychain! Tutti possono collaborare a <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain su Transifex</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_about.html b/OpenKeychain/src/main/res/raw-ja/help_about.html
deleted file mode 100644
index 77c774cf6..000000000
--- a/OpenKeychain/src/main/res/raw-ja/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> は  Android における OpenPGP 実装です。</p>
-<p>ライセンス: GPLv3以降</p>
-
-<h2>開発者</h2>
-<ul>
-<li>Dominik Schürmann (メンテナ)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>ライブラリ</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
deleted file mode 100644
index f6ceaa427..000000000
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>鍵のファイルへのエクスポートの修正 (現実的になりました)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>鍵のファイルへのエクスポートの修正 (部分的に修正)</li>
-<li>Android 2.3でのクラッシュ修正</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Android 5でのクラッシュ修正</li>
-<li>新しい検証画面</li>
-<li>セキュアな鍵リストの直接交換(SafeSlinger ライブラリ)</li>
-<li>新しいQRコードのプログラムフロー</li>
-<li>復号化画面の再デザイン</li>
-<li>新しいアイコン利用とカラー</li>
-<li>Symantec Encryption Desktopから秘密鍵をインポート時の問題修正</li>
-<li>Yubikeyでの副鍵IDを正くチェックするようになりました</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>巨大な鍵のインポートのより良い取り扱い</li>
-<li>副鍵選択の改善</li>
-</ul>
-<h2>3.0</h2>
-<ul>
-<li>Yubikeyでの署名生成と復号化のフルサポート</li>
-<li>アプリリスト内の互換性のあるアプリをインストールが可能であると提案します</li>
-<li>復号化画面を新しいデザインに</li>
-<li>鍵のインポートで沢山の修正、また鍵のストリップでも修正</li>
-<li>鍵の認証フラグの表示と設定</li>
-<li>カスタムした鍵の生成のユーザーインタフェース</li>
-<li>ユーザーID破棄証明の修正</li>
-<li>新しいクラウド検索 (古典的な keyserverと keybase.io から検索します)</li>
-<li>OpenKeychain内で鍵をストリップするのをサポートしました</li>
-</ul>
-<h2>2.9.2</h2>
-<ul>
-<li>2.9.1での鍵破壊問題修正</li>
-<li>API経由でYubikeyの復号処理が動くようになった</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<li>暗号化スクリーンを2つに分割</li>
-<li>鍵のフラグ管理を修正 (現在Mailvelope 0.7 鍵をサポート)</li>
-<li>パスフレーズの取り回しを改善</li>
-<li>SafeSlingerでの鍵の共有</li>
-<li>Yubikey: 設定で他のPINを受け付け、現在OpenPGP API経由での署名しか動きません、OpenKeychainの内部ではないため</li>
-<li>ストリップした鍵の利用法を修正</li>
-<li>互換性のためデフォルトをSHA256に</li>
-<li>インテント API を変更しました、以下参照 https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>OpenPGP API は現在破棄/期限切れの鍵を扱えるようになり、またすべてのユーザIDを返すようになりました</li>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li>v2.8 から発生したクラッシュ問題をFix</li>
-<li>実験的にECCをサポート</li>
-<li>実験的にYubikeyをサポート(インポート済みの鍵での署名のみ)</li>
-</ul>
-<h2>2.8</h2>
-<ul>
-<li>そして主要な新しい機能を主眼としたこのリリースでたくさんのバグが修正されました</li>
-<li>鍵編集: 新しいすごいデザイン、鍵の破棄</li>
-<li>鍵インポート: 新しいすごいデザイン、hkps経由での鍵サーバとの安全な接続、そしてDNS SRVレコードによる鍵サーバの解決</li>
-<li>新しい初回表示</li>
-<li>新しい鍵生成画面: Androidのあなたの個人アカウントをベースとした名前とメールの自動補完</li>
-<li>ファイル暗号化: 新しいすごいデザイン、複数ファイルの暗号化をサポートする</li>
-<li>鍵のステータス表示の新しいアイコン(Brennan Novak提供)</li>
-<li>重要なバグ修正: 巨大な鍵コレクションをファイルからインポートするのが可能になりました</li>
-<li>キャッシュしたパスフレーズの通知表示</li>
-<li>鍵のアドレスをAndroidの連絡先と連携するようにした</li>
-</ul>
-<p> Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfiharの働きなくしてはこのリリースはありませんでした</p>
-
-<h2>2.7</h2>
-<ul>
-<li>Purple! (Dominik, Vincent)</li>
-<li>新しい鍵のビューのデザイン (Dominik, Vincent)</li>
-<li>新しいフラットな Android ボタン (Dominik, Vincent)</li>
-<li>API のフィックス (Dominik)</li>
-<li>Keybase.io からのインポート (Tim Bray)</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>いくつかのリグレッションバグ修正</li>
-</ul>
-<h2>2.6</h2>
-<ul>
-<li>鍵証明 (ありがとうVincent Breitmoser)</li>
-<li>GnuPGの部分秘密鍵のサポート (ありがとうVincent Breitmoser)</li>
-<li>新しいデザインでの署名の検証</li>
-<li>カスタムの鍵長 (ありがとうGreg Witczak)</li>
-<li>他のアプリからの共有ファンクションの修正</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>対称暗号化PGPメッセージ/ファイルの復号化を修正</li>
-<li>鍵編集画面のリファクタ (ありがとうAsh Hughes)</li>
-<li>暗号化/復号化画面を新しいモダンなデザインに</li>
-<li>OpenPGP API バージョン 3 (複数APIアカウント, 内部修正,鍵検索)</li>
-</ul>
-<h2>2.4</h2>
-<p>このリリースにおいて適用したリッチでバグのない機能を作ってくれたGoogle Summer of Code 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>さらなるAPIでの内部動作</li>
-<li>ユーザーIDの証明</li>
-<li>鍵サーバへの要求をマシンリーダブル出力を基盤にした</li>
-<li>タブレットでのナビゲーションドロワーのロック</li>
-<li>鍵の生成でのメールについての提案</li>
-<li>公開鍵リスト内での検索</li>
-<li>そしてさらなる改善と修正...</li>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>古いバージョンからのアップデートでクラッシュすることに対するホットフィックス</li>
-</ul>
-<h2>2.3</h2>
-<ul>
-<li>秘密鍵のエクスポート時における必要でない公開鍵のエクスポートの削除 (ありがとうAsh Hughes)</li>
-<li>鍵の期限日時設定の修正 (ありがとうAsh Hughes)</li>
-<li>鍵編集時のさらなる内部修正 (ありがとうAsh Hughes)</li>
-<li>インポート画面から直接鍵サーバへ要求するようにした</li>
-<li>Android 2.2から3.0でのレイアウトとダイアログスタイルの修正</li>
-<li>空ユーザIDの鍵でのクラッシュ修正</li>
-<li>署名画面から戻ってきたときにリストが空だとクラッシュするのを修正</li>
-<li>Bouncy Castle (cryptography library) を1.47 から 1.50アップデートおよびソースからのビルド</li>
-<li>署名画面からの鍵のアップロード修正</li>
-</ul>
-<h2>2.2</h2>
-<ul>
-<li>ナビゲーションドロワー付きの新しいデザイン</li>
-<li>新しい公開鍵リストデザイン</li>
-<li>新しい公開鍵ビュー</li>
-<li>鍵のインポート時のバグ修正</li>
-<li>鍵のクロス証明 (ありがとうAsh Hughes)</li>
-<li>適切な UTF-8 パスワード処理 (ありがとうAsh Hughes)</li>
-<li>新しい言語での最初のバージョン  (ありがとうTransifexの貢献者達)</li>
-<li>QRコードによる鍵共有の修正と改善</li>
-<li>APIでのパッケージ署名検証</li>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>APIアップデート、K-9 Mail統合準備</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<li>たくさんのバグ修正</li>
-<li>開発者向け新API</li>
-<li>Googleによる擬似乱数生成器バグの修正</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>再デザイン完了</li>
-<li>QRコード、NFCビームでの公開鍵共有</li>
-<li>鍵への署名</li>
-<li>鍵サーバへアップロード</li>
-<li>インポート問題修正</li>
-<li>新しいAIDL API</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>鍵サーバの基本サポート</li>
-<li>App2SD</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>改行を含まないテキストの署名検証問題の修正</li>
-<li>パスフレーズのキャッシュ生存時間 (20,40,60分) のオプション追加</li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Froyo でのアカウント追加時クラッシュの修正</li>
-<li>セキュアファイル削除</li>
-<li>鍵ファイルインポート後の削除オプション</li>
-<li>ストリーム暗号化/復号化 (ギャラリーなど)</li>
-<li>新しいオプション (言語、強制V3署名)</li>
-<li>インタフェース変更</li>
-<li>バグ修正</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>ドイツ語およびイタリア語翻訳追加</li>
-<li>BCソースが重複してしまっていたことによる、より小さいパッケージ化</li>
-<li>新しい設定GUI</li>
-<li>ローカライズでのレイアウトを適合化</li>
-<li>署名バグ修正</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>クエリービルダーによるSDKのいくつかのバグによるクラッシュの修正</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>鍵エクスポートできる時と暗号化/署名中のクラッシュ修正</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>鍵リストのフィルタ可能化</li>
-<li>暗号化鍵の事前選択のよりスマートな実装</li>
-<li>VIEWおよびSENDについて新しいインテントのハンドリング、ファイルマネージャ外のファイルを暗号化/復号化するのを受け付けるようになる。</li>
-<li>K-9 Mailにおける修正と追加機能 (鍵事前選択)、新しいベータビルド提供</li>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>1.0.0で壊れたGmailアカウントリストアップを再度修正</li>
-</ul>
-<h2>1.0.0</h2>
-<ul>
-<li>K-9 Mail 統合、K-9 MailでのAPG サポートのベータビルド</li>
-<li>(ASTROを含む)ファイルマネージャのさらなるサポート</li>
-<li>スロベニア語翻訳追加</li>
-<li>より早くてメモリ使用量の少ない新しいデータベース</li>
-<li>他のアプリでのインテントおよびコンテンツプロバイダの定義</li>
-<li>バグ修正</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_start.html b/OpenKeychain/src/main/res/raw-ja/help_start.html
deleted file mode 100644
index 6b8d1dbcd..000000000
--- a/OpenKeychain/src/main/res/raw-ja/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<h2>OpenKeychainでバグを見付けた!</h2>
-<p><a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychainのIssueトラッカー</a>を使ってバグレポートを送ってください。</p>
-
-<h2>寄贈</h2>
-<p>もし、あなたが OpenKeychain の開発を助け、コードを寄贈するというなら、<a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">Githubのミニガイドを確認</a>して下さい。</p>
-
-<h2>翻訳</h2>
-<p>OpenKeychainの翻訳を助けてください! <a href="https://www.transifex.com/projects/p/openpgp-keychain/">TransifexのOpenKeychainプロジェクト</a>に誰でも参加できます。</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_about.html b/OpenKeychain/src/main/res/raw-nl/help_about.html
deleted file mode 100644
index abcbf7087..000000000
--- a/OpenKeychain/src/main/res/raw-nl/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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 een OpenPGP implementatie voor Android.</p>
-<p>Licentie: GPLv3+</p>
-
-<h2>Ontwikkelaars</h2>
-<ul>
-<li>Dominik Schürmann (beheerder)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Bibliotheken</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 Licentie)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT-licentie)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache Licentie v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache-licentie v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache-licentie v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache-licentie v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache Licentie v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache Licentie v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache Licentie v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache Licentie v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache Licentie v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT Licentie)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache Licentie v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.html b/OpenKeychain/src/main/res/raw-nl/help_changelog.html
deleted file mode 100644
index 809ffa6e6..000000000
--- a/OpenKeychain/src/main/res/raw-nl/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Oplossing voor exporteren van sleutels naar bestanden (deze keer echt)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Oplossing voor exporteren van sleutels naar bestanden (ze werden maar gedeeltelijk geschreven)</li>
-<li>Oplossing voor crash op Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Oplossing voor crash op Android 5</li>
-<li>Nieuw certificeerscherm</li>
-<li>Veilig uitwisselen vanuit sleutellijst (SafeSlinger bibliotheek)</li>
-<li>Nieuwe QR code programma flow</li>
-<li>Nieuw design voor ontcijferingsscherm</li>
-<li>Nieuw icoon en kleuren</li>
-<li>Oplossing voor importeren van geheime sleutels van Symantec Encryption Desktop</li>
-<li>Subsleutel-ID's op Yubikeys worden nu currect gecontroleerd</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Grote sleutelimportaties worden beter behandeld</li>
-<li>Subsleutelselectie verbeterd</li>
-</ul>
-<h2>3.0</h2>
-<ul>
-<li>Volledige ondersteuning voor Yubikey ondertekeningsgeneratie en ontcijfering!</li>
-<li>Stel installeerbare compatibele apps voor in apps-lijst</li>
-<li>Nieuw design voor ontcijferingsschermen</li>
-<li>Veel oplossingen voor sleutelimporteren, lost ook gestripte sleutels op</li>
-<li>Eer en toon sleutelauthenticatievlaggen</li>
-<li>Gebruikersinterface om eigen sleutels aan te maken</li>
-<li>Oplossing voor gebruikers-ID-intrekkingscertificaten</li>
-<li>Nieuwe cloud search (zoekt op traditionele sleutelservers en keybase.io)</li>
-<li>Ondersteuning voor strippen van sleutels in OpenKeychain</li>
-</ul>
-<h2>2.9.2</h2>
-<ul>
-<li>Oplossing voor gebroken sleutels in 2.9.1</li>
-<li>Yubikey ontsleuteling werkt nu via API</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<li>Deel versleutelingsscherm in twee</li>
-<li>Oplossing voor sleutelvlaggen (ondersteunt nu Mailvelope 0.7 sleutels)</li>
-<li>Verbeterde behandeling van wachtwoorden</li>
-<li>Sleutels delen via SafeSlinger</li>
-<li>Yubikey: optie om andere PINs toe te staan, momenteel werkt enkel ondertekenen via de OpenPGP API, niet in OpenKeychain zelf</li>
-<li>Oplossing voor gestripte sleutels</li>
-<li>SHA256 als standaard voor compatibiliteit</li>
-<li>Intent API is veranderd, zie https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>OpenPGP API behandelt nu ingetrokken/verlopen sleutels en geeft alle gebruikers-ID's weer</li>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li>Oplossing voor crashes geïntroduceerd in v2.8</li>
-<li>Experimentele ondersteuning voor ECC</li>
-<li>Experimentele ondersteuning voor Yubikey (alleen ondertekenen met geïmporteerde sleutels)</li>
-</ul>
-<h2>2.8</h2>
-<ul>
-<li>Er zijn zoveel bugs opgelost in deze release dat we kunnen focussen op de belangrijke nieuwe mogelijkheden</li>
-<li>Sleutels wijzigen: nieuw design, sleutels intrekken</li>
-<li>Sleutels importeren: nieuw design, veilige verbindingen met sleutelservers via hkps, sleutelserver resolving via DNS SRV records</li>
-<li>Nieuw eerste gebruiksscherm</li>
-<li>Nieuw scherm voor sleutels aanmaken: automatisch aanvullen van naam en e-mailadres gebaseerd op persoonlijke Android-accounts</li>
-<li>Bestandsversleuteling: nieuw design, ondersteuning voor versleutelen van meerdere bestanden</li>
-<li>Nieuwe iconen om sleutelstatus weer te geven (door Brennan Novak)</li>
-<li>Belangrijke bugfix: importeren van grote sleutelbossen uit een bestand is nu mogelijk</li>
-<li>Melding om gecachete wachtwoorden weer te geven</li>
-<li>Sleutels worden verbonden aan Android's contacten</li>
-</ul>
-<p>Deze release zou niet mogelijk zijn zonder het werkt van Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
-
-<h2>2.7</h2>
-<ul>
-<li>Paars! (Dominik, Vincent)</li>
-<li>Nieuw design voor bekijken van sleutels (Dominik, Vincent)</li>
-<li>Nieuwe platte Android-knoppen (Dominik, Vincent)</li>
-<li>API-oplossingen (Dominik)</li>
-<li>Importeren uit keybase.io (Tim Bray)</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Enkele oplossingen voor regressies</li>
-</ul>
-<h2>2.6</h2>
-<ul>
-<li>Sleutelcertificaties (dank aan Vincent Breitmoser)</li>
-<li>Ondersteuning voor GnuPG gedeeltelijke geheime sleutels (dank aan Vincent Breitmoser)</li>
-<li>Nieuw design voor ondertekeningsverificatie</li>
-<li>Aangepaste sleutellengte (dank aan Greg Witczak)</li>
-<li>Oplossing voor delen vanuit andere apps</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Oplossing voor ontcijfering van symmetrische OpenPGP berichten/bestanden</li>
-<li>Nieuw ontwerp voor sleutelbewerkingsscherm (dank aan Ash Hughes)</li>
-<li>Nieuw modern design voor versleutelings/ontcijferingsschermen</li>
-<li>OpenPGP API versie 3 (meerdere API accounts, interne fixes, zoeken naar sleutels)</li>
-</ul>
-<h2>2.4</h2>
-<p>Dank aan alle deelnemers aan Google Summer of Code 2014 die deze release zo vol mogelijkheden en zonder bugs hebben gemaakt!
-Buiten verschillende kleine patches, werden een groot aantal patches gemaakt door volgende personen (alfabetisch gerangschikt):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-<ul>
-<li>Nieuwe geünificeerde sleutellijst</li>
-<li>Gekleurde sleutelvingerafdruk</li>
-<li>Ondersteuning voor sleutelserver-poorten</li>
-<li>Zet mogelijkheid om zwakke sleutels aan te maken uit</li>
-<li>Veel meer intern werk aan API</li>
-<li>Certificeer gebruikers-ID's</li>
-<li>Sleutelserverzoekopdracht gebaseerd op machine-leesbare output</li>
-<li>Zet navigatiedrawer op tablets vast</li>
-<li>Suggesties voor e-mailadress bij aanmaken van sleutels</li>
-<li>Zoeken in publieke sleutellijsten</li>
-<li>En veel more verbeteringen en fixes...</li>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix voor crash bij upgraden van oude versies</li>
-</ul>
-<h2>2.3</h2>
-<ul>
-<li>Verwijder onnodige export van publieke sleutels bij exporteren van geheime sleutel (dank aan Ash Hughes)</li>
-<li>Oplossing voor verloopdata op sleutels (dank aan Ash Hughes)</li>
-<li>Meer interne fixes by bewerken van sleutels (dank aan Ash Hughes)</li>
-<li>Zoeken op sleutelservers rechtstreeks van importscherm</li>
-<li>Oplossing voor layout en dialoogstijl op Android 2.2-3.0</li>
-<li>Oplossing voor crash op sleutels met lege gebruikers-ID's</li>
-<li>Oplossing voor crash en lege lijsten bij terugkeren van ondertekeningsscherm</li>
-<li>Bouncy Castle (cryptografie-bibliotheek) geüpdatet van 1.47 naar 1.50 en built from source</li>
-<li>Oplossing voor uploaden van sleutel van ondertekeningsscherm</li>
-</ul>
-<h2>2.2</h2>
-<ul>
-<li>Nieuw design met navigatiebalk</li>
-<li>Nieuw publieke sleutellijst design</li>
-<li>Nieuwe publieke sleutel view</li>
-<li>Bugfixes voor importeren van sleutels</li>
-<li>Sleutel certificatie (dank aan Ash Hughes)</li>
-<li>Behandel UTF-8 wachtwoorden correct (dank aan Ash Hughes)</li>
-<li>Eerste versie met nieuwe talen (dank aan de medewerkers op Transifex)</li>
-<li>Delen van sleutels via QR codes opgelost en verbeterd</li>
-<li>Pakketondertekeningsverificatie voor API</li>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API updates, voorbereiding voor K-9 Mail integratie</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<li>Veel bugfixes</li>
-<li>Nieuwe API voor ontwikkelaars</li>
-<li>PRNG bug fix door Google</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Volledig nieuw design</li>
-<li>Publieke sleutels delen via QR codes, NFC beam</li>
-<li>Sleutels ondertekenen</li>
-<li>Upload sleutels naar server</li>
-<li>Importeerproblemen opgelost</li>
-<li>Nieuwe AIDL API</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basisondersteuning voor sleutelservers</li>
-<li>App2SD</li>
-<li>Meer keuzes voor wachtwoordcache: 1, 2, 4, 8 uur</li>
-<li>Vertalingen: Noors (bedankt, Sander Danielsen), Chinees (bedankt, Zhang Fredrick)</li>
-<li>Bugfixes</li>
-<li>Optimalisaties</li>
-</ul>
-<h2>1.0.7</h2>
-<ul>
-<li>Probleem met ondertekeningsverificatie van text met achterlopende newline opgelost</li>
-<li>Meer opties voor wachtwoord cachetijd (20, 40, 60 min.)</li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Crash bij toevoegen van account op Froyo opgelost</li>
-<li>Veilige bestandsverwijdering</li>
-<li>Optie om sleutelbestand na importeren te verwijderen</li>
-<li>Stream versleuteling/ontcijfering (galerij, enz.)</li>
-<li>Nieuwe opties (taal, forceer v3 ondertekeningen)</li>
-<li>Wijzigingen in interface</li>
-<li>Bugfixes</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Duitse en Italiaanse vertaling</li>
-<li>Veel kleiner pakket, door verminderde BC bronnen</li>
-<li>Nieuwe GUI voor voorkeuren</li>
-<li>Layout wijzigingen voor localisatie</li>
-<li>Bugfix voor ondertekeningen</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Een andere crash veroorzaakt door een SDK bug met de query builder opgelost</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Crashes tijdens versleuteling/ondertekenen en mogelijk sleutelexportatie opgelost</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>Filterbare sleutellijsten</li>
-<li>Slimmere preselectie van cryptosleutels</li>
-<li>Nieuwe Intents voor VIEW en SEND, laat toe bestanden te versleutelen/ontcijferen vanuit bestandsbeheerders</li>
-<li>Oplossingen en nieuwe functies (sleutel preselectie) voor K-9 Mail, nieuwe beta build beschikbaar</li>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>Oplijsten van GMail accounts werkte niet in 1.0.0, opgelost</li>
-</ul>
-<h2>1.0.0</h2>
-<ul>
-<li>K-9 Mail integratie, APG ondersteuning voor beta build van K-9 Mail</li>
-<li>Ondersteuning voor meer bestandsbeheerders (waaronder ASTRO)</li>
-<li>Sloveense vertaling</li>
-<li>Nieuwe database, veel sneller, minder geheugengebruik</li>
-<li>Intents en content provider voor andere apps gedefinieerd</li>
-<li>Bugfixes</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_start.html b/OpenKeychain/src/main/res/raw-nl/help_start.html
deleted file mode 100644
index 04fc9c263..000000000
--- a/OpenKeychain/src/main/res/raw-nl/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>Hoe activeer ik OpenKeychain in K-9 Mail?</h2>
-<p>Volg deze stappen om OpenKeychain te gebruiken met K-9 Mail:</p>
-<ol>
-<li>Open K-9 Mail en druk lang op de account waarmee je OpenKeychain wil gebruiken.</li>
-    <li>Selecteer "Accountinstellingen", scroll helemaal naar beneden en klik op "Cryptografie".</li>
-    <li>Klik op "OpenPGP-provider" en selecteer OpenKeychain in de lijst.</li>
-</ol>
-<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>
-
-<h2>Bijdragen</h2>
-<p>Als je ons wil helpen om OpenKeychain te ontwikkelen door code bij te dragen, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">volg onze kleine gids op Github</a>.</p>
-
-<h2>Vertalingen</h2>
-<p>Help OpenKeychain te vertalen! Iedereen kan deelnemen op <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain op Transifex</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_about.html b/OpenKeychain/src/main/res/raw-pl/help_about.html
deleted file mode 100644
index ba319afca..000000000
--- a/OpenKeychain/src/main/res/raw-pl/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> jest implementacją OpenPGP pod Androida.</p>
-<p>Licencja: GPLv3+</p>
-
-<h2>Deweloperzy</h2>
-<ul>
-<li>Dominik Schürmann (Opiekun projektu)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Biblioteki</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (Licencja MIT X11)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (Licencja MIT)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (licencja Apache v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Licencja Apache v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Licencja Apache v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licencja Apache v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
deleted file mode 100644
index 07dcd04e2..000000000
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Lepsza obsługa importowania dużych ilości kluczy</li>
-<li>Poprawione wybieranie pod-kluczy</li>
-</ul>
-<h2>3.0</h2>
-<ul>
-<li>Pełna obsługa generowania podpisów i odszyfrowania Yubikey!</li>
-<li>Zaproponowano instalacje aplikacji współpracujących w liście aplikacji</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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_start.html b/OpenKeychain/src/main/res/raw-pl/help_start.html
deleted file mode 100644
index f5cd3a9aa..000000000
--- a/OpenKeychain/src/main/res/raw-pl/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>
-
-<h2>Wkład</h2>
-<p>Jeżeli chcesz pomóc nam rozwijać OpenKeychain jako programista, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">zapoznaj się z naszym małym poradnikiem na Githubie</a>.</p>
-
-<h2>Tłumaczenia</h2>
-<p>Pomóż przetłumaczyć OpenKeychain! Każdy może wziąć udział przez stronę <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain w serwisie Transifex</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_about.html b/OpenKeychain/src/main/res/raw-pt/help_about.html
deleted file mode 100644
index cf77cf11d..000000000
--- a/OpenKeychain/src/main/res/raw-pt/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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>License: GPLv3+</p>
-
-<h2>Developers</h2>
-<ul>
-<li>Dominik Schürmann (Maintainer)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_changelog.html b/OpenKeychain/src/main/res/raw-pt/help_changelog.html
deleted file mode 100644
index 0cb7d5210..000000000
--- a/OpenKeychain/src/main/res/raw-pt/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_start.html b/OpenKeychain/src/main/res/raw-pt/help_start.html
deleted file mode 100644
index 58f3fae40..000000000
--- a/OpenKeychain/src/main/res/raw-pt/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>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>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_about.html b/OpenKeychain/src/main/res/raw-ro/help_about.html
deleted file mode 100644
index cf77cf11d..000000000
--- a/OpenKeychain/src/main/res/raw-ro/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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>License: GPLv3+</p>
-
-<h2>Developers</h2>
-<ul>
-<li>Dominik Schürmann (Maintainer)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Libraries</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_changelog.html b/OpenKeychain/src/main/res/raw-ro/help_changelog.html
deleted file mode 100644
index 0cb7d5210..000000000
--- a/OpenKeychain/src/main/res/raw-ro/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_start.html b/OpenKeychain/src/main/res/raw-ro/help_start.html
deleted file mode 100644
index 58f3fae40..000000000
--- a/OpenKeychain/src/main/res/raw-ro/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>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>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_about.html b/OpenKeychain/src/main/res/raw-ru/help_about.html
deleted file mode 100644
index 52a85c45d..000000000
--- a/OpenKeychain/src/main/res/raw-ru/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> - реализация OpenPGP для Android.</p>
-<p>Лицензия: GPLv3+</p>
-
-<h2>Разработчики</h2>
-<ul>
-<li>Dominik Schürmann (Ведущий разработчик)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Компоненты</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
deleted file mode 100644
index 6c22f1315..000000000
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Исправление экспорта ключей в файл (на этот раз точно)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Исправление экспорта ключей (записывались частично)</li>
-<li>Исправление падений на Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Исправление падений на Android 5</li>
-<li>Новый диалог сертификации</li>
-<li>Безопасный обмен ключами из списка (SafeSlinger library)</li>
-<li>Новый обработчик QR кодов</li>
-<li>Изменение дизайна диалога расшифровки</li>
-<li>Использование новых иконок и цветов</li>
-<li>Исправлен импорт закрытых ключей из Symantec Encryption Desktop</li>
-<li>Корректная проверка идентификаторов доп. ключей на Yubikeys</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Улучшение обработки импорта больших ключей</li>
-<li>Улучшение выбора доп. ключей</li>
-</ul>
-<h2>3.0</h2>
-<ul>
-<li>Полная поддержка подписания и расшифровки с Yubikey!</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>Исправление ключей, сломанных в 2.9.1</li>
-<li>Расшифровка с Yubikey теперь работает через API</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<li>Разделение диалога шифрования на два окна</li>
-<li>Исправление обработки флагов ключей (теперь поддерживаются ключи Mailvelope 0.7)</li>
-<li>Улучшение обработчика паролей</li>
-<li>Передача ключей через SafeSlinger</li>
-<li>Yubikey: опция использования других PIN, пока работает только подписание через OpenPGP API, не внутри OpenKeychain</li>
-<li>Исправление использования сжатых ключей</li>
-<li>SHA256 по умолчанию для совместимости</li>
-<li>Изменение API. См. https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>OpenPGP API теперь обрабатывает отозванные/просроченные ключи и возвращает все идентификаторы</li>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li>Исправление падений, выявленных в 2.8</li>
-<li>Экспериментальная поддержка Эллиптических кривых</li>
-<li>Экспериментальная поддержка Yubikey (вход по импортированному ключу)</li>
-</ul>
-<h2>2.8</h2>
-<ul>
-<li>Так много небольших исправлений, что лучше сообщить о существенных изменениях</li>
-<li>Изменение ключа: новый дизайн, аннулирование клуча</li>
-<li>Импорт ключа: усовершенствованный дизайн, безопасное соединение с серверами ключей по протоколу hkps, определение серверов по записям DNS SRV</li>
-<li>Новый диалог при первом запуске</li>
-<li>Экран создания ключа: автодополнение имени и адреса почты из учетной записи Android</li>
-<li>Шифрование файла: усовершенствованный дизайн, возможность шифрования нескольких файлов</li>
-<li>Новые иконки статуса ключа (Brennan Novak)</li>
-<li>Важное исправление: Теперь возможен импорт большого количества ключей из одного файла</li>
-<li>Уведомление о запомненных паролях</li>
-<li>Ключи соединяются с контактами Android</li>
-</ul>
-<p>Этот релиз стал возможен благодаря работе Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
-
-<h2>2.7</h2>
-<ul>
-<li>Пурпурный! (Dominik, Vincent)</li>
-<li>Новый вид просмотра ключей (Dominik, Vincent)</li>
-<li>Новый вид кнопок в стиле Android (Dominik, Vincent)</li>
-<li>Исправления API (Dominik)</li>
-<li>Импорт Keybase.io (Tim Bray)</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Исправления найденных ошибок</li>
-</ul>
-<h2>2.6</h2>
-<ul>
-<li>Сертификация ключей (благодаря Vincent Breitmoser)</li>
-<li>Поддержка частично-секретных ключей GnuPG (благодаря  Vincent Breitmoser)</li>
-<li>Новый дизайн проверки подписи</li>
-<li>Произвольная длина ключей (благодаря Greg Witczak)</li>
-<li>Исправление ошибки получения данных от других приложений</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Исправлено симметричное шифрование сообщений/файлов</li>
-<li>Переработано окно изменения ключа (благодаря Ash Hughes)</li>
-<li>Новый дизайн для окон шифрования/расшифровки</li>
-<li>OpenPGP API версии 3 (множественные аккаунты, внутренние исправления, поиск ключей)</li>
-</ul>
-<h2>2.4</h2>
-<p>Спасибо всем участникам Google Summer of Code 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>Ещё больше улучшений работы API</li>
-<li>Сертификация пользовательских данных</li>
-<li>Запрос к серверу ключей основывается на машинном формате вывода</li>
-<li>Фиксация панели на планшетах</li>
-<li>Подсказки email при создании ключей</li>
-<li>Поиск в списках публичных ключей</li>
-<li>И множество других исправлений и улучшений...</li>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Исправление ошибки при обновлении со старых версий</li>
-</ul>
-<h2>2.3</h2>
-<ul>
-<li>Удален не требующийся экспорт публичного ключа при экспорте секретного ключа (спасибо, Ash Hughes)</li>
-<li>Исправлена ошибка срока годности ключей (спасибо, Ash Hughes)</li>
-<li>Исправления ошибок при изменении ключей (спасибо, Ash Hughes)</li>
-<li>Запрос ключа с сервера прямо из окна импорта ключей</li>
-<li>Исправление внешнего вида для Android 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>Новый дизайн с боковой панелью</li>
-<li>Новый дизайн списка ключей</li>
-<li>Новый вид просмотра ключа</li>
-<li>Исправление ошибок импорта ключей</li>
-<li>Кросс-сертификация ключей (спасибо, Ash Hughes)</li>
-<li>Правильная обработка паролей в UTF-8 (спасибо, Ash Hughes)</li>
-<li>Первая версия с новыми языками (спасибо переводчикам с Transifex)</li>
-<li>Исправление и улучшение передачи ключей через QR коды</li>
-<li>Проверка подписей пакетов для API</li>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>Обновление API, подготовка к интеграции с K-9 Mail</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<li>Множество исправлений ошибок</li>
-<li>Новый API для разработчиков</li>
-<li>Исправление ошибки генератора случайных чисел</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Переработка дизайна</li>
-<li>Передача ключей через QR коды и NFC</li>
-<li>Подписание ключей</li>
-<li>Загрузка ключей на сервер</li>
-<li>Исправление проблем импорта</li>
-<li>Новый AIDL API</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Поддержка серверов ключей</li>
-<li>App2SD</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>Исправление ошибки при проверке подписи текста с переводом строки</li>
-<li>Больше вариантов сохранения кэша пароля (20, 40, 60 минут)</li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Исправление ошибки создания записи на Froyo</li>
-<li>Безопасное удаление файлов</li>
-<li>Опция удаления файла ключа после импорта</li>
-<li>Передача шифрования (галерея и т.д.)</li>
-<li>Новые возможности (язык, v3 подписи)</li>
-<li>Изменения интерфейса</li>
-<li>Исправления ошибок</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Новые языки: немецкий, итальянский</li>
-<li>Значительное уменьшение размера программы</li>
-<li>Новый интерфейс настроек</li>
-<li>Изменение вида для локализации</li>
-<li>Исправление ошибки подписи</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Исправление еще одной ошибки, возникающей в SDK</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Исправление ошибок при шифровании/подписании и экспорте ключей</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>Фильтр списка ключей</li>
-<li>Улучшение выбора ключей шифрования</li>
-<li>Добавлена возможность шифровать файлы прямо из файлового менеджера</li>
-<li>Исправления ошибок и новые возможности для интеграции с K-9 Mail</li>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>Исправление выбора учетной записи GMail, сломанного в 1.0.0</li>
-</ul>
-<h2>1.0.0</h2>
-<ul>
-<li>интеграция с K-9 Mail, APG поддерживает beta-версию K-9 Mail</li>
-<li>Поддержка сторонних файловых менеджеров (в т.ч. ASTRO)</li>
-<li>Словенский перевод</li>
-<li>Новая база данных, еще быстрее и компактнее</li>
-<li>Добавлены обработчики для взаимодействия с другими приложениями</li>
-<li>Исправления ошибок</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_start.html b/OpenKeychain/src/main/res/raw-ru/help_start.html
deleted file mode 100644
index dbfb87503..000000000
--- a/OpenKeychain/src/main/res/raw-ru/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<h2>Я нашел ошибку в OpenKeychain!</h2>
-<p>Пожалуйста, сообщайте о возникших проблемах и найденных ошибках в разделе <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Решение проблем OpenKeychain</a>.</p>
-
-<h2>Вклад в развитие</h2>
-<p>Если Вы хотите помочь в разработке OpenKeychain, обратитесь к <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">инструкции на Github</a>.</p>
-
-<h2>Перевод</h2>
-<p>Помогите переводить OpenKeychain! Каждый может принять участие в переводе <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain на Transifex</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_about.html b/OpenKeychain/src/main/res/raw-sl/help_about.html
deleted file mode 100644
index 36ce2c104..000000000
--- a/OpenKeychain/src/main/res/raw-sl/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> je implementacija OpenPGP za Android.</p>
-<p>Licenca: GPLv3+</p>
-
-<h2>Razvijalci</h2>
-<ul>
-<li>Dominik Schürmann (vzdrževalec)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Knjižnice</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (licenca MIT X11)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (licenca MIT)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (licenca Apache v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (licenca Apache v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (licenca Apache v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (licenca Apache v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.html b/OpenKeychain/src/main/res/raw-sl/help_changelog.html
deleted file mode 100644
index 943ba79f1..000000000
--- a/OpenKeychain/src/main/res/raw-sl/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Dešifriranje z Yubikey ključem sedaj deluje prek API-ja</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<li>Ekran za šifriranje razdeljen na dva ekrana</li>
-<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
-<li>Izboljšano delo z gesli</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 je privzet za večjo združljivost</li>
-<li>Intent API je bil spremenjen, glej 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>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li>Odprava sesutij, ki so se pojavili v verziji 2.8</li>
-<li>Eksperimentalna podpora za ECC</li>
-<li>Experimental Yubikey support (signing-only with imported keys)</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>Urejanje ključev: čudovit nov izgled, preklic ključev</li>
-<li>Uvoz ključev: čudovit nov izgled, varne povezave s strežniki hkps, razreševanje strežnikov ključev preko SRV DNS vnosov</li>
-<li>Novo okno ob prvem zagonu</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>Nove ikone za prikaz statusa ključev (avtor Brennan Novak)</li>
-<li>Important bug fix: Importing of large key collections from a file is now possible</li>
-<li>Kliknite za izbris zapomnjenih gesel</li>
-<li>Ključi so povezani s kontakti v Androidu</li>
-</ul>
-<p>Ta izdaja ne bi bila mogoča brez dela avtorjev: Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray in Thialfihar</p>
-
-<h2>2.7</h2>
-<ul>
-<li>Vijolična! (Dominik, Vincent)</li>
-<li>Nova podoba za ključe (Dominik, Vincent)</li>
-<li>Nova podoba - ploski androiidni gumbi (Dominik, Vincent)</li>
-<li>API popravki (Dominik)</li>
-<li>Uboz iz Keybase.io (Tim Bray)</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Popravki hroščev ob posodobitvi iz prejšnjih različic</li>
-</ul>
-<h2>2.6</h2>
-<ul>
-<li>Overjanje ključev (hvala, Vincent Breitmoser)</li>
-<li>Podpora delnim zasebnim ključem GnuPG (hvala, Vincent Breitmoser)</li>
-<li>Nova podoba za preverjanje podpisov</li>
-<li>Izbirna dolžina ključev (hvala, Greg Witczak)</li>
-<li>Popravek za deljenje iz drugih aplikacij</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP messages/files</li>
-<li>Popravki kode za okno 'uredi ključ' (hvala, Ash Hughes)</li>
-<li>Nova, sodobna podoba za okno 'šifriranje/dešifriranje'</li>
-<li>API OpenPGP, verzija 3 (podpora za več api računov, interni popravki, iskanje ključev)</li>
-</ul>
-<h2>2.4</h2>
-<p>Hvala vsem kandidatom za Google Summer of Code 2014, ki so omogočili to vsebinsko bogato različico!
-Največje število popravkov je bilo s strani naslednjih ljudi (po abecednem vrstnem redu):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-<ul>
-<li>Nov enoten seznam ključev</li>
-<li>Obarvanje prstnih odtisov ključev</li>
-<li>Podpora za vrata strežnikov</li>
-<li>Odstranitev možnosti generiranja šibkih ključev</li>
-<li>Veliko internega dela za API</li>
-<li>Overjanje uporabniških ID-jev</li>
-<li>Iskanje po strežnikih na osnovi strojno berljivih izpisov</li>
-<li>Zaklep navigacijskega poteznika na tabličnih računalnikih</li>
-<li>Namigi za izbiro e-poštnih naslovov pri ustvarjanju ključev</li>
-<li>Iskanje po seznamu javnih ključev</li>
-<li>In še veliko drugih izboljšav in popravkov...</li>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Sesutje pri nadgraditvi iz starejše različice, hitri popravek</li>
-</ul>
-<h2>2.3</h2>
-<ul>
-<li>Odprava nepotrebnega hkratnega izvoza javnih ključev ob izvozu zasebnih (hvala, Ash Hughes)</li>
-<li>Popravek nastavitev datumov poteka ključev (hvala, Ash Hughes)</li>
-<li>Več internih popravkov pri urejanju ključev (hvala, Ash Hughes)</li>
-<li>Iskanje strežnikov naravnost iz uvoznega okna</li>
-<li>Popravki za razporeditev in pogovorna okna na Androidu 2.2-3.0</li>
-<li>Sesutje pri ključih s praznim uporabniškim ID-jem, popravek</li>
-<li>Sesutje in prazen seznam ob povratku iz podpisovalnega okna, popravek</li>
-<li>Bouncy Castle (kriptografska knjižnica) nadgrajen iz 1.47 na 1.50 in izgrajen iz izvorne kode</li>
-<li>Nalaganje ključev iz podpisovalnega okna, popravek</li>
-</ul>
-<h2>2.2</h2>
-<ul>
-<li>Nova podoba z navigacijskim poteznikom</li>
-<li>Nova podoba za seznam javnih ključev</li>
-<li>Nova podoba okna za ogled posameznih javnih ključev</li>
-<li>Odprava hroščev pri uvozu ključev</li>
-<li>Navzkrižno overjanje ključev (hvala, Ash Hughes)</li>
-<li>Pravilno upravljanje gesel v formatu UTF-8 (hvala, Ash Hughes)</li>
-<li>Prva različica z novimi jeziki (hvala prevajalcem iz portala Transifex)</li>
-<li>Izbojšave in popravki za deljenje ključev preko kod QR</li>
-<li>Preverjanje podpisov paketov za API</li>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>posodobitve za API, priprava na integracijo z aplikacijo 'K-9 Mail'</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<li>Veliko število popravkov hroščev</li>
-<li>Nov API za razvijalce</li>
-<li>popravek za hrošč PRNG, prispeval Google</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Kompletna prenova izgleda</li>
-<li>Share public keys via QR codes, NFC beam</li>
-<li>Podpisovanje ključev</li>
-<li>Nalaganje ključev na strežnik</li>
-<li>Popravki problemov z uvozom</li>
-<li>Nov AIDL API</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Osnovna podpora za strežnike</li>
-<li>Podpora app2sd</li>
-<li>Več možnosti pomnjenja gesla: 1, 2, 4, 8 ur</li>
-<li>Prevodi: Norveško (hvala, Sander Danielsen), Kitajsko (hvala, Zhang Fredrick)</li>
-<li>Razhroščevanje</li>
-<li>Optimizacije</li>
-</ul>
-<h2>1.0.7</h2>
-<ul>
-<li>Odpravljen problem pri preverjanju podpisov besedil</li>
-<li>Več možnosti za pomnjenje gesla v spominu (20, 40, 60 min) </li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Sesutje ob dodajanju računa na napravah Froyo, popravek</li>
-<li>Varno brisanje datotek</li>
-<li>Možnost izbrisa datoteke s ključem po uvozu v aplikacijo</li>
-<li>Šifriranje/dešifriranje toka (galerija, itd.)</li>
-<li>Nove možnosti (jezik, vsili podpis v3)</li>
-<li>Spremembe vmesnika</li>
-<li>Razhroščevanje</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Nemški in Italijanski prevod</li>
-<li>Veliko manjši paket zaradi manj izvorne kode BC</li>
-<li>Nov grafični vmesnik za Nastavitve</li>
-<li>Prilagoditev vmesnika za lokalizacije</li>
-<li>Popravki pri podpisovanju</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Popravek sesutja zaradi hrošča v SDK, pri sestavljanju poizvedbe</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Sesutja ob šifriranju/podpisovanju in verjetno tudi izvozu, popravek</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>Filtriranje seznama ključev</li>
-<li>Pametnejši predizbor šifrirnih ključev</li>
-<li>Nov način upravljanja z 'nameni' za 'ODPRI' in 'POŠLJI' omogoča šifriranje/dešifriranje datotek izven upravljalnikov datotek.</li>
-<li>Popravki in dodatne funkcije (predizbira ključev) za aplikacijo 'K-9 Mail', nova beta različica</li>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>seznam računov GMail v različici 1.0.0 je bil okvarjen, popravek</li>
-</ul>
-<h2>1.0.0</h2>
-<ul>
-<li>integracija z aplikacijo 'K-9 Mail', APG podpira različico beta te aplikacije</li>
-<li>Podpora za več upravljalnikov datotek (vključno z Astro)</li>
-<li>Slovenski prevod</li>
-<li>Nova baza podatkov, hitrejše delovanje, manjša raba pomnilnika</li>
-<li>Definirani 'nameni' in vsebina ponudnikov za druge aplikacije</li>
-<li>Razhroščevanje</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_start.html b/OpenKeychain/src/main/res/raw-sl/help_start.html
deleted file mode 100644
index 84a2fc8f7..000000000
--- a/OpenKeychain/src/main/res/raw-sl/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<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>
-
-<h2>Prispevajte</h2>
-<p>Če želite sodelovati pri razvoju aplikacije OpenKeychain in prispevati lastno kodo <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">prosimo sledite navodilom na Github-u</a>.</p>
-
-<h2>Prevodi</h2>
-<p>Pomagajte nam pri prevajanju aplikacije OpenKeychain! Svoje prevode lahko prispevate tukaj: <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain na Transifex</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_about.html b/OpenKeychain/src/main/res/raw-sr/help_about.html
deleted file mode 100644
index 0d2f9d697..000000000
--- a/OpenKeychain/src/main/res/raw-sr/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> је ОпенПГП имплементација за Андроид.</p>
-<p>Лиценца: ГПЛв3+</p>
-
-<h2>Програмери</h2>
-<ul>
-<li>Dominik Schürmann (главни програмер)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Библиотеке</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (МИТ Икс11 лиценца)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (МИТ лиценца)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Андроидове библиотеке подршке</a> (Апачи лиценца в2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Апачи лиценца в2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Апачи лиценца в2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Апачи лиценца в2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Апачи лиценца в2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Апачи лиценца в2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Апачи лиценца в2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Материјални дизајн)</a> (Апачи лиценца в2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Апачи лиценца в2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (МИТ лиценца)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Апачи лиценца в2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_changelog.html b/OpenKeychain/src/main/res/raw-sr/help_changelog.html
deleted file mode 100644
index 599498336..000000000
--- a/OpenKeychain/src/main/res/raw-sr/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Поправка извоза кључева у фајлове (сада заиста)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Поправка извоза кључева у фајлове (били су уписивани делимично)</li>
-<li>Поправка рушења на Андроиду 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Поправка рушења на Андроиду 5</li>
-<li>Нови екран за оверавање</li>
-<li>Сигурна размена директно са списка кључева (Сејфслингер библиотека)</li>
-<li>Нови програмски ток за бар-код</li>
-<li>Редизајн екрана дешифровања</li>
-<li>Нова употреба икона и боја</li>
-<li>Поправка увоза тајних кључева са „Symantec Encryption Desktop“</li>
-<li>ИД-ови поткључева на Јубикључу сада се исправно проверавају</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Боље руковање увозима великих кључева</li>
-<li>Побољшан одабир поткључева</li>
-</ul>
-<h2>3.0</h2>
-<ul>
-<li>Пуна подршка за прављење и дешифровање Јубикључ потписа!</li>
-<li>Предлози за инсталабилне компатибилне апликације у списку апликација</li>
-<li>Нови дизајн за екране дешифровања</li>
-<li>Много поправки за увоз кључа, такође поправљени огољени кључеви</li>
-<li>Поштовање и приказ заставица аутентификације кључа</li>
-<li>Корисничко сучеље за прављење прилагођених кључева</li>
-<li>Поправка корисничког ид-а сертификата опозива</li>
-<li>Нова клауд претрага (тражи преко традиционални сервера кључева и keybase.io)</li>
-<li>Подршка за огољивање кључева унутар Отвореног кључарника</li>
-</ul>
-<h2>2.9.2</h2>
-<ul>
-<li>Поправка кључева покварених у 2.9.1</li>
-<li>Јубикључ дешифровање сада ради преко АПИ-ја</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<li>Подела екрана шифровања на два дела</li>
-<li>Поправка руковања заставицама кључа (подршка за Mailvelope 0.7 кључеве)</li>
-<li>Побољшано руковање лозинкама</li>
-<li>Дељење кључа преко Сејфслингера (SafeSlinger)</li>
-<li>Јубикључ: опција за дозволу осталих ПИН-ова, тренутно ради само потписивање преко ОпенПГП АПИ-ја, не унутар Отвореног кључарника</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>Поправка рушења која су се појавила у в2.8</li>
-<li>Експериментална подршка за ЕЦЦ</li>
-<li>Експериментална подршка за Јубикључ (Yubikey) (само пријава са увезеним кључевима)</li>
-</ul>
-<h2>2.8</h2>
-<ul>
-<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>Љубичасто! (Доминик, Винсент)</li>
-<li>Нови дизајн приказа кључа (Доминик, Винсент)</li>
-<li>Нова равна Андроид дугмад (Доминик, Винсент)</li>
-<li>Поправке АПИ-ја (Доминик)</li>
-<li>Keybase.io увоз (Тим Бреј (Tim Bray))</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Поправке неких регресивних грешака</li>
-</ul>
-<h2>2.6</h2>
-<ul>
-<li>Овере кључа (захваљујући Винсенту Брајтмозеру)</li>
-<li>Подршка за ГнуПГ деломично тајне кључеве (захваљујући Винсенту Брајтмозеру)</li>
-<li>Нови дизајн за оверу потписа</li>
-<li>Подесива дужина кључа (захваљујући Грегу Вичаку)</li>
-<li>Поправка функције дељења из других апликација</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Поправка дешифровања симетричних ОпенПГП порука/фајлова</li>
-<li>Прерађен екран уређивања кључа (захваљујући Ешу Хјуџесу)</li>
-<li>Нови модерни дизајн за екране шифровања/дешифровања</li>
-<li>ОпенПГП АПИ издање 3 (вишеструки АПИ налози, унутрашње поправке, потрага кључа)</li>
-</ul>
-<h2>2.4</h2>
-<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>Брза поправка рушења приликом надоградње са претходних издања</li>
-</ul>
-<h2>2.3</h2>
-<ul>
-<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>Нови дизајн са навигационом фиоком</li>
-<li>Нови дизајн списка јавних кључева</li>
-<li>Нови приказ јавног кључа</li>
-<li>Поправке грешака увоза кључева</li>
-<li>Унакрсна сертификација кључева (захваљујући Ешу Хјуџесу)</li>
-<li>Исправно руковање УТФ-8 лозинкама (захваљујући Ешу Хјуџесу (Ash Hughes))</li>
-<li>Прво издање са новим језицима (захваљујући доприносиоцима са Трансифекса)</li>
-<li>Поправљено и побољшано дељење кључева преко бар-кодова</li>
-<li>Овера потписа пакета за АПИ</li>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>Ажурирања АПИ-ја, припрема за интеграцију у К-9 Пошту</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<li>Много поправљних грешака</li>
-<li>Нови АПИ за програмере</li>
-<li>Гуглова поправка ПРНГ грешке</li>
-</ul>
-<h2>2.0</h2>
-<ul>
-<li>Комплетан редизајн</li>
-<li>Подела кључева преко бар-ко̂дова, НФЦ сноп</li>
-<li>Потпис кључева</li>
-<li>Учитавање кључева на сервер</li>
-<li>Поправке за проблеме увоза</li>
-<li>Нови АИДЛ АПИ</li>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Основна подршка за сервер кључева</li>
-<li>App2sd</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>Решен проблем овере потписа текста са пратећим новим редом</li>
-<li>Још опција за време живота кеша лозинке (20, 40, 60 минута)</li>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<li>Поправљено рушење при додавању налога на Фроју</li>
-<li>Сигурно брисање фајлова</li>
-<li>Опција за брисање фајла кључа након увоза</li>
-<li>Проточно шифровање/дешифровање (галерија, итд.)</li>
-<li>Нове опције (језик, форсирање в3 потписа)</li>
-<li>Промене сучеља</li>
-<li>Поправке грешака</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<li>Немачки и талијански преводи</li>
-<li>Много мањи пакет, захваљујући редукованим БЦ изворима</li>
-<li>Нови ГУИ за поставке</li>
-<li>Подешен распоред за локализацију</li>
-<li>Поправка грешке потписа</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Поправљено још једно рушење узроковано неком СДК грешком у креатору упита</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Поправљено рушење током шифровања/потписивања и можда извоза кључева</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<li>Могућност филтрирања списка кључева</li>
-<li>Паметнији предизбор кључева за шифровање</li>
-<li>Ново Интент руковање за VIEW и SEND, дозвољава да фајлови буду шифровани/дешифровани унутар менаџера фајлова</li>
-<li>Поправке и додатне могућности (предизбор кључа) за К-9 Пошту, ново бета издање доступно</li>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>Испис налога ГМејла је био покварен у 1.0.0, поправљен поново</li>
-</ul>
-<h2>1.0.0</h2>
-<ul>
-<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_start.html b/OpenKeychain/src/main/res/raw-sr/help_start.html
deleted file mode 100644
index e1d5c7726..000000000
--- a/OpenKeychain/src/main/res/raw-sr/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>Како да активирам Отворени кључарник у К-9 Пошти?</h2>
-<p>Да бисте користили Отворени кључарник са К-9 Поштом, пратите ове кораке:</p>
-<ol>
-<li>Отворите К-9 Пошту и притисните дуго на налог са којим желите да користите Отворени кључарник.</li>
-    <li>Изаберите „поставке налога“ и клизајте на дно и притисните „криптографија“.</li>
-    <li>Кликните на „ОпенПГП апликација“ и изаберите Отворени кључарник са списка.</li>
-</ol>
-<h2>Пронађох грешку у Отвореном кључарнику!</h2>
-<p>Пријавите грешку на <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">пратиоцу проблема за Отворени кључарник</a>.</p>
-
-<h2>Доприноси</h2>
-<p>Ако желите да нам помогнете у развоју Отвореног кључарника доприносом кода, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">пратите наш мали водич на Гитхабу</a>.</p>
-
-<h2>Преводи</h2>
-<p>Помозите у превођењу Отвореног кључарника! Било ко може да учествује у <a href="https://www.transifex.com/projects/p/openpgp-keychain/">пројекту Отвореног кључара на Трансифексу</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sv/help_about.html b/OpenKeychain/src/main/res/raw-sv/help_about.html
deleted file mode 100644
index 3c401f4b1..000000000
--- a/OpenKeychain/src/main/res/raw-sv/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> är en OpenPGP-implementering för Android.</p>
-<p>Licens: GPLv3+</p>
-
-<h2>Utvecklare</h2>
-<ul>
-<li>Dominik Schürmann (Maintainer)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Bibliotek</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sv/help_changelog.html b/OpenKeychain/src/main/res/raw-sv/help_changelog.html
deleted file mode 100644
index 30ab97733..000000000
--- a/OpenKeychain/src/main/res/raw-sv/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fixade nyckelexport till filer (nu på riktigt)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fixade krasch på Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fixade krasch på Android 5</li>
-<li>Ny certifieringsskärm</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Omdesignad dekrypteringsskärm</li>
-<li>Nya ikoner och färger</li>
-<li>Fixade import av privata nycklar från Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Bättre hantering av import av stora nycklar</li>
-<li>Förbättade markeringen av undernycklar</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</ul>
-<h2>2.9</h2>
-<ul>
-<li>Fixar krascher som uppstod i v2.8</li>
-<li>Experimentellt stöd för ECC</li>
-<li>Experimentellt stöd för Yubikey (endast signering med importerade nycklar)</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>Nyckelredigering: ny design, nyckelåterkallelse</li>
-<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
-<li>Ny första gången-skärm</li>
-<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
-<li>Filkryptering: ny design, stöd för att kryptera flera filer</li>
-<li>Nya ikoner för att visa nyckelstatus (av Brennan Novak)</li>
-<li>Important bug fix: Importing of large key collections from a file is now possible</li>
-<li>Notis visar cachace lösenordsfraser</li>
-<li>Nycklar är anslutna till Androids kontakter</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>
-
-<h2>2.7</h2>
-<ul>
-<li>Lila! (Dominik, Vincent)</li>
-<li>Ny design av nyckelvy (Dominik, Vincent)</li>
-<li>Nya platta Android-knappar (Dominik, Vincent)</li>
-<li>API-fixar (Dominik)</li>
-<li>Import från Keybase.io (Tim Bray)</li>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>Ny design för verifiering av signaturer</li>
-<li>Anpassad nyckellängd (tack vare Greg Witczak)</li>
-<li>Fix share-functionality from other apps</li>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP messages/files</li>
-<li>Refactored key edit screen (thanks to Ash Hughes)</li>
-<li>Ny modern design för kryptera-/dekryptera-skärmar</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</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>Färglagda nyckelfingeravtryck</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>Certifiera användar-ID:n</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sv/help_start.html b/OpenKeychain/src/main/res/raw-sv/help_start.html
deleted file mode 100644
index 5de9f23f0..000000000
--- a/OpenKeychain/src/main/res/raw-sv/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<h2>Jag hittade en bugg i OpenKeychain!</h2>
-<p>Rapporterar buggen med <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">felrapporteringssystemen av OpenKeychain</a>.</p>
-
-<h2>Bidra</h2>
-<p>Om du vill hjälpa oss att utveckla OpenKeychain genom att bidra med kod <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">, följ vår korta guide på Github</a>.</p>
-
-<h2>Översättningar</h2>
-<p>Hjälp till med att översätta OpenKeychain! Alla kan delta i <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain på Transifex</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_about.html b/OpenKeychain/src/main/res/raw-tr/help_about.html
deleted file mode 100644
index 9933e24a9..000000000
--- a/OpenKeychain/src/main/res/raw-tr/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> Android için bir OpenPGP implementasyonudur.</p>
-<p>Lisans: GPLv3+</p>
-
-<h2>Geliştiriciler</h2>
-<ul>
-<li>Dominik Schürmann (Sorumlu)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>Kütüphaneler</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 Lisans)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Takas kütüphanesi</a> (MIT Lisans)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache Lisans v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache Lisans v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache Lisans v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache Lisans v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.html b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
deleted file mode 100644
index cb5cdaf36..000000000
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Büyük anahtar içe alımlarında iyileştirme </li>
-<li>Alt anahtar seçimleri geliştirildi</li>
-</ul>
-<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 şifre çözme şimdi API aracılığıyla çalışıyor</li>
-</ul>
-<h2>2.9.1</h2>
-<ul>
-<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>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>
-<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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Eski sürümden güncellenirken çökmeler düzeltildi</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>
-</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>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>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 güncellemeleri, K-9 Mail entegrasyonuna hazırlık</li>
-</ul>
-<h2>2.1</h2>
-<ul>
-<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>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>Temel keyserver desteği</li>
-<li>App2sd</li>
-<li>More choices for passphrase cache: 1, 2, 4, 8, hours</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>
-<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>
-</ul>
-<h2>1.0.6</h2>
-<ul>
-<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>Arayüz değişiklikleri</li>
-<li>Hata Düzeltmeleri</li>
-</ul>
-<h2>1.0.5</h2>
-<ul>
-<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>İmza hata düzetmesi</li>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</li>
-</ul>
-<h2>1.0.2</h2>
-<ul>
-<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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>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>Hata Düzeltmeleri</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_start.html b/OpenKeychain/src/main/res/raw-tr/help_start.html
deleted file mode 100644
index 868c2bbcb..000000000
--- a/OpenKeychain/src/main/res/raw-tr/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<h2>OpenKeychain'de bir bug buldum!</h2>
-<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>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>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-uk/help_about.html b/OpenKeychain/src/main/res/raw-uk/help_about.html
deleted file mode 100644
index a9a181525..000000000
--- a/OpenKeychain/src/main/res/raw-uk/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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> імплементація OpenPGP для Андроїду.</p>
-<p>Ліцензія: GPLv3+</p>
-
-<h2>Розробники</h2>
-<ul>
-<li>Домінік Шурман (супроводжувач)</li>
-<li>Арт О'Катен</li>
-<li>Еш Гуджес</li>
-<li>Браян С. Барнс</li>
-<li>Бахтіяр 'kalkin' Ґадімов</li>
-<li>Даніель Альберт</li>
-<li>Даніель Гаман</li>
-<li>Даніель Габ</li>
-<li>Ґреґ Вітчак</li>
-<li>'mar-v-in'</li>
-<li>Маркус Дойтс</li>
-<li>Міроджін Бакші</li>
-<li>Ніхіл Петер Радж</li>
-<li>Пауль Сарбіновський</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Срірам Вояпаті</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Тім Брей</li>
-<li>Вінсент Брейтмозер</li>
-</ul>
-<h2>Бібліотеки</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (ліцензія MIT X11)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (ліцензія Apache в2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (ліцензія Apache в2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (ліцензія Apache в2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (ліцензія Apache в. 2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
deleted file mode 100644
index 0cb7d5210..000000000
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_start.html b/OpenKeychain/src/main/res/raw-uk/help_start.html
deleted file mode 100644
index 5b336ed99..000000000
--- a/OpenKeychain/src/main/res/raw-uk/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<h2>Я знайшов помилку в OpenPGP Keychain!</h2>
-<p>Будь ласка, повідомте про ваду за допомогою <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">відстежувача проблем OpenPGP Keychain</a>.</p>
-
-<h2>Внесок</h2>
-<p>Якщо ви хочете допомогти нам у розробці OpenPGP Keychain через редагування коду програми <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">підпишіться на наш невеличкий посібник у Github</a>.</p>
-
-<h2>Переклади</h2>
-<p>Допоможіть перекласти OpenPGP Keychain! Кожний може взяти участь на <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain на Transifex</a>.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
deleted file mode 100644
index 0aaebdae3..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<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>是一個Android的OpenPGP應用。</p>
-<p>授權: GPLv3+</p>
-
-<h2>銘謝</h2>
-<ul>
-<li>Dominik Schürmann (維護人)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>函式庫</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11授權條款)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT授權條款)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache授權條款 v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache授權條款 v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache授權條款 v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache授權條款 v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
deleted file mode 100644
index bf28ea2e0..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>修正〝匯出金鑰到檔案〞功能(這次是真的了)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>修正〝匯出金鑰到檔案〞功能(部分完成)</li>
-<li>修正在Android 2.3上的崩潰</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>修正在Android 5上的崩潰</li>
-<li>新的認證畫面</li>
-<li>直接在金鑰清單進行安全的金鑰交換 (使用SafeSlinger程式庫)</li>
-<li>New QR Code program flow</li>
-<li>重新設計的解密畫面</li>
-<li>New icon usage and colors</li>
-<li>修正從Symantec Encryption Desktop匯入密鑰的問題</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
deleted file mode 100644
index 6ba9afe7a..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<h2>我在OpenKeychain發現問題！</h2>
-<p>請通過<a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain問題追蹤</a>回報問題。</p>
-
-<h2>發佈</h2>
-<p>如果你願意發佈原始碼協助我們開發，請參考我們Github上的<a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">發佈指南</a>。</p>
-
-<h2>翻譯</h2>
-<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/raw-zh/help_about.html b/OpenKeychain/src/main/res/raw-zh/help_about.html
deleted file mode 100644
index 9fa512604..000000000
--- a/OpenKeychain/src/main/res/raw-zh/help_about.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<html>
-<head></head>
-<body>
-<p><a href="http://www.openkeychain.org">我们的网站</a></p>
-<p><a href="http://www.openkeychain.org">OpenKeychain</a>是一个符合 OpenPGP标准的安装应用程序</p>
-<p>授权：GPLv3+</p>
-
-<h2>开发者们</h2>
-<ul>
-<li>Dominik Schürmann (Maintainer)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert</li>
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-<h2>函式庫</h2>
-<ul>
-<li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li>
-<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li>
-<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
deleted file mode 100644
index af25ad08e..000000000
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>解决在 Android 2.3 下的崩溃</li>
-</ul>
-<h2>3.1</h2>
-<ul>
-<li>解决在 Android 5 下的崩溃</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_start.html b/OpenKeychain/src/main/res/raw-zh/help_start.html
deleted file mode 100644
index cf1b84941..000000000
--- a/OpenKeychain/src/main/res/raw-zh/help_start.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head></head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-<li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<h2>我在OpenKeychain發現問題！</h2>
-<p>請利用 <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain 項目回報系統</a>回報問題。</p>
-
-<h2>發布</h2>
-<p>帮助我们开发 <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">Github</a>.</p>
-
-<h2>翻译</h2>
-<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/raw/help_about.html b/OpenKeychain/src/main/res/raw/help_about.html
deleted file mode 100644
index 6c034cc21..000000000
--- a/OpenKeychain/src/main/res/raw/help_about.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- Maintain structure with headings with h2 tags and content with p tags.
-This makes it easy to translate the values with transifex!
-And don't add newlines before or after p tags because of transifex -->
-<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>License: GPLv3+</p>
-
-<h2>Developers</h2>
-<ul>
-<li>Dominik Schürmann (Maintainer)</li>
-<li>Art O Cathain</li>
-<li>Ash Hughes</li>
-<li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov</li>
-<li>Daniel Albert
-<li>Daniel Hammann</li>
-<li>Daniel Haß</li>
-<li>Greg Witczak</li>
-<li>'mar-v-in'</li>
-<li>Markus Doits</li>
-<li>Miroojin Bakshi</li>
-<li>Nikhil Peter Raj</li>
-<li>Paul Sarbinowski</li>
-<li>'Senecaso'</li>
-<li>Signe Rüsch</li>
-<li>Sreeram Boyapati</li>
-<li>Thialfihar (APG 1.x)</li>
-<li>Tim Bray</li>
-<li>Vincent Breitmoser</li>
-</ul>
-
-<h2>Libraries</h2>
-<ul>
-<li><a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
-<li><a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
-<li><a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li>
-<li><a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
-<li><a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
-<li><a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
-<li><a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
-<li><a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li>
-<li><a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li>
-<li><a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li>
-<li><a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li>
-<li><a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li>
-<li><a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li>
-</ul>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw/help_about.md b/OpenKeychain/src/main/res/raw/help_about.md
new file mode 100644
index 000000000..df2429c6a
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw/help_about.md
@@ -0,0 +1,45 @@
+
+[http://www.openkeychain.org](http://www.openkeychain.org)
+
+[OpenKeychain](http://www.openkeychain.org) is an OpenPGP implementation for Android.
+
+License: GPLv3+
+
+## Developers
+  * Dominik Schürmann (Maintainer)
+  * Art O Cathain
+  * Ash Hughes
+  * Brian C. Barnes
+  * Bahtiar 'kalkin' Gadimov
+  * Daniel Albert
+  * Daniel Hammann
+  * Daniel Haß
+  * Greg Witczak
+  * 'mar-v-in'
+  * Markus Doits
+  * Miroojin Bakshi
+  * Nikhil Peter Raj
+  * Paul Sarbinowski
+  * 'Senecaso'
+  * Signe Rüsch
+  * Sreeram Boyapati
+  * Thialfihar (APG 1.x)
+  * Tim Bray
+  * Vincent Breitmoser
+
+## Libraries
+  * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License)
+  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
+  * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
+  * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache License v2)
+  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2)
+  * [MiniDNS](https://github.com/rtreffer/minidns) (Apache License v2)
+  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
+  * [ZXing](https://github.com/zxing/zxing) (Apache License v2)
+  * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2)
+  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design)</a> (Apache License v2)
+  * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Apache License v2)
+  * [Snackbar](https://github.com/nispok/snackbar) (MIT License)
+  * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
+  * [HtmlTextView](https://github.com/dschuermann/html-textview) (Apache License v2)
+  * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2)
diff --git a/OpenKeychain/src/main/res/raw/help_certification.html b/OpenKeychain/src/main/res/raw/help_certification.html
deleted file mode 100644
index d4aff1ad7..000000000
--- a/OpenKeychain/src/main/res/raw/help_certification.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- Maintain structure with headings with h2 tags and content with p tags.
-This makes it easy to translate the values with transifex!
-And don't add newlines before or after p tags because of transifex -->
-<html>
-<head>
-</head>
-<body>
-
-<h2>Key Confirmation</h2>
-Without confirmation, you cannot be sure if a key really corresponds to a specific person.
-The most simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC.
-To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys.
-
-<h2>Key Status</h2>
-<p><img src="status_signature_verified_cutout_24dp"/><br/>Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.
-<br/><img src="status_signature_unverified_cutout_24dp"/><br/>Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.
-<br/><img src="status_signature_expired_cutout_24dp"/><br/>Expired: This key is no longer valid. Only the owner can extend its validity.
-<br/><img src="status_signature_revoked_cutout_24dp"/><br/>Revoked: This key is no longer valid. It has been revoked by its owner.</p>
-
-<h2>Advanced Information</h2>
-<p>A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.
-This certification is a <a href="http://tools.ietf.org/html/rfc4880#section-5.2.1">"generic certification (0x10)"</a> described in the standard by:
-"The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID."</p>
-
-<p>Traditionally, certifications (also with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust.
-Our model of key confirmation is a much simpler concept to avoid common usability problems related to this Web of Trust.
-We assume that keys are verified only to a certain degree that is still usable enough to be executed "on the go".
-We also do not implement (potentially transitive) trust signatures or an ownertrust database like in GnuPG.
-Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw/help_certification.md b/OpenKeychain/src/main/res/raw/help_certification.md
new file mode 100644
index 000000000..8da27e8e0
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw/help_certification.md
@@ -0,0 +1,27 @@
+
+## Key Confirmation
+Without confirmation, you cannot be sure if a key really corresponds to a specific person.
+The most simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC.
+To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys.
+
+## Key Status
+
+<img src="status_signature_verified_cutout_24dp"/>  
+Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.  
+<img src="status_signature_unverified_cutout_24dp"/>  
+Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.  
+<img src="status_signature_expired_cutout_24dp"/>  
+Expired: This key is no longer valid. Only the owner can extend its validity.  
+<img src="status_signature_revoked_cutout_24dp"/>  
+Revoked: This key is no longer valid. It has been revoked by its owner.
+
+## Advanced Information
+A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.
+This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) described in the standard by:
+"The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID."
+
+Traditionally, certifications (also with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust.
+Our model of key confirmation is a much simpler concept to avoid common usability problems related to this Web of Trust.
+We assume that keys are verified only to a certain degree that is still usable enough to be executed "on the go".
+We also do not implement (potentially transitive) trust signatures or an ownertrust database like in GnuPG.
+Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html
deleted file mode 100644
index dcc626feb..000000000
--- a/OpenKeychain/src/main/res/raw/help_changelog.html
+++ /dev/null
@@ -1,278 +0,0 @@
-<!-- Maintain structure with headings with h2 tags and content with p tags.
-This makes it easy to translate the values with transifex!
-And don't add newlines before or after p tags because of transifex -->
-<html>
-<head>
-</head>
-<body>
-
-<h2>3.2beta2</h2>
-<ul>
-<li>Material design</li>
-<li>Integration of QR Scanner (New permissions required)</li>
-<li>Improved key creation wizard</li>
-<li>Fix missing contacts after sync</li>
-<li>Requires Android 4</li>
-<li>Redesigned key screen</li>
-<li>Simplify crypto preferences, better selection of secure ciphers</li>
-<li>API: Detached signatures, free selection of signing key,...</li>
-<li>Fix: Some valid keys were shown revoked or expired</li>
-<li>Don't accept signatures by expired or revoked subkeys</li>
-<li>Keybase.io support in advanced view</li>
-</ul>
-
-<h2>3.1.2</h2>
-<ul>
-<li>Fix key export to files (now for real)</li>
-</ul>
-
-<h2>3.1.1</h2>
-<ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
-</ul>
-
-<h2>3.1</h2>
-<ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
-</ul>
-
-<h2>3.0.1</h2>
-<ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
-</ul>
-
-<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>
-<li>Yubikey decryption now working via API</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>
-</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>
-</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>
-
-<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>
-</ul>
-
-<h2>2.6.1</h2>
-<ul>
-<li>Some fixes for regression bugs</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>
-</ul>
-
-<h2>2.5</h2>
-<ul>
-<li>Fix decryption of symmetric OpenPGP 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>
-</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>
-</ul>
-
-<h2>2.3.1</h2>
-<ul>
-<li>Hotfix for crash when upgrading from old versions</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>
-</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>
-</ul>
-
-<h2>2.1.1</h2>
-<ul>
-<li>API Updates, preparation for K-9 Mail integration</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>
-</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>
-</ul>
-
-<h2>1.0.8</h2>
-<ul>
-<li>Basic keyserver support</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>
-</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>
-</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>
-</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>
-</ul>
-
-<h2>1.0.4</h2>
-<ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
-</ul>
-
-<h2>1.0.3</h2>
-<ul>
-<li>Fixed crashes during encryption/signing and possibly key export</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>
-</ul>
-
-<h2>1.0.1</h2>
-<ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</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>
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.md b/OpenKeychain/src/main/res/raw/help_changelog.md
new file mode 100644
index 000000000..b6b992866
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw/help_changelog.md
@@ -0,0 +1,268 @@
+
+## 3.2beta2
+
+  * Material design
+  * Integration of QR Scanner (New permissions required)
+  * Improved key creation wizard
+  * Fix missing contacts after sync
+  * Requires Android 4
+  * Redesigned key screen
+  * Simplify crypto preferences, better selection of secure ciphers
+  * API: Detached signatures, free selection of signing key,...
+  * Fix: Some valid keys were shown revoked or expired
+  * Don't accept signatures by expired or revoked subkeys
+  * Keybase.io support in advanced view
+
+
+## 3.1.2
+
+  * Fix key export to files (now for real)
+
+
+## 3.1.1
+
+  * Fix key export to files (they were written partially)
+  * Fix crash on Android 2.3
+
+
+## 3.1
+
+  * Fix crash on Android 5
+  * New certify screen
+  * Secure Exchange directly from key list (SafeSlinger library)
+  * New QR Code program flow
+  * Redesigned decrypt screen
+  * New icon usage and colors
+  * Fix import of secret keys from Symantec Encryption Desktop
+  * Subkey IDs on Yubikeys are now checked correctly
+
+
+## 3.0.1
+
+  * Better handling of large key imports
+  * Improved subkey selection
+
+
+## 3.0
+
+  * Full support for Yubikey signature generation and decryption!
+  * Propose installable compatible apps in apps list
+  * New design for decryption screens
+  * Many fixes for key import, also fixes stripped keys
+  * Honor and display key authenticate flags
+  * User interface to generate custom keys
+  * Fixing user id revocation certificates
+  * New cloud search (searches over traditional keyservers and keybase.io)
+  * Support for stripping keys inside OpenKeychain
+
+
+## 2.9.2
+
+  * Fix keys broken in 2.9.1
+  * Yubikey decryption now working via API
+
+
+## 2.9.1
+
+  * Split encrypt screen into two
+  * Fix key flags handling (now supporting Mailvelope 0.7 keys)
+  * Improved passphrase handling
+  * Key sharing via SafeSlinger
+  * Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
+  * Fix usage of stripped keys
+  * SHA256 as default for compatibility
+  * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
+  * OpenPGP API now handles revoked/expired keys and returns all user ids
+
+
+## 2.9
+
+  * Fixing crashes introduced in v2.8
+  * Experimental ECC support
+  * Experimental Yubikey support (signing-only with imported keys)
+
+
+## 2.8
+
+  * So many bugs have been fixed in this release that we focus on the main new features
+  * Key edit: awesome new design, key revocation
+  * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records
+  * New first time screen
+  * New key creation screen: autocompletion of name and email based on your personal Android accounts
+  * File encryption: awesome new design, support for encrypting multiple files
+  * New icons to show status of key (by Brennan Novak)
+  * Important bug fix: Importing of large key collections from a file is now possible
+  * Notification showing cached passphrases
+  * Keys are connected to Android's contacts
+
+<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>
+
+## 2.7
+
+  * Purple! (Dominik, Vincent)
+  * New key view design (Dominik, Vincent)
+  * New flat Android buttons (Dominik, Vincent)
+  * API fixes (Dominik)
+  * Keybase.io import (Tim Bray)
+
+
+## 2.6.1
+
+  * Some fixes for regression bugs
+
+
+## 2.6
+
+  * Key certifications (thanks to Vincent Breitmoser)
+  * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
+  * New design for signature verification
+  * Custom key length (thanks to Greg Witczak)
+  * Fix share-functionality from other apps
+
+
+## 2.5
+
+  * Fix decryption of symmetric OpenPGP messages/files
+  * Refactored key edit screen (thanks to Ash Hughes)
+  * New modern design for encrypt/decrypt screens
+  * OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)
+
+
+## 2.4
+<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>
+
+  * New unified key list
+  * Colorized key fingerprint
+  * Support for keyserver ports
+  * Deactivate possibility to generate weak keys
+  * Much more internal work on the API
+  * Certify user ids
+  * Keyserver query based on machine-readable output
+  * Lock navigation drawer on tablets
+  * Suggestions for emails on creation of keys
+  * Search in public key lists
+  * And much more improvements and fixes…
+
+
+## 2.3.1
+
+  * Hotfix for crash when upgrading from old versions
+
+
+## 2.3
+
+  * Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
+  * Fix setting expiry dates on keys (thanks to Ash Hughes)
+  * More internal fixes when editing keys (thanks to Ash Hughes)
+  * Querying keyservers directly from the import screen
+  * Fix layout and dialog style on Android 2.2-3.0
+  * Fix crash on keys with empty user ids
+  * Fix crash and empty lists when coming back from signing screen
+  * Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source
+  * Fix upload of key from signing screen
+
+
+## 2.2
+
+  * New design with navigation drawer
+  * New public key list design
+  * New public key view
+  * Bug fixes for importing of keys
+  * Key cross-certification (thanks to Ash Hughes)
+  * Handle UTF-8 passwords properly (thanks to Ash Hughes)
+  * First version with new languages (thanks to the contributors on Transifex)
+  * Sharing of keys via QR Codes fixed and improved
+  * Package signature verification for API
+
+
+## 2.1.1
+
+  * API Updates, preparation for K-9 Mail integration
+
+
+## 2.1
+
+  * Lots of bug fixes
+  * New API for developers
+  * PRNG bug fix by Google
+
+
+## 2.0
+
+  * Complete redesign
+  * Share public keys via QR codes, NFC beam
+  * Sign keys
+  * Upload keys to server
+  * Fixes import issues
+  * New AIDL API
+
+
+## 1.0.8
+
+  * Basic keyserver support
+  * App2sd
+  * More choices for passphrase cache: 1, 2, 4, 8, hours
+  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Bugfixes
+  * Optimizations
+
+
+## 1.0.7
+
+  * Fixed problem with signature verification of texts with trailing newline
+  * More options for passphrase cache time to live (20, 40, 60 mins)
+
+
+## 1.0.6
+
+  * Account adding crash on Froyo fixed
+  * Secure file deletion
+  * Option to delete key file after import
+  * Stream encryption/decryption (gallery, etc.)
+  * New options (language, force v3 signatures)
+  * Interface changes
+  * Bugfixes
+
+
+## 1.0.5
+
+  * German and Italian translation
+  * Much smaller package, due to reduced BC sources
+  * New preferences GUI
+  * Layout adjustment for localization
+  * Signature bugfix
+
+
+## 1.0.4
+
+  * Fixed another crash caused by some SDK bug with query builder
+
+
+## 1.0.3
+
+  * Fixed crashes during encryption/signing and possibly key export
+
+
+## 1.0.2
+
+  * Filterable key lists
+  * Smarter pre-selection of encryption keys
+  * New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
+  * Fixes and additional features (key preselection) for K-9 Mail, new beta build available
+
+
+## 1.0.1
+
+  * GMail account listing was broken in 1.0.0, fixed again
+
+
+## 1.0.0
+
+  * K-9 Mail integration, APG supporting beta build of K-9 Mail
+  * Support of more file managers (including ASTRO)
+  * Slovenian translation
+  * New database, much faster, less memory usage
+  * Defined Intents and content provider for other apps
+  * Bugfixes
diff --git a/OpenKeychain/src/main/res/raw/help_faq.md b/OpenKeychain/src/main/res/raw/help_faq.md
new file mode 100644
index 000000000..a3b49cd0e
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw/help_faq.md
@@ -0,0 +1,126 @@
+[comment]: <> (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+
+# Frequently Asked Questions
+
+## Are my secret keys safe on my mobile device?
+
+This is a very common question, and it's not an easy one. In the end it comes down to how much you trust your mobile device.
+The real question usually isn't, "how safe are they", but rather "are they less safe than on my laptop"? The answer depends on three factors:
+
+ 1. Do you trust the hardware? Obviously, there are no guarantees that the vendor of your phone hardware didn't add some kind of backdoor.
+    Then again, the same applies to your laptop's hardware, so it's about even.
+ 2. How easily can the device be stolen? This depends a lot on how careful you are, but this too is probably about even with your laptop.
+ 3. Do you trust the software? The Android operating system actually offers a lot more in the way of security between applications than desktop operating systems.
+    No app without root privileges besides OpenKeychain can ever access the keys stored in OpenKeychain's database.
+    By comparison, any program you run on your computer can just upload your gnupg keyring, if those files belong to the same user.
+    As long as Android as a platform is trustworthy, your keys are safe from malware apps.
+
+In conclusion, we believe that secret keys are not notably less safe on your mobile than they would be on your laptop.
+If your security requirements are high enough that you don't keep your keys on your laptop, you probably shouldn't put them on your mobile either.
+Otherwise, they should be fine.
+
+## What is the best way to transfer my own key to OpenKeychain?
+
+Ideally, put the key on an sd card, import, then erase from the sd card.
+If your mobile does not have an sd card reader, read on.
+
+Our recommended method is to transfer the exported key "through the cloud", but with a super-safe passphrase which is only used during the transfer.
+Your key is **encrypted with its passphrase**, the only visible parts in the exported file are your public key.
+
+So is this really safe? The answer is: Yes, IF you use a good passphrase.
+If your passphrase is as difficult to guess as your key, an attacker will gain no useful information from your exported key file.
+To give you a (very!) rough impression, the passphrase "J0hnnnyy1995" is about a third as difficult to guess as a 2048 bit RSA key, while "%aBbaf11!o9$pP2,o9/=" is about the same.
+
+ 1. Make up a long and complex passphrase to use during the transfer.
+    It should be at least 20 characters (more is better, although more than 50 is overkill), with varying capitalization, many special characters and *no words from the dictionary*.
+    Yes, it is annoying to type, but you'll only use it once!
+    You can also write it down, but make sure to destroy the note afterwards, and make sure it is never transferred over the internet!
+ 2. Change the passphrase of your key to that one, then export
+ 3. Transfer the key file to your mobile by whatever way is most convenient to you (Mail to yourself, PushBullet, Dropbox, ...)
+ 4. Import the key with OpenKeychain, then delete the file from your storage.
+ 5. **Change the passphrase** to an easier one which is still safe, but more reasonable to type.
+    
+## Should I certify a key without manually comparing fingerprints?
+
+To certify someone's key, you should make sure that it's really that same key the other person wants you to certify with their name on it.
+
+Since keys are usually obtained from a keyserver, it is necessary to double-check that the keyserver gave you the correct key.
+This is traditionally done by manually comparing the key's entire fingerprint, character by character.
+
+However, scanning a QR code, receiving a key via NFC, or exchanging keys via SafeSlinger all have that same check already built-in, so as long as you trust the method used for key exchange, there is no reason to check the fingerprint again manually.
+
+## Can I mark public keys as trusted without certifying them with my own key?
+
+No. You can, however, simply create a new key just for certification, which will essentially be the same thing.
+    
+
+# Avanced Questions
+
+## Why is OpenKeychain's database not password protected?
+
+Your keys are already encrypted with their passphrase - that's the reason you have to input it for every crypto operation.
+There is no point in encrypting those keys again with another password, so password protecting the entire database would only protect the list of public keys.
+If this is important to you, consider using [full disk encryption](https://source.android.com/devices/tech/security/encryption/).
+
+## How can I specify connection port for Keyserver?
+
+Add a new Keyserver (or modify existing one) by going to Preferences -> General -> Keyservers. Enter the port number after the Keyserver address and preceded it by a colon.
+For example, "p80.pool.sks-keyservers.net:80" (without quotation marks) means that server "p80.pool.sks-keyservers.net" is working on a port 80.
+Default connection port is 11371 and it doesn't need to be specified.
+
+## I have more than one subkey capable of singing. Which one is selected when signing with this OpenPGP key?
+
+OpenKeychain assumes that OpenPGP keys hold one usable signing subkey only and selects the first non-revoked non-expired non-stripped one it finds in the unordered list of subkeys.
+We consider having more than one valid signing subkey an advanced usecase. You can either strip subkeys that should not be used using OpenKeychain's edit key screen or explicitly select the right subkeys when exporting from gpg with ``gpg --export-secret-subkeys``.
+
+## How to prepare a YubiKey NEO for OpenKeychain?
+
+  1. [Buy a YubiKey NEO](http://www.yubico.com/support/resellers/)
+  2. [Prepare it for usage with OpenPGP using GnuPG and Yubico's tools](http://www.yubico.com/2012/12/yubikey-neo-openpgp/).
+  3. Export the keypair from GnuPG with
+     ```
+     gpg -a --output gpg-secret-key.asc --export-secret-keys <insert key id or name>
+     ```
+     and transfer the file to your Android device.
+  4. In OpenKeychain, select "Import from file", select the file and import the keypair. It will be automatically detect that this is a keypair that works with a YubiKey only.
+
+You can now use your YubiKey with OpenKeychain and compatible [apps](http://www.openkeychain.org/apps/). A screen will appear when you need to hold your YubiKey against the NFC antenna.
+
+## How to use a different YubiKey PIN?
+  1. Deselect "Use default YubiKey PIN" in OpenKeychain's advanced settings screen
+  2. Follow [https://developers.yubico.com/ykneo-openpgp/CardEdit.html](https://developers.yubico.com/ykneo-openpgp/CardEdit.html)
+
+## How to import an existing key onto the YubiKey?
+Follow [https://developers.yubico.com/ykneo-openpgp/KeyImport.html](https://developers.yubico.com/ykneo-openpgp/KeyImport.html)
+
+## Advanced YubiKey Infos
+  * [https://developers.yubico.com/ykneo-openpgp](https://developers.yubico.com/ykneo-openpgp)
+  * [https://github.com/Yubico/ykneo-openpgp](https://github.com/Yubico/ykneo-openpgp)
+
+## Where can I find more information about OpenKeychain's security model and design decisions?
+
+Head over to our [Wiki](https://github.com/open-keychain/open-keychain/wiki).
+
+
+
+# Known Issues
+
+### Importing secret key fails
+
+Before posting a new bug report, please check if you are using gpg prior to 2.1.0 and changed the expiry date before exporting the secret key.
+
+Changing the expiry date of a key in gpg prior to version 2.1.0 breaks the secret key in a way which emerges only on export.
+It's not a problem with OpenKeychain, we correctly reject the key because its self-certificates are either invalid, or have wrong flags.
+
+This issue has been reported before ([#996](https://github.com/open-keychain/open-keychain/issues/996), [#1003](https://github.com/open-keychain/open-keychain/issues/1003), [#1026](https://github.com/open-keychain/open-keychain/issues/1026)), and can be assumed to affect a large number of users.
+The bug in gpg has been fixed in gpg 2.1.0, but that version is as of now [only deployed in debian experimental](https://packages.debian.org/search?keywords=gnupg2), not even sid.
+Another [bug report](https://bugs.g10code.com/gnupg/issue1817) has been opened to backport the fix, so we hope this gets fixed soonish.
+
+## A wrong primary user id is shown when searching on a Keyserver
+
+Unfortunately, this is a bug in the SKS Keyserver software. Its machine-readable output returns the user ids in an arbitrary order. Read the [related bug](https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index) report for more information.
+
+### Not working with AOSP Mail
+
+For now, OpenKeychain will not support AOSP Mail due to bugs in AOSP were we cannot work around ([#290](https://github.com/open-keychain/open-keychain/issues/290)).
+
diff --git a/OpenKeychain/src/main/res/raw/help_start.html b/OpenKeychain/src/main/res/raw/help_start.html
deleted file mode 100644
index 0a30cbd92..000000000
--- a/OpenKeychain/src/main/res/raw/help_start.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Maintain structure with headings with h2 tags and content with p tags.
-This makes it easy to translate the values with transifex!
-And don't add newlines before or after p tags because of transifex -->
-<html>
-<head>
-</head>
-<body>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-    <li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-
-<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>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>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw/help_start.md b/OpenKeychain/src/main/res/raw/help_start.md
new file mode 100644
index 000000000..36b9dfa33
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw/help_start.md
@@ -0,0 +1,15 @@
+
+## How do I activate OpenKeychain in K-9 Mail?
+To use OpenKeychain with K-9 Mail, you want to follow these steps:
+  1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
+  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
+
+## I found a bug in OpenKeychain!
+Please report the bug using the [issue tracker of OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues).
+
+## Contribute
+If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
+
+## Translations
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib
-Subproject 70a17dcbeb5d8de095f09a7ce756543deff0165
+Subproject 9abb91d3a69964a547f26aa1d56de233e75c441