Merge pull request #103522 from atiratree/fix-translations-location

fix translations location in update-translations.sh

hack/update-translations.sh

@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This script updates `translations/kubectl/template.pot` for
-# `pkg/kubectl/cmd/*.go pkg/kubectl/cmd/*/*.go`.
+# This script updates `staging/src/k8s.io/kubectl/pkg/util/i18n/translations/kubectl/template.pot` and
+# generates/fixes .po and .mo files.
 # Usage: `update-translations.sh`.
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
@@ -98,15 +98,15 @@ fi
 if [[ "${fix_translations}" == "true" ]]; then
   echo "Fixing .po files"
   kube::util::ensure-temp-dir
-  for PO_FILE in translations/kubectl/*/LC_MESSAGES/k8s.po; do
+  for PO_FILE in "${TRANSLATIONS}"/kubectl/*/LC_MESSAGES/k8s.po; do
     TMP="${KUBE_TEMP}/fix.po"
     if [[ "${PO_FILE}" =~ .*/default/.* || "${PO_FILE}" =~ .*/en_US/.*  ]]; then
       # mark obsolete, and set default values for english translations
-      msgen translations/kubectl/template.pot | \
+      msgen "${TRANSLATIONS}/kubectl/template.pot" | \
         msgmerge -s --no-fuzzy-matching "${PO_FILE}" - > "${TMP}"
     else
       # mark obsolete, but do not add untranslated messages
-      msgmerge -s --no-fuzzy-matching "${PO_FILE}" translations/kubectl/template.pot | msgattrib --translated - > "${TMP}"
+      msgmerge -s --no-fuzzy-matching "${PO_FILE}" "${TRANSLATIONS}/kubectl/template.pot" | msgattrib --translated - > "${TMP}"
     fi
     mv "${TMP}" "${PO_FILE}"
   done

staging/src/k8s.io/kubectl/pkg/util/i18n/translations/kubectl/fr_FR/LC_MESSAGES/k8s.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-go-examples-hello\n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2021-05-17 15:40+0200\n"
+"POT-Creation-Date: 2021-07-07 20:15+0200\n"
 "PO-Revision-Date: 2017-01-29 22:54-0800\n"
 "Last-Translator: Brendan Burns <brendan.d.burns@gmail.com>\n"
 "Language-Team: \n"
@@ -19,21 +19,12 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/apply.go#L98
-#: staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go:173
-msgid "Apply a configuration to a resource by filename or stdin"
-msgstr ""
-"Appliquer une configuration à une ressource par nom de fichier ou depuis "
-"stdin"
-
 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/delete_cluster.go#L38
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster.go:41
 #: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster.go:42
 msgid "Delete the specified cluster from the kubeconfig"
 msgstr "Supprimer le cluster spécifié du kubeconfig"
 
 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/delete_context.go#L38
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context.go:41
 #: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context.go:42
 msgid "Delete the specified context from the kubeconfig"
 msgstr "Supprimer le contexte spécifié du kubeconfig"
@@ -55,50 +46,49 @@ msgstr ""
 "Afficher les paramètres fusionnés de kubeconfig ou d'un fichier kubeconfig "
 "spécifié"
 
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/current_context.go#L48
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/current_context.go:51
-msgid "Displays the current-context"
-msgstr "Affiche le contexte actuel"
-
 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/config.go#L39
 #: staging/src/k8s.io/kubectl/pkg/cmd/config/config.go:42
 msgid "Modify kubeconfig files"
 msgstr "Modifier des fichiers kubeconfig"
 
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_cluster.go#L67
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/create_cluster.go:73
-msgid "Sets a cluster entry in kubeconfig"
-msgstr "Définit un cluster dans kubeconfig"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_context.go#L57
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/create_context.go:61
-msgid "Sets a context entry in kubeconfig"
-msgstr "Définit un contexte dans kubeconfig"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_authinfo.go#L103
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go:152
-msgid "Sets a user entry in kubeconfig"
-msgstr "Définit un utilisateur dans kubeconfig"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/set.go#L59
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/set.go:74
-msgid "Sets an individual value in a kubeconfig file"
-msgstr "Définit une valeur individuelle dans un fichier kubeconfig"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/use_context.go#L48
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/use_context.go:51
-msgid "Sets the current-context in a kubeconfig file"
-msgstr "Définit le contexte courant dans un fichier kubeconfig"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/unset.go#L47
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/unset.go:59
-msgid "Unsets an individual value in a kubeconfig file"
-msgstr "Supprime une valeur individuelle dans un fichier kubeconfig"
-
-#: staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go:134
+#: staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go:135
 msgid "Update the annotations on a resource"
 msgstr "Mettre à jour les annotations d'une ressource"
 
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/apply.go#L98
+#~ msgid "Apply a configuration to a resource by filename or stdin"
+#~ msgstr ""
+#~ "Appliquer une configuration à une ressource par nom de fichier ou depuis "
+#~ "stdin"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/current_context.go#L48
+#~ msgid "Displays the current-context"
+#~ msgstr "Affiche le contexte actuel"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_cluster.go#L67
+#~ msgid "Sets a cluster entry in kubeconfig"
+#~ msgstr "Définit un cluster dans kubeconfig"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_context.go#L57
+#~ msgid "Sets a context entry in kubeconfig"
+#~ msgstr "Définit un contexte dans kubeconfig"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_authinfo.go#L103
+#~ msgid "Sets a user entry in kubeconfig"
+#~ msgstr "Définit un utilisateur dans kubeconfig"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/set.go#L59
+#~ msgid "Sets an individual value in a kubeconfig file"
+#~ msgstr "Définit une valeur individuelle dans un fichier kubeconfig"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/use_context.go#L48
+#~ msgid "Sets the current-context in a kubeconfig file"
+#~ msgstr "Définit le contexte courant dans un fichier kubeconfig"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/unset.go#L47
+#~ msgid "Unsets an individual value in a kubeconfig file"
+#~ msgstr "Supprime une valeur individuelle dans un fichier kubeconfig"
+
 #~ msgid ""
 #~ "watch is only supported on individual resources and resource collections "
 #~ "- %d resources were found"

