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-es/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-es/help_about.md')
-rw-r--r-- | OpenKeychain/src/main/res/raw-es/help_about.md | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/res/raw-es/help_about.md b/OpenKeychain/src/main/res/raw-es/help_about.md index fdf0e7063..194adfd3a 100644 --- a/OpenKeychain/src/main/res/raw-es/help_about.md +++ b/OpenKeychain/src/main/res/raw-es/help_about.md @@ -1,4 +1,4 @@ -[//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!) +[//]: # (NOTA: ¡Ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!) [http://www.openkeychain.org](http://www.openkeychain.org) @@ -6,14 +6,21 @@ Licencia: GPLv3+ +[//]: # (NOTA: Orden alfabético) + ## Desarrolladores principales * Dominik Schürmann (Mantenedor) * Vincent Breitmoser -## Contribuidores +## Máximos contribuidores * Adithya Abraham Philip - * Art O Cathain * Ash Hughes + * 'mar-v-in' + * 'Thialfihar' (desarrollador APG) + * Tim Bray + +## Contribuidores ocasionales + * Art O Cathain * Brian C. Barnes * Bahtiar 'kalkin' Gadimov * Daniel Albert @@ -34,7 +41,6 @@ Licencia: GPLv3+ * 'ligi' * Lukas Zorich * Manoj Khanna - * 'mar-v-in' * Markus Doits * Miroojin Bakshi * Morgan Gangwere @@ -44,22 +50,23 @@ Licencia: GPLv3+ * Signe Rüsch * Sreeram Boyapati * 'steelman' - * 'Thialfihar' (desarrollador APG) - * Tim Bray + +[//]: # (NOTA: Orden alfabético) ## Librerías - * [SpongyCastle](http://rtyley.github.com/spongycastle/) (Licencia MIT X11) - * [Librería SafeSlinger Exchange](https://github.com/SafeSlingerProject/exchange-android) (Licencia MIT) * [Librerías de Soporte Android](http://developer.android.com/tools/support-library/index.html) (Licencia Apache v2) + * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licencia Apache v2) + * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Licencia Apache v2) * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Licencia Apache v2) - * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licencia Apache v2) + * [Markdown4J](https://github.com/jdcasey/markdown4j) (Licencia Apache v2) + * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Licencia Apache v2) * [MiniDNS](https://github.com/rtreffer/minidns) (Licencia Apache v2) - * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licencia Apache v2) - * [ZXing](https://github.com/zxing/zxing) (Licencia Apache v2) - * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Licencia Apache v2) + * [OkHttp](http://square.github.io/okhttp/) (Licencia Apache v2) * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Licencia Apache v2) - * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Licencia Apache v2) + * [Librería SafeSlinger Exchange](https://github.com/SafeSlingerProject/exchange-android) (Licencia MIT) * [Snackbar](https://github.com/nispok/snackbar) (Licencia MIT) - * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licencia Apache v2) - * [HtmlTextView](https://github.com/sufficientlysecure/html-textview) (Licencia Apache v2) - * [Markdown4J](https://github.com/jdcasey/markdown4j) (Licencia Apache v2)
\ No newline at end of file + * [SpongyCastle](http://rtyley.github.com/spongycastle/) (Licencia MIT X11) + * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licencia Apache v2) + * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licencia Apache v2) + * [ZXing](https://github.com/zxing/zxing) (Licencia Apache v2) + * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Licencia Apache v2)
\ No newline at end of file |