Improve sync logic, thanks to Marjolein
Update English language file