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

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
Update `dev-fr` with `main` head
* Finish style-guide translation

Signed-off-by: Flavien Hardy <flav.hardy@gmail.com>

* Init french translation of contributeur guide

add fr/contribute/_index.md translation

Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>

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

Signed-off-by: Flavien Hardy <flav.hardy@gmail.com>

* Update config.toml

Signed-off-by: Seokho Son <shsongist@gmail.com>

* update i18n fr reading time section

Fix a misunderstanding about the reading time section

Signed-off-by: Flavien Hardy <flav.hardy@gmail.com>

Signed-off-by: Flavien Hardy <flav.hardy@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Seokho Son <shsongist@gmail.com>
Co-authored-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Co-authored-by: Seokho Son <shsongist@gmail.com>
Rebase dev-fr with main branch
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Christophe Sauthier <christophe.sauthier@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Signed-off-by: Christophe Sauthier <christophe.sauthier@gmail.com>
Signed-off-by: Christophe Sauthier <christophe.sauthier@gmail.com>
Signed-off-by: Christophe Sauthier <christophe.sauthier@gmail.com>
Signed-off-by: Christophe Sauthier <christophe.sauthier@gmail.com>
Signed-off-by: Christophe Sauthier <christophe.sauthier@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
[French] Traduction de containerization.md
Traduction de Monolithic-apps.md
Signed-off-by: Christophe Sauthier <christophe.sauthier@gmail.com>
Signed-off-by: Stéphane Este-Gracias <sestegra@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
[FR] Traduction de virtual-machine.md
Signed-off-by: Stéphane Este-Gracias <sestegra@gmail.com>
Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
@netlify
Copy link

netlify bot commented Oct 2, 2023

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
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
Development

Successfully merging this pull request may close these issues.