Skip to content
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

Sync with upstream @ 3a0b3f4e #89

Open
wants to merge 1,225 commits into
base: master
from
Open

Sync with upstream @ 3a0b3f4e #89

wants to merge 1,225 commits into from

Conversation

@javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Jan 18, 2021

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

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 65 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.

iliakan and others added 30 commits Nov 22, 2020
Fis typo in 2.5.2 (Scripts: async, defer)
fix nested markdown
Various minor punctuation and phrasing changes.
Update article.md
 (even more minor)
More little tweaks. That should do for now.
Fix my typos in 1.5.5
Clarify a bit ambiguous wording in 1.5.7
Include missing fileServer
Rephrase sentence.
Fix typo in 2.3.3 (Moving the mouse...)
Symmetrize Map and Set summaries
Fix possible typo in 1.5.7 task
Clarify some things in 1.5.12
FIX: some typo error
Minor grammar alteration.
Rephrased for better clarity.
Fix typo in 2.2.5 (Dispatching custom events)
Fix typo in 2.3.1 (Mouse events)
Buffer purpose. And missing "s".
iliakan and others added 27 commits Jan 10, 2021
parameters are also local variables
It is should be made know that `new.target` is `undefined` for regular function calls than say it is empty.
new.target is undefined not empty
For completeness of the test cases we could add tests for the read method. So every method can have individual test cases.
fix spelling of `further`
to ensure completeness, every method should have their own individual test case.
there is nothing to see when code is run. So run button for code can create some confusion.
no need to "js run"
individual test case for methods
Update article.md
each unit parts must be tested
typo
"exception" vs "new feature" ?
@javascript-translate-bot javascript-translate-bot requested a review from javascript-tutorial/translate-pl Jan 18, 2021
@CLAassistant
Copy link

@CLAassistant CLAassistant commented Jan 18, 2021

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

iliakan
joaquinelio
RapTho
lumosmind
Danziger
TaylorClay
lapstjup
sarscode
martynov-94
bilalbutt044
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
Linked issues

Successfully merging this pull request may close these issues.

None yet

You can’t perform that action at this time.