Skip to content

Conversation

@javascript-translate-bot

This PR was automatically generated.
Merge changes from en.javascript.info at 19223ae

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

We recommend to close this PR and merge conflicting changes manually.

The steps are:

  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 them. Otherwise, following commands can help:
    • Checkout translated version of a file/folder at the given path:
      • git checkout --ours <path>
    • Checkout upstream version of a file/folder at the given path:
      • git checkout --theirs <path>
    • See what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
  5. 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).

candh and others added 30 commits April 17, 2019 23:02
Changed the sign on line 32,33.
Remove word "to" after a modal verb
Correct DOOM to DOM
'lines' instead of 'line' in the "multi-line input" section
BEFORE
"3. When this happens, a special “object wrapper” IS CREATED that provides the extra functionality, and then is destroyed."
AFTER
"3. When this happens, a special “object wrapper” that provides the extra functionality IS CREATED, and then is destroyed."
@CLAassistant
Copy link

CLAassistant commented Apr 26, 2019

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 14 committers have signed the CLA.

✅ Violet-Bora-Lee
✅ lex111
❌ candh
❌ JohnMcGuinness
❌ dragonwocky
❌ iliakan
❌ him2312
❌ mihansweatpants
❌ alaabouayed
❌ cmdlhz
❌ h-n-y
❌ marksq
❌ Antiai
❌ david-cho-lerat-HL2
You have signed the CLA already but the status is still pending? Let us recheck it.

@sahinyanlik sahinyanlik merged commit d0789c8 into master May 6, 2019
@sahinyanlik sahinyanlik deleted the sync-19223ae7 branch May 6, 2019 13:02
javascript-translate-bot pushed a commit that referenced this pull request Sep 2, 2019
javascript-translate-bot pushed a commit that referenced this pull request Sep 9, 2019
javascript-translate-bot pushed a commit that referenced this pull request Mar 24, 2020
Repo Update 4-Aug, 2018
sahinyanlik pushed a commit that referenced this pull request Jan 19, 2021
Translated solution.md
2-ui/1-document/07-modifying-document/1-createtextnode-vs-innerhtml/solution.md
bilgedemirkaya pushed a commit that referenced this pull request Jan 25, 2021
Merge pull request #176 from kayraberktuncer/master
www-learn-en pushed a commit that referenced this pull request Jun 15, 2021
sahinyanlik pushed a commit that referenced this pull request Feb 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.