Skip to content

K
k3s
Commit 018f8cfd authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46339 from xilabao/fix-kubectl

Automatic merge from submit-queue (batch tested with PRs 46782, 46719, 46339, 46609, 46494) update default translation of annotations **What this PR does / why we need it**: ``` using the local cluster. the help of kubectl is not corrent # ./cluster/kubectl.sh ....... Settings Commands: label Update the labels on a resource annotate Update the annotations on a resourcewatch is only supported on individual resources and resource collections - %d resources were found completion Output shell completion code for the specified shell (bash or zsh) Other Commands: api-versions Print the supported API versions on the server, in the form of "group/version" config Modify kubeconfig files help Help about any command plugin Runs a command-line plugin version Print the client and server version information Use "kubectl <command> --help" for more information about a given command. Use "kubectl options" for a list of global command-line options (applies to all commands). ``` **Which issue this PR fixes**: **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents ea5e6bce 09efc99f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
pkg/generated/bindata.go
View file @ 018f8cfd
This source diff could not be displayed because it is too large. You can view the blob instead.
translations/kubectl/default/LC_MESSAGES/k8s.po
View file @ 018f8cfd
...@@ -8,14 +8,14 @@ msgstr "" ...@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: gettext-go-examples-hello\n" "Project-Id-Version: gettext-go-examples-hello\n"
"Report-Msgid-Bugs-To: EMAIL\n" "Report-Msgid-Bugs-To: EMAIL\n"
"POT-Creation-Date: 2017-03-14 21:32-0700\n" "POT-Creation-Date: 2017-03-14 21:32-0700\n"
"PO-Revision-Date: 2017-03-14 21:34-0800\n" "PO-Revision-Date: 2017-05-24 18:01+0800\n"
"Last-Translator: Brendan Burns <brendan.d.burns@gmail.com>\n" "Last-Translator: Brendan Burns <brendan.d.burns@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: en\n" "Language: en\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n" "X-Generator: Poedit 1.8.12\n"
"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SourceCharset: UTF-8\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
...@@ -3379,9 +3379,7 @@ msgstr "Update resource requests/limits on objects with pod templates" ...@@ -3379,9 +3379,7 @@ msgstr "Update resource requests/limits on objects with pod templates"
#: pkg/kubectl/cmd/annotate.go:116 #: pkg/kubectl/cmd/annotate.go:116
msgid "Update the annotations on a resource" msgid "Update the annotations on a resource"
msgstr "" msgstr "Update the annotations on a resource"
"Update the annotations on a resourcewatch is only supported on individual "
"resources and resource collections - %d resources were found"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/label.go#L109 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/label.go#L109
#: pkg/kubectl/cmd/label.go:114 #: pkg/kubectl/cmd/label.go:114
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment