diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 14:39:28 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 14:39:28 +0100 |
| commit | 2f83291920e024b0f8038fe0caa747051b41cf1c (patch) | |
| tree | 780fc0975e56b3dbd8a1eb4cb2988ac3e2e23ea1 /OpenKeychain/src/main/res/raw-fi | |
| parent | aa22a0defcf94d5f734d3a00288f5c8d916d2e57 (diff) | |
| parent | 4e29d027af05fc574dc5398d2fb3afcdf3defc70 (diff) | |
| download | open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.tar.gz open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.tar.bz2 open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.zip | |
NON-WORKING Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
OpenKeychain/src/main/res/values/strings.xml
extern/spongycastle
Diffstat (limited to 'OpenKeychain/src/main/res/raw-fi')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-fi/help_changelog.html | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw-fi/help_start.html | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw-fi/help_wot.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.html b/OpenKeychain/src/main/res/raw-fi/help_changelog.html index 4d3d293ac..0cb7d5210 100644 --- a/OpenKeychain/src/main/res/raw-fi/help_changelog.html +++ b/OpenKeychain/src/main/res/raw-fi/help_changelog.html @@ -99,7 +99,7 @@ </ul> <h2>2.5</h2> <ul> -<li>Fix decryption of symmetric pgp messages/files</li> +<li>Fix decryption of symmetric OpenPGP messages/files</li> <li>Refactored key edit screen (thanks to Ash Hughes)</li> <li>New modern design for encrypt/decrypt screens</li> <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li> diff --git a/OpenKeychain/src/main/res/raw-fi/help_start.html b/OpenKeychain/src/main/res/raw-fi/help_start.html index 4f029ab37..92fd4a92a 100644 --- a/OpenKeychain/src/main/res/raw-fi/help_start.html +++ b/OpenKeychain/src/main/res/raw-fi/help_start.html @@ -4,7 +4,7 @@ <h2>Getting started</h2> <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>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> +<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.</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/OpenKeychain/src/main/res/raw-fi/help_wot.html b/OpenKeychain/src/main/res/raw-fi/help_wot.html index 29790139b..2a551f79c 100644 --- a/OpenKeychain/src/main/res/raw-fi/help_wot.html +++ b/OpenKeychain/src/main/res/raw-fi/help_wot.html @@ -2,7 +2,7 @@ <head></head> <body> <h2>Web of Trust</h2> -<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p> +<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p> <h2>Support in OpenKeychain</h2> <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p> |