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

Translate Getting Started #50

Merged
merged 14 commits into from
Mar 6, 2019
Merged

Translate Getting Started #50

merged 14 commits into from
Mar 6, 2019

Conversation

ds-tothemoon
Copy link
Contributor

@ds-tothemoon ds-tothemoon commented Feb 26, 2019 •
edited
Loading

#39 conflict 관련 이슈로 새로 PR 생성하였습니다.
@taehwanno 조언 감사합니다. 새로 브런치 생성하여서 다시 PR 하였습니다.

Progress

@ds-tothemoon ds-tothemoon changed the title Getting started Translate Getting Started Feb 26, 2019
@netlify
Copy link

netlify bot commented Feb 26, 2019 •
edited
Loading

Deploy preview for ko-reactjs-org ready!

Built with commit 551c3f8

https://deploy-preview-50--ko-reactjs-org.netlify.com

@taehwanno
Copy link
Member

taehwanno commented Feb 26, 2019 •
edited
Loading

498332d 커밋 때문에 충돌이 발생하고 있네요. fork 하신 저장소에 쓰기 권한을 잠시 주시겠어요?
"저장소 > Settings > Collaborators > taehwanno Add Collaborator" 단계로 해주시면 됩니다.

@ds-tothemoon
Copy link
Contributor Author

네 권한 드렸습니다!

@taehwanno
Copy link
Member

@MDJuniooor 충돌 다 해결했습니다.
git은 충돌 내용이 같다고 동일하게 작동하지 않아요. commit hash를 기준으로 작동하기 때문에 주의 부탁드릴게요.

이전에 master에 직접 커밋을 하셔서 다른 번역을 동시에 진행하고자 할 때 위험할 수도 있기 때문에 fork 하신 저장소의 master에 직접 커밋된 것들은 삭제하고 sync 맞춰서 force-push 해놨습니다.

$ git checkout getting-started
$ git branch -d master
$ git fetch
$ git checkout -b master origin/master

위 처럼 실행하셔서 로컬 머신의 master 브랜치 정리 부탁드려요.

@taehwanno taehwanno mentioned this pull request Feb 26, 2019
Closed
5 tasks
@ds-tothemoon
Copy link
Contributor Author

@taehwanno

넵 감사합니다 ㅠㅠ 고생 많으셨습니다.

앞으로는 주의하겠습니다. 친절하게 알려주셔서 정말 감사합니다!!

@tesseralis tesseralis mentioned this pull request Feb 27, 2019
Open
gnujoow
gnujoow previously approved these changes Mar 6, 2019
View reviewed changes
Copy link
Member

@gnujoow gnujoow left a comment

Choose a reason for hiding this comment

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

LGTM

content/docs/getting-started.md Outdated

If something is missing in the documentation or if you found some part confusing, please [file an issue for the documentation repository](https://github.com/reactjs/reactjs.org/issues/new) with your suggestions for improvement, or tweet at the [@reactjs account](https://twitter.com/reactjs). We love hearing from you!
이 문서에서 빠진 부분이나 혼동되는 부분을 발견하시면, 개선을 위한 제안과 함께 [문서의 레퍼지토리](https://github.com/reactjs/reactjs.org/issues/new)에 이슈를 올려주시거나, [@reactjs 계정](https://twitter.com/reactjs)에 tweet 해주세요. 저희는 당신의 소식을 좋아합니다!
Copy link
Member

Choose a reason for hiding this comment

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

We love hearing from you!

제안과 빠진 내용에 대한 개선에 대한 내용이므로

여러분의 참여를 기다립니다! 로 의역하면 어떨까요?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@gnujoow
넵넵 뉘앙스랑 의미가 말씀해주신 게 더 자연스럽고 좋게 느껴지네요.

여러분의 참여를 기다립니다!

로 수정하겠습니다.

gnujoow
gnujoow previously approved these changes Mar 6, 2019
View reviewed changes
Copy link
Member

@gnujoow gnujoow left a comment

Choose a reason for hiding this comment

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

LGTM

@taehwanno
Copy link
Member

몇 가지 텍스트 및 링크를 직접 수정했습니다. 고생하셨습니다 :)

@taehwanno taehwanno merged commit 5cefc40 into reactjs:master Mar 6, 2019
@taehwanno taehwanno deleted the getting-started branch March 6, 2019 15:53
@ds-tothemoon
Copy link
Contributor Author

@taehwanno
네 감사합니다~~

@gnujoow
부족한 번역이었지만, 친절하게 리뷰해주셔서 감사합니다 :) 덕분에 많이 배웠습니다!

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

@taehwanno taehwanno taehwanno approved these changes

@gnujoow gnujoow gnujoow left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ds-tothemoon @taehwanno @gnujoow