Sync with upstream @ 5e893cff by javascript-translate-bot · Pull Request #613 · javascript-tutorial/fr.javascript.info
Conversation
javascript-translate-bot
commented
Nov 17, 2025
This PR was automatically generated to merge changes from en.javascript.info at 5e893cf
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 29 files
- 1-js/01-getting-started/4-devtools/article.md
- 1-js/02-first-steps/04-variables/article.md
- 1-js/02-first-steps/05-types/article.md
- 1-js/02-first-steps/09-comparison/article.md
- 1-js/03-code-quality/06-polyfills/article.md
- 1-js/04-object-basics/04-object-methods/8-chain-calls/task.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/06-iterable/article.md
- 1-js/05-data-types/10-destructuring-assignment/article.md
- 1-js/06-advanced-functions/06-function-object/article.md
- 1-js/06-advanced-functions/10-bind/article.md
- 1-js/08-prototypes/04-prototype-methods/article.md
- 1-js/09-classes/06-instanceof/article.md
- 1-js/10-error-handling/1-try-catch/article.md
- 1-js/11-async/02-promise-basics/article.md
- 1-js/13-modules/02-import-export/article.md
- 2-ui/3-event-details/6-pointer-events/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/99-ui-misc/02-selection-range/article.md
- 2-ui/99-ui-misc/03-event-loop/article.md
- 6-data-storage/01-cookie/article.md
- 6-data-storage/03-indexeddb/article.md
- 7-animation/3-js-animation/article.md
- 9-regular-expressions/11-regexp-groups/article.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
This PR will be closed and replaced with a new one in a few days.
wdscxsj and others added 30 commits
Fixing a minor grammatical typo in the selection and range markdown document.
Add WeakRef and FinalizationRegistry article
Fix broken link to compat-table
Fix broken link to compat-table
Replace the assignment operator `=` with the equality comparison `==` in both examples in the 'Truncate the text' task.
Fix the broken link in Chapter 3.6
Replace assignment with equals in Truncate the text task
Add missing words
fix square brackets
Improve awkward sentence structure
Updated RFC spec Safe Methods URL in Cookies chapter
typo "optimzed
iliakan and others added 26 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
All committers have signed the CLA.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
