Refactor to make translations work
Update .po files
Manual merge