better help text

This commit is contained in:
Dominik Schürmann 2014-02-04 18:36:10 +01:00
parent 34ec841a0b
commit e6b64f5f3b
3 changed files with 24 additions and 31 deletions

View File

@ -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);

View File

@ -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>

View File

@ -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>