Skip to content

G
gitlab-ce
Commit 55dd4c4a authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Fix conflicts for locale/gitlab.pot

parent 31f42749
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
locale/gitlab.pot
View file @ 55dd4c4a
...@@ -599,15 +599,15 @@ msgstr "" ...@@ -599,15 +599,15 @@ msgstr ""
msgid "An error has occurred" msgid "An error has occurred"
msgstr "" msgstr ""
msgid "An error occurred creating the new branch."
msgstr ""
msgid "An error occurred adding a draft to the discussion." msgid "An error occurred adding a draft to the discussion."
msgstr "" msgstr ""
msgid "An error occurred adding a new draft." msgid "An error occurred adding a new draft."
msgstr "" msgstr ""
msgid "An error occurred creating the new branch."
msgstr ""
msgid "An error occurred previewing the blob" msgid "An error occurred previewing the blob"
msgstr "" msgstr ""
...@@ -1597,14 +1597,10 @@ msgstr "" ...@@ -1597,14 +1597,10 @@ msgstr ""
msgid "CiVariable|All environments" msgid "CiVariable|All environments"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "CiVariable|Create wildcard" msgid "CiVariable|Create wildcard"
msgstr "" msgstr ""
msgid "CiVariable|Error occured while saving variables"
=======
msgid "CiVariable|Error occurred while saving variables" msgid "CiVariable|Error occurred while saving variables"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "CiVariable|New environment" msgid "CiVariable|New environment"
......
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