diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
| commit | 4afd6b881edfd0bc404734a4e8959a7a0fa785a7 (patch) | |
| tree | 63a051fb595d168f8ddbfd76a51bb2319889d40b /OpenKeychain/src/main/res/raw-eu | |
| parent | ba7d8a58673d55660bc7faf68970229f17458514 (diff) | |
| parent | db39b779c984a758e13adc16837893509f3b364f (diff) | |
| download | open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.gz open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.bz2 open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-eu')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-eu/help_about.html | 36 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw-eu/help_start.html | 19 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw-eu/nfc_beam_share.html | 11 |
3 files changed, 31 insertions, 35 deletions
diff --git a/OpenKeychain/src/main/res/raw-eu/help_about.html b/OpenKeychain/src/main/res/raw-eu/help_about.html index 2c6c5b3c4..6f19ccaad 100644 --- a/OpenKeychain/src/main/res/raw-eu/help_about.html +++ b/OpenKeychain/src/main/res/raw-eu/help_about.html @@ -2,12 +2,12 @@ <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> +<p><a href="http://www.openkeychain.org">OpenKeychain</a> Android-rako OpenPGP inplemetazio bat da.</p> +<p>Baimena: GPLv3+</p> -<h2>Developers</h2> +<h2>Garatzaileak</h2> <ul> -<li>Dominik Schürmann (Maintainer)</li> +<li>Dominik Schürmann (Mantentzailea)</li> <li>Art O Cathain</li> <li>Ash Hughes</li> <li>Brian C. Barnes</li> @@ -28,30 +28,34 @@ <li>Tim Bray</li> <li>Vincent Breitmoser</li> </ul> -<h2>Libraries</h2> +<h2>Liburutegiak</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 Baimena)</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="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT Baimena)</li> <li> -<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</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/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</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 License v2)</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 License v2)</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 License v2)</li> +<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache Baimena 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-eu/help_start.html b/OpenKeychain/src/main/res/raw-eu/help_start.html index 92fd4a92a..0e05e3790 100644 --- a/OpenKeychain/src/main/res/raw-eu/help_start.html +++ b/OpenKeychain/src/main/res/raw-eu/help_start.html @@ -1,19 +1,22 @@ <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>I found a bug in OpenKeychain!</h2> +<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>Contribute</h2> +<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>Translations</h2> -<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p> +<h2>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-eu/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-eu/nfc_beam_share.html deleted file mode 100644 index 083e055c7..000000000 --- a/OpenKeychain/src/main/res/raw-eu/nfc_beam_share.html +++ /dev/null @@ -1,11 +0,0 @@ -<html> -<head></head> -<body> -<ol> -<li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li> -<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> -<li>Tap the card and the content will then load on the other person’s device.</li> -</ol> -</body> -</html> |