Merge branch 'master' into oc_preview

apps/files/appinfo/app.php

apps/files/js/file-upload.js

apps/files/js/fileactions.js

apps/files/js/keyboardshortcuts.js

apps/files/l10n/ca.php

apps/files/l10n/cs_CZ.php

apps/files/l10n/da.php

apps/files/l10n/de.php

apps/files/l10n/de_DE.php

apps/files/l10n/et_EE.php

apps/files/l10n/gl.php

apps/files/l10n/ja_JP.php

apps/files/l10n/lv.php

apps/files/l10n/nb_NO.php

apps/files/l10n/nl.php

apps/files/l10n/ru.php

apps/files/l10n/sk_SK.php

apps/files/l10n/sv.php

apps/files/l10n/zh_CN.php

apps/files_encryption/l10n/ru.php