staging/src/k8s.io/kubectl/pkg/util/i18n/translations/kubectl/ko_KR/LC_MESSAGES/k8s.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-go-examples-hello\n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2021-05-17 15:40+0200\n"
+"POT-Creation-Date: 2021-07-07 20:15+0200\n"
 "PO-Revision-Date: 2018-04-03 06:05+0900\n"
 "Last-Translator: Ian Y. Choi <ianyrchoi@gmail.com>\n"
 "Language-Team: \n"
@@ -19,19 +19,12 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-# https://github.com/kubernetes/kubernetes/blob/masterpkg/kubectl/cmd/apply.go#L98
-#: staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go:173
-msgid "Apply a configuration to a resource by filename or stdin"
-msgstr "구성을 파일 이름 또는 stdin에 의한 자원에 적용합니다"
-
 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/delete_cluster.go#L38
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster.go:41
 #: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster.go:42
 msgid "Delete the specified cluster from the kubeconfig"
 msgstr "kubeconfig에서 지정된 클러스터를 삭제합니다"
 
 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/delete_context.go#L38
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context.go:41
 #: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context.go:42
 msgid "Delete the specified context from the kubeconfig"
 msgstr "kubeconfig에서 지정된 컨텍스트를 삭제합니다"
@@ -51,50 +44,47 @@ msgstr "kubeconfig에 정의된 클러스터를 표시합니다"
 msgid "Display merged kubeconfig settings or a specified kubeconfig file"
 msgstr "병합된 kubeconfig 설정 또는 지정된 kubeconfig 파일을 표시합니다"
 
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/current_context.go#L48
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/current_context.go:51
-msgid "Displays the current-context"
-msgstr "현재-컨텍스트를 표시합니다"
-
 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/config.go#L39
 #: staging/src/k8s.io/kubectl/pkg/cmd/config/config.go:42
 msgid "Modify kubeconfig files"
 msgstr "kubeconfig 파일을 수정합니다"
 
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_cluster.go#L67
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/create_cluster.go:73
-msgid "Sets a cluster entry in kubeconfig"
-msgstr "kubeconfig에서 클러스터 항목을 설정합니다"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_context.go#L57
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/create_context.go:61
-msgid "Sets a context entry in kubeconfig"
-msgstr "kubeconfig에서 컨텍스트 항목을 설정합니다"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_authinfo.go#L103
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go:152
-msgid "Sets a user entry in kubeconfig"
-msgstr "kubeconfig에서 사용자 항목을 설정합니다"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/set.go#L59
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/set.go:74
-msgid "Sets an individual value in a kubeconfig file"
-msgstr "kubeconfig 파일에서 단일값을 설정합니다"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/use_context.go#L48
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/use_context.go:51
-msgid "Sets the current-context in a kubeconfig file"
-msgstr "kubeconfig 파일에서 현재-컨텍스트를 설정합니다"
-
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/unset.go#L47
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/unset.go:59
-msgid "Unsets an individual value in a kubeconfig file"
-msgstr "kubeconfig 파일에서 단일값 설정을 해제합니다"
-
-#: staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go:134
+#: staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go:135
 msgid "Update the annotations on a resource"
 msgstr "자원에 대한 주석을 업데이트합니다"
 
