Skip to content

Translate Reconciliation - #139

Merged
lex111 merged 21 commits into
reactjs:masterfrom
styopaiv:reconciliation
Feb 27, 2019
Merged

Translate Reconciliation#139
lex111 merged 21 commits into
reactjs:masterfrom
styopaiv:reconciliation

Conversation

@styopaiv

@styopaivstyopaiv commented Feb 14, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@styopaivstyopaiv mentioned this pull request Feb 14, 2019
Closed
88 tasks
@another-guyanother-guy added the needs review A pull request ready to be reviewed label Feb 14, 2019
ntishkevich
ntishkevich reviewed Feb 14, 2019
View reviewed changes
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
ntishkevichand others added 5 commits February 15, 2019 11:05
@ntishkevich@styopaiv
Update content/docs/reconciliation.md
ab6b4dd
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@ntishkevich@styopaiv
Update content/docs/reconciliation.md
36c6cec
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@ntishkevich@styopaiv
Update content/docs/reconciliation.md
b95e4dc
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@ntishkevich@styopaiv
Update content/docs/reconciliation.md
22fe315
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@ntishkevich@styopaiv
Update content/docs/reconciliation.md
bea4486
Co-Authored-By: astralpunch <aastralplane@gmail.com>
lex111
lex111 reviewed Feb 17, 2019
View reviewed changes

@lex111lex111 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Спасибо за перевод, небольшие предложения по его улучшению.

Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
lex111and others added 3 commits February 18, 2019 11:19
@lex111@styopaiv
Update content/docs/reconciliation.md
e683964
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@lex111@styopaiv
Update content/docs/reconciliation.md
6d7b80f
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@lex111@styopaiv
Update content/docs/reconciliation.md
782d7d9
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guyanother-guy added work in progress Author opened the pull-request but it's still being worked on and removed needs review A pull request ready to be reviewed labels Feb 23, 2019
another-guy
another-guy reviewed Feb 25, 2019
View reviewed changes

@another-guyanother-guy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Несколько предложений по стилю.

Ряд сложных предложений переведён блестяще, @astralpunch ! 👏

Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
### Компоненты одного типа {#component-elements-of-the-same-type}

When a component updates, the instance stays the same, so that state is maintained across renders. React updates the props of the underlying component instance to match the new element, and calls `componentWillReceiveProps()` and `componentWillUpdate()` on the underlying instance.
Когда компонент обновляется, его экземпляр не меняется, чтобы его состояние сохранялось сквозь рендеры. React обновляет пропсы базового экземпляра компонента для соответствия новому элементу и вызывает `componentWillReceiveProps()` и `componentWillUpdate()` на базовом экземпляре.

@another-guyanother-guyFeb 25, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

React обновляет пропсы базового экземпляра компонента для соответствия новому элементу и вызывает componentWillReceiveProps() и componentWillUpdate() на базовом экземпляре.

@astralpunch @lex111 при первом прочтении мне было не ясно, о каком "базовом" компоненте идёт речь. В оригинале underlying звучит очень понятно, но плохо ложится на русский в вариантах ниже лежащий, лежащий в основе и подобных. Если ли мысли, как это предложение получше переписать.

@lex111lex111Feb 27, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Пока вариантов нет, потом можно к этому вернуться.

Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
Comment threadcontent/docs/reconciliation.md Outdated
another-guyand others added 10 commits February 25, 2019 15:39
@another-guy@styopaiv
Update content/docs/reconciliation.md
96b8f09
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guy@styopaiv
Update content/docs/reconciliation.md
097044c
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guy@styopaiv
Update content/docs/reconciliation.md
6f1af5d
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guy@styopaiv
Update content/docs/reconciliation.md
9b8e818
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guy@styopaiv
Update content/docs/reconciliation.md
dac2f10
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guy@styopaiv
Update content/docs/reconciliation.md
49c1ce8
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guy@styopaiv
Update content/docs/reconciliation.md
73e9128
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guy@styopaiv
Update content/docs/reconciliation.md
ec6239f
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guy@styopaiv
Update content/docs/reconciliation.md
585900e
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@another-guy@styopaiv
Update content/docs/reconciliation.md
97d5154
Co-Authored-By: astralpunch <aastralplane@gmail.com>
@netlify

netlifyBot commented Feb 25, 2019

Copy link
Copy Markdown

Deploy preview for ru-reactjs ready!

Built with commit 96b8f09

https://deploy-preview-139--ru-reactjs.netlify.com

@netlify

netlifyBot commented Feb 25, 2019

Copy link
Copy Markdown

Deploy preview for ru-reactjs ready!

Built with commit 585900e

https://deploy-preview-139--ru-reactjs.netlify.com

@netlify

netlifyBot commented Feb 25, 2019•
edited
Loading

Copy link
Copy Markdown

Deploy preview for ru-reactjs ready!

Built with commit 079c74e

https://deploy-preview-139--ru-reactjs.netlify.com

@another-guy

another-guy commented Feb 25, 2019

Copy link
Copy Markdown
Contributor

@astralpunch исправь, пожалуйста, merge conflict. Спасибо за внесение изменений.

@lex111
lex111 merged commit bc72c29 into reactjs:masterFeb 27, 2019
@lex111

lex111 commented Feb 27, 2019

Copy link
Copy Markdown
Contributor

Спасибо @astralpunch, а также @ntishkevich и @another-guy за ревью!

@lex111lex111 removed the work in progress Author opened the pull-request but it's still being worked on label Feb 27, 2019
@lex111lex111 added the needs proofread A read-through is still needed to release the document label Feb 27, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers
@lex111lex111lex111 approved these changes
@ntishkevichntishkevichntishkevich left review comments
@another-guyanother-guyanother-guy approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

needs proofreadA read-through is still needed to release the document

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@styopaiv@another-guy@lex111@ntishkevich