Sync with upstream @ e074a5f8

[javascript-translate-bot]

This PR was automatically generated to merge changes from en.javascript.info at e074a5f

Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.

Alternatively, you can close this PR and merge conflicting changes manually.

The following files have conflicts and may need updates of the translations:

Click to open a list of 33 files

• 1-js/02-first-steps/05-types/article.md
• 1-js/02-first-steps/06-alert-prompt-confirm/article.md
• 1-js/02-first-steps/08-operators/4-fix-prompt/solution.md
• 1-js/02-first-steps/08-operators/article.md
• 1-js/02-first-steps/13-while-for/6-repeat-until-correct/solution.md
• 1-js/03-code-quality/04-ninja-code/article.md
• 1-js/04-object-basics/02-object-copy/article.md
• 1-js/04-object-basics/07-optional-chaining/article.md
• 1-js/05-data-types/06-iterable/article.md
• 1-js/06-advanced-functions/03-closure/10-make-army/lexenv-makearmy.svg
• 1-js/06-advanced-functions/03-closure/10-make-army/solution.md
• 1-js/06-advanced-functions/03-closure/10-make-army/task.md
• 1-js/06-advanced-functions/03-closure/article.md
• 1-js/06-advanced-functions/04-var/article.md
• 1-js/06-advanced-functions/09-call-apply-decorators/03-debounce/task.md
• 1-js/07-object-properties/01-property-descriptors/article.md
• 1-js/08-prototypes/03-native-prototypes/article.md
• 1-js/09-classes/02-class-inheritance/article.md
• 1-js/12-generators-iterators/2-async-iterators-generators/article.md
• 2-ui/1-document/10-size-and-scroll-window/article.md
• 2-ui/2-events/05-dispatch-events/article.md
• 2-ui/3-event-details/1-mouse-events-basics/article.md
• 2-ui/3-event-details/6-pointer-events/article.md
• 2-ui/5-loading/02-script-async-defer/article.md
• 2-ui/99-ui-misc/01-mutation-observer/article.md
• 2-ui/99-ui-misc/03-event-loop/article.md
• 3-frames-and-windows/01-popup-windows/article.md
• 3-frames-and-windows/03-cross-window-communication/article.md
• 4-binary/03-blob/article.md
• 5-network/04-fetch-abort/article.md
• 5-network/05-fetch-crossorigin/xhr-another-domain.svg
• 5-network/05-fetch-crossorigin/xhr-preflight.svg
• 5-network/10-long-polling/article.md

To merge changes manually (instead of merging this PR):

1. Add remote upstream that links to the English version (only needs to be done once)
   • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
2. Commit all current work locally and git checkout master
3. Pull the recent changes from the English version:
   • git pull upstream master
4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
   • Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
     • git checkout --ours <path>
   • See the diff, what changed in the upstream file since branches diverged:
     • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
   • Then you can examine the changes in upstream and add them manually
5. When conflicts resolved, commit them and git push origin master

This PR will be closed and replaced with a new one in a few days.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
7 out of 18 committers have signed the CLA.

✅ leviding
✅ Violet-Bora-Lee
✅ yoga1234
✅ joaquinelio
✅ iliakan
✅ LitStronger
✅ vsemozhetbyt
❌ leeyc0
❌ paroche
❌ haond10adp
❌ lumosmind
❌ peachesontour
❌ pushpend3r
❌ henchies
❌ MuhammedZakir
❌ apcurran
❌ cristian-wang
❌ Jarvis-3000
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[joaquinelio]

No hacer este MERGE

Edit: Nada mal,
Se redujo y se hizo manejable como esperábamos, excelente.

Pero

1 Nros de linea no respetados complican la edicion.

2 Hay que ser CUIDADOSO en revisar, se muestran CLARAMENTE como conflictos >>> === <<< (fácil de resolver) pero no los trata como tales, presumiblemente sobrescribirá la linea traducida.

3 corrige SVG
@EzequielCaste Esto reemplaza svg traducidos por otros con otro nombre ¿habria que hacer tu proceso de nuevo?

[joaquinelio]

@vplentinax
SSi todos fueran conflictos simples se podrian resolver aqui (con el debido cuidado)

Pero hay articulos totalmente trastocados (de origen) y es mejor tener las herramientas ide.
Cierro este.
Esstoy resolviendo localmente y voy a escribir el procedimiento... a ver si al fin me desprendo de esto

@EzequielCaste
No hace meerge de Los SVG, los sobreescribe porque los toma como binarios.
No sé cómo evitar que los sobrescriba, el merge pendiente no me da opcion a elegir "ours" como en los md (por lo menos en el ide) aunque sí lo podria evitar en mi pr

Pero se supone que el svg fue arreglado de alguna forma
El pr que voy a poner pisa 2 svg con ingles 5-5-fetch cross origin (creo que es lo que corresponde),
si no los seguis voy a qye tener que aprender a hacer funcionar tu procedimiento...

[joaquinelio]

MERGE enabled again,
I guess it would add >>>> ==== <<<< stuff into the files

too tempting...
I'll put as draft again before I ruin the repo just for stating the point.