Merge branch 'master' into convert-oc_config

apps/files/l10n/de_DE.php

apps/files/l10n/fr.php

apps/files/l10n/it.php

apps/files/l10n/sv.php

apps/files/l10n/zh_CN.php

apps/files_encryption/appinfo/app.php

apps/files_encryption/files/error.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/l10n/eu.php

apps/files_encryption/l10n/fi_FI.php

apps/files_encryption/l10n/gl.php

apps/files_encryption/l10n/it.php

apps/files_encryption/l10n/sl.php

apps/files_encryption/l10n/sv.php

apps/files_encryption/l10n/zh_CN.php

apps/files_encryption/lib/helper.php

apps/files_external/l10n/eu.php

apps/files_sharing/l10n/it.php

apps/files_sharing/public.php

apps/files_sharing/templates/authenticate.php