diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-24 15:31:37 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-24 15:31:37 +0200 |
| commit | a50fe142e42b8925fcd51be3d2acf0e639738e44 (patch) | |
| tree | ed71384659a1ea1a387d5b4096c7676d57ccf6fa /OpenKeychain/src/main/res | |
| parent | 7c6eff6d92ebf6383659a101cff1438dcf959ed8 (diff) | |
| parent | 514c8ea9e90e0daff5a45774c18d973265541ae3 (diff) | |
| download | open-keychain-a50fe142e42b8925fcd51be3d2acf0e639738e44.tar.gz open-keychain-a50fe142e42b8925fcd51be3d2acf0e639738e44.tar.bz2 open-keychain-a50fe142e42b8925fcd51be3d2acf0e639738e44.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml | 11 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw/help_nfc_beam.html | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw/help_start.html | 10 |
3 files changed, 14 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml index 543f7d675..b67da13a6 100644 --- a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml +++ b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml @@ -23,4 +23,15 @@ android:layout_centerVertical="true" android:layout_toRightOf="@+id/api_apps_adapter_item_icon" /> + <ImageView + android:id="@+id/api_apps_adapter_install_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_action_download" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:padding="8dp" /> + + </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/raw/help_nfc_beam.html b/OpenKeychain/src/main/res/raw/help_nfc_beam.html index f3bb9d16e..30060a897 100644 --- a/OpenKeychain/src/main/res/raw/help_nfc_beam.html +++ b/OpenKeychain/src/main/res/raw/help_nfc_beam.html @@ -7,7 +7,7 @@ And don't add newlines before or after p tags because of transifex --> <body> <h2>How to receive keys</h2> <ol> -<li>Go to your partners contacts and open the contact you want to share.</li> +<li>Go to your partners keys and open the key you want to share.</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 partners 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 your device.</li> diff --git a/OpenKeychain/src/main/res/raw/help_start.html b/OpenKeychain/src/main/res/raw/help_start.html index 58d1340c9..d54780491 100644 --- a/OpenKeychain/src/main/res/raw/help_start.html +++ b/OpenKeychain/src/main/res/raw/help_start.html @@ -6,15 +6,9 @@ And don't add newlines before or after p tags because of transifex --> </head> <body> <h2>Getting started</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>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>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: -<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 something, e.g. a door</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. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</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> |