From 0ea669def2751873e3a5abf0df9851008b5425bc Mon Sep 17 00:00:00 2001 From: Tao Wang Date: Sat, 16 Jun 2018 15:30:22 +1000 Subject: [PATCH] i18n: externalize strings from 'app/views/shared/' Signed-off-by: Tao Wang --- .../shared/_allow_request_access.html.haml | 4 +- .../shared/_auto_devops_callout.html.haml | 2 +- app/views/shared/_clone_panel.html.haml | 2 +- .../_commit_message_container.html.haml | 7 +- app/views/shared/_confirm_modal.html.haml | 11 +- .../shared/_delete_label_modal.html.haml | 10 +- app/views/shared/_email_with_badge.html.haml | 2 +- app/views/shared/_field.html.haml | 2 +- app/views/shared/_group_form.html.haml | 12 +- app/views/shared/_group_tips.html.haml | 8 +- app/views/shared/_label_row.html.haml | 4 +- app/views/shared/_milestone_expired.html.haml | 6 +- app/views/shared/_milestones_filter.html.haml | 6 +- .../shared/_mini_pipeline_graph.html.haml | 2 +- app/views/shared/_no_password.html.haml | 2 +- app/views/shared/_no_ssh.html.haml | 2 +- app/views/shared/_outdated_browser.html.haml | 7 +- .../_personal_access_tokens_form.html.haml | 6 +- .../_personal_access_tokens_table.html.haml | 22 +- app/views/shared/_project_limit.html.haml | 6 +- app/views/shared/_promo.html.haml | 6 +- app/views/shared/_recaptcha_form.html.haml | 2 +- app/views/shared/_ref_dropdown.html.haml | 4 +- app/views/shared/_service_settings.html.haml | 4 +- .../shared/_sidebar_toggle_button.html.haml | 6 +- app/views/shared/_visibility_level.html.haml | 2 +- .../shared/badges/_badge_settings.html.haml | 2 +- app/views/shared/builds/_tabs.html.haml | 8 +- app/views/shared/deploy_keys/_form.html.haml | 8 +- .../shared/empty_states/_issues.html.haml | 4 +- .../empty_states/_priority_labels.html.haml | 2 +- .../form_elements/_description.html.haml | 4 +- app/views/shared/groups/_dropdown.html.haml | 6 +- app/views/shared/hook_logs/_content.html.haml | 16 +- app/views/shared/labels/_form.html.haml | 12 +- .../shared/notifications/_button.html.haml | 6 +- .../_custom_notifications.html.haml | 2 +- app/views/shared/plugins/_index.html.haml | 10 +- app/views/shared/projects/_dropdown.html.haml | 18 +- app/views/shared/projects/_list.html.haml | 4 +- app/views/shared/projects/_project.html.haml | 4 +- .../shared/projects/_search_form.html.haml | 2 +- app/views/shared/runners/_form.html.haml | 28 +- .../runners/_runner_description.html.haml | 12 +- app/views/shared/runners/show.html.haml | 38 +- app/views/shared/snippets/_blob.html.haml | 2 +- app/views/shared/snippets/_embed.html.haml | 2 +- app/views/shared/snippets/_form.html.haml | 12 +- app/views/shared/snippets/_header.html.haml | 5 +- app/views/shared/snippets/_snippet.html.haml | 2 +- .../shared/tokens/_scopes_list.html.haml | 2 +- app/views/shared/web_hooks/_form.html.haml | 52 +-- .../shared/web_hooks/_test_button.html.haml | 2 +- locale/gitlab.pot | 422 +++++++++++++++++- qa/qa/page/profile/personal_access_tokens.rb | 2 +- 55 files changed, 615 insertions(+), 221 deletions(-) diff --git a/app/views/shared/_allow_request_access.html.haml b/app/views/shared/_allow_request_access.html.haml index 92268e74b1eea8..87fce9f3d03cad 100644 --- a/app/views/shared/_allow_request_access.html.haml +++ b/app/views/shared/_allow_request_access.html.haml @@ -1,6 +1,6 @@ .form-check = form.check_box :request_access_enabled, class: 'form-check-input' = form.label :request_access_enabled, class: 'form-check-label' do - %strong Allow users to request access + %strong= _("Allow users to request access") %br - %span.descr Allow users to request access if visibility is public or internal. + %span.descr= _("Allow users to request access if visibility is public or internal.") diff --git a/app/views/shared/_auto_devops_callout.html.haml b/app/views/shared/_auto_devops_callout.html.haml index 084d295f2c1888..41ab526a6b76df 100644 --- a/app/views/shared/_auto_devops_callout.html.haml +++ b/app/views/shared/_auto_devops_callout.html.haml @@ -12,5 +12,5 @@ = link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'autodevops-settings'), class: 'btn js-close-callout' %button.btn-transparent.banner-close.close.js-close-callout{ type: 'button', - 'aria-label' => 'Dismiss Auto DevOps box' } + 'aria-label' => _('Dismiss Auto DevOps box') } = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true') diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index dd87962f330baf..107efcc5debe10 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -20,7 +20,7 @@ %li = kerberos_clone_button(project) - = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true, aria: { label: 'Project clone URL' } + = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true, aria: { label: _('Project clone URL') } .input-group-append = clipboard_button(target: '#project_clone', title: _("Copy URL to clipboard"), class: "input-group-text btn-default btn-clipboard") diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml index 68c14c307acd17..caf71681bedbe7 100644 --- a/app/views/shared/_commit_message_container.html.haml +++ b/app/views/shared/_commit_message_container.html.haml @@ -14,12 +14,11 @@ id: "commit_message-#{nonce}" - if local_assigns[:hint] %p.hint - Try to keep the first line under 52 characters - and the others under 72. + = _("Try to keep the first line under 52 characters and the others under 72.") - if descriptions.present? .hint.js-with-description-hint = link_to "#", class: "js-with-description-link" do - Include description in commit message + = _("Include description in commit message") .hint.js-without-description-hint.hide = link_to "#", class: "js-without-description-link" do - Don't include description in commit message + = _("Don't include description in commit message") diff --git a/app/views/shared/_confirm_modal.html.haml b/app/views/shared/_confirm_modal.html.haml index 73e0555f3b50a4..019f5f568f0bb8 100644 --- a/app/views/shared/_confirm_modal.html.haml +++ b/app/views/shared/_confirm_modal.html.haml @@ -3,7 +3,7 @@ .modal-content .modal-header %h3.page-title - Confirmation required + = _("Confirmation required") %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } %span{ "aria-hidden": true } × @@ -12,14 +12,11 @@ %p %span.js-warning-text - This action can lead to data loss. - To prevent accidental actions we ask you to confirm your intention. + = _('This action can lead to data loss. To prevent accidental actions we ask you to confirm your intention.') %br - Please type - %code.js-confirm-danger-match= phrase - to proceed or close this modal to cancel. + = _("Please type %{phrase} to proceed or close this modal to cancel.").html_safe % { phrase: phrase } .form-group = text_field_tag 'confirm_name_input', '', class: 'form-control js-confirm-danger-input' .form-actions - = submit_tag 'Confirm', class: "btn btn-danger js-confirm-danger-submit" + = submit_tag _('Confirm'), class: "btn btn-danger js-confirm-danger-submit" diff --git a/app/views/shared/_delete_label_modal.html.haml b/app/views/shared/_delete_label_modal.html.haml index b96380923aca47..76a1d72659d2b3 100644 --- a/app/views/shared/_delete_label_modal.html.haml +++ b/app/views/shared/_delete_label_modal.html.haml @@ -2,20 +2,22 @@ .modal-dialog .modal-content .modal-header - %h3.page-title Delete #{render_colored_label(label, tooltip: false)} ? + %h3.page-title= _("Delete %{label} ?") % { label: render_colored_label(label, tooltip: false) } %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } %span{ "aria-hidden": true } × .modal-body %p %strong= label.name - %span will be permanently deleted from #{label.is_a?(ProjectLabel)? label.project.name : label.group.name}. This cannot be undone. + %span + - project_or_group = label.is_a?(ProjectLabel)? label.project.name : label.group.name + = _("will be permanently deleted from %{project_or_group}. This cannot be undone.") .modal-footer %a{ href: '#', data: { dismiss: 'modal' }, class: 'btn btn-default' } Cancel - = link_to 'Delete label', + = link_to _('Delete label'), destroy_label_path(label), - title: 'Delete', + title: _('Delete'), method: :delete, class: 'btn btn-remove' diff --git a/app/views/shared/_email_with_badge.html.haml b/app/views/shared/_email_with_badge.html.haml index ad863b1967dacc..294fe74a5cacaf 100644 --- a/app/views/shared/_email_with_badge.html.haml +++ b/app/views/shared/_email_with_badge.html.haml @@ -1,6 +1,6 @@ - css_classes = %w(badge badge-verification-status) - css_classes << (verified ? 'verified': 'unverified') -- text = verified ? 'Verified' : 'Unverified' +- text = verified ? _('Verified') : _('Unverified') .email-badge .email-badge-email= email diff --git a/app/views/shared/_field.html.haml b/app/views/shared/_field.html.haml index b89045e726a493..5aa283b1c8972d 100644 --- a/app/views/shared/_field.html.haml +++ b/app/views/shared/_field.html.haml @@ -11,7 +11,7 @@ .form-group.row - if type == "password" && value.present? - = form.label name, "Enter new #{title.downcase}", class: "col-form-label col-sm-2" + = form.label name, _("Enter new %{title}") % { title: title.downcase }, class: "col-form-label col-sm-2" - else = form.label name, title, class: "col-form-label col-sm-2" .col-sm-10 diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml index dbed4b94d61aee..5a80117b1ddd38 100644 --- a/app/views/shared/_group_form.html.haml +++ b/app/views/shared/_group_form.html.haml @@ -4,7 +4,7 @@ .form-group.row = f.label :path, class: 'col-form-label col-sm-2' do - Group path + = _("Group path") .col-sm-10 .input-group.gl-field-error-anchor .group-root-path.input-group-prepend.has-tooltip{ title: group_path, :'data-placement' => 'bottom' } @@ -16,22 +16,22 @@ = f.text_field :path, placeholder: 'open-source', class: 'form-control', autofocus: local_assigns[:autofocus] || false, required: true, pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS, - title: 'Please choose a group path with no special characters.', + title: _('Please choose a group path with no special characters.'), "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}" - if @group.persisted? .alert.alert-warning.prepend-top-10 - Changing group path can have unintended side effects. + = _("Changing group path can have unintended side effects.") = succeed '.' do - = link_to 'Learn more', help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank' + = link_to _('Learn more'), help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank' .form-group.row.group-name-holder = f.label :name, class: 'col-form-label col-sm-2' do - Group name + = _("Group name") .col-sm-10 = f.text_field :name, class: 'form-control', required: true, - title: 'You can choose a descriptive name different from the path.' + title: _('You can choose a descriptive name different from the path.') - if @group.persisted? .form-group.row.group-name-holder diff --git a/app/views/shared/_group_tips.html.haml b/app/views/shared/_group_tips.html.haml index 46e4340511a5b1..f66284f104824b 100644 --- a/app/views/shared/_group_tips.html.haml +++ b/app/views/shared/_group_tips.html.haml @@ -1,5 +1,5 @@ %ul - %li A group is a collection of several projects - %li Members of a group may only view projects they have permission to access - %li Group project URLs are prefixed with the group namespace - %li Existing projects may be moved into a group + %li= _("A group is a collection of several projects") + %li= _("Members of a group may only view projects they have permission to access") + %li= _("Group project URLs are prefixed with the group namespace") + %li= _("Existing projects may be moved into a group") diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index 16c8fef86ae3d5..ceda5726997d20 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -17,11 +17,11 @@ %ul.label-links - if show_label_epics_link %li.label-link-item.inline - = link_to 'Epics', group_epics_path(@group, label_name:[label.name]) + = link_to _('Epics'), group_epics_path(@group, label_name:[label.name]) · - if show_label_issues_link %li.label-link-item.inline - = link_to_label(label, subject: subject) { 'Issues' } + = link_to_label(label, subject: subject) { _('Issues') } · - if show_label_merge_requests_link %li.label-link-item.inline diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml index 099e3ac8462c4e..65e91926357e48 100644 --- a/app/views/shared/_milestone_expired.html.haml +++ b/app/views/shared/_milestone_expired.html.haml @@ -1,6 +1,6 @@ - if milestone.expired? and not milestone.closed? - .status-box.status-box-expired.append-bottom-5 Expired + .status-box.status-box-expired.append-bottom-5= _("Expired") - if milestone.upcoming? - .status-box.status-box-mr-merged.append-bottom-5 Upcoming + .status-box.status-box-mr-merged.append-bottom-5= _("Upcoming") - if milestone.closed? - .status-box.status-box-closed.append-bottom-5 Closed + .status-box.status-box-closed.append-bottom-5= _("Closed") diff --git a/app/views/shared/_milestones_filter.html.haml b/app/views/shared/_milestones_filter.html.haml index 6c1ac20d54440a..3aefe0d39ab184 100644 --- a/app/views/shared/_milestones_filter.html.haml +++ b/app/views/shared/_milestones_filter.html.haml @@ -1,13 +1,13 @@ %ul.nav-links.mobile-separator.nav.nav-tabs %li{ class: milestone_class_for_state(params[:state], 'opened', true) }> = link_to milestones_filter_path(state: 'opened') do - Open + = _("Open") %span.badge.badge-pill= counts[:opened] %li{ class: milestone_class_for_state(params[:state], 'closed') }> = link_to milestones_filter_path(state: 'closed', sort: 'due_date_desc') do - Closed + = _("Closed") %span.badge.badge-pill= counts[:closed] %li{ class: milestone_class_for_state(params[:state], 'all') }> = link_to milestones_filter_path(state: 'all', sort: 'due_date_desc') do - All + = _("All") %span.badge.badge-pill= counts[:all] diff --git a/app/views/shared/_mini_pipeline_graph.html.haml b/app/views/shared/_mini_pipeline_graph.html.haml index ac2164a4a71d0b..641f83fef41dca 100644 --- a/app/views/shared/_mini_pipeline_graph.html.haml +++ b/app/views/shared/_mini_pipeline_graph.html.haml @@ -16,4 +16,4 @@ %li.js-builds-dropdown-loading.hidden .text-center - %i.fa.fa-spinner.fa-spin{ 'aria-hidden': 'true', 'aria-label': 'Loading' } + %i.fa.fa-spinner.fa-spin{ 'aria-hidden': 'true', 'aria-label': _('Loading') } diff --git a/app/views/shared/_no_password.html.haml b/app/views/shared/_no_password.html.haml index 9b1a467df6b00e..0cec67c9e36ac9 100644 --- a/app/views/shared/_no_password.html.haml +++ b/app/views/shared/_no_password.html.haml @@ -4,6 +4,6 @@ - set_password_message = _("You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account") % translation_params = set_password_message.html_safe .alert-link-group - = link_to _("Don't show again"), profile_path(user: {hide_no_password: true}), method: :put + = link_to _("Don't show again"), profile_path(user: { hide_no_password: true }), method: :put | = link_to _('Remind later'), '#', class: 'hide-no-password-message' diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml index 17ef5327341de2..1feb684b2fed9b 100644 --- a/app/views/shared/_no_ssh.html.haml +++ b/app/views/shared/_no_ssh.html.haml @@ -4,6 +4,6 @@ - ssh_message = _("You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile") % { add_ssh_key_link: add_ssh_key_link } = ssh_message.html_safe .alert-link-group - = link_to _("Don't show again"), profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link' + = link_to _("Don't show again"), profile_path(user: { hide_no_ssh_key: true }), method: :put, class: 'alert-link' | = link_to _('Remind later'), '#', class: 'hide-no-ssh-message alert-link' diff --git a/app/views/shared/_outdated_browser.html.haml b/app/views/shared/_outdated_browser.html.haml index 8ddb1b2bc99825..037284bae183fc 100644 --- a/app/views/shared/_outdated_browser.html.haml +++ b/app/views/shared/_outdated_browser.html.haml @@ -1,8 +1,7 @@ - if outdated_browser? .flash-container .flash-alert.text-center - GitLab may not work properly because you are using an outdated web browser. + = _("GitLab may not work properly because you are using an outdated web browser.") %br - Please install a - = link_to 'supported web browser', help_page_path('install/requirements', anchor: 'supported-web-browsers') - for a better experience. + - link_to_supported_browser = link_to(_('supported web browser'), help_page_path('install/requirements', anchor: 'supported-web-browsers')) + = _("Please install a %{link_to_supported_browser} for a better experience.").html_safe % { link_to_supported_browser: link_to_supported_browser } diff --git a/app/views/shared/_personal_access_tokens_form.html.haml b/app/views/shared/_personal_access_tokens_form.html.haml index 58d310fac16b59..8df42f744f26e7 100644 --- a/app/views/shared/_personal_access_tokens_form.html.haml +++ b/app/views/shared/_personal_access_tokens_form.html.haml @@ -1,9 +1,9 @@ - type = impersonation ? "impersonation" : "personal access" %h5.prepend-top-0 - Add a #{type} token + = _("Add a %{type} token") % { type: type } %p.profile-settings-content - Pick a name for the application, and we'll give you a unique #{type} token. + = _("Pick a name for the application, and we'll give you a unique %{type} token.") % { type: type } = form_for token, url: path, method: :post, html: { class: 'js-requires-input' } do |f| @@ -26,4 +26,4 @@ = render 'shared/tokens/scopes_form', prefix: 'personal_access_token', token: token, scopes: scopes .prepend-top-default - = f.submit "Create #{type} token", class: "btn btn-create" + = f.submit _("Create %{type} token") % { type: type }, class: "btn btn-create" diff --git a/app/views/shared/_personal_access_tokens_table.html.haml b/app/views/shared/_personal_access_tokens_table.html.haml index cadac1cc99d6c6..7005a6e146d816 100644 --- a/app/views/shared/_personal_access_tokens_table.html.haml +++ b/app/views/shared/_personal_access_tokens_table.html.haml @@ -1,22 +1,22 @@ -- type = impersonation ? "Impersonation" : "Personal Access" +- type = impersonation ? _("Impersonation") : _("Personal Access") %hr -%h5 Active #{type} Tokens (#{active_tokens.length}) +%h5= _("Active %{type} Tokens (%{active_tokens_length})") % { type: type, active_tokens_length: active_tokens.length } - if impersonation %p.profile-settings-content - To see all the user's personal access tokens you must impersonate them first. + = _("To see all the user's personal access tokens you must impersonate them first.") - if active_tokens.present? .table-responsive %table.table.active-tokens %thead %tr - %th Name - %th Created - %th Expires - %th Scopes + %th= _("Name") + %th= _("Created") + %th= _("Expires") + %th= _("Scopes") - if impersonation - %th Token + %th= _("Token") %th %tbody - active_tokens.each do |token| @@ -28,14 +28,14 @@ %span{ class: ('text-warning' if token.expires_soon?) } In #{distance_of_time_in_words_to_now(token.expires_at)} - else - %span.token-never-expires-label Never + %span.token-never-expires-label= _("Never") %td= token.scopes.present? ? token.scopes.join(", ") : "" - if impersonation %td.token-token-container = text_field_tag 'impersonation-token-token', token.token, readonly: true, class: "form-control" = clipboard_button(text: token.token) - path = impersonation ? revoke_admin_user_impersonation_token_path(token.user, token) : revoke_profile_personal_access_token_path(token) - %td= link_to "Revoke", path, method: :put, class: "btn btn-danger float-right", data: { confirm: "Are you sure you want to revoke this #{type} Token? This action cannot be undone." } + %td= link_to _("Revoke"), path, method: :put, class: "btn btn-danger float-right", data: { confirm: _("Are you sure you want to revoke this %{type} Token? This action cannot be undone.") % { type: type } } - else .settings-message.text-center - This user has no active #{type} Tokens. + = _("This user has no active %{type} Tokens.") % { type: type } diff --git a/app/views/shared/_project_limit.html.haml b/app/views/shared/_project_limit.html.haml index 2c52eccccb6a73..a8d7764211f35c 100644 --- a/app/views/shared/_project_limit.html.haml +++ b/app/views/shared/_project_limit.html.haml @@ -1,8 +1,8 @@ - if cookies[:hide_project_limit_message].blank? && !current_user.hide_project_limit && !current_user.can_create_project? && current_user.projects_limit > 0 .project-limit-message.alert.alert-warning.d-none.d-sm-block - You won't be able to create new projects because you have reached your project limit. + = _("You won't be able to create new projects because you have reached your project limit.") .float-right - = link_to "Don't show again", profile_path(user: {hide_project_limit: true}), method: :put, class: 'alert-link' + = link_to _("Don't show again"), profile_path(user: { hide_project_limit: true }), method: :put, class: 'alert-link' | - = link_to 'Remind later', '#', class: 'hide-project-limit-message alert-link' + = link_to _('Remind later'), '#', class: 'hide-project-limit-message alert-link' diff --git a/app/views/shared/_promo.html.haml b/app/views/shared/_promo.html.haml index 09edf4000d5f91..276e93decb5d5c 100644 --- a/app/views/shared/_promo.html.haml +++ b/app/views/shared/_promo.html.haml @@ -1,5 +1,5 @@ .gitlab-promo - = link_to 'Homepage', promo_url - = link_to 'Blog', promo_url + '/blog/' + = link_to _('Homepage'), promo_url + = link_to _('Blog'), promo_url + '/blog/' = link_to '@gitlab', 'https://twitter.com/gitlab' - = link_to 'Requests', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#feature-proposals' + = link_to _('Requests'), 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#feature-proposals' diff --git a/app/views/shared/_recaptcha_form.html.haml b/app/views/shared/_recaptcha_form.html.haml index a0ba1afc28425c..f014cc646cf72c 100644 --- a/app/views/shared/_recaptcha_form.html.haml +++ b/app/views/shared/_recaptcha_form.html.haml @@ -17,4 +17,4 @@ - if has_submit .row-content-block.footer-block - = f.submit "Submit #{humanized_resource_name}", class: 'btn btn-create' + = f.submit _("Submit %{humanized_resource_name}") % { humanized_resource_name: humanized_resource_name }, class: 'btn btn-create' diff --git a/app/views/shared/_ref_dropdown.html.haml b/app/views/shared/_ref_dropdown.html.haml index 8b2a3bee407545..b0833911685eda 100644 --- a/app/views/shared/_ref_dropdown.html.haml +++ b/app/views/shared/_ref_dropdown.html.haml @@ -1,7 +1,7 @@ - dropdown_class = local_assigns.fetch(:dropdown_class, '') .dropdown-menu.dropdown-menu-selectable.git-revision-dropdown{ class: dropdown_class } - = dropdown_title "Select Git revision" - = dropdown_filter "Filter by Git revision" + = dropdown_title _("Select Git revision") + = dropdown_filter _("Filter by Git revision") = dropdown_content = dropdown_loading diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index 6fa61c15493fe7..bfc1ed65e08e9e 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -10,13 +10,13 @@ .service-settings - if @service.show_active_box? .form-group.row - = form.label :active, "Active", class: "col-form-label col-sm-2" + = form.label :active, _("Active"), class: "col-form-label col-sm-2" .col-sm-10 = form.check_box :active, disabled: disable_fields_service?(@service) - if @service.configurable_events.present? .form-group.row - .col-sm-2.text-right Trigger + .col-sm-2.text-right= _("Trigger") .col-sm-10 - @service.configurable_events.each do |event| diff --git a/app/views/shared/_sidebar_toggle_button.html.haml b/app/views/shared/_sidebar_toggle_button.html.haml index 2530db986e049e..3b9c9b6fc8af39 100644 --- a/app/views/shared/_sidebar_toggle_button.html.haml +++ b/app/views/shared/_sidebar_toggle_button.html.haml @@ -1,8 +1,8 @@ -%a.toggle-sidebar-button.js-toggle-sidebar{ role: "button", type: "button", title: "Toggle sidebar" } +%a.toggle-sidebar-button.js-toggle-sidebar{ role: "button", type: "button", title: _("Toggle sidebar") } = sprite_icon('angle-double-left', css_class: 'icon-angle-double-left') = sprite_icon('angle-double-right', css_class: 'icon-angle-double-right') - %span.collapse-text Collapse sidebar + %span.collapse-text= _("Collapse sidebar") = button_tag class: 'close-nav-button', type: 'button' do = sprite_icon('close', size: 16) - %span.collapse-text Close sidebar + %span.collapse-text= _("Close sidebar") diff --git a/app/views/shared/_visibility_level.html.haml b/app/views/shared/_visibility_level.html.haml index 01ce1225b8d269..25a402a5cb8890 100644 --- a/app/views/shared/_visibility_level.html.haml +++ b/app/views/shared/_visibility_level.html.haml @@ -3,7 +3,7 @@ .form-group.row.visibility-level-setting - if with_label = f.label :visibility_level, class: 'col-form-label col-sm-2' do - Visibility Level + = _("Visibility Level") = link_to icon('question-circle'), help_page_path("public_access/public_access") %div{ :class => (with_label ? "col-sm-10" : "col-sm-12") } - if can_change_visibility_level diff --git a/app/views/shared/badges/_badge_settings.html.haml b/app/views/shared/badges/_badge_settings.html.haml index b7c250d3b1ced8..ed1eda81fe6550 100644 --- a/app/views/shared/badges/_badge_settings.html.haml +++ b/app/views/shared/badges/_badge_settings.html.haml @@ -1,4 +1,4 @@ #badge-settings{ data: { api_endpoint_url: @badge_api_endpoint, - docs_url: help_page_path('user/project/badges')} } + docs_url: help_page_path('user/project/badges') } } .text-center.prepend-top-default = icon('spinner spin 2x') diff --git a/app/views/shared/builds/_tabs.html.haml b/app/views/shared/builds/_tabs.html.haml index 5c74e71b644f04..55066f2824b637 100644 --- a/app/views/shared/builds/_tabs.html.haml +++ b/app/views/shared/builds/_tabs.html.haml @@ -1,24 +1,24 @@ %ul.nav-links.mobile-separator.nav.nav-tabs %li{ class: active_when(scope.nil?) }> = link_to build_path_proc.call(nil) do - All + = _("All") %span.badge.badge-pill.js-totalbuilds-count = limited_counter_with_delimiter(all_builds) %li{ class: active_when(scope == 'pending') }> = link_to build_path_proc.call('pending') do - Pending + = _("Pending") %span.badge.badge-pill = limited_counter_with_delimiter(all_builds.pending) %li{ class: active_when(scope == 'running') }> = link_to build_path_proc.call('running') do - Running + = _("Running") %span.badge.badge-pill = limited_counter_with_delimiter(all_builds.running) %li{ class: active_when(scope == 'finished') }> = link_to build_path_proc.call('finished') do - Finished + = _("Finished") %span.badge.badge-pill = limited_counter_with_delimiter(all_builds.finished) diff --git a/app/views/shared/deploy_keys/_form.html.haml b/app/views/shared/deploy_keys/_form.html.haml index 913c065e188574..099f1bfc20806c 100644 --- a/app/views/shared/deploy_keys/_form.html.haml +++ b/app/views/shared/deploy_keys/_form.html.haml @@ -13,8 +13,8 @@ = form.label :key, class: 'col-form-label col-sm-2' .col-sm-10 %p.light - Paste a machine public key here. Read more about how to generate it - = link_to 'here', help_page_path('ssh/README') + = _("Paste a machine public key here. Read more about how to generate it") + = link_to _('here'), help_page_path('ssh/README') = form.text_area :key, class: 'form-control thin_area', rows: 5 - else = form.label :fingerprint, class: 'col-form-label col-sm-2' @@ -28,6 +28,6 @@ .col-sm-10 = deploy_keys_project_form.label :can_push do = deploy_keys_project_form.check_box :can_push - %strong Write access allowed + %strong= _("Write access allowed") %p.light.append-bottom-0 - Allow this key to push to repository as well? (Default only allows pull access.) + = _("Allow this key to push to repository as well? (Default only allows pull access.)") diff --git a/app/views/shared/empty_states/_issues.html.haml b/app/views/shared/empty_states/_issues.html.haml index 2e26fe63d3ea4a..fd38da788cea3e 100644 --- a/app/views/shared/empty_states/_issues.html.haml +++ b/app/views/shared/empty_states/_issues.html.haml @@ -16,9 +16,9 @@ - if has_button .text-center - if project_select_button - = render 'shared/new_project_item_select', path: 'issues/new', label: 'New issue', type: :issues, with_feature_enabled: 'issues' + = render 'shared/new_project_item_select', path: 'issues/new', label: _('New issue'), type: :issues, with_feature_enabled: 'issues' - else - = link_to 'New issue', button_path, class: 'btn btn-success', title: 'New issue', id: 'new_issue_link' + = link_to _('New issue'), button_path, class: 'btn btn-success', title: _('New issue'), id: 'new_issue_link' - else %h4.text-center= _("There are no issues to show") %p diff --git a/app/views/shared/empty_states/_priority_labels.html.haml b/app/views/shared/empty_states/_priority_labels.html.haml index 555cb4f4af9af2..fe08243faab07e 100644 --- a/app/views/shared/empty_states/_priority_labels.html.haml +++ b/app/views/shared/empty_states/_priority_labels.html.haml @@ -1,4 +1,4 @@ .text-center .svg-content = image_tag 'illustrations/priority_labels.svg' - %p Star labels to start sorting by priority + %p= _("Star labels to start sorting by priority") diff --git a/app/views/shared/form_elements/_description.html.haml b/app/views/shared/form_elements/_description.html.haml index 25df2fe5cd6c57..8f030914fe2ef9 100644 --- a/app/views/shared/form_elements/_description.html.haml +++ b/app/views/shared/form_elements/_description.html.haml @@ -10,13 +10,13 @@ - preview_url = preview_markdown_path(project) .form-group.row.detail-page-description - = form.label :description, 'Description', class: 'col-form-label col-sm-2' + = form.label :description, _('Description'), class: 'col-form-label col-sm-2' .col-sm-10 = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do = render 'projects/zen', f: form, attr: :description, classes: 'note-textarea qa-issuable-form-description', - placeholder: "Write a comment or drag your files here…", + placeholder: _("Write a comment or drag your files here…"), supports_quick_actions: supports_quick_actions = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions .clearfix diff --git a/app/views/shared/groups/_dropdown.html.haml b/app/views/shared/groups/_dropdown.html.haml index 2237b93a10b642..19c95803e33545 100644 --- a/app/views/shared/groups/_dropdown.html.haml +++ b/app/views/shared/groups/_dropdown.html.haml @@ -24,10 +24,10 @@ %li.divider %li.js-filter-archived-projects = link_to filter_groups_path(archived: nil), class: ("is-active" unless params[:archived].present?) do - Hide archived projects + = _("Hide archived projects") %li.js-filter-archived-projects = link_to filter_groups_path(archived: true), class: ("is-active" if Gitlab::Utils.to_boolean(params[:archived])) do - Show archived projects + = _("Show archived projects") %li.js-filter-archived-projects = link_to filter_groups_path(archived: 'only'), class: ("is-active" if params[:archived] == 'only') do - Show archived projects only + = _("Show archived projects only") diff --git a/app/views/shared/hook_logs/_content.html.haml b/app/views/shared/hook_logs/_content.html.haml index f3b56df0c96428..61ca2a70a10908 100644 --- a/app/views/shared/hook_logs/_content.html.haml +++ b/app/views/shared/hook_logs/_content.html.haml @@ -1,19 +1,19 @@ %p - %strong Request URL: + %strong= _("Request URL:") POST = hook_log.url = render partial: 'shared/hook_logs/status_label', locals: { hook_log: hook_log } %p - %strong Trigger: + %strong= _("Trigger:") %td.d-none.d-sm-block %span.badge.badge-gray.deploy-project-label = hook_log.trigger.singularize.titleize %p - %strong Elapsed time: + %strong= _("Elapsed time:") #{number_with_precision(hook_log.execution_duration, precision: 2)} sec %p - %strong Request time: + %strong= _("Request time:") = time_ago_with_tooltip(hook_log.created_at) %hr @@ -22,23 +22,23 @@ .bs-callout.bs-callout-danger = hook_log.internal_error_message -%h5 Request headers: +%h5= _("Request headers:") %pre - hook_log.request_headers.each do |k,v| #{k}: #{v} %br -%h5 Request body: +%h5= _("Request body:") %pre :escaped #{JSON.pretty_generate(hook_log.request_data)} -%h5 Response headers: +%h5= _("Response headers:") %pre - hook_log.response_headers.each do |k,v| #{k}: #{v} %br -%h5 Response body: +%h5= _("Response body:") %pre :escaped #{hook_log.response_body} diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml index 2bf5efae1e6cff..7e1c002da562f6 100644 --- a/app/views/shared/labels/_form.html.haml +++ b/app/views/shared/labels/_form.html.haml @@ -10,16 +10,14 @@ .col-sm-10 = f.text_field :description, class: "form-control js-quick-submit" .form-group.row - = f.label :color, "Background color", class: 'col-form-label col-sm-2' + = f.label :color, _("Background color"), class: 'col-form-label col-sm-2' .col-sm-10 .input-group .input-group-prepend .input-group-text.label-color-preview   = f.text_field :color, class: "form-control" .form-text.text-muted - Choose any color. - %br - Or you can choose one of the suggested colors below + = _("Choose any color.
Or you can choose one of the suggested colors below").html_safe .suggest-colors - suggested_colors.each do |color| @@ -28,7 +26,7 @@ .form-actions - if @label.persisted? - = f.submit 'Save changes', class: 'btn btn-save js-save-button' + = f.submit _('Save changes'), class: 'btn btn-save js-save-button' - else - = f.submit 'Create label', class: 'btn btn-create js-save-button' - = link_to 'Cancel', back_path, class: 'btn btn-cancel' + = f.submit _('Create label'), class: 'btn btn-create js-save-button' + = link_to _('Cancel'), back_path, class: 'btn btn-cancel' diff --git a/app/views/shared/notifications/_button.html.haml b/app/views/shared/notifications/_button.html.haml index 09ddf732ada3ce..092d20ee6e0c26 100644 --- a/app/views/shared/notifications/_button.html.haml +++ b/app/views/shared/notifications/_button.html.haml @@ -6,14 +6,14 @@ .js-notification-toggle-btns %div{ class: ("btn-group" if notification_setting.custom?) } - if notification_setting.custom? - %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } } + %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: _("Notification setting"), "aria-label" => "#{_("Notification setting:")} #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } } = icon("bell", class: "js-notification-loading") = notification_title(notification_setting.level) %button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } } = icon('caret-down') - .sr-only Toggle dropdown + .sr-only= _("Toggle dropdown") - else - %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), display: 'static' } } + %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: _("Notification setting"), "aria-label" => "#{_("Notification setting:")} #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), display: 'static' } } = icon("bell", class: "js-notification-loading") = notification_title(notification_setting.level) = icon("caret-down") diff --git a/app/views/shared/notifications/_custom_notifications.html.haml b/app/views/shared/notifications/_custom_notifications.html.haml index 1f6e8f98bbb8cb..103168b4ad515c 100644 --- a/app/views/shared/notifications/_custom_notifications.html.haml +++ b/app/views/shared/notifications/_custom_notifications.html.haml @@ -3,7 +3,7 @@ .modal-content .modal-header %h4#custom-notifications-title.modal-title - #{ _('Custom notification events') } + = _('Custom notification events') %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } %span{ "aria-hidden": true } × diff --git a/app/views/shared/plugins/_index.html.haml b/app/views/shared/plugins/_index.html.haml index 7bcc54e7459dc4..5ea55d07b38aaa 100644 --- a/app/views/shared/plugins/_index.html.haml +++ b/app/views/shared/plugins/_index.html.haml @@ -3,16 +3,16 @@ .row.prepend-top-default .col-lg-4 %h4.prepend-top-0 - Plugins + = _("Plugins") %p - #{link_to 'Plugins', help_page_path('administration/plugins')} are similar to - system hooks but are executed as files instead of sending data to a URL. + - link_to_plugin = link_to(_('Plugins'), help_page_path('administration/plugins')) + = _("%{link_to_plugin} are similar to system hooks but are executed as files instead of sending data to a URL.") .col-lg-8.append-bottom-default - if plugins.any? .card .card-header - Plugins (#{plugins.count}) + = _("Plugins (%{count})") % { count: plugins.count } %ul.content-list - plugins.each do |file| %li @@ -20,4 +20,4 @@ = File.basename(file) - else %p.card.bg-light.text-center - No plugins found. + = _("No plugins found.") diff --git a/app/views/shared/projects/_dropdown.html.haml b/app/views/shared/projects/_dropdown.html.haml index 98b258d9275d54..887d6a53868fbb 100644 --- a/app/views/shared/projects/_dropdown.html.haml +++ b/app/views/shared/projects/_dropdown.html.haml @@ -4,7 +4,7 @@ = dropdown_toggle(toggle_text, { toggle: 'dropdown', display: 'static' }, { id: 'sort-projects-dropdown' }) %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable %li.dropdown-header - Sort by + = _("Sort by") - projects_sort_options_hash.each do |value, title| %li = link_to filter_projects_path(sort: value), class: ("is-active" if @sort == value) do @@ -13,29 +13,29 @@ %li.divider %li = link_to filter_projects_path(archived: nil), class: ("is-active" unless params[:archived].present?) do - Hide archived projects + = _("Hide archived projects") %li = link_to filter_projects_path(archived: true), class: ("is-active" if Gitlab::Utils.to_boolean(params[:archived])) do - Show archived projects + = _("Show archived projects") %li = link_to filter_projects_path(archived: 'only'), class: ("is-active" if params[:archived] == 'only') do - Show archived projects only + = _("Show archived projects only") - if current_user %li.divider %li = link_to filter_projects_path(personal: nil), class: ("is-active" unless params[:personal].present?) do - Owned by anyone + = _("Owned by anyone") %li = link_to filter_projects_path(personal: true), class: ("is-active" if params[:personal].present?) do - Owned by me + = _("Owned by me") - if @group && @group.shared_projects.present? %li.divider %li = link_to filter_projects_path(shared: nil), class: ("is-active" unless params[:shared].present?) do - All projects + = _("All projects") %li = link_to filter_projects_path(shared: 0), class: ("is-active" if params[:shared] == '0') do - Hide shared projects + = _("Hide shared projects") %li = link_to filter_projects_path(shared: 1), class: ("is-active" if params[:shared] == '1') do - Hide group projects + = _("Hide group projects") diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml index e1da05d8f08cc3..b695d67ba40450 100644 --- a/app/views/shared/projects/_list.html.haml +++ b/app/views/shared/projects/_list.html.haml @@ -24,7 +24,7 @@ %li.project-row.private-forks-notice = icon('lock fw', base: 'circle', class: 'fa-lg private-fork-icon') %strong= pluralize(@private_forks_count, 'private fork') - %span  you have no access to. + %span  #{_("you have no access to.")} = paginate_collection(projects, remote: remote) - else - .nothing-here-block No projects found + .nothing-here-block= _("No projects found") diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index be053d481e433c..be0b83e2a28542 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -46,7 +46,7 @@ .controls .prepend-top-0 - if project.archived - %span.prepend-left-10.badge.badge-warning archived + %span.prepend-left-10.badge.badge-warning= _("archived") - if can?(current_user, :read_cross_project) && project.pipeline_status.has_status? %span.prepend-left-10 = render_project_pipeline_status(project.pipeline_status) @@ -61,4 +61,4 @@ %span.prepend-left-10.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(project) } = visibility_level_icon(project.visibility_level, fw: true) .prepend-top-0 - updated #{updated_tooltip} + = _("updated %{time_ago}").html_safe % { time_ago: updated_tooltip } diff --git a/app/views/shared/projects/_search_form.html.haml b/app/views/shared/projects/_search_form.html.haml index b89194bcc677c0..ed549d34e1460e 100644 --- a/app/views/shared/projects/_search_form.html.haml +++ b/app/views/shared/projects/_search_form.html.haml @@ -1,6 +1,6 @@ = form_tag filter_projects_path, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f| = search_field_tag :name, params[:name], - placeholder: 'Filter by name...', + placeholder: _('Filter by name...'), class: 'project-filter-form-field form-control input-short js-projects-list-filter', spellcheck: false, id: 'project-filter-form-field', diff --git a/app/views/shared/runners/_form.html.haml b/app/views/shared/runners/_form.html.haml index 0337680d79b1cd..9d3fad6b3a130b 100644 --- a/app/views/shared/runners/_form.html.haml +++ b/app/views/shared/runners/_form.html.haml @@ -1,23 +1,23 @@ = form_for runner, url: runner_form_url do |f| = form_errors(runner) .form-group.row - = label :active, "Active", class: 'col-form-label col-sm-2' + = label :active, _("Active"), class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.check_box :active, { class: 'form-check-input' } - %span.light Paused Runners don't accept new jobs + %span.light= _("Paused Runners don't accept new jobs") .form-group.row - = label :protected, "Protected", class: 'col-form-label col-sm-2' + = label :protected, _("Protected"), class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.check_box :access_level, { class: 'form-check-input' }, 'ref_protected', 'not_protected' - %span.light This runner will only run on pipelines triggered on protected branches + %span.light= _("This runner will only run on pipelines triggered on protected branches") .form-group.row - = label :run_untagged, 'Run untagged jobs', class: 'col-form-label col-sm-2' + = label :run_untagged, _('Run untagged jobs'), class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.check_box :run_untagged, { class: 'form-check-input' } - %span.light Indicates whether this runner can pick jobs without tags + %span.light= _("Indicates whether this runner can pick jobs without tags") - unless runner.group_type? .form-group.row = label :locked, _('Lock to current projects'), class: 'col-form-label col-sm-2' @@ -27,30 +27,30 @@ %span.light= _('When a runner is locked, it cannot be assigned to other projects') .form-group.row = label_tag :token, class: 'col-form-label col-sm-2' do - Token + = _("Token") .col-sm-10 = f.text_field :token, class: 'form-control', readonly: true .form-group.row = label_tag :ip_address, class: 'col-form-label col-sm-2' do - IP Address + = _("IP Address") .col-sm-10 = f.text_field :ip_address, class: 'form-control', readonly: true .form-group.row = label_tag :description, class: 'col-form-label col-sm-2' do - Description + = _("Description") .col-sm-10 = f.text_field :description, class: 'form-control' .form-group.row = label_tag :maximum_timeout_human_readable, class: 'col-form-label col-sm-2' do - Maximum job timeout + = _("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 + .form-text.text-muted= _("This timeout will take precedence when lower than Project-defined timeout") .form-group.row = label_tag :tag_list, class: 'col-form-label col-sm-2' do - Tags + = _("Tags") .col-sm-10 = f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control' - .form-text.text-muted You can setup jobs to only use Runners with specific tags. Separate tags with commas. + .form-text.text-muted= _("You can setup jobs to only use Runners with specific tags. Separate tags with commas.") .form-actions - = f.submit 'Save changes', class: 'btn btn-save' + = f.submit _('Save changes'), class: 'btn btn-save' diff --git a/app/views/shared/runners/_runner_description.html.haml b/app/views/shared/runners/_runner_description.html.haml index da5c032add5dad..8af875c1b6730d 100644 --- a/app/views/shared/runners/_runner_description.html.haml +++ b/app/views/shared/runners/_runner_description.html.haml @@ -1,16 +1,14 @@ .light.prepend-top-default %p - = _("A 'Runner' is a process which runs a job. You can setup as many Runners as you need.") - %br - = _('Runners can be placed on separate users, servers, and even on your local machine.') + = _("A 'Runner' is a process which runs a job. You can setup as many Runners as you need.
Runners can be placed on separate users, servers, and even on your local machine.").html_safe %p = _('Each Runner can be in one of the following states:') %div %ul %li - %span.badge.badge-success active - = _('- Runner is active and can process any new jobs') + %span.badge.badge-success= _("active") + \- #{_('Runner is active and can process any new jobs')} %li - %span.badge.badge-danger paused - = _('- Runner is paused and will not receive any new jobs') + %span.badge.badge-danger= _("paused") + \- #{_('Runner is paused and will not receive any new jobs')} diff --git a/app/views/shared/runners/show.html.haml b/app/views/shared/runners/show.html.haml index 362569bfbafc4f..f64ee161c9a3c0 100644 --- a/app/views/shared/runners/show.html.haml +++ b/app/views/shared/runners/show.html.haml @@ -1,71 +1,71 @@ -- page_title "#{@runner.description} ##{@runner.id}", "Runners" +- page_title "#{@runner.description} ##{@runner.id}", _("Runners") %h3.page-title Runner ##{@runner.id} .float-right - if @runner.instance_type? %span.runner-state.runner-state-shared - Shared + = _("Shared") - elsif @runner.group_type? %span.runner-state.runner-state-shared - Group + = _("Group") - else %span.runner-state.runner-state-specific - Specific + = _("Specific") .table-holder %table.table %thead %tr - %th Property Name - %th Value + %th= _("Property Name") + %th= _("Value") %tr %td Active - %td= @runner.active? ? 'Yes' : 'No' + %td= @runner.active? ? _('Yes') : _('No') %tr %td Protected %td= @runner.active? ? _('Yes') : _('No') %tr %td Can run untagged jobs - %td= @runner.run_untagged? ? 'Yes' : 'No' + %td= @runner.run_untagged? ? _('Yes') : _('No') - unless @runner.group_type? %tr %td Locked to this project - %td= @runner.locked? ? 'Yes' : 'No' + %td= @runner.locked? ? _('Yes') : _('No') %tr - %td Tags + %td= _("Tags") %td - @runner.tag_list.sort.each do |tag| %span.badge.badge-primary = tag %tr - %td Name + %td= _("Name") %td= @runner.name %tr - %td Version + %td= _("Version") %td= @runner.version %tr - %td IP Address + %td= _("IP Address") %td= @runner.ip_address %tr - %td Revision + %td= _("Revision") %td= @runner.revision %tr - %td Platform + %td= _("Platform") %td= @runner.platform %tr - %td Architecture + %td= _("Architecture") %td= @runner.architecture %tr - %td Description + %td= _("Description") %td= @runner.description %tr %td Maximum job timeout %td= @runner.maximum_timeout_human_readable %tr - %td Last contact + %td= _("Last contact") %td - if @runner.contacted_at = time_ago_with_tooltip @runner.contacted_at - else - Never + = _("Never") diff --git a/app/views/shared/snippets/_blob.html.haml b/app/views/shared/snippets/_blob.html.haml index 2132fcbccc57e8..b7a7c1a4b49b1d 100644 --- a/app/views/shared/snippets/_blob.html.haml +++ b/app/views/shared/snippets/_blob.html.haml @@ -9,6 +9,6 @@ = copy_blob_source_button(blob) = open_raw_blob_button(blob) - = link_to icon('download'), download_snippet_path(@snippet), target: '_blank', class: "btn btn-sm has-tooltip", title: 'Download', data: { container: 'body' } + = link_to icon('download'), download_snippet_path(@snippet), target: '_blank', class: "btn btn-sm has-tooltip", title: _('Download'), data: { container: 'body' } = render 'projects/blob/content', blob: blob diff --git a/app/views/shared/snippets/_embed.html.haml b/app/views/shared/snippets/_embed.html.haml index c7f0511d1def70..5ca014eb12e0e7 100644 --- a/app/views/shared/snippets/_embed.html.haml +++ b/app/views/shared/snippets/_embed.html.haml @@ -10,7 +10,7 @@ %small = number_to_human_size(blob.raw_size) - %a.gitlab-logo{ href: url_for(only_path: false, overwrite_params: nil), title: 'view on gitlab' } + %a.gitlab-logo{ href: url_for(only_path: false, overwrite_params: nil), title: _('view on gitlab') } on   %span.logo-text GitLab diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml index 5e5c050d5c378e..0bc46f324a6c59 100644 --- a/app/views/shared/snippets/_form.html.haml +++ b/app/views/shared/snippets/_form.html.haml @@ -18,11 +18,11 @@ .file-editor .form-group.row - = f.label :file_name, "File", class: 'col-form-label col-sm-2' + = f.label :file_name, _("File"), class: 'col-form-label col-sm-2' .col-sm-10 .file-holder.snippet .js-file-title.file-title - = f.text_field :file_name, placeholder: "Optionally name this file to add code highlighting, e.g. example.rb for Ruby.", class: 'form-control snippet-file-name' + = f.text_field :file_name, placeholder: _("Optionally name this file to add code highlighting, e.g. example.rb for Ruby."), class: 'form-control snippet-file-name' .file-content.code %pre#editor= @snippet.content = f.hidden_field :content, class: 'snippet-file-content' @@ -32,11 +32,11 @@ .form-actions - if @snippet.new_record? - = f.submit 'Create snippet', class: "btn-create btn" + = f.submit _('Create snippet'), class: "btn-create btn" - else - = f.submit 'Save changes', class: "btn-save btn" + = f.submit _('Save changes'), class: "btn-save btn" - if @snippet.project_id - = link_to "Cancel", project_snippets_path(@project), class: "btn btn-cancel" + = link_to _("Cancel"), project_snippets_path(@project), class: "btn btn-cancel" - else - = link_to "Cancel", snippets_path(@project), class: "btn btn-cancel" + = link_to _("Cancel"), snippets_path(@project), class: "btn btn-cancel" diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index 10bfc30492aa85..4ec67571297c76 100644 --- a/app/views/shared/snippets/_header.html.haml +++ b/app/views/shared/snippets/_header.html.haml @@ -5,9 +5,8 @@ = visibility_level_label(@snippet.visibility_level) = visibility_level_icon(@snippet.visibility_level, fw: false) %span.creator - Authored - = time_ago_with_tooltip(@snippet.created_at, placement: 'bottom', html_class: 'snippet_updated_ago') - by #{link_to_member(@project, @snippet.author, size: 24, author_class: "author item-title", avatar_class: "d-none d-sm-inline")} + - link_to_author = link_to_member(@project, @snippet.author, size: 24, author_class: "author item-title", avatar_class: "d-none d-sm-inline") + = _("Authored %{time_ago} by %{author}").html_safe % { time_ago: time_ago_with_tooltip(@snippet.created_at, placement: 'bottom', html_class: 'snippet_updated_ago'), author: link_to_author } = user_status(@snippet.author) .detail-page-header-actions diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml index 5069e2e4ca6e2c..2696bb091ff5d0 100644 --- a/app/views/shared/snippets/_snippet.html.haml +++ b/app/views/shared/snippets/_snippet.html.haml @@ -34,4 +34,4 @@ = snippet.project.full_name .float-right.snippet-updated-at - %span updated #{time_ago_with_tooltip(snippet.updated_at, placement: 'bottom')} + %span= _("updated %{time_ago}").html_safe % { time_ago: time_ago_with_tooltip(snippet.updated_at, placement: 'bottom') } diff --git a/app/views/shared/tokens/_scopes_list.html.haml b/app/views/shared/tokens/_scopes_list.html.haml index f99e905e95c7b2..c56ef8bddc7ddd 100644 --- a/app/views/shared/tokens/_scopes_list.html.haml +++ b/app/views/shared/tokens/_scopes_list.html.haml @@ -4,7 +4,7 @@ %tr %td - Scopes + = _("Scopes") %td %ul.scopes-list.append-bottom-0 - token.scopes.each do |scope| diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml index 07ebb8680d24d5..b9559468d64299 100644 --- a/app/views/shared/web_hooks/_form.html.haml +++ b/app/views/shared/web_hooks/_form.html.haml @@ -1,79 +1,79 @@ = form_errors(hook) .form-group - = form.label :url, 'URL', class: 'label-bold' + = form.label :url, _('URL'), class: 'label-bold' = form.text_field :url, class: 'form-control', placeholder: 'http://example.com/trigger-ci.json' .form-group - = form.label :token, 'Secret Token', class: 'label-bold' + = form.label :token, _('Secret Token'), class: 'label-bold' = form.text_field :token, class: 'form-control', placeholder: '' %p.form-text.text-muted - Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header. + = _("Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header.") .form-group - = form.label :url, 'Trigger', class: 'label-bold' + = form.label :url, _('Trigger'), class: 'label-bold' %ul.list-unstyled.prepend-left-20 %li = form.check_box :push_events, class: 'form-check-input' = form.label :push_events, class: 'list-label form-check-label ml-1' do - %strong Push events + %strong= _("Push events") %p.light.ml-1 - This URL will be triggered by a push to the repository + = _("This URL will be triggered by a push to the repository") %li = form.check_box :tag_push_events, class: 'form-check-input' = form.label :tag_push_events, class: 'list-label form-check-label ml-1' do - %strong Tag push events + %strong= _("Tag push events") %p.light.ml-1 - This URL will be triggered when a new tag is pushed to the repository + = _("This URL will be triggered when a new tag is pushed to the repository") %li = form.check_box :note_events, class: 'form-check-input' = form.label :note_events, class: 'list-label form-check-label ml-1' do - %strong Comments + %strong= _("Comments") %p.light.ml-1 - This URL will be triggered when someone adds a comment + = _("This URL will be triggered when someone adds a comment") %li = form.check_box :confidential_note_events, class: 'form-check-input' = form.label :confidential_note_events, class: 'list-label form-check-label ml-1' do - %strong Confidential Comments + %strong= _("Confidential Comments") %p.light.ml-1 - This URL will be triggered when someone adds a comment on a confidential issue + = _("This URL will be triggered when someone adds a comment on a confidential issue") %li = form.check_box :issues_events, class: 'form-check-input' = form.label :issues_events, class: 'list-label form-check-label ml-1' do - %strong Issues events + %strong= _("Issues events") %p.light.ml-1 - This URL will be triggered when an issue is created/updated/merged + = _("This URL will be triggered when an issue is created/updated/merged") %li = form.check_box :confidential_issues_events, class: 'form-check-input' = form.label :confidential_issues_events, class: 'list-label form-check-label ml-1' do - %strong Confidential Issues events + %strong= _("Confidential Issues events") %p.light.ml-1 - This URL will be triggered when a confidential issue is created/updated/merged + = _("This URL will be triggered when a confidential issue is created/updated/merged") %li = form.check_box :merge_requests_events, class: 'form-check-input' = form.label :merge_requests_events, class: 'list-label form-check-label ml-1' do - %strong Merge request events + %strong= _("Merge request events") %p.light.ml-1 - This URL will be triggered when a merge request is created/updated/merged + = _("This URL will be triggered when a merge request is created/updated/merged") %li = form.check_box :job_events, class: 'form-check-input' = form.label :job_events, class: 'list-label form-check-label ml-1' do - %strong Job events + %strong= _("Job events") %p.light.ml-1 - This URL will be triggered when the job status changes + = _("This URL will be triggered when the job status changes") %li = form.check_box :pipeline_events, class: 'form-check-input' = form.label :pipeline_events, class: 'list-label form-check-label ml-1' do - %strong Pipeline events + %strong= _("Pipeline events") %p.light.ml-1 - This URL will be triggered when the pipeline status changes + = _("This URL will be triggered when the pipeline status changes") %li = form.check_box :wiki_page_events, class: 'form-check-input' = form.label :wiki_page_events, class: 'list-label form-check-label ml-1' do - %strong Wiki Page events + %strong= _("Wiki Page events") %p.light.ml-1 - This URL will be triggered when a wiki page is created/updated + = _("This URL will be triggered when a wiki page is created/updated") .form-group - = form.label :enable_ssl_verification, 'SSL verification', class: 'label-bold checkbox' + = form.label :enable_ssl_verification, _('SSL verification'), class: 'label-bold checkbox' .form-check = form.check_box :enable_ssl_verification, class: 'form-check-input' = form.label :enable_ssl_verification, class: 'form-check-label ml-1' do - %strong Enable SSL verification + %strong= _("Enable SSL verification") diff --git a/app/views/shared/web_hooks/_test_button.html.haml b/app/views/shared/web_hooks/_test_button.html.haml index 5ece8b1d4c70ec..40cd884de60994 100644 --- a/app/views/shared/web_hooks/_test_button.html.haml +++ b/app/views/shared/web_hooks/_test_button.html.haml @@ -4,7 +4,7 @@ .hook-test-button.dropdown.inline %button.btn{ 'data-toggle' => 'dropdown', class: button_class } - Test + = _("Test") = icon('caret-down') %ul.dropdown-menu.dropdown-menu-right{ role: 'menu' } - triggers.each_value do |event| diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0ea8789d6cbfc5..c0cd2a3c695072 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -122,6 +122,9 @@ msgstr "" msgid "%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects." msgstr "" +msgid "%{link_to_plugin} are similar to system hooks but are executed as files instead of sending data to a URL." +msgstr "" + msgid "%{loadingIcon} Started" msgstr "" @@ -191,12 +194,6 @@ 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 "" @@ -306,12 +303,15 @@ msgstr "" msgid "Removes source branch" msgstr "" -msgid "A 'Runner' is a process which runs a job. You can setup as many Runners as you need." +msgid "A 'Runner' is a process which runs a job. You can setup as many Runners as you need.
Runners can be placed on separate users, servers, and even on your local machine." msgstr "" msgid "A collection of graphs regarding Continuous Integration" msgstr "" +msgid "A group is a collection of several projects" +msgstr "" + msgid "A new branch will be created in your fork and a new merge request will be started." msgstr "" @@ -372,6 +372,9 @@ msgstr "" msgid "Active" msgstr "" +msgid "Active %{type} Tokens (%{active_tokens_length})" +msgstr "" + msgid "Active Sessions" msgstr "" @@ -399,6 +402,9 @@ msgstr "" msgid "Add Readme" msgstr "" +msgid "Add a %{type} token" +msgstr "" + msgid "Add additional text to appear in all email communications. %{character_limit} character limit" msgstr "" @@ -507,6 +513,9 @@ msgstr "" msgid "All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings." msgstr "" +msgid "All projects" +msgstr "" + msgid "All users" msgstr "" @@ -522,6 +531,15 @@ msgstr "" msgid "Allow requests to the local network from hooks and services." msgstr "" +msgid "Allow this key to push to repository as well? (Default only allows pull access.)" +msgstr "" + +msgid "Allow users to request access" +msgstr "" + +msgid "Allow users to request access if visibility is public or internal." +msgstr "" + msgid "Allows you to add and manage Kubernetes clusters." msgstr "" @@ -702,6 +720,9 @@ msgstr "" msgid "April" msgstr "" +msgid "Architecture" +msgstr "" + msgid "Archived project! Repository and other project resources are read-only" msgstr "" @@ -726,6 +747,9 @@ msgstr "" msgid "Are you sure you want to reset the health check token?" msgstr "" +msgid "Are you sure you want to revoke this %{type} Token? This action cannot be undone." +msgstr "" + msgid "Are you sure you want to unlock %{path_lock_path}?" msgstr "" @@ -804,6 +828,9 @@ msgstr "" msgid "Author" msgstr "" +msgid "Authored %{time_ago} by %{author}" +msgstr "" + msgid "Authorization code:" msgstr "" @@ -1340,6 +1367,9 @@ msgstr "" msgid "Changes are shown as if the source revision was being merged into the target revision." msgstr "" +msgid "Changing group path can have unintended side effects." +msgstr "" + msgid "Charts" msgstr "" @@ -1376,6 +1406,9 @@ msgstr "" msgid "Choose any color." msgstr "" +msgid "Choose any color.
Or you can choose one of the suggested colors below" +msgstr "" + msgid "Choose between clone or fetch to get the recent application code" msgstr "" @@ -1535,6 +1568,9 @@ msgstr "" msgid "Close" msgstr "" +msgid "Close sidebar" +msgstr "" + msgid "Closed" msgstr "" @@ -2052,6 +2088,12 @@ msgstr "" msgid "Confidential" msgstr "" +msgid "Confidential Comments" +msgstr "" + +msgid "Confidential Issues events" +msgstr "" + msgid "Confidentiality" msgstr "" @@ -2079,6 +2121,12 @@ msgstr "" msgid "Configure the way a user creates a new account." msgstr "" +msgid "Confirm" +msgstr "" + +msgid "Confirmation required" +msgstr "" + msgid "Connect" msgstr "" @@ -2226,6 +2274,9 @@ msgstr "" msgid "Create" msgstr "" +msgid "Create %{type} token" +msgstr "" + msgid "Create New Directory" msgstr "" @@ -2268,6 +2319,9 @@ msgstr "" msgid "Create issue" msgstr "" +msgid "Create label" +msgstr "" + msgid "Create lists from labels. Issues with that label appear in that list." msgstr "" @@ -2298,6 +2352,9 @@ msgstr "" msgid "Create project label" msgstr "" +msgid "Create snippet" +msgstr "" + msgid "CreateNewFork|Fork" msgstr "" @@ -2424,9 +2481,15 @@ msgstr "" msgid "Delete" msgstr "" +msgid "Delete %{label} ?" +msgstr "" + msgid "Delete Snippet" msgstr "" +msgid "Delete label" +msgstr "" + msgid "Delete list" msgstr "" @@ -2624,6 +2687,9 @@ msgstr "" msgid "Dismiss" msgstr "" +msgid "Dismiss Auto DevOps box" +msgstr "" + msgid "Dismiss Cycle Analytics introduction box" msgstr "" @@ -2639,6 +2705,9 @@ msgstr "" msgid "Domain" msgstr "" +msgid "Don't include description in commit message" +msgstr "" + msgid "Don't show again" msgstr "" @@ -2708,6 +2777,9 @@ msgstr "" msgid "Edit identity for %{user_name}" msgstr "" +msgid "Elapsed time:" +msgstr "" + msgid "Elasticsearch" msgstr "" @@ -2738,6 +2810,9 @@ msgstr "" msgid "Enable SAML authentication for this group" msgstr "" +msgid "Enable SSL verification" +msgstr "" + msgid "Enable Sentry for error reporting and logging." msgstr "" @@ -2780,6 +2855,9 @@ msgstr "" msgid "Enter in your Bitbucket Server URL and personal access token below" msgstr "" +msgid "Enter new %{title}" +msgstr "" + msgid "Environments" msgstr "" @@ -2966,6 +3044,9 @@ msgstr "" msgid "Everyone can contribute" msgstr "" +msgid "Existing projects may be moved into a group" +msgstr "" + msgid "Expand" msgstr "" @@ -2975,6 +3056,12 @@ msgstr "" msgid "Expand sidebar" msgstr "" +msgid "Expired" +msgstr "" + +msgid "Expires" +msgstr "" + msgid "Explore" msgstr "" @@ -3056,6 +3143,9 @@ msgstr "" msgid "Fields on this page are now uneditable, you can configure" msgstr "" +msgid "File" +msgstr "" + msgid "Files" msgstr "" @@ -3068,9 +3158,15 @@ msgstr "" msgid "Filter" msgstr "" +msgid "Filter by Git revision" +msgstr "" + msgid "Filter by commit message" msgstr "" +msgid "Filter by name..." +msgstr "" + msgid "Find by path" msgstr "" @@ -3496,6 +3592,9 @@ msgstr "" msgid "GitLab User" msgstr "" +msgid "GitLab may not work properly because you are using an outdated web browser." +msgstr "" + msgid "GitLab project export" msgstr "" @@ -3580,6 +3679,15 @@ msgstr "" msgid "Group maintainers can register group runners in the %{link}" msgstr "" +msgid "Group name" +msgstr "" + +msgid "Group path" +msgstr "" + +msgid "Group project URLs are prefixed with the group namespace" +msgstr "" + msgid "Group: %{group_name}" msgstr "" @@ -3745,9 +3853,18 @@ msgstr "" msgid "Here is the public SSH key that needs to be added to the remote server. For more information, please refer to the documentation." msgstr "" +msgid "Hide archived projects" +msgstr "" + +msgid "Hide group projects" +msgstr "" + msgid "Hide host keys manual input" msgstr "" +msgid "Hide shared projects" +msgstr "" + msgid "Hide value" msgid_plural "Hide values" msgstr[0] "" @@ -3759,6 +3876,9 @@ msgstr "" msgid "History" msgstr "" +msgid "Homepage" +msgstr "" + msgid "Housekeeping successfully started" msgstr "" @@ -3807,6 +3927,9 @@ msgstr "" msgid "IDE|Review" msgstr "" +msgid "IP Address" +msgstr "" + msgid "Identifier" msgstr "" @@ -3846,6 +3969,9 @@ msgstr "" msgid "ImageDiffViewer|Swipe" msgstr "" +msgid "Impersonation" +msgstr "" + msgid "Import" msgstr "" @@ -3915,12 +4041,18 @@ msgstr "" msgid "Include a Terms of Service agreement and Privacy Policy that all users must accept." msgstr "" +msgid "Include description in commit message" +msgstr "" + msgid "Include the username in the URL if required: https://username@gitlab.company.com/group/project.git." msgstr "" msgid "Incompatible Project" msgstr "" +msgid "Indicates whether this runner can pick jobs without tags" +msgstr "" + msgid "Inline" msgstr "" @@ -3995,6 +4127,9 @@ msgstr "" msgid "Issues closed" msgstr "" +msgid "Issues events" +msgstr "" + msgid "Jan" msgstr "" @@ -4004,6 +4139,9 @@ msgstr "" msgid "Job" msgstr "" +msgid "Job events" +msgstr "" + msgid "Job has been erased" msgstr "" @@ -4111,6 +4249,9 @@ msgstr "" msgid "Last commit" msgstr "" +msgid "Last contact" +msgstr "" + msgid "Last edited %{date}" msgstr "" @@ -4239,6 +4380,9 @@ msgstr "" msgid "Live preview" msgstr "" +msgid "Loading" +msgstr "" + msgid "Loading contribution stats for group members" msgstr "" @@ -4347,6 +4491,9 @@ msgstr "" msgid "Maximum git storage failures" msgstr "" +msgid "Maximum job timeout" +msgstr "" + msgid "May" msgstr "" @@ -4356,6 +4503,9 @@ msgstr "" msgid "Members" msgstr "" +msgid "Members of a group may only view projects they have permission to access" +msgstr "" + msgid "Members will be forwarded here when signing in to your group. Get this from your identity provider, where it can also be called \"SSO Service Location\", \"SAML Token Issuance Endpoint\", or \"SAML 2.0/W-Federation URL\"." msgstr "" @@ -4380,6 +4530,9 @@ msgstr "" msgid "Merge request approvals" msgstr "" +msgid "Merge request events" +msgstr "" + msgid "Merge requests" msgstr "" @@ -4790,9 +4943,15 @@ msgstr "" msgid "No other labels with such name or description" msgstr "" +msgid "No plugins found." +msgstr "" + msgid "No prioritised labels with such name or description" msgstr "" +msgid "No projects found" +msgstr "" + msgid "No public groups" msgstr "" @@ -4859,6 +5018,12 @@ msgstr "" msgid "Notification events" msgstr "" +msgid "Notification setting" +msgstr "" + +msgid "Notification setting:" +msgstr "" + msgid "NotificationEvent|Close issue" msgstr "" @@ -5002,6 +5167,9 @@ msgstr "" msgid "Operations" msgstr "" +msgid "Optionally name this file to add code highlighting, e.g. example.rb for Ruby." +msgstr "" + msgid "Optionally, you can %{link_to_customize} how FogBugz email addresses and usernames are imported into GitLab." msgstr "" @@ -5032,6 +5200,12 @@ msgstr "" msgid "Overwrite diverged branches" msgstr "" +msgid "Owned by anyone" +msgstr "" + +msgid "Owned by me" +msgstr "" + msgid "Owner" msgstr "" @@ -5056,6 +5230,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "Paste a machine public key here. Read more about how to generate it" +msgstr "" + msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key." msgstr "" @@ -5065,6 +5242,9 @@ msgstr "" msgid "Pause" msgstr "" +msgid "Paused Runners don't accept new jobs" +msgstr "" + msgid "Pending" msgstr "" @@ -5083,9 +5263,15 @@ msgstr "" msgid "Permissions" msgstr "" +msgid "Personal Access" +msgstr "" + msgid "Personal Access Token" msgstr "" +msgid "Pick a name for the application, and we'll give you a unique %{type} token." +msgstr "" + msgid "Pipeline" msgstr "" @@ -5098,6 +5284,9 @@ msgstr "" msgid "Pipeline Schedules" msgstr "" +msgid "Pipeline events" +msgstr "" + msgid "Pipeline quota" msgstr "" @@ -5260,18 +5449,27 @@ msgstr "" msgid "PlantUML" msgstr "" +msgid "Platform" +msgstr "" + msgid "Play" msgstr "" msgid "Please accept the Terms of Service before continuing." msgstr "" +msgid "Please choose a group path with no special characters." +msgstr "" + msgid "Please convert them to %{link_to_git}, and go through the %{link_to_import_flow} again." msgstr "" msgid "Please convert them to Git on Google Code, and go through the %{link_to_import_flow} again." msgstr "" +msgid "Please install a %{link_to_supported_browser} for a better experience." +msgstr "" + msgid "Please note that this application is not provided by GitLab and you should verify its authenticity before allowing access." msgstr "" @@ -5284,12 +5482,21 @@ msgstr "" msgid "Please try again" msgstr "" +msgid "Please type %{phrase} to proceed or close this modal to cancel." +msgstr "" + msgid "Please wait while we connect to your repository. Refresh at will." msgstr "" msgid "Please wait while we import the repository for you. Refresh at will." msgstr "" +msgid "Plugins" +msgstr "" + +msgid "Plugins (%{count})" +msgstr "" + msgid "Preferences" msgstr "" @@ -5452,6 +5659,9 @@ msgstr "" msgid "Project avatar in repository: %{link}" msgstr "" +msgid "Project clone URL" +msgstr "" + msgid "Project details" msgstr "" @@ -5683,6 +5893,12 @@ msgstr "" msgid "Promotions|Upgrade plan" msgstr "" +msgid "Property Name" +msgstr "" + +msgid "Protected" +msgstr "" + msgid "Protip:" msgstr "" @@ -5883,6 +6099,21 @@ msgstr "" msgid "Request Access" msgstr "" +msgid "Request URL:" +msgstr "" + +msgid "Request body:" +msgstr "" + +msgid "Request headers:" +msgstr "" + +msgid "Request time:" +msgstr "" + +msgid "Requests" +msgstr "" + msgid "Requests Profiles" msgstr "" @@ -5907,6 +6138,12 @@ msgstr "" msgid "Resolve discussion" msgstr "" +msgid "Response body:" +msgstr "" + +msgid "Response headers:" +msgstr "" + msgid "Response metrics (Custom)" msgstr "" @@ -5945,6 +6182,9 @@ msgstr "" msgid "Reviewing (merge request !%{mergeRequestId})" msgstr "" +msgid "Revision" +msgstr "" + msgid "Revoke" msgstr "" @@ -5954,6 +6194,15 @@ msgstr "" msgid "Run CI/CD pipelines for external repositories" msgstr "" +msgid "Run untagged jobs" +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 "Runner token" msgstr "" @@ -5963,9 +6212,6 @@ msgstr "" msgid "Runners API" msgstr "" -msgid "Runners can be placed on separate users, servers, and even on your local machine." -msgstr "" - msgid "Running" msgstr "" @@ -5996,6 +6242,9 @@ msgstr "" msgid "SSL Verification" msgstr "" +msgid "SSL verification" +msgstr "" + msgid "Save" msgstr "" @@ -6029,6 +6278,9 @@ msgstr "" msgid "Scoped issue boards" msgstr "" +msgid "Scopes" +msgstr "" + msgid "Scroll down to Google Code Project Hosting and enable the switch on the right." msgstr "" @@ -6098,6 +6350,9 @@ msgstr "" msgid "Seconds to wait for a storage access attempt" msgstr "" +msgid "Secret Token" +msgstr "" + msgid "Secret:" msgstr "" @@ -6130,6 +6385,9 @@ msgstr "" msgid "Select Archive Format" msgstr "" +msgid "Select Git revision" +msgstr "" + msgid "Select a namespace to fork the project" msgstr "" @@ -6238,6 +6496,9 @@ msgstr "" msgid "Share the %{sso_label} with members so they can sign in to your group through your identity provider" msgstr "" +msgid "Shared" +msgstr "" + msgid "Shared Runners" msgstr "" @@ -6253,6 +6514,12 @@ msgstr "" msgid "Sherlock Transactions" msgstr "" +msgid "Show archived projects" +msgstr "" + +msgid "Show archived projects only" +msgstr "" + msgid "Show command" msgstr "" @@ -6492,6 +6759,9 @@ msgstr "" msgid "Spam and Anti-bot Protection" msgstr "" +msgid "Specific" +msgstr "" + msgid "Specific Runners" msgstr "" @@ -6522,6 +6792,9 @@ msgstr "" msgid "Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging." msgstr "" +msgid "Star labels to start sorting by priority" +msgstr "" + msgid "StarProject|Star" msgstr "" @@ -6570,6 +6843,9 @@ msgstr "" msgid "Subgroups" msgstr "" +msgid "Submit %{humanized_resource_name}" +msgstr "" + msgid "Submit as spam" msgstr "" @@ -6608,6 +6884,9 @@ msgid_plural "Tags (%{tag_count})" msgstr[0] "" msgstr[1] "" +msgid "Tag push events" +msgstr "" + msgid "Tags" msgstr "" @@ -6701,6 +6980,9 @@ msgstr "" msgid "Terms of Service and Privacy Policy" msgstr "" +msgid "Test" +msgstr "" + msgid "Test coverage parsing" msgstr "" @@ -6875,6 +7157,39 @@ 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 URL will be triggered by a push to the repository" +msgstr "" + +msgid "This URL will be triggered when a confidential issue is created/updated/merged" +msgstr "" + +msgid "This URL will be triggered when a merge request is created/updated/merged" +msgstr "" + +msgid "This URL will be triggered when a new tag is pushed to the repository" +msgstr "" + +msgid "This URL will be triggered when a wiki page is created/updated" +msgstr "" + +msgid "This URL will be triggered when an issue is created/updated/merged" +msgstr "" + +msgid "This URL will be triggered when someone adds a comment" +msgstr "" + +msgid "This URL will be triggered when someone adds a comment on a confidential issue" +msgstr "" + +msgid "This URL will be triggered when the job status changes" +msgstr "" + +msgid "This URL will be triggered when the pipeline status changes" +msgstr "" + +msgid "This action can lead to data loss. To prevent accidental actions we ask you to confirm your intention." +msgstr "" + msgid "This application was created by %{link_to_owner}." msgstr "" @@ -6974,9 +7289,18 @@ msgstr "" msgid "This repository" msgstr "" +msgid "This runner will only run on pipelines triggered on protected branches" +msgstr "" + msgid "This source diff could not be displayed because it is too large." msgstr "" +msgid "This timeout will take precedence when lower than Project-defined timeout" +msgstr "" + +msgid "This user has no active %{type} Tokens." +msgstr "" + msgid "This user has no identities" msgstr "" @@ -7209,6 +7533,9 @@ msgstr "" msgid "To only use CI/CD features for an external repository, choose CI/CD for external repo." msgstr "" +msgid "To see all the user's personal access tokens you must impersonate them first." +msgstr "" + msgid "To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:" msgstr "" @@ -7239,6 +7566,9 @@ msgstr "" msgid "Toggle discussion" msgstr "" +msgid "Toggle dropdown" +msgstr "" + msgid "Toggle navigation" msgstr "" @@ -7251,6 +7581,9 @@ msgstr "" msgid "ToggleButton|Toggle Status: ON" msgstr "" +msgid "Token" +msgstr "" + msgid "Too many changes to show." msgstr "" @@ -7278,6 +7611,9 @@ msgstr "" msgid "Trending" msgstr "" +msgid "Trigger" +msgstr "" + msgid "Trigger pipelines for mirror updates" msgstr "" @@ -7287,18 +7623,27 @@ msgstr "" msgid "Trigger this manual action" msgstr "" +msgid "Trigger:" +msgstr "" + msgid "Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions." msgstr "" msgid "Try again" msgstr "" +msgid "Try to keep the first line under 52 characters and the others under 72." +msgstr "" + msgid "Turn on Service Desk" msgstr "" msgid "Twitter" msgstr "" +msgid "URL" +msgstr "" + msgid "Unable to load the diff. %{button_try_again}" msgstr "" @@ -7353,6 +7698,9 @@ msgstr "" msgid "Up to date" msgstr "" +msgid "Upcoming" +msgstr "" + msgid "Update" msgstr "" @@ -7419,6 +7767,9 @@ msgstr "" msgid "Use the following registration token during setup:" msgstr "" +msgid "Use this token to validate received payloads. It will be sent with the request in the X-Gitlab-Token HTTP header." +msgstr "" + msgid "Use your global notification setting" msgstr "" @@ -7440,6 +7791,9 @@ msgstr "" msgid "User|Current status" msgstr "" +msgid "Value" +msgstr "" + msgid "Variables" msgstr "" @@ -7461,6 +7815,9 @@ msgstr "" msgid "Verified" msgstr "" +msgid "Version" +msgstr "" + msgid "View epics list" msgstr "" @@ -7494,6 +7851,9 @@ msgstr "" msgid "View replaced file @ " msgstr "" +msgid "Visibility Level" +msgstr "" + msgid "Visibility and access controls" msgstr "" @@ -7557,6 +7917,9 @@ msgstr "" msgid "Wiki" msgstr "" +msgid "Wiki Page events" +msgstr "" + msgid "WikiClone|Clone your wiki" msgstr "" @@ -7695,6 +8058,12 @@ msgstr "" msgid "Withdraw Access Request" msgstr "" +msgid "Write a comment or drag your files here…" +msgstr "" + +msgid "Write access allowed" +msgstr "" + msgid "Yes" msgstr "" @@ -7737,6 +8106,9 @@ msgstr "" msgid "You can also test your .gitlab-ci.yml in the %{linkStart}Lint%{linkEnd}" msgstr "" +msgid "You can choose a descriptive name different from the path." +msgstr "" + msgid "You can easily contribute to them by requesting to join these groups." msgstr "" @@ -7755,6 +8127,9 @@ 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 "" +msgid "You can setup jobs to only use Runners with specific tags. Separate tags with commas." +msgstr "" + msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead." msgstr "" @@ -7809,6 +8184,9 @@ msgstr "" msgid "You will receive notifications only for comments in which you were @mentioned" msgstr "" +msgid "You won't be able to create new projects because you have reached your project limit." +msgstr "" + msgid "You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account" msgstr "" @@ -7875,6 +8253,9 @@ msgstr "" msgid "a deleted user" msgstr "" +msgid "active" +msgstr "" + msgid "ago" msgstr "" @@ -7891,6 +8272,9 @@ msgid_plural "and %d fixed vulnerabilities" msgstr[0] "" msgstr[1] "" +msgid "archived" +msgstr "" + msgid "assign yourself" msgstr "" @@ -8456,6 +8840,9 @@ msgstr[1] "" msgid "password" msgstr "" +msgid "paused" +msgstr "" + msgid "personal access token" msgstr "" @@ -8480,12 +8867,18 @@ msgstr "" msgid "started" msgstr "" +msgid "supported web browser" +msgstr "" + msgid "this document" msgstr "" msgid "to help your contributors communicate effectively!" msgstr "" +msgid "updated %{time_ago}" +msgstr "" + msgid "username" msgstr "" @@ -8495,6 +8888,12 @@ msgstr "" msgid "view it on GitLab" msgstr "" +msgid "view on gitlab" +msgstr "" + +msgid "will be permanently deleted from %{project_or_group}. This cannot be undone." +msgstr "" + msgid "with %{additions} additions, %{deletions} deletions." msgstr "" @@ -8502,3 +8901,6 @@ msgid "within %d minute " msgid_plural "within %d minutes " msgstr[0] "" msgstr[1] "" + +msgid "you have no access to." +msgstr "" diff --git a/qa/qa/page/profile/personal_access_tokens.rb b/qa/qa/page/profile/personal_access_tokens.rb index f5ae47dadd055e..f1876710f8bc48 100644 --- a/qa/qa/page/profile/personal_access_tokens.rb +++ b/qa/qa/page/profile/personal_access_tokens.rb @@ -4,7 +4,7 @@ module Profile class PersonalAccessTokens < Page::Base view 'app/views/shared/_personal_access_tokens_form.html.haml' do element :personal_access_token_name_field, 'text_field :name' - element :create_token_button, 'submit "Create #{type} token"' # rubocop:disable Lint/InterpolationCheck + element :create_token_button, 'submit _("Create %{type} token")' element :scopes_api_radios, "label :scopes" end -- GitLab