Merge branch 'master' into fixing-1424-master

apps/files/l10n/da.php

apps/files/l10n/de_DE.php

apps/files/l10n/es_AR.php

apps/files/l10n/et_EE.php

apps/files/l10n/eu.php

apps/files/l10n/ja_JP.php

apps/files/l10n/nl.php

apps/files/l10n/ru.php

apps/files_encryption/l10n/da.php

apps/files_encryption/l10n/es_AR.php

apps/files_encryption/l10n/et_EE.php

apps/files_encryption/l10n/eu.php

apps/files_encryption/l10n/pl.php

apps/files_external/ajax/addRootCertificate.php

apps/files_external/ajax/dropbox.php

apps/files_external/ajax/google.php

apps/files_external/ajax/removeMountPoint.php

apps/files_external/l10n/hi.php

apps/files_external/lib/smb.php

apps/files_external/templates/settings.php