Small localization fixes & correction in templates so that translation regexes work OK