Merge branch 'master' into oc_preview

apps/files/js/files.js

apps/files/l10n/hu_HU.php

apps/files/l10n/pt_PT.php

apps/files/l10n/zh_TW.php

apps/files_encryption/appinfo/info.xml

apps/files_encryption/appinfo/version

apps/files_encryption/hooks/hooks.php

apps/files_encryption/l10n/ar.php

apps/files_encryption/l10n/bg_BG.php

apps/files_encryption/l10n/bn_BD.php

apps/files_encryption/l10n/ca.php

apps/files_encryption/l10n/cs_CZ.php

apps/files_encryption/l10n/cy_GB.php

apps/files_encryption/l10n/da.php

apps/files_encryption/l10n/de.php

apps/files_encryption/l10n/de_DE.php

apps/files_encryption/l10n/el.php

apps/files_encryption/l10n/eo.php

apps/files_encryption/l10n/es.php

apps/files_encryption/l10n/es_AR.php