Resolve locale/gitlab.pot

locale/gitlab.pot

@@ -3310,10 +3310,12 @@ msgstr ""
 msgid "Explore public groups"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "External Classification Policy Authorization"
 msgstr ""
 
+msgid "External URL"
+msgstr ""
+
 msgid "External authentication"
 msgstr ""
 
@@ -3330,9 +3332,6 @@ msgid "ExternalAuthorizationService|Classification label"
 msgstr ""
 
 msgid "ExternalAuthorizationService|When no classification label is set the default label `%{default_label}` will be used."
-=======
-msgid "External URL"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Facebook"
@@ -5143,6 +5142,9 @@ msgstr ""
 msgid "Metrics and profiling"
 msgstr ""
 
+msgid "Metrics for environment"
+msgstr ""
+
 msgid "Metrics|Business"
 msgstr ""
 
@@ -5221,14 +5223,7 @@ msgstr ""
 msgid "Metrics|Used as a title for the chart"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Metrics|Used if the query returns a single series. If it returns multiple series, their legend labels will be picked up from the response."
-=======
-msgid "Metrics for environment"
-msgstr ""
-
-msgid "Metrics|Check out the CI/CD documentation on deploying to an environment"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Metrics|Y-axis label"
@@ -5428,11 +5423,10 @@ msgstr ""
 msgid "New directory"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "New epic"
-=======
 msgid "New environment"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "New epic"
 msgstr ""
 
 msgid "New file"
@@ -5534,11 +5528,10 @@ msgstr ""
 msgid "No other labels with such name or description"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "No packages stored for this project."
-=======
+msgstr ""
+
 msgid "No preview for this file type"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "No prioritised labels with such name or description"
@@ -7224,7 +7217,6 @@ msgstr ""
 msgid "Secret"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Security"
 msgstr ""
 
@@ -7280,9 +7272,9 @@ msgid "SecurityDashboard|Monitor vulnerabilities in your code"
 msgstr ""
 
 msgid "SecurityDashboard|Pipeline %{pipelineLink} triggered"
-=======
+msgstr ""
+
 msgid "See metrics"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Select"
@@ -7399,11 +7391,10 @@ msgstr ""
 msgid "Set up a specific Runner automatically"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Set up assertions/attributes/claims (email, first_name, last_name) and NameID according to %{docsLinkStart}the documentation %{icon}%{docsLinkEnd}"
-=======
+msgstr ""
+
 msgid "Set up new U2F device"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically."
@@ -7510,14 +7501,13 @@ msgstr ""
 msgid "Sign in / Register"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Sign in to %{group_name}"
 msgstr ""
 
-msgid "Sign in with Single Sign-On"
-=======
 msgid "Sign in via 2FA code"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "Sign in with Single Sign-On"
 msgstr ""
 
 msgid "Sign out"
@@ -8585,17 +8575,16 @@ msgstr ""
 msgid "To move or copy an entire GitLab project from another GitLab installation to this one, navigate to the original project's settings page, generate an export file, and upload it here."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>."
 msgstr ""
 
 msgid "To open Jaeger and easily view tracing from GitLab, link the %{start_tag}Tracing%{end_tag} page to your server"
 msgstr ""
 
-msgid "To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:"
-=======
 msgid "To preserve performance only <strong>%{display_size} of ${real_size}</strong> files are displayed."
->>>>>>> upstream/master
+msgstr ""
+
+msgid "To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:"
 msgstr ""
 
 msgid "To start serving your jobs you can add Runners to your group"
@@ -8709,17 +8698,16 @@ msgstr ""
 msgid "Try again"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Try all GitLab has to offer for 30 days."
+msgid "Try again?"
 msgstr ""
 
-msgid "Turn on Service Desk"
-=======
-msgid "Try again?"
+msgid "Try all GitLab has to offer for 30 days."
 msgstr ""
 
 msgid "Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now."
->>>>>>> upstream/master
+msgstr ""
+
+msgid "Turn on Service Desk"
 msgstr ""
 
 msgid "Twitter"
@@ -8962,13 +8950,13 @@ msgstr ""
 msgid "View app"
 msgstr ""
 
-msgid "View documentation"
+msgid "View deployment"
 msgstr ""
 
-msgid "View epics list"
+msgid "View documentation"
 msgstr ""
 
-msgid "View deployment"
+msgid "View epics list"
 msgstr ""
 
 msgid "View file @ "