Merge branch 'master' into filesystem

apps/files/l10n/es_AR.php

apps/files/l10n/sk_SK.php

apps/files/l10n/zh_CN.php

apps/user_ldap/l10n/sk_SK.php

core/l10n/es_AR.php

core/l10n/pt_PT.php

core/l10n/sk_SK.php

core/l10n/zh_CN.php

l10n/ca/lib.po

l10n/de/lib.po

l10n/es_AR/core.po

l10n/es_AR/files.po

l10n/es_AR/lib.po

l10n/nl/lib.po

l10n/pt_PT/core.po

l10n/pt_PT/lib.po

l10n/si_LK/lib.po

l10n/sk_SK/core.po

l10n/sk_SK/files.po

l10n/sk_SK/lib.po