Sync with upstream @ 9acc1302 #9

javascript-translate-bot · 2020-02-17T05:00:38Z

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

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:

1-js/01-getting-started/1-intro/article.md

To merge changes manually (instead of merging this PR):

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
Commit all current work locally and git checkout master
Pull the recent changes from the English version:
- git pull upstream master
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
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.

It literally says «Operating System system functions.»

add semicolon at end -> " return prop >= target.start && prop <= target.end;"

"return `undefined`" -> "returns `undefined`"

"on the paper" -> "on paper"

Grammar mistake (?)

According to the MDN precedence-table you've linked some precedence numbers are incorrect. Having a quick look at different language versions (French and Russian) this error may has to be corrected at every version.

"chapter" -> "article" 2x

"returns to event loop" -> "returns to the event loop" "no much difference" -> "not much difference"

"move the scheduling to the beginning" (2x)

"similar stuff to described above" -> "similar stuff to what's described above"

"roll our own" -> "roll your own" "can see that's" - "can see that that's"

Incorrect precedence numbers (prob. "language-wide")

"big text" -> "large amount of text" "evade problems" -> "avoid problems" "another 100 lines" -> "for the next 100 lines" "To demonstrate the approach" -> "To demonstrate this approach" "instead of syntax-highlighting" -> "instead of text-highlighting,"

"using nested `setTimeout`:" -> "using nested `setTimeout` calls:"

'The browser may even show "the script..." warning' -> 'The browser may even show a "the script..." warning'

"to react on other user actions" -> "to react to other user actions" (a little more natural sounding)

"From one hand" -> "On one hand"

"get in details" -> "get in to the details"

"if arguments count" -> "if the arguments count" "allows to easily" -> "allows us to easily" "seen in the logging example:" -> "seen in the logging example," rephrasing rest of above sentence for readability

claassistantio · 2020-02-17T05:00:53Z

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

✅ u-n-known
✅ iliakan
❌ lex111
❌ paroche
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

lex111 and others added 23 commits February 10, 2020 18:29

Fix link in BigInt

cad5a28

Grammar mistake (?)

bad7807

It literally says «Operating System system functions.»

Update article.md

bad9ca5

add semicolon at end -> " return prop >= target.start && prop <= target.end;"

Update article.md

59861ad

"return `undefined`" -> "returns `undefined`"

Update article.md

0b2e5e7

"on the paper" -> "on paper"

Merge pull request #1745 from u-n-known/patch-1

425a0af

Grammar mistake (?)

False precedence numbers

00a1f2c

According to the MDN precedence-table you've linked some precedence numbers are incorrect. Having a quick look at different language versions (French and Russian) this error may has to be corrected at every version.

Update article.md

837f7ab

"chapter" -> "article" 2x

Update article.md

3b681c8

"returns to event loop" -> "returns to the event loop" "no much difference" -> "not much difference"

Update article.md

ff82a9b

"move the scheduling to the beginning" (2x)

closes #1747

db9b580

Update article.md

42920c1

"similar stuff to described above" -> "similar stuff to what's described above"

Update article.md

62c32d2

"roll our own" -> "roll your own" "can see that's" - "can see that that's"

Merge pull request #1746 from u-n-known/patch-2

cb8c12c

Incorrect precedence numbers (prob. "language-wide")

Update article.md

863b320

"big text" -> "large amount of text" "evade problems" -> "avoid problems" "another 100 lines" -> "for the next 100 lines" "To demonstrate the approach" -> "To demonstrate this approach" "instead of syntax-highlighting" -> "instead of text-highlighting,"

Update article.md

6cf0f08

"using nested `setTimeout`:" -> "using nested `setTimeout` calls:"

Update article.md

0b2cbf9

'The browser may even show "the script..." warning' -> 'The browser may even show a "the script..." warning'

Update article.md

1dd5e06

"to react on other user actions" -> "to react to other user actions" (a little more natural sounding)

Update article.md

220bed3

"From one hand" -> "On one hand"

Update article.md

7fb11bd

"get in details" -> "get in to the details"

Update article.md

c6c25c9

"if arguments count" -> "if the arguments count" "allows to easily" -> "allows us to easily" "seen in the logging example:" -> "seen in the logging example," rephrasing rest of above sentence for readability

fixes #1747

9acc130

merging all conflicts

14c68f9

javascript-translate-bot added the review needed label Feb 17, 2020

javascript-translate-bot requested a review from a team February 17, 2020 05:00

javascript-translate-bot closed this Feb 24, 2020

iliakan mentioned this pull request Feb 15, 2020

Azerbaijani Translation Progress #1

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync with upstream @ 9acc1302 #9

Sync with upstream @ 9acc1302 #9

javascript-translate-bot commented Feb 17, 2020

claassistantio commented Feb 17, 2020 •

edited

Loading

Sync with upstream @ 9acc1302 #9

Sync with upstream @ 9acc1302 #9

Conversation

javascript-translate-bot commented Feb 17, 2020

claassistantio commented Feb 17, 2020 • edited Loading

claassistantio commented Feb 17, 2020 •

edited

Loading