Translate fixes
Merge branch 'nitrat-tester' into nitrat-tester-with-products