tr.javascript.info
tr.javascript.info copied to clipboard
Sync with upstream @ 540d753e
This PR was automatically generated to merge changes from en.javascript.info at 540d753e
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 329 files
- [ ] 1-js/01-getting-started/1-intro/article.md
- [ ] 1-js/01-getting-started/2-manuals-specifications/article.md
- [ ] 1-js/01-getting-started/3-code-editors/article.md
- [ ] 1-js/01-getting-started/4-devtools/article.md
- [ ] 1-js/01-getting-started/4-devtools/[email protected]
- [ ] 1-js/01-getting-started/4-devtools/safari.png
- [ ] 1-js/01-getting-started/4-devtools/[email protected]
- [ ] 1-js/02-first-steps/01-hello-world/article.md
- [ ] 1-js/02-first-steps/02-structure/article.md
- [ ] 1-js/02-first-steps/03-strict-mode/article.md
- [ ] 1-js/02-first-steps/04-variables/2-declare-variables/solution.md
- [ ] 1-js/02-first-steps/04-variables/3-uppercast-constant/solution.md
- [ ] 1-js/02-first-steps/04-variables/3-uppercast-constant/task.md
- [ ] 1-js/02-first-steps/04-variables/article.md
- [ ] 1-js/02-first-steps/05-types/article.md
- [ ] 1-js/02-first-steps/06-alert-prompt-confirm/article.md
- [ ] 1-js/02-first-steps/07-type-conversions/article.md
- [ ] 1-js/02-first-steps/08-comparison/1-comparison-questions/solution.md
- [ ] 1-js/02-first-steps/08-operators/3-primitive-conversions-questions/task.md
- [ ] 1-js/02-first-steps/08-operators/article.md
- [ ] 1-js/02-first-steps/09-comparison/article.md
- [ ] 1-js/02-first-steps/10-ifelse/2-check-standard/task.md
- [ ] 1-js/02-first-steps/10-ifelse/5-rewrite-if-question/solution.md
- [ ] 1-js/02-first-steps/10-ifelse/5-rewrite-if-question/task.md
- [ ] 1-js/02-first-steps/10-ifelse/article.md
- [ ] 1-js/02-first-steps/11-logical-operators/2-alert-or/solution.md
- [ ] 1-js/02-first-steps/11-logical-operators/3-alert-1-null-2/solution.md
- [ ] 1-js/02-first-steps/11-logical-operators/6-check-if-in-range/task.md
- [ ] 1-js/02-first-steps/11-logical-operators/7-check-if-out-range/task.md
- [ ] 1-js/02-first-steps/11-logical-operators/article.md
- [ ] 1-js/02-first-steps/13-while-for/6-repeat-until-correct/solution.md
- [ ] 1-js/02-first-steps/13-while-for/article.md
- [ ] 1-js/02-first-steps/14-function-basics/1-if-else-required/solution.md
- [ ] 1-js/02-first-steps/14-switch/article.md
- [ ] 1-js/02-first-steps/15-function-basics/2-rewrite-function-question-or/solution.md
- [ ] 1-js/02-first-steps/15-function-basics/2-rewrite-function-question-or/task.md
- [ ] 1-js/02-first-steps/15-function-basics/4-pow/solution.md
- [ ] 1-js/02-first-steps/15-function-basics/article.md
- [ ] 1-js/02-first-steps/16-function-expressions/article.md
- [ ] 1-js/02-first-steps/17-arrow-functions-basics/1-rewrite-arrow/solution.md
- [ ] 1-js/02-first-steps/17-arrow-functions-basics/1-rewrite-arrow/task.md
- [ ] 1-js/02-first-steps/18-javascript-specials/article.md
- [ ] 1-js/03-code-quality/01-debugging-chrome/article.md
- [ ] 1-js/03-code-quality/01-debugging-chrome/chrome-open-sources.svg
- [ ] 1-js/03-code-quality/01-debugging-chrome/chrome-sources-breakpoint.svg
- [ ] 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
- [ ] 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
- [ ] 1-js/03-code-quality/02-coding-style/1-style-errors/solution.md
- [ ] 1-js/03-code-quality/02-coding-style/article.md
- [ ] 1-js/03-code-quality/02-coding-style/code-style.svg
- [ ] 1-js/03-code-quality/03-comments/article.md
- [ ] 1-js/03-code-quality/04-ninja-code/article.md
- [ ] 1-js/03-code-quality/05-testing-mocha/3-pow-test-wrong/solution.md
- [ ] 1-js/03-code-quality/05-testing-mocha/article.md
- [ ] 1-js/03-code-quality/05-testing-mocha/beforeafter.view/test.js
- [ ] 1-js/03-code-quality/05-testing-mocha/pow-2.view/test.js
- [ ] 1-js/03-code-quality/06-polyfills/article.md
- [ ] 1-js/04-object-basics/01-object/4-const-object/solution.md
- [ ] 1-js/04-object-basics/01-object/4-const-object/task.md
- [ ] 1-js/04-object-basics/01-object/8-multiply-numeric/task.md
- [ ] 1-js/04-object-basics/01-object/article.md
- [ ] 1-js/04-object-basics/03-garbage-collection/article.md
- [ ] 1-js/04-object-basics/03-garbage-collection/family-delete-refs.svg
- [ ] 1-js/04-object-basics/03-garbage-collection/family-no-family.svg
- [ ] 1-js/04-object-basics/03-garbage-collection/family-no-father-2.svg
- [ ] 1-js/04-object-basics/03-garbage-collection/family-no-father.svg
- [ ] 1-js/04-object-basics/03-garbage-collection/family.svg
- [ ] 1-js/04-object-basics/03-garbage-collection/garbage-collection-1.svg
- [ ] 1-js/04-object-basics/03-garbage-collection/garbage-collection-2.svg
- [ ] 1-js/04-object-basics/03-garbage-collection/garbage-collection-3.svg
- [ ] 1-js/04-object-basics/03-garbage-collection/garbage-collection-4.svg
- [ ] 1-js/04-object-basics/03-garbage-collection/garbage-collection-5.svg
- [ ] 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
- [ ] 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
- [ ] 1-js/04-object-basics/04-object-methods/7-calculator/task.md
- [ ] 1-js/04-object-basics/04-object-methods/8-chain-calls/_js.view/solution.js
- [ ] 1-js/04-object-basics/04-object-methods/8-chain-calls/_js.view/test.js
- [ ] 1-js/04-object-basics/04-object-methods/8-chain-calls/solution.md
- [ ] 1-js/04-object-basics/04-object-methods/8-chain-calls/task.md
- [ ] 1-js/04-object-basics/04-object-methods/article.md
- [ ] 1-js/04-object-basics/05-object-toprimitive/article.md
- [ ] 1-js/04-object-basics/06-constructor-new/1-two-functions-one-object/task.md
- [ ] 1-js/04-object-basics/06-constructor-new/2-calculator-constructor/task.md
- [ ] 1-js/04-object-basics/06-constructor-new/3-accumulator/task.md
- [ ] 1-js/04-object-basics/06-constructor-new/article.md
- [ ] 1-js/04-object-basics/08-symbol/article.md
- [ ] 1-js/05-data-types/01-primitives-methods/1-string-new-property/solution.md
- [ ] 1-js/05-data-types/01-primitives-methods/1-string-new-property/task.md
- [ ] 1-js/05-data-types/01-primitives-methods/article.md
- [ ] 1-js/05-data-types/02-number/2-why-rounded-down/solution.md
- [ ] 1-js/05-data-types/02-number/article.md
- [ ] 1-js/05-data-types/03-string/1-ucfirst/solution.md
- [ ] 1-js/05-data-types/03-string/1-ucfirst/task.md
- [ ] 1-js/05-data-types/03-string/3-truncate/task.md
- [ ] 1-js/05-data-types/03-string/article.md
- [ ] 1-js/05-data-types/04-array/2-create-array/task.md
- [ ] 1-js/05-data-types/04-array/article.md
- [ ] 1-js/05-data-types/05-array-methods/11-array-unique/solution.md
- [ ] 1-js/05-data-types/05-array-methods/2-filter-range/task.md
- [ ] 1-js/05-data-types/05-array-methods/3-filter-range-in-place/_js.view/test.js
- [ ] 1-js/05-data-types/05-array-methods/4-sort-back/task.md
- [ ] 1-js/05-data-types/05-array-methods/7-map-objects/solution.md
- [ ] 1-js/05-data-types/05-array-methods/8-sort-objects/solution.md
- [ ] 1-js/05-data-types/05-array-methods/9-shuffle/solution.md
- [ ] 1-js/05-data-types/05-array-methods/article.md
- [ ] 1-js/05-data-types/06-iterable/article.md
- [ ] 1-js/05-data-types/07-map-set-weakmap-weakset/04-recipients-read/solution.md
- [ ] 1-js/05-data-types/07-map-set-weakmap-weakset/04-recipients-read/task.md
- [ ] 1-js/05-data-types/07-map-set-weakmap-weakset/article.md
- [ ] 1-js/05-data-types/07-map-set/02-filter-anagrams/solution.md
- [ ] 1-js/05-data-types/07-map-set/03-iterable-keys/task.md
- [ ] 1-js/05-data-types/08-weakmap-weakset/02-recipients-when-read/solution.md
- [ ] 1-js/05-data-types/08-weakmap-weakset/02-recipients-when-read/task.md
- [ ] 1-js/05-data-types/09-keys-values-entries/article.md
- [ ] 1-js/05-data-types/10-date/1-new-date/solution.md
- [ ] 1-js/05-data-types/10-date/3-weekday/solution.md
- [ ] 1-js/05-data-types/10-destructuring-assignment/6-max-salary/_js.view/solution.js
- [ ] 1-js/05-data-types/10-destructuring-assignment/article.md
- [ ] 1-js/05-data-types/10-destructuring-assignment/destructuring-complex.svg
- [ ] 1-js/05-data-types/11-date/6-get-seconds-today/solution.md
- [ ] 1-js/05-data-types/11-date/6-get-seconds-today/task.md
- [ ] 1-js/05-data-types/11-date/8-format-date-relative/solution.md
- [ ] 1-js/05-data-types/11-date/8-format-date-relative/task.md
- [ ] 1-js/05-data-types/11-date/article.md
- [ ] 1-js/05-data-types/12-json/2-serialize-event-circular/task.md
- [ ] 1-js/05-data-types/12-json/article.md
- [ ] 1-js/05-data-types/12-json/json-meetup.svg
- [ ] 1-js/06-advanced-functions/01-recursion/01-sum-to/solution.md
- [ ] 1-js/06-advanced-functions/01-recursion/02-factorial/solution.md
- [ ] 1-js/06-advanced-functions/01-recursion/03-fibonacci-numbers/solution.md
- [ ] 1-js/06-advanced-functions/01-recursion/04-output-single-linked-list/solution.md
- [ ] 1-js/06-advanced-functions/01-recursion/05-output-single-linked-list-reverse/solution.md
- [ ] 1-js/06-advanced-functions/01-recursion/article.md
- [ ] 1-js/06-advanced-functions/01-recursion/recursive-salaries.svg
- [ ] 1-js/06-advanced-functions/02-rest-parameters-spread/article.md
- [ ] 1-js/06-advanced-functions/03-closure/10-make-army/lexenv-makearmy.svg
- [ ] 1-js/06-advanced-functions/03-closure/5-function-in-if/task.md
- [ ] 1-js/06-advanced-functions/03-closure/7-sort-by-field/solution.md
- [ ] 1-js/06-advanced-functions/03-closure/8-make-army/solution.md
- [ ] 1-js/06-advanced-functions/03-closure/8-make-army/task.md
- [ ] 1-js/06-advanced-functions/03-closure/article.md
- [ ] 1-js/06-advanced-functions/04-var/article.md
- [ ] 1-js/06-advanced-functions/05-global-object/article.md
- [ ] 1-js/06-advanced-functions/06-function-object/2-counter-inc-dec/task.md
- [ ] 1-js/06-advanced-functions/06-function-object/5-sum-many-brackets/solution.md
- [ ] 1-js/06-advanced-functions/06-function-object/article.md
- [ ] 1-js/06-advanced-functions/07-new-function/article.md
- [ ] 1-js/06-advanced-functions/08-settimeout-setinterval/1-output-numbers-100ms/solution.md
- [ ] 1-js/06-advanced-functions/08-settimeout-setinterval/1-output-numbers-100ms/task.md
- [ ] 1-js/06-advanced-functions/08-settimeout-setinterval/3-rewrite-settimeout/solution.md
- [ ] 1-js/06-advanced-functions/08-settimeout-setinterval/3-rewrite-settimeout/task.md
- [ ] 1-js/06-advanced-functions/08-settimeout-setinterval/article.md
- [ ] 1-js/06-advanced-functions/09-call-apply-decorators/01-spy-decorator/solution.md
- [ ] 1-js/06-advanced-functions/09-call-apply-decorators/03-debounce/_js.view/solution.js
- [ ] 1-js/06-advanced-functions/09-call-apply-decorators/03-debounce/_js.view/test.js
- [ ] 1-js/06-advanced-functions/09-call-apply-decorators/03-debounce/solution.md
- [ ] 1-js/06-advanced-functions/09-call-apply-decorators/03-debounce/task.md
- [ ] 1-js/06-advanced-functions/09-call-apply-decorators/04-throttle/_js.view/test.js
- [ ] 1-js/06-advanced-functions/09-call-apply-decorators/04-throttle/solution.md
- [ ] 1-js/06-advanced-functions/09-call-apply-decorators/04-throttle/task.md
- [ ] 1-js/06-advanced-functions/09-call-apply-decorators/article.md
- [ ] 1-js/06-advanced-functions/10-bind/4-function-property-after-bind/task.md
- [ ] 1-js/06-advanced-functions/10-bind/5-question-use-bind/solution.md
- [ ] 1-js/06-advanced-functions/10-bind/6-ask-partial/task.md
- [ ] 1-js/06-advanced-functions/10-bind/article.md
- [ ] 1-js/06-advanced-functions/11-currying-partials/article.md
- [ ] 1-js/06-advanced-functions/12-arrow-functions/article.md
- [ ] 1-js/07-object-properties/01-property-descriptors/article.md
- [ ] 1-js/07-object-properties/02-property-accessors/article.md
- [ ] 1-js/08-prototypes/01-prototype-inheritance/2-search-algorithm/task.md
- [ ] 1-js/08-prototypes/01-prototype-inheritance/3-proto-and-this/solution.md
- [ ] 1-js/08-prototypes/01-prototype-inheritance/3-proto-and-this/task.md
- [ ] 1-js/08-prototypes/01-prototype-inheritance/4-hamster-proto/solution.md
- [ ] 1-js/08-prototypes/01-prototype-inheritance/4-hamster-proto/task.md
- [ ] 1-js/08-prototypes/01-prototype-inheritance/article.md
- [ ] 1-js/08-prototypes/02-function-prototype/1-changing-prototype/solution.md
- [ ] 1-js/08-prototypes/02-function-prototype/1-changing-prototype/task.md
- [ ] 1-js/08-prototypes/02-function-prototype/article.md
- [ ] 1-js/08-prototypes/03-native-prototypes/article.md
- [ ] 1-js/08-prototypes/04-prototype-methods/2-dictionary-tostring/solution.md
- [ ] 1-js/08-prototypes/04-prototype-methods/article.md
- [ ] 1-js/09-classes/01-class/1-rewrite-to-class/task.md
- [ ] 1-js/09-classes/01-class/article.md
- [ ] 1-js/09-classes/02-class-inheritance/article.md
- [ ] 1-js/09-classes/03-static-properties-methods/3-class-extend-object/rabbit-extends-object.svg
- [ ] 1-js/09-classes/03-static-properties-methods/3-class-extend-object/solution.md
- [ ] 1-js/09-classes/03-static-properties-methods/article.md
- [ ] 1-js/09-classes/06-instanceof/1-strange-instanceof/task.md
- [ ] 1-js/09-classes/06-instanceof/article.md
- [ ] 1-js/09-classes/07-mixins/article.md
- [ ] 1-js/10-error-handling/1-try-catch/1-finally-or-code-after/solution.md
- [ ] 1-js/10-error-handling/1-try-catch/1-finally-or-code-after/task.md
- [ ] 1-js/10-error-handling/1-try-catch/article.md
- [ ] 1-js/10-error-handling/2-custom-errors/article.md
- [ ] 1-js/11-async/01-callbacks/article.md
- [ ] 1-js/11-async/02-promise-basics/article.md
- [ ] 1-js/11-async/02-promise-basics/promise-reject-1.svg
- [ ] 1-js/11-async/02-promise-basics/promise-resolve-1.svg
- [ ] 1-js/11-async/03-promise-chaining/article.md
- [ ] 1-js/11-async/05-promise-api/article.md
- [ ] 1-js/11-async/06-promisify/article.md
- [ ] 1-js/11-async/07-microtask-queue/article.md
- [ ] 1-js/12-generators-iterators/1-generators/article.md
- [ ] 1-js/12-generators-iterators/1-generators/generateSequence-2.svg
- [ ] 1-js/12-generators-iterators/1-generators/generateSequence-3.svg
- [ ] 1-js/13-modules/01-modules-intro/article.md
- [ ] 1-js/13-modules/02-import-export/article.md
- [ ] 1-js/13-modules/03-modules-dynamic-imports/article.md
- [ ] 1-js/99-js-misc/01-proxy/article.md
- [ ] 1-js/99-js-misc/01-proxy/proxy.svg
- [ ] 1-js/99-js-misc/02-eval/1-eval-calculator/task.md
- [ ] 1-js/99-js-misc/02-eval/article.md
- [ ] 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
- [ ] 1-js/99-js-misc/04-reference-type/3-why-this/task.md
- [ ] 2-ui/1-document/01-browser-environment/article.md
- [ ] 2-ui/1-document/02-dom-nodes/article.md
- [ ] 2-ui/1-document/03-dom-navigation/article.md
- [ ] 2-ui/1-document/04-searching-elements-dom/1-find-elements/solution.md
- [ ] 2-ui/1-document/04-searching-elements-dom/1-find-elements/task.md
- [ ] 2-ui/1-document/05-basic-dom-node-properties/dom-class-hierarchy.svg
- [ ] 2-ui/1-document/07-modifying-document/1-createtextnode-vs-innerhtml/task.md
- [ ] 2-ui/1-document/07-modifying-document/10-clock-setinterval/solution.md
- [ ] 2-ui/1-document/07-modifying-document/12-sort-table/solution.md
- [ ] 2-ui/1-document/07-modifying-document/12-sort-table/solution.view/index.html
- [ ] 2-ui/1-document/07-modifying-document/12-sort-table/source.view/index.html
- [ ] 2-ui/1-document/07-modifying-document/12-sort-table/task.md
- [ ] 2-ui/1-document/07-modifying-document/5-why-aaa/task.md
- [ ] 2-ui/1-document/07-modifying-document/6-create-list/task.md
- [ ] 2-ui/1-document/07-modifying-document/9-calendar-table/solution.md
- [ ] 2-ui/1-document/07-modifying-document/article.md
- [ ] 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
- [ ] 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
- [ ] 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
- [ ] 2-ui/1-document/09-size-and-scroll/metric-css.svg
- [ ] 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
- [ ] 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
- [ ] 2-ui/1-document/10-size-and-scroll-window/document-client-width-height.svg
- [ ] 2-ui/2-events/01-introduction-browser-events/04-move-ball-field/move-ball-coords.svg
- [ ] 2-ui/2-events/01-introduction-browser-events/article.md
- [ ] 2-ui/2-events/02-bubbling-and-capturing/event-order-bubbling.svg
- [ ] 2-ui/2-events/03-event-delegation/bagua-bubble.svg
- [ ] 2-ui/3-event-details/1-mouse-events-basics/01-selectable-list/task.md
- [ ] 2-ui/3-event-details/1-mouse-events-basics/article.md
- [ ] 2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/1-behavior-nested-tooltip/task.md
- [ ] 2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/2-hoverintent/task.md
- [ ] 2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/article.md
- [ ] 2-ui/3-event-details/4-mouse-drag-and-drop/1-slider/solution.md
- [ ] 2-ui/3-event-details/4-mouse-drag-and-drop/2-drag-heroes/solution.md
- [ ] 2-ui/3-event-details/4-mouse-drag-and-drop/2-drag-heroes/solution.view/field.svg
- [ ] 2-ui/3-event-details/4-mouse-drag-and-drop/2-drag-heroes/task.md
- [ ] 2-ui/3-event-details/4-mouse-drag-and-drop/article.md
- [ ] 2-ui/3-event-details/7-keyboard-events/german-layout.svg
- [ ] 2-ui/3-event-details/7-keyboard-events/us-layout.svg
- [ ] 2-ui/3-event-details/8-onscroll/article.md
- [ ] 2-ui/4-forms-controls/1-form-elements/article.md
- [ ] 2-ui/4-forms-controls/3-events-change-input/article.md
- [ ] 2-ui/4-forms-controls/4-forms-submit/article.md
- [ ] 2-ui/5-loading/02-script-async-defer/article.md
- [ ] 2-ui/99-ui-misc/03-event-loop/article.md
- [ ] 2-ui/99-ui-misc/03-event-loop/eventLoop.svg
- [ ] 3-frames-and-windows/06-clickjacking/article.md
- [ ] 4-binary/03-blob/article.md
- [ ] 5-network/01-fetch-basics/article.md
- [ ] 5-network/04-fetch-crossorigin/article.md
- [ ] 5-network/05-fetch-api/article.md
- [ ] 5-network/05-fetch-crossorigin/cors-gmail-messages.svg
- [ ] 5-network/05-fetch-crossorigin/xhr-another-domain.svg
- [ ] 5-network/05-fetch-crossorigin/xhr-preflight.svg
- [ ] 5-network/06-url/article.md
- [ ] 5-network/11-websocket/websocket-handshake.svg
- [ ] 6-data-storage/01-cookie/article.md
- [ ] 7-animation/1-bezier-curve/article.md
- [ ] 7-animation/1-bezier-curve/bezier3-draw1.svg
- [ ] 7-animation/1-bezier-curve/bezier3-e.svg
- [ ] 7-animation/1-bezier-curve/bezier3.svg
- [ ] 7-animation/1-bezier-curve/demo.svg
- [ ] 7-animation/2-css-animations/2-animate-logo-bezier-css/task.md
- [ ] 7-animation/2-css-animations/article.md
- [ ] 7-animation/3-js-animation/article.md
- [ ] 8-web-components/1-webcomponents-intro/article.md
- [ ] 8-web-components/1-webcomponents-intro/web-components-twitter.svg
- [ ] 9-regular-expressions/01-regexp-introduction/article.md
- [ ] 9-regular-expressions/02-regexp-character-classes/article.md
- [ ] 9-regular-expressions/03-regexp-unicode/article.md
- [ ] 9-regular-expressions/04-regexp-anchors/1-start-end/solution.md
- [ ] 9-regular-expressions/04-regexp-anchors/1-start-end/task.md
- [ ] 9-regular-expressions/04-regexp-anchors/article.md
- [ ] 9-regular-expressions/05-regexp-multiline-mode/article.md
- [ ] 9-regular-expressions/06-regexp-boundary/1-find-time-hh-mm/solution.md
- [ ] 9-regular-expressions/06-regexp-boundary/1-find-time-hh-mm/task.md
- [ ] 9-regular-expressions/06-regexp-boundary/article.md
- [ ] 9-regular-expressions/07-regexp-escaping/article.md
- [ ] 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
- [ ] 9-regular-expressions/09-regexp-quantifiers/1-find-text-manydots/solution.md
- [ ] 9-regular-expressions/09-regexp-quantifiers/1-find-text-manydots/task.md
- [ ] 9-regular-expressions/09-regexp-quantifiers/2-find-html-colors-6hex/solution.md
- [ ] 9-regular-expressions/09-regexp-quantifiers/2-find-html-colors-6hex/task.md
- [ ] 9-regular-expressions/09-regexp-quantifiers/article.md
- [ ] 9-regular-expressions/10-regexp-greedy-and-lazy/article.md
- [ ] 9-regular-expressions/11-regexp-groups/01-test-mac/solution.md
- [ ] 9-regular-expressions/11-regexp-groups/01-test-mac/task.md
- [ ] 9-regular-expressions/11-regexp-groups/03-find-decimal-numbers/solution.md
- [ ] 9-regular-expressions/11-regexp-groups/04-parse-expression/solution.md
- [ ] 9-regular-expressions/11-regexp-groups/article.md
- [ ] 9-regular-expressions/12-regexp-backreferences/article.md
- [ ] 9-regular-expressions/13-regexp-alternation/02-find-matching-bbtags/solution.md
- [ ] 9-regular-expressions/13-regexp-alternation/article.md
- [ ] 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
- [ ] 9-regular-expressions/14-regexp-lookahead-lookbehind/2-insert-after-head/task.md
- [ ] 9-regular-expressions/14-regexp-lookahead-lookbehind/article.md
- [ ] 9-regular-expressions/15-regexp-catastrophic-backtracking/article.md
- [ ] 9-regular-expressions/16-regexp-sticky/article.md
- [ ] 9-regular-expressions/17-regexp-methods/article.md
- [ ] 9-regular-expressions/index.md
- [ ] README.md
- [ ] figures.sketch
- [ ]
To merge changes manually (instead of merging this PR):
- 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
- Commit all current work locally and
git checkout master - Pull the recent changes from the English version:
git pull upstream master
- 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
- Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
- 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.
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 17 committers have signed the CLA.
:white_check_mark: kricsleo
:white_check_mark: Alexandre887
:white_check_mark: smith558
:white_check_mark: vincent-clipet
:white_check_mark: iliakan
:x: FloffyGarlic
:x: shallow-beach
:x: zakingslayerv22
:x: pj-szdm
:x: tonybishnoi
:x: nikoandpiko
:x: AdityaGirdhar
:x: mhi1627
:x: Gleb-Pastushenko
:x: rahulrao0209
:x: dangerman
:x: Paramesh-T-S
You have signed the CLA already but the status is still pending? Let us recheck it.