Skip to content

Conversation

javascript-translate-bot

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

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

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.

aruseni and others added 30 commits July 11, 2019 00:40
[strings] 2 code units are 4 bytes
Not sure if it's what you wanted to say but the original sentence is not accurate I think.
change parameter name to the set one
Fixed typo
I fixed some of the awkward phrasing:

• `concrete` is more common in the literary style of writing and is used to denote something opposite of abstract, so placing it here when describing a relation between html elements seems unnecessarily cumbersome. Plus there's some tautology in using `concrete` together with `actually`. I propose something simpler.

• `It’s possible that event.target equals this` -- the present indefinite tense is not quite correctly used here, because this sentence describes something that only happens conditionally and is not always true. There are many ways to rewrite this sentence, and I propose one that aims to keep the original structure of the idea.
errata
Corrected no-declaration object destructuring
[strings] Surrogate pairs S example
@CLAassistant
Copy link

CLAassistant commented Aug 12, 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.
3 out of 4 committers have signed the CLA.

✅ iliakan
✅ jinpae
✅ Violet-Bora-Lee
❌ alexgarbarev
You have signed the CLA already but the status is still pending? Let us recheck it.

@luizclr
Copy link
Contributor

luizclr commented Aug 15, 2019

@alexgarbarev @jinpae please check for Contributor License Agreement.

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.