Merge branch 'master' into fileinfo

apps/files/l10n/ru_RU.php

apps/files_external/3rdparty/smb4php/smb.php

apps/files_external/l10n/ru_RU.php

apps/files_external/lib/config.php

apps/files_external/lib/webdav.php

apps/files_sharing/l10n/ru_RU.php

apps/files_sharing/lib/share/file.php

apps/files_sharing/lib/sharedstorage.php

apps/files_trashbin/l10n/ru_RU.php

apps/user_ldap/l10n/ru_RU.php

core/l10n/ru_RU.php

core/templates/mail.php

l10n/ru_RU/core.po

l10n/ru_RU/files.po

l10n/ru_RU/files_encryption.po

l10n/ru_RU/files_external.po

l10n/ru_RU/files_sharing.po

l10n/ru_RU/files_trashbin.po

l10n/ru_RU/files_versions.po

l10n/ru_RU/lib.po