Merge makemessages and synchronize