diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 18:36:10 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 18:36:10 +0100 |
| commit | e6b64f5f3bc1b3802778dfd9082f200d5f8709d8 (patch) | |
| tree | 4ef42f53607b00b49b16527ea4618a101dc25b7c /OpenPGP-Keychain | |
| parent | 34ec841a0b536b68b98776ca36e4e618cf9bb985 (diff) | |
| download | open-keychain-e6b64f5f3bc1b3802778dfd9082f200d5f8709d8.tar.gz open-keychain-e6b64f5f3bc1b3802778dfd9082f200d5f8709d8.tar.bz2 open-keychain-e6b64f5f3bc1b3802778dfd9082f200d5f8709d8.zip | |
better help text
Diffstat (limited to 'OpenPGP-Keychain')
3 files changed, 24 insertions, 31 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java index 40cdb91ad..257136cbd 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java @@ -93,13 +93,11 @@ public class KeyListPublicAdapter extends CursorAdapter implements StickyListHea String userId = cursor.getString(mIndexUserId); String[] userIdSplit = PgpKeyHelper.splitUserId(userId); - if (userIdSplit[0] != null) { mainUserId.setText(userIdSplit[0]); } else { mainUserId.setText(R.string.user_id_no_name); } - if (userIdSplit[1] != null) { mainUserIdRest.setText(userIdSplit[1]); mainUserIdRest.setVisibility(View.VISIBLE); diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html index 1386e8cc1..e2841ac5c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html @@ -1,22 +1,22 @@ +<!-- 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> +<head> +</head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> - -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>First you need some keys. Import or create them via the option menus in "My Keys". + <br/>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report it in the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain 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 OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex.</a></p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_start.html b/OpenPGP-Keychain/src/main/res/raw/help_start.html index 097e22ba8..8aedfb370 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_start.html @@ -5,23 +5,18 @@ And don't add newlines before or after p tags because of transifex --> <head> </head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys". -<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> +<p>First you need some keys. Import or create them via the option menus in "My Keys". <br/>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> - <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report it in the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain 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 OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex.</a></p> + </body> </html> |