diff --git a/translations/kubectl/ja_JP/LC_MESSAGES/k8s.mo b/translations/kubectl/ja_JP/LC_MESSAGES/k8s.mo
index ea414503961..40a00818bb4 100644
Binary files a/translations/kubectl/ja_JP/LC_MESSAGES/k8s.mo and b/translations/kubectl/ja_JP/LC_MESSAGES/k8s.mo differ
diff --git a/translations/kubectl/ja_JP/LC_MESSAGES/k8s.po b/translations/kubectl/ja_JP/LC_MESSAGES/k8s.po
index d17825b73fd..d6fd26333ed 100644
--- a/translations/kubectl/ja_JP/LC_MESSAGES/k8s.po
+++ b/translations/kubectl/ja_JP/LC_MESSAGES/k8s.po
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.2.4\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: pkg/kubectl/cmd/create_clusterrolebinding.go:35
 msgid ""
@@ -724,32 +724,36 @@ msgstr ""
 #: pkg/kubectl/cmd/portforward.go:53
 msgid ""
 "\n"
-"\t\t# Listen on ports 5000 and 6000 locally, forwarding data to/from ports "
-"5000 and 6000 in the pod\n"
-"\t\tkubectl port-forward mypod 5000 6000\n"
+"\t\t# Listen on ports 5000 and 6000 locally, forwarding data to/from ports 5000 and 6000 in the pod"
+"\t\tkubectl port-forward pod/mypod 5000 6000"
 "\n"
-"\t\t# Listen on port 8888 locally, forwarding to 5000 in the pod\n"
-"\t\tkubectl port-forward mypod 8888:5000\n"
+"\t\t# Listen on ports 5000 and 6000 locally, forwarding data to/from ports 5000 and 6000 in a pod selected by the deployment"
+"\t\tkubectl port-forward deployment/mydeployment 5000 6000"
 "\n"
-"\t\t# Listen on a random port locally, forwarding to 5000 in the pod\n"
-"\t\tkubectl port-forward mypod :5000\n"
+"\t\t# Listen on ports 5000 and 6000 locally, forwarding data to/from ports 5000 and 6000 in a pod selected by the service"
+"\t\tkubectl port-forward service/myservice 5000 6000"
 "\n"
-"\t\t# Listen on a random port locally, forwarding to 5000 in the pod\n"
-"\t\tkubectl port-forward mypod 0:5000"
+"\t\t# Listen on port 8888 locally, forwarding to 5000 in the pod"
+"\t\tkubectl port-forward pod/mypod 8888:5000"
+"\n"
+"\t\t# Listen on a random port locally, forwarding to 5000 in the pod"
+"\t\tkubectl port-forward pod/mypod :5000"
 msgstr ""
 "\n"
-"\t\t# Listen on ports 5000 and 6000 locally, forwarding data to/from ports "
-"5000 and 6000 in the pod\n"
-"\t\tkubectl port-forward mypod 5000 6000\n"
+"\t\t# Listen on ports 5000 and 6000 locally, forwarding data to/from ports 5000 and 6000 in the pod"
+"\t\tkubectl port-forward pod/mypod 5000 6000"
 "\n"
-"\t\t# Listen on port 8888 locally, forwarding to 5000 in the pod\n"
-"\t\tkubectl port-forward mypod 8888:5000\n"
+"\t\t# Listen on ports 5000 and 6000 locally, forwarding data to/from ports 5000 and 6000 in a pod selected by the deployment"
+"\t\tkubectl port-forward deployment/mydeployment 5000 6000"
 "\n"
-"\t\t# Listen on a random port locally, forwarding to 5000 in the pod\n"
-"\t\tkubectl port-forward mypod :5000\n"
+"\t\t# Listen on ports 5000 and 6000 locally, forwarding data to/from ports 5000 and 6000 in a pod selected by the service"
+"\t\tkubectl port-forward service/myservice 5000 6000"
 "\n"
-"\t\t# Listen on a random port locally, forwarding to 5000 in the pod\n"
-"\t\tkubectl port-forward mypod 0:5000"
+"\t\t# Listen on port 8888 locally, forwarding to 5000 in the pod"
+"\t\tkubectl port-forward pod/mypod 8888:5000"
+"\n"
+"\t\t# Listen on a random port locally, forwarding to 5000 in the pod"
+"\t\tkubectl port-forward pod/mypod :5000"
 
 #: pkg/kubectl/cmd/drain.go:118
 msgid ""
@@ -1031,7 +1035,7 @@ msgstr ""
 "\n"
 "\t\t# Set the last-applied-configuration of a resource to match the contents "
 "of a file, will create the annotation if it does not already exist.\n"
-"\t\tkubectl apply set-last-applied -f deploy.yaml —create-annotation=true\n"
+"\t\tkubectl apply set-last-applied -f deploy.yaml --create-annotation=true\n"
 "\t\t"
 
 #: pkg/kubectl/cmd/top_pod.go:61
@@ -1054,10 +1058,10 @@ msgstr ""
 "\t\tkubectl top pod\n"
 "\n"
 "\t\t# Show metrics for all pods in the given namespace\n"
-"\t\tkubectl top pod —namespace=NAMESPACE\n"
+"\t\tkubectl top pod --namespace=NAMESPACE\n"
 "\n"
 "\t\t# Show metrics for a given pod and its containers\n"
-"\t\tkubectl top pod POD_NAME —containers\n"
+"\t\tkubectl top pod POD_NAME --containers\n"
 "\n"
 "\t\t# Show metrics for the pods defined by label name=myLabel\n"
 "\t\tkubectl top pod -l name=myLabel"
@@ -2825,12 +2829,12 @@ msgstr ""
 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/delete_cluster.go#L38
 #: pkg/kubectl/cmd/config/delete_cluster.go:39
 msgid "Delete the specified cluster from the kubeconfig"
-msgstr "kubeconfigから指定したクラスターを削除する"
+msgstr "指定したコンテキストをkubeconfigから削除する"
 
 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/delete_context.go#L38
 #: pkg/kubectl/cmd/config/delete_context.go:39
 msgid "Delete the specified context from the kubeconfig"
-msgstr "kubeconfigから指定したコンテキストを削除する"
+msgstr "指定したコンテキストをkubeconfigから削除する"
 
 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/certificates.go#L121
 #: pkg/kubectl/cmd/certificates.go:122