Skip to content

G
gitlab-ce
Commit 43229f26 authored by Sean McGivern's avatar Sean McGivern
Browse files
Options

Resolve locale/gitlab.pot

parent e874e20f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
locale/gitlab.pot
View file @ 43229f26
...@@ -6971,11 +6971,10 @@ msgstr "" ...@@ -6971,11 +6971,10 @@ msgstr ""
msgid "The collection of events added to the data gathered for that stage." msgid "The collection of events added to the data gathered for that stage."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "The connection will time out after %{timeout}. For repositories that take longer, use a clone/push combination." msgid "The connection will time out after %{timeout}. For repositories that take longer, use a clone/push combination."
======= msgstr ""
msgid "The deployment of this job to %{environmentLink} did not succeed." msgid "The deployment of this job to %{environmentLink} did not succeed."
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "The fork relationship has been removed." msgid "The fork relationship has been removed."
......
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