Skip to content

G
gitlab-ce
Commit ac273ede authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve locale/gitlab.pot 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 40be7b33
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
locale/gitlab.pot
View file @ ac273ede
...@@ -4524,7 +4524,6 @@ msgstr "" ...@@ -4524,7 +4524,6 @@ msgstr ""
msgid "Import timed out. Import took longer than %{import_jobs_expiration} seconds" msgid "Import timed out. Import took longer than %{import_jobs_expiration} seconds"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "ImportButtons|Connect repositories from" msgid "ImportButtons|Connect repositories from"
msgstr "" msgstr ""
...@@ -4537,8 +4536,6 @@ msgstr "" ...@@ -4537,8 +4536,6 @@ msgstr ""
msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "In order to enable instance-level analytics, please ask an admin to enable %{usage_ping_link_start}usage ping%{usage_ping_link_end}." msgid "In order to enable instance-level analytics, please ask an admin to enable %{usage_ping_link_start}usage ping%{usage_ping_link_end}."
msgstr "" msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7