Skip to content

Sync with upstream @ 206485fc - #231

Closed
javascript-translate-bot wants to merge 618 commits into
masterfrom
sync-206485fc
Closed

Sync with upstream @ 206485fc#231
javascript-translate-bot wants to merge 618 commits into
masterfrom
sync-206485fc

Conversation

@javascript-translate-bot

Copy link
Copy Markdown

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

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

This PR will be closed and replaced with a new one in a few days.

Manik2375 and others added 30 commits December 13, 2021 18:28
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
FIX: fix bug caused by GitHub data change
Added missing word in a sentence.
iliakan and others added 28 commits May 3, 2022 22:48
update localStorage size limit info
add missing line break and remove excess one
replace side-effect with side effect
minor fix, and explanation improvements
Fix grammar in 'Symbol type' article
Fix language in 'Methods of primitives' task
@CLAassistant

CLAassistant commented May 9, 2022

Copy link
Copy Markdown

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

✅ leviding
✅ iliakan
❌ Kirshach
❌ MondoBurrito
❌ Rnbsov
❌ TimothyRuszala
❌ OmerBaddour
❌ pavansuthar
❌ Luca1152
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.