Removed untranslatable strings
Merge branch 'pr587'