Merge branch 'selhorn-runner-lowercase-2' into 'master'

Runner admin: Updated UI to make runner lowercase

See merge request gitlab-org/gitlab!50477

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

@@ -5,34 +5,34 @@
   .col-sm-6
     .bs-callout
       %p
-        = (_"A 'Runner' is a process which runs a job. You can set up as many Runners as you need.")
+        = (_"Runners are processes that pick up and execute CI/CD jobs for GitLab.")
         %br
-        = _('Runners can be placed on separate users, servers, even on your local machine.')
+        = _('You can register runners as separate users, on separate servers, and on your local machine. Register as many runners as you want.')
         %br
 
       %div
-        %span= _('Each Runner can be in one of the following states and/or belong to one of the following types:')
+        %span= _('Runners can be:')
         %ul
           %li
             %span.badge.badge-success shared
             \-
-            = _('Runner runs jobs from all unassigned projects')
+            = _('Runs jobs from all unassigned projects.')
           %li
             %span.badge.badge-success group
             \-
-            = _('Runner runs jobs from all unassigned projects in its group')
+            = _('Runs jobs from all unassigned projects in its group.')
           %li
             %span.badge.badge-info specific
             \-
-            = _('Runner runs jobs from assigned projects')
+            = _('Runs jobs from assigned projects.')
           %li
             %span.badge.badge-warning locked
             \-
-            = _('Runner cannot be assigned to other projects')
+            = _('Cannot be assigned to other projects.')
           %li
             %span.badge.badge-danger paused
             \-
-            = _('Runner will not receive any new jobs')
+            = _('Not available to run jobs.')
 
   .col-sm-6
     .bs-callout

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

@@ -15,17 +15,17 @@
 
 - if @runner.instance_type?
   .bs-callout.bs-callout-success
-    %h4 This Runner will process jobs from ALL UNASSIGNED projects
+    %h4= _('This runner processes jobs for all unassigned projects.')
     %p
-      If you want Runners to build only specific projects, enable them in the table below.
-      Keep in mind that this is a one way transition.
+      = _('If you want a runner to build only specific projects, restrict the project in the table below. After you restrict a runner to a project, you cannot change it back to a shared runner.')
 - elsif @runner.group_type?
   .bs-callout.bs-callout-success
-    %h4 This runner will process jobs from all projects in its group and subgroups
+    %h4= _('This runner processes jobs for all projects in its group and subgroups.')
 - else
   .bs-callout.bs-callout-info
-    %h4 This Runner will process jobs only from ASSIGNED projects
-    %p You can't make this a shared Runner.
+    %h4= _('This runner processes jobs for assigned projects only.')
+    %p
+      = _('You cannot make this a shared runner.')
 %hr
 
 .gl-mb-6
@@ -33,12 +33,12 @@
 
 .row
   .col-md-6
-    %h4 Restrict projects for this Runner
+    %h4= _('Restrict projects for this runner')
     - if @runner.projects.any?
       %table.table.assigned-projects
         %thead
           %tr
-            %th Assigned projects
+            %th= _('Assigned projects')
         - @runner.runner_projects.each do |runner_project|
           - project = runner_project.project
           - if project
@@ -55,7 +55,7 @@
     %table.table.unassigned-projects
       %thead
         %tr
-          %th Project
+          %th= _('Project')
           %th
 
       %tr
@@ -78,15 +78,15 @@
     = paginate_without_count @projects
 
   .col-md-6
-    %h4 Recent jobs served by this Runner
+    %h4= _('Recent jobs served by this runner')
     %table.table.ci-table.runner-builds
       %thead
         %tr
-          %th Job
-          %th Status
-          %th Project
-          %th Commit
-          %th Finished at
+          %th= _('Job')
+          %th= _('Status')
+          %th= _('Project')
+          %th= _('Commit')
+          %th= _('Finished at')
 
       - @builds.each do |build|
         - project = build.project

app/views/shared/runners/_form.html.haml

@@ -5,7 +5,7 @@
     .col-sm-10
       .form-check
         = f.check_box :active, { class: 'form-check-input' }
-        %label.light{ for: :runner_active }= _("Paused Runners don't accept new jobs")
+        %label.light{ for: :runner_active }= _("Paused runners don't accept new jobs")
   .form-group.row
     = label :protected, _("Protected"), class: 'col-form-label col-sm-2'
     .col-sm-10
