Skip to content

Conversation

@javascript-translate-bot

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

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:

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.

Saiyn Dembirel and others added 30 commits November 7, 2019 17:19
Changes to Summary description of `clientLeft/clientTop`. I **think** this is what was meant.
added a missing word
The solution explanation is not very obvious so added another example to make things clear
quick description:
before: .catch(f) is the same as promise.then(null, f)
after: .catch(f) is the same as .then(null, f)
Changed the reference to each item of the array since it was previously defined as the variable word.
When assigning the static method `staticMethod` to the `User` class, as a property directly, no parentheses should be used after `User`, since this leads to an error: `SyntaxError: Unexpected token '('`. For this reason, such parentheses have to be removed.
in the control control forms section, fixed mistake selectionEnd and selectionStart were both said to be  start position
Removed duplicated `also`.
Fix: typos in <5-network/02-formdata/article.md>
Fix err in syntax
Update article.md
fixed a word 'operational' to be 'operating'
Update article.md
replace russian-english comment with english
modified a sentence
'and want' to implement...
imabp and others added 26 commits January 14, 2020 23:20
Function return example update
Typo fix.
Make minor grammar corrections/updates to async/microtask-queue
Update 'Selection and Range' article.md
A small grammar change and fixing a typo (I think) (no -> not).
Actually taking out a comma.
Make minor grammar corrections/updates to async/promise-basics
Change panel names according to official documentation
Translated tasks to English Language.
@claassistantio
Copy link

claassistantio commented Jan 20, 2020

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

✅ leviding
✅ iliakan
✅ KennethKinLum
✅ tarasyyyk
❌ Aissaoui-Ahmed
❌ lex111
❌ LaievskyiSasha
❌ sajadhsm
❌ nylki
❌ ogaclejapan
❌ jianlin
❌ karniol
❌ paroche
❌ jchue
❌ dashaezhova
❌ baooab
❌ imabp
❌ dpyzo0o
❌ mdizo
❌ va-z
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.