Skip to content

Commit 8bc88f5

Browse files
reactjs-translation-botreactjs-translation-bot
committed
merging all conflicts
2 parents d692a70 + 68e4efc commit 8bc88f5

23 files changed

+155
-59
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The documentation is divided into several sections with a different tone and pur
5555
1. `git push my-fork-name the-name-of-my-branch`
5656
1. Go to the [ja.reactjs.org repo](https://github.com/reactjs/ja.reactjs.org) and you should see recently pushed branches.
5757
1. Follow GitHub's instructions.
58-
1. If possible, include screenshots of visual changes. A Netlify build will also be automatically created once you make your PR so other people can see your change.
58+
1. If possible, include screenshots of visual changes. A [Netlify](https://www.netlify.com/) build will also be automatically created once you make your PR so other people can see your change.
5959

6060
## Translation
6161

‎content/blog/2017-09-08-dom-attributes-in-react-16.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ React has always provided a JavaScript-centric API to the DOM. Since React compo
3232
<div tabIndex={-1} />
3333
```
3434

35-
This has not changed. However, the way we enforced it in the past forced us to maintain a allowlist of all valid React DOM attributes in the bundle:
35+
This has not changed. However, the way we enforced it in the past forced us to maintain an allowlist of all valid React DOM attributes in the bundle:
3636

3737
```js
3838
// ...

‎content/blog/2020-10-20-react-v17.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ Raect 17 は[新しい JSX トランスフォーム](/blog/2020/09/22/introducin
5858

5959
## React Native {#react-native}
6060

61+
<<<<<<< HEAD
6162
React Native のリリーススケジュールは React と異なっています。現在のところ React Native 0.65 において React 17 のサポートが入ることを期待していますが、正確なバージョンについては変わる可能性があります。いつものように、リリースに関する議論は React Native Community のリリースに関する[イシュートラッカ](https://github.com/react-native-community/releases)で追うことができます。
63+
=======
64+
React Native has a separate release schedule. We landed the support for React 17 in React Native 0.64. As always, you can track the release discussions on the React Native Community releases [issue tracker](https://github.com/react-native-community/releases).
65+
>>>>>>> 68e4efcf93b6e589355f6aa3cbc3f3c811c0ad37
6266
6367
## インストール {#installation}
6468

‎content/community/conferences.md

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,37 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1212

1313
## Upcoming Conferences {#upcoming-conferences}
1414

15-
### React fwdays’21 {#react-fwdays-2021}
16-
March 27, 2021 - remote event
15+
### render(ATL) 2021 {#render-atlanta-2021}
16+
September 13-15, 2021. Atlanta, GA, USA
1717

18-
[Website](https://fwdays.com/en/event/react-fwdays-2021) - [Twitter](https://twitter.com/fwdays) - [Facebook](https://www.facebook.com/events/1133828147054286) - [LinkedIn](https://www.linkedin.com/events/reactfwdays-21onlineconference6758046347334582273) - [Meetup](https://www.meetup.com/ru-RU/Fwdays/events/275764431/)
18+
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl)
1919

20-
### React Summit - Remote Edition 2021 {#react-summit-remote-2021}
21-
April 14-16, 2021, 7am PST / 10am EST / 4pm CEST - remote event
20+
### React Advanced 2021 {#react-advanced-2021}
21+
October 22-23, 2021. In-person in London, UK + remote (hybrid event)
2222

23-
[Website](https://remote.reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
23+
[Website](https://reactadvanced.com) - [Twitter](http://twitter.com/reactadvanced) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Videos](https://youtube.com/c/ReactConferences)
24+
25+
### React India 2021 {#react-india-2021}
26+
November 12-13, 2021 in Mumbai, India
27+
28+
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia/) - [LinkedIn](https://www.linkedin.com/showcase/14545585) - [YouTube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w/videos)
29+
30+
## Past Conferences {#past-conferences}
2431

2532
### React Case Study Festival 2021 {#react-case-study-festival-2021}
2633
April 27-28, 2021 - remote event
2734

2835
[Website](https://link.geekle.us/react/offsite) - [LinkedIn](https://www.linkedin.com/events/reactcasestudyfestival6721300943411015680/) - [Facebook](https://www.facebook.com/events/255715435820203)
2936

30-
### render(ATL) 2021 {#render-atlanta-2021}
31-
September 13-15, 2021. Atlanta, GA, USA
32-
33-
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl)
37+
### React Summit - Remote Edition 2021 {#react-summit-remote-2021}
38+
April 14-16, 2021, 7am PST / 10am EST / 4pm CEST - remote event
3439

35-
### React India 2021 {#react-india-2021}
36-
November 12-13, 2021 in Mumbai, India
40+
[Website](https://remote.reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
3741

38-
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia/) - [LinkedIn](https://www.linkedin.com/showcase/14545585) - [YouTube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w/videos)
42+
### React fwdays’21 {#react-fwdays-2021}
43+
March 27, 2021 - remote event
3944

40-
## Past Conferences {#past-conferences}
45+
[Website](https://fwdays.com/en/event/react-fwdays-2021) - [Twitter](https://twitter.com/fwdays) - [Facebook](https://www.facebook.com/events/1133828147054286) - [LinkedIn](https://www.linkedin.com/events/reactfwdays-21onlineconference6758046347334582273) - [Meetup](https://www.meetup.com/ru-RU/Fwdays/events/275764431/)
4146

4247
### React Next 2020 {#react-next-2020}
4348
December 1-2, 2020 - remote event

‎content/community/courses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ permalink: community/courses.html
2828

2929
- [Egghead.io](https://egghead.io/browse/frameworks/react) - Short instructional videos on React and many other topics.
3030

31-
- [Frontend Masters](https://frontendmasters.com/courses/) - Video courses on React and other frontend frameworks.
31+
- [Frontend Masters](https://frontendmasters.com/learn/react/) - Video courses on React.
3232

3333
- [Fullstack React](https://www.fullstackreact.com/) - The up-to-date, in-depth, complete guide to React and friends.
3434

‎content/community/videos.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ Videos dedicated to the discussion of React and the React ecosystem.
1313
### React Conf 2019 {#react-conf-2019}
1414

1515
A playlist of videos from React Conf 2019.
16-
<iframe title="React Conf 2019" width="650" height="366" src="https://www.youtube-nocookie.com/embed/videoseries?list=PLPxbbTqCLbGHPxZpw4xj_Wwg8-fdNxJRh" frameborder="0" allowfullscreen></iframe>
16+
<iframe title="React Conf 2019" width="650" height="366" src="https://www.youtube-nocookie.com/embed/playlist?list=PLPxbbTqCLbGHPxZpw4xj_Wwg8-fdNxJRh" frameborder="0" allowfullscreen></iframe>
1717

1818
### React Conf 2018 {#react-conf-2018}
1919

2020
A playlist of videos from React Conf 2018.
21-
<iframe title="React Conf 2018" width="650" height="366" src="https://www.youtube-nocookie.com/embed/videoseries?list=PLPxbbTqCLbGE5AihOSExAa4wUM-P42EIJ" frameborder="0" allowfullscreen></iframe>
21+
<iframe title="React Conf 2018" width="650" height="366" src="https://www.youtube-nocookie.com/embed/playlist?list=PLPxbbTqCLbGE5AihOSExAa4wUM-P42EIJ" frameborder="0" allowfullscreen></iframe>
2222

2323
### React.js Conf 2017 {#reactjs-conf-2017}
2424

‎content/docs/addons-test-utils.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,17 @@ var ReactTestUtils = require('react-dom/test-utils'); // ES5 with npm
1919

2020
> 補足:
2121
>
22+
<<<<<<< HEAD
2223
> [`react-testing-library`](https://testing-library.com/react) の使用をおすすめします。これは、エンドユーザがコンポーネントを使用するのと同様の書き方でコンポーネントを使用するテストを書くことを可能にし、かつそれを促進するように設計されています。
2324
>
2425
> また別の手段として、Airbnb が [Enzyme](http://airbnb.io/enzyme/) と呼ばれるテストユーティリティをリリースしています。Enzyme は React コンポーネントの出力のアサート、操作、そして横断的な処理を簡単にしてくれます。
26+
=======
27+
> We recommend using [React Testing Library](https://testing-library.com/react) which is designed to enable and encourage writing tests that use your components as the end users do.
28+
>
29+
> For React versions <= 16, the [Enzyme](https://airbnb.io/enzyme/) library makes it easy to assert, manipulate, and traverse your React Components' output.
30+
31+
32+
>>>>>>> 68e4efcf93b6e589355f6aa3cbc3f3c811c0ad37
2533
2634
- [`act()`](#act)
2735
- [`mockComponent()`](#mockcomponent)

‎content/docs/code-splitting.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ console.log(add(16, 26)); // 42
4242
4343
もし [Create React App](https://create-react-app.dev/)、[Next.js](https://nextjs.org/)、[Gatsby](https://www.gatsbyjs.org/) やこれらに類するツールを使用している場合、アプリケーションをバンドルするための Webpack のセットアップが最初から含まれています。
4444

45+
<<<<<<< HEAD
4546
そうでない場合は、自分でバンドルを設定する必要があります。設定方法に関しては、Webpack のドキュメントにある [Installation](https://webpack.js.org/guides/installation/) や [Getting Started](https://webpack.js.org/guides/getting-started/) などを参照してみてください。
47+
=======
48+
If you aren't, you'll need to set up bundling yourself. For example, see the [Installation](https://webpack.js.org/guides/installation/) and [Getting Started](https://webpack.js.org/guides/getting-started/) guides on the Webpack docs.
49+
>>>>>>> 68e4efcf93b6e589355f6aa3cbc3f3c811c0ad37
4650
4751
## コード分割 {#code-splitting}
4852

‎content/docs/concurrent-mode-adoption.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ next: concurrent-mode-reference.html
2121
>
2222
> このドキュメントは興味のある読者やアーリーアダプター向けのものです。**React が初めての方はこれらの機能を気にしないで構いません** -- 今すぐに学ぶ必要はありません。
2323
24+
>Caution:
25+
>
26+
>All references below to "blocking mode" and `createBlockingRoot` are outdated and should be ignored.
27+
2428
</div>
2529

2630
- [インストール](#installation)

‎content/docs/concurrent-mode-reference.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ prev: concurrent-mode-adoption.html
2828

2929
- [並列モードの有効化](#concurrent-mode)
3030
- [`createRoot`](#createroot)
31+
<<<<<<< HEAD
3132
- [`createBlockingRoot`](#createblockingroot)
3233
- [サスペンス API](#suspense)
34+
=======
35+
- [Suspense](#suspense)
36+
>>>>>>> 68e4efcf93b6e589355f6aa3cbc3f3c811c0ad37
3337
- [`Suspense`](#suspensecomponent)
3438
- [`SuspenseList`](#suspenselist)
3539
- [`useTransition`](#usetransition)
@@ -47,6 +51,7 @@ ReactDOM.createRoot(rootNode).render(<App />);
4751

4852
並列モードについての詳細は[並列モードのドキュメント](/docs/concurrent-mode-intro.html)を参照してください。
4953

54+
<<<<<<< HEAD
5055
### `createBlockingRoot` {#createblockingroot}
5156

5257
```js
@@ -60,6 +65,9 @@ ReactDOM.createBlockingRoot(rootNode).render(<App />)
6065
ブロッキングモードには並列モードの機能の小さなサブセットのみが含まれているので、直接的な移行ができないアプリケーションのための中間的な移行ステップとなることを意図しています。
6166

6267
## サスペンス API {#suspense}
68+
=======
69+
## Suspense API {#suspense}
70+
>>>>>>> 68e4efcf93b6e589355f6aa3cbc3f3c811c0ad37
6371
6472
### `Suspense` {#suspensecomponent}
6573

@@ -72,7 +80,11 @@ ReactDOM.createBlockingRoot(rootNode).render(<App />)
7280

7381
`Suspense` により、レンダー可能になる前にコンポーネントが「待機」し、待機中にフォールバックを表示できるようになります。
7482

83+
<<<<<<< HEAD
7584
上記の例では、`ProfileDetails` は何らかのデータを取得するために非同期 API コールを待機しています。`ProfileDetails` と `ProfilePhoto` を待機している間、`Loading...` というフォールバックを代わりに表示します。`<Suspense>` 内のすべての子要素がロードされるまでは、フォールバックが表示されつづけることに注意することが重要です。
85+
=======
86+
In this example, `ProfileDetails` is waiting for an asynchronous API call to fetch some data. While we wait for `ProfileDetails` and `ProfilePhoto`, we will show the `Loading...` fallback instead. It is important to note that until all children inside `<Suspense>` have loaded, we will continue to show the fallback.
87+
>>>>>>> 68e4efcf93b6e589355f6aa3cbc3f3c811c0ad37
7688
7789
`Suspense` は 2 つの props を受け取ります：
7890
* **fallback** はローディングインジケータを受け取ります。フォールバックは `Suspense` コンポーネントのすべての子要素がレンダーを完了するまで表示されます。

0 commit comments

Comments
 (0)