Skip to content

Sync with upstream @ a6fdfda0#59

Closed
javascript-translate-bot wants to merge 237 commits intomasterfrom
sync-a6fdfda0
Closed

Sync with upstream @ a6fdfda0#59
javascript-translate-bot wants to merge 237 commits intomasterfrom
sync-a6fdfda0

Conversation

@javascript-translate-bot
Copy link
Copy Markdown

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

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.

joaquinelio and others added 26 commits December 13, 2021 18:05
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
ms - official international name for millisecond. 1 ms = 1 * 10**(-3) second (or 1e-3). Source : https://en.wikipedia.org/wiki/Metric_prefix .
0.000001 or 1e-6 - it's microsecond. Better name for this variable 'mcs' or 'us'. 'mcs' easier to understand.
fix spelling error at line 139: "Lke" to "Like"
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Jan 17, 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.
3 out of 10 committers have signed the CLA.

✅ iliakan
✅ joaquinelio
✅ odsantos
❌ Manik2375
❌ HiddenOgre28
❌ tburette
❌ tathienphuoc
❌ Ilya Kantor
❌ NickFallman
❌ 11201010


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.