Skip to content

Conversation

@javascript-translate-bot

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

This PR contains files with conflicts. 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 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.

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

Please ignore changes in Readme.md (git checkout --ours Readme.md && git commit -m ignore Readme.md).

muraha and others added 30 commits April 15, 2019 14:34
Fix typo dynamicaly to dinamically
"press" is when we push a keyboard key
"click"/"select" is when we use a mouse button.
minor spelling and grammar corrections
Update article.md (File and FileReader)
Array methods: minor mistake
…e-basics

Replace error strings with template strings
Fixed typos in defer example
@CLAassistant
Copy link

CLAassistant commented May 30, 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 16 committers have signed the CLA.

✅ iliakan
✅ Violet-Bora-Lee
❌ him2312
❌ lex111
❌ fakeinc
❌ developerdavo
❌ oonufrienko
❌ shamilDzhakeev
❌ nabaraj
❌ maurodibert
❌ KenjiI
❌ alfiya-udc
❌ T1mL3arn
❌ skmetaly
❌ tonchique
❌ vasilevx


fakeinc seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

javascript-translate-bot pushed a commit that referenced this pull request Nov 11, 2019
Adding some mention of implicit `<tbody>` element. Comes up later in Modifying the Document task #10 solution.
odsantos added a commit that referenced this pull request Dec 17, 2022
Change 'importance' translation back to English
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.