search

javascript-tutorial / bn.javascript.info

Modern JavaScript Tutorial in Bengali
https://javascript.info
Other
118 stars 90 forks source link

Sync with upstream @ d694e895 #315

Closed javascript-translate-bot closed 1 year ago

javascript-translate-bot commented 1 year ago

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

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 129 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/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/3-primitive-conversions-questions/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/08-operators/3-primitive-conversions-questions/solution.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/11-logical-operators/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/11-logical-operators/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/15-function-basics/1-if-else-required/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/15-function-basics/1-if-else-required/solution.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/17-arrow-functions-basics/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/17-arrow-functions-basics/article.md) - [ ] [1-js/03-code-quality/01-debugging-chrome/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/01-debugging-chrome/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/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/02-coding-style/article.md) - [ ] [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/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/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/06-constructor-new/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/06-constructor-new/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/04-object-basics/09-object-toprimitive/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/09-object-toprimitive/article.md) - [ ] [1-js/05-data-types/04-array/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/04-array/article.md) - [ ] [1-js/05-data-types/05-array-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/05-array-methods/article.md) - [ ] [1-js/05-data-types/06-iterable/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/06-iterable/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/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/10-destructuring-assignment/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/05-data-types/11-date/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/11-date/article.md) - [ ] [1-js/05-data-types/12-json/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/12-json/article.md) - [ ] [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/04-var/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/04-var/article.md) - [ ] [1-js/06-advanced-functions/07-new-function/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/07-new-function/article.md) - [ ] [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/07-object-properties/01-property-descriptors/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/07-object-properties/01-property-descriptors/article.md) - [ ] [1-js/07-object-properties/02-property-accessors/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/07-object-properties/02-property-accessors/article.md) - [ ] [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/12-generators-iterators/1-generators/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/12-generators-iterators/1-generators/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/12-generators-iterators/2-async-iterators-generators/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/12-generators-iterators/2-async-iterators-generators/article.md) - [ ] [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/03-dom-navigation/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/03-dom-navigation/article.md) - [ ] [2-ui/1-document/04-searching-elements-dom/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/04-searching-elements-dom/article.md) - [ ] [2-ui/1-document/05-basic-dom-node-properties/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/05-basic-dom-node-properties/article.md) - [ ] [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/06-dom-attributes-and-properties/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/06-dom-attributes-and-properties/article.md) - [ ] [2-ui/1-document/07-modifying-document/1-createtextnode-vs-innerhtml/task.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/07-modifying-document/1-createtextnode-vs-innerhtml/task.md) - [ ] [2-ui/1-document/07-modifying-document/5-why-aaa/solution.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/07-modifying-document/5-why-aaa/solution.md) - [ ] [2-ui/1-document/07-modifying-document/5-why-aaa/task.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/07-modifying-document/5-why-aaa/task.md) - [ ] [2-ui/1-document/07-modifying-document/6-create-list/task.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/07-modifying-document/6-create-list/task.md) - [ ] [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/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/article.md) - [ ] [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/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/10-size-and-scroll-window/article.md) - [ ] [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/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/02-bubbling-and-capturing/article.md) - [ ] [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/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/03-event-delegation/article.md) - [ ] [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/04-default-browser-action/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/04-default-browser-action/article.md) - [ ] [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/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/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/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-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) - [ ] [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/01-regexp-introduction/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/01-regexp-introduction/article.md) - [ ] [9-regular-expressions/02-regexp-character-classes/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/02-regexp-character-classes/article.md) - [ ] [9-regular-expressions/05-regexp-multiline-mode/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/05-regexp-multiline-mode/article.md) - [ ] [9-regular-expressions/07-regexp-escaping/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/07-regexp-escaping/article.md) - [ ] [9-regular-expressions/08-regexp-character-sets-and-ranges/1-find-range-1/solution.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/08-regexp-character-sets-and-ranges/1-find-range-1/solution.md) - [ ] [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/10-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/task.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/task.md) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/article.md) - [ ] [9-regular-expressions/11-regexp-groups/01-test-mac/task.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/11-regexp-groups/01-test-mac/task.md) - [ ] [9-regular-expressions/11-regexp-groups/03-find-decimal-numbers/solution.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/11-regexp-groups/03-find-decimal-numbers/solution.md) - [ ] [9-regular-expressions/11-regexp-groups/04-parse-expression/solution.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/11-regexp-groups/04-parse-expression/solution.md) - [ ] [9-regular-expressions/11-regexp-groups/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/11-regexp-groups/article.md) - [ ] [9-regular-expressions/13-regexp-alternation/02-find-matching-bbtags/solution.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/13-regexp-alternation/02-find-matching-bbtags/solution.md) - [ ] [9-regular-expressions/13-regexp-alternation/03-match-quoted-string/solution.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/13-regexp-alternation/03-match-quoted-string/solution.md) - [ ] [9-regular-expressions/13-regexp-alternation/03-match-quoted-string/task.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/13-regexp-alternation/03-match-quoted-string/task.md) - [ ] [9-regular-expressions/13-regexp-alternation/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/13-regexp-alternation/article.md) - [ ] [9-regular-expressions/14-regexp-lookahead-lookbehind/1-find-non-negative-integers/solution.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/14-regexp-lookahead-lookbehind/1-find-non-negative-integers/solution.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/14-regexp-lookahead-lookbehind/2-insert-after-head/task.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/14-regexp-lookahead-lookbehind/2-insert-after-head/task.md) - [ ] [9-regular-expressions/14-regexp-lookahead-lookbehind/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/14-regexp-lookahead-lookbehind/article.md) - [ ] [9-regular-expressions/15-regexp-catastrophic-backtracking/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/15-regexp-catastrophic-backtracking/article.md) - [ ] [9-regular-expressions/16-regexp-sticky/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/16-regexp-sticky/article.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)

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

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.

CLAassistant commented 1 year ago

CLA assistant check
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 14 committers have signed the CLA.

:white_check_mark: odsantos
:white_check_mark: joaquinelio
:white_check_mark: iliakan
:white_check_mark: bogdanbacosca
:white_check_mark: Violet-Bora-Lee
:x: orelby
:x: cerealexperiments
:x: a-v-gor
:x: marcusicaro
:x: MAHIN0093
:x: pradeep-ramola
:x: JeraldVin
:x: Raviikumar001
:x: MSHNK1
You have signed the CLA already but the status is still pending? Let us recheck it.