Merge remote-tracking branch 'refs/remotes/upstream/master'

apps/files/l10n/ca.php

apps/files/l10n/de.php

apps/files/l10n/fr.php

apps/files/l10n/nl.php

apps/files/l10n/sv.php

apps/files/l10n/zh_TW.php

apps/files_encryption/l10n/nl.php

apps/files_trashbin/l10n/ca.php

apps/files_trashbin/l10n/cs_CZ.php

apps/files_trashbin/l10n/de.php

apps/files_trashbin/l10n/de_DE.php

apps/files_trashbin/l10n/fi_FI.php

apps/files_trashbin/l10n/fr.php

apps/files_trashbin/l10n/it.php

apps/files_trashbin/l10n/ja_JP.php

apps/files_trashbin/l10n/nl.php

apps/files_trashbin/l10n/sr.php

apps/files_trashbin/l10n/sv.php

apps/files_trashbin/l10n/th_TH.php

apps/files_versions/l10n/sr.php