Merge branch '46115-i18n-for-group-runner-pages' into 'master'

Resolve "Improve i18n of "Runners""

Closes #46115

See merge request gitlab-org/gitlab-ce!18838

app/views/groups/runners/_group_runners.html.haml

-- link = link_to 'Runners API', help_page_path('api/runners.md')
+- link = link_to _('Runners API'), help_page_path('api/runners.md')
 
 %h3
   = _('Group Runners')

app/views/groups/runners/edit.html.haml

-- page_title "Edit", "#{@runner.description} ##{@runner.id}", "Runners"
+- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", 'Runners'
 
 %h4 Runner ##{@runner.id}
 

app/views/projects/runners/_group_runners.html.haml

-- link = link_to 'Runners API', help_page_path('api/runners.md')
+- link = link_to _('Runners API'), help_page_path('api/runners.md')
 
 %h3
   = _('Group Runners')
@@ -25,7 +25,7 @@
   = _('This group does not provide any group Runners yet.')
 
   - if can?(current_user, :admin_pipeline, @project.group)
-    - group_link = link_to 'Group CI/CD settings', group_settings_ci_cd_path(@project.group)
+    - group_link = link_to _('Group CI/CD settings'), group_settings_ci_cd_path(@project.group)
     = _('Group masters can register group runners in the %{link}').html_safe % { link: group_link }
   - else
     = _('Ask your group master to setup a group Runner.')

app/views/projects/runners/_shared_runners.html.haml

-%h3 Shared Runners
+%h3
+  = _('Shared Runners')
 
 .bs-callout.shared-runners-description
   - if Gitlab::CurrentSettings.shared_runners_text.present?
@@ -17,8 +18,7 @@
     for this project
 
 - if @shared_runners_count.zero?
-  This GitLab instance does not provide any shared Runners yet. Instance
-  administrators can register shared Runners in the admin area.
+  = _('This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area.')
 - else
   %h4.underlined-title Available shared Runners : #{@shared_runners_count}
   %ul.bordered-list.available-shared-runners

app/views/projects/runners/_specific_runners.html.haml

-%h3 Specific Runners
+%h3
+  = _('Specific Runners')
 
 = render partial: 'ci/runner/how_to_setup_specific_runner',
          locals: { registration_token: @project.runners_token }

app/views/projects/runners/edit.html.haml

-- page_title "Edit", "#{@runner.description} ##{@runner.id}", "Runners"
+- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", 'Runners'
 
 %h4 Runner ##{@runner.id}
 

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

@@ -20,11 +20,11 @@
         %span.light Indicates whether this runner can pick jobs without tags
   - unless runner.group_type?
     .form-group
-      = label :locked, 'Lock to current projects', class: 'control-label'
+      = label :locked, _('Lock to current projects'), class: 'control-label'
       .col-sm-10
         .checkbox
           = f.check_box :locked
-          %span.light When a runner is locked, it cannot be assigned to other projects
+          %span.light= _('When a runner is locked, it cannot be assigned to other projects')
   .form-group
     = label_tag :token, class: 'control-label' do
       Token

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

@@ -21,17 +21,17 @@
         %th Value
     %tr
       %td Active
-      %td= @runner.active? ? 'Yes' : 'No'
+      %td= @runner.active? ? _('Yes') : _('No')
     %tr
       %td Protected
-      %td= @runner.ref_protected? ? 'Yes' : 'No'
+      %td= @runner.ref_protected? ? _('Yes') : _('No')
     %tr
-      %td Can run untagged jobs
-      %td= @runner.run_untagged? ? 'Yes' : 'No'
+      %td= _('Can run untagged jobs')
+      %td= @runner.run_untagged? ? _('Yes') : _('No')
     - unless @runner.group_type?
       %tr
-        %td Locked to this project
-        %td= @runner.locked? ? 'Yes' : 'No'
+        %td= _('Locked to this project')
+        %td= @runner.locked? ? _('Yes') : _('No')
     %tr
       %td Tags
       %td
@@ -60,7 +60,7 @@
       %td Description
       %td= @runner.description
     %tr
