Merge branch 'master' into filesystem

apps/files/l10n/es_AR.php

apps/files/l10n/fr.php

apps/files/l10n/vi.php

apps/files_external/l10n/vi.php

apps/files_sharing/l10n/ka_GE.php

apps/files_sharing/l10n/vi.php

apps/user_ldap/l10n/si_LK.php

core/l10n/vi.php

l10n/es_AR/files.po

l10n/fr/files.po

l10n/fr/lib.po

l10n/ka_GE/files_sharing.po

l10n/si_LK/settings.po

l10n/si_LK/user_ldap.po

l10n/ta_LK/lib.po

l10n/templates/core.pot

l10n/templates/files.pot

l10n/templates/files_encryption.pot

l10n/templates/files_external.pot

l10n/templates/files_sharing.pot