summaryrefslogtreecommitdiff
path: root/locale/zh_CN/gitlab.po
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 12:08:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 12:08:31 +0000
commit28ce39a3e0e7b47e53939a15fb823af9c433327a (patch)
treef703cd7b431827880ccb74b98d16fab0f60dd245 /locale/zh_CN/gitlab.po
parentafe057a8ff8546f0032e439a9a200307fb6de86a (diff)
downloadgitlab-ce-28ce39a3e0e7b47e53939a15fb823af9c433327a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale/zh_CN/gitlab.po')
-rw-r--r--locale/zh_CN/gitlab.po23
1 files changed, 11 insertions, 12 deletions
diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po
index 2c6a67d6ecc..8b4414f2042 100644
--- a/locale/zh_CN/gitlab.po
+++ b/locale/zh_CN/gitlab.po
@@ -1497,37 +1497,37 @@ msgstr "更新评论时发生错误"
msgid "An error occurred while validating username"
msgstr "验证用户名时发生错误"
-msgid "An error occurred whilst committing your changes."
+msgid "An error occurred while committing your changes."
msgstr "提交更改时发生错误。"
-msgid "An error occurred whilst fetching the job trace."
+msgid "An error occurred while fetching the job trace."
msgstr "获取作业日志时发生错误。"
-msgid "An error occurred whilst fetching the latest pipeline."
+msgid "An error occurred while fetching the latest pipeline."
msgstr "获取最新流水线时发生错误。"
-msgid "An error occurred whilst getting files for - %{branchId}"
+msgid "An error occurred while getting files for - %{branchId}"
msgstr "获取文件 - %{branchId} 时出错"
-msgid "An error occurred whilst loading all the files."
+msgid "An error occurred while loading all the files."
msgstr "加载所有文件时发生错误。"
-msgid "An error occurred whilst loading the file content."
+msgid "An error occurred while loading the file content."
msgstr "加载文件内容时发生错误。"
-msgid "An error occurred whilst loading the file."
+msgid "An error occurred while loading the file."
msgstr "加载文件时发生错误。"
-msgid "An error occurred whilst loading the merge request changes."
+msgid "An error occurred while loading the merge request changes."
msgstr "加载合并请求的变更内容时发生错误。"
-msgid "An error occurred whilst loading the merge request version data."
+msgid "An error occurred while loading the merge request version data."
msgstr "加载合并请求的版本数据时发生错误。"
-msgid "An error occurred whilst loading the merge request."
+msgid "An error occurred while loading the merge request."
msgstr "加载合并请求时发生错误。"
-msgid "An error occurred whilst loading the pipelines jobs."
+msgid "An error occurred while loading the pipelines jobs."
msgstr "加载流水线作业时发生错误。"
msgid "An error occurred. Please try again."
@@ -19414,4 +19414,3 @@ msgstr[0] "在%d分钟内"
msgid "yaml invalid"
msgstr "yaml无效"
-