-      %td Maximum job timeout
+      %td= _('Maximum job timeout')
       %td= @runner.maximum_timeout_human_readable
     %tr
       %td Last contact

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-02 22:28+0200\n"
-"PO-Revision-Date: 2018-05-02 22:28+0200\n"
+"POT-Creation-Date: 2018-05-09 09:24+0200\n"
+"PO-Revision-Date: 2018-05-09 09:24+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -104,6 +104,12 @@ msgstr ""
 msgid "+ %{moreCount} more"
 msgstr ""
 
+msgid "- Runner is active and can process any new jobs"
+msgstr ""
+
+msgid "- Runner is paused and will not receive any new jobs"
+msgstr ""
+
 msgid "- show less"
 msgstr ""
 
@@ -156,6 +162,9 @@ msgstr ""
 msgid "<strong>Removes</strong> source branch"
 msgstr ""
 
+msgid "A 'Runner' is a process which runs a job. You can setup as many Runners as you need."
+msgstr ""
+
 msgid "A collection of graphs regarding Continuous Integration"
 msgstr ""
 
@@ -387,6 +396,9 @@ msgstr ""
 msgid "Artifacts"
 msgstr ""
 
+msgid "Ask your group master to setup a group Runner."
+msgstr ""
+
 msgid "Assign custom color like #FF0000"
 msgstr ""
 
@@ -474,6 +486,12 @@ msgstr ""
 msgid "Available"
 msgstr ""
 
+msgid "Available group Runners : %{runners}"
+msgstr ""
+
+msgid "Available group Runners : %{runners}."
+msgstr ""
+
 msgid "Avatar will be removed. Are you sure?"
 msgstr ""
 
@@ -716,6 +734,9 @@ msgstr ""
 msgid "CI/CD configuration"
 msgstr ""
 
+msgid "CI/CD settings"
+msgstr ""
+
 msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
 msgstr ""
 
@@ -749,6 +770,9 @@ msgstr ""
 msgid "CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages."
 msgstr ""
 
+msgid "Can run untagged jobs"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -1652,6 +1676,15 @@ msgstr ""
 msgid "Directory name"
 msgstr ""
 
+msgid "Disable"
+msgstr ""
+
+msgid "Disable for this project"
+msgstr ""
+
+msgid "Disable group Runners"
+msgstr ""
+
 msgid "Discard changes"
 msgstr ""
 
@@ -1703,6 +1736,9 @@ msgstr ""
 msgid "Due date"
 msgstr ""
 
+msgid "Each Runner can be in one of the following states:"
+msgstr ""
+
 msgid "Edit"
 msgstr ""
 
@@ -1724,6 +1760,9 @@ msgstr ""
 msgid "Embed"
 msgstr ""
 
+msgid "Enable"
+msgstr ""
+
 msgid "Enable Auto DevOps"
 msgstr ""
 
@@ -1736,6 +1775,12 @@ msgstr ""
 msgid "Enable and configure Prometheus metrics."
 msgstr ""
 
+msgid "Enable for this project"
+msgstr ""
+
+msgid "Enable group Runners"
+msgstr ""
+
 msgid "Enable or disable version check and usage ping."
 msgstr ""
 
@@ -1978,6 +2023,9 @@ msgstr ""
 msgid "GitLab CI Linter has been moved"
 msgstr ""
 
+msgid "GitLab Group Runners can execute code for all the projects in this group."
+msgstr ""
+
 msgid "GitLab Runner section"
 msgstr ""
 
@@ -2002,9 +2050,18 @@ msgstr ""
 msgid "Got it!"
 msgstr ""
 
+msgid "Group CI/CD settings"
+msgstr ""
+
 msgid "Group ID"
 msgstr ""
 
+msgid "Group Runners"
+msgstr ""
+
+msgid "Group masters can register group runners in the %{link}"
+msgstr ""
+
 msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
 msgstr ""
 
@@ -2315,9 +2372,18 @@ msgstr ""
 msgid "Lock %{issuableDisplayName}"
 msgstr ""
 
