Rework string translation handler