Merge master...

apps/files/l10n/ca.php

apps/files/l10n/el.php

apps/files/l10n/fa.php

apps/files/l10n/ja_JP.php

apps/files/l10n/pt_PT.php

apps/files/l10n/sv.php

apps/files/l10n/th_TH.php

apps/files/l10n/tr.php

apps/files/l10n/zh_CN.php

apps/files_encryption/ajax/mode.php

apps/files_encryption/appinfo/app.php

apps/files_encryption/appinfo/database.xml

apps/files_encryption/appinfo/info.xml

apps/files_encryption/appinfo/version

apps/files_encryption/hooks/hooks.php

apps/files_encryption/js/settings-personal.js

apps/files_encryption/js/settings.js

apps/files_encryption/l10n/ar.php

apps/files_encryption/l10n/bg_BG.php

apps/files_encryption/l10n/bn_BD.php