Merge branch 'scootergrisen/gitlab-fix50' into 'master'

Fix all kinds of smaller problems in translation strings

See merge request gitlab-org/gitlab!73085

app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue

@@ -84,7 +84,7 @@ export default {
     ),
     subnetDropdownHelpPath: 'https://console.aws.amazon.com/vpc/home?#subnets',
     securityGroupDropdownHelpText: s__(
-      'ClusterIntegration|Choose the %{linkStart}security group %{linkEnd} to apply to the EKS-managed Elastic Network Interfaces that are created in your worker node subnets.',
+      'ClusterIntegration|Choose the %{linkStart}security group%{linkEnd} to apply to the EKS-managed Elastic Network Interfaces that are created in your worker node subnets.',
     ),
     securityGroupDropdownHelpPath: 'https://console.aws.amazon.com/vpc/home?#securityGroups',
     instanceTypesDropdownHelpText: s__(

app/assets/javascripts/ref/constants.js

@@ -15,9 +15,9 @@ export const DEFAULT_I18N = Object.freeze({
   searchPlaceholder: __('Search by Git revision'),
   noResultsWithQuery: __('No matching results for "%{query}"'),
   noResults: __('No matching results'),
-  branchesErrorMessage: __('An error occurred while fetching branches.  Retry the search.'),
+  branchesErrorMessage: __('An error occurred while fetching branches. Retry the search.'),
   tagsErrorMessage: __('An error occurred while fetching tags. Retry the search.'),
-  commitsErrorMessage: __('An error occurred while fetching commits.  Retry the search.'),
+  commitsErrorMessage: __('An error occurred while fetching commits. Retry the search.'),
   branches: __('Branches'),
   tags: __('Tags'),
   commits: __('Commits'),

app/views/projects/branches/_branch.html.haml

@@ -23,7 +23,7 @@
       - if commit
         = render 'projects/branches/commit', commit: commit, project: @project
       - else
-        = s_('Branches|Cant find HEAD commit for this branch')
+        = s_('Branches|Can’t find HEAD commit for this branch')
 
   - if branch.name != @repository.root_ref
     .js-branch-divergence-graph

app/views/projects/mirrors/_instructions.html.haml

@@ -3,7 +3,7 @@
     %li
       = html_escape(_('The repository must be accessible over %{code_open}http://%{code_close},
       %{code_open}https://%{code_close}, %{code_open}ssh://%{code_close} or %{code_open}git://%{code_close}.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
-    %li= html_escape(_('When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, provide the exact URL to the repository. HTTP redirects will not be followed.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
+    %li= html_escape(_('When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, please provide the exact URL to the repository. HTTP redirects will not be followed.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
     %li= html_escape(_('Include the username in the URL if required: %{code_open}https://username@gitlab.company.com/group/project.git%{code_close}.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
     %li
       - minutes = Gitlab.config.gitlab_shell.git_timeout / 60

app/views/projects/pages/_no_domains.html.haml

@@ -3,4 +3,4 @@
     .card-header
       = s_('GitLabPages|Domains')
     .nothing-here-block
-      = s_("GitLabPages|Support for domains and certificates is disabled.  Ask your system's administrator to enable it.")
+      = s_("GitLabPages|Support for domains and certificates is disabled. Ask your system's administrator to enable it.")

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

-- link = link_to _('MaxBuilds'), 'https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnersmachine-section', target: '_blank'
+-# "MaxBuilds" is a runner configuration keyword so it must not be translated.
+- link = link_to 'MaxBuilds', 'https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnersmachine-section', target: '_blank'
 
 %h4
   = _('Shared runners')

ee/app/views/groups/_self_or_ancestor_marked_for_deletion_notice.html.haml

@@ -6,5 +6,5 @@
     - if group.marked_for_deletion?
       = _("This group, its subgroups and projects has been scheduled for removal on %{date}.") % { date: permanent_deletion_date(group_pending_deletion.marked_for_deletion_on) }
     - else
-      = _("This group, its subgroups and projects will be removed on %{date} since its parent group '%{parent_group_name}'' has been scheduled for removal.") % { date: permanent_deletion_date(group_pending_deletion.marked_for_deletion_on), parent_group_name: group_pending_deletion.name }
+      = _("This group, its subgroups and projects will be removed on %{date} since its parent group '%{parent_group_name}' has been scheduled for removal.") % { date: permanent_deletion_date(group_pending_deletion.marked_for_deletion_on), parent_group_name: group_pending_deletion.name }
 

ee/app/views/shared/pages/_max_pages_size_input.html.haml

@@ -7,4 +7,4 @@
     = s_('GitLabPages|Maximum size of pages (MB)')
   = form.number_field :max_pages_size, value: form.object.max_pages_size, class: 'form-control', min: 0
   %span.form-text.text-muted#repository_size_limit_help_block
-    = s_('GitLabPages|The total size of deployed static content will be limited to this size.  0 for unlimited.  Leave empty to inherit the global value.')
+    = s_('GitLabPages|The total size of deployed static content will be limited to this size. 0 for unlimited. Leave empty to inherit the global value.')

locale/gitlab.pot

@@ -3610,7 +3610,7 @@ msgstr ""
 msgid "An error occurred while fetching ancestors"
 msgstr ""
 
-msgid "An error occurred while fetching branches.  Retry the search."
+msgid "An error occurred while fetching branches. Retry the search."
 msgstr ""
 
 msgid "An error occurred while fetching codequality mr diff reports."
@@ -3619,7 +3619,7 @@ msgstr ""
 msgid "An error occurred while fetching commit data."
 msgstr ""
 
-msgid "An error occurred while fetching commits.  Retry the search."
+msgid "An error occurred while fetching commits. Retry the search."
 msgstr ""
 
 msgid "An error occurred while fetching coverage reports."
@@ -5672,7 +5672,7 @@ msgstr ""
 msgid "Branches|Cancel, keep branch"
 msgstr ""
 
-msgid "Branches|Cant find HEAD commit for this branch"
+msgid "Branches|Can’t find HEAD commit for this branch"
 msgstr ""
 
 msgid "Branches|Compare"
@@ -7511,7 +7511,7 @@ msgstr ""
 msgid "ClusterIntegration|Check your token"
 msgstr ""
 
-msgid "ClusterIntegration|Choose the %{linkStart}security group %{linkEnd} to apply to the EKS-managed Elastic Network Interfaces that are created in your worker node subnets."
+msgid "ClusterIntegration|Choose the %{linkStart}security group%{linkEnd} to apply to the EKS-managed Elastic Network Interfaces that are created in your worker node subnets."
 msgstr ""
 
 msgid "ClusterIntegration|Choose the %{linkStart}subnets %{linkEnd} in your VPC where your worker nodes will run."
@@ -15695,10 +15695,10 @@ msgstr ""
 msgid "GitLabPages|Something went wrong while obtaining the Let's Encrypt certificate for %{domain}. To retry visit your %{link_start}domain details%{link_end}."
 msgstr ""
 
-msgid "GitLabPages|Support for domains and certificates is disabled.  Ask your system's administrator to enable it."
+msgid "GitLabPages|Support for domains and certificates is disabled. Ask your system's administrator to enable it."
 msgstr ""
 
-msgid "GitLabPages|The total size of deployed static content will be limited to this size.  0 for unlimited.  Leave empty to inherit the global value."
+msgid "GitLabPages|The total size of deployed static content will be limited to this size. 0 for unlimited. Leave empty to inherit the global value."
 msgstr ""
 
 msgid "GitLabPages|Unverified"
@@ -21051,9 +21051,6 @@ msgstr ""
 msgid "Max session time"
 msgstr ""
 
-msgid "MaxBuilds"
-msgstr ""
-
 msgid "Maximum 20 characters"
 msgstr ""
 
@@ -34921,7 +34918,7 @@ msgstr ""
 msgid "This group, its subgroups and projects has been scheduled for removal on %{date}."
 msgstr ""
 
-msgid "This group, its subgroups and projects will be removed on %{date} since its parent group '%{parent_group_name}'' has been scheduled for removal."
+msgid "This group, its subgroups and projects will be removed on %{date} since its parent group '%{parent_group_name}' has been scheduled for removal."
 msgstr ""
 
 msgid "This invitation was sent to %{mail_to_invite_email}, but you are signed in as %{link_to_current_user} with email %{mail_to_current_user}."
@@ -38517,9 +38514,6 @@ msgstr[1] ""
 msgid "When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, please provide the exact URL to the repository. HTTP redirects will not be followed."
 msgstr ""
 
-msgid "When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, provide the exact URL to the repository. HTTP redirects will not be followed."
-msgstr ""
-
 msgid "When:"
 msgstr ""