Fixes message and translations

fixes #1244