Merge branch 'master' into add_ocimage_unittest

apps/files/l10n/cs_CZ.php

apps/files_sharing/l10n/cs_CZ.php

apps/files_sharing/l10n/ru.php

apps/files_trashbin/ajax/delete.php

apps/files_trashbin/ajax/undelete.php

apps/files_trashbin/index.php

apps/files_trashbin/js/trash.js

apps/files_trashbin/l10n/nl.php

apps/files_trashbin/l10n/ru.php

apps/files_trashbin/lib/trash.php

apps/files_trashbin/templates/index.php

apps/files_trashbin/templates/part.breadcrumb.php

apps/files_trashbin/templates/part.list.php

core/js/js.js

core/l10n/cs_CZ.php

core/l10n/ru.php

l10n/af_ZA/files_encryption.po

l10n/ar/files.po

l10n/ar/files_encryption.po

l10n/be/files_encryption.po