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

Merge dev-de in main #2421

Merged
merged 78 commits into from
Sep 27, 2023
Merged
Changes from 2 commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
b43cb62
Update CODEOWNERS in dev-de to sync with main
seokho-son Feb 2, 2022
61628ae
Settings and initial contents for German localization (#347)
iamNoah1 Feb 16, 2022
e6919ac
Update CODEOWNDERS for dev-de
seokho-son Feb 17, 2022
07c2b2e
Merge branch 'main' into dev-de
iamNoah1 Mar 22, 2022
4d2b92b
Merge pull request #646 from iamNoah1/dev-de
seokho-son Mar 24, 2022
20eec23
first shot
iamNoah1 Mar 26, 2022
c7c844e
[de] Fix typo in _index.md
gdenn Apr 8, 2022
9b3b456
localize feedback section
iamNoah1 Apr 9, 2022
71ed549
change requests
iamNoah1 Apr 9, 2022
a3f4986
Merge pull request #712 from gdenn/de-bugfix/index-typo
Petria3s Apr 9, 2022
97f0a0f
Merge pull request #661 from iamNoah1/agile-software-dev
Petria3s Apr 9, 2022
4d2fdd3
[de] Add localization cloud computing (#711)
gdenn Apr 11, 2022
2249b80
update terms to completed (#725)
iamNoah1 Apr 12, 2022
c433dfc
[de] Add localization for "abstraction"
gdenn Apr 12, 2022
379f6be
[de] Remove whitespaces
gdenn Apr 13, 2022
47ec764
[de] Remove redundant information
gdenn Apr 13, 2022
ab59a40
[de] Rephrase sentence
gdenn Apr 13, 2022
920399b
[de] Rephrase sentence
gdenn Apr 13, 2022
1985210
Merge pull request #718 from iamNoah1/add-fedback-templating
seokho-son Apr 15, 2022
ca54a93
[de] Remove white spaces
gdenn Apr 17, 2022
87dbc22
[de] Fix template title for agile software dev (#731)
gdenn Apr 19, 2022
edd1fec
[de] Add localization cloud native tech
ohdle Apr 21, 2022
bf23f45
Incorporate suggested change
ohdle Apr 23, 2022
76b79a4
Incorporate suggested change
ohdle Apr 23, 2022
b87b901
Incorporate suggested change
ohdle Apr 23, 2022
d1b8675
Incorporate suggested change to title
ohdle Apr 23, 2022
fb6436e
Add german translation for API Gateway (#732)
christianhuening Apr 29, 2022
6570292
Merge pull request #730 from gdenn/de-abstraction
DaveVentura May 2, 2022
675de23
Update cloud_native_tech.md
ohdle May 4, 2022
fc73aee
Merge pull request #776 from ohdle/dev-de-cloud-native-tech
DaveVentura Jun 13, 2022
3a1c797
Merge branch 'main' into dev-de
iamNoah1 Jun 20, 2022
d0b880d
Merge pull request #982 from iamNoah1/dev-de
seokho-son Jun 22, 2022
66012c3
rename files, add semantic line breaks, empty lines (#974)
iamNoah1 Jun 24, 2022
6f362cc
Merge branch 'main' into dev-de
iamNoah1 Jul 5, 2022
9c390af
Merge pull request #1041 from iamNoah1/dev-de
seokho-son Jul 8, 2022
38f7ea0
[DE] Take Over Cloud Native Security localization (#990)
iamNoah1 Jul 12, 2022
025ee14
german localize cloud native apps (#1085)
DaveVentura Aug 11, 2022
8baab46
[DE] Add german definition for canary deployment (#1247)
bcubk Oct 3, 2022
b3db84f
german autoscaling localization (#1111)
DaveVentura Oct 3, 2022
4bc2c15
corrects filename
iamNoah1 Oct 4, 2022
ba55d83
Merge pull request #1343 from iamNoah1/correct-filename-canary-depl
seokho-son Oct 5, 2022
68ef5eb
adds david again (#1356)
iamNoah1 Oct 10, 2022
8ef864d
Merge remote-tracking branch 'origin' into dev-de
iamNoah1 Oct 11, 2022
5a2e68d
Merge pull request #1359 from iamNoah1/dev-de
seokho-son Oct 11, 2022
8a70e6d
correct wording (#1355)
iamNoah1 Oct 20, 2022
05dbc67
[localization/german] Add localization for API (#1055)
gdenn Oct 24, 2022
66ff51b
fix filename
iamNoah1 Oct 31, 2022
b3d05bc
Merge pull request #1434 from iamNoah1/fix-api-filename
seokho-son Nov 4, 2022
c0638f6
localization
DaveVentura Oct 28, 2022
db7e389
[DE] Localization of Blue Green Deployment (#1342)
iamNoah1 Nov 9, 2022
6772ba3
Update content/de/client-server-architecture.md
DaveVentura Dec 1, 2022
4ec7ab8
Apply suggestions from code review
DaveVentura Dec 1, 2022
ce1914c
Add german translation for bare metal machine (#1431)
bcubk Jan 5, 2023
650ffde
Merge branch 'main' into dev-de
iamNoah1 Feb 3, 2023
fff8ac0
Merge pull request #1686 from iamNoah1/dev-de
seokho-son Feb 4, 2023
5493f50
add change requests
DaveVentura Feb 8, 2023
6cd3f35
Update content/de/client-server-architecture.md
iamNoah1 Feb 16, 2023
7bdf75c
Update content/de/client-server-architecture.md
DaveVentura Feb 28, 2023
182e695
Update content/de/client-server-architecture.md
DaveVentura Feb 28, 2023
4168327
Merge pull request #1423 from cncf/513-german-localize-client-server-…
DaveVentura Feb 28, 2023
7f30a5e
Create containers.md first throw
DaveVentura May 16, 2023
d83eb1f
Update containers.md
DaveVentura May 16, 2023
be11f28
Update containers.md
DaveVentura May 16, 2023
879dad5
Update containers.md
DaveVentura May 17, 2023
31288cb
Update containers.md
DaveVentura May 17, 2023
f7b14c0
Update content/de/containers.md
DaveVentura Jul 13, 2023
b8411fc
Update content/de/containers.md
DaveVentura Jul 13, 2023
9bb804b
Update content/de/containers.md
DaveVentura Jul 13, 2023
308488a
Update content/de/containers.md
DaveVentura Jul 13, 2023
153d1a6
Update content/de/containers.md
DaveVentura Jul 13, 2023
ab12237
Update content/de/containers.md apply suggestion
DaveVentura Jul 13, 2023
5f5d7db
Merge pull request #2049 from cncf/1409-german-localize-containers
DaveVentura Jul 17, 2023
979cc50
[DE] localize Cluster (#2208)
iamNoah1 Jul 18, 2023
bee0f34
Merge branch 'main' into dev-de
iamNoah1 Aug 16, 2023
b03dbb5
Merge pull request #2304 from iamNoah1/dev-de
seokho-son Aug 17, 2023
2bba101
set status to completed
iamNoah1 Aug 19, 2023
a015a2a
Merge pull request #2315 from iamNoah1/dev-de
DaveVentura Aug 23, 2023
28b4ab5
Merge pull request #2422 from cncf/main
iamNoah1 Sep 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -26,11 +26,14 @@
# Approvers for Italian contents
/content/it/ @fsbaraglia @meryem-ldn @annalisag-spark @sistella

# Owners of Arabic contents
/content/ar/ @TarekMSayed @same7ammar @AShabana @hacktron95
# Approvers for Arabic contents
/content/ar/ @TarekMSayed @same7ammar @AShabana @arezk84

# Owners of Bengali contents
/content/bn/ @mitul3737 @Mouly22 @ikramulkayes
# Approvers for Bengali contents
/content/bn/ @mitul3737 @Mouly22 @ikramulkayes @Imtiaz1234

# Owners of Spanish contents
/content/es/ @CathPag @raelga @electrocucaracha
# Approvers for Spanish contents
/content/es/ @raelga @electrocucaracha @krol3

# Approvers for Chinese contents
/content/zh-cn/ @hanyuancheung @Jacob953 @Rocksnake @Submarinee
52 changes: 51 additions & 1 deletion config.toml
Original file line number Diff line number Diff line change
@@ -67,12 +67,62 @@ weight = 1
#time_format_default = "02.01.2006"
#time_format_blog = "02.01.2006"


Copy link
Collaborator

Choose a reason for hiding this comment

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

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.

[languages.hi]
title = "क्लाउड नेटिव शब्दावली"
description = "CNCF क्लाउड नेटिव शब्दावली परियोजना का उद्देश्य क्लाउड नेटिव एप्लिकेशन के बारे में बात करते समय प्रयोग किए जाने वाले सामान्य शब्दों के संदर्भ के रूप में उपयोग किया जाना है।"
languageName ="हिन्दी(Hindi)"
contentDir = "content/hi"
weight = 2

[languages.pt-br]
title = "Glossário Cloud Native"
description = "O Projeto CNCF Glossário Cloud Native se destina a ser usado como uma referência para termos comuns usados ao falar sobre aplicações nativas de nuvem."
languageName = "Português"
contentDir = "content/pt-br"
weight = 3

[languages.it]
title = "Glossario Cloud Native"
description = "Il progetto del Glossario CNCF Cloud Native è pensato per essere un riferimento per i termini comuni, usati nell'ambito delle applicazioni cloud native."
languageName = "Italiano"
contentDir = "content/it"
weight = 4

[languages.ko]
title = "클라우드 네이티브(Cloud Native) 용어집"
description = "CNCF 클라우드 네이티브 용어집 프로젝트는 클라우드 네이티브 애플리케이션을 주제로 대화를 나눌 때 참조할 수 있는 공통의 용어 제공을 목표로 한다."
languageName ="한국어(Korean)"
contentDir = "content/ko"
weight = 5

[languages.es]
title = "Cloud Native Glosario"
description = "El proyecto de CNCF Cloud Native Glosario pretende ser usado como una referencia para los terminos comunes usados cuando se habla acerca de las aplicaciones nativas para la nube."
languageName ="Español(Spanish)"
contentDir = "content/es"
weight = 6

[languages.zh-cn]
title = "Cloud Native(云原生) Glossary"
description = "CNCF 云原生 Glossary 项目旨在用作讨论云原生应用程序时常用术语的参考"
languageName ="中文(Chinese)"
contentDir = "content/zh-cn"
weight = 7

[languages.bn]
title = "ক্লাউড নেটিভ শব্দকোষ"
description = "CNCF ক্লাউড নেটিভ শব্দকোষ প্রকল্পটি ক্লাউড নেটিভ অ্যাপ্লিকেশন সম্পর্কে কথা বলার সময় ব্যবহৃত সাধারণ পদগুলির জন্য একটি রেফারেন্স হিসাবে ব্যবহার করার উদ্দেশ্যে।"
languageName = "বাংলা(Bengali)"
contentDir = "content/bn"
weight = 8

[languages.de]
title = "Cloud Native Glossar"
description = "Das CNCF Cloud Native Glossar soll als Referenz für gängige Begriffe dienen, die im Zusammenhang mit Cloud Native Anwendungen verwendet werden."
languageName ="Deutsch"
contentDir = "content/de"
weight = 3
weight = 9


[markup]