Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

"Testing recipes" page translation #393

Merged
merged 25 commits into from
Sep 4, 2019
Merged

"Testing recipes" page translation #393

merged 25 commits into from
Sep 4, 2019

Conversation

shdq
Copy link
Contributor

@shdq shdq commented Aug 27, 2019 •
edited
Loading

Комментарии и правки приветствуются.

@shdq shdq mentioned this pull request Aug 27, 2019
Closed
3 tasks
@shdq shdq changed the title [WIP] Testing recipes translation [WIP] "Testing recipes" page translation Aug 27, 2019
@netlify
Copy link

netlify bot commented Aug 27, 2019 •
edited
Loading

Deploy preview for ru-reactjs ready!

Built with commit ba65f42

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

@ntishkevich ntishkevich added the needs review A pull request ready to be reviewed label Aug 27, 2019
@ntishkevich
Copy link
Collaborator

Сейчас ваши изменения конфликтуют с тем, что находится в мастере. Просьба к вам зарезолвить конфликт, так как мы не сможем смержить в последующем ваши изменения в мастер.

@shdq
Copy link
Contributor Author

shdq commented Aug 27, 2019

@ntishkevich это мой PR в основной репозиторий вызвал конфликт, подскажите, пожалуйста, как правильно устранить конфликт?

@ntishkevich
Copy link
Collaborator

Как один из вариантов, сделать ребейз ветки мастер в свою ветку, предварительно забрав последнии изменения из мастера и зарезолвив все конфликты. Затем можно будет сделать force-push вашей ветки.

@shdq shdq changed the title [WIP] "Testing recipes" page translation "Testing recipes" page translation Aug 28, 2019
@shdq
Copy link
Contributor Author

shdq commented Aug 28, 2019

@ntishkevich я думаю, перевод готов к ревью.

ntishkevich
ntishkevich reviewed Aug 29, 2019
View reviewed changes
Copy link
Collaborator

@ntishkevich ntishkevich left a comment

Choose a reason for hiding this comment

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

Пробежался по переводу и нашел несколько незначительных моментов. Спасибо за перевод!

content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
@shdq
Copy link
Contributor Author

shdq commented Sep 3, 2019

@ntishkevich если все ок, давай мерджить!

ntishkevich
ntishkevich approved these changes Sep 3, 2019
View reviewed changes
Copy link
Collaborator

@ntishkevich ntishkevich left a comment

Choose a reason for hiding this comment

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

На мой взгляд все хорошо, @lex111 можешь проверить все ли ок и тогда смержим изменения?

lex111
lex111 requested changes Sep 3, 2019
View reviewed changes
Copy link
Member

@lex111 lex111 left a comment

Choose a reason for hiding this comment

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

Извиняюсь, пропустил ревью.

content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
content/docs/testing-recipes.md Outdated Show resolved Hide resolved
shdq and others added 8 commits September 4, 2019 10:11
@shdq @lex111
Update content/docs/testing-recipes.md
48c6b98 
Co-Authored-By: Alexey Pyltsyn <[email protected]>
@shdq @lex111
Update content/docs/testing-recipes.md
74ee28f 
Co-Authored-By: Alexey Pyltsyn <[email protected]>
@shdq @lex111
Update content/docs/testing-recipes.md
177907f 
Co-Authored-By: Alexey Pyltsyn <[email protected]>
@shdq @lex111
Update content/docs/testing-recipes.md
73505e0 
Co-Authored-By: Alexey Pyltsyn <[email protected]>
@shdq @lex111
Update content/docs/testing-recipes.md
ef89ba3 
Co-Authored-By: Alexey Pyltsyn <[email protected]>
@shdq @lex111
Update content/docs/testing-recipes.md
80b069d 
Co-Authored-By: Alexey Pyltsyn <[email protected]>
@shdq @lex111
Update content/docs/testing-recipes.md
fe4bb77 
Co-Authored-By: Alexey Pyltsyn <[email protected]>
@shdq @lex111
Update content/docs/testing-recipes.md
ba65f42 
Co-Authored-By: Alexey Pyltsyn <[email protected]>
@lex111 lex111 merged commit bf46608 into reactjs:master Sep 4, 2019
@lex111
Copy link
Member

lex111 commented Sep 4, 2019

@shdq спасибо за перевод! 💯

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lex111 lex111 lex111 approved these changes

@ntishkevich ntishkevich ntishkevich approved these changes

Assignees
No one assigned
Labels
needs review A pull request ready to be reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shdq @ntishkevich @lex111