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 @ 99e59ba6 #260

Open
wants to merge 143 commits into
base: master
from
Open

Conversation

@javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Nov 16, 2020

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

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

joaquinelio and others added 30 commits Oct 12, 2020
assign "it"
This updates a small grammar error and adds some helpful info. Hoping it's better now. Let me know if you need any more changes and I'll update it immediately.
Updated based on suggestion on issue #1769
Update task.md
Update 2-ui/4-forms-controls/1-form-elements/article.md
Winnie Pooh case...  : )
Fix: change ; => ,
redundant "use case"
iliakan and others added 27 commits Nov 10, 2020
Fix semicolons in 1.11.6  (Promisification)
Fix semicolons, remove old note in 1.11.8
Fix typo in 1.11.6 (Promisification)
Fix Optional chaining doc
Fix typo, add note in 1.12.2 (Async iteration)
…section

Change `var` to `let` in 7.16 regexp-sticky
Correct comment in 1.13.1
Fix typos in 'Proxy and Reflect'
Fix outdated note in 1.99.04 (Reference Type)
Correct solution explanation in 1.99.04 (Reference Type)
Fix link in 2.1.5 (Node properties...)
It can be more readable with same line of code. There was a lot of nested parenthesis.
Fix a typo in 1.11.3 (Promises chaining)
Fix typo in 2.1.6 (Attributes and properties)
look like ninja code
fix typo in 06-promisify article.md
Fix typos in 2.1.4 (Searching elements)
FIX: delete extra space
Fix a typo in 1.6.1 task solution
Fix a possible typo in 1.6.1
OPT: change "false" to "falsy"
FIX: change ; to ,
@javascript-translate-bot javascript-translate-bot requested a review from javascript-tutorial/translate-fr Nov 16, 2020
@CLAassistant
Copy link

@CLAassistant CLAassistant commented Nov 16, 2020

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

iliakan
leviding
vsemozhetbyt
ZhaoMuwei
wam
lumosmind
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.