Skip to content

G
gitlab-ce
Commit d1a6ae67 authored by Robert Speicher's avatar Robert Speicher
Browse files
Options

Resolve locale/gitlab.pot

parent 7a7e7d81
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
locale/gitlab.pot
View file @ d1a6ae67
...@@ -7170,12 +7170,9 @@ msgstr "" ...@@ -7170,12 +7170,9 @@ msgstr ""
msgid "Repository cleanup has started. You will receive an email once the cleanup operation is complete." msgid "Repository cleanup has started. You will receive an email once the cleanup operation is complete."
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Repository has no locks." msgid "Repository has no locks."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Repository maintenance" msgid "Repository maintenance"
msgstr "" msgstr ""
...@@ -7634,9 +7631,6 @@ msgstr "" ...@@ -7634,9 +7631,6 @@ msgstr ""
msgid "Server version" msgid "Server version"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Service Desk"
=======
msgid "Serverless" msgid "Serverless"
msgstr "" msgstr ""
...@@ -7674,7 +7668,9 @@ msgid "Serverless|Runtime" ...@@ -7674,7 +7668,9 @@ msgid "Serverless|Runtime"
msgstr "" msgstr ""
msgid "Serverless|There is currently no function data available from Knative. This could be for a variety of reasons including:" msgid "Serverless|There is currently no function data available from Knative. This could be for a variety of reasons including:"
>>>>>>> upstream/master msgstr ""
msgid "Service Desk"
msgstr "" msgstr ""
msgid "Service Templates" msgid "Service Templates"
......
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