Merge remote-tracking branch 'spriver/11244/doc-applet'
Conflicts: wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.de.po wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.de.po wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.de.po
Please register or sign in to comment