Skip to content

Conversation

@javascript-translate-bot

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

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 25 files

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

This PR will be closed and replaced with a new one in a few days.

Siteproxy

Siteproxy

搜索引擎


常用网站


新闻网站


海外论坛


wdscxsj and others added 30 commits October 3, 2022 16:58

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fixing a minor grammatical typo in the selection and range markdown document.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Add WeakRef and FinalizationRegistry article

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix broken link to compat-table

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix broken link to compat-table

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Replace the assignment operator `=` with the equality comparison `==` in both examples in the 'Truncate the text' task.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Fix the broken link in Chapter 3.6

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Replace assignment with equals in Truncate the text task

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Add missing words

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
fix square brackets

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Improve awkward sentence structure

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Updated RFC spec Safe Methods URL in Cookies chapter

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Fix typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
typo "optimzed
smith558 and others added 26 commits February 10, 2025 19:13

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Fixed missing closing parenthesis

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Removed  https://errorception.com/ from the md file as it is no longer operational.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Fix minor typo in Function object, NFE article.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…_JS_topic_Error-handling

Fix for #3826 - Removed errorception.com from the respective md file.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…_JS_topic_Error-handling

sentry.io added as per suggestion

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Fix minor typo in Function binding article.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update Function object, NFE article

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…shot

Update Safari dev tools setup instructions
@CLAassistant
Copy link

CLAassistant commented Apr 21, 2025

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.
2 out of 5 committers have signed the CLA.

✅ iliakan
✅ smith558
❌ rahulrao0209
❌ Paramesh-T-S
❌ dangerman
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

None yet