PIM-1794: Add translations and fix scenarios