ENYO-2940: improve regexp and add missing method to translate strings with parameters