diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
| commit | 4afd6b881edfd0bc404734a4e8959a7a0fa785a7 (patch) | |
| tree | 63a051fb595d168f8ddbfd76a51bb2319889d40b /OpenKeychain/src/main/res/raw-eu/help_about.html | |
| parent | ba7d8a58673d55660bc7faf68970229f17458514 (diff) | |
| parent | db39b779c984a758e13adc16837893509f3b364f (diff) | |
| download | open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.gz open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.bz2 open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-eu/help_about.html')
| -rw-r--r-- | OpenKeychain/src/main/res/raw-eu/help_about.html | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/res/raw-eu/help_about.html b/OpenKeychain/src/main/res/raw-eu/help_about.html index 2c6c5b3c4..6f19ccaad 100644 --- a/OpenKeychain/src/main/res/raw-eu/help_about.html +++ b/OpenKeychain/src/main/res/raw-eu/help_about.html @@ -2,12 +2,12 @@ <head></head> <body> <p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p> -<p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p> -<p>License: GPLv3+</p> +<p><a href="http://www.openkeychain.org">OpenKeychain</a> Android-rako OpenPGP inplemetazio bat da.</p> +<p>Baimena: GPLv3+</p> -<h2>Developers</h2> +<h2>Garatzaileak</h2> <ul> -<li>Dominik Schürmann (Maintainer)</li> +<li>Dominik Schürmann (Mantentzailea)</li> <li>Art O Cathain</li> <li>Ash Hughes</li> <li>Brian C. Barnes</li> @@ -28,30 +28,34 @@ <li>Tim Bray</li> <li>Vincent Breitmoser</li> </ul> -<h2>Libraries</h2> +<h2>Liburutegiak</h2> <ul> <li> -<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 Baimena)</li> <li> -<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> +<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT Baimena)</li> <li> -<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li> <li> -<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li> +<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache Baimena v2)</li> <li> -<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li> +<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache Baimena v2)</li> <li> -<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li> +<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache Baimena v2)</li> <li> -<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> +<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache Baimena v2)</li> <li> -<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li> +<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li> <li> -<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> +<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li> <li> -<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li> +<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li> <li> -<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li> +<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li> +<li> +<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li> +<li> +<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li> </ul> </body> </html> |