Sync with upstream @ 47d18659#37
Closed
javascript-translate-bot wants to merge 760 commits intomasterfrom
Closed
Conversation
Grammar suggestions
Grammar suggestions
Changed spelling of "neighbor" from British ("neighbour") to American.
I think that's how you want it. Otherwise some other stuff has to be switched to British.
"Although, " to "However,".
Spelling things out a bit more for insertAdjacentHTML
Further tweaks in the insertAdjacent... neighborhood of Summary.
Update article.md
Grammar suggestions
Update article.md
Update article.md
Update article.md
Update article.md
Grammar suggestions
Update article.md
Grammar suggestions
Update article.md
Update article.md
Update task.md
Update article.md
Grammar suggestions
fix typo
Wouldn't this solution be more flexible?
Update article.md
Update solution.md
Update article.md
Update 'Window sizes and scrolling' article.md
Consistent HTML for the task source and solution
consistent CSS for the task and the solution
Update solution.md
add consistency
Fix small grammar mistake in closure makeArmy task
BigInt Type added in primitive types
Update master
Grammar and phrasing changes to first paragraph. Not 100% sure didn't change meaning so am leaving it for review.
Grammar and phrasing changes to first paragraph. Wasn't 100% sure didn't change meaning and was going to leave it for review, but it seems I already committed it somehow when I was trying to make revisions, so hope it's right.
Fix small typo in comment
Add a missing word
Update article.md
consistent error output comments
Added clarification
|
|
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 47d1865
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 184 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 masterThis PR will be closed and replaced with a new one in a few days.