Clean up and sync with english strings