Merge branch 'bvl-fix-invalid-po-files' into 'master'

Fix currently invalid po files

Closes #35302 and #35235

See merge request !13032

6 files changed, 36 insertions, 14 deletions

diff --git a/changelogs/unreleased/bvl-fix-invalid-po-files.yml b/changelogs/unreleased/bvl-fix-invalid-po-files.yml
new file mode 100644
index 00000000000..b8a22a9e6df
--- /dev/null
+++ b/changelogs/unreleased/bvl-fix-invalid-po-files.yml
@@ -0,0 +1,4 @@
+---
+title: Fix some invalid entries in PO files
+merge_request: 13032
+author:
diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po
index c0aa536e4a4..8606c631af0 100644
--- a/locale/ja/gitlab.po
+++ b/locale/ja/gitlab.po
@@ -34,7 +34,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についてのグラフ"
@@ -1136,8 +1137,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. "
diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po
index d68a4e7ff19..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 ранку)"
diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po
index ffb16c123e6..dc46fe92ee3 100644
--- a/locale/zh_CN/gitlab.po
+++ b/locale/zh_CN/gitlab.po
@@ -27,6 +27,14 @@ msgstr[0] "%d 次提交"
 msgid "%{commit_author_link} committed %{commit_timeago}"
 msgstr "由 %{commit_author_link} 提交于 %{commit_timeago}"
 
+msgid "1 pipeline"
+msgid_plural "%d pipelines"
+msgstr[0] "1 条流水线"
+msgstr[1] "%d 条流水线"
+
+msgid "A collection of graphs regarding Continuous Integration"
+msgstr "持续集成数据图"
+
 msgid "About auto deploy"
 msgstr "关于自动部署"
 
@@ -223,6 +231,14 @@ msgstr "复制提交 SHA 的值到剪贴板"
 msgid "Create New Directory"
 msgstr "创建新目录"
 
+<<<<<<< HEAD
+=======
+msgid ""
+"Create a personal access token on your account to pull or push via "
+"%{protocol}."
+msgstr "在帐户上创建个人访问令牌，以通过 %{protocol} 来拉取或推送。"
+
+>>>>>>> 5a9554bb33... Merge branch 'bvl-fix-invalid-po-files' into 'master'
 msgid "Create directory"
 msgstr "创建目录"
 
@@ -1055,9 +1071,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 "
@@ -1125,4 +1139,3 @@ msgstr "通知邮件"
 msgid "parent"
 msgid_plural "parents"
 msgstr[0] "父级"
-
diff --git a/locale/zh_HK/gitlab.po b/locale/zh_HK/gitlab.po
index 9126561a5af..6f1715a2f37 100644
--- a/locale/zh_HK/gitlab.po
+++ b/locale/zh_HK/gitlab.po
@@ -28,6 +28,14 @@ msgstr[0] " %d 次提交"
 msgid "%{commit_author_link} committed %{commit_timeago}"
 msgstr "由 %{commit_author_link} 提交於 %{commit_timeago}"
 
+msgid "1 pipeline"
+msgid_plural "%d pipelines"
+msgstr[0] "1 條流水線"
+msgstr[1] "%d 條流水線"
+
+msgid "A collection of graphs regarding Continuous Integration"
+msgstr "相關持續集成的圖像集合"
+
 msgid "About auto deploy"
 msgstr "關於自動部署"
 
@@ -1056,9 +1064,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 "
@@ -1126,4 +1132,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] "上層"
-