Lots of strings still missing, help would be welcome
(cherry picked from commit 946eba4adf89f4727dcecf84e20cf8cf98110cb4)