Closed javascript-translate-bot closed 3 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.
4 out of 7 committers have signed the CLA.
:white_check_mark: iliakan
:white_check_mark: joaquinelio
:white_check_mark: vsemozhetbyt
:white_check_mark: leviding
:x: lex111
:x: dorelljames
:x: aruku
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 2d5be7b7
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 62 files
- [ ] [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/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/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/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/10-ifelse/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/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) - [ ] [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) - [ ] [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.