diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
commit | 7dd5e2235339401b44eda13b124f3482472539d4 (patch) | |
tree | d7f1e6ad18a258e6467a75731ab44968fe005c9a /OpenKeychain/src/main/res/raw-it/help_about.md | |
parent | a2dcb579ff5d3565e7e6c6afe37878855361595b (diff) | |
parent | d4612b5e173455a24adbae2bfd4654ae065556cc (diff) | |
download | open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.gz open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.bz2 open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.zip |
Merge branch 'master' into backup-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
extern/openpgp-api-lib
Diffstat (limited to 'OpenKeychain/src/main/res/raw-it/help_about.md')
-rw-r--r-- | OpenKeychain/src/main/res/raw-it/help_about.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/raw-it/help_about.md b/OpenKeychain/src/main/res/raw-it/help_about.md index 8cd939be2..96a51ff18 100644 --- a/OpenKeychain/src/main/res/raw-it/help_about.md +++ b/OpenKeychain/src/main/res/raw-it/help_about.md @@ -2,7 +2,7 @@ [https://www.openkeychain.org](https://www.openkeychain.org) -[OpenKeychain](https://www.openkeychain.org) is an OpenPGP implementation for Android. +[OpenKeychain](https://www.openkeychain.org) è un'implementazione di OpenPGP in ambiente Android. Licenza: GPLv3+ @@ -61,11 +61,11 @@ Licenza: GPLv3+ * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2) * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2) * [MiniDNS](https://github.com/rtreffer/minidns) (Apache License v2) - * [OkHttp](https://square.github.io/okhttp/) (Apache License v2) + * [OkHttp](https://square.github.io/okhttp/) (Licenza Apache v2) * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Design materiale) (Apache License v2) * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License) * [Snackbar](https://github.com/nispok/snackbar) (MIT License) - * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (MIT X11 License) + * [BouncyCastle](https://github.com/open-keychain/bouncycastle) (Licenza MIT X11) * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2) * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2) * [ZXing](https://github.com/zxing/zxing) (Apache License v2) |