Merge branch 'master' into ocs_api

apps/files/ajax/newfile.php

apps/files/js/files.js

apps/files/l10n/da.php

apps/files/l10n/de.php

apps/files/l10n/he.php

apps/files/l10n/ru_RU.php

apps/files/l10n/zh_CN.php

apps/files_encryption/l10n/da.php

apps/files_external/settings.php

apps/files_sharing/l10n/da.php

apps/files_versions/l10n/ca.php

apps/files_versions/l10n/cs_CZ.php

apps/files_versions/l10n/da.php

apps/files_versions/l10n/de.php

apps/files_versions/l10n/el.php

apps/files_versions/l10n/eo.php

apps/files_versions/l10n/es.php

apps/files_versions/l10n/et_EE.php

apps/files_versions/l10n/eu.php

apps/files_versions/l10n/fa.php