Skip to content

Sync with upstream @ 206485fc#96

Merged
ipapoutsidis merged 51 commits intomasterfrom
sync-206485fc
May 9, 2022
Merged

Sync with upstream @ 206485fc#96
ipapoutsidis merged 51 commits intomasterfrom
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:

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.

leviding and others added 30 commits April 17, 2022 15:41
Change of case sensitive word from AppLE to APPLE
Use "What do you think" instead of "How do you think".
New: That said, all symbols have the `description` property.
Old:   That said, any symbols have `description` property.
Line 54: "What functionality we're describing" -- I believe this is a question? Without a question mark, it doesn't make much sense.
I think it's safe now to assume that localStorage can store at least 5MB of data since the last time 2MB was mentioned was in 2015 for Android Browser v4 which has a reported global usage of 0.36% according to caniuse.com. Its' current version of 100 seems to support the same 5MB standard
minor typos and English improvements
update localStorage size limit info
iliakan and others added 21 commits May 3, 2022 22:56
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
Copy link
Copy Markdown

CLAassistant commented May 9, 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.
2 out of 9 committers have signed the CLA.

✅ leviding
✅ iliakan
❌ TimothyRuszala
❌ pavansuthar
❌ MondoBurrito
❌ Luca1152
❌ Kirshach
❌ OmerBaddour
❌ Rnbsov
You have signed the CLA already but the status is still pending? Let us recheck it.

@ipapoutsidis ipapoutsidis merged commit a4101ca into master May 9, 2022
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.