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

Add terms from dev-es branch to main #1644

Merged
merged 143 commits into from
Jan 26, 2023
Merged

Add terms from dev-es branch to main #1644

merged 143 commits into from
Jan 26, 2023

Conversation

krol3
Copy link
Collaborator

@krol3 krol3 commented Jan 25, 2023

Describe your changes

Merge the dev-es branch to the main

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

N/A

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

  • [x ] This PR does not contain plagiarism
    • don’t copy other people’s work unless you are quoting and contributing it to them.
  • [ x] 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".

anyulled and others added 30 commits June 3, 2022 16:27
@anyulled @electrocucaracha @raelga
feat: canary deployment (#873)
054659b 
Signed-off-by: anyul <anyulled@gmail.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Co-authored-by: Rael Garcia <rael@rael.io>
@CristianFrancisco85 @raelga
Translate CI term to spanish (#924)
342f18d 
* CI definition
* Fix typos and word added to dictionary
* Update and rename continuous_integration.md to continuous-integration.md
* Add line break space content/es/continuous-integration.md

Signed-off-by: Rael Garcia <rael@rael.io>
Signed-off-by: Cristian Meoño <cristianfrancisco85@gmail.com>
Co-authored-by: Rael Garcia <rael@rael.io>
@92nqb @electrocucaracha
[es] Localize infrastructure_as_a_service.md (#929)
909797e 
* [es] Localize infrastructure_as_a_service.md (#606)

Signed-off-by: Nicolas Quiceno B <nicolas.quiceno@astrokube.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@ramrodo
es] Localize client_server_architecture.md (#935)
d9cf639 
* [es] Localize client_server_architecture.md
* Change from "_" to "-" to use the new name convention

Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@ramrodo @electrocucaracha
[es] Localize cloud-native-apps.md (#983)
2fed971 
* [es] Localize cloud-native-apps.md

Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@92nqb @electrocucaracha
[Spanish] localize 'GitOps' (#939)
0ed0df8 
* [Spanish] localize 'GitOps' closes (#603)

Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Signed-off-by: Nicolas Quiceno B <nicolas.quiceno@astrokube.com>
@ramrodo @electrocucaracha
[es] Localize cloud-native-security.md (#1051)
caf670d 
* [es] Localize cloud-native-security.md
* Update content/es/cloud-native-security.md

Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@gamba47 @electrocucaracha @raelga
[ESP] add content/es/application_programming_interface.md done (#704)
69817e9 
* application_programming_interface.md done
* clean: apply format conventions
* Apply suggestions from code review

Signed-off-by: Emiliano <emilianovazquez@gmail.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Co-authored-by: Rael Garcia <rael@redhat.com>
@krol3
feat: add content es/portability (#1043)
3962df0 
* feat: add content es/portability

Signed-off-by: Carol Valencia <krol3@@users.noreply.github.com>
@gamba47
[ES] add content/es/auto_scaling.md (#1231)
0fc040e 
* [ES] add content/es/auto_scaling.md
* Fix wordlist add autoescalado
* Rebase wordlist
* Sort wordlist

Signed-off-by: Emiliano <emilianovazquez@gmail.com>
@ramrodo
[es] Localize cloud-native-tech.md (#1193)
0a92f7e 
* [es] Localize cloud-native-tech.md
* Revert change from resolving conflicts

Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@electrocucaracha
Update headers and links (#1278)
2b04b55 
* [es] Rename canary deployment file
* [es] Fix template headers
* [es] Update word list
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@RedwineOS
[es] Localize 'Container Image' (#1228)
3825024 
* Container image translation

Signed-off-by: Eduardo Sánchez <eduardo.sanchez.eslp@gmail.com>
@ramrodo @electrocucaracha
@92nqb @krol3
[es] Localize continuous-delivery.md (#1280)
c8e520a 
* [es] Localize continuous-delivery.md

Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Co-authored-by: Nicolas Quiceno B <nicolas.quiceno@astrokube.com>
Co-authored-by: Carol Valencia <8355621+krol3@users.noreply.github.com>
@anyulled @electrocucaracha
@raelga @ramrodo
feat: canary deployment (#873)
6d19f48 
Signed-off-by: anyul <anyulled@gmail.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Co-authored-by: Rael Garcia <rael@rael.io>
@CristianFrancisco85 @raelga @ramrodo
Translate CI term to spanish (#924)
5cc48d5 
* CI definition
* Fix typos and word added to dictionary
* Update and rename continuous_integration.md to continuous-integration.md
* Add line break space content/es/continuous-integration.md

Signed-off-by: Rael Garcia <rael@rael.io>
Signed-off-by: Cristian Meoño <cristianfrancisco85@gmail.com>
Co-authored-by: Rael Garcia <rael@rael.io>
@92nqb @electrocucaracha @ramrodo
[es] Localize infrastructure_as_a_service.md (#929)
e032d3d 
* [es] Localize infrastructure_as_a_service.md (#606)

Signed-off-by: Nicolas Quiceno B <nicolas.quiceno@astrokube.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@ramrodo
es] Localize client_server_architecture.md (#935)
4de6f95 
* [es] Localize client_server_architecture.md
* Change from "_" to "-" to use the new name convention

Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@ramrodo @electrocucaracha
[es] Localize cloud-native-apps.md (#983)
cb7b1e6 
* [es] Localize cloud-native-apps.md

Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@92nqb @electrocucaracha @ramrodo
[Spanish] localize 'GitOps' (#939)
d77252b 
* [Spanish] localize 'GitOps' closes (#603)

Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Signed-off-by: Nicolas Quiceno B <nicolas.quiceno@astrokube.com>
@ramrodo @electrocucaracha
[es] Localize cloud-native-security.md (#1051)
0d005b7 
* [es] Localize cloud-native-security.md
* Update content/es/cloud-native-security.md

Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@gamba47 @electrocucaracha
@raelga @ramrodo
[ESP] add content/es/application_programming_interface.md done (#704)
da72f8b 
* application_programming_interface.md done
* clean: apply format conventions
* Apply suggestions from code review

Signed-off-by: Emiliano <emilianovazquez@gmail.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Co-authored-by: Rael Garcia <rael@redhat.com>
@krol3 @ramrodo
feat: add content es/portability (#1043)
64984b6 
* feat: add content es/portability

Signed-off-by: Carol Valencia <krol3@@users.noreply.github.com>
@gamba47 @ramrodo
[ES] add content/es/auto_scaling.md (#1231)
2fa21ef 
* [ES] add content/es/auto_scaling.md
* Fix wordlist add autoescalado
* Rebase wordlist
* Sort wordlist

Signed-off-by: Emiliano <emilianovazquez@gmail.com>
@ramrodo
[es] Localize cloud-native-tech.md (#1193)
e198934 
* [es] Localize cloud-native-tech.md
* Revert change from resolving conflicts

Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@electrocucaracha @ramrodo
Update headers and links (#1278)
908601e 
* [es] Rename canary deployment file
* [es] Fix template headers
* [es] Update word list
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@RedwineOS @ramrodo
[es] Localize 'Container Image' (#1228)
362cfae 
* Container image translation

Signed-off-by: Eduardo Sánchez <eduardo.sanchez.eslp@gmail.com>
@ramrodo @electrocucaracha
@92nqb @krol3
[es] Localize continuous-delivery.md (#1280)
6041e22 
* [es] Localize continuous-delivery.md

Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Co-authored-by: Nicolas Quiceno B <nicolas.quiceno@astrokube.com>
Co-authored-by: Carol Valencia <8355621+krol3@users.noreply.github.com>
@ramrodo
Rename files to use under score to solve conflicts (revert this chang…
40aa293 
…e later on)

Signed-off-by: Rodolfo Martínez Vega <rodomar@outlook.com>
@seokho-son
Merge pull request #1341 from ramrodo/dev-es
31356f7 
Rebase dev-es branch (solving conflict issue)
electrocucaracha and others added 11 commits January 17, 2023 07:02
@electrocucaracha
Update contributor ladder index (#1522)
5a551e0 
* [es] Sync contributor ladder index
* Add missing words to the Spanish list

Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@electrocucaracha
[es] Sync header tags (#1524)
5578d10 
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@electrocucaracha
[es] Sync infrastructure as a service term (#1605)
3bf1883 
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@electrocucaracha
Update load balancer (#1606)
578796e 
* [es] Sync load-balancer term
* Add microservicio to ES wordlist

Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@electrocucaracha @92nqb
Apply suggestions from code review
4df7fdf 
Co-authored-by: Nicolas Quiceno B <nicolas.quiceno@astrokube.com>
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@electrocucaracha
Update portability term (#1611)
843de86 
* [es] Sync portability term
* Add property to ES wordlist

Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@92nqb
Merge pull request #1610 from electrocucaracha/update_observability
10c3164 
Update observability term
@electrocucaracha
Update contribute index page (#1521)
7af7274 
* [es] Sync contribute index file

Signed-off-by: Victor Morales <chipahuac@hotmail.com>

* Add missing words to the Spanish list

Signed-off-by: Victor Morales <chipahuac@hotmail.com>

Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@krol3
Merge remote-tracking branch 'upstream/main' into dev-es-main-20jan
4b7fdba
@electrocucaracha @92nqb
Update chaos engineering term (#1520)
5119908 
* [es] Sync chaos engineering term

Co-authored-by: Nicolas Quiceno B <nicolas.quiceno@astrokube.com>
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
@seokho-son
Merge pull request #1634 from krol3/dev-es-main-20jan
ae0565d 
sync dev-es branch to main
@netlify
Copy link

netlify bot commented Jan 25, 2023 •
edited
Loading

✅ Deploy Preview for cncfglossary ready!

Name Link
🔨 Latest commit ae0565d
🔍 Latest deploy log https://app.netlify.com/sites/cncfglossary/deploys/63d097e53399890008aa4945
😎 Deploy Preview https://deploy-preview-1644--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.

@electrocucaracha electrocucaracha added the lang/es for Spanish label Jan 25, 2023
seokho-son
seokho-son approved these changes Jan 25, 2023
View reviewed changes
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 with a minor comment. :)

content/es/_index.md
El Glosario Cloud Native fue iniciado por CNCF Marketing
Committee (Business Value Subcommittee) e incluye
contribuciones de [Catherine Paganini](https://www.linkedin.com/in/catherinepaganini/en/), [Chris Aniszczyk](https://www.linkedin.com/in/caniszczyk/),
[Daniel Jones](https://www.linkedin.com/in/danieljoneseb/?originalSubdomain=uk), [Jason Morgan](https://www.linkedin.com/in/jasonmorgan2/), [Katelin Ramer](https://www.linkedin.com/in/katelinramer/), [Mike Foster](https://www.linkedin.com/in/mfosterche/?originalSubdomain=ca), [Seokho Son](https://www.linkedin.com/in/seokho-son/) y muchos contribuidores mas. Para una lista de contribuidores completa, consulte [esta página de GitHub](https://github.com/cncf/glossary/graphs/contributors).
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hi @krol3
I think this part from the source document has been removed by this PR. (Acknowledgement to the Glossary maintainers)
But it seems not urgent issue, can be resolved next time.
I thinks you can open another PR to restore the removed part to make up this PR, or I can merge this PR first, upto your team decision.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I agree with opening other PR to remove this. I think we can merge this PR first.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I created an issue to track this!! Thank you

ramrodo
ramrodo approved these changes Jan 25, 2023
View reviewed changes
Copy link
Collaborator

@ramrodo ramrodo 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
Copy link
Collaborator

Let me merge this PR. Thanks all !!

@seokho-son seokho-son merged commit af6d101 into main Jan 26, 2023
@krol3 krol3 mentioned this pull request Jan 26, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ramrodo ramrodo ramrodo approved these changes

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

@electrocucaracha electrocucaracha electrocucaracha approved these changes

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

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

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

@CathPag CathPag Awaiting requested review from CathPag

@JasonMorgan JasonMorgan Awaiting requested review from JasonMorgan

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

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

Assignees
No one assigned
Labels
lang/es for Spanish
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.