diff --git a/content/en/blog/_posts/2019-04-26-latest-on-localization.md b/content/en/blog/_posts/2019-04-26-latest-on-localization.md index 8e6176a8ce..98f1d74706 100644 --- a/content/en/blog/_posts/2019-04-26-latest-on-localization.md +++ b/content/en/blog/_posts/2019-04-26-latest-on-localization.md @@ -8,7 +8,7 @@ date: 2019-04-26 Last year we optimized the Kubernetes website for [hosting multilingual content](/blog/2018/11/08/kubernetes-docs-updates-international-edition/). Contributors responded by adding multiple new localizations: as of April 2019, Kubernetes docs are partially available in nine different languages, with six added in 2019 alone. You can see a list of available languages in the language selector at the top of each page. -By _partially available_, I mean that localizations are ongoing projects. They range from mostly complete ([Chinese docs for 1.12](https://v1-12.docs.kubernetes.io/zh/)) to brand new (1.14 docs in [Portuguese](https://kubernetes.io/pt/)). If you're interested in helping an existing localization, read on! +By _partially available_, I mean that localizations are ongoing projects. They range from mostly complete ([Chinese docs for 1.12](https://v1-12.docs.kubernetes.io/zh-cn/)) to brand new (1.14 docs in [Portuguese](https://kubernetes.io/pt/)). If you're interested in helping an existing localization, read on! ## What is a localization? diff --git a/content/zh-cn/docs/home/_index.md b/content/zh-cn/docs/home/_index.md index ee0aaf68d7..738ee19bb4 100644 --- a/content/zh-cn/docs/home/_index.md +++ b/content/zh-cn/docs/home/_index.md @@ -62,7 +62,7 @@ overview: # title: K8s Release Notes # description: If you are installing Kubernetes or upgrading to the newest version, refer to the current release notes. # button: "Download Kubernetes" -# button_path: "/zh/docs/setup/release/notes" +# button_path: "/zh-cn/docs/setup/release/notes" # - name: about # title: About the documentation # description: This website contains documentation for the current and previous 4 versions of Kubernetes. @@ -71,37 +71,37 @@ cards: title: "了解 Kubernetes" description: "了解 Kubernetes 和其基础概念。" button: "查看概念" - button_path: "/zh/docs/concepts" + button_path: "/zh-cn/docs/concepts" - name: tutorials title: "尝试 Kubernetes" description: "按照教程学习如何在 Kubernetes 上部署应用。" button: "查看教程" - button_path: "/zh/docs/tutorials" + button_path: "/zh-cn/docs/tutorials" - name: setup title: "设置 K8s 集群" description: "按照你的资源情况和需求运行 Kubernetes。" button: "设置 Kubernetes" - button_path: "/zh/docs/setup" + button_path: "/zh-cn/docs/setup" - name: tasks title: "了解如何使用 Kubernetes" description: "查看常见任务以及如何使用简单步骤执行它们。" button: "查看任务" - button_path: "/zh/docs/tasks" + button_path: "/zh-cn/docs/tasks" - name: training title: "培训" description: "通过 Kubernetes 认证，助你的云原生项目成功！" button: "查看培训" - button_path: "/zh/training" + button_path: "/zh-cn/training" - name: reference title: 查阅参考信息 description: 浏览术语、命令行语法、API 资源类型和安装工具文档。 button: 查看参考 - button_path: /zh/docs/reference + button_path: /zh-cn/docs/reference - name: contribute title: 为文档作贡献 description: 任何人，无论对该项目熟悉与否，都能贡献自己的力量。 button: 为文档作贡献 - button_path: /zh/docs/contribute + button_path: /zh-cn/docs/contribute - name: release-notes title: K8s 发布说明 description: 如果你正在安装或升级 Kubernetes，最好参考最新的发布说明。 diff --git a/content/zh-cn/docs/home/supported-doc-versions.md b/content/zh-cn/docs/home/supported-doc-versions.md index d455a039a3..6fc4dcf339 100644 --- a/content/zh-cn/docs/home/supported-doc-versions.md +++ b/content/zh-cn/docs/home/supported-doc-versions.md @@ -31,4 +31,4 @@ which versions of Kubernetes are officially supported, and for how long. 本网站包含当前版本和之前四个版本的 Kubernetes 文档。 Kubernetes 版本的文档可用性与当前是否支持该版本是分开的。 -阅读[支持期限](/zh/releases/patch-releases/#support-period)，了解官方支持 Kubernetes 的哪些版本，以及支持多长时间。 +阅读[支持期限](/zh-cn/releases/patch-releases/#support-period)，了解官方支持 Kubernetes 的哪些版本，以及支持多长时间。 diff --git a/content/zh-cn/docs/test.md b/content/zh-cn/docs/test.md index 9642299b5d..404dfb9d68 100644 --- a/content/zh-cn/docs/test.md +++ b/content/zh-cn/docs/test.md @@ -503,10 +503,10 @@ You can also use HTML, but it is not preferred. - 指向 Kubernetes 文档的站内链接，需要在英文链接之前添加前缀 `/zh`。 例如，原链接目标为 `/docs/foo/bar` 时，译文中的链接目标应为 - `/zh/docs/foo/bar`。例如： + `/zh-cn/docs/foo/bar`。例如： - 英文版本链接 [Kubernetes Components](/docs/concepts/overview/components/) - - 对应中文链接 [Kubernetes 组件](/zh/docs/concepts/overview/components/) + - 对应中文链接 [Kubernetes 组件](/zh-cn/docs/concepts/overview/components/) - 英文页面子标题会生成对应锚点（Anchor），例如子标题 `## Using object` 会生成 对应标签 `#using-objects`。在翻译为中文之后，对应锚点可能会失效。对此，有 diff --git a/content/zh-cn/includes/default-storage-class-prereqs.md b/content/zh-cn/includes/default-storage-class-prereqs.md index 63a27a0d40..0dbea685dc 100644 --- a/content/zh-cn/includes/default-storage-class-prereqs.md +++ b/content/zh-cn/includes/default-storage-class-prereqs.md @@ -1,7 +1,7 @@ -你需要有一个带有默认 [StorageClass](/zh/docs/concepts/storage/storage-classes/)的 -[动态 PersistentVolume 供应程序](/zh/docs/concepts/storage/dynamic-provisioning/)， -或者自己[静态的提供 PersistentVolume](/zh/docs/concepts/storage/persistent-volumes/#provisioning) -来满足这里使用的 [PersistentVolumeClaim](/zh/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims)。 +你需要有一个带有默认 [StorageClass](/zh-cn/docs/concepts/storage/storage-classes/)的 +[动态 PersistentVolume 供应程序](/zh-cn/docs/concepts/storage/dynamic-provisioning/)， +或者自己[静态的提供 PersistentVolume](/zh-cn/docs/concepts/storage/persistent-volumes/#provisioning) +来满足这里使用的 [PersistentVolumeClaim](/zh-cn/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims)。 -Kubernetes文档中[用户指南](/zh/docs/user-guide/)部分中的主题被移动到 -[任务](/zh/docs/tasks/)、[教程](/zh/docs/tutorials/)和[概念](/zh/docs/concepts)节。 +Kubernetes文档中[用户指南](/zh-cn/docs/user-guide/)部分中的主题被移动到 +[任务](/zh-cn/docs/tasks/)、[教程](/zh-cn/docs/tutorials/)和[概念](/zh-cn/docs/concepts)节。 本主题内容已移至: diff --git a/content/zh-cn/releases/_index.md b/content/zh-cn/releases/_index.md index 721366fde3..dc89e9f03a 100644 --- a/content/zh-cn/releases/_index.md +++ b/content/zh-cn/releases/_index.md @@ -16,7 +16,7 @@ type: docs The Kubernetes project maintains release branches for the most recent three minor releases ({{< skew currentVersion >}}, {{< skew currentVersionAddMinor -1 >}}, {{< skew currentVersionAddMinor -2 >}}). Kubernetes 1.19 and newer receive [approximately 1 year of patch support](/releases/patch-releases/#support-period). Kubernetes 1.18 and older received approximately 9 months of patch support. --> Kubernetes 项目维护最近三个次要版本（{{< skew currentVersion >}}、{{< skew currentVersionAddMinor -1 >}}、{{< skew currentVersionAddMinor -2 >}}）的发布分支。 -Kubernetes 1.19 和更新版本获得[大约 1 年的补丁支持](/zh/releases/patch-releases/#support-period)。 +Kubernetes 1.19 和更新版本获得[大约 1 年的补丁支持](/zh-cn/releases/patch-releases/#support-period)。 Kubernetes 1.18 及更早版本获得了大约 9 个月的补丁支持周期。 diff --git a/content/zh-cn/releases/download.md b/content/zh-cn/releases/download.md index 93837d2c29..c05432d80d 100644 --- a/content/zh-cn/releases/download.md +++ b/content/zh-cn/releases/download.md @@ -119,7 +119,7 @@ To manually verify signed container images of Kubernetes core components, refer --> 对于 Kubernetes v{{< skew currentVersion >}}，唯一可以验证完整性的代码工件就是容器镜像，它使用实验性签名支持。 -如需手动验证 Kubernetes 核心组件的签名容器镜像，请参考[验证签名容器镜像](/zh/docs/tasks/administer-cluster/verify-signed-images)。 +如需手动验证 Kubernetes 核心组件的签名容器镜像，请参考[验证签名容器镜像](/zh-cn/docs/tasks/administer-cluster/verify-signed-images)。 -Kubernetes 命令行工具 [kubectl](/zh/docs/reference/kubectl/kubectl/) 允许你对 Kubernetes 集群执行命令。 +Kubernetes 命令行工具 [kubectl](/zh-cn/docs/reference/kubectl/kubectl/) 允许你对 Kubernetes 集群执行命令。 你可以使用 kubectl 部署应用程序、检查和管理集群资源以及查看日志。 有关更多信息，包括 kubectl 操作的完整列表，请参阅 -[`kubectl` 参考文档](/zh/docs/reference/kubectl/)。 +[`kubectl` 参考文档](/zh-cn/docs/reference/kubectl/)。 -[API 弃用](/zh/docs/reference/using-api/deprecation-policy/)和 +[API 弃用](/zh-cn/docs/reference/using-api/deprecation-policy/)和 [API 变更指南](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api_changes.md) 的项目策略要求 `kube-apiserver` 在升级时不跳过次要版本，即使在单实例集群中也是如此。 {{< /note >}} @@ -318,7 +318,7 @@ Optionally upgrade `kubelet` instances to **{{< skew currentVersion >}}** (or th Before performing a minor version `kubelet` upgrade, [drain](/docs/tasks/administer-cluster/safely-drain-node/) pods from that node. In-place minor version `kubelet` upgrades are not supported. --> -在执行次要版本 `kubelet` 升级之前，[排空](/zh/docs/tasks/administer-cluster/safely-drain-node/)该节点的 Pod。 +在执行次要版本 `kubelet` 升级之前，[排空](/zh-cn/docs/tasks/administer-cluster/safely-drain-node/)该节点的 Pod。 `kubelet` 不支持原地次要版本升级。 {{}} diff --git a/data/i18n/zh-cn/zh-cn.toml b/data/i18n/zh-cn/zh-cn.toml index 49174039e7..3220f77d81 100644 --- a/data/i18n/zh-cn/zh-cn.toml +++ b/data/i18n/zh-cn/zh-cn.toml @@ -1,4 +1,4 @@ -# i18n strings for the Chinese version of the site (https://kubernetes.io/zh/) +# i18n strings for the Chinese version of the site (https://kubernetes.io/zh-cn/) # 注意：修改此文件时请维持字符串名称的字母顺序并与英文版保持一致 [caution] @@ -38,7 +38,7 @@ other = " 版本的文档已不再维护。您现在看到的版本来自于一 other = "已过时" [dockershim_message] -other = """自 1.24 版起，Dockershim 已从 Kubernetes 项目中移除。阅读 Dockershim 移除的常见问题了解更多详情。""" +other = """自 1.24 版起，Dockershim 已从 Kubernetes 项目中移除。阅读 Dockershim 移除的常见问题了解更多详情。""" [docs_label_browse] other = "浏览文档" @@ -255,7 +255,7 @@ other="""第三方内容建议""" other = """🛇 本条目指向第三方项目或产品，而该项目（产品）不是 Kubernetes 的一部分。更多信息""" [thirdparty_message_disclaimer] -other = """

本页面中的条目引用了第三方产品或项目，这些产品（项目）提供了 Kubernetes 所需的功能。Kubernetes 项目的开发人员不对这些第三方产品（项目）负责。请参阅CNCF 网站指南了解更多细节。

在提交更改建议，向本页添加新的第三方链接之前，你应该先阅读内容指南。

""" +other = """

本页面中的条目引用了第三方产品或项目，这些产品（项目）提供了 Kubernetes 所需的功能。Kubernetes 项目的开发人员不对这些第三方产品（项目）负责。请参阅CNCF 网站指南了解更多细节。

在提交更改建议，向本页添加新的第三方链接之前，你应该先阅读内容指南。

""" [ui_search_placeholder] other = "搜索" diff --git a/scripts/README.md b/scripts/README.md index 02e3e66ff0..9f1e9fdfbe 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -147,11 +147,11 @@ since a localized version has been committed. The following example checks a single file: - ./scripts/lsync.sh content/zh/docs/concepts/_index.md + ./scripts/lsync.sh content/zh-cn/docs/concepts/_index.md The following command checks a subdirectory: - ./scripts/lsync.sh content/zh/docs/concepts/ + ./scripts/lsync.sh content/zh-cn/docs/concepts/ ## check-ctrlcode.py diff --git a/scripts/linkchecker.py b/scripts/linkchecker.py index 6dfd39b81e..ece90b5c98 100755 --- a/scripts/linkchecker.py +++ b/scripts/linkchecker.py @@ -4,7 +4,7 @@ # # If the language to check is not English (`en`), we check if you are actually # using the localized links. For example, if you checking -# `content/zh/docs/foo/bar`, we check if the English version exists AND if the +# `content/zh-cn/docs/foo/bar`, we check if the English version exists AND if the # Chinese version exists as well. A checking record is produced if the link # can use the localized version. # @@ -462,7 +462,7 @@ def main(): if len(parts) != 3 or parts[0] != "content": print("ERROR:\nPlease specify file pattern in the format " "'content//', for example:\n" - "'content/zh/docs/concepts/**/*.md'\n") + "'content/zh-cn/docs/concepts/**/*.md'\n") PARSER.print_help() sys.exit(-1) diff --git a/scripts/lsync.sh b/scripts/lsync.sh index 934e3b91ef..bac46c768a 100755 --- a/scripts/lsync.sh +++ b/scripts/lsync.sh @@ -7,7 +7,7 @@ if [ "$#" -ne 1 ] ; then echo -e "\nThis script checks if the English version of a page has changed since a " >&2 echo -e "localized page has been committed.\n" >&2 echo -e "Usage:\n\t$0 \n" >&2 - echo -e "Example:\n\t$0 content/zh/docs/concepts/_index.md\n" >&2 + echo -e "Example:\n\t$0 content/zh-cn/docs/concepts/_index.md\n" >&2 exit 1 fi