diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-10 16:19:46 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-10 16:19:46 +0100 |
| commit | 58d066a54e5ed1d4f7f28f22f49826fe5b69e172 (patch) | |
| tree | feb3c84d1a34a829dea892fd523256e80da04860 /OpenKeychain/src/main/res/raw-fi | |
| parent | 446e16fc62df97ceb554efee5a745e018afcb569 (diff) | |
| download | open-keychain-58d066a54e5ed1d4f7f28f22f49826fe5b69e172.tar.gz open-keychain-58d066a54e5ed1d4f7f28f22f49826fe5b69e172.tar.bz2 open-keychain-58d066a54e5ed1d4f7f28f22f49826fe5b69e172.zip | |
Pull from transifex
Diffstat (limited to 'OpenKeychain/src/main/res/raw-fi')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-fi/help_about.html | 20 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw-fi/help_start.html | 11 |
2 files changed, 19 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/res/raw-fi/help_about.html b/OpenKeychain/src/main/res/raw-fi/help_about.html index 2c6c5b3c4..cf77cf11d 100644 --- a/OpenKeychain/src/main/res/raw-fi/help_about.html +++ b/OpenKeychain/src/main/res/raw-fi/help_about.html @@ -31,27 +31,31 @@ <h2>Libraries</h2> <ul> <li> -<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</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 Library v7 'appcompat'</a> (Apache License v2)</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/JohnPersano/SuperToasts">SuperToasts</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="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li> +<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li> <li> -<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> +<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li> <li> -<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li> +<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li> <li> -<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</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_start.html b/OpenKeychain/src/main/res/raw-fi/help_start.html index 92fd4a92a..58f3fae40 100644 --- a/OpenKeychain/src/main/res/raw-fi/help_start.html +++ b/OpenKeychain/src/main/res/raw-fi/help_start.html @@ -1,11 +1,14 @@ <html> <head></head> <body> -<h2>Getting started</h2> -<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> - -<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p> +<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> |