Merge branch '29165-confusing-wording-fix' into 'master'

Resolve "Admin Area's *Runners* page is confusing with use of *State* and *Type*"

Closes #29165

See merge request gitlab-org/gitlab!21591

app/views/admin/runners/index.html.haml

@@ -10,7 +10,7 @@
         %br
 
       %div
-        %span= _('Each Runner can be in one of the following states:')
+        %span= _('Each Runner can be in one of the following states and/or belong to one of the following types:')
         %ul
           %li
             %span.badge.badge-success shared
@@ -120,7 +120,7 @@
   .runners-content.content-list
     .table-holder
       .gl-responsive-table-row.table-row-header{ role: 'row' }
-        .table-section.section-10{ role: 'rowheader' }= _('Type')
+        .table-section.section-10{ role: 'rowheader' }= _('Type/State')
         .table-section.section-10{ role: 'rowheader' }= _('Runner token')
         .table-section.section-20{ role: 'rowheader' }= _('Description')
         .table-section.section-10{ role: 'rowheader' }= _('Version')

changelogs/unreleased/29165-confusing-wording-fix.yml

+---
+title: Fixes wording on runner admin
+merge_request:
+author:
+type: changed

locale/gitlab.pot

@@ -6233,6 +6233,9 @@ msgstr ""
 msgid "Dynamic Application Security Testing (DAST)"
 msgstr ""
 
+msgid "Each Runner can be in one of the following states and/or belong to one of the following types:"
+msgstr ""
+
 msgid "Each Runner can be in one of the following states:"
 msgstr ""
 
@@ -18914,6 +18917,9 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+msgid "Type/State"
+msgstr ""
+
 msgid "U2F Devices (%{length})"
 msgstr ""