Skip to content

Sync with upstream @ 7000ede2#103

Merged
ipapoutsidis merged 24 commits intomasterfrom
sync-7000ede2
Aug 10, 2022
Merged

Sync with upstream @ 7000ede2#103
ipapoutsidis merged 24 commits intomasterfrom
sync-7000ede2

Conversation

@javascript-translate-bot
Copy link
Copy Markdown

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

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.

peterhauke and others added 24 commits June 22, 2022 18:53
In the first paragraph, both of the following are correct:

you'll need other resources.
you'll need access to other sources.

I propose the first version

There is no hyphen in In-between, so you could write here: in between or between - but between is by far better.
Improve English language/correct grammar
fix: 1-js/06-advanced-functions/05-global-object
fix: changed 'template' to '<custom-menu>'
…st-of-code-editors

Removed Atom (Sunsetted) From List Of Code Editors
Fixed typo
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Aug 8, 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 9 committers have signed the CLA.

✅ printfinn
✅ iliakan
✅ leviding
❌ peterhauke
❌ xmready
❌ Aleksey28
❌ chilipenko
❌ icarrington
❌ nayanadasgupta
You have signed the CLA already but the status is still pending? Let us recheck it.

@ipapoutsidis ipapoutsidis merged commit 1e2a27e into master Aug 10, 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.