Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Sync with upstream @ 540d753e#1774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
javascript-translate-bot wants to merge1,925 commits intomaster
base:master
Choose a base branch
Loading
fromsync-540d753e

Conversation

javascript-translate-bot

This PR was automatically generated to merge changes fromen.javascript.info at540d753

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 241 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 andgit 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 andgit 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.

digital-bwand others added30 commitsSeptember 24, 2022 19:50
contextually 'true' can be confusing after 'false' in sentence: "... false, technically that's true ..."
Parentheses can be omitted even if the constructor function has arguments:```jsnew function(test) {    return { test }}// Works the same asnew (function(test) {    return { test }})();```
Remove description of inconsistency between Chrome and Firefox
fix small typo in web-components slots chapter.
Gleb-Pastushenkoand others added27 commitsFebruary 10, 2025 20:59
Correction of grammatical error
Fix minor typo in Function object, NFE article.
…_JS_topic_Error-handlingFix for #3826 - Removed errorception.com from the respective md file.
…_JS_topic_Error-handlingsentry.io added as per suggestion
Fix minor typo in Function binding article.
Update Function object, NFE article
…shotUpdate Safari dev tools setup instructions
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

60 participants
@javascript-translate-bot@web-dev-sam@joaquinelio@skromez@romanstetsyk@ann-kilzer@wdscxsj@iliakan@aki-mizu@TevaHenry@Rnbsov@adam4nj@f6p@Vic-Bonlight@leviding@nikolai-chernolutskii@Alexandre887@alagunoff@cerealexperiments@bogdanbacosca@orelby@a-v-gor@Violet-Bora-Lee@sagarpanchal@odsantos@MAHIN0093@marcusicaro@JeraldVin@Raviikumar001@pradeep-ramola@MSHNK1@rahulrao0209@WOLFRIEND@smith558@nakhodkin@JaFro96@alexandermirzoyan@CJDumbleton@qadzek@mikayel00@eedrxs@nepikn@0xtpsl@Filin3@ellie-heidari@pvepamb1@sneeed@kricsleo@FloffyGarlic@shallow-beach@tonybishnoi@nikoandpiko@zakingslayerv22@pj-szdm@mhi1627@AdityaGirdhar@Gleb-Pastushenko@vincent-clipet@Paramesh-T-S@dangerman

[8]ページ先頭

©2009-2025 Movatter.jp