Sync with upstream @ e515f80a by javascript-translate-bot · Pull Request #527 · javascript-tutorial/zh.javascript.info

javascript-translate-bot · 2019-11-18T05:06:33Z

This PR was automatically generated to merge changes from en.javascript.info at e515f80

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 616 files

To merge changes manually (instead of merging this PR):

Add remote upstream that links to the English version (only needs to be done once)
- git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
Commit all current work locally and git checkout master
Pull the recent changes from the English version:
- git pull upstream master
Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
- Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
  - git checkout --ours <path>
- See the diff, what changed in the upstream file since branches diverged:
  - git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
- Then you can examine the changes in upstream and add them manually
When conflicts resolved, commit them and git push origin master

Please 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.

"an array", "filter out"

Changed 'XHTML' to 'in XML mode' in title to match contents. 'XHTML' isn't mentioned anywhere else in the article except in that title. So either change it to 'XML' or explain the relationship?

"...`1` for elements,`3` for text nodes, and a few others ..."

There has to be a scary CPU-intensive task here, otherwise the example wouldn't make sense. Hence the suppression of "can"; I have also removed "actually" because in this context it would be interpreted as "to your surprise", which is not the case here

Deleted the full-stop as it's one sentence only

Minor grammar; removed unnecessary semicolon; added (best practices) semicolon

Minor grammar fixes and suggestions

Update article.md

Update solution.md

Update task.md

Update article.md

minor

On first and second reading, I found this section very confusing. After looking up outerHTML on Mozilla and doing some tests, I came to understand what was being said (I think). Here I'm proposing some changes to, I hope, make it clearer (plus some little grammar changes).

"there's a lot" -> "there are a lot",

Wording on why use attribute vs classes question

"**and** more attributes...

Update article.md

minor

`null` if that's `offsetParent` -> `null` for `offsetParent`

"CSS width is useless at all." -> "CSS width is useless." Could have also said "CSS width is of no use at all."

"starts to bug..." -> "becomes buggy..." I am not aware of "bug" being used as a verb in IT, but if it is, this is the first time I recall seeing it, so I would say it's probably not common. Anyway, using it as a verb kind of bugged me a little.

Fixed Typo

'from bottom scroll' -> 'to bottom scroll'

"how to..." -> "how do we..."

"find out" -> "find"

And an added "the": "**the** `<html>` tag".

Update article.md

'"pro" and "contra" -> 'pros and cons'. 'pros and cons' is a much more typical way of saying it. But "pro" and "contra" is interesting. I hadn't previously thought about what "cons" stood for, though now it seems obvious. Also, punctuation change.

'work with event' -> 'work with events'

"but strongly" -> "but is strongly". "is strongly not recommended" is still a bit odd, though it's readable and totally understandable. Could maybe be changed to "but is strongly discouraged". Still, not bad as (now) is.

typo fixed

Remove extra "b" from "visible".

Update solution.md

Move '=' out of backticks

Move '=' out of backticks. Take two.

'well-thought' -> 'well thought out'

CLAassistant · 2019-11-18T05:08:37Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 6 committers have signed the CLA.

✅ iliakan
❌ lex111
❌ paroche
❌ dashaezhova
❌ embok345
❌ koala-lava
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

paroche and others added 30 commits October 17, 2019 17:02

Update article.md

eb2b6c9

"an array", "filter out"

Update article.md

4452139

Changed 'XHTML' to 'in XML mode' in title to match contents. 'XHTML' isn't mentioned anywhere else in the article except in that title. So either change it to 'XML' or explain the relationship?

Update article.md

33e4cc2

"...`1` for elements,`3` for text nodes, and a few others ..."

Update article.md

81a2503

There has to be a scary CPU-intensive task here, otherwise the example wouldn't make sense. Hence the suppression of "can"; I have also removed "actually" because in this context it would be interpreted as "to your surprise", which is not the case here

Update article.md

5ac537f

Deleted the full-stop as it's one sentence only

Update task.md

a2b45a8

Minor grammar; removed unnecessary semicolon; added (best practices) semicolon

Update solution.md

2ffc997

Minor grammar fixes and suggestions

minor

01352c1

minor

