diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
| commit | e457d4c9097cb3f2e1c6305609cfacff1c5c38c2 (patch) | |
| tree | 9d6410b554b68aca6aa49539e045e9db5d703cbf /OpenKeychain/src/main/res/raw-sl | |
| parent | 9a3a032d99064cd16ca065a214d8f7fd09d54088 (diff) | |
| parent | 40751bceb586d12da671966c1ad5661223819c5b (diff) | |
| download | open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.gz open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.bz2 open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/raw-sl')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-sl/help_about.html | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw-sl/help_changelog.html | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/raw-sl/help_about.html b/OpenKeychain/src/main/res/raw-sl/help_about.html index a97ce04a0..a34746c51 100644 --- a/OpenKeychain/src/main/res/raw-sl/help_about.html +++ b/OpenKeychain/src/main/res/raw-sl/help_about.html @@ -51,7 +51,7 @@ <li> <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (licenca Apache v2)</li> <li> -<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li> +<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (licenca MIT)</li> </ul> </body> </html> diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.html b/OpenKeychain/src/main/res/raw-sl/help_changelog.html index da12fec8e..7328172cd 100644 --- a/OpenKeychain/src/main/res/raw-sl/help_changelog.html +++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.html @@ -1,16 +1,21 @@ <html> <head></head> <body> -<h2>2.10</h2> +<h2>2.9.2</h2> <ul> -<li>Split encrypt screen into two</li> +<li>Popravek ključev, pokvarjenih v verziji 2.9.1</li> +<li>Dešifriranje z Yubikey ključem sedaj deluje prek API-ja</li> +</ul> +<h2>2.9.1</h2> +<ul> +<li>Ekran za šifriranje razdeljen na dva ekrana</li> <li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li> -<li>Improved passphrase handling</li> +<li>Izboljšano delo z gesli</li> <li>Key sharing via SafeSlinger</li> <li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li> <li>Fix usage of stripped keys</li> -<li>SHA256 as default for compatibility</li> -<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li> +<li>SHA256 je privzet za večjo združljivost</li> +<li>Intent API je bil spremenjen, glej https://github.com/open-keychain/open-keychain/wiki/Intent-API</li> <li>OpenPGP API now handles revoked/expired keys and returns all user ids</li> </ul> <h2>2.9</h2> |