Open javascript-translate-bot opened 2 years ago
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.
5 out of 13 committers have signed the CLA.
:white_check_mark: iliakan
:white_check_mark: buynao
:white_check_mark: rankanin
:white_check_mark: joaquinelio
:white_check_mark: leviding
:x: Omid-Heydarzadeh
:x: jovton
:x: Sen-442b
:x: erolaliyev
:x: justinpage
:x: ruslauz
:x: ArSn
:x: robertmcabee
You have signed the CLA already but the status is still pending? Let us recheck it.
This PR was automatically generated to merge changes from en.javascript.info at 29216730
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 88 files
- [ ] [.gitignore](/javascript-tutorial/en.javascript.info/commits/master/.gitignore) - [ ] [1-js/01-getting-started/1-intro/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/01-getting-started/1-intro/article.md) - [ ] [1-js/01-getting-started/2-manuals-specifications/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/01-getting-started/2-manuals-specifications/article.md) - [ ] [1-js/01-getting-started/3-code-editors/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/01-getting-started/3-code-editors/article.md) - [ ] [1-js/02-first-steps/01-hello-world/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/01-hello-world/article.md) - [ ] [1-js/02-first-steps/02-structure/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/02-structure/article.md) - [ ] [1-js/02-first-steps/03-strict-mode/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/03-strict-mode/article.md) - [ ] [1-js/02-first-steps/04-variables/2-declare-variables/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/04-variables/2-declare-variables/solution.md) - [ ] [1-js/02-first-steps/04-variables/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/04-variables/article.md) - [ ] [1-js/02-first-steps/05-types/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/05-types/article.md) - [ ] [1-js/02-first-steps/06-alert-prompt-confirm/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/06-alert-prompt-confirm/article.md) - [ ] [1-js/02-first-steps/07-type-conversions/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/07-type-conversions/article.md) - [ ] [1-js/02-first-steps/08-operators/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/08-operators/article.md) - [ ] [1-js/02-first-steps/10-ifelse/2-check-standard/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/10-ifelse/2-check-standard/task.md) - [ ] [1-js/02-first-steps/10-ifelse/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/10-ifelse/article.md) - [ ] [1-js/02-first-steps/12-nullish-coalescing-operator/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-nullish-coalescing-operator/article.md) - [ ] [1-js/02-first-steps/12-while-for/1-loop-last-value/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/1-loop-last-value/solution.md) - [ ] [1-js/02-first-steps/12-while-for/1-loop-last-value/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/1-loop-last-value/task.md) - [ ] [1-js/02-first-steps/12-while-for/2-which-value-while/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/2-which-value-while/solution.md) - [ ] [1-js/02-first-steps/12-while-for/2-which-value-while/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/2-which-value-while/task.md) - [ ] [1-js/02-first-steps/12-while-for/3-which-value-for/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/3-which-value-for/solution.md) - [ ] [1-js/02-first-steps/12-while-for/3-which-value-for/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/3-which-value-for/task.md) - [ ] [1-js/02-first-steps/12-while-for/4-for-even/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/4-for-even/solution.md) - [ ] [1-js/02-first-steps/12-while-for/4-for-even/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/4-for-even/task.md) - [ ] [1-js/02-first-steps/12-while-for/5-replace-for-while/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/5-replace-for-while/solution.md) - [ ] [1-js/02-first-steps/12-while-for/5-replace-for-while/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/5-replace-for-while/task.md) - [ ] [1-js/02-first-steps/12-while-for/6-repeat-until-correct/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/6-repeat-until-correct/solution.md) - [ ] [1-js/02-first-steps/12-while-for/6-repeat-until-correct/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/6-repeat-until-correct/task.md) - [ ] [1-js/02-first-steps/12-while-for/7-list-primes/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/7-list-primes/solution.md) - [ ] [1-js/02-first-steps/12-while-for/7-list-primes/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/7-list-primes/task.md) - [ ] [1-js/02-first-steps/12-while-for/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-while-for/article.md) - [ ] [1-js/02-first-steps/13-while-for/1-loop-last-value/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/1-loop-last-value/solution.md) - [ ] [1-js/02-first-steps/13-while-for/1-loop-last-value/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/1-loop-last-value/task.md) - [ ] [1-js/02-first-steps/13-while-for/2-which-value-while/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/2-which-value-while/solution.md) - [ ] [1-js/02-first-steps/13-while-for/2-which-value-while/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/2-which-value-while/task.md) - [ ] [1-js/02-first-steps/13-while-for/3-which-value-for/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/3-which-value-for/solution.md) - [ ] [1-js/02-first-steps/13-while-for/3-which-value-for/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/3-which-value-for/task.md) - [ ] [1-js/02-first-steps/13-while-for/4-for-even/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/4-for-even/solution.md) - [ ] [1-js/02-first-steps/13-while-for/4-for-even/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/4-for-even/task.md) - [ ] [1-js/02-first-steps/13-while-for/5-replace-for-while/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/5-replace-for-while/solution.md) - [ ] [1-js/02-first-steps/13-while-for/5-replace-for-while/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/5-replace-for-while/task.md) - [ ] [1-js/02-first-steps/13-while-for/6-repeat-until-correct/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/6-repeat-until-correct/solution.md) - [ ] [1-js/02-first-steps/13-while-for/6-repeat-until-correct/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/6-repeat-until-correct/task.md) - [ ] [1-js/02-first-steps/13-while-for/7-list-primes/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/7-list-primes/solution.md) - [ ] [1-js/02-first-steps/13-while-for/7-list-primes/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/7-list-primes/task.md) - [ ] [1-js/02-first-steps/13-while-for/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/article.md) - [ ] [1-js/02-first-steps/15-function-basics/2-rewrite-function-question-or/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/15-function-basics/2-rewrite-function-question-or/solution.md) - [ ] [1-js/02-first-steps/15-function-basics/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/15-function-basics/article.md) - [ ] [1-js/02-first-steps/18-while-for/1-loop-last-value/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/1-loop-last-value/solution.md) - [ ] [1-js/02-first-steps/18-while-for/1-loop-last-value/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/1-loop-last-value/task.md) - [ ] [1-js/02-first-steps/18-while-for/2-which-value-while/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/2-which-value-while/solution.md) - [ ] [1-js/02-first-steps/18-while-for/2-which-value-while/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/2-which-value-while/task.md) - [ ] [1-js/02-first-steps/18-while-for/3-which-value-for/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/3-which-value-for/solution.md) - [ ] [1-js/02-first-steps/18-while-for/3-which-value-for/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/3-which-value-for/task.md) - [ ] [1-js/02-first-steps/18-while-for/4-for-even/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/4-for-even/solution.md) - [ ] [1-js/02-first-steps/18-while-for/4-for-even/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/4-for-even/task.md) - [ ] [1-js/02-first-steps/18-while-for/5-replace-for-while/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/5-replace-for-while/solution.md) - [ ] [1-js/02-first-steps/18-while-for/5-replace-for-while/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/5-replace-for-while/task.md) - [ ] [1-js/02-first-steps/18-while-for/6-repeat-until-correct/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/6-repeat-until-correct/solution.md) - [ ] [1-js/02-first-steps/18-while-for/6-repeat-until-correct/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/6-repeat-until-correct/task.md) - [ ] [1-js/02-first-steps/18-while-for/7-list-primes/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/7-list-primes/solution.md) - [ ] [1-js/02-first-steps/18-while-for/7-list-primes/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/7-list-primes/task.md) - [ ] [1-js/02-first-steps/18-while-for/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-while-for/article.md) - [ ] [1-js/03-code-quality/03-comments/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/03-comments/article.md) - [ ] [1-js/03-code-quality/04-ninja-code/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/04-ninja-code/article.md) - [ ] [1-js/04-object-basics/07-optional-chaining/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/07-optional-chaining/article.md) - [ ] [1-js/05-data-types/01-primitives-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/01-primitives-methods/article.md) - [ ] [1-js/05-data-types/10-destructuring-assignment/destructuring-complex.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/10-destructuring-assignment/destructuring-complex.svg) - [ ] [1-js/06-advanced-functions/01-recursion/recursive-salaries.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/01-recursion/recursive-salaries.svg) - [ ] [1-js/11-async/02-promise-basics/promise-reject-1.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/02-promise-basics/promise-reject-1.svg) - [ ] [1-js/11-async/02-promise-basics/promise-resolve-1.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/02-promise-basics/promise-resolve-1.svg) - [ ] [1-js/12-generators-iterators/1-generators/generateSequence-2.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/12-generators-iterators/1-generators/generateSequence-2.svg) - [ ] [1-js/12-generators-iterators/1-generators/generateSequence-3.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/12-generators-iterators/1-generators/generateSequence-3.svg) - [ ] [1-js/99-js-misc/01-proxy/proxy-inherit-admin.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/99-js-misc/01-proxy/proxy-inherit-admin.svg) - [ ] [2-ui/1-document/10-size-and-scroll-window/document-client-width-height.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/10-size-and-scroll-window/document-client-width-height.svg) - [ ] [2-ui/1-document/11-coordinates/coordinates.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/11-coordinates/coordinates.svg) - [ ] [2-ui/2-events/02-bubbling-and-capturing/event-order-bubbling.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/02-bubbling-and-capturing/event-order-bubbling.svg) - [ ] [2-ui/2-events/03-event-delegation/bagua-bubble.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/03-event-delegation/bagua-bubble.svg) - [ ] [2-ui/99-ui-misc/03-event-loop/eventLoop.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/03-event-loop/eventLoop.svg) - [ ] [5-network/01-fetch/01-fetch-users/solution.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/01-fetch/01-fetch-users/solution.md) - [ ] [5-network/01-fetch/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/01-fetch/article.md) - [ ] [5-network/02-formdata/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/02-formdata/article.md) - [ ] [5-network/03-fetch-progress/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/03-fetch-progress/article.md) - [ ] [5-network/05-fetch-crossorigin/xhr-preflight.svg](/javascript-tutorial/en.javascript.info/commits/master/5-network/05-fetch-crossorigin/xhr-preflight.svg) - [ ] [5-network/11-websocket/websocket-handshake.svg](/javascript-tutorial/en.javascript.info/commits/master/5-network/11-websocket/websocket-handshake.svg) - [ ] [7-animation/1-bezier-curve/bezier3-e.svg](/javascript-tutorial/en.javascript.info/commits/master/7-animation/1-bezier-curve/bezier3-e.svg) - [ ] [7-animation/1-bezier-curve/bezier3.svg](/javascript-tutorial/en.javascript.info/commits/master/7-animation/1-bezier-curve/bezier3.svg) - [ ] [README.md](/javascript-tutorial/en.javascript.info/commits/master/README.md)To merge changes manually (instead of merging this PR):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
git checkout master
git pull upstream master
git checkout --ours <path>
git diff --word-diff master...upstream/master <path>
(please note: three dots in the command)git push origin master
Please ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).
This PR will be closed and replaced with a new one in a few days.