+msgid "Lock to current projects"
+msgstr ""
+
 msgid "Locked"
 msgstr ""
 
+msgid "Locked to current projects"
+msgstr ""
+
+msgid "Locked to this project"
+msgstr ""
+
 msgid "Login"
 msgstr ""
 
@@ -2348,6 +2414,9 @@ msgstr ""
 msgid "Maximum git storage failures"
 msgstr ""
 
+msgid "Maximum job timeout"
+msgstr ""
+
 msgid "May"
 msgstr ""
 
@@ -2491,6 +2560,9 @@ msgstr ""
 msgid "New tag"
 msgstr ""
 
+msgid "No"
+msgstr ""
+
 msgid "No assignee"
 msgstr ""
 
@@ -2680,6 +2752,9 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+msgid "Pause"
+msgstr ""
+
 msgid "Pending"
 msgstr ""
 
@@ -3145,6 +3220,9 @@ msgstr ""
 msgid "Register / Sign In"
 msgstr ""
 
+msgid "Register and see your runners for this group."
+msgstr ""
+
 msgid "Related Commits"
 msgstr ""
 
@@ -3169,6 +3247,12 @@ msgstr ""
 msgid "Remind later"
 msgstr ""
 
+msgid "Remove"
+msgstr ""
+
+msgid "Remove Runner"
+msgstr ""
+
 msgid "Remove avatar"
 msgstr ""
 
@@ -3202,6 +3286,9 @@ msgstr ""
 msgid "Resolve discussion"
 msgstr ""
 
+msgid "Resume"
+msgstr ""
+
 msgid "Retry"
 msgstr ""
 
@@ -3234,6 +3321,15 @@ msgstr ""
 msgid "Runners"
 msgstr ""
 
+msgid "Runners API"
+msgstr ""
+
+msgid "Runners can be placed on separate users, servers, and even on your local machine."
+msgstr ""
+
+msgid "Runners settings"
+msgstr ""
+
 msgid "Running"
 msgstr ""
 
@@ -3360,6 +3456,9 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+msgid "Shared Runners"
+msgstr ""
+
 msgid "Show command"
 msgstr ""
 
@@ -3515,6 +3614,9 @@ msgstr ""
 msgid "Spam and Anti-bot Protection"
 msgstr ""
 
+msgid "Specific Runners"
+msgstr ""
+
 msgid "Specify the following URL during the Runner setup:"
 msgstr ""
 
@@ -3772,9 +3874,18 @@ msgstr ""
 msgid "There was an error when unsubscribing from this label."
 msgstr ""
 
+msgid "They can be managed using the %{link}."
+msgstr ""
+
+msgid "This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area."
+msgstr ""
+
 msgid "This directory"
 msgstr ""
 
+msgid "This group does not provide any group Runners yet."
+msgstr ""
+
 msgid "This is a confidential issue."
 msgstr ""
 
@@ -3832,6 +3943,9 @@ msgstr ""
 msgid "This project"
 msgstr ""
 
+msgid "This project does not belong to a group and can therefore not make use of group Runners."
+msgstr ""
+
 msgid "This repository"
 msgstr ""
 
@@ -4016,6 +4130,9 @@ msgstr ""
 msgid "To import an SVN repository, check out %{svn_link}."
 msgstr ""
 
+msgid "To start serving your jobs you can add Runners to your group"
+msgstr ""
+
 msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
 msgstr ""
 
@@ -4187,6 +4304,9 @@ msgstr ""
 msgid "Web terminal"
 msgstr ""
 
+msgid "When a runner is locked, it cannot be assigned to other projects"
+msgstr ""
+
 msgid "When enabled, users cannot use GitLab until the terms have been accepted."
 msgstr ""
 
@@ -4304,6 +4424,9 @@ msgstr ""
 msgid "Write a commit message..."
 msgstr ""
 
+msgid "Yes"
+msgstr ""
+
 msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
 msgstr ""
 
@@ -4447,6 +4570,9 @@ msgstr ""
 msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
 msgstr ""
 
+msgid "for this project"
+msgstr ""
+
 msgid "importing"
 msgstr ""