Fix xml files and strings