diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
commit | 3814ae7d53a22ba89f1e39d7a4661016f76cf8c8 (patch) | |
tree | d83d41d3c424a784da144515665fb41ef650aa52 /OpenKeychain/src/main/res/raw-sl | |
parent | dbaf7070ead596f5c70ad48fc55aada2f77a856a (diff) | |
parent | d5dd6a49c8156a699b3fbbbeef06658e1c232c16 (diff) | |
download | open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.gz open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.bz2 open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.zip |
Merge branch 'master' into mime4j
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/raw-sl')
-rw-r--r-- | OpenKeychain/src/main/res/raw-sl/help_about.md | 37 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/raw-sl/help_changelog.md | 7 |
2 files changed, 29 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/res/raw-sl/help_about.md b/OpenKeychain/src/main/res/raw-sl/help_about.md index f3319c2dd..3fe72beef 100644 --- a/OpenKeychain/src/main/res/raw-sl/help_about.md +++ b/OpenKeychain/src/main/res/raw-sl/help_about.md @@ -6,14 +6,21 @@ Licenca: GPLv3+ +[//]: # (NOTE: Alphabetic ordering) + ## Main Developers * Dominik Schürmann (Skrbnik) * Vincent Breitmoser -## Contributors +## Top Contributors * Adithya Abraham Philip - * Art O Cathain * Ash Hughes + * 'mar-v-in' + * 'Thialfihar' (APG developer) + * Tim Bray + +## Occasional Contributors + * Art O Cathain * Brian C. Barnes * Bahtiar 'kalkin' Gadimov * Daniel Albert @@ -34,7 +41,6 @@ Licenca: GPLv3+ * 'ligi' * Lukas Zorich * Manoj Khanna - * 'mar-v-in' * Markus Doits * Miroojin Bakshi * Morgan Gangwere @@ -44,22 +50,23 @@ Licenca: GPLv3+ * Signe Rüsch * Sreeram Boyapati * 'steelman' - * 'Thialfihar' (APG developer) - * Tim Bray + +[//]: # (NOTE: Alphabetic ordering) ## Knjižnice - * [SpongyCastle](http://rtyley.github.com/spongycastle/) (Licenca MIT X11) - * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (Licenca MIT) * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Licenca Apache v2) + * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licenca Apache v2) + * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2) * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Licenca Apache v2) - * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licenca Apache v2) + * [Markdown4J](https://github.com/jdcasey/markdown4j) (Licenca Apache v2) + * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2) * [MiniDNS](https://github.com/rtreffer/minidns) (Licenca Apache v2) - * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licenca Apache v2) - * [ZXing](https://github.com/zxing/zxing) (Licenca Apache v2) - * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Licenca Apache v2) + * [OkHttp](http://square.github.io/okhttp/) (Apache License v2) * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) - * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2) + * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (Licenca MIT) * [Snackbar](https://github.com/nispok/snackbar) (Licenca MIT) - * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licenca Apache v2) - * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Apache License v2) - * [Markdown4J](https://github.com/jdcasey/markdown4j) (Licenca Apache v2)
\ No newline at end of file + * [SpongyCastle](http://rtyley.github.com/spongycastle/) (Licenca MIT X11) + * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licenca Apache v2) + * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licenca Apache v2) + * [ZXing](https://github.com/zxing/zxing) (Licenca Apache v2) + * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Licenca Apache v2)
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.md b/OpenKeychain/src/main/res/raw-sl/help_changelog.md index 45ac104e0..11d7975b1 100644 --- a/OpenKeychain/src/main/res/raw-sl/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.md @@ -1,5 +1,12 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.5 + + * Key revocation on key deletion + * Improved checks for insecure cryptography + * Fix: Don't close OpenKeychain after first time wizard succeeds + * API: Version 8 + ## 3.4 * Anonymous key download over Tor |