From e6b64f5f3bc1b3802778dfd9082f200d5f8709d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 4 Feb 2014 18:36:10 +0100 Subject: [PATCH] better help text --- .../ui/adapter/KeyListPublicAdapter.java | 2 -- .../src/main/res/raw-de/help_start.html | 30 +++++++++---------- .../src/main/res/raw/help_start.html | 23 ++++++-------- 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 @@ + - + + -

EXPERIMENTAL software

-

This is EXPERIMENTAL software. Use at your own risk!

-

Getting started

-

First you need some keys. Import or create them via the option menus in "My Secret Keys". -
It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.

- -

Big ToDos

- -

If you want to contribute, fork it and do a pull request on Github: https://github.com/dschuermann/openpgp-keychain

+

First you need some keys. Import or create them via the option menus in "My Keys". +
It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.

I found a bug in OpenPGP Keychain!

-

Please report it in the issue tracker of OpenPGP Keychain.

+

Please report it in the issue tracker of OpenPGP Keychain.

+ +

Contribute

+

If you want to help us developing OpenPGP Keychain by contributing code follow our small guide on Github.

+ +

Translations

+

Help translating OpenPGP Keychain! Everybody can participate at OpenPGP Keychain on Transifex.

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

EXPERIMENTAL software

-

This is EXPERIMENTAL software. Use at your own risk!

-

Getting started

-

First you need some keys. Import or create them via the option menus in "My Secret Keys". - +

First you need some keys. Import or create them via the option menus in "My Keys".
It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.

-

Big ToDos

- -

If you want to contribute, fork it and do a pull request on Github: https://github.com/dschuermann/openpgp-keychain

-

I found a bug in OpenPGP Keychain!

-

Please report it in the issue tracker of OpenPGP Keychain.

+

Please report it in the issue tracker of OpenPGP Keychain.

+ +

Contribute

+

If you want to help us developing OpenPGP Keychain by contributing code follow our small guide on Github.

+ +

Translations

+

Help translating OpenPGP Keychain! Everybody can participate at OpenPGP Keychain on Transifex.

+