Rebase dev-ja from main branch

[naonishijima]

Describe your changes

Rebase dev-ja from main branch and manual fix a conflict.

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".

[naonishijima]

Maybe config.toml is conflict a file but I can't find a conflict place in Files changed. What should I do?

[kaitoii11]

Maybe config.toml is conflict a file but I can't find a conflict place in Files changed. What should I do?

Looking at the file locally, we need to resolve the below. And maybe we need to fix the weight as well?

@@@ -140,12 -141,21 +141,30 @@@ weight = 1
  [languages.ur.params]
  description = "CNCF کلاؤڈ کی مقامی لغت کا مقصد کلاؤڈ مقامی ایپلی کیشنز کے بارے میں بات کرتے وقت استعمال ہونے والی عام اصطلاحات کے حوالے کے طور پر استعمال کرنا ہے۔"

++<<<<<<< HEAD
 +[languages.ja]
 +title = "クラウドネイティブ用語集"
 +description = "CNCF クラウドネイティブ用語集プロジェクトは、クラウドネイティブアプリケーションについて話すときに使われる一般的な用語のリファレンスとして使用することを目的としています。"
 +languageName ="日本語 (Japanese)"
 +contentDir = "content/ja"
 +weight = 11
++=======
+ [languages.fr]
+ title = "Glossaire Cloud Native"
+ languageName ="Français (French)"
+ contentDir = "content/fr"
+ weight = 11
+ [languages.fr.params]
+ description = "Le projet de Glossaire CNCF Cloud Native a pour objectif de référencer les termes courants utilisés dans les différentes applications Cloud Natives."
+
+ [languages.zh-tw]
+ title = "Cloud Native(雲端原生) Glossary"
+ languageName ="繁體中文 (Traditional Chinese)"
+ contentDir = "content/zh-tw"
+ weight = 12
+ [languages.zh-tw.params]
+ description = "CNCF 雲端原生 Glossary 專案旨在用作討論雲端原生應用程式時常用術語的參考"
++>>>>>>> main

[naonishijima]

@kaitoii11 Thank you for advice!
I was trying to fix a conflict following the "use the command line" instruction. however I got the following error when I pushed. Perhaps something is wrong.

# git push -u origin main
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 8 threads
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 819 bytes | 819.00 KiB/s, done.
Total 5 (delta 4), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/main.
remote: error: Waiting on code owner review from caniszczyk, iamNoah1, inductor, jihoon-seo, kaitoii11, nate-double-u, seokho-so
n, and/or yuichi-nakamura. You're not authorized to push to this branch. Visit https://docs.github.com/articles/about-protected-
branches/ for more information.
To https://github.com/cncf/glossary.git
 ! [remote rejected] main -> main (protected branch hook declined)
error: failed to push some refs to 'https://github.com/cncf/glossary.git'

[kaitoii11]

I don't think you can push to main branch directly. You might want to fix changes on dev-ja branch.

[seokho-son]

Hi @naonishijima @kaitoii11
To help the Ja team, I've opened a PR that hopefully resolves the conflict here.

#2704

[kaitoii11]

Still having a merge conflict, unfortunately.

[naonishijima]

Do we need to create a new PR?

[seokho-son]

Let's close this PR since this PR cannot resolve merge conflict.
We can use #2738 :)