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-fr/help_about.md | |
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-fr/help_about.md')
-rw-r--r-- | OpenKeychain/src/main/res/raw-fr/help_about.md | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/res/raw-fr/help_about.md b/OpenKeychain/src/main/res/raw-fr/help_about.md index 0eb1e9823..5994ae4df 100644 --- a/OpenKeychain/src/main/res/raw-fr/help_about.md +++ b/OpenKeychain/src/main/res/raw-fr/help_about.md @@ -6,14 +6,21 @@ Licence : GPLv3+ +[//] : # (NOTE : tri alphabétique) + ## Développeurs principaux * Dominik Schürmann (mainteneur) * Vincent Breitmoser -## Contributeurs +## Meilleurs contributeurs * Adithya Abraham Philip - * Art O Cathain * Ash Hughes + * « mar-v-in » + * 'Thialfihar' (développeur APG) + * Tim Bray + +## Contributeurs occasionnels + * Art O Cathain * Brian C. Barnes * Bahtiar « kalkin » Gadimov * Daniel Albert @@ -34,7 +41,6 @@ Licence : GPLv3+ * 'ligi' * Lukas Zorich * Manoj Khanna - * « mar-v-in » * Markus Doits * Miroojin Bakshi * Morgan Gangwere @@ -44,22 +50,23 @@ Licence : GPLv3+ * Signe Rüsch * Sreeram Boyapati * 'steelman' - * 'Thialfihar' (développeur APG) - * Tim Bray + +[//] : # (NOTE : tri alphabétique) ## Bibliothèques - * [SpongyCastle](http://rtyley.github.com/spongycastle/) (Licence MIT X11) - * [Bibliothèque d'échange SafeSlinger](https://github.com/SafeSlingerProject/exchange-android) (Licence MIT) * [Bibliothèques de soutien Android](http://developer.android.com/tools/support-library/index.html) (Licence Apache v2) + * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licence Apache v2) + * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Licence Apache v2) * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Licence Apache v2) - * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licence Apache v2) + * [Markdown4J](https://github.com/jdcasey/markdown4j) (Licence Apache v2) + * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Licence Apache v2) * [MiniDNS](https://github.com/rtreffer/minidns) (Licence Apache v2) - * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licence Apache v2) - * [ZXing](https://github.com/zxing/zxing) (Licence Apache v2) - * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Licence Apache v2) + * [OkHttp](http://square.github.io/okhttp/) (licence Apache v2) * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Conception matérielle)</a> (Licence Apache v2) - * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Licence Apache v2) + * [Bibliothèque d'échange SafeSlinger](https://github.com/SafeSlingerProject/exchange-android) (Licence MIT) * [Snackbar](https://github.com/nispok/snackbar) (Licence MIT) - * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licence Apache v2) - * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Licence Apache v2) - * [Markdown4J](https://github.com/jdcasey/markdown4j) (Licence Apache v2)
\ No newline at end of file + * [SpongyCastle](http://rtyley.github.com/spongycastle/) (Licence MIT X11) + * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licence Apache v2) + * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licence Apache v2) + * [ZXing](https://github.com/zxing/zxing) (Licence Apache v2) + * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Licence Apache v2)
\ No newline at end of file |