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 @ 081bb312 #264

Merged
merged 39 commits into from
Nov 12, 2019
Merged

Sync with reactjs.org @ 081bb312 #264

merged 39 commits into from
Nov 12, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Oct 28, 2019

This PR was automatically generated.

Merge changes from reactjs.org at 081bb31

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.

sophiebits and others added 30 commits October 21, 2019 22:36
more unstable -> less stable
* Add app.js conf

* Change spelling of Kraków
Removes a redundant "about this" in the concurrent-mode suspense docs.
Fix typo: `timeout:` to `timeoutMs:`
The variable name that's loading is called `user`
* Update tools-starter-kits.md

Please consider adding Crisp React. Thank you.

* Update tools-starter-kits.md

Thanks for the amendment.

Co-Authored-By: Alexey Pyltsyn <[email protected]>
Jhon Mike and others added 6 commits October 27, 2019 11:30
* format post react-v16.9.0

* running yarn check-all
ReactConf just finished, so making a quick update to the upcoming conference list. 💞
We have unexpected text on the page. This PR fixes it.
s/MyShowList/MySlowList

Updated to reflect actual component name in example: `<MySlowList text={text} />`
@netlify
Copy link

netlify bot commented Oct 28, 2019

Deploy preview for ja-reactjs ready!

Built with commit 1b5c85d

https://deploy-preview-264--ja-reactjs.netlify.com

Copy link
Member

@smikitky smikitky left a comment

Choose a reason for hiding this comment

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

コンフリクト自体は一瞬で解決できましたが concurrent mode と prerelease 絡みの新規記事が結構増えていますので、これらは testing の時と同様に別に翻訳していく必要があります。

新しい Issue を立てましょうか、それとも #4 の利用を続けましょうか?

@smikitky smikitky self-requested a review October 29, 2019 02:39
@potato4d
Copy link
Member

potato4d commented Nov 2, 2019

@smikitky
粒度的にページごとに Issue があったほうがアサインが管理しやすかったりして便利だと思うので、個別で Issue たててトリアージしていきましょう!

@smikitky
Copy link
Member

smikitky commented Nov 2, 2019

@potato4d では #4#262 が終わったら close ということで。こちらの conflict も解決しましたので大丈夫そうならマージをお願いします。

@smikitky
Copy link
Member

smikitky commented Nov 6, 2019

@potato4d @koba04 軽微なコンフリクトですしこれがマージされないとConcurrent Modeの記事がいつまでも表示されないので対応をお願いします

Copy link
Member

@koba04 koba04 left a comment

Choose a reason for hiding this comment

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

👍

@koba04 koba04 merged commit c77c2df into master Nov 12, 2019
@koba04 koba04 deleted the sync-081bb312 branch November 12, 2019 22:22
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.