Translation updated and merged