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-tr branch onto main #2234

Merged
merged 39 commits into from
Jul 17, 2023
Merged

Rebase dev-tr branch onto main #2234

merged 39 commits into from
Jul 17, 2023

Conversation

aliok
Copy link
Member

@aliok aliok commented Jul 17, 2023

Describe your changes

Rebase dev-tr branch onto main. Per https://github.com/cncf/glossary/blob/main/LOCALIZATION.md#localization-team-guidelines

Localization teams need to get changes from the main branch in their dev-xx branch from time to time. Therefore a PR should be opened where the main branch is merged into dev-xx. The glossary maintainers will then choose the rebase method to complete the PR and keep the history linear.

Related issue number or link (ex: resolves #issue-number)

Checklist before opening this PR (put x in the checkboxes)

  • This PR does not contain plagiarism
    • don’t copy other people’s work unless you are quoting and contributing it to them.
  • I have signed off on all commits
    • signing off (ex: git commit -s) is to affirm that commits comply DCO. If you are working locally, you could add an alias to your gitconfig by running git config --global alias.ci "commit -s".

Azanul and others added 30 commits April 11, 2023 00:37
* [LOCALIZE] SRE in spanish

Signed-off-by: Azanul <azanulhaque@gmail.com>
* added content/es/hypervisor.md
* fixed content references

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
…e-guide & content/es/contribute (#1867)

* added missing sections + semantic line breaks in content/es/style-guide/_index.md.
* added a missing section in content/es/contribute/_index.md.

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
* added content/es/serverless.md

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
* added content/es/security-chaos-engineering.md
* added content/es/data-center.md
* added latest changes from document in main
* fixed typo in data-center
* updated es-datacenter with latest content
* Update content/es/data-center.md

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
)

* #1775 Issue: Localized the content/en/software-as-a-service.md document to Spanish
* Fix the spelling and translated the English part of the file
* Fixes the spell check failure and update the content/es/software-as-a-service.md

Signed-off-by: Naymul Islam <naymul504@gmail.com>
Signed-off-by: Naymul Islam <68547750+ai-naymul@users.noreply.github.com>
* added es/content/service-mesh.md

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
* added content/virtual-machine.md

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
* added es/content/function-as-a-service.
* added FaaS to wordlist.txt.

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
[es] Translate tags section in es.toml file
* added content/es/service-discovery

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
* added content/es/stateful-apps.md

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
* added compute/es/edge-computing.md

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
* added es/vertical-scaling.md

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
* added es/_TEMPLATE.md
* added PR suggestions

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
* Added service.md file
* Change Linked Concept in the following files:
        content/es/abstraction.md
        content/es/blue-green-deployment.md
        content/es/event-driven-architecture.md
        content/es/function-as-a-service.md
        content/es/microservices-architecture.md
        content/es/service-mesh.md

Signed-off-by: MartinEliasQ <elias.quintero@udea.edu.co>
Signed-off-by: Martin E. Quintero <elias.quintero@udea.edu.co>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
* This commit updates the text Site Results to Resultados de la búsqueda to provide a version in Spanish.

Signed-off-by: MartinEliasQ <elias.quintero@udea.edu.co>
* added es/mutual-transport-layer-security.md

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
* Add self-healing.md
* Change link in kubernetes.md to self-healing
* Changed concept translatation

Signed-off-by: MartinEliasQ <elias.quintero@udea.edu.co>
* Added the translated version of version control
* Update content/es/version-control.md

Signed-off-by: MartinEliasQ <elias.quintero@udea.edu.co>
Signed-off-by: Martin E. Quintero <elias.quintero@udea.edu.co>
Co-authored-by: Rodolfo Martínez Vega <rodomar@outlook.com>
* added es/virtualization.md.
* updated virtualization reference in virtual-machine term.

Signed-off-by: marianogg9 <gonzalez.mariano.gabriel@gmail.com>
* Added the translated version of the Zero trist architecture.
* Update content/es/zero-trust-architecture.md

Signed-off-by: MartinEliasQ <elias.quintero@udea.edu.co>
Signed-off-by: Martin E. Quintero <elias.quintero@udea.edu.co>
Co-authored-by: Rodolfo Martínez Vega <rodomar@outlook.com>
Signed-off-by: dependabot[bot] <support@github.com>
* [es] #1773 Issue : added the content/es/shift-left.md

Signed-off-by: Naymul Islam <naymul504@gmail.com>
* [ES] Localize stateless app

Signed-off-by: Jonnatan Jossemar Cordero <jossemargt@gmail.com>
krol3 and others added 3 commits July 4, 2023 12:10
* [en] Virtualization - remove redundant sentence

Signed-off-by: Guillaume Bernard <guillaume.bernard@live.fr>

* [en] Virtualization - remove redundant sentence

Signed-off-by: Guillaume Bernard <guillaume.bernard@live.fr>

---------

Signed-off-by: Guillaume Bernard <guillaume.bernard@live.fr>
@netlify
Copy link

netlify bot commented Jul 17, 2023

Deploy Preview for cncfglossary ready!

Name Link
🔨 Latest commit ff963d4
🔍 Latest deploy log https://app.netlify.com/sites/cncfglossary/deploys/64b532869374080008c1fb19
😎 Deploy Preview https://deploy-preview-2234--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/bn for Bengali lang/es for Spanish labels Jul 17, 2023
@aliok
Copy link
Member Author

aliok commented Jul 17, 2023

@seokho-son any idea how to bypass DCO here?

Also, is the default merge "rebase"? I don't want a merge commit as it will kill the commit history.

@seokho-son
Copy link
Collaborator

In case of this PR, approvers do not need to review the content itself.
(just updating dev branch based on upsteam/main)

Let me force merge this PR as a maintainer.

@aliok I set bypass the DCO manually as well (the DCO issue is not from this PR)

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

@seokho-son seokho-son merged commit b72e60a into dev-tr Jul 17, 2023
@aliok
Copy link
Member Author

aliok commented Jul 17, 2023

Thanks!

@aliok aliok mentioned this pull request Aug 16, 2023
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lang/bn for Bengali lang/en for English lang/es for Spanish
Projects
Development

Successfully merging this pull request may close these issues.