Sync with upstream @ d78b01e9 by javascript-translate-bot · Pull Request #207 · javascript-tutorial/ro.javascript.info
javascript-tutorial / ro.javascript.info Public
-
Notifications
You must be signed in to change notification settings - Fork 30
Closed
Closed
Conversation
javascript-translate-bot
commented
Feb 23, 2026
This PR was automatically generated to merge changes from en.javascript.info at d78b01e
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 45 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/02-first-steps/04-variables/3-uppercast-constant/task.md
- 1-js/02-first-steps/04-variables/article.md
- 1-js/02-first-steps/07-type-conversions/article.md
- 1-js/02-first-steps/08-operators/3-primitive-conversions-questions/solution.md
- 1-js/02-first-steps/10-ifelse/article.md
- 1-js/02-first-steps/14-switch/article.md
- 1-js/02-first-steps/18-javascript-specials/article.md
- 1-js/03-code-quality/03-comments/article.md
- 1-js/03-code-quality/06-polyfills/article.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/04-object-methods/7-calculator/task.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/08-symbol/article.md
- 1-js/04-object-basics/09-object-toprimitive/article.md
- 1-js/05-data-types/02-number/article.md
- 1-js/05-data-types/04-array/article.md
- 1-js/05-data-types/05-array-methods/article.md
- 1-js/05-data-types/07-map-set/article.md
- 1-js/05-data-types/11-date/article.md
- 1-js/06-advanced-functions/01-recursion/01-sum-to/solution.md
- 1-js/06-advanced-functions/01-recursion/article.md
- 1-js/06-advanced-functions/03-closure/5-function-in-if/task.md
- 1-js/06-advanced-functions/03-closure/article.md
- 1-js/06-advanced-functions/05-global-object/article.md
- 1-js/06-advanced-functions/06-function-object/article.md
- 1-js/06-advanced-functions/08-settimeout-setinterval/article.md
- 1-js/11-async/01-callbacks/article.md
- 1-js/11-async/02-promise-basics/article.md
- 1-js/11-async/03-promise-chaining/article.md
- 1-js/11-async/05-promise-api/article.md
- 2-ui/1-document/10-size-and-scroll-window/document-client-width-height.svg
- 2-ui/99-ui-misc/03-event-loop/2-micro-macro-queue/solution.md
- 2-ui/99-ui-misc/03-event-loop/2-micro-macro-queue/task.md
- 2-ui/99-ui-misc/03-event-loop/article.md
- 5-network/01-fetch/article.md
- 5-network/11-websocket/websocket-handshake.svg
- 7-animation/2-css-animations/article.md
- README.md
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.
wdscxsj and others added 30 commits
Firefox v105 also shows `10px`.
Remove description of inconsistency between Chrome and Firefox
ECMA broken link
Fix typo "stirng" to "string"
Change link to the spec
Omitting parentheses after `new`
grammar suggestion
fix small typo
fix small typo in web-components slots chapter.
fix a small typo
Update task.md
Same as title
iliakan and others added 29 commits
Removed https://errorception.com/ from the md file as it is no longer operational.
Fix minor typo in Function object, NFE article.
…_JS_topic_Error-handling Fix for #3826 - Removed errorception.com from the respective md file.
…_JS_topic_Error-handling sentry.io added as per suggestion
Fix minor typo in Function binding article.
Update article.md
Update Function object, NFE article
…shot Update Safari dev tools setup instructions
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Fix minor typo
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
clarify wording about null and undefined equality in JS
Minor grammar improvement
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
20 participants