@@ -40,13 +40,13 @@
       = _('Maximum job timeout')
     .col-sm-10
       = f.text_field :maximum_timeout_human_readable, class: 'form-control'
-      .form-text.text-muted= _('This timeout will take precedence when lower than project-defined timeout and accepts a human readable time input language like "1 hour". Values without specification represent seconds.')
+      .form-text.text-muted= _('Enter the number of seconds, or other human-readable input, like "1 hour". This timeout takes precedence over lower timeouts set for the project.')
   .form-group.row
     = label_tag :tag_list, class: 'col-form-label col-sm-2' do
       = _('Tags')
     .col-sm-10
       = f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control'
-      .form-text.text-muted= _('You can set up jobs to only use Runners with specific tags. Separate tags with commas.')
+      .form-text.text-muted= _('You can configure jobs to use runners that are assigned specific tags. Separate tags with commas.')
   - if local_assigns[:in_gitlab_com_admin_context]
     .form-group.row
       = label_tag :public_projects_minutes_cost_factor, class: 'col-form-label col-sm-2' do

changelogs/unreleased/selhorn-runner-lowercase-2.yml

+---
+title: Updated UI text to make runner lowercase
+merge_request: 50477
+author:
+type: other

locale/gitlab.pot

@@ -1205,9 +1205,6 @@ msgstr ""
 msgid "A %{incident_docs_start}modified issue%{incident_docs_end} to guide the resolution of incidents."
 msgstr ""
 
-msgid "A 'Runner' is a process which runs a job. You can set up as many Runners as you need."
-msgstr ""
-
 msgid "A .NET Core console application template, customizable for any .NET Core project"
 msgstr ""
 
@@ -3916,6 +3913,9 @@ msgstr ""
 msgid "Assigned Merge Requests"
 msgstr ""
 
+msgid "Assigned projects"
+msgstr ""
+
 msgid "Assigned to %{assigneeName}"
 msgstr ""
 
@@ -5086,6 +5086,9 @@ msgstr ""
 msgid "Cancelling Preview"
 msgstr ""
 
+msgid "Cannot be assigned to other projects."
+msgstr ""
+
 msgid "Cannot be merged automatically"
 msgstr ""
 
@@ -10263,9 +10266,6 @@ 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 ""
 
@@ -10791,6 +10791,9 @@ msgstr ""
 msgid "Enter the name of your application, and we'll return a unique %{type}."
 msgstr ""
 
+msgid "Enter the number of seconds, or other human-readable input, like \"1 hour\". This timeout takes precedence over lower timeouts set for the project."
+msgstr ""
+
 msgid "Enter weights for storages for new repositories."
 msgstr ""
 
@@ -12422,6 +12425,9 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
+msgid "Finished at"
+msgstr ""
+
 msgid "First Seen"
 msgstr ""
 
@@ -14499,6 +14505,9 @@ msgstr ""
 msgid "If you remove this license, GitLab will fall back on the previous license, if any."
 msgstr ""
 
+msgid "If you want a runner to build only specific projects, restrict the project in the table below. After you restrict a runner to a project, you cannot change it back to a shared runner."
+msgstr ""
+
 msgid "If you want to re-enable two-factor authentication, visit %{two_factor_link}"
 msgstr ""
 
@@ -19217,6 +19226,9 @@ msgstr ""
 msgid "Not available for protected branches"
 msgstr ""
 
+msgid "Not available to run jobs."
+msgstr ""
+
 msgid "Not confidential"
 msgstr ""
 
@@ -20362,7 +20374,7 @@ msgstr ""
 msgid "Pause replication"
 msgstr ""
 
-msgid "Paused Runners don't accept new jobs"
+msgid "Paused runners don't accept new jobs"
 msgstr ""
 
 msgid "Pending"
@@ -23074,6 +23086,9 @@ msgstr ""
 msgid "Recent Searches Service is unavailable"
 msgstr ""
 
+msgid "Recent jobs served by this runner"
+msgstr ""
+
 msgid "Recent searches"
 msgstr ""
 
@@ -24027,6 +24042,9 @@ msgstr ""
 msgid "Restrict membership by email domain"
 msgstr ""
 
