Merge branch 'master' into filesystem

apps/files/appinfo/filesync.php

apps/files/appinfo/remote.php

apps/files/l10n/nb_NO.php

apps/files/l10n/si_LK.php

apps/files/templates/index.php

apps/files_external/l10n/lt_LT.php

apps/files_sharing/l10n/nb_NO.php

apps/files_versions/l10n/nb_NO.php

apps/user_ldap/l10n/nb_NO.php

core/js/oc-dialogs.js

core/l10n/es.php

core/l10n/es_AR.php

core/l10n/nb_NO.php

core/l10n/pl.php

core/l10n/ru.php

core/l10n/si_LK.php

core/l10n/ta_LK.php

l10n/es/core.po

l10n/es_AR/core.po

l10n/et_EE/settings.po