BZ:1043833 - Translation issues

(cherry picked from commit a307eac3f6900c152212df1d0949ab3d86f0c965)