Merge branch 'master' into fixing-4546-master

apps/files/ajax/upload.php

apps/files/css/files.css

apps/files/js/file-upload.js

apps/files/js/files.js

apps/files/l10n/ady.php

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/nl.php

apps/files/l10n/pt_PT.php

apps/files/l10n/sv.php

apps/files/templates/index.php

apps/files/templates/part.list.php

apps/files_encryption/files/error.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/l10n/de.php

apps/files_encryption/l10n/de_DE.php

apps/files_encryption/l10n/en_GB.php

apps/files_encryption/l10n/es.php