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

Rebase dev-ru with the main branch #2455

Merged
merged 216 commits into from
Oct 4, 2023
Merged

Rebase dev-ru with the main branch #2455

merged 216 commits into from
Oct 4, 2023

Conversation

kirkonru
Copy link
Collaborator

@kirkonru kirkonru commented Oct 2, 2023

This PR is to rebase the dev-ru localization branch to the main branch to get new changes.

  • No content review is required, since this PR simply updates the dev-ru branch to match the main branch.

seokho-son and others added 30 commits July 1, 2022 21:29
@seokho-son
Merge pull request #1021 from cncf/main
dc173b8 
Update `dev-fr` with `main` head
@fydrah @Krast76 @seokho-son
Settings and initial contents for French localization (#1145)
0c1b259 
* Finish style-guide translation

Signed-off-by: Flavien Hardy <[email protected]>

* Init french translation of contributeur guide

add fr/contribute/_index.md translation

Signed-off-by: Ludovic Logiou <[email protected]>

* Review fr style-guide and contribute, add fr TEMPLATE, typos

Signed-off-by: Flavien Hardy <[email protected]>

* Update config.toml

Signed-off-by: Seokho Son <[email protected]>

* update i18n fr reading time section

Fix a misunderstanding about the reading time section

Signed-off-by: Flavien Hardy <[email protected]>

Signed-off-by: Flavien Hardy <[email protected]>
Signed-off-by: Ludovic Logiou <[email protected]>
Signed-off-by: Seokho Son <[email protected]>
Co-authored-by: Ludovic Logiou <[email protected]>
Co-authored-by: Seokho Son <[email protected]>
@seokho-son
Merge pull request #1235 from cncf/main
c397032 
Rebase dev-fr with main branch
@Krast76
Localize cloud-native apps and tech to fr
38514a7 
Signed-off-by: Ludovic Logiou <[email protected]>
@Krast76
Fix native to natives and on-premise datacenter translation
b389dc3 
Signed-off-by: Ludovic Logiou <[email protected]>
@Krast76
Fix after title have been changed from the template
737ac6f 
Signed-off-by: Ludovic Logiou <[email protected]>
@huats
Traduction de container.md
533c4f1 
Signed-off-by: Christophe Sauthier <[email protected]>
@Krast76
Add Fydrah feedbacks
76199e1 
Signed-off-by: Ludovic Logiou <[email protected]>
@Krast76
Localize service-mesh fr
9f274fc 
Signed-off-by: Ludovic Logiou <[email protected]>
@Krast76
Add feedbacks from Huats
e9b1a46 
Signed-off-by: Ludovic Logiou <[email protected]>
@Krast76
Fix after title have been changed from the template
b484eb3 
Signed-off-by: Ludovic Logiou <[email protected]>
@Krast76
Replace Service Mesh by maillage de services in the title
691b438 
Signed-off-by: Ludovic Logiou <[email protected]>
@Krast76
Add fydrah insights
dba837d 
Signed-off-by: Ludovic Logiou <[email protected]>
@Krast76
Fix last error about dette technique
2a09c2f 
Signed-off-by: Ludovic Logiou <[email protected]>
@huats
Traduction de monolithic-apps.md
5bd767b 
Signed-off-by: Christophe Sauthier <[email protected]>
@huats
Traduction de virtual-machine.md
662a69e 
Signed-off-by: Christophe Sauthier <[email protected]>
@fydrah
Merge pull request #1302 from huats/container-fr
d9ab562 
Traduction de container.md
@huats
Traduction de containerization.md
2f5d595 
Signed-off-by: Christophe Sauthier <[email protected]>
@huats
Applied feedback from Flavien
2b7ed3f 
Signed-off-by: Christophe Sauthier <[email protected]>
@huats
Traduction de container-orchestration en FR
a2c9f89 
Signed-off-by: Christophe Sauthier <[email protected]>
@Krast76
Add review from Fydrah
e3bd7b2 
Signed-off-by: Ludovic Logiou <[email protected]>
@huats
Merge pull request #1432 from huats/containerization-fr
cb2bfe4 
[French] Traduction de containerization.md
@huats
Merge pull request #1426 from huats/monolithic-apps-fr
37ed968 
Traduction de Monolithic-apps.md
@huats
Integrate Fydrah feedback
2eaa43a 
Signed-off-by: Christophe Sauthier <[email protected]>
@sestegra
[fr] Localize abstraction
011c186 
Signed-off-by: Stéphane Este-Gracias <[email protected]>
@Krast76
Add feedbacks from Huats
a6e913b 
Signed-off-by: Ludovic Logiou <[email protected]>
@huats
Merge pull request #1433 from huats/virtual-machine-fr
0da9618 
[FR] Traduction de virtual-machine.md
@sestegra
Updates after reviews
f3396cf 
Signed-off-by: Stéphane Este-Gracias <[email protected]>
@Krast76
Merge pull request #1272 from Krast76/servicemesh-fr
3c63671 
Localize service-mesh fr
@Krast76
Fix missing s at application
5de6f29 
Signed-off-by: Ludovic Logiou <[email protected]>
@netlify
Copy link

netlify bot commented Oct 2, 2023 •
edited
Loading

✅ Deploy Preview for cncfglossary ready!

Name Link
🔨 Latest commit 581109e
🔍 Latest deploy log https://app.netlify.com/sites/cncfglossary/deploys/651acb2bf22c820008d4d3a7
😎 Deploy Preview https://deploy-preview-2455--cncfglossary.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@github-actions github-actions bot added lang/en for English lang/pt for Portuguese lang/it for Italian lang/hi for Hindi lang/ko for Korean lang/de for German lang/bn for Bengali lang/es for Spanish lang/zh for Chinese lang/fr for French labels Oct 2, 2023
@kirkonru
Copy link
Collaborator Author

kirkonru commented Oct 2, 2023

LGTM

@kirkonru
Copy link
Collaborator Author

kirkonru commented Oct 2, 2023

@seokho-son could you please merge this PR?

@kirkonru kirkonru requested a review from shurup October 2, 2023 14:02
@shurup
Copy link
Collaborator

shurup commented Oct 3, 2023

LGTM

P.S. Sorry that so many people are triggered when we need to rebase. I'll start a Slack thread to discuss if there's any better way to do it next time.

@seokho-son
Copy link
Collaborator

Thanks!

As this PR mentioned,
// No content review is required, since this PR simply updates the dev-ru branch to match the main branch.

Let me merge this PR as one of maintainers.

@seokho-son seokho-son merged commit d14d43c into dev-ru Oct 4, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seokho-son seokho-son seokho-son approved these changes

@hanyuancheung hanyuancheung Awaiting requested review from hanyuancheung hanyuancheung is a code owner

@Jacob953 Jacob953 Awaiting requested review from Jacob953 Jacob953 is a code owner

@Rocksnake Rocksnake Awaiting requested review from Rocksnake Rocksnake is a code owner

@Submarinee Submarinee Awaiting requested review from Submarinee Submarinee is a code owner

@Saim-Safdar Saim-Safdar Awaiting requested review from Saim-Safdar Saim-Safdar is a code owner

@waleed318 waleed318 Awaiting requested review from waleed318 waleed318 is a code owner

@edsoncelio edsoncelio Awaiting requested review from edsoncelio edsoncelio is a code owner

@brunoguidone brunoguidone Awaiting requested review from brunoguidone brunoguidone is a code owner

@jessicalins jessicalins Awaiting requested review from jessicalins jessicalins is a code owner

@MrErlison MrErlison Awaiting requested review from MrErlison MrErlison is a code owner

@jihoon-seo jihoon-seo Awaiting requested review from jihoon-seo jihoon-seo is a code owner

@yunkon-kim yunkon-kim Awaiting requested review from yunkon-kim yunkon-kim is a code owner

@fsbaraglia fsbaraglia Awaiting requested review from fsbaraglia fsbaraglia is a code owner

@ugho16 ugho16 Awaiting requested review from ugho16 ugho16 is a code owner

@annalisag-spark annalisag-spark Awaiting requested review from annalisag-spark annalisag-spark is a code owner

@sistella sistella Awaiting requested review from sistella sistella is a code owner

@Garima-Negi Garima-Negi Awaiting requested review from Garima-Negi Garima-Negi is a code owner

@sayantani11 sayantani11 Awaiting requested review from sayantani11

@anubha-v-ardhan anubha-v-ardhan Awaiting requested review from anubha-v-ardhan

@jayesh-srivastava jayesh-srivastava Awaiting requested review from jayesh-srivastava jayesh-srivastava is a code owner

@huats huats Awaiting requested review from huats huats is a code owner

@fydrah fydrah Awaiting requested review from fydrah

@Krast76 Krast76 Awaiting requested review from Krast76 Krast76 is a code owner

@sestegra sestegra Awaiting requested review from sestegra sestegra is a code owner

@raelga raelga Awaiting requested review from raelga raelga is a code owner

@ramrodo ramrodo Awaiting requested review from ramrodo ramrodo is a code owner

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha electrocucaracha is a code owner

@krol3 krol3 Awaiting requested review from krol3 krol3 is a code owner

@92nqb 92nqb Awaiting requested review from 92nqb 92nqb is a code owner

@iamNoah1 iamNoah1 Awaiting requested review from iamNoah1 iamNoah1 is a code owner

@DaveVentura DaveVentura Awaiting requested review from DaveVentura DaveVentura is a code owner

@CathPag CathPag Awaiting requested review from CathPag CathPag is a code owner

@bcubk bcubk Awaiting requested review from bcubk bcubk is a code owner

@Arindam200 Arindam200 Awaiting requested review from Arindam200 Arindam200 is a code owner

@Imtiaz1234 Imtiaz1234 Awaiting requested review from Imtiaz1234 Imtiaz1234 is a code owner

@mitul3737 mitul3737 Awaiting requested review from mitul3737 mitul3737 is a code owner

@sajibAdhi sajibAdhi Awaiting requested review from sajibAdhi sajibAdhi is a code owner

@caniszczyk caniszczyk Awaiting requested review from caniszczyk caniszczyk is a code owner

@JasonMorgan JasonMorgan Awaiting requested review from JasonMorgan

@nate-double-u nate-double-u Awaiting requested review from nate-double-u nate-double-u is a code owner

@castrojo castrojo Awaiting requested review from castrojo castrojo is a code owner

@shurup shurup Awaiting requested review from shurup

Assignees

@kirkonru kirkonru

Labels
lang/bn for Bengali lang/de for German lang/en for English lang/es for Spanish lang/fr for French lang/hi for Hindi lang/it for Italian lang/ko for Korean lang/pt for Portuguese lang/ru for Russian lang/zh for Chinese maintainers Use this label if PR requires maintainers to take action
Projects
CNCF glossary definition review board
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.