Sync with upstream @ 29216730 #131
Merged
Conversation
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
add a missing colon
Update article.md
confusing line
Fix a small grammar mistake
Response header name is changed to the right one
minor grammar change in webcomponents-intro
Add 1 letter in 5-network/03-fetch-progress
fix typo in 5-network/02-formdata
fix typo
slider not working on movile
Missing `let` keyword
Made sure the english tutorial closely matches the romanian repo.
Updated entire 01-getting-started
Matched romanian translations with english articles and fixed conflicts
Updated sections to match
Fixed conflicts in the garbage collector and `this` articles, also translated some introductory pages. There are also some minor updates.
Fixed conflicts
Conflicts are resolved for article.md from 08-symbol in the 04-object-basics section. index.md from the same section was updated. Minor fix to the comments article from 03-code-quality.
fixed conflicts and minor updates
Made a few updates in 1-js/04-object-basics/ regarding grammar and translation, also added some missing pieces. Fixed the conflicts for 1-js/06-advanced-functions/03-closure/article.md Fixed conflicts from 11-async/02-promise-basics/article.md Fixed conflicts for the main article and updated the tasks and solutions of 1-js/99-js-misc/01-proxy
Changed translation of labelled code `key` and adjusted line 174 to be more similar to the original article.
synced with en version
synced with en version
bogdanbacosca
approved these changes
Nov 24, 2022
Contributor
bogdanbacosca
left a comment
bogdanbacosca
left a comment
There was a problem hiding this comment.
changes ready to merge
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 2921673
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 70 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.