Resolve locale/gitlab.pot

locale/gitlab.pot

@@ -2403,11 +2403,10 @@ msgstr ""
 msgid "DashboardProjects|Personal"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Date picker"
-=======
+msgstr ""
+
 msgid "Debug"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Dec"
@@ -3302,14 +3301,7 @@ msgstr ""
 msgid "GeoNodes|Learn more about Wiki verification"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "GeoNodes|Loading nodes"
-=======
-msgid "Go to"
-msgstr ""
-
-msgid "Go to %{link_to_google_takeout}."
->>>>>>> upstream/master
 msgstr ""
 
 msgid "GeoNodes|Local LFS objects"
@@ -3591,6 +3583,9 @@ msgstr ""
 msgid "Go back"
 msgstr ""
 
+msgid "Go to"
+msgstr ""
+
 msgid "Go to %{link_to_google_takeout}."
 msgstr ""
 
@@ -4072,6 +4067,9 @@ msgstr ""
 msgid "Jobs"
 msgstr ""
 
+msgid "Job|This job is stuck, because the project doesn't have any runners online assigned to it."
+msgstr ""
+
 msgid "Jul"
 msgstr ""
 
@@ -6073,14 +6071,13 @@ msgstr ""
 msgid "Runners can be placed on separate users, servers, and even on your local machine."
 msgstr ""
 
-<<<<<<< HEAD
+msgid "Runners page"
+msgstr ""
+
 msgid "Runners page."
 msgstr ""
 
 msgid "Runners|You have used all your shared Runners pipeline minutes."
-=======
-msgid "Runners page"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Running"
@@ -7064,6 +7061,12 @@ msgstr ""
 msgid "This job is in pending state and is waiting to be picked by a runner"
 msgstr ""
 
+msgid "This job is stuck, because you don't have any active runners online with any of these tags assigned to them:"
+msgstr ""
+
+msgid "This job is stuck, because you don't have any active runners that can run this job."
+msgstr ""
+
 msgid "This job requires a manual action"
 msgstr ""