diff --git a/app/views/projects/_bitbucket_import_modal.html.haml b/app/views/projects/_bitbucket_import_modal.html.haml index c54a4ceb8901b85fee459e1739ee62d5c6f1f401..4deb017c5339ec3d186c749f0d9017c43c227d29 100644 --- a/app/views/projects/_bitbucket_import_modal.html.haml +++ b/app/views/projects/_bitbucket_import_modal.html.haml @@ -2,13 +2,13 @@ .modal-dialog .modal-content .modal-header - %h3.modal-title Import projects from Bitbucket + %h3.modal-title= _("Import projects from Bitbucket") %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } %span{ "aria-hidden": true } × .modal-body - To enable importing projects from Bitbucket, + = _("To enable importing projects from Bitbucket,") - if current_user.admin? - as administrator you need to configure + = _("as administrator you need to configure") - else - ask your GitLab administrator to configure - = link_to 'OAuth integration', help_page_path("integration/bitbucket") + = _("ask your GitLab administrator to configure") + = link_to _('OAuth integration'), help_page_path("integration/bitbucket") diff --git a/app/views/projects/_commit_button.html.haml b/app/views/projects/_commit_button.html.haml index b387e38c1a68fbc4ad4e93c6cc1f017a0d81d212..da42690eb985dec39392e1e8063807a3be9bbdc0 100644 --- a/app/views/projects/_commit_button.html.haml +++ b/app/views/projects/_commit_button.html.haml @@ -1,6 +1,6 @@ .form-actions - = button_tag 'Commit changes', class: 'btn commit-btn js-commit-button btn-create' - = link_to 'Cancel', cancel_path, + = button_tag _('Commit changes'), class: 'btn commit-btn js-commit-button btn-create' + = link_to _('Cancel'), cancel_path, class: 'btn btn-cancel', data: {confirm: leave_edit_message} = render 'shared/projects/edit_information' diff --git a/app/views/projects/_customize_workflow.html.haml b/app/views/projects/_customize_workflow.html.haml index a41791f0eca25aac153efef51426143225cff375..9eebd6fc292453ac8794d42774ae33eb0ffa37c4 100644 --- a/app/views/projects/_customize_workflow.html.haml +++ b/app/views/projects/_customize_workflow.html.haml @@ -1,8 +1,8 @@ .row-content-block.project-home-empty .text-center{ class: container_class } %h4 - Customize your workflow! + = _("Customize your workflow!") %p - Get started with GitLab by enabling features that work best for your project. From issues and wikis, to merge requests and pipelines, GitLab can help manage your workflow from idea to production! + = _("Get started with GitLab by enabling features that work best for your project. From issues and wikis, to merge requests and pipelines, GitLab can help manage your workflow from idea to production!") - if can?(current_user, :admin_project, @project) - = link_to "Get started", edit_project_path(@project), class: "btn btn-success" + = link_to _("Get started"), edit_project_path(@project), class: "btn btn-success" diff --git a/app/views/projects/_deletion_failed.html.haml b/app/views/projects/_deletion_failed.html.haml index 4f3698f91e6747a7064e2fa36d746e83d256bd68..c768a687c5e076254d6d3f00630dd07f2a51e215 100644 --- a/app/views/projects/_deletion_failed.html.haml +++ b/app/views/projects/_deletion_failed.html.haml @@ -2,5 +2,5 @@ - return unless project.delete_error.present? .project-deletion-failed-message.alert.alert-warning - This project was scheduled for deletion, but failed with the following message: + = _("This project was scheduled for deletion, but failed with the following message:") = project.delete_error diff --git a/app/views/projects/_export.html.haml b/app/views/projects/_export.html.haml index aa980da7e95a72ee5411d384b5e9025230de9a8a..6cfa2556446eefdd2eb9a47ade045a04d04ce65d 100644 --- a/app/views/projects/_export.html.haml +++ b/app/views/projects/_export.html.haml @@ -6,36 +6,36 @@ %section.settings.no-animate#js-export-project{ class: ('expanded' if expanded) } .settings-header %h4 - Export project + = _("Export project") %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p - Export this project with all its related data in order to move your project to a new GitLab instance. Once the export is finished, you can import the file from the "New Project" page. + = _('Export this project with all its related data in order to move your project to a new GitLab instance. Once the export is finished, you can import the file from the "New Project" page.') .settings-content .bs-callout.bs-callout-info %p.append-bottom-0 %p - The following items will be exported: + = _("The following items will be exported:") %ul - %li Project and wiki repositories - %li Project uploads - %li Project configuration including web hooks and services - %li Issues with comments, merge requests with diffs and comments, labels, milestones, snippets, and other project entities - %li LFS objects + %li= _("Project and wiki repositories") + %li= _("Project uploads") + %li= _("Project configuration including web hooks and services") + %li= _("Issues with comments, merge requests with diffs and comments, labels, milestones, snippets, and other project entities") + %li= _("LFS objects") %p - The following items will NOT be exported: + = _("The following items will NOT be exported:") %ul - %li Job traces and artifacts - %li Container registry images - %li CI variables - %li Any encrypted tokens + %li= _("Job traces and artifacts") + %li= _("Container registry images") + %li= _("CI variables") + %li= _("Any encrypted tokens") %p - Once the exported file is ready, you will receive a notification email with a download link, or you can download it from this page. + = _("Once the exported file is ready, you will receive a notification email with a download link, or you can download it from this page.") - if project.export_status == :finished - = link_to 'Download export', download_export_project_path(project), + = link_to _('Download export'), download_export_project_path(project), rel: 'nofollow', download: '', method: :get, class: "btn btn-default" - = link_to 'Generate new export', generate_new_export_project_path(project), + = link_to _('Generate new export'), generate_new_export_project_path(project), method: :post, class: "btn btn-default" - else - = link_to 'Export project', export_project_path(project), + = link_to _('Export project'), export_project_path(project), method: :post, class: "btn btn-default" diff --git a/app/views/projects/_fork_suggestion.html.haml b/app/views/projects/_fork_suggestion.html.haml index c855bfaf06789ad1d94a516541657b7e3f24d2b4..4c8bedd4f24674eda703b54d1bb55cc21998f926 100644 --- a/app/views/projects/_fork_suggestion.html.haml +++ b/app/views/projects/_fork_suggestion.html.haml @@ -1,11 +1,7 @@ - if current_user .js-file-fork-suggestion-section.file-fork-suggestion.hidden %span.file-fork-suggestion-note - You're not allowed to - %span.js-file-fork-suggestion-section-action - edit - files in this project directly. Please fork this project, - make your changes there, and submit a merge request. - = link_to 'Fork', nil, method: :post, class: 'js-fork-suggestion-button btn btn-grouped btn-inverted btn-new' + = _("You're not allowed to edit files in this project directly. Please fork this project, make your changes there, and submit a merge request.").html_safe + = link_to _('Fork'), nil, method: :post, class: 'js-fork-suggestion-button btn btn-grouped btn-inverted btn-new' %button.js-cancel-fork-suggestion-button.btn.btn-grouped{ type: 'button' } - Cancel + = _("Cancel") diff --git a/app/views/projects/_gitlab_import_modal.html.haml b/app/views/projects/_gitlab_import_modal.html.haml index 5519415cdc3485b8def1d3cdc1298289ca2930be..0d7666d9475861d787e422b679a11147adef83e0 100644 --- a/app/views/projects/_gitlab_import_modal.html.haml +++ b/app/views/projects/_gitlab_import_modal.html.haml @@ -2,13 +2,13 @@ .modal-dialog .modal-content .modal-header - %h3.modal-title Import projects from GitLab.com + %h3.modal-title= _("Import projects from GitLab.com") %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } %span{ "aria-hidden": true } × .modal-body - To enable importing projects from GitLab.com, + = _("To enable importing projects from GitLab.com,") - if current_user.admin? - as administrator you need to configure + = _("as administrator you need to configure") - else - ask your GitLab administrator to configure - = link_to 'OAuth integration', help_page_path("integration/gitlab") + = _("ask your GitLab administrator to configure") + = link_to _('OAuth integration'), help_page_path("integration/gitlab") diff --git a/app/views/projects/_import_project_pane.html.haml b/app/views/projects/_import_project_pane.html.haml index 70e1c55754742f59bf5f06fbaae63f080b7c9dcb..96a8754f5328ea572bea0a207d81e91c850fc009 100644 --- a/app/views/projects/_import_project_pane.html.haml +++ b/app/views/projects/_import_project_pane.html.haml @@ -3,22 +3,22 @@ .project-import .form-group.import-btn-container.clearfix %h5 - Import project from + = _("Import project from") .import-buttons - if gitlab_project_import_enabled? .import_gitlab_project.has-tooltip{ data: { container: 'body' } } = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do - = icon('gitlab', text: 'GitLab export') + = icon('gitlab', text: _('GitLab export')) - if github_import_enabled? %div = link_to new_import_github_path, class: 'btn js-import-github' do - = icon('github', text: 'GitHub') + = icon('github', text: _('GitHub')) - if bitbucket_import_enabled? %div = link_to status_import_bitbucket_path, class: "btn import_bitbucket #{'how_to_import_link' unless bitbucket_import_configured?}" do - = icon('bitbucket', text: 'Bitbucket Cloud') + = icon('bitbucket', text: _('Bitbucket Cloud')) - unless bitbucket_import_configured? = render 'bitbucket_import_modal' - if bitbucket_server_import_enabled? @@ -29,14 +29,14 @@ - if gitlab_import_enabled? %div = link_to status_import_gitlab_path, class: "btn import_gitlab #{'how_to_import_link' unless gitlab_import_configured?}" do - = icon('gitlab', text: 'GitLab.com') + = icon('gitlab', text: _('GitLab.com')) - unless gitlab_import_configured? = render 'gitlab_import_modal' - if google_code_import_enabled? %div = link_to new_import_google_code_path, class: 'btn import_google_code' do - = icon('google', text: 'Google Code') + = icon('google', text: _('Google Code')) - if fogbugz_import_enabled? %div @@ -52,12 +52,12 @@ - if git_import_enabled? %div %button.btn.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active' } } - = icon('git', text: 'Repo by URL') + = icon('git', text: _('Repo by URL')) - if manifest_import_enabled? %div = link_to new_import_manifest_path, class: 'btn import_manifest' do - = icon('file-text-o', text: 'Manifest file') + = icon('file-text-o', text: _('Manifest file')) .js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'import') } = form_for @project, html: { class: 'new_project' } do |f| diff --git a/app/views/projects/_issuable_by_email.html.haml b/app/views/projects/_issuable_by_email.html.haml index 22adf5b40085b0747ea9d3b2b5e9ba3104aba4f9..6e67a06654e1afff8dbcba474005c00616b06093 100644 --- a/app/views/projects/_issuable_by_email.html.haml +++ b/app/views/projects/_issuable_by_email.html.haml @@ -1,27 +1,27 @@ -- name = issuable_type == 'issue' ? 'issue' : 'merge request' +- name = issuable_type == 'issue' ? _('issue') : _('merge request') .issuable-footer.text-center %button.issuable-email-modal-btn{ type: "button", data: { toggle: "modal", target: "#issuable-email-modal" } } - Email a new #{name} to this project + = _("Email a new %{name} to this project") % { name: name } #issuable-email-modal.modal.fade{ tabindex: "-1", role: "dialog" } .modal-dialog{ role: "document" } .modal-content .modal-header %h4.modal-title - Create new #{name} by email + = _("Create new %{name} by email") % { name: name } %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } %span{ "aria-hidden": true } × .modal-body %p - You can create a new #{name} inside this project by sending an email to the following email address: + = _("You can create a new %{name} inside this project by sending an email to the following email address:") % { name: name } .email-modal-input-group.input-group = text_field_tag :issuable_email, email, class: "monospace js-select-on-focus form-control", readonly: true .input-group-append = clipboard_button(target: '#issuable_email', class: 'btn btn-clipboard input-group-text btn-transparent d-none d-sm-block') = mail_to email, class: 'btn btn-clipboard btn-transparent', - subject: _("Enter the #{name} title"), - body: _("Enter the #{name} description"), + subject: _("Enter the %{name} title") % { name: name }, + body: _("Enter the %{name} description") % { name: name }, title: _('Send email'), data: { toggle: 'tooltip', placement: 'bottom' } do = sprite_icon('mail') @@ -29,9 +29,5 @@ %p = render 'by_email_description' %p - This is a private email address, generated just for you. - - Anyone who gets ahold of it can create issues or merge requests as if they were you. - You should - = link_to 'reset it', new_issuable_address_project_path(@project, issuable_type: issuable_type), class: 'incoming-email-token-reset' - if that ever happens. + - link_to_reset_it = link_to 'reset it', new_issuable_address_project_path(@project, issuable_type: issuable_type), class: 'incoming-email-token-reset' + = _("This is a private email address, generated just for you. Anyone who gets ahold of it can create issues or merge requests as if they were you. You should %{reset_it} if that ever happens.").html_safe % { reset_it: link_to_reset_it } diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index 8fb6aa55436395e9b6360bace7f084f06685e252..449d43d30c95a224cc40fa24f9b805c4bc06fbfc 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -12,20 +12,20 @@ %ul.nav.nav-tabs.nav-links.clearfix %li.md-header-tab.active %a.js-md-write-button{ href: "#md-write-holder", tabindex: -1 } - Write + = _("Write") %li.md-header-tab %a.js-md-preview-button{ href: "#md-preview-holder", tabindex: -1 } - Preview + = _("Preview") %li.md-header-toolbar.active - = markdown_toolbar_button({ icon: "bold", data: { "md-tag" => "**" }, title: "Add bold text" }) - = markdown_toolbar_button({ icon: "italic", data: { "md-tag" => "*" }, title: "Add italic text" }) - = markdown_toolbar_button({ icon: "quote", data: { "md-tag" => "> ", "md-prepend" => true }, title: "Insert a quote" }) - = markdown_toolbar_button({ icon: "code", data: { "md-tag" => "`", "md-block" => "```" }, title: "Insert code" }) - = markdown_toolbar_button({ icon: "list-bulleted", data: { "md-tag" => "* ", "md-prepend" => true }, title: "Add a bullet list" }) - = markdown_toolbar_button({ icon: "list-numbered", data: { "md-tag" => "1. ", "md-prepend" => true }, title: "Add a numbered list" }) - = markdown_toolbar_button({ icon: "task-done", data: { "md-tag" => "* [ ] ", "md-prepend" => true }, title: "Add a task list" }) - %button.toolbar-btn.toolbar-fullscreen-btn.js-zen-enter.has-tooltip{ type: "button", tabindex: -1, "aria-label": "Go full screen", title: "Go full screen", data: { container: "body" } } + = markdown_toolbar_button({ icon: "bold", data: { "md-tag" => "**" }, title: _("Add bold text") }) + = markdown_toolbar_button({ icon: "italic", data: { "md-tag" => "*" }, title: _("Add italic text") }) + = markdown_toolbar_button({ icon: "quote", data: { "md-tag" => "> ", "md-prepend" => true }, title: _("Insert a quote") }) + = markdown_toolbar_button({ icon: "code", data: { "md-tag" => "`", "md-block" => "```" }, title: _("Insert code") }) + = markdown_toolbar_button({ icon: "list-bulleted", data: { "md-tag" => "* ", "md-prepend" => true }, title: _("Add a bullet list") }) + = markdown_toolbar_button({ icon: "list-numbered", data: { "md-tag" => "1. ", "md-prepend" => true }, title: _("Add a numbered list") }) + = markdown_toolbar_button({ icon: "task-done", data: { "md-tag" => "* [ ] ", "md-prepend" => true }, title: _("Add a task list") }) + %button.toolbar-btn.toolbar-fullscreen-btn.js-zen-enter.has-tooltip{ type: "button", tabindex: -1, "aria-label": _("Go full screen"), title: _("Go full screen"), data: { container: "body" } } = sprite_icon("screen-full") .md-write-holder @@ -37,8 +37,4 @@ .referenced-users.hide %span = icon("exclamation-triangle") - You are about to add - %strong - %span.js-referenced-users-count 0 - people - to the discussion. Proceed with caution. + = _("You are about to add 0 people to the discussion. Proceed with caution.").html_safe diff --git a/app/views/projects/_merge_request_merge_method_settings.html.haml b/app/views/projects/_merge_request_merge_method_settings.html.haml index 540e996e4d88730c43f818a0916d0f33edf6d25a..7274911b9dda484eb38e42b5d05a0524a9835f79 100644 --- a/app/views/projects/_merge_request_merge_method_settings.html.haml +++ b/app/views/projects/_merge_request_merge_method_settings.html.haml @@ -3,34 +3,34 @@ .form-group = label_tag :merge_method_merge, class: 'label-bold' do - Merge method + = _("Merge method") .form-check = form.radio_button :merge_method, :merge, class: "js-merge-method-radio form-check-input" = label_tag :project_merge_method_merge, class: 'form-check-label' do - %strong Merge commit + %strong= _("Merge commit") %br %span.descr - A merge commit is created for every merge, and merging is allowed as long as there are no conflicts. + = _("A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.") .form-check = form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio form-check-input" = label_tag :project_merge_method_rebase_merge, class: 'form-check-label' do - %strong Merge commit with semi-linear history + %strong= _("Merge commit with semi-linear history") %br %span.descr - A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. - This way you could make sure that if this merge request would build, after merging to target branch it would also build. + = _("A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible.") + = _("This way you could make sure that if this merge request would build, after merging to target branch it would also build.") %br %span.descr - When fast-forward merge is not possible, the user is given the option to rebase. + = _("When fast-forward merge is not possible, the user is given the option to rebase.") .form-check = form.radio_button :merge_method, :ff, class: "js-merge-method-radio qa-radio-button-merge-ff form-check-input" = label_tag :project_merge_method_ff, class: 'form-check-label' do - %strong Fast-forward merge + %strong= _("Fast-forward merge") %br %span.descr - No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. + = _("No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.") %br %span.descr - When fast-forward merge is not possible, the user is given the option to rebase. + = _("When fast-forward merge is not possible, the user is given the option to rebase.") diff --git a/app/views/projects/_merge_request_merge_settings.html.haml b/app/views/projects/_merge_request_merge_settings.html.haml index f178c94e0080eada02368ffa08b151a67975d9a9..c6123b4ebedee7645a6a8bfaf811bfd34dd135b7 100644 --- a/app/views/projects/_merge_request_merge_settings.html.haml +++ b/app/views/projects/_merge_request_merge_settings.html.haml @@ -4,20 +4,20 @@ .form-check.builds-feature{ class: ("hidden" if @project && @project.project_feature.send(:builds_access_level) == 0) } = form.check_box :only_allow_merge_if_pipeline_succeeds, class: 'form-check-input' = form.label :only_allow_merge_if_pipeline_succeeds, class: 'form-check-label' do - %strong Only allow merge requests to be merged if the pipeline succeeds + %strong= _("Only allow merge requests to be merged if the pipeline succeeds") %br %span.descr - Pipelines need to be configured to enable this feature. + = _("Pipelines need to be configured to enable this feature.") = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds'), target: '_blank' .form-check = form.check_box :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-input' = form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do - %strong Only allow merge requests to be merged if all discussions are resolved + %strong= _("Only allow merge requests to be merged if all discussions are resolved") .form-check = form.check_box :resolve_outdated_diff_discussions, class: 'form-check-input' = form.label :resolve_outdated_diff_discussions, class: 'form-check-label' do - %strong Automatically resolve merge request diff discussions when they become outdated + %strong= _("Automatically resolve merge request diff discussions when they become outdated") .form-check = form.check_box :printing_merge_request_link_enabled, class: 'form-check-input' = form.label :printing_merge_request_link_enabled, class: 'form-check-label' do - %strong Show link to create/view merge request when pushing from the command line + %strong= _("Show link to create/view merge request when pushing from the command line") diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml index 64f8216ba84b05a05e044b5cf308f85005d316de..6f9360ba71384ed6d16bf71f1b4f10cadb05360b 100644 --- a/app/views/projects/_new_project_fields.html.haml +++ b/app/views/projects/_new_project_fields.html.haml @@ -6,7 +6,7 @@ .form-group.project-path.col-sm-6 = f.label :namespace_id, class: 'label-bold' do %span - Project path + = _("Project path") .input-group - if current_user.can_select_namespace? .input-group-prepend.has-tooltip{ title: root_url } @@ -28,22 +28,22 @@ .form-group.project-path.col-sm-6 = f.label :path, class: 'label-bold' do %span - Project name + = _("Project name") = f.text_field :path, placeholder: "my-awesome-project", class: "form-control", tabindex: 2, autofocus: true, required: true - if current_user.can_create_group? .form-text.text-muted - Want to house several dependent projects under the same namespace? - = link_to "Create a group", new_group_path + = _("Want to house several dependent projects under the same namespace?") + = link_to _("Create a group"), new_group_path .form-group = f.label :description, class: 'label-bold' do - Project description + = _("Project description") %span (optional) - = f.text_area :description, placeholder: 'Description format', class: "form-control", rows: 3, maxlength: 250 + = f.text_area :description, placeholder: _('Description format'), class: "form-control", rows: 3, maxlength: 250 = f.label :visibility_level, class: 'label-bold' do - Visibility Level - = link_to icon('question-circle'), help_page_path("public_access/public_access"), aria: { label: 'Documentation for Visibility Level' }, target: '_blank', rel: 'noopener noreferrer' + = _("Visibility Level") + = link_to icon('question-circle'), help_page_path("public_access/public_access"), aria: { label: _('Documentation for Visibility Level') }, target: '_blank', rel: 'noopener noreferrer' = render 'shared/visibility_level', f: f, visibility_level: visibility_level.to_i, can_change_visibility_level: true, form_model: @project, with_label: false .form-group.row.initialize-with-readme-setting @@ -52,9 +52,9 @@ = check_box_tag 'project[initialize_with_readme]', '1', false, class: 'form-check-input' = label_tag 'project[initialize_with_readme]', class: 'form-check-label' do .option-title - %strong Initialize repository with a README + %strong= _("Initialize repository with a README") .option-description - Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository. + = _("Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository.") -= f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4 -= link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel' += f.submit _('Create project'), class: "btn btn-create project-submit", tabindex: 4 += link_to _('Cancel'), dashboard_projects_path, class: 'btn btn-cancel' diff --git a/app/views/projects/_new_project_push_tip.html.haml b/app/views/projects/_new_project_push_tip.html.haml index 22e9522c0e79b12fcb57cd8846f283361bc7c68c..9f5a0eb69ca71b25f7d15eae853bf7716c38a5bd 100644 --- a/app/views/projects/_new_project_push_tip.html.haml +++ b/app/views/projects/_new_project_push_tip.html.haml @@ -8,4 +8,4 @@ %span.input-group-append = clipboard_button(text: push_to_create_project_command, title: _("Copy command to clipboard"), class: 'input-group-text', placement: "right") %p - = link_to("What does this command do?", help_page_path("gitlab-basics/create-project", anchor: "push-to-create-a-new-project"), target: "_blank") + = link_to(_("What does this command do?"), help_page_path("gitlab-basics/create-project", anchor: "push-to-create-a-new-project"), target: "_blank") diff --git a/app/views/projects/_readme.html.haml b/app/views/projects/_readme.html.haml index 705338c083e6d30f172827e688a15ab13df77f80..0cc70fc4a80c592ec1a8b7ca8b12321a1e2e7f81 100644 --- a/app/views/projects/_readme.html.haml +++ b/app/views/projects/_readme.html.haml @@ -10,14 +10,10 @@ - else .row-content-block.second-block.center %h4 - This project does not have a README yet + = _("This project does not have a README yet") - if can?(current_user, :push_code, @project) %p - A - %code README - file contains information about other files in a repository and is commonly - distributed with computer software, forming part of its documentation. - GitLab will render it here instead of this message. + = _("A README file contains information about other files in a repository and is commonly distributed with computer software, forming part of its documentation. GitLab will render it here instead of this message.").html_safe %p - = link_to "Add Readme", @project.add_readme_path, class: 'btn btn-new' + = link_to _("Add Readme"), @project.add_readme_path, class: 'btn btn-new' diff --git a/app/views/projects/_wiki.html.haml b/app/views/projects/_wiki.html.haml index 5646dc464f805e3112d2b7de2ec2025c3781ab22..4dc06c35fe494a7efac064650ab19a3f977d40be 100644 --- a/app/views/projects/_wiki.html.haml +++ b/app/views/projects/_wiki.html.haml @@ -8,11 +8,10 @@ .project-home-empty{ class: [('row-content-block' if can_create_wiki), ('content-block' unless can_create_wiki)] } .text-center{ class: container_class } %h4 - This project does not have a wiki homepage yet + = _("This project does not have a wiki homepage yet") - if can_create_wiki %p - Add a homepage to your wiki that contains information about your project + = _("Add a homepage to your wiki that contains information about your project") %p - We recommend you - = link_to "add a homepage", project_wiki_path(@project, :home) - to your project's wiki and GitLab will show it here instead of this message. + - link_to_add_a_homepage = link_to(_("add a homepage"), project_wiki_path(@project, :home)) + = _("We recommend you %{link_to_add_a_homepage} to your project's wiki and GitLab will show it here instead of this message.").html_safe % { link_to_add_a_homepage: link_to_add_a_homepage } diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml index 87b165e581ad659e56658495a97b27d177608280..64fe724c638c721765952d7055fc34d34e5c29bb 100644 --- a/app/views/projects/artifacts/browse.html.haml +++ b/app/views/projects/artifacts/browse.html.haml @@ -1,5 +1,5 @@ - breadcrumb_title _('Artifacts') -- page_title @path.presence, 'Artifacts', "#{@build.name} (##{@build.id})", 'Jobs' +- page_title @path.presence, _('Artifacts'), "#{@build.name} (##{@build.id})", _('Jobs') = render "projects/jobs/header", show_controls: false @@ -10,7 +10,7 @@ .nav-block %ul.breadcrumb.repo-breadcrumb %li.breadcrumb-item - = link_to 'Artifacts', browse_project_job_artifacts_path(@project, @build) + = link_to _('Artifacts'), browse_project_job_artifacts_path(@project, @build) - path_breadcrumbs do |title, path| %li.breadcrumb-item = link_to truncate(title, length: 40), browse_project_job_artifacts_path(@project, @build, path) @@ -19,16 +19,16 @@ = link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-default download' do = sprite_icon('download') - Download artifacts archive + = _("Download artifacts archive") .tree-content-holder %table.table.tree-table %thead %tr - %th Name - %th Size + %th= _("Name") + %th= _("Size") = render partial: 'tree_directory', collection: @entry.directories(parent: true), as: :directory = render partial: 'tree_file', collection: @entry.files, as: :file - if @entry.empty? - .center Empty + .center= _("Empty") diff --git a/app/views/projects/artifacts/file.html.haml b/app/views/projects/artifacts/file.html.haml index f7174d6b2c613db1aac319eb75572595d2222036..595683422640996723cd291ae84e4b3812ecc7d2 100644 --- a/app/views/projects/artifacts/file.html.haml +++ b/app/views/projects/artifacts/file.html.haml @@ -1,4 +1,4 @@ -- page_title @path, 'Artifacts', "#{@build.name} (##{@build.id})", 'Jobs' +- page_title @path, _('Artifacts'), "#{@build.name} (##{@build.id})", _('Jobs') = render "projects/jobs/header", show_controls: false @@ -6,7 +6,7 @@ .nav-block %ul.breadcrumb.repo-breadcrumb %li.breadcrumb-item - = link_to 'Artifacts', browse_project_job_artifacts_path(@project, @build) + = link_to _('Artifacts'), browse_project_job_artifacts_path(@project, @build) - path_breadcrumbs do |title, path| - title = truncate(title, length: 40) %li.breadcrumb-item diff --git a/app/views/projects/blame/_age_map_legend.html.haml b/app/views/projects/blame/_age_map_legend.html.haml index 533dc20ffb32a4e74398bd350b2c961763bf92bb..8f103951b96fbb40378ec068ba5d9f6c0f3bf0ff 100644 --- a/app/views/projects/blame/_age_map_legend.html.haml +++ b/app/views/projects/blame/_age_map_legend.html.haml @@ -1,4 +1,4 @@ -%span.left-label Newer +%span.left-label= _("Newer") %span.legend-box.legend-box-0 %span.legend-box.legend-box-1 %span.legend-box.legend-box-2 @@ -9,4 +9,4 @@ %span.legend-box.legend-box-7 %span.legend-box.legend-box-8 %span.legend-box.legend-box-9 -%span.right-label Older +%span.right-label= _("Older") diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index ef6f5c76de6d4f9dfb76f0c1bf06245f33e902b8..136535ae8c4247330c920f6a2a6dc5ef9a9ef219 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -1,6 +1,6 @@ - @no_container = true - project_duration = age_map_duration(@blame_groups, @project) -- page_title "Blame", @blob.path, @ref +- page_title _("Blame"), @blob.path, @ref %div{ class: container_class } #blob-content-holder.tree-holder @@ -26,9 +26,8 @@ = link_to commit.short_id, project_commit_path(@project, commit), class: "commit-sha"   .light - = commit_author_link(commit, avatar: false) - committed - #{time_ago_with_tooltip(commit.committed_date)} + - link_to_commit_author = commit_author_link(commit, avatar: false) + = _("%{commit_author} committed %{time_ago}").html_safe % { commit_author: link_to_commit_author, time_ago: time_ago_with_tooltip(commit.committed_date) } %td.line-numbers - line_count = blame_group[:lines].count - (current_line...(current_line + line_count)).each do |i| diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml index 65b414c8af2d9862502cbae7032d3ee1371d719a..2f76e36bc95ba46d2c69d2d68b6cfc0dc7beea27 100644 --- a/app/views/projects/branches/new.html.haml +++ b/app/views/projects/branches/new.html.haml @@ -1,4 +1,4 @@ -- page_title "New Branch" +- page_title _("New Branch") - default_ref = params[:ref] || @project.default_branch - if @error @@ -6,7 +6,7 @@ %button.close{ type: "button", "data-dismiss" => "alert" } × = @error %h3.page-title - New Branch + = _('New Branch') %hr = form_tag namespace_project_branches_path, method: :post, id: "new-branch-form", class: "js-create-branch-form js-requires-input" do @@ -16,7 +16,7 @@ = text_field_tag :branch_name, params[:branch_name], required: true, autofocus: true, class: 'form-control js-branch-name' .form-text.text-muted.text-danger.js-branch-name-error .form-group.row - = label_tag :ref, 'Create from', class: 'col-form-label col-sm-2' + = label_tag :ref, _('Create from'), class: 'col-form-label col-sm-2' .col-sm-10.create-from .dropdown = hidden_field_tag :ref, default_ref @@ -24,9 +24,9 @@ .text-left.dropdown-toggle-text= default_ref = icon('chevron-down') = render 'shared/ref_dropdown', dropdown_class: 'wide' - .form-text.text-muted Existing branch name, tag, or commit SHA + .form-text.text-muted= _('Existing branch name, tag, or commit SHA') .form-actions - = button_tag 'Create branch', class: 'btn btn-create', tabindex: 3 - = link_to 'Cancel', project_branches_path(@project), class: 'btn btn-cancel' + = button_tag _('Create branch'), class: 'btn btn-create', tabindex: 3 + = link_to _('Cancel'), project_branches_path(@project), class: 'btn btn-cancel' -# haml-lint:disable InlineJavaScript %script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe diff --git a/app/views/projects/buttons/_download.html.haml b/app/views/projects/buttons/_download.html.haml index f7551434d47819df65b7e690ac8c500f55f98518..a96efc4d25e220cd4743e4aca775df90a810f5c1 100644 --- a/app/views/projects/buttons/_download.html.haml +++ b/app/views/projects/buttons/_download.html.haml @@ -24,12 +24,12 @@ %span= _('Download tar') - if pipeline && pipeline.latest_builds_with_artifacts.any? - %li.dropdown-header Artifacts + %li.dropdown-header= _("Artifacts") - unless pipeline.latest? - latest_pipeline = project.pipeline_for(ref) %li .unclickable= ci_status_for_statuseable(latest_pipeline) - %li.dropdown-header Previous Artifacts + %li.dropdown-header= _("Previous Artifacts") - pipeline.latest_builds_with_artifacts.each do |job| %li = link_to latest_succeeded_project_artifacts_path(project, "#{ref}/download", job: job.name), rel: 'nofollow', download: '' do diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index d0fd57367b6c45c15b4ca71447aa0bc4b73105fc..71cb3d69c90ed44eda627a7f7c6e9ec71452d092 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -44,8 +44,7 @@ .commiter - commit_author_link = commit_author_link(commit, avatar: false, size: 24) - commit_timeago = time_ago_with_tooltip(commit.authored_date, placement: 'bottom') - - commit_text = _('%{commit_author_link} authored %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago } - #{ commit_text.html_safe } + = _('%{commit_author_link} authored %{commit_timeago}').html_safe % { commit_author_link: commit_author_link, commit_timeago: commit_timeago } - if show_project_name %span.project_namespace = project.full_name diff --git a/app/views/projects/commits/_commit_list.html.haml b/app/views/projects/commits/_commit_list.html.haml index 8f8eb2c3d5a4860ca815a480dc69abba2ad1abff..e3debc59347da9ae9c998d0e5f3f97a99f87ef3b 100644 --- a/app/views/projects/commits/_commit_list.html.haml +++ b/app/views/projects/commits/_commit_list.html.haml @@ -3,12 +3,12 @@ .card .card-header - Commits (#{@commits.count}) + = _("Commits (%{count})") % { count: @commits.count } - if hidden > 0 %ul.content-list - commits.each do |commit| = render "projects/commits/inline_commit", commit: commit, project: @project %li.warning-row.unstyled - #{number_with_delimiter(hidden)} additional commits have been omitted to prevent performance issues. + = _("%{hidden_commits} additional commits have been omitted to prevent performance issues.") % { hidden_commits: number_with_delimiter(hidden) } - else %ul.content-list= render commits, project: @project, ref: @ref diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index 07112c9880428677d35f880b82ba8c1b267dfa24..464857a4be3b7f988eb3a59381231f0f72f7ecb2 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -1,7 +1,7 @@ = form_tag project_compare_index_path(@project), method: :post, class: 'form-inline js-requires-input js-signature-container', data: { 'signatures-path' => signatures_namespace_project_compare_index_path } do - if params[:to] && params[:from] .compare-switch-container - = link_to icon('exchange'), { from: params[:to], to: params[:from] }, class: 'commits-compare-switch has-tooltip btn btn-white', title: 'Swap revisions' + = link_to icon('exchange'), { from: params[:to], to: params[:from] }, class: 'commits-compare-switch has-tooltip btn btn-white', title: _('Swap revisions') .form-group.dropdown.compare-form-group.to.js-compare-to-dropdown .input-group.inline-input-group %span.input-group-prepend diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml index 14c64b3534a414297a69956ed7f70fd4fb977e46..19f0b7d779a8cbd21045fdf54179f857336e4610 100644 --- a/app/views/projects/compare/index.html.haml +++ b/app/views/projects/compare/index.html.haml @@ -1,6 +1,6 @@ - @no_container = true -- breadcrumb_title "Compare Revisions" -- page_title "Compare" +- breadcrumb_title _("Compare Revisions") +- page_title _("Compare") %div{ class: container_class } %h3.page-title diff --git a/app/views/projects/cycle_analytics/_overview.html.haml b/app/views/projects/cycle_analytics/_overview.html.haml index 5b0d73b8c6817acfbc17099f38141f76d3213f2c..994fdaa02322842a120bee9d346d89b092425896 100644 --- a/app/views/projects/cycle_analytics/_overview.html.haml +++ b/app/views/projects/cycle_analytics/_overview.html.haml @@ -4,10 +4,10 @@ .col-md-10.offset-md-1 .row.overview-details .col-md-6.overview-text - %h4 Introducing Cycle Analytics + %h4= _("Introducing Cycle Analytics") %p - Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project. - To set up CA, you must first define a production environment by setting up your CI and then deploy to production. + = _("Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.") + = _("To set up CA, you must first define a production environment by setting up your CI and then deploy to production.") %p %a.btn{ href: help_page_path('user/project/cycle_analytics'), target: '_blank' } Read more .col-md-6.overview-image diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml index bdf021fd87f63714099da9b04e2767c519c84428..64f5b6452c900b21ff22ed09dcdc9a0575d21d5c 100644 --- a/app/views/projects/cycle_analytics/show.html.haml +++ b/app/views/projects/cycle_analytics/show.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- page_title "Cycle Analytics" +- page_title _("Cycle Analytics") #cycle-analytics{ class: container_class, "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project) } } - if @cycle_analytics_no_data diff --git a/app/views/projects/deploy_tokens/_index.html.haml b/app/views/projects/deploy_tokens/_index.html.haml index 33faab0c51038578cdd2aa08e620cdc38d46d936..ad1a2138f666adfa09e7a802cf2aaf18691eaa6e 100644 --- a/app/views/projects/deploy_tokens/_index.html.haml +++ b/app/views/projects/deploy_tokens/_index.html.haml @@ -4,7 +4,7 @@ .settings-header %h4= s_('DeployTokens|Deploy Tokens') %button.btn.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p = s_('DeployTokens|Deploy tokens allow read-only access to your repository and registry images.') .settings-content diff --git a/app/views/projects/deploy_tokens/_table.html.haml b/app/views/projects/deploy_tokens/_table.html.haml index 91466a6736b3214332523ec88a4e41c16c090f4f..4a951d0ad5d71047a2803eb3ef25ed36fe62e84d 100644 --- a/app/views/projects/deploy_tokens/_table.html.haml +++ b/app/views/projects/deploy_tokens/_table.html.haml @@ -22,8 +22,8 @@ %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 - %td= token.scopes.present? ? token.scopes.join(", ") : "" + %span.token-never-expires-label= _("Never") + %td= token.scopes.present? ? token.scopes.join(", ") : _("") %td= link_to s_('DeployTokens|Revoke'), "#", class: "btn btn-danger float-right", data: { toggle: "modal", target: "#revoke-modal-#{token.id}"} = render 'projects/deploy_tokens/revoke_modal', token: token, project: project - else diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index f483fad6142c146244614072f57631c0c4f283df..993a7b9abb094f33db4ef135f2f8afba221ebba9 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -1,5 +1,5 @@ -- breadcrumb_title "General Settings" -- page_title "General" +- breadcrumb_title _("General Settings") +- page_title _("General") - @content_class = "limit-container-width" unless fluid_layout - expanded = Rails.env.test? @@ -7,11 +7,11 @@ %section.settings.general-settings.no-animate#js-general-project-settings{ class: ('expanded' if expanded) } .settings-header %h4 - General project + = _("General project") %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p - Update your project name, description, avatar, and other general settings. + = _("Update your project name, description, avatar, and other general settings.") .settings-content .project-edit-errors = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f| @@ -19,25 +19,25 @@ .row .form-group.col-md-9 = f.label :name, class: 'label-bold', for: 'project_name_edit' do - Project name + = _("Project name") = f.text_field :name, class: "form-control", id: "project_name_edit" .form-group.col-md-3 = f.label :id, class: 'label-bold' do - Project ID + = _("Project ID") = f.text_field :id, class: 'form-control', readonly: true .form-group = f.label :description, class: 'label-bold' do - Project description - %span.light (optional) + = _("Project description") + %span.light= _("(optional)") = f.text_area :description, class: "form-control", rows: 3, maxlength: 250 = render_if_exists 'projects/classification_policy_settings', f: f - unless @project.empty_repo? .form-group - = f.label :default_branch, "Default Branch", class: 'label-bold' + = f.label :default_branch, _("Default Branch"), class: 'label-bold' = f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'}) = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project @@ -45,7 +45,7 @@ .form-group = f.label :tag_list, "Tags", class: 'label-bold' = f.text_field :tag_list, value: @project.tag_list.sort.join(', '), maxlength: 2000, class: "form-control" - %p.form-text.text-muted Separate tags with commas. + %p.form-text.text-muted= _("Separate tags with commas.") %fieldset.features %h5.prepend-top-0= _("Project avatar") .form-group @@ -63,39 +63,39 @@ - if @project.avatar? %hr = link_to _('Remove avatar'), project_avatar_path(@project), data: { confirm: _("Avatar will be removed. Are you sure?") }, method: :delete, class: "btn btn-danger btn-inverted" - = f.submit 'Save changes', class: "btn btn-success js-btn-save-general-project-settings" + = f.submit _('Save changes'), class: "btn btn-success js-btn-save-general-project-settings" %section.settings.sharing-permissions.no-animate#js-shared-permissions{ class: ('expanded' if expanded) } .settings-header %h4 - Permissions + = _("Permissions") %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p - Enable or disable certain project features and choose access levels. + = _("Enable or disable certain project features and choose access levels.") .settings-content = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "sharing-permissions-form" }, authenticity_token: true do |f| -# haml-lint:disable InlineJavaScript %script.js-project-permissions-form-data{ type: "application/json" }= project_permissions_panel_data(@project) .js-project-permissions-form - = f.submit 'Save changes', class: "btn btn-save" + = f.submit _('Save changes'), class: "btn btn-save" = render_if_exists 'projects/issues_settings' %section.qa-merge-request-settings.settings.merge-requests-feature.no-animate#js-merge-request-settings{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] } .settings-header %h4 - Merge request + = _("Merge request") %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p - Customize your merge request restrictions. + = _("Customize your merge request restrictions.") .settings-content = render_if_exists 'shared/promotions/promote_mr_features' = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form" }, authenticity_token: true do |f| = render 'projects/merge_request_settings', form: f - = f.submit 'Save changes', class: "btn btn-save qa-save-merge-request-changes" + = f.submit _('Save changes'), class: "btn btn-save qa-save-merge-request-changes" = render_if_exists 'projects/service_desk_settings' @@ -104,53 +104,53 @@ %section.qa-advanced-settings.settings.advanced-settings.no-animate#js-project-advanced-settings{ class: ('expanded' if expanded) } .settings-header %h4 - Advanced + = _("Advanced") %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p - Perform advanced options such as housekeeping, archiving, renaming, transferring, or removing your project. + = _("Perform advanced options such as housekeeping, archiving, renaming, transferring, or removing your project.") .settings-content .sub-section - %h4 Housekeeping + %h4= _("Housekeeping") %p - Runs a number of housekeeping tasks within the current repository, such as compressing file revisions and removing unreachable objects. - = link_to 'Run housekeeping', housekeeping_project_path(@project), + = _("Runs a number of housekeeping tasks within the current repository, such as compressing file revisions and removing unreachable objects.") + = link_to _('Run housekeeping'), housekeeping_project_path(@project), method: :post, class: "btn btn-default" - if can? current_user, :archive_project, @project .sub-section %h4.warning-title - if @project.archived? - Unarchive project + = _("Unarchive project") - else - Archive project + = _("Archive project") - if @project.archived? %p - Unarchiving the project will restore people's ability to make changes to it. - The repository can be committed to, and issues, comments and other entities can be created. - %strong Once active this project shows up in the search and on the dashboard. - = link_to 'Unarchive project', unarchive_project_path(@project), - data: { confirm: "Are you sure that you want to unarchive this project?" }, + = _("Unarchiving the project will restore people's ability to make changes to it.") + = _("The repository can be committed to, and issues, comments and other entities can be created.") + %strong= _("Once active this project shows up in the search and on the dashboard.") + = link_to _('Unarchive project'), unarchive_project_path(@project), + data: { confirm: _("Are you sure that you want to unarchive this project?") }, method: :post, class: "btn btn-success" - else %p - Archiving the project will make it entirely read-only. It is hidden from the dashboard and doesn't show up in searches. - %strong The repository cannot be committed to, and no issues, comments or other entities can be created. - = link_to 'Archive project', archive_project_path(@project), - data: { confirm: "Are you sure that you want to archive this project?" }, + = _("Archiving the project will make it entirely read-only. It is hidden from the dashboard and doesn't show up in searches.") + %strong= _("The repository cannot be committed to, and no issues, comments or other entities can be created.") + = link_to _('Archive project'), archive_project_path(@project), + data: { confirm: _("Are you sure that you want to archive this project?") }, method: :post, class: "btn btn-warning" .sub-section.rename-respository %h4.warning-title - Rename repository + = _("Rename repository") = render 'projects/errors' = form_for([@project.namespace.becomes(Namespace), @project]) do |f| .form-group.project_name_holder = f.label :name, class: 'label-bold' do - Project name + = _("Project name") .form-group = f.text_field :name, class: "form-control" .form-group = f.label :path, class: 'label-bold' do - %span Path + %span= _("Path") .form-group .input-group .input-group-prepend @@ -158,33 +158,33 @@ #{URI.join(root_url, @project.namespace.full_path)}/ = f.text_field :path, class: 'form-control' %ul - %li Be careful. Renaming a project's repository can have unintended side effects. - %li You will need to update your local repositories to point to the new location. + %li= _("Be careful. Renaming a project's repository can have unintended side effects.") + %li= _("You will need to update your local repositories to point to the new location.") - if @project.deployment_platform.present? - %li Your deployment services will be broken, you will need to manually fix the services after renaming. - = f.submit 'Rename project', class: "btn btn-warning" + %li= _("Your deployment services will be broken, you will need to manually fix the services after renaming.") + = f.submit _('Rename project'), class: "btn btn-warning" - if can?(current_user, :change_namespace, @project) .sub-section %h4.danger-title - Transfer project + = _("Transfer project") = form_for([@project.namespace.becomes(Namespace), @project], url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'js-project-transfer-form' } ) do |f| .form-group = label_tag :new_namespace_id, nil, class: 'label-bold' do - %span Select a new namespace + %span= _("Select a new namespace") .form-group = select_tag :new_namespace_id, namespaces_options(nil), include_blank: true, class: 'select2' %ul - %li Be careful. Changing the project's namespace can have unintended side effects. - %li You can only transfer the project to namespaces you manage. - %li You will need to update your local repositories to point to the new location. - %li Project visibility level will be changed to match namespace rules when transferring to a group. - = f.submit 'Transfer project', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) } + %li= _("Be careful. Changing the project's namespace can have unintended side effects.") + %li= _("You can only transfer the project to namespaces you manage.") + %li= _("You will need to update your local repositories to point to the new location.") + %li= _("Project visibility level will be changed to match namespace rules when transferring to a group.") + = f.submit _('Transfer project'), class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) } - if @project.forked? && can?(current_user, :remove_fork_project, @project) .sub-section %h4.danger-title - Remove fork relationship + = _("Remove fork relationship") %p - This will remove the fork relationship to source project + = _("This will remove the fork relationship to source project") = succeed "." do - if @project.fork_source = link_to(fork_source_name(@project), project_path(@project.fork_source)) @@ -192,24 +192,24 @@ = fork_source_name(@project) = form_for([@project.namespace.becomes(Namespace), @project], url: remove_fork_project_path(@project), method: :delete, remote: true, html: { class: 'transfer-project' }) do |f| %p - %strong Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source. - = button_to 'Remove fork relationship', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_fork_project_message(@project) } + %strong= _("Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source.") + = button_to _('Remove fork relationship'), '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_fork_project_message(@project) } - if can?(current_user, :remove_project, @project) .sub-section %h4.danger-title - Remove project + = _("Remove project") %p - Removing the project will delete its repository and all related resources including issues, merge requests etc. + = _("Removing the project will delete its repository and all related resources including issues, merge requests etc.") = form_tag(project_path(@project), method: :delete) do %p - %strong Removed projects cannot be restored! - = button_to 'Remove project', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_project_message(@project) } + %strong= _("Removed projects cannot be restored!") + = button_to _('Remove project'), '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_project_message(@project) } .save-project-loader.hide .center %h2 %i.fa.fa-spinner.fa-spin - Saving project. - %p Please wait a moment, this page will automatically refresh when ready. + = _("Saving project.") + %p= _("Please wait a moment, this page will automatically refresh when ready.") = render 'shared/confirm_modal', phrase: @project.path diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index d47dc3d814396c7f6d1101483cc3a1b976018196..b77cfd04569f9accde792d79c575b4029a97a751 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -41,17 +41,17 @@ .prepend-top-20 .empty_wrapper %h3#repo-command-line-instructions.page-title-empty - Command line instructions + = _("Command line instructions") .git-empty %fieldset - %h5 Git global setup + %h5= _("Git global setup") %pre.bg-light :preserve git config --global user.name "#{h git_user_name}" git config --global user.email "#{h git_user_email}" %fieldset - %h5 Create a new repository + %h5= _("Create a new repository") %pre.bg-light :preserve git clone #{ content_tag(:span, default_url_to_repo, class: 'clone')} @@ -64,7 +64,7 @@ git push -u origin master %fieldset - %h5 Existing folder + %h5= _("Existing folder") %pre.bg-light :preserve cd existing_folder @@ -77,7 +77,7 @@ git push -u origin master %fieldset - %h5 Existing Git repository + %h5= _("Existing Git repository") %pre.bg-light :preserve cd existing_repo @@ -90,4 +90,4 @@ - if can? current_user, :remove_project, @project .prepend-top-20 - = link_to 'Remove project', [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-inverted btn-remove float-right" + = link_to _('Remove project'), [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-inverted btn-remove float-right" diff --git a/app/views/projects/find_file/show.html.haml b/app/views/projects/find_file/show.html.haml index a966bfb2dd98c4ace09bb997340a93474314e385..c0e7931d524daae1ce5563a582b1e7d411b2d70b 100644 --- a/app/views/projects/find_file/show.html.haml +++ b/app/views/projects/find_file/show.html.haml @@ -1,4 +1,4 @@ -- page_title "Find File", @ref +- page_title _("Find File"), @ref .file-finder-holder.tree-holder.clearfix.js-file-finder{ 'data-file-find-url': "#{escape_javascript(project_files_path(@project, @ref, @options.merge(format: :json)))}", 'data-find-tree-url': escape_javascript(project_tree_path(@project, @ref)), 'data-blob-url-template': escape_javascript(project_blob_path(@project, @id || @commit.id)) } .nav-block diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml index 639efd34a741358393e4bb9404e3926e7e8c8f3c..925d430f0ca6edd092bd7212aa839b7c2a137901 100644 --- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml +++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml @@ -22,7 +22,7 @@ = generic_commit_status.tags.any? ? icon('tag') : sprite_icon('fork', size: 10) = link_to generic_commit_status.ref, project_commits_path(generic_commit_status.project, generic_commit_status.ref) - else - .light none + .light= _('none') .icon-container.commit-icon = custom_icon("icon_commit") @@ -30,7 +30,7 @@ = link_to generic_commit_status.short_sha, project_commit_path(generic_commit_status.project, generic_commit_status.sha), class: "commit-sha" - if retried - = icon('warning', class: 'text-warning has-tooltip', title: 'Status was retried.') + = icon('warning', class: 'text-warning has-tooltip', title: _('Status was retried.')) .label-container - if generic_commit_status.tags.any? @@ -38,7 +38,7 @@ %span.badge.badge-primary = tag - if retried - %span.badge.badge-warning retried + %span.badge.badge-warning= _('retried') - if pipeline_link %td @@ -58,7 +58,7 @@ - if generic_commit_status.try(:runner) = runner_link(generic_commit_status.runner) - else - .light none + .light= _('none') - if stage %td diff --git a/app/views/projects/graphs/charts.html.haml b/app/views/projects/graphs/charts.html.haml index 3f1974d05f4beb57a86086220cd4c6eacdb0e239..81291ead05cb4e634f7089708afa30f520b17ec1 100644 --- a/app/views/projects/graphs/charts.html.haml +++ b/app/views/projects/graphs/charts.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- page_title "Charts" +- page_title _("Charts") .repo-charts{ class: container_class } %h4.sub-header diff --git a/app/views/projects/hook_logs/_index.html.haml b/app/views/projects/hook_logs/_index.html.haml index 3e54c3ca9f8d6bf878f69480cc06f366c835d372..193324030f7995e15fda6e04145d206de9284fe9 100644 --- a/app/views/projects/hook_logs/_index.html.haml +++ b/app/views/projects/hook_logs/_index.html.haml @@ -1,18 +1,18 @@ .row.prepend-top-default.append-bottom-default .col-lg-3 %h4.prepend-top-0 - Recent Deliveries - %p When an event in GitLab triggers a webhook, you can use the request details to figure out if something went wrong. + = _("Recent Deliveries") + %p= _("When an event in GitLab triggers a webhook, you can use the request details to figure out if something went wrong.") .col-lg-9 - if hook_logs.any? %table.table %thead %tr - %th Status - %th Trigger - %th URL - %th Elapsed time - %th Request time + %th= _('Status') + %th= _('Trigger') + %th= _('URL') + %th= _('Elapsed time') + %th= _('Request time') %th - hook_logs.each do |hook_log| %tr @@ -28,10 +28,10 @@ %td.light = time_ago_with_tooltip(hook_log.created_at) %td - = link_to 'View details', project_hook_hook_log_path(project, hook, hook_log) + = link_to _('View details'), project_hook_hook_log_path(project, hook, hook_log) = paginate hook_logs, theme: 'gitlab' - else .settings-message.text-center - You don't have any webhooks deliveries + = _("You don't have any webhooks deliveries") diff --git a/app/views/projects/hook_logs/show.html.haml b/app/views/projects/hook_logs/show.html.haml index e51efa85df0955be13abbee11d531505609a1d2c..1d71824a6bbc2ad35aed779b1b2709ea57899b97 100644 --- a/app/views/projects/hook_logs/show.html.haml +++ b/app/views/projects/hook_logs/show.html.haml @@ -1,9 +1,9 @@ .row.prepend-top-default.append-bottom-default .col-lg-3 %h4.prepend-top-0 - Request details + = _("Request details") .col-lg-9 - = link_to 'Resend Request', retry_project_hook_hook_log_path(@project, @hook, @hook_log), class: "btn btn-default float-right prepend-left-10" + = link_to _('Resend Request'), retry_project_hook_hook_log_path(@project, @hook, @hook_log), class: "btn btn-default float-right prepend-left-10" = render partial: 'shared/hook_logs/content', locals: { hook_log: @hook_log } diff --git a/app/views/projects/hooks/_index.html.haml b/app/views/projects/hooks/_index.html.haml index 5990582fd55f169411e00a1098d75cf3de1f8683..90afdb2b4a785ca9f375d386fe7dd1ff7b42e302 100644 --- a/app/views/projects/hooks/_index.html.haml +++ b/app/views/projects/hooks/_index.html.haml @@ -3,21 +3,21 @@ %h4.prepend-top-0 = page_title %p - #{link_to 'Webhooks', help_page_path('user/project/integrations/webhooks')} can be - used for binding events when something is happening within the project. + - link_to_webhooks = link_to(_('Webhooks'), help_page_path('user/project/integrations/webhooks')) + = _("%{link_to_webhooks} can be used for binding events when something is happening within the project.").html_safe % { link_to_webhooks: link_to_webhooks } .col-lg-8.append-bottom-default = form_for @hook, as: :hook, url: polymorphic_path([@project.namespace.becomes(Namespace), @project, :hooks]) do |f| = render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook } - = f.submit 'Add webhook', class: 'btn btn-create' + = f.submit _('Add webhook'), class: 'btn btn-create' %hr %h5.prepend-top-default - Webhooks (#{@hooks.count}) + = _("Webhooks (%{count})") % { count: @hooks.count } - if @hooks.any? %ul.content-list - @hooks.each do |hook| = render 'project_hook', hook: hook - else %p.settings-message.text-center.append-bottom-0 - No webhooks found, add one in the form above. + = _("No webhooks found, add one in the form above.") diff --git a/app/views/projects/hooks/edit.html.haml b/app/views/projects/hooks/edit.html.haml index c31aef60453ec5a1e9c141efa5466385e0bf4ea9..b56917d8cb4bd9daa6a9e612582b4c842f12a7d8 100644 --- a/app/views/projects/hooks/edit.html.haml +++ b/app/views/projects/hooks/edit.html.haml @@ -1,19 +1,19 @@ -- page_title 'Integrations' +- page_title _('Integrations') .row.prepend-top-default .col-lg-3 %h4.prepend-top-0 = page_title %p - #{link_to 'Webhooks', help_page_path('user/project/integrations/webhooks')} can be - used for binding events when something is happening within the project. + - link_to_webhooks = link_to(_('Webhooks'), help_page_path('user/project/integrations/webhooks')) + = _("%{link_to_webhooks} can be used for binding events when something is happening within the project.").html_safe % { link_to_webhooks: link_to_webhooks } .col-lg-9.append-bottom-default = form_for [@project.namespace.becomes(Namespace), @project, @hook], as: :hook, url: project_hook_path(@project, @hook) do |f| = render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook } - = f.submit 'Save changes', class: 'btn btn-create' + = f.submit _('Save changes'), class: 'btn btn-create' = render 'shared/web_hooks/test_button', triggers: ProjectHook.triggers, hook: @hook - = link_to 'Remove', project_hook_path(@project, @hook), method: :delete, class: 'btn btn-remove float-right', data: { confirm: 'Are you sure?' } + = link_to _('Remove'), project_hook_path(@project, @hook), method: :delete, class: 'btn btn-remove float-right', data: { confirm: _('Are you sure?') } %hr diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml index 8ce822c43b705c09f5aa4135f978eda2fe3925de..0996525558e2772b1ff6de380a485bb3a984a1c6 100644 --- a/app/views/projects/imports/new.html.haml +++ b/app/views/projects/imports/new.html.haml @@ -1,12 +1,12 @@ -- page_title "Import repository" +- page_title _("Import repository") %h3.page-title - Import repository + = _("Import repository") %hr - if @project.import_failed? .card.border-danger - .card-header.bg-danger.text-white The repository could not be imported. + .card-header.bg-danger.text-white= _("The repository could not be imported.") .card-body %pre :preserve @@ -16,4 +16,4 @@ = render "shared/import_form", f: f .form-actions - = f.submit 'Start import', class: "btn btn-create", tabindex: 4 + = f.submit _('Start import'), class: "btn btn-create", tabindex: 4 diff --git a/app/views/projects/mirrors/_instructions.html.haml b/app/views/projects/mirrors/_instructions.html.haml index e051f9e6331de343e7b990d2ec138d870160a15b..a2883a8288a332ce78b894e59e2d59318df6bb7f 100644 --- a/app/views/projects/mirrors/_instructions.html.haml +++ b/app/views/projects/mirrors/_instructions.html.haml @@ -1,11 +1,9 @@ .account-well.prepend-top-default.append-bottom-default %ul %li - = _('The repository must be accessible over http://, - https://, ssh:// and git://.').html_safe + = _('The repository must be accessible over http://, https://, ssh:// and git://.').html_safe %li= _('Include the username in the URL if required: https://username@gitlab.company.com/group/project.git.').html_safe %li= _("The update action will time out after #{import_will_timeout_message(Gitlab.config.gitlab_shell.git_timeout)} minutes. For big repositories, use a clone/push combination.") %li= _('The Git LFS objects will not be synced.').html_safe %li - = _('This user will be the author of all events in the activity feed that are the result of an update, - like new branches being created or new commits being pushed to existing branches.') + = _('This user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches.') diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index 2d3f91167039549398a3cf2c6160bd0e4f17b69a..2f4c9b8517c16e63d0ae17bc3c3b1e821710fbf1 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -1,5 +1,5 @@ -- breadcrumb_title "Graph" -- page_title "Graph", @ref +- breadcrumb_title _("Graph") +- page_title _("Graph"), @ref = render "head" %div{ class: container_class } .project-network diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 52f26783b9c6670ddb272b01067dc31a6c6b2e15..2f7421dbf8c01ea984b928f617ff24085aa78c7d 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -1,8 +1,8 @@ - @breadcrumb_link = dashboard_projects_path -- breadcrumb_title "Projects" +- breadcrumb_title _("Projects") - @hide_top_links = true -- page_title 'New Project' -- header_title "Projects", dashboard_projects_path +- page_title _('New Project') +- header_title _("Projects"), dashboard_projects_path - visibility_level = params.dig(:project, :visibility_level) || default_project_visibility - active_tab = local_assigns.fetch(:active_tab, 'blank') @@ -36,16 +36,16 @@ %ul.nav.nav-tabs.nav-links.gitlab-tabs{ role: 'tablist' } %li.nav-item{ role: 'presentation' } %a.nav-link.active{ href: '#blank-project-pane', id: 'blank-project-tab', data: { toggle: 'tab' }, role: 'tab' } - %span.d-none.d-sm-block Blank project - %span.d-block.d-sm-none Blank + %span.d-none.d-sm-block= _("Blank project") + %span.d-block.d-sm-none= _("Blank") %li.nav-item{ role: 'presentation' } %a.nav-link{ href: '#create-from-template-pane', id: 'create-from-template-tab', data: { toggle: 'tab' }, role: 'tab' } - %span.d-none.d-sm-block Create from template - %span.d-block.d-sm-none Template + %span.d-none.d-sm-block= _("Create from template") + %span.d-block.d-sm-none= _("Template") %li.nav-item{ role: 'presentation' } %a.nav-link{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab' }, role: 'tab' } - %span.d-none.d-sm-block Import project - %span.d-block.d-sm-none Import + %span.d-none.d-sm-block= _("Import project") + %span.d-block.d-sm-none= _("Import") -# EE-specific start = render 'new_ci_cd_only_project_tab', active_tab: active_tab -# EE-specific end @@ -67,8 +67,8 @@ = render 'import_project_pane', active_tab: active_tab - else .nothing-here-block - %h4 No import options available - %p Contact an administrator to enable options for importing your project. + %h4= _("No import options available") + %p= _("Contact an administrator to enable options for importing your project.") -# EE-specific start = render 'new_ci_cd_only_project_pane', active_tab: active_tab @@ -78,5 +78,5 @@ .center %h2 %i.fa.fa-spinner.fa-spin - Creating project & repository. - %p Please wait a moment, this page will automatically refresh when ready. + = _("Creating project & repository.") + %p= _("Please wait a moment, this page will automatically refresh when ready.") diff --git a/app/views/projects/notes/_actions.html.haml b/app/views/projects/notes/_actions.html.haml index b4fe1cabdfd0417733c35e9b72005de8d9e5c45d..d9023d5024c1d1941699addd1a3c35a25d4ac69c 100644 --- a/app/views/projects/notes/_actions.html.haml +++ b/app/views/projects/notes/_actions.html.haml @@ -29,7 +29,7 @@ ":title" => "buttonText", ":ref" => "'button'" } - = icon('spin spinner', 'v-if' => 'loading', class: 'loading', 'aria-hidden' => 'true', 'aria-label' => 'Loading') + = icon('spin spinner', 'v-if' => 'loading', class: 'loading', 'aria-hidden' => 'true', 'aria-label' => _('Loading')) %div{ 'v-else' => '' } %template{ 'v-if' => 'isResolved' } = render 'shared/icons/icon_status_success_solid.svg' @@ -40,7 +40,7 @@ - if note.emoji_awardable? - user_authored = note.user_authored?(current_user) .note-actions-item - = button_tag title: 'Add reaction', class: "note-action-button note-emoji-button js-add-award js-note-emoji #{'js-user-authored' if user_authored} has-tooltip btn btn-transparent", data: { position: 'right', container: 'body' } do + = button_tag title: _('Add reaction'), class: "note-action-button note-emoji-button js-add-award js-note-emoji #{'js-user-authored' if user_authored} has-tooltip btn btn-transparent", data: { position: 'right', container: 'body' } do = icon('spinner spin') %span{ class: 'link-highlight award-control-icon-neutral' }= custom_icon('emoji_slightly_smiling_face') %span{ class: 'link-highlight award-control-icon-positive' }= custom_icon('emoji_smiley') @@ -48,7 +48,7 @@ - if note_editable .note-actions-item - = button_tag title: 'Edit comment', class: 'note-action-button js-note-edit has-tooltip btn btn-transparent', data: { container: 'body' } do + = button_tag title: _('Edit comment'), class: 'note-action-button js-note-edit has-tooltip btn btn-transparent', data: { container: 'body' } do %span.link-highlight = custom_icon('icon_pencil') diff --git a/app/views/projects/notes/_more_actions_dropdown.html.haml b/app/views/projects/notes/_more_actions_dropdown.html.haml index 88085c7185b87eb6bac92246e92c9af868745611..555eb4fa70c7a4e3500143a91cb0eb9d7f5a261e 100644 --- a/app/views/projects/notes/_more_actions_dropdown.html.haml +++ b/app/views/projects/notes/_more_actions_dropdown.html.haml @@ -2,17 +2,17 @@ - if note_editable || !is_current_user .dropdown.more-actions.note-actions-item - = button_tag title: 'More actions', class: 'note-action-button more-actions-toggle has-tooltip btn btn-transparent', data: { toggle: 'dropdown', container: 'body' } do + = button_tag title: _('More actions'), class: 'note-action-button more-actions-toggle has-tooltip btn btn-transparent', data: { toggle: 'dropdown', container: 'body' } do %span.icon = custom_icon('ellipsis_v') %ul.dropdown-menu.more-actions-dropdown.dropdown-open-left %li - = clipboard_button(text: noteable_note_url(note), title: 'Copy reference to clipboard', button_text: 'Copy link', class: 'btn-clipboard', hide_tooltip: true, hide_button_icon: true) + = clipboard_button(text: noteable_note_url(note), title: _('Copy reference to clipboard'), button_text: _('Copy link'), class: 'btn-clipboard', hide_tooltip: true, hide_button_icon: true) - unless is_current_user %li = link_to new_abuse_report_path(user_id: note.author.id, ref_url: noteable_note_url(note)) do - Report as abuse + = _("Report as abuse") - if note_editable %li - = link_to note_url(note), method: :delete, data: { confirm: 'Are you sure you want to delete this comment?' }, remote: true, class: 'js-note-delete' do - %span.text-danger Delete comment + = link_to note_url(note), method: :delete, data: { confirm: _('Are you sure you want to delete this comment?') }, remote: true, class: 'js-note-delete' do + %span.text-danger= _("Delete comment") diff --git a/app/views/projects/pipeline_schedules/new.html.haml b/app/views/projects/pipeline_schedules/new.html.haml index cfdaf6d43bb59891ccc700d5265c9171c0bc48a8..94b9f72e14d7961faa9e4590e180ecd9b977d73b 100644 --- a/app/views/projects/pipeline_schedules/new.html.haml +++ b/app/views/projects/pipeline_schedules/new.html.haml @@ -1,8 +1,8 @@ -- breadcrumb_title "Schedules" +- breadcrumb_title _("Schedules") - @breadcrumb_link = namespace_project_pipeline_schedules_path(@project.namespace, @project) - page_title _("New Pipeline Schedule") -- add_to_breadcrumbs("Pipelines", project_pipelines_path(@project)) +- add_to_breadcrumbs(_("Pipelines"), project_pipelines_path(@project)) %h3.page-title = _("Schedule a new pipeline") diff --git a/app/views/projects/registry/repositories/_tag.html.haml b/app/views/projects/registry/repositories/_tag.html.haml index a4cde53e8c6d0bdc52221dc7405417780f1e8617..77dce8669681855b14209f297eeb318430a45040 100644 --- a/app/views/projects/registry/repositories/_tag.html.haml +++ b/app/views/projects/registry/repositories/_tag.html.haml @@ -28,6 +28,6 @@ = link_to project_registry_repository_tag_path(@project, tag.repository, tag.name), method: :delete, class: 'btn btn-remove has-tooltip', - title: 'Remove tag', - data: { confirm: 'Are you sure you want to delete this tag?' } do + title: _('Remove tag'), + data: { confirm: _('Are you sure you want to delete this tag?') } do = icon('trash cred') diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml index 0426f2215ad9754a0142a99a76c06fe734185ca4..c6c5e1db53a188473157ce13fcfa6c6f8db74545 100644 --- a/app/views/projects/registry/repositories/index.html.haml +++ b/app/views/projects/registry/repositories/index.html.haml @@ -1,4 +1,4 @@ -- page_title "Container Registry" +- page_title _("Container Registry") %section .settings-header diff --git a/app/views/projects/releases/edit.html.haml b/app/views/projects/releases/edit.html.haml index 8093cc2c2d7046c7e820f0dbcd4d7c1247dffe51..e679180715ad329f1bab4ae1e91e9564cfeef3eb 100644 --- a/app/views/projects/releases/edit.html.haml +++ b/app/views/projects/releases/edit.html.haml @@ -1,13 +1,13 @@ - @no_container = true -- add_to_breadcrumbs "Tags", project_tags_path(@project) +- add_to_breadcrumbs _("Tags"), project_tags_path(@project) - breadcrumb_title @tag.name -- page_title "Edit", @tag.name, "Tags" +- page_title _("Edit"), @tag.name, _("Tags") %div{ class: container_class } .sub-header-block.no-bottom-space .oneline .title - Release notes for tag + = _("Release notes for tag") %strong= @tag.name @@ -15,9 +15,9 @@ html: { class: 'common-note-form release-form js-quick-submit' }, data: { markdown_version: @release.cached_markdown_version }) do |f| = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project), referenced_users: true } do - = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: "Write your release notes or drag files here…" + = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: _("Write your release notes or drag files here…") = render 'shared/notes/hints' .error-alert .prepend-top-default - = f.submit 'Save changes', class: 'btn btn-save' - = link_to "Cancel", project_tag_path(@project, @tag.name), class: "btn btn-default btn-cancel" + = f.submit _('Save changes'), class: 'btn btn-save' + = link_to _("Cancel"), project_tag_path(@project, @tag.name), class: "btn btn-default btn-cancel" diff --git a/app/views/projects/repositories/_feed.html.haml b/app/views/projects/repositories/_feed.html.haml index ae0d9ab9908fd84ae3b8769d6bc947caa50fec07..70da9881a6fe971705cc2234ec9f00051b22f3bd 100644 --- a/app/views/projects/repositories/_feed.html.haml +++ b/app/views/projects/repositories/_feed.html.haml @@ -5,7 +5,7 @@ %strong = commit.head.name - if @project.root_ref?(commit.head.name) - %span.label default + %span.label= _("default") %td %div diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml index 434aed2f603259e4e46de98cc5aec5b41b31b452..3c4f155405912033d017a5881bc1660832f26575 100644 --- a/app/views/projects/settings/ci_cd/_form.html.haml +++ b/app/views/projects/settings/ci_cd/_form.html.haml @@ -17,7 +17,7 @@ %h5.prepend-top-0 = _("Git strategy for pipelines") %p - = _("Choose between clone or fetch to get the recent application code") + = _("Choose between clone or fetch to get the recent application code").html_safe = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'git-strategy'), target: '_blank' .form-check = f.radio_button :build_allow_git_fetch, 'false', { class: 'form-check-input' } @@ -47,7 +47,7 @@ = f.label :ci_config_path, _('Custom CI config path'), class: 'label-bold' = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml' %p.form-text.text-muted - = _("The path to CI config file. Defaults to .gitlab-ci.yml") + = _("The path to CI config file. Defaults to .gitlab-ci.yml").html_safe = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-config-path'), target: '_blank' %hr @@ -60,7 +60,7 @@ = _("Allow public access to pipelines and job details, including output logs and artifacts") = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'visibility-of-pipelines'), target: '_blank' .bs-callout.bs-callout-info - %p #{_("If enabled")}: + %p= _("If enabled:") %ul %li = _("For public projects, anyone can view pipelines and access job details (output logs and artifacts)") diff --git a/app/views/projects/settings/integrations/_project_hook.html.haml b/app/views/projects/settings/integrations/_project_hook.html.haml index ef445f2e1398ffe97390780e489f3358d4e55627..891cdd5e3cfd0c292a0964e686593d1661fd005c 100644 --- a/app/views/projects/settings/integrations/_project_hook.html.haml +++ b/app/views/projects/settings/integrations/_project_hook.html.haml @@ -8,7 +8,7 @@ %span.badge.badge-gray.deploy-project-label= event.to_s.titleize .col-md-4.col-lg-5.text-right-lg.prepend-top-5 %span.append-right-10.inline - #{_("SSL Verification")}: #{hook.enable_ssl_verification ? _('enabled') : _('disabled')} + #{_("SSL Verification:")} #{hook.enable_ssl_verification ? _('enabled') : _('disabled')} = link_to _('Edit'), edit_project_hook_path(@project, hook), class: 'btn btn-sm' = render 'shared/web_hooks/test_button', triggers: ProjectHook.triggers, hook: hook, button_class: 'btn-sm' = link_to project_hook_path(@project, hook), data: { confirm: _('Are you sure?') }, method: :delete, class: 'btn btn-transparent' do diff --git a/app/views/projects/tree/_spinner.html.haml b/app/views/projects/tree/_spinner.html.haml index b47ad0f41e48d63a4ca2ba91d684729b4b47b14d..078bec686e7166866ad95e6ff1a9855712a794f9 100644 --- a/app/views/projects/tree/_spinner.html.haml +++ b/app/views/projects/tree/_spinner.html.haml @@ -1,3 +1,3 @@ %span.log_loading.hide %i.fa.fa-spinner.fa-spin - Loading commit data... + = _("Loading commit data...") diff --git a/app/views/projects/tree/_truncated_notice_tree_row.html.haml b/app/views/projects/tree/_truncated_notice_tree_row.html.haml index 693b641888be827a5252769e3e1c557b0dd62819..e4e803ac88aff60abc9633478e7018b655af7509 100644 --- a/app/views/projects/tree/_truncated_notice_tree_row.html.haml +++ b/app/views/projects/tree/_truncated_notice_tree_row.html.haml @@ -2,6 +2,4 @@ %td{ colspan: '3' } = icon('exclamation-triangle fw') %span - Too many items to show. To preserve performance only - %strong #{number_with_delimiter(limit)} of #{number_with_delimiter(total)} - items are displayed. + = _("Too many items to show. To preserve performance only %{limit} of %{total} items are displayed.").html_safe % { limit: number_with_delimiter(limit), total: number_with_delimiter(total) } diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0ea8789d6cbfc5b9435051434d264fa0aa5b3903..103530abb38d1f31372ab982d2258acbf0e80987 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -108,6 +108,9 @@ msgstr "" msgid "%{commit_author_link} authored %{commit_timeago}" msgstr "" +msgid "%{commit_author} committed %{time_ago}" +msgstr "" + msgid "%{counter_storage} (%{counter_repositories} repositories, %{counter_build_artifacts} build artifacts, %{counter_lfs_objects} LFS)" msgstr "" @@ -122,6 +125,12 @@ 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 "%{hidden_commits} additional commits have been omitted to prevent performance issues." +msgstr "" + +msgid "%{link_to_webhooks} can be used for binding events when something is happening within the project." +msgstr "" + msgid "%{loadingIcon} Started" msgstr "" @@ -188,6 +197,9 @@ msgstr[1] "" msgid "%{unstaged} unstaged and %{staged} staged changes" msgstr "" +msgid "(optional)" +msgstr "" + msgid "+ %{moreCount} more" msgstr "" @@ -288,6 +300,9 @@ msgstr "" msgid "\"johnsmith@example.com\": \"johnsmith@example.com\" will add \"By johnsmith@example.com\" to all issues and comments originally created by johnsmith@example.com. By default, the email address or username is masked to ensure the user's privacy. Use this option if you want to show the full email address." msgstr "" +msgid "" +msgstr "" + msgid "%{changedFilesLength} unstaged and %{stagedFilesLength} staged changes" msgstr "" @@ -309,9 +324,18 @@ msgstr "" msgid "A 'Runner' is a process which runs a job. You can setup as many Runners as you need." msgstr "" +msgid "A README file contains information about other files in a repository and is commonly distributed with computer software, forming part of its documentation. GitLab will render it here instead of this message." +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "" +msgid "A merge commit is created for every merge, and merging is allowed as long as there are no conflicts." +msgstr "" + +msgid "A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible." +msgstr "" + msgid "A new branch will be created in your fork and a new merge request will be started." msgstr "" @@ -399,9 +423,27 @@ msgstr "" msgid "Add Readme" msgstr "" +msgid "Add a bullet list" +msgstr "" + +msgid "Add a homepage to your wiki that contains information about your project" +msgstr "" + +msgid "Add a numbered list" +msgstr "" + +msgid "Add a task list" +msgstr "" + msgid "Add additional text to appear in all email communications. %{character_limit} character limit" msgstr "" +msgid "Add bold text" +msgstr "" + +msgid "Add italic text" +msgstr "" + msgid "Add new application" msgstr "" @@ -420,6 +462,9 @@ msgstr "" msgid "Add users to group" msgstr "" +msgid "Add webhook" +msgstr "" + msgid "Additional text" msgstr "" @@ -525,6 +570,9 @@ msgstr "" msgid "Allows you to add and manage Kubernetes clusters." msgstr "" +msgid "Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository." +msgstr "" + msgid "Also called \"Issuer\" or \"Relying party trust identifier\"" msgstr "" @@ -681,6 +729,9 @@ msgstr "" msgid "Any Label" msgstr "" +msgid "Any encrypted tokens" +msgstr "" + msgid "Appearance" msgstr "" @@ -702,12 +753,30 @@ msgstr "" msgid "April" msgstr "" +msgid "Archive project" +msgstr "" + msgid "Archived project! Repository and other project resources are read-only" msgstr "" +msgid "Archiving the project will make it entirely read-only. It is hidden from the dashboard and doesn't show up in searches." +msgstr "" + +msgid "Are you sure that you want to archive this project?" +msgstr "" + +msgid "Are you sure that you want to unarchive this project?" +msgstr "" + +msgid "Are you sure you want to delete this comment?" +msgstr "" + msgid "Are you sure you want to delete this pipeline schedule?" msgstr "" +msgid "Are you sure you want to delete this tag?" +msgstr "" + msgid "Are you sure you want to lose unsaved changes?" msgstr "" @@ -870,6 +939,9 @@ msgstr "" msgid "AutoDevOps|enable Auto DevOps" msgstr "" +msgid "Automatically resolve merge request diff discussions when they become outdated" +msgstr "" + msgid "Available" msgstr "" @@ -969,6 +1041,12 @@ msgstr "" msgid "Badges|Your badges" msgstr "" +msgid "Be careful. Changing the project's namespace can have unintended side effects." +msgstr "" + +msgid "Be careful. Renaming a project's repository can have unintended side effects." +msgstr "" + msgid "Begin with the selected commit" msgstr "" @@ -1044,12 +1122,24 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" +msgid "Bitbucket Cloud" +msgstr "" + msgid "Bitbucket Server Import" msgstr "" msgid "Bitbucket import" msgstr "" +msgid "Blame" +msgstr "" + +msgid "Blank" +msgstr "" + +msgid "Blank project" +msgstr "" + msgid "Blog" msgstr "" @@ -1232,6 +1322,9 @@ msgstr "" msgid "CI / CD Settings" msgstr "" +msgid "CI variables" +msgstr "" + msgid "CI will run using the credentials assigned above." msgstr "" @@ -1946,6 +2039,9 @@ msgstr "" msgid "Collapse sidebar" msgstr "" +msgid "Command line instructions" +msgstr "" + msgid "Comment & resolve discussion" msgstr "" @@ -1968,6 +2064,9 @@ msgstr[1] "" msgid "Commit Message" msgstr "" +msgid "Commit changes" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "" @@ -1989,6 +2088,9 @@ msgstr "" msgid "Commits" msgstr "" +msgid "Commits (%{count})" +msgstr "" + msgid "Commits feed" msgstr "" @@ -2094,9 +2196,15 @@ msgstr "" msgid "Connecting..." msgstr "" +msgid "Contact an administrator to enable options for importing your project." +msgstr "" + msgid "Container Registry" msgstr "" +msgid "Container registry images" +msgstr "" + msgid "ContainerRegistry|Created" msgstr "" @@ -2214,6 +2322,9 @@ msgstr "" msgid "Copy incoming email address to clipboard" msgstr "" +msgid "Copy link" +msgstr "" + msgid "Copy reference to clipboard" msgstr "" @@ -2229,6 +2340,9 @@ msgstr "" msgid "Create New Directory" msgstr "" +msgid "Create a group" +msgstr "" + msgid "Create a new branch" msgstr "" @@ -2238,6 +2352,9 @@ msgstr "" msgid "Create a new issue" msgstr "" +msgid "Create a new repository" +msgstr "" + msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "" @@ -2259,6 +2376,12 @@ msgstr "" msgid "Create file" msgstr "" +msgid "Create from" +msgstr "" + +msgid "Create from template" +msgstr "" + msgid "Create group" msgstr "" @@ -2277,6 +2400,9 @@ msgstr "" msgid "Create merge request and branch" msgstr "" +msgid "Create new %{name} by email" +msgstr "" + msgid "Create new branch" msgstr "" @@ -2295,6 +2421,9 @@ msgstr "" msgid "Create new..." msgstr "" +msgid "Create project" +msgstr "" + msgid "Create project label" msgstr "" @@ -2322,6 +2451,9 @@ msgstr "" msgid "Creating epic" msgstr "" +msgid "Creating project & repository." +msgstr "" + msgid "Cron Timezone" msgstr "" @@ -2364,6 +2496,12 @@ msgstr "" msgid "Customize how Google Code email addresses and usernames are imported into GitLab. In the next step, you'll be able to select the projects you want to import." msgstr "" +msgid "Customize your merge request restrictions." +msgstr "" + +msgid "Customize your workflow!" +msgstr "" + msgid "Cycle Analytics" msgstr "" @@ -2409,6 +2547,9 @@ msgstr "" msgid "Decline and sign out" msgstr "" +msgid "Default Branch" +msgstr "" + msgid "Default classification label" msgstr "" @@ -2427,6 +2568,9 @@ msgstr "" msgid "Delete Snippet" msgstr "" +msgid "Delete comment" +msgstr "" + msgid "Delete list" msgstr "" @@ -2573,6 +2717,9 @@ msgstr "" msgid "Description" msgstr "" +msgid "Description format" +msgstr "" + msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." msgstr "" @@ -2633,6 +2780,9 @@ msgstr "" msgid "Do you want to customize how Google Code email addresses and usernames are imported into GitLab?" msgstr "" +msgid "Documentation for Visibility Level" +msgstr "" + msgid "Documentation for popular identity providers" msgstr "" @@ -2648,6 +2798,12 @@ msgstr "" msgid "Download" msgstr "" +msgid "Download artifacts archive" +msgstr "" + +msgid "Download export" +msgstr "" + msgid "Download tar" msgstr "" @@ -2699,6 +2855,9 @@ msgstr "" msgid "Edit application" msgstr "" +msgid "Edit comment" +msgstr "" + msgid "Edit files in the editor and commit changes here" msgstr "" @@ -2708,6 +2867,9 @@ msgstr "" msgid "Edit identity for %{user_name}" msgstr "" +msgid "Elapsed time" +msgstr "" + msgid "Elasticsearch" msgstr "" @@ -2717,6 +2879,9 @@ msgstr "" msgid "Email" msgstr "" +msgid "Email a new %{name} to this project" +msgstr "" + msgid "Email patch" msgstr "" @@ -2726,6 +2891,9 @@ msgstr "" msgid "Embed" msgstr "" +msgid "Empty" +msgstr "" + msgid "Enable" msgstr "" @@ -2759,6 +2927,9 @@ msgstr "" msgid "Enable or disable certain group features and choose access levels." msgstr "" +msgid "Enable or disable certain project features and choose access levels." +msgstr "" + msgid "Enable or disable the Pseudonymizer data collection." msgstr "" @@ -2780,6 +2951,12 @@ msgstr "" msgid "Enter in your Bitbucket Server URL and personal access token below" msgstr "" +msgid "Enter the %{name} description" +msgstr "" + +msgid "Enter the %{name} title" +msgstr "" + msgid "Environments" msgstr "" @@ -2966,6 +3143,15 @@ msgstr "" msgid "Everyone can contribute" msgstr "" +msgid "Existing Git repository" +msgstr "" + +msgid "Existing branch name, tag, or commit SHA" +msgstr "" + +msgid "Existing folder" +msgstr "" + msgid "Expand" msgstr "" @@ -2993,6 +3179,12 @@ msgstr "" msgid "Explore public groups" msgstr "" +msgid "Export project" +msgstr "" + +msgid "Export this project with all its related data in order to move your project to a new GitLab instance. Once the export is finished, you can import the file from the \"New Project\" page." +msgstr "" + msgid "External Classification Policy Authorization" msgstr "" @@ -3044,6 +3236,9 @@ msgstr "" msgid "Failure" msgstr "" +msgid "Fast-forward merge" +msgstr "" + msgid "Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)" msgstr "" @@ -3071,6 +3266,9 @@ msgstr "" msgid "Filter by commit message" msgstr "" +msgid "Find File" +msgstr "" + msgid "Find by path" msgstr "" @@ -3181,12 +3379,21 @@ msgstr "" msgid "General" msgstr "" +msgid "General Settings" +msgstr "" + msgid "General pipelines" msgstr "" +msgid "General project" +msgstr "" + msgid "Generate a default set of labels" msgstr "" +msgid "Generate new export" +msgstr "" + msgid "Geo Nodes" msgstr "" @@ -3460,9 +3667,18 @@ msgstr "" msgid "Geo|You need a different license to use Geo replication" msgstr "" +msgid "Get started" +msgstr "" + +msgid "Get started with GitLab by enabling features that work best for your project. From issues and wikis, to merge requests and pipelines, GitLab can help manage your workflow from idea to production!" +msgstr "" + msgid "Git" msgstr "" +msgid "Git global setup" +msgstr "" + msgid "Git repository URL" msgstr "" @@ -3478,6 +3694,9 @@ msgstr "" msgid "Git version" msgstr "" +msgid "GitHub" +msgstr "" + msgid "GitHub import" msgstr "" @@ -3496,6 +3715,9 @@ msgstr "" msgid "GitLab User" msgstr "" +msgid "GitLab export" +msgstr "" + msgid "GitLab project export" msgstr "" @@ -3505,6 +3727,9 @@ msgstr "" msgid "GitLab will run a background job that will produce pseudonymized CSVs of the GitLab database that will be uploaded to your configured object storage directory." msgstr "" +msgid "GitLab.com" +msgstr "" + msgid "GitLab.com import" msgstr "" @@ -3529,6 +3754,9 @@ msgstr "" msgid "Go back" msgstr "" +msgid "Go full screen" +msgstr "" + msgid "Go to %{link_to_google_takeout}." msgstr "" @@ -3538,6 +3766,9 @@ msgstr "" msgid "GoToYourFork|Fork" msgstr "" +msgid "Google Code" +msgstr "" + msgid "Google Code import" msgstr "" @@ -3759,6 +3990,9 @@ msgstr "" msgid "History" msgstr "" +msgid "Housekeeping" +msgstr "" + msgid "Housekeeping successfully started" msgstr "" @@ -3822,10 +4056,10 @@ msgstr "" msgid "If disabled, the access level will depend on the user's permissions in the project." msgstr "" -msgid "If enabled" +msgid "If enabled, access to projects will be validated on an external service using their classification label." msgstr "" -msgid "If enabled, access to projects will be validated on an external service using their classification label." +msgid "If enabled:" msgstr "" msgid "If using GitHub, you’ll see pipeline statuses on GitHub for your commits and pull requests. %{more_info_link}" @@ -3873,6 +4107,9 @@ msgstr "" msgid "Import project" msgstr "" +msgid "Import project from" +msgstr "" + msgid "Import projects from Bitbucket" msgstr "" @@ -3921,6 +4158,9 @@ msgstr "" msgid "Incompatible Project" msgstr "" +msgid "Initialize repository with a README" +msgstr "" + msgid "Inline" msgstr "" @@ -3930,6 +4170,12 @@ msgstr "" msgid "Input your repository URL" msgstr "" +msgid "Insert a quote" +msgstr "" + +msgid "Insert code" +msgstr "" + msgid "Install GitLab Runner" msgstr "" @@ -3995,6 +4241,9 @@ msgstr "" msgid "Issues closed" msgstr "" +msgid "Issues with comments, merge requests with diffs and comments, labels, milestones, snippets, and other project entities" +msgstr "" + msgid "Jan" msgstr "" @@ -4007,6 +4256,9 @@ msgstr "" msgid "Job has been erased" msgstr "" +msgid "Job traces and artifacts" +msgstr "" + msgid "Jobs" msgstr "" @@ -4055,6 +4307,9 @@ msgstr "" msgid "LFS" msgstr "" +msgid "LFS objects" +msgstr "" + msgid "LFSStatus|Disabled" msgstr "" @@ -4239,6 +4494,12 @@ msgstr "" msgid "Live preview" msgstr "" +msgid "Loading" +msgstr "" + +msgid "Loading commit data..." +msgstr "" + msgid "Loading contribution stats for group members" msgstr "" @@ -4317,6 +4578,9 @@ msgstr "" msgid "Manifest" msgstr "" +msgid "Manifest file" +msgstr "" + msgid "Manifest file import" msgstr "" @@ -4371,9 +4635,18 @@ msgstr "" msgid "Merge Requests created" msgstr "" +msgid "Merge commit" +msgstr "" + +msgid "Merge commit with semi-linear history" +msgstr "" + msgid "Merge events" msgstr "" +msgid "Merge method" +msgstr "" + msgid "Merge request" msgstr "" @@ -4662,6 +4935,9 @@ msgstr "" msgid "New Application" msgstr "" +msgid "New Branch" +msgstr "" + msgid "New Group" msgstr "" @@ -4679,6 +4955,9 @@ msgstr "" msgid "New Pipeline Schedule" msgstr "" +msgid "New Project" +msgstr "" + msgid "New Snippet" msgstr "" @@ -4736,6 +5015,9 @@ msgstr "" msgid "New..." msgstr "" +msgid "Newer" +msgstr "" + msgid "No" msgstr "" @@ -4772,12 +5054,18 @@ msgstr "" msgid "No files found." msgstr "" +msgid "No import options available" +msgstr "" + msgid "No issues for the selected time period." msgstr "" msgid "No labels with such name or description" msgstr "" +msgid "No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded." +msgstr "" + msgid "No merge requests for the selected time period." msgstr "" @@ -4805,6 +5093,9 @@ msgstr "" msgid "No schedules" msgstr "" +msgid "No webhooks found, add one in the form above." +msgstr "" + msgid "No, directly import the existing email addresses and usernames." msgstr "" @@ -4928,6 +5219,9 @@ msgstr "" msgid "Number of access attempts" msgstr "" +msgid "OAuth integration" +msgstr "" + msgid "OK" msgstr "" @@ -4940,9 +5234,21 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "" +msgid "Older" +msgstr "" + +msgid "Once active this project shows up in the search and on the dashboard." +msgstr "" + msgid "Once imported, repositories can be mirrored over SSH. Read more %{ssh_link}" msgstr "" +msgid "Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source." +msgstr "" + +msgid "Once the exported file is ready, you will receive a notification email with a download link, or you can download it from this page." +msgstr "" + msgid "One more item" msgid_plural "%d more items" msgstr[0] "" @@ -4960,6 +5266,12 @@ msgstr "" msgid "Only admins" msgstr "" +msgid "Only allow merge requests to be merged if all discussions are resolved" +msgstr "" + +msgid "Only allow merge requests to be merged if the pipeline succeeds" +msgstr "" + msgid "Only comments from the following commit are shown below" msgstr "" @@ -5059,6 +5371,9 @@ 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 "" +msgid "Path" +msgstr "" + msgid "Path:" msgstr "" @@ -5077,6 +5392,9 @@ msgstr "" msgid "Perform advanced options such as changing path, transferring, or removing the group." msgstr "" +msgid "Perform advanced options such as housekeeping, archiving, renaming, transferring, or removing your project." +msgstr "" + msgid "Performance optimization" msgstr "" @@ -5167,6 +5485,9 @@ msgstr "" msgid "Pipelines for last year" msgstr "" +msgid "Pipelines need to be configured to enable this feature." +msgstr "" + msgid "Pipelines|Build with confidence" msgstr "" @@ -5284,6 +5605,9 @@ msgstr "" msgid "Please try again" msgstr "" +msgid "Please wait a moment, this page will automatically refresh when ready." +msgstr "" + msgid "Please wait while we connect to your repository. Refresh at will." msgstr "" @@ -5299,6 +5623,9 @@ msgstr "" msgid "Preview" msgstr "" +msgid "Previous Artifacts" +msgstr "" + msgid "Primary" msgstr "" @@ -5443,15 +5770,27 @@ msgstr "" msgid "Project Badges" msgstr "" +msgid "Project ID" +msgstr "" + msgid "Project access must be granted explicitly to each user." msgstr "" +msgid "Project and wiki repositories" +msgstr "" + msgid "Project avatar" msgstr "" msgid "Project avatar in repository: %{link}" msgstr "" +msgid "Project configuration including web hooks and services" +msgstr "" + +msgid "Project description" +msgstr "" + msgid "Project details" msgstr "" @@ -5470,6 +5809,15 @@ msgstr "" msgid "Project name" msgstr "" +msgid "Project path" +msgstr "" + +msgid "Project uploads" +msgstr "" + +msgid "Project visibility level will be changed to match namespace rules when transferring to a group." +msgstr "" + msgid "ProjectActivityRSS|Subscribe" msgstr "" @@ -5746,6 +6094,9 @@ msgstr "" msgid "Real-time features" msgstr "" +msgid "Recent Deliveries" +msgstr "" + msgid "Reference:" msgstr "" @@ -5793,6 +6144,9 @@ msgstr "" msgid "Related merge requests" msgstr "" +msgid "Release notes for tag" +msgstr "" + msgid "Remind later" msgstr "" @@ -5805,12 +6159,24 @@ msgstr "" msgid "Remove avatar" msgstr "" +msgid "Remove fork relationship" +msgstr "" + msgid "Remove priority" msgstr "" msgid "Remove project" msgstr "" +msgid "Remove tag" +msgstr "" + +msgid "Removed projects cannot be restored!" +msgstr "" + +msgid "Removing the project will delete its repository and all related resources including issues, merge requests etc." +msgstr "" + msgid "Rename" msgstr "" @@ -5820,6 +6186,12 @@ msgstr "" msgid "Rename folder" msgstr "" +msgid "Rename project" +msgstr "" + +msgid "Rename repository" +msgstr "" + msgid "Repair authentication" msgstr "" @@ -5829,6 +6201,9 @@ msgstr "" msgid "Repo by URL" msgstr "" +msgid "Report as abuse" +msgstr "" + msgid "Reports|%{failedString} and %{resolvedString}" msgstr "" @@ -5883,12 +6258,21 @@ msgstr "" msgid "Request Access" msgstr "" +msgid "Request details" +msgstr "" + +msgid "Request time" +msgstr "" + msgid "Requests Profiles" msgstr "" msgid "Require all users to accept Terms of Service and Privacy Policy when they access GitLab." msgstr "" +msgid "Resend Request" +msgstr "" + msgid "Reset git storage health information" msgstr "" @@ -5954,6 +6338,9 @@ msgstr "" msgid "Run CI/CD pipelines for external repositories" msgstr "" +msgid "Run housekeeping" +msgstr "" + msgid "Runner token" msgstr "" @@ -5969,6 +6356,9 @@ msgstr "" msgid "Running" msgstr "" +msgid "Runs a number of housekeeping tasks within the current repository, such as compressing file revisions and removing unreachable objects." +msgstr "" + msgid "SAML SSO" msgstr "" @@ -5993,7 +6383,7 @@ msgstr "" msgid "SSH public key" msgstr "" -msgid "SSL Verification" +msgid "SSL Verification:" msgstr "" msgid "Save" @@ -6011,6 +6401,9 @@ msgstr "" msgid "Save variables" msgstr "" +msgid "Saving project." +msgstr "" + msgid "Schedule a new pipeline" msgstr "" @@ -6133,6 +6526,9 @@ msgstr "" msgid "Select a namespace to fork the project" msgstr "" +msgid "Select a new namespace" +msgstr "" + msgid "Select a timezone" msgstr "" @@ -6178,6 +6574,9 @@ msgstr "" msgid "Sep" msgstr "" +msgid "Separate tags with commas." +msgstr "" + msgid "September" msgstr "" @@ -6265,6 +6664,9 @@ msgstr "" msgid "Show latest version of the diff" msgstr "" +msgid "Show link to create/view merge request when pushing from the command line" +msgstr "" + msgid "Show parent pages" msgstr "" @@ -6315,6 +6717,9 @@ msgstr "" msgid "Sign-up restrictions" msgstr "" +msgid "Size" +msgstr "" + msgid "Size and domain settings for static websites" msgstr "" @@ -6537,6 +6942,9 @@ msgstr "" msgid "Start a %{new_merge_request} with these changes" msgstr "" +msgid "Start import" +msgstr "" + msgid "Start the Runner!" msgstr "" @@ -6552,6 +6960,9 @@ msgstr "" msgid "Status" msgstr "" +msgid "Status was retried." +msgstr "" + msgid "Stop impersonation" msgstr "" @@ -6585,6 +6996,9 @@ msgstr "" msgid "Subscribe at project level" msgstr "" +msgid "Swap revisions" +msgstr "" + msgid "Switch branch/tag" msgstr "" @@ -6734,6 +7148,12 @@ msgstr "" msgid "The connection will time out after %{timeout}. For repositories that take longer, use a clone/push combination." msgstr "" +msgid "The following items will NOT be exported:" +msgstr "" + +msgid "The following items will be exported:" +msgstr "" + msgid "The fork relationship has been removed." msgstr "" @@ -6782,6 +7202,15 @@ msgstr "" msgid "The pseudonymizer data collection is disabled. When enabled, GitLab will run a background job that will produce pseudonymized CSVs of the GitLab database that will be uploaded to your configured object storage directory." msgstr "" +msgid "The repository can be committed to, and issues, comments and other entities can be created." +msgstr "" + +msgid "The repository cannot be committed to, and no issues, comments or other entities can be created." +msgstr "" + +msgid "The repository could not be imported." +msgstr "" + msgid "The repository for this project does not exist." msgstr "" @@ -6905,6 +7334,9 @@ msgstr "" msgid "This is a confidential issue." msgstr "" +msgid "This is a private email address, generated just for you. Anyone who gets ahold of it can create issues or merge requests as if they were you. You should %{reset_it} if that ever happens." +msgstr "" + msgid "This is the author's first Merge Request to this project." msgstr "" @@ -6968,9 +7400,18 @@ msgstr "" msgid "This project does not belong to a group and can therefore not make use of group Runners." msgstr "" +msgid "This project does not have a README yet" +msgstr "" + +msgid "This project does not have a wiki homepage yet" +msgstr "" + msgid "This project does not have billing enabled. To create a cluster, enable billing and try again." msgstr "" +msgid "This project was scheduled for deletion, but failed with the following message:" +msgstr "" + msgid "This repository" msgstr "" @@ -6986,9 +7427,15 @@ msgstr "" msgid "This user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches. Upon creation or when reassigning you can only assign yourself to be the mirror user." msgstr "" +msgid "This way you could make sure that if this merge request would build, after merging to target branch it would also build." +msgstr "" + msgid "This will delete the custom metric, Are you sure?" msgstr "" +msgid "This will remove the fork relationship to source project" +msgstr "" + msgid "Those emails automatically become issues (with the comments becoming the email conversation) listed here." msgstr "" @@ -7188,6 +7635,12 @@ msgstr "" msgid "To connect an SVN repository, check out %{svn_link}." msgstr "" +msgid "To enable importing projects from Bitbucket," +msgstr "" + +msgid "To enable importing projects from GitLab.com," +msgstr "" + msgid "To get started you enter your FogBugz URL and login information below. In the next steps, you'll be able to map users and select the projects you want to import." msgstr "" @@ -7209,6 +7662,9 @@ msgstr "" msgid "To only use CI/CD features for an external repository, choose CI/CD for external repo." msgstr "" +msgid "To set up CA, you must first define a production environment by setting up your CI and then deploy to production." +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 "" @@ -7254,6 +7710,9 @@ msgstr "" msgid "Too many changes to show." msgstr "" +msgid "Too many items to show. To preserve performance only %{limit} of %{total} items are displayed." +msgstr "" + msgid "Total Contributions" msgstr "" @@ -7275,9 +7734,15 @@ msgstr "" msgid "Track time with quick actions" msgstr "" +msgid "Transfer project" +msgstr "" + msgid "Trending" msgstr "" +msgid "Trigger" +msgstr "" + msgid "Trigger pipelines for mirror updates" msgstr "" @@ -7299,12 +7764,21 @@ msgstr "" msgid "Twitter" msgstr "" +msgid "URL" +msgstr "" + msgid "Unable to load the diff. %{button_try_again}" msgstr "" msgid "Unable to sign you in to the group with SAML due to \"%{reason}\"" msgstr "" +msgid "Unarchive project" +msgstr "" + +msgid "Unarchiving the project will restore people's ability to make changes to it." +msgstr "" + msgid "Unknown" msgstr "" @@ -7362,6 +7836,9 @@ msgstr "" msgid "Update your group name, description, avatar, and other general settings." msgstr "" +msgid "Update your project name, description, avatar, and other general settings." +msgstr "" + msgid "Updating" msgstr "" @@ -7461,6 +7938,9 @@ msgstr "" msgid "Verified" msgstr "" +msgid "View details" +msgstr "" + msgid "View epics list" msgstr "" @@ -7494,6 +7974,9 @@ msgstr "" msgid "View replaced file @ " msgstr "" +msgid "Visibility Level" +msgstr "" + msgid "Visibility and access controls" msgstr "" @@ -7515,6 +7998,9 @@ msgstr "" msgid "VisibilityLevel|Unknown" msgstr "" +msgid "Want to house several dependent projects under the same namespace?" +msgstr "" + msgid "Want to see the data? Please ask an administrator for access." msgstr "" @@ -7524,6 +8010,9 @@ msgstr "" msgid "We don't have enough data to show this stage." msgstr "" +msgid "We recommend you %{link_to_add_a_homepage} to your project's wiki and GitLab will show it here instead of this message." +msgstr "" + msgid "We want to be sure it is you, please confirm you are not a robot." msgstr "" @@ -7533,6 +8022,12 @@ msgstr "" msgid "Web terminal" msgstr "" +msgid "Webhooks" +msgstr "" + +msgid "Webhooks (%{count})" +msgstr "" + msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." msgstr "" @@ -7545,12 +8040,21 @@ msgstr "" msgid "Weight %{weight}" msgstr "" +msgid "What does this command do?" +msgstr "" + msgid "When a runner is locked, it cannot be assigned to other projects" msgstr "" +msgid "When an event in GitLab triggers a webhook, you can use the request details to figure out if something went wrong." +msgstr "" + msgid "When enabled, users cannot use GitLab until the terms have been accepted." msgstr "" +msgid "When fast-forward merge is not possible, the user is given the option to rebase." +msgstr "" + msgid "When leaving the URL blank, classification labels can still be specified without disabling cross project features or performing external authorization checks." msgstr "" @@ -7695,6 +8199,12 @@ msgstr "" msgid "Withdraw Access Request" msgstr "" +msgid "Write" +msgstr "" + +msgid "Write your release notes or drag files here…" +msgstr "" + msgid "Yes" msgstr "" @@ -7704,6 +8214,9 @@ msgstr "" msgid "Yes, let me map Google Code users to full names or GitLab users." msgstr "" +msgid "You are about to add 0 people to the discussion. Proceed with caution." +msgstr "" + msgid "You are an admin, which means granting access to %{client_name} will allow them to interact with GitLab as an admin as well. Proceed with caution." msgstr "" @@ -7737,6 +8250,9 @@ msgstr "" msgid "You can also test your .gitlab-ci.yml in the %{linkStart}Lint%{linkEnd}" msgstr "" +msgid "You can create a new %{name} inside this project by sending an email to the following email address:" +msgstr "" + msgid "You can easily contribute to them by requesting to join these groups." msgstr "" @@ -7752,6 +8268,9 @@ msgstr "" msgid "You can only edit files when you are on a branch" msgstr "" +msgid "You can only transfer the project to namespaces you manage." +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 "" @@ -7770,6 +8289,9 @@ msgstr "" msgid "You don't have any authorized applications" msgstr "" +msgid "You don't have any webhooks deliveries" +msgstr "" + msgid "You have no permissions" msgstr "" @@ -7794,6 +8316,9 @@ msgstr "" msgid "You need permission." msgstr "" +msgid "You will need to update your local repositories to point to the new location." +msgstr "" + msgid "You will not get any notifications via email" msgstr "" @@ -7821,6 +8346,9 @@ msgstr "" msgid "You'll need to use different branch names to get a valid comparison." msgstr "" +msgid "You're not allowed to edit files in this project directly. Please fork this project, make your changes there, and submit a merge request." +msgstr "" + msgid "You're receiving this email because %{reason}." msgstr "" @@ -7863,6 +8391,9 @@ msgstr "" msgid "Your comment will not be visible to the public." msgstr "" +msgid "Your deployment services will be broken, you will need to manually fix the services after renaming." +msgstr "" + msgid "Your groups" msgstr "" @@ -7875,6 +8406,9 @@ msgstr "" msgid "a deleted user" msgstr "" +msgid "add a homepage" +msgstr "" + msgid "ago" msgstr "" @@ -7891,6 +8425,12 @@ msgid_plural "and %d fixed vulnerabilities" msgstr[0] "" msgstr[1] "" +msgid "as administrator you need to configure" +msgstr "" + +msgid "ask your GitLab administrator to configure" +msgstr "" + msgid "assign yourself" msgstr "" @@ -8139,6 +8679,9 @@ msgid_plural "days" msgstr[0] "" msgstr[1] "" +msgid "default" +msgstr "" + msgid "deploy token" msgstr "" @@ -8191,6 +8734,9 @@ msgstr "" msgid "is not a valid X509 certificate." msgstr "" +msgid "issue" +msgstr "" + msgid "latest version" msgstr "" @@ -8437,6 +8983,9 @@ msgstr "" msgid "new merge request" msgstr "" +msgid "none" +msgstr "" + msgid "notification emails" msgstr "" @@ -8471,6 +9020,9 @@ msgstr "" msgid "remove weight" msgstr "" +msgid "retried" +msgstr "" + msgid "source" msgstr "" diff --git a/qa/qa/page/file/form.rb b/qa/qa/page/file/form.rb index f6e502f500b55262f5c7bd06f7003c9cf06bb14d..def421f673187ca91f55c863dce6527821f56c9a 100644 --- a/qa/qa/page/file/form.rb +++ b/qa/qa/page/file/form.rb @@ -10,7 +10,7 @@ class Form < Page::Base end view 'app/views/projects/_commit_button.html.haml' do - element :commit_changes, "button_tag 'Commit changes'" + element :commit_changes, "button_tag _('Commit changes')" end def add_name(name) diff --git a/qa/qa/page/project/new.rb b/qa/qa/page/project/new.rb index 1fb569b0f29c3f9a43328e50da90f0af88552ba0..ff883d808604db81a38a09f92fc4a11252ba26c3 100644 --- a/qa/qa/page/project/new.rb +++ b/qa/qa/page/project/new.rb @@ -13,12 +13,12 @@ class New < Page::Base element :project_namespace_field, 'namespaces_options' element :project_path, 'text_field :path' element :project_description, 'text_area :description' - element :project_create_button, "submit 'Create project'" + element :project_create_button, "submit _('Create project')" element :visibility_radios, 'visibility_level:' end view 'app/views/projects/_import_project_pane.html.haml' do - element :import_github, "icon('github', text: 'GitHub')" + element :import_github, "icon('github', text: _('GitHub'))" end def choose_test_namespace diff --git a/qa/qa/page/project/settings/advanced.rb b/qa/qa/page/project/settings/advanced.rb index d7b2b66b5873593fe25742b283f6f35cbe90e27f..e6723c9b95c55ad758247dfd26aa0055ee965708 100644 --- a/qa/qa/page/project/settings/advanced.rb +++ b/qa/qa/page/project/settings/advanced.rb @@ -6,7 +6,7 @@ class Advanced < Page::Base view 'app/views/projects/edit.html.haml' do element :project_path_field, 'text_field :path' element :project_name_field, 'text_field :name' - element :rename_project_button, "submit 'Rename project'" + element :rename_project_button, "submit _('Rename project')" end def rename_to(path) diff --git a/qa/qa/page/project/settings/common.rb b/qa/qa/page/project/settings/common.rb index 874fb381554a5d35099f44c3c672f0a4dc6cfb79..cee94223a02b3bef53a58945808cc8c547d35e82 100644 --- a/qa/qa/page/project/settings/common.rb +++ b/qa/qa/page/project/settings/common.rb @@ -8,7 +8,7 @@ module Common def self.included(base) base.class_eval do view 'app/views/projects/edit.html.haml' do - element :advanced_settings_expand, "= expanded ? 'Collapse' : 'Expand'" + element :advanced_settings_expand, "= expanded ? _('Collapse') : _('Expand')" end end end