diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-24 13:19:43 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-24 13:19:43 +0100 |
| commit | 040cf42cb07c0bc58aceb048804c6d9359754499 (patch) | |
| tree | 8534be929516f9a2d5a489b8fd9e14d247f1a392 /OpenKeychain/src/main/res/raw-es/help_about.md | |
| parent | c694d73cab1edf91cb94d53cc8352ca93f0eb6ce (diff) | |
| parent | eeccd7cd1475f02a9f4650f1debc38ab6a66d866 (diff) | |
| download | open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.tar.gz open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.tar.bz2 open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.zip | |
Merge branch 'development' into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-es/help_about.md')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-es/help_about.md | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/raw-es/help_about.md b/OpenKeychain/src/main/res/raw-es/help_about.md new file mode 100644 index 000000000..0435b2d5b --- /dev/null +++ b/OpenKeychain/src/main/res/raw-es/help_about.md @@ -0,0 +1,45 @@ + +[http://www.openkeychain.org](http://www.openkeychain.org) + +[OpenKeychain](http://www.openkeychain.org) es una implementación de OpenPGP para Android. + +Licencia: GPLv3+ + +## Desarrolladores + * Dominik Schürmann (Mantenedor) + * Art O Cathain + * Ash Hughes + * Brian C. Barnes + * Bahtiar 'kalkin' Gadimov + * Daniel Albert + * Daniel Hammann + * Daniel Haß + * Greg Witczak + * 'mar-v-in' + * Markus Doits + * Miroojin Bakshi + * Nikhil Peter Raj + * Paul Sarbinowski + * 'Senecaso' + * Signe Rüsch + * Sreeram Boyapati + * Thialfihar (APG 1.x) + * Tim Bray + * Vincent Breitmoser + +## 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) + * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Licencia Apache v2) + * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (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) + * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Diseño estilo Material)</a> (Licencia Apache v2) + * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Licencia Apache v2) + * [Snackbar](https://github.com/nispok/snackbar) (Licencia MIT) + * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licencia Apache v2) + * [HtmlTextView](https://github.com/dschuermann/html-textview) (Licencia Apache v2) + * [Markdown4J](https://github.com/jdcasey/markdown4j) (Licencia Apache v2)
\ No newline at end of file |