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.

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

Sync with reactjs.org @ 4fc709d0 #270

Merged
merged 28 commits into from
Dec 13, 2020
Merged

Sync with reactjs.org @ 4fc709d0 #270

merged 28 commits into from
Dec 13, 2020

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Dec 7, 2020

This PR was automatically generated.

Merge changes from reactjs.org at 4fc709d

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.

JoshuaKGoldberg and others added 22 commits November 10, 2020 03:24
Co-authored-by: Sunil Pai <threepointone@oculus.com>
Co-authored-by: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Updated the document and added the link to the React.js User group meetup page for Albania.
Co-authored-by: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Co-authored-by: Edward Baggott <edward.baggott@shellenergy.co.uk>
Co-authored-by: Sebastian Silbermann <silbermann.sebastian@gmail.com>
@netlify
Copy link

netlify bot commented Dec 7, 2020

Deploy preview for ko-reactjs-org ready!

Built with commit dbf0899

https://deploy-preview-270--ko-reactjs-org.netlify.app

@taehwanno taehwanno mentioned this pull request Dec 13, 2020
4 tasks
@taehwanno taehwanno self-assigned this Dec 13, 2020
Related to b236356

원문에는 포함되어 있는 몇 가지 문장이 번역되면서 누락된 것을
확인했습니다. 따로 이슈로 등록해서 처리할 예정입니다.
On production, instead, the errors will not bubble up, which means any ancestor error handler will only receive errors not explicitly caught by `componentDidCatch()`.

> Note
>>>>>>> 4fc709d0576d0f0f1f8ea8b6bb341a12944b5510
Copy link
Member

@taehwanno taehwanno Dec 13, 2020

Choose a reason for hiding this comment

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

충돌 발생한 부분 해결하려고 살펴보니 몇 가지 문장이 번역본에서 유실되어 있는걸 확인했습니다. 따로 이슈 등록해서 처리할게요~!

(Updated) #272 로 이슈 등록해뒀습니다.

@taehwanno taehwanno merged commit b164c80 into master Dec 13, 2020
@taehwanno taehwanno deleted the sync-4fc709d0 branch December 13, 2020 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.