diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-23 20:13:21 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-23 20:13:21 +0100 |
commit | 4e2e40f40440cf36d8725c89f593503add49409b (patch) | |
tree | aa1c70425b0a9270e15b45446de0261029cec028 /OpenPGP-Keychain/src/main/res/raw-fr | |
parent | ff67ddc5f4bea0144fc99ba80830788abfb43893 (diff) | |
parent | 9d4582f9689f53589bbf7cc3e224f9fd061f1d51 (diff) | |
download | open-keychain-4e2e40f40440cf36d8725c89f593503add49409b.tar.gz open-keychain-4e2e40f40440cf36d8725c89f593503add49409b.tar.bz2 open-keychain-4e2e40f40440cf36d8725c89f593503add49409b.zip |
Merge pull request #473 from thi/master
Adjust credits, align signature in encrypt layout slightly, fix file decryption, remove icon set credits
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/raw-fr')
-rw-r--r-- | OpenPGP-Keychain/src/main/res/raw-fr/help_about.html | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html index 3cbbce4d5..93e5a5df7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html @@ -15,9 +15,8 @@ </ul> <h2>Les développeurs d'APG 1.x</h2> <ul> -<li>« Thialfihar (développeur principal)</li> +<li>Thialfihar (développeur principal)</li> <li>« Senecaso » (Code QR, signer/téléverser la clef)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Bibliothèques</h2> @@ -38,8 +37,6 @@ <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Licence Apache v2)</li> <li> <a href="https://github.com/johnkil/Android-AppMsg">Bibliothèque Android AppMsg</a> (Licence Apache v2)</li> -<li>Icônes du <a href="http://rrze-icon-set.berlios.de/">jeu d'icônes RRZE</a> (Licence Creative Commons Paternité - Partage des Conditions Initiales à l'Identique 3.0)</li> -<li>Icônes du <a href="http://tango.freedesktop.org/">jeu d'icônes Tango</a> (domaine public)</li> </ul> </body> </html> |