a52a643

minor

ee6f0ac

minor

d5f4fe9

minor changes in grammar

58c91c3

minor

5b795f7

minor

e8d86d9

minor

a960984

Update article.md (#1478)

7d1e1ba

Update article.md

Merge pull request #1480 from hrodward/patch-12

501bdf6

Update solution.md

Merge pull request #1479 from hrodward/patch-11

edfc79d

Update task.md

Merge pull request #1477 from hrodward/patch-10

6634181

Update article.md

Merge pull request #1476 from hrodward/patch-9

3483424

Update article.md

Merge pull request #1475 from javascript-tutorial/paroche-patch-3

1fe192d

Update article.md

Merge pull request #1485 from Ghost-017/patch-7

f75439f

minor

minor

f0e848a

Merge pull request #1482 from Ghost-017/patch-4

4088e5d

minor

Update article.md

79e2447

"there's a lot" -> "there are a lot",

Update article.md

676ffb7

Wording on why use attribute vs classes question

Update article.md

8826f07

"**and** more attributes...

Merge pull request #1486 from javascript-tutorial/paroche-patch-4

ebd69e2

Update article.md

Merge pull request #1484 from Ghost-017/patch-6

4c9c943

minor

paroche and others added 25 commits November 7, 2019 21:34

Update article.md

83bfe33

`null` if that's `offsetParent` -> `null` for `offsetParent`

Update article.md

b071f46

"CSS width is useless at all." -> "CSS width is useless." Could have also said "CSS width is of no use at all."

Update article.md

d6b9f74

"starts to bug..." -> "becomes buggy..." I am not aware of "bug" being used as a verb in IT, but if it is, this is the first time I recall seeing it, so I would say it's probably not common. Anyway, using it as a verb kind of bugged me a little.

Fixed Typo (#1595)

b2e53ef

Fixed Typo

Fix link

53ae1bb

Update task.md

aa97ba0

'from bottom scroll' -> 'to bottom scroll'

Update article.md

012e536

"how to..." -> "how do we..."

Update article.md

37d8255

"find out" -> "find"

Update article.md

5be8789

And an added "the": "**the** `<html>` tag".

Merge pull request #1598 from javascript-tutorial/paroche-patch-8

83bf32f

Update article.md

Update article.md

64acea4

'"pro" and "contra" -> 'pros and cons'. 'pros and cons' is a much more typical way of saying it. But "pro" and "contra" is interesting. I hadn't previously thought about what "cons" stood for, though now it seems obvious. Also, punctuation change.

Update article.md

aab70cd

'work with event' -> 'work with events'

Update article.md

be244d0

"but strongly" -> "but is strongly". "is strongly not recommended" is still a bit odd, though it's readable and totally understandable. Could maybe be changed to "but is strongly discouraged". Still, not bad as (now) is.

minor

2b5ac97

typo fixed and minimal opinionated improvement

b574453

round example changed back ot originial

cfefb5a

typo fixed (#1605)

74e603a

typo fixed

minor

f759f38

minor

120700e

Update solution.md

6831d68

Remove extra "b" from "visible".

Merge pull request #1610 from javascript-tutorial/paroche-patch-10

25c8c4a

Update solution.md

Update article.md

b7a92c9

Move '=' out of backticks

Update article.md

d75be14

Move '=' out of backticks. Take two.

Update article.md

e515f80

'well-thought' -> 'well thought out'

merging all conflicts

451ce71

javascript-translate-bot added the review needed label Nov 18, 2019

javascript-translate-bot requested a review from a team November 18, 2019 05:06

javascript-translate-bot closed this Nov 25, 2019

leviding deleted the sync-e515f80a branch November 25, 2019 08:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync with upstream @ e515f80a#527

Sync with upstream @ e515f80a#527
javascript-translate-bot wants to merge 2386 commits intomasterfrom
sync-e515f80a

javascript-translate-bot commented Nov 18, 2019

Uh oh!

CLAassistant commented Nov 18, 2019 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

javascript-translate-bot commented Nov 18, 2019

Uh oh!

CLAassistant commented Nov 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

CLAassistant commented Nov 18, 2019 •

edited

Loading