b9c70abef4
Manually resolved merge conflicts from https://hosted.weblate.org/git/tachiyomi/strings/
(cherry picked from commit f3c50ee9a3)