Syncing with the English repo

[tesseralis]

Hi new translators! If you see an issue that looks like this:

https://github.com/reactjs/es.reactjs.org/pull/140/files

That's because I just ran the script to sync the translation and English source repo. Just fix any issues that exist just like you would any merge conflict and merge it in!