merge master into filesystem

apps/files/l10n/fr.php

apps/files/l10n/ja_JP.php

apps/files/l10n/nl.php

apps/files/l10n/pl.php

apps/files/l10n/sv.php

apps/files/l10n/tr.php

apps/files/l10n/uk.php

apps/files/l10n/zh_CN.php

apps/files_encryption/l10n/sr.php

apps/files_sharing/l10n/tr.php

apps/files_sharing/public.php

apps/user_webdavauth/l10n/tr.php

core/js/jquery.infieldlabel.js

core/js/jquery.infieldlabel.min.js

core/l10n/eo.php

core/l10n/is.php

core/l10n/sr.php

core/l10n/tr.php

core/setup.php

l10n/de/settings.po