From 56b383273fb60f7d73af2496d6eb419cc2370d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rado=C5=A1=20Mili=C4=87ev?= <40705899+rammba@users.noreply.github.com> Date: Tue, 1 Oct 2024 21:34:40 +0200 Subject: [PATCH 1/2] Use correct link for translations progress site (#7199) --- src/content/community/acknowledgements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/community/acknowledgements.md b/src/content/community/acknowledgements.md index aeb0787efc..9a981efd5c 100644 --- a/src/content/community/acknowledgements.md +++ b/src/content/community/acknowledgements.md @@ -59,7 +59,7 @@ We'd like to recognize a few people who have made significant contributions to R This list is not exhaustive. -We'd like to give special thanks to [Tom Occhino](https://github.com/tomocchino) and [Adam Wolff](https://github.com/wolffiex) for their guidance and support over the years. We are also thankful to all the volunteers who [translated React into other languages.](https://translations.reactjs.org/) +We'd like to give special thanks to [Tom Occhino](https://github.com/tomocchino) and [Adam Wolff](https://github.com/wolffiex) for their guidance and support over the years. We are also thankful to all the volunteers who [translated React into other languages.](https://translations.react.dev/) ## Additional Thanks {/*additional-thanks*/} From 76769fa90e9eb89af962c06d793eefcc160e2960 Mon Sep 17 00:00:00 2001 From: Xleine Date: Thu, 3 Oct 2024 21:56:21 +0800 Subject: [PATCH 2/2] fix merge conflict && translate --- src/content/community/acknowledgements.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/content/community/acknowledgements.md b/src/content/community/acknowledgements.md index 6d83220d12..be76ffc1a7 100644 --- a/src/content/community/acknowledgements.md +++ b/src/content/community/acknowledgements.md @@ -59,11 +59,7 @@ React 从最初由 [Jordan Walke](https://github.com/jordwalke) 创立至今, 这份名单并不详尽。 -<<<<<<< HEAD -我们要特别感谢 [Tom Occhino](https://github.com/tomocchino) 和 [Adam Wolff](https://github.com/wolffiex)，感谢他们多年来的指导和支持。我们还要感谢所有 [将 React 翻译为其他语言的志愿者们](https://translations.reactjs.org/)。 -======= -We'd like to give special thanks to [Tom Occhino](https://github.com/tomocchino) and [Adam Wolff](https://github.com/wolffiex) for their guidance and support over the years. We are also thankful to all the volunteers who [translated React into other languages.](https://translations.react.dev/) ->>>>>>> 56b383273fb60f7d73af2496d6eb419cc2370d9e +我们要特别感谢 [Tom Occhino](https://github.com/tomocchino) 和 [Adam Wolff](https://github.com/wolffiex) 多年来的指导和支持，以及所有 [将 React 翻译为其他语言的志愿者们](https://translations.react.dev/)。 ## Additional Thanks {/*additional-thanks*/}