diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-13 18:52:48 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-13 18:52:48 +0200 |
| commit | be46eabdb51918b668773607720ce71f530c4feb (patch) | |
| tree | 77334f490cb580bca7fb0f8388701d17f13cb644 | |
| parent | 2aa3eb2bb57077fdbc7635da6095cb73962978e8 (diff) | |
| download | open-keychain-be46eabdb51918b668773607720ce71f530c4feb.tar.gz open-keychain-be46eabdb51918b668773607720ce71f530c4feb.tar.bz2 open-keychain-be46eabdb51918b668773607720ce71f530c4feb.zip | |
Add pgpauth app to help, update html-textview
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/apps_pgpauth.png | bin | 0 -> 16342 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/raw-de/help_start.html | 24 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw/help_start.html | 7 | ||||
| m--------- | extern/html-textview | 0 |
4 files changed, 4 insertions, 27 deletions
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/apps_pgpauth.png b/OpenKeychain/src/main/res/drawable-xxhdpi/apps_pgpauth.png Binary files differnew file mode 100644 index 000000000..4cf6a6770 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/apps_pgpauth.png 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 2fb606f76..000000000 --- a/OpenKeychain/src/main/res/raw-de/help_start.html +++ /dev/null @@ -1,24 +0,0 @@ -<html> -<head></head> -<body> -<h2>Los gehts</h2> -<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> - -<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> - -<h2>Applications</h2> -<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p> -<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p> -<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p> - -<h2>Ich habe einen Fehler in OpenKeychain gefunden!</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>Unterstützen</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>Übersetzungen</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.html b/OpenKeychain/src/main/res/raw/help_start.html index 0a1da56f4..26386d3d4 100644 --- a/OpenKeychain/src/main/res/raw/help_start.html +++ b/OpenKeychain/src/main/res/raw/help_start.html @@ -11,9 +11,10 @@ And don't add newlines before or after p tags because of transifex --> <p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <h2>Applications</h2> -<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p> -<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"/>Conversations</a>: Jabber/XMPP client</p> -<p><img src="apps_k9"/>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p> +<p>Several applications support OpenKeychain to encrypt/sign your private communication: +<br/><img src="apps_k9"/><br/>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>! +<br/><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"/><br/>Conversations</a>: Jabber/XMPP client +<br/><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"/><br/>PGPAuth</a>: App to send a PGP-signed request to a server to open or close $thing</p> <h2>I found a bug in OpenKeychain!</h2> <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p> diff --git a/extern/html-textview b/extern/html-textview -Subproject bae0199d69c05b9df242b323eda2f8bb4fb1081 +Subproject 51d7e3f4fb7db530733ae26255c73c1ad49ca9a |
