Merge dev-de in main #2421
Merged
Merge dev-de in main #2421
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* first shot * WIP german contribution index file * finalized contribution index, add de.toml * add contentDir to de config section in config.toml * change request from catherine * finalizing style guide * change request from David and Catherine
Merge main into dev-de
[de] Fix typo in _index.md
[de] translation for agile software dev
* [de] Add localization cloud computing * [de] Add missing title meta inf * [de] Adjust wording in cloud computing * [de] Adjust wording cloud computing Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com> Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
* update terms to completed * Update content/de/agile_software_development.md Co-authored-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com> * Update cloud_computing.md Co-authored-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>
chore: Add feedback templating
Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
* Add german translation for API Gateway Add german translation for API Gateway. Solves #507 * Update api_gateway.md fixed all found typos by * Update api_gateway.md small wording adjustment, changes state Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
[de] Abstraction
[de] Add localization cloud native tech
Co-authored-by: Noah Ispas <Noahispas@gmail.com> Signed-off-by: DaveVentura <47860237+DaveVentura@users.noreply.github.com>
1409 german localize containers
* first shot Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com> * Update content/de/cluster.md Co-authored-by: DaveVentura <47860237+DaveVentura@users.noreply.github.com> Signed-off-by: Noah Ispas <Noahispas@gmail.com> * Update content/de/cluster.md Co-authored-by: DaveVentura <47860237+DaveVentura@users.noreply.github.com> Signed-off-by: Noah Ispas <Noahispas@gmail.com> * Update content/de/cluster.md Signed-off-by: Noah Ispas <Noahispas@gmail.com> --------- Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com> Signed-off-by: Noah Ispas <Noahispas@gmail.com> Co-authored-by: DaveVentura <47860237+DaveVentura@users.noreply.github.com>
Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com>
[DE] merge main into dev-de
Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com>
Update status to completed for some terms
iamNoah1
requested review from
DaveVentura,
CathPag,
bcubk,
caniszczyk,
seokho-son,
jihoon-seo and
nate-double-u
as code owners
✅ Deploy Preview for cncfglossary ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
|
There are several commits without sign-off. I guess they have been included before we applied DCO in this repo. |
seokho-son
approved these changes
Sep 19, 2023
seokho-son
reviewed
Sep 19, 2023
| @@ -68,6 +68,7 @@ description = "The CNCF Cloud Native Glossary Project is intended to be used as | |||
| #time_format_default = "02.01.2006" | |||
| #time_format_blog = "02.01.2006" | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
We don't have to modify this part, but I guess it was from previous manual rebase.
In order to minimize mixed up situation, we'd better update dev-de first, and then, let's merge this PR.
|
Wait, please do not proceed with this yet. |
Update dev-de branch
|
@jihoon-seo @seokho-son I guess we can proceed here?! |
|
Hi @iamNoah1 :) I had hoped that #2422 would help discard the minor change in the config.toml. However, it didn't work as expected. I suspect the change originated from a previous rebase of the dev-de branch. We could potentially discard the change by altering the commit history, but the hassle might outweigh the benefits. |
sestegra
added a commit
to juliafmorgado/CNCFglossary
that referenced
this pull request
Oct 29, 2023
This reverts commit 581109e.
sestegra
added a commit
to juliafmorgado/CNCFglossary
that referenced
this pull request
Oct 29, 2023
This reverts commit 581109e.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
In order to get the completed terms online, we want to merge dev-de into main