Skip to content

Sync with upstream @ 246c600f #112

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3,020 commits into from
Closed

Conversation

javascript-translate-bot

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

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

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.

joaquinelio and others added 30 commits June 10, 2021 00:00

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
typpo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
FIX: minor typo error

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
 FIX: The range of hexadecimal numbers is 0-9 or A-F

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
easier to read

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
"not required" vs "incorrect"

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Remove mentions of :host-context

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix typo in 1-js/05-data-types/03-string

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
"inserts into" instead of "appends to"

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Removed unnecessary escape characters from regex in "getCookie function in cookie.js" - 
. ( ) [ / +
The above characters don't need escaping.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
iliakan and others added 26 commits December 13, 2021 18:29
Change the phrase "a property" to "the property" in line 57 (`Here the line (*) sets animal to be a prototype of rabbit.`) because it made it sound like an object can inherit more than one prototype at a time.
Adding the third header in list
transl: easier to change where mdn: dsnt work
fix the broken RFC link in the JSON article
Fix: Rewrite sentence in line 121
I didnt test it
@CLAassistant
Copy link

CLAassistant commented Jan 10, 2022

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

✅ joaquinelio
✅ hc9937
✅ iliakan
✅ justforuse
✅ odsantos
❌ Ilya Kantor
❌ yangsong97
❌ akxavier
❌ tburette
❌ LexaWin
❌ Tofpu
❌ HiddenOgre28
❌ Manik2375


Ilya Kantor 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.

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.

None yet