Closed javascript-translate-bot closed 1 year 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.
6 out of 13 committers have signed the CLA.
:white_check_mark: joaquinelio
:white_check_mark: bogdanbacosca
:white_check_mark: leviding
:white_check_mark: Alexandre887
:white_check_mark: iliakan
:white_check_mark: Violet-Bora-Lee
:x: Rnbsov
:x: nikolai-chernolutskii
:x: alagunoff
:x: cerealexperiments
:x: orelby
:x: Victor-Nikliaiev
:x: a-v-gor
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 ea7738bb
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 90 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/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/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/3-uppercast-constant/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/04-variables/3-uppercast-constant/task.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/10-ifelse/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/10-ifelse/article.md) - [ ] [1-js/03-code-quality/01-debugging-chrome/chrome-open-sources.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/01-debugging-chrome/chrome-open-sources.svg) - [ ] [1-js/03-code-quality/01-debugging-chrome/chrome-sources-breakpoint.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/01-debugging-chrome/chrome-sources-breakpoint.svg) - [ ] [1-js/03-code-quality/01-debugging-chrome/chrome-sources-console.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/01-debugging-chrome/chrome-sources-console.svg) - [ ] [1-js/03-code-quality/01-debugging-chrome/chrome-sources-debugger-pause.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/01-debugging-chrome/chrome-sources-debugger-pause.svg) - [ ] [1-js/03-code-quality/01-debugging-chrome/chrome-sources-debugger-trace-1.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/01-debugging-chrome/chrome-sources-debugger-trace-1.svg) - [ ] [1-js/03-code-quality/01-debugging-chrome/chrome-tabs.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/01-debugging-chrome/chrome-tabs.svg) - [ ] [1-js/03-code-quality/02-coding-style/code-style.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/02-coding-style/code-style.svg) - [ ] [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/06-polyfills/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/06-polyfills/article.md) - [ ] [1-js/04-object-basics/02-object-copy/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-object-copy/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/1-string-new-property/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/01-primitives-methods/1-string-new-property/task.md) - [ ] [1-js/05-data-types/03-string/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/03-string/article.md) - [ ] [1-js/05-data-types/07-map-set/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/07-map-set/article.md) - [ ] [1-js/05-data-types/08-weakmap-weakset/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/08-weakmap-weakset/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/06-advanced-functions/09-call-apply-decorators/03-debounce/debounce.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/09-call-apply-decorators/03-debounce/debounce.svg) - [ ] [1-js/08-prototypes/01-prototype-inheritance/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/08-prototypes/01-prototype-inheritance/article.md) - [ ] [1-js/08-prototypes/03-native-prototypes/proto-constructor-animal-rabbit.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/08-prototypes/03-native-prototypes/proto-constructor-animal-rabbit.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/11-async/05-promise-api/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/05-promise-api/article.md) - [ ] [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) - [ ] [1-js/99-js-misc/01-proxy/proxy.svg](/javascript-tutorial/en.javascript.info/commits/master/1-js/99-js-misc/01-proxy/proxy.svg) - [ ] [2-ui/1-document/02-dom-nodes/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/02-dom-nodes/article.md) - [ ] [2-ui/1-document/02-dom-nodes/domconsole0.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/02-dom-nodes/domconsole0.svg) - [ ] [2-ui/1-document/02-dom-nodes/domconsole1.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/02-dom-nodes/domconsole1.svg) - [ ] [2-ui/1-document/02-dom-nodes/elk.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/02-dom-nodes/elk.svg) - [ ] [2-ui/1-document/02-dom-nodes/inspect.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/02-dom-nodes/inspect.svg) - [ ] [2-ui/1-document/05-basic-dom-node-properties/dom-class-hierarchy.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/05-basic-dom-node-properties/dom-class-hierarchy.svg) - [ ] [2-ui/1-document/07-modifying-document/10-clock-setinterval/solution.view/index.html](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/07-modifying-document/10-clock-setinterval/solution.view/index.html) - [ ] [2-ui/1-document/09-size-and-scroll/4-put-ball-in-center/field.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/4-put-ball-in-center/field.svg) - [ ] [2-ui/1-document/09-size-and-scroll/metric-all.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/metric-all.svg) - [ ] [2-ui/1-document/09-size-and-scroll/metric-client-left-top-rtl.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/metric-client-left-top-rtl.svg) - [ ] [2-ui/1-document/09-size-and-scroll/metric-client-left-top.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/metric-client-left-top.svg) - [ ] [2-ui/1-document/09-size-and-scroll/metric-client-width-height.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/metric-client-width-height.svg) - [ ] [2-ui/1-document/09-size-and-scroll/metric-css.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/metric-css.svg) - [ ] [2-ui/1-document/09-size-and-scroll/metric-offset-parent.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/metric-offset-parent.svg) - [ ] [2-ui/1-document/09-size-and-scroll/metric-offset-width-height.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/metric-offset-width-height.svg) - [ ] [2-ui/1-document/09-size-and-scroll/metric-scroll-top.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/metric-scroll-top.svg) - [ ] [2-ui/1-document/09-size-and-scroll/metric-scroll-width-height.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/metric-scroll-width-height.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/01-introduction-browser-events/04-move-ball-field/move-ball-coords.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/01-introduction-browser-events/04-move-ball-field/move-ball-coords.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/2-events/05-dispatch-events/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/05-dispatch-events/article.md) - [ ] [2-ui/3-event-details/1-mouse-events-basics/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/1-mouse-events-basics/article.md) - [ ] [2-ui/3-event-details/4-mouse-drag-and-drop/2-drag-heroes/solution.view/field.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/4-mouse-drag-and-drop/2-drag-heroes/solution.view/field.svg) - [ ] [2-ui/4-forms-controls/3-events-change-input/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/4-forms-controls/3-events-change-input/article.md) - [ ] [2-ui/99-ui-misc/02-selection-range/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/article.md) - [ ] [2-ui/99-ui-misc/02-selection-range/range-example-p-0-1.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/range-example-p-0-1.svg) - [ ] [2-ui/99-ui-misc/02-selection-range/range-example-p-1-3.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/range-example-p-1-3.svg) - [ ] [2-ui/99-ui-misc/02-selection-range/range-example-p-2-b-3-range.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/range-example-p-2-b-3-range.svg) - [ ] [2-ui/99-ui-misc/02-selection-range/range-example-p-2-b-3.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/range-example-p-2-b-3.svg) - [ ] [2-ui/99-ui-misc/02-selection-range/selection-direction-backward.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/selection-direction-backward.svg) - [ ] [2-ui/99-ui-misc/02-selection-range/selection-direction-forward.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/selection-direction-forward.svg) - [ ] [2-ui/99-ui-misc/02-selection-range/selection-firefox.svg](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/selection-firefox.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/04-fetch-abort/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/04-fetch-abort/article.md) - [ ] [5-network/05-fetch-crossorigin/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/05-fetch-crossorigin/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/06-fetch-api/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/06-fetch-api/article.md) - [ ] [5-network/11-websocket/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/11-websocket/article.md) - [ ] [5-network/11-websocket/websocket-handshake.svg](/javascript-tutorial/en.javascript.info/commits/master/5-network/11-websocket/websocket-handshake.svg) - [ ] [6-data-storage/01-cookie/article.md](/javascript-tutorial/en.javascript.info/commits/master/6-data-storage/01-cookie/article.md) - [ ] [6-data-storage/02-localstorage/article.md](/javascript-tutorial/en.javascript.info/commits/master/6-data-storage/02-localstorage/article.md) - [ ] [6-data-storage/03-indexeddb/article.md](/javascript-tutorial/en.javascript.info/commits/master/6-data-storage/03-indexeddb/article.md) - [ ] [7-animation/1-bezier-curve/bezier3-draw1.svg](/javascript-tutorial/en.javascript.info/commits/master/7-animation/1-bezier-curve/bezier3-draw1.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) - [ ] [7-animation/2-css-animations/article.md](/javascript-tutorial/en.javascript.info/commits/master/7-animation/2-css-animations/article.md) - [ ] [8-web-components/1-webcomponents-intro/web-components-twitter.svg](/javascript-tutorial/en.javascript.info/commits/master/8-web-components/1-webcomponents-intro/web-components-twitter.svg) - [ ] [9-regular-expressions/08-regexp-character-sets-and-ranges/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/08-regexp-character-sets-and-ranges/article.md) - [ ] [9-regular-expressions/14-regexp-lookahead-lookbehind/2-insert-after-head/solution.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/14-regexp-lookahead-lookbehind/2-insert-after-head/solution.md) - [ ] [9-regular-expressions/17-regexp-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/17-regexp-methods/article.md) - [ ] [README.md](/javascript-tutorial/en.javascript.info/commits/master/README.md) - [ ] [figures.sketch](/javascript-tutorial/en.javascript.info/commits/master/figures.sketch)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.