+# https://github.com/kubernetes/kubernetes/blob/masterpkg/kubectl/cmd/apply.go#L98
+#~ msgid "Apply a configuration to a resource by filename or stdin"
+#~ msgstr "구성을 파일 이름 또는 stdin에 의한 자원에 적용합니다"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/current_context.go#L48
+#~ msgid "Displays the current-context"
+#~ msgstr "현재-컨텍스트를 표시합니다"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_cluster.go#L67
+#~ msgid "Sets a cluster entry in kubeconfig"
+#~ msgstr "kubeconfig에서 클러스터 항목을 설정합니다"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_context.go#L57
+#~ msgid "Sets a context entry in kubeconfig"
+#~ msgstr "kubeconfig에서 컨텍스트 항목을 설정합니다"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/create_authinfo.go#L103
+#~ msgid "Sets a user entry in kubeconfig"
+#~ msgstr "kubeconfig에서 사용자 항목을 설정합니다"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/set.go#L59
+#~ msgid "Sets an individual value in a kubeconfig file"
+#~ msgstr "kubeconfig 파일에서 단일값을 설정합니다"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/use_context.go#L48
+#~ msgid "Sets the current-context in a kubeconfig file"
+#~ msgstr "kubeconfig 파일에서 현재-컨텍스트를 설정합니다"
+
+# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/unset.go#L47
+#~ msgid "Unsets an individual value in a kubeconfig file"
+#~ msgstr "kubeconfig 파일에서 단일값 설정을 해제합니다"
+
 #~ msgid ""
 #~ "watch is only supported on individual resources and resource collections "
 #~ "- %d resources were found"

staging/src/k8s.io/kubectl/pkg/util/i18n/translations/kubectl/zh_TW/LC_MESSAGES/k8s.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-world\n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2021-05-17 15:40+0200\n"
+"POT-Creation-Date: 2021-07-07 20:15+0200\n"
 "PO-Revision-Date: 2017-06-02 09:13+0800\n"
 "Last-Translator: William Chang <warmchang@outlook.com>\n"
 "Language-Team: \n"
@@ -19,16 +19,10 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go:173
-msgid "Apply a configuration to a resource by filename or stdin"
-msgstr "通過檔案名或標準輸入流(stdin)對資源進行配置"
-
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster.go:41
 #: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster.go:42
 msgid "Delete the specified cluster from the kubeconfig"
 msgstr "刪除 kubeconfig 檔案中指定的叢集(cluster)"
 
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context.go:41
 #: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context.go:42
 msgid "Delete the specified context from the kubeconfig"
 msgstr "刪除 kubeconfig 檔案中指定的 context"
@@ -45,42 +39,38 @@ msgstr "顯示 kubeconfig 檔案中定義的叢集(cluster)"
 msgid "Display merged kubeconfig settings or a specified kubeconfig file"
 msgstr "顯示合併的 kubeconfig 配置或一個指定的 kubeconfig 檔案"
 
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/current_context.go:51
-msgid "Displays the current-context"
-msgstr "顯示目前的 context"
-
 #: staging/src/k8s.io/kubectl/pkg/cmd/config/config.go:42
 msgid "Modify kubeconfig files"
 msgstr "修改 kubeconfig 檔案"
 
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/create_cluster.go:73
-msgid "Sets a cluster entry in kubeconfig"
-msgstr "設置 kubeconfig 檔案中的一個叢集(cluster)條目"
-
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/create_context.go:61
-msgid "Sets a context entry in kubeconfig"
-msgstr "設置 kubeconfig 檔案中的一個 context 條目"
-
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go:152
-msgid "Sets a user entry in kubeconfig"
-msgstr "設置 kubeconfig 檔案中的一個使用者條目"
-
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/set.go:74
-msgid "Sets an individual value in a kubeconfig file"
-msgstr "設置 kubeconfig 檔案中的一個值"
-
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/use_context.go:51
-msgid "Sets the current-context in a kubeconfig file"
-msgstr "設置 kubeconfig 檔案中的目前 context"
-
-#: staging/src/k8s.io/kubectl/pkg/cmd/config/unset.go:59
-msgid "Unsets an individual value in a kubeconfig file"
-msgstr "取消設置 kubeconfig 檔案中的一個值"
-
-#: staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go:134
+#: staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go:135
 msgid "Update the annotations on a resource"
 msgstr "更新一個資源的注解(annotations)"
 
+#~ msgid "Apply a configuration to a resource by filename or stdin"
+#~ msgstr "通過檔案名或標準輸入流(stdin)對資源進行配置"
+
+#~ msgid "Displays the current-context"
+#~ msgstr "顯示目前的 context"
+
+#~ msgid "Sets a cluster entry in kubeconfig"
+#~ msgstr "設置 kubeconfig 檔案中的一個叢集(cluster)條目"
+
+#~ msgid "Sets a context entry in kubeconfig"
+#~ msgstr "設置 kubeconfig 檔案中的一個 context 條目"
+
+#~ msgid "Sets a user entry in kubeconfig"
+#~ msgstr "設置 kubeconfig 檔案中的一個使用者條目"
+
+#~ msgid "Sets an individual value in a kubeconfig file"
+#~ msgstr "設置 kubeconfig 檔案中的一個值"
+
+#~ msgid "Sets the current-context in a kubeconfig file"
+#~ msgstr "設置 kubeconfig 檔案中的目前 context"
+
+#~ msgid "Unsets an individual value in a kubeconfig file"
+#~ msgstr "取消設置 kubeconfig 檔案中的一個值"
+
 #~ msgid ""
 #~ "watch is only supported on individual resources and resource collections "
 #~ "- %d resources were found"