- fixed Poedit strings conflicts