Closed javascript-translate-bot closed 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: justforuse
:white_check_mark: iliakan
:white_check_mark: hc9937
:white_check_mark: joaquinelio
:white_check_mark: odsantos
:x: Tofpu
:x: akxavier
:x: yangsong97
:x: Manik2375
:x: LexaWin
:x: Ilya Kantor
:x: HiddenOgre28
:x: tburette
This PR was automatically generated to merge changes from en.javascript.info at 246c600f
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 54 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/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/4-devtools/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/01-getting-started/4-devtools/article.md) - [ ] [1-js/02-first-steps/14-switch/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/14-switch/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/04-object-basics/01-object/4-const-object/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/01-object/4-const-object/solution.md) - [ ] [1-js/04-object-basics/01-object/4-const-object/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/01-object/4-const-object/task.md) - [ ] [1-js/04-object-basics/01-object/8-multiply-numeric/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/01-object/8-multiply-numeric/task.md) - [ ] [1-js/04-object-basics/01-object/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/01-object/article.md) - [ ] [1-js/04-object-basics/01-object/variable-copy-value.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/01-object/variable-copy-value.svg) - [ ] [1-js/04-object-basics/02-garbage-collection/family-delete-refs.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-garbage-collection/family-delete-refs.svg) - [ ] [1-js/04-object-basics/02-garbage-collection/family-no-family.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-garbage-collection/family-no-family.svg) - [ ] [1-js/04-object-basics/02-garbage-collection/family-no-father.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-garbage-collection/family-no-father.svg) - [ ] [1-js/04-object-basics/02-garbage-collection/family.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-garbage-collection/family.svg) - [ ] [1-js/04-object-basics/02-garbage-collection/garbage-collection-1.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-garbage-collection/garbage-collection-1.svg) - [ ] [1-js/04-object-basics/02-garbage-collection/garbage-collection-2.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-garbage-collection/garbage-collection-2.svg) - [ ] [1-js/04-object-basics/02-garbage-collection/garbage-collection-3.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-garbage-collection/garbage-collection-3.svg) - [ ] [1-js/04-object-basics/02-garbage-collection/garbage-collection-4.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-garbage-collection/garbage-collection-4.svg) - [ ] [1-js/04-object-basics/02-garbage-collection/garbage-collection-5.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-garbage-collection/garbage-collection-5.svg) - [ ] [1-js/04-object-basics/02-object-copy/variable-contains-reference.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-object-copy/variable-contains-reference.svg) - [ ] [1-js/04-object-basics/02-object-copy/variable-copy-reference.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-object-copy/variable-copy-reference.svg) - [ ] [1-js/04-object-basics/03-garbage-collection/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/03-garbage-collection/article.md) - [ ] [1-js/04-object-basics/03-garbage-collection/family-no-father-2.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/03-garbage-collection/family-no-father-2.svg) - [ ] [1-js/04-object-basics/03-garbage-collection/memory-user-john-admin.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/03-garbage-collection/memory-user-john-admin.svg) - [ ] [1-js/04-object-basics/03-garbage-collection/memory-user-john-lost.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/03-garbage-collection/memory-user-john-lost.svg) - [ ] [1-js/04-object-basics/03-garbage-collection/memory-user-john.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/03-garbage-collection/memory-user-john.svg) - [ ] [1-js/04-object-basics/04-object-methods/4-object-property-this/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/04-object-methods/4-object-property-this/solution.md) - [ ] [1-js/04-object-basics/04-object-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/04-object-methods/article.md) - [ ] [1-js/04-object-basics/08-symbol/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/08-symbol/article.md) - [ ] [1-js/06-advanced-functions/03-closure/8-make-army/lexenv-makearmy.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/03-closure/8-make-army/lexenv-makearmy.svg) - [ ] [1-js/06-advanced-functions/03-closure/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/03-closure/article.md) - [ ] [1-js/06-advanced-functions/03-closure/lexenv-nested-work.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/03-closure/lexenv-nested-work.svg) - [ ] [1-js/09-classes/03-static-properties-methods/3-class-extend-object/rabbit-extends-object.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/09-classes/03-static-properties-methods/3-class-extend-object/rabbit-extends-object.svg) - [ ] [1-js/11-async/02-promise-basics/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/02-promise-basics/article.md) - [ ] [1-js/99-js-misc/04-reference-type/2-check-syntax/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/99-js-misc/04-reference-type/2-check-syntax/solution.md) - [ ] [1-js/99-js-misc/04-reference-type/3-why-this/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/99-js-misc/04-reference-type/3-why-this/solution.md) - [ ] [1-js/99-js-misc/04-reference-type/3-why-this/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/99-js-misc/04-reference-type/3-why-this/task.md) - [ ] [2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/article.md) - [ ] [2-ui/3-event-details/5-keyboard-events/german-layout.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/5-keyboard-events/german-layout.svg) - [ ] [2-ui/3-event-details/5-keyboard-events/us-layout.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/5-keyboard-events/us-layout.svg) - [ ] [2-ui/99-ui-misc/03-event-loop/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/03-event-loop/article.md) - [ ] [9-regular-expressions/03-regexp-character-classes/love-html5-classes.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/03-regexp-character-classes/love-html5-classes.svg) - [ ] [9-regular-expressions/06-regexp-boundary/hello-java-boundaries.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/06-regexp-boundary/hello-java-boundaries.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy1.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy1.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy2.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy2.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy3.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy3.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy4.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy4.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy5.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy5.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy6.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_greedy6.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_lazy3.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_lazy3.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_lazy4.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_lazy4.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_lazy5.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_lazy5.svg) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/witch_lazy6.svg](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/witch_lazy6.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.