Merge "Fix string translation by providing context"