diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
| commit | c0ebc926117d3e444c7c32bf3251880852000df6 (patch) | |
| tree | b84926b3eee5cf1cfd6d38a2c3bec23e8f0b6779 /OpenKeychain/src/main/res/raw-cs/help_changelog.html | |
| parent | ad69e47cec58287d82978b28416db50f6c3feb77 (diff) | |
| parent | b193965e585d0d492cf2744e3c86ecc9e45b71d4 (diff) | |
| download | open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.gz open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.bz2 open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.zip | |
Merge branch 'master' into yubikey
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-cs/help_changelog.html')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-cs/help_changelog.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.html b/OpenKeychain/src/main/res/raw-cs/help_changelog.html index e27ac7475..41ec2cad6 100644 --- a/OpenKeychain/src/main/res/raw-cs/help_changelog.html +++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.html @@ -7,11 +7,12 @@ <li>Key edit: awesome new design, key revocation</li> <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li> <li>New first time screen</li> -<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li> +<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li> <li>File encryption: awesome new design, support for encrypting multiple files</li> <li>New icons to show status of key (by Brennan Novak)</li> <li>Important bug fix: Importing of large key collections from a file is now possible</li> <li>Notification showing cached passphrases</li> +<li>Keys are connected to Android's contacts</li> </ul> <p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p> @@ -38,7 +39,7 @@ <h2>2.5</h2> <ul> <li>Fix decryption of symmetric pgp messages/files</li> -<li>Refactored edit key screen (thanks to Ash Hughes)</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> </ul> @@ -110,7 +111,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa <ul> <li>Basic keyserver support</li> <li>App2sd</li> -<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li> +<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li> <li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> <li>Bugfixes</li> <li>Optimizations</li> @@ -118,7 +119,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa <h2>1.0.7</h2> <ul> <li>Fixed problem with signature verification of texts with trailing newline</li> -<li>More options for pass phrase cache time to live (20, 40, 60 mins)</li> +<li>More options for passphrase cache time to live (20, 40, 60 mins)</li> </ul> <h2>1.0.6</h2> <ul> |