+msgid "Restrict projects for this runner"
+msgstr ""
+
 msgid "Restricts sign-ups for email addresses that match the given regex. See the %{supported_syntax_link_start}supported syntax%{supported_syntax_link_end} for more information."
 msgstr ""
 
@@ -24181,21 +24199,9 @@ msgstr ""
 msgid "Run untagged jobs"
 msgstr ""
 
-msgid "Runner cannot be assigned to other projects"
-msgstr ""
-
 msgid "Runner is %{status}, last contact was %{runner_contact} ago"
 msgstr ""
 
-msgid "Runner runs jobs from all unassigned projects"
-msgstr ""
-
-msgid "Runner runs jobs from all unassigned projects in its group"
-msgstr ""
-
-msgid "Runner runs jobs from assigned projects"
-msgstr ""
-
 msgid "Runner token"
 msgstr ""
 
@@ -24211,9 +24217,6 @@ msgstr ""
 msgid "Runner was successfully updated."
 msgstr ""
 
-msgid "Runner will not receive any new jobs"
-msgstr ""
-
 msgid "Runners"
 msgstr ""
 
@@ -24223,13 +24226,16 @@ msgstr ""
 msgid "Runners activated for this project"
 msgstr ""
 
+msgid "Runners are processes that pick up and execute CI/CD jobs for GitLab."
+msgstr ""
+
 msgid "Runners are processes that pick up and execute jobs for GitLab. Here you can register and see your Runners for this project."
 msgstr ""
 
 msgid "Runners can be placed on separate users, servers, and even on your local machine."
 msgstr ""
 
-msgid "Runners can be placed on separate users, servers, even on your local machine."
+msgid "Runners can be:"
 msgstr ""
 
 msgid "Runners currently online: %{active_runners_count}"
@@ -24307,6 +24313,15 @@ msgstr ""
 msgid "Runs a number of housekeeping tasks within the current repository, such as compressing file revisions and removing unreachable objects."
 msgstr ""
 
+msgid "Runs jobs from all unassigned projects in its group."
+msgstr ""
+
+msgid "Runs jobs from all unassigned projects."
+msgstr ""
+
+msgid "Runs jobs from assigned projects."
+msgstr ""
+
 msgid "SAML"
 msgstr ""
 
@@ -28845,6 +28860,15 @@ msgstr ""
 msgid "This repository was last checked %{last_check_timestamp}. The check passed."
 msgstr ""
 
+msgid "This runner processes jobs for all projects in its group and subgroups."
+msgstr ""
+
+msgid "This runner processes jobs for all unassigned projects."
+msgstr ""
+
+msgid "This runner processes jobs for assigned projects only."
+msgstr ""
+
 msgid "This runner will only run on pipelines triggered on protected branches"
 msgstr ""
 
@@ -28860,9 +28884,6 @@ msgstr ""
 msgid "This suggestion already matches its content."
 msgstr ""
 
-msgid "This timeout will take precedence when lower than project-defined timeout and accepts a human readable time input language like \"1 hour\". Values without specification represent seconds."
-msgstr ""
-
 msgid "This user cannot be unlocked manually from GitLab"
 msgstr ""
 
@@ -31959,6 +31980,9 @@ msgstr ""
 msgid "You can always edit this later"
 msgstr ""
 
+msgid "You can configure jobs to use runners that are assigned specific tags. Separate tags with commas."
+msgstr ""
+
 msgid "You can create a new %{link}."
 msgstr ""
 
@@ -32049,6 +32073,9 @@ msgstr ""
 msgid "You can recover this project until %{date}"
 msgstr ""
 
+msgid "You can register runners as separate users, on separate servers, and on your local machine. Register as many runners as you want."
+msgstr ""
+
 msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}"
 msgstr ""
 
@@ -32058,9 +32085,6 @@ msgstr ""
 msgid "You can set up as many Runners as you need to run your jobs."
 msgstr ""
 
-msgid "You can set up jobs to only use Runners with specific tags. Separate tags with commas."
-msgstr ""
-
 msgid "You can specify notification level per group or per project."
 msgstr ""
 
@@ -32082,6 +32106,9 @@ msgstr ""
 msgid "You cannot impersonate an internal user"
 msgstr ""
 
+msgid "You cannot make this a shared runner."
+msgstr ""
+
 msgid "You cannot play this scheduled pipeline at the moment. Please wait a minute."
 msgstr ""