gettext fixes
cy.po conflict fix