Merge branch 'master' into file_encryption_tests

apps/files_encryption/l10n/gl.php

apps/files_encryption/l10n/ja_JP.php

apps/files_encryption/l10n/pt_BR.php

l10n/af_ZA/core.po

l10n/af_ZA/lib.po

l10n/ar/core.po

l10n/ar/files.po

l10n/ar/files_external.po

l10n/ar/files_sharing.po

l10n/ar/files_trashbin.po

l10n/ar/lib.po

l10n/ar/settings.po

l10n/ar/user_ldap.po

l10n/bg_BG/core.po

l10n/bg_BG/files.po

l10n/bg_BG/files_external.po

l10n/bg_BG/files_sharing.po

l10n/bg_BG/files_trashbin.po

l10n/bg_BG/lib.po

l10n/bg_BG/settings.po