diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-05 19:30:52 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-05 19:30:52 +0200 |
| commit | aa6f5118f5b88ed40e1318b59d47465bae6067df (patch) | |
| tree | c00db3802cd6258073b16d197b1bd2e8d2d7e975 /OpenPGP-Keychain/src/main/res/raw-pl/help_about.html | |
| parent | 5e4239a7b98a050b4312eee075f2fdac7f2b8af2 (diff) | |
| parent | db25433890cfc5bbf0200eb488076df23cb44866 (diff) | |
| download | open-keychain-aa6f5118f5b88ed40e1318b59d47465bae6067df.tar.gz open-keychain-aa6f5118f5b88ed40e1318b59d47465bae6067df.tar.bz2 open-keychain-aa6f5118f5b88ed40e1318b59d47465bae6067df.zip | |
Merge remote-tracking branch 'origin/master' into certs
A lot of things are completely broken, but it compiles and doesn't crash
right away. Good enough for me.
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/raw-pl/help_about.html')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/raw-pl/help_about.html | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html b/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html new file mode 100644 index 000000000..a033c084a --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html @@ -0,0 +1,49 @@ +<html> +<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> to implementacja OpenPGP na platformę Android.</p> +<p>Licencja: GPLv3+</p> + +<h2>Deweloperzy OpenKeychain</h2> +<ul> +<li>Dominik Schürmann (Wiodący developer)</li> +<li>Ash Hughes (łatki crypto)</li> +<li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (Interfejs Użytkownika)</li> +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> +</ul> +<h2>Deweloperzy APG 1.x</h2> +<ul> +<li>Thialfihar (Wiodący deweloper)</li> +<li>'Senecaso' (kody QR, podpisy kluczy, wysyłanie kluczy)</li> +<li>Markus Doits</li> +</ul> +<h2>Biblioteki</h2> +<ul> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Licencja Apache v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Licencja Apache v2)</li> +<li> +<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licencja Apache v2)</li> +<li> +<a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (Licencja MIT)</li> +<li> +<a href="http://code.google.com/p/zxing/">ZXing</a> (Licencja Apache v2)</li> +<li> +<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (Licencja MIT X11)</li> +<li> +<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Licencja Apache v2)</li> +<li> +<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Licencja Apache v2)</li> +</ul> +</body> +</html> |