Sync with upstream @ 206485fc - #231
Closed
javascript-translate-bot wants to merge 618 commits into
Closed
Conversation
Change the phrase "a property" to "the property" in line 57 (`Here the line (*) sets animal to be a prototype of rabbit.`) because it made it sound like an object can inherit more than one prototype at a time.
Replace 'mdn' link
Adding the third header in list
transl: easier to change where mdn: dsnt work
Fix sentence in article.md
fix the broken RFC link in the JSON article
Fix: Rewrite sentence in line 121
domain cookie option
FIX: fix bug caused by GitHub data change
Added missing word in a sentence.
add missing break line
update localStorage size limit info
Fixed grammatical error.
add highliting
add a run button
Update article.md
add a comma
add missing line break and remove excess one
replace side-effect with side effect
minor fix, and explanation improvements
just add a comma
remove one extra break line
Fix grammar in 'Symbol type' article
Fix language in 'Methods of primitives' task
add some emphasis
minor grammar fix
Case sensitive word change
fix minor grammatical mistakes
fix: type error in index.html
|
|
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
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 206485f
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 101 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.