Manual merge string updates from MarhyCZ