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-fr with main branch #1235

Merged
merged 104 commits into from
Aug 17, 2022
Merged

Rebase dev-fr with main branch #1235

merged 104 commits into from
Aug 17, 2022

Conversation

fydrah
Copy link
Contributor

@fydrah fydrah commented Aug 17, 2022

This PR is to rebase dev-fr localization branch with main branch to get new changes.

Andong LIAO and others added 30 commits May 16, 2022 23:12
* [zh] Localize 'api_gateway' fix #850

* [zh] remove english description

* [zh] move the hyperlink to the right place, add spacing
* [zh] optimize the description on home page

* Update content/zh-cn/_index.md

Co-authored-by: Brian Yan <18373181742@163.com>

Co-authored-by: Brian Yan <18373181742@163.com>
* [zh] Localize 'infrastructure_as_a_service'

* [zh] refer to existing zh terms in iaas
[zh] Localize horizontal_scaling.md
扩展 - > 伸缩 for scalability
* Create auto_scaling.md

* Update content/zh-cn/auto_scaling.md

Co-authored-by: Brian Yan <18373181742@163.com>

* unify expression

* Update auto_scaling.md

Co-authored-by: Brian Yan <18373181742@163.com>
Co-authored-by: Jacob953 <710297349@qq.com>
* [zh] translate api

* [zh] refine the transalation of scalability
Signed-off-by: Andong Liao <adliao@thoughtworks.com>
Signed-off-by: Andong Liao <adliao@thoughtworks.com>
[zh] Keep the subheadings consistent
[zh] Localize 'agile_software_development'
[zh] Localize chaos_engineering.md
Signed-off-by: zhangxuhai <lenshood.zxh@gmail.com>
Signed-off-by: Andong Liao <adliao@thoughtworks.com>
Signed-off-by: Juncheng <37217311+JunchengL@users.noreply.github.com>
Signed-off-by: Juncheng <37217311+JunchengL@users.noreply.github.com>
[zh] Localize vertical_scaling.md
* [zh] cs archtecture

Signed-off-by: Andong Liao <adliao@thoughtworks.com>

* [zh] resolve comments and resubmit with sign

Signed-off-by: Andong Liao <adliao@thoughtworks.com>
Co-authored-by: Brian Yan <44219737+Rocksnake@users.noreply.github.com>
[zh] localize platform_as_a_service.md
* [zh-cn] Update DevOps

Glossary `DevOps` is widely used, we can put it in title just as `CI` and `CD`.

Signed-off-by: tianzong48 <tianzong48@gmail.com>

* Update content/zh-cn/devops.md

Co-authored-by: Brian Yan <44219737+Rocksnake@users.noreply.github.com>

Signed-off-by: Submarinee <45026656+Submarinee@users.noreply.github.com>

Co-authored-by: Submarinee <45026656+Submarinee@users.noreply.github.com>
slash in `<em></em>` do not match

Signed-off-by: Yuedong Wu <57584831+lunarwhite@users.noreply.github.com>
Signed-off-by: Yuedong Wu <57584831+lunarwhite@users.noreply.github.com>
@netlify
Copy link

netlify bot commented Aug 17, 2022

Deploy Preview for cncfglossary ready!

Name Link
🔨 Latest commit 2fe9fd9
🔍 Latest deploy log https://app.netlify.com/sites/cncfglossary/deploys/62fd17a7e6c7ad0008975cc3
😎 Deploy Preview https://deploy-preview-1235--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 settings.

@fydrah fydrah added the maintainers Use this label if PR requires maintainers to take action label Aug 17, 2022
Copy link
Collaborator

@mitul3737 mitul3737 left a comment

Choose a reason for hiding this comment

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

LGTM

@huats
Copy link
Collaborator

huats commented Aug 17, 2022

LGTM

Copy link
Collaborator

@seokho-son seokho-son left a comment

Choose a reason for hiding this comment

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

LGTM. This PR does not require contents review.
Let me merge this PR.

@seokho-son seokho-son merged commit c397032 into dev-fr Aug 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lang/fr for French maintainers Use this label if PR requires maintainers to take action
Projects
None yet
Development

Successfully merging this pull request may close these issues.