Merge branch 'master' into files_encryption

apps/files/l10n/es_AR.php

apps/files/l10n/nb_NO.php

apps/files/l10n/nn_NO.php

apps/files_external/l10n/nb_NO.php

apps/files_sharing/l10n/nn_NO.php

apps/files_trashbin/l10n/nb_NO.php

apps/files_trashbin/l10n/nn_NO.php

apps/files_versions/l10n/nn_NO.php

apps/user_ldap/l10n/es.php

apps/user_ldap/l10n/et_EE.php

apps/user_ldap/l10n/it.php

apps/user_ldap/l10n/ja_JP.php

l10n/es/core.po

l10n/es/user_ldap.po

l10n/es_AR/files.po

l10n/es_AR/settings.po

l10n/et_EE/user_ldap.po

l10n/it/core.po

l10n/it/files.po

l10n/it/files_encryption.po