Sync with upstream @ fcfef6a0#80
Closed
javascript-translate-bot wants to merge 107 commits intomasterfrom
Closed
Conversation
As threatened, change line 34, "to summarize: ..." Also add "these" before "internal properties".
Removed extraneous quote mark I had accidentally inserted.
Small punctuation change. Separately, I didn't change anything on this today, but note that line 34 above: "So to summarize: the executor runs automatically and attempts to perform a job. When it is finished with the attempt it calls `resolve` if it was successful or `reject` if there was an error." was, before it was changed recently, pretty much the same as line 82 above: "To summarize, the executor should perform a job (usually something that takes time) and then call `resolve` or `reject` to change the state of the corresponding promise object." So maybe some revision there is in order -- to not have both, or to change one or both. Not familiar enough with the article at this point to make the revision.
fix: spell correction to existence
Corrected grammatical errors.
Check if `pattern:Y` is immediately after `pattern:X` and then the regex will check if Z is immediately after Y, Like this it's more understandable.
Change "occasional" to "accidental". I think that's what you mean, and the words are not synonymous in English.
"continues to closest" -> "continues to next closest". Consistent w/ usage in rest of explanation.
A minor typo issue : polywill -> polyfill
Fixing a typo
Fix typo in 11-coordinates/article.md
"allows to use" -> "allows us to use" "to use with await" -> "to use it with await"
Update article.md
A few syntactic and punctuation changes to 'The “try…catch” syntax' section.
Update article.md
"can use" -> "we can use".
Maybe clarifying a bit where `.json()` comes from. I personally found it a bit confusing at first.
"We can get loop over values by `for..of`:" -> "We can loop over their values using `for..of`"
Update article.md
adding the `[^]` pattern
fix: Minor typo and grammar
Update article.md
Remove unnecessary return in couple of examples
…f 'Shift' #1743 Fix Submitted.
Mac OS multiline Commenting shortcut is should use 'Option' instead o…
Fix minor typo error of 1-js/06-advanced-functions/03-closure/article.md
Some missing whitespaces
Update article.md
Rephrasing introductory sentences about async iterators and generators.
"allows to" -> "allows us to" (3x)
Update article.md
"we should use `for...loop`" -> "we should use a `for...loop`"
corrected order for subtraction
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated to merge changes from en.javascript.info at fcfef6a
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):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterThis PR will be closed and replaced with a new one in a few days.