fix merge conflicts

apps/files/console/scan.php

apps/files/l10n/cs_CZ.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/l10n/cs_CZ.php

apps/files_encryption/l10n/de.php

apps/files_encryption/l10n/gl.php

apps/files_encryption/l10n/it.php

apps/files_encryption/l10n/pt_BR.php

apps/files_encryption/l10n/pt_PT.php

apps/files_encryption/l10n/sl.php

apps/files_encryption/l10n/sv.php

apps/files_encryption/tests/share.php

apps/files_external/l10n/uk.php

apps/files_external/lib/amazons3.php

apps/files_sharing/css/404.css

apps/files_sharing/l10n/ca.php

apps/files_sharing/l10n/cs_CZ.php

apps/files_sharing/l10n/da.php

apps/files_sharing/l10n/de.php

apps/files_sharing/l10n/de_DE.php