summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-24 11:07:30 +0000
committerRémy Coutable <remy@rymai.me>2017-07-24 11:07:30 +0000
commit5a9554bb338bec4b31b0e712ae07898235f7a69d (patch)
treedccdd649c942cf5d4dbb52695e48d76f53dda8e3 /locale
parentd3f5e78bf22444c5fc1d7af253473fa5478a86c8 (diff)
parent632f360d0cf5a37f1047452b8fc25fd58c6f4e14 (diff)
downloadgitlab-ce-5a9554bb338bec4b31b0e712ae07898235f7a69d.tar.gz
Merge branch 'bvl-fix-invalid-po-files' into 'master'
Fix currently invalid po files Closes #35302 and #35235 See merge request !13032
Diffstat (limited to 'locale')
-rw-r--r--locale/ja/gitlab.po7
-rw-r--r--locale/uk/gitlab.po3
-rw-r--r--locale/zh_CN/gitlab.po10
-rw-r--r--locale/zh_HK/gitlab.po8
-rw-r--r--locale/zh_TW/gitlab.po4
5 files changed, 13 insertions, 19 deletions
diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po
index cf74abf81bc..04c61906c73 100644
--- a/locale/ja/gitlab.po
+++ b/locale/ja/gitlab.po
@@ -33,7 +33,8 @@ msgstr "%{commit_author_link}は%{commit_timeago}前、コミットしました
msgid "1 pipeline"
msgid_plural "%d pipelines"
-msgstr[0] "%d 個のパイプライン"
+msgstr[0] "1 個のパイプライン"
+msgstr[1] "%d 個のパイプライン"
msgid "A collection of graphs regarding Continuous Integration"
msgstr "CIについてのグラフ"
@@ -1135,8 +1136,7 @@ msgstr ""
msgid ""
"You are going to remove the fork relationship to source project "
"%{forked_from_project}. Are you ABSOLUTELY sure?"
-msgstr "元のプロジェクト (%{forked_from_project}) とのリレーションを削除しようとしています。\n"
-"本当によろしいですか?"
+msgstr "元のプロジェクト (%{forked_from_project}) とのリレーションを削除しようとしています。本当によろしいですか?"
msgid ""
"You are going to transfer %{project_name_with_namespace} to another owner. "
@@ -1201,4 +1201,3 @@ msgstr "メール通知"
msgid "parent"
msgid_plural "parents"
msgstr[0] "親"
-
diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po
index 59a7eb6e1b3..f198fff8dce 100644
--- a/locale/uk/gitlab.po
+++ b/locale/uk/gitlab.po
@@ -379,7 +379,7 @@ msgid "Edit"
msgstr "Редагувати"
msgid "Edit Pipeline Schedule %{id}"
-msgstr "Редагувати Розклад Конвеєра % {id}"
+msgstr "Редагувати Розклад Конвеєра %{id}"
msgid "Every day (at 4:00am)"
msgstr "Кожен день (в 4:00 ранку)"
@@ -1231,4 +1231,3 @@ msgid_plural "parents"
msgstr[0] "джерело"
msgstr[1] "джерела"
msgstr[2] "джерел"
-
diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po
index 47b72d7be1a..f471e7def25 100644
--- a/locale/zh_CN/gitlab.po
+++ b/locale/zh_CN/gitlab.po
@@ -29,7 +29,8 @@ msgstr "由 %{commit_author_link} 提交于 %{commit_timeago}"
msgid "1 pipeline"
msgid_plural "%d pipelines"
-msgstr[0] "%d 条流水线"
+msgstr[0] "1 条流水线"
+msgstr[1] "%d 条流水线"
msgid "A collection of graphs regarding Continuous Integration"
msgstr "持续集成数据图"
@@ -236,7 +237,7 @@ msgstr "创建新目录"
msgid ""
"Create a personal access token on your account to pull or push via "
"%{protocol}."
-msgstr "在帐户上创建个人访问令牌,以通过%{protocol}来拉取或推送。"
+msgstr "在帐户上创建个人访问令牌,以通过 %{protocol} 来拉取或推送。"
msgid "Create directory"
msgstr "创建目录"
@@ -1109,9 +1110,7 @@ msgid ""
"You are going to remove %{project_name_with_namespace}.\n"
"Removed project CANNOT be restored!\n"
"Are you ABSOLUTELY sure?"
-msgstr "即将要删除 %{project_name_with_namespace}。\n"
-"已删除的项目无法恢复!\n"
-"确定继续吗?"
+msgstr "即将要删除 %{project_name_with_namespace}。已删除的项目无法恢复!确定继续吗?"
msgid ""
"You are going to remove the fork relationship to source project "
@@ -1179,4 +1178,3 @@ msgstr "通知邮件"
msgid "parent"
msgid_plural "parents"
msgstr[0] "父级"
-
diff --git a/locale/zh_HK/gitlab.po b/locale/zh_HK/gitlab.po
index 8a4e6da4ea9..1b7c39f8f62 100644
--- a/locale/zh_HK/gitlab.po
+++ b/locale/zh_HK/gitlab.po
@@ -28,7 +28,8 @@ msgstr "由 %{commit_author_link} 提交於 %{commit_timeago}"
msgid "1 pipeline"
msgid_plural "%d pipelines"
-msgstr[0] "%d 條流水線"
+msgstr[0] "1 條流水線"
+msgstr[1] "%d 條流水線"
msgid "A collection of graphs regarding Continuous Integration"
msgstr "相關持續集成的圖像集合"
@@ -1108,9 +1109,7 @@ msgid ""
"You are going to remove %{project_name_with_namespace}.\n"
"Removed project CANNOT be restored!\n"
"Are you ABSOLUTELY sure?"
-msgstr "即將要刪除 %{project_name_with_namespace}。\n"
-"已刪除的項目無法恢複!\n"
-"確定繼續嗎?"
+msgstr "即將要刪除 %{project_name_with_namespace}。已刪除的項目無法恢複!確定繼續嗎?"
msgid ""
"You are going to remove the fork relationship to source project "
@@ -1178,4 +1177,3 @@ msgstr "通知郵件"
msgid "parent"
msgid_plural "parents"
msgstr[0] "父級"
-
diff --git a/locale/zh_TW/gitlab.po b/locale/zh_TW/gitlab.po
index 05173ed12c0..8d30a78145d 100644
--- a/locale/zh_TW/gitlab.po
+++ b/locale/zh_TW/gitlab.po
@@ -32,7 +32,8 @@ msgstr "%{commit_author_link} 在 %{commit_timeago} 送交"
msgid "1 pipeline"
msgid_plural "%d pipelines"
-msgstr[0] "%d 條流水線"
+msgstr[0] "1 條流水線"
+msgstr[1] "%d 條流水線"
msgid "A collection of graphs regarding Continuous Integration"
msgstr "持續整合 (CI) 相關的圖表"
@@ -1193,4 +1194,3 @@ msgstr "通知信"
msgid "parent"
msgid_plural "parents"
msgstr[0] "上層"
-