Sync with upstream @ 162280b6#53
Closed
javascript-translate-bot wants to merge 1743 commits intomasterfrom
Closed
Conversation
"`123` millonth" -> "`123 millionths"
Update article.md
Remove comma, change spelling of "labeled". While both "labelled" and "labeled" are correct, "labeled" is the preferred American spelling (though the British spelling "labelled" is more logical, given the general rules of English spelling, such as they are, since the "e" sound before the "l" is short, not long). Still, probably better with American spelling.
Update article.md
fix typo intentially -> intentionally
Fix incorrect link address
Fix typo: "and" instead of "и"
fix: type error of 1-js/03-code-quality/05-testing-mocha/article.md
Update article.md
Spell correction
remove incorrect info about synchronous postMessage
Update 1-js/03-code-quality/05-testing-mocha/pow-2.view/test.js
Add "bigint" to primitive types
small typo fix
Add commas after non-terminal properties
func.apply(context, args); // is same as using apply => Is a type error?
Comments section: Remove useless spaces
fix: removed , from solution.md and task.md for date data types
Corrected Grammar
fix: 2 stray lines of russian and a typo
fix: fix markdown highlight
Fix minor type error
Minor statement change
Fix error in 1-js/11-async/05-promise-api/article.md
Update solution of 1-js/02-first-steps/01-hello-world/1-hello-alert
Fix some type error
|
|
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
20 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 162280b
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 204 files
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 masterPlease 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.