Skip to content

Sync with upstream @ c4d1987e #2

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

Closed
wants to merge 53 commits into from

Conversation

javascript-translate-bot

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

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.

snowcoding and others added 30 commits August 22, 2019 16:13
fix typo
Change to wording about maximum recursion depth.
Correct spelling of "standardized".
Change the order between ´body´ and ´step´. Also delete the phrase '... but before the condition check', which seems a bit confusing.
Maybe this is what you want. "Complexity" is singular, so if that's the antecedent, one would use "was".
fix typo in comment to match code example
fixed missing pronoun 'it'.
fixed missing pronoun 'it'
fixed grammaticalmistakes, i.e. changed 'And' to 'and', added missing pronoun 'it' after 'to'.
@CLAassistant
Copy link

CLAassistant commented Sep 2, 2019

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

✅ iliakan
✅ Violet-Bora-Lee
✅ DouglasMV
❌ snowcoding
❌ paroche
❌ theBearWhoCodes
❌ James868
❌ Raggan
❌ cluah
❌ jessepeterman
❌ atimidguy
❌ gergooo
❌ Jandoria
You have signed the CLA already but the status is still pending? Let us recheck it.

javascript-translate-bot pushed a commit that referenced this pull request Sep 9, 2019
www-learn-en pushed a commit that referenced this pull request Jun 15, 2021
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.