Merge branch 'master' into versioning_preview_shared

apps/files/css/files.css

apps/files/l10n/en_GB.php

apps/files/l10n/es.php

apps/files/l10n/et_EE.php

apps/files/l10n/fr.php

apps/files/l10n/pt_PT.php

apps/files/templates/part.list.php

apps/files_encryption/files/error.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/l10n/en_GB.php

apps/files_encryption/l10n/es.php

apps/files_encryption/l10n/et_EE.php

apps/files_encryption/l10n/fr.php

apps/files_encryption/l10n/pl.php

apps/files_encryption/l10n/pt_PT.php

apps/files_encryption/lib/crypt.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/stream.php

apps/files_encryption/templates/invalid_private_key.php