Skip to content

Sync with upstream @ 9e3fa135#309

Closed
javascript-translate-bot wants to merge 883 commits intomasterfrom
sync-9e3fa135
Closed

Sync with upstream @ 9e3fa135#309
javascript-translate-bot wants to merge 883 commits intomasterfrom
sync-9e3fa135

Conversation

@javascript-translate-bot

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

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 164 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 July 13, 2022 08:54
…st-of-code-editors

Removed Atom (Sunsetted) From List Of Code Editors
Fixed the wrong sequence
Fixed typo
to make `alerts` work
Noticed that the word implementing was spelt incorrectly within the section for pointercancel events, thus I decided to correct it for reading comprehension reasons.
Fixed typo
According to MDN, the precedence of unary plus, unary negation,
exponentiation, multiplication, division, addition, and
subtraction is 1 lower than it is in the document
Line 265 and 266: Use 'fruits' instead of the 'arr' variable.
This is almost the minimal number of changes that I would make. 

I would still recommend changing "play" in the first line to "work".
Looks like the right line for a comment is the line 306 instead of 308.
bogdanbacosca and others added 26 commits November 26, 2022 10:01
the dots look weird here
No need for the extra ' here.
minor code formatting for 1-js/02-first-steps/10-ifelse/article.md
…mo-when-paused

Bezier curves: update paused demo on point move
Co-authored-by: Bogdan Bacoșcă <bogdanbacosca@protonmail.com>
Since the button is causing mobile screen users to have a horizontal scroll, I've fixed it giving it a max-height.

This removes the horizontal scroll that the button was causing on the entire page for mobile readers.
correct statement grammar by adding missing word 'to'
fix: add missing word 'to' - Pointer events
Update button to fix horizontal scroll on mobile
Fix the article.md Resolves #3307
@CLAassistant
Copy link

CLAassistant commented Feb 13, 2023

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.
5 out of 11 committers have signed the CLA.

✅ iliakan
✅ joaquinelio
✅ bogdanbacosca
✅ Violet-Bora-Lee
✅ odsantos
❌ cerealexperiments
❌ orelby
❌ MAHIN0093
❌ a-v-gor
❌ marcusicaro
❌ JeraldVin
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.