diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index 8f302dce5d4728ea1532652ff7cee87bff73d79e..eb6570af30e2a271341b89f0d3ae94b668813f0c 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -1,6 +1,6 @@ .alert.alert-info %span - Post receive hooks for binding events. + Post-receive hooks for binding events. %br Read more about system hooks %strong #{link_to "here", help_system_hooks_path, class: "vlink"} diff --git a/app/views/dashboard/_zero_authorized_projects.html.haml b/app/views/dashboard/_zero_authorized_projects.html.haml index 4b0d0d6873d13a3ddc1d0186bd9d8debd090908c..ea5d8d6376fa9fb71df11f2bc37b2e9bd768a577 100644 --- a/app/views/dashboard/_zero_authorized_projects.html.haml +++ b/app/views/dashboard/_zero_authorized_projects.html.haml @@ -1,12 +1,12 @@ %h3.nothing_here_message - There are no projects you have access to. + You don't have access to any projects. %br - if current_user.can_create_project? You can create up to - = current_user.projects_limit - projects. Click on button below to add a new one + = pluralize(current_user.projects_limit, "project") + "." + Click on the button below to add a new one .link_holder = link_to new_project_path, class: "btn btn-primary" do New Project ยป - else - If you will be added to project - it will be displayed here + If you are added to a project, it will be displayed here diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 8b736fb50398a61d533d2c2b4898a1c35adbf13e..82880d5ef63e4c96ec166638bc4f771847c6ea3a 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -3,7 +3,7 @@ %span.pull-right #{@issues.total_count} issues %p.light - For all issues you should visit project issues page. Or you can use search panel to find specific issue + For all issues you should visit the project's issues page, or use the search panel to find a specific issue. %hr .row diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 6ffe54028b56a0f2250dd117b15c63f382969741..9c96edeefd588a058ce62759ffce18d1f9b627f0 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -4,7 +4,7 @@ %p.light - Only merge requests authored or assigned to you are listed here. + Only merge requests created by you or assigned to you are listed here. %hr .row .span3 diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml index 7e413904dc8b31be80075c209c9bced93e639d68..3599320dfb36ad82e965fe77784e766472d341ee 100644 --- a/app/views/dashboard/projects.html.haml +++ b/app/views/dashboard/projects.html.haml @@ -1,6 +1,6 @@ %h3.page-title My Projects %p.light - All projects you have access to are listed here. Public projects are not included here unless you have membership in it + All projects you have access to are listed here. Public projects are not included here unless you are a member %hr .row .span3 diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml index 122ff1b4a0195f231176d5be1b42d758a89d417b..d711d55ec99da82b685ba431bee71ca3acc16a29 100644 --- a/app/views/profiles/account.html.haml +++ b/app/views/profiles/account.html.haml @@ -1,7 +1,7 @@ %h3.page-title Account settings %p.light - You can change password, username, private token here. + You can change your password, username and private token here. - if current_user.ldap_user? Some options are unavailable for LDAP accounts %hr @@ -20,7 +20,7 @@ %legend Password = form_for @user, url: update_password_profile_path, method: :put do |f| .padded - %p.slead After successful password update you will be redirected to login page where you should login with new password + %p.slead After a successful password update you will be redirected to login page where you should login with your new password -if @user.errors.any? .alert.alert-error %ul @@ -49,9 +49,9 @@ = form_for @user, url: reset_private_token_profile_path, method: :put do |f| .data %p.slead - Private token used to access application resources without authentication. + Your private token is used to access application resources without authentication. %br - It can be used for atom feed or API + It can be used for atom feeds or the API. %p.cgray - if current_user.private_token = text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text input-xpadding" @@ -81,8 +81,8 @@ %i.icon-remove Failed %ul.cred - %li It will change web url for personal projects. - %li It will change the git path to repositories for personal projects. + %li This will change the web URL for personal projects. + %li This will change the git path to repositories for personal projects. .controls = f.submit 'Save username', class: "btn btn-save" diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml index 59ee696387cededb0a3962896b346b887ef7b76e..d3ff233bf12d93318f3e6123e41429068eadde35 100644 --- a/app/views/profiles/groups/index.html.haml +++ b/app/views/profiles/groups/index.html.haml @@ -6,7 +6,7 @@ %i.icon-plus New Group %p.light - Members of group have access to all group projects. + Group members have access to all a group's projects %hr .ui-box .title diff --git a/app/views/profiles/history.html.haml b/app/views/profiles/history.html.haml index 5e59463ce37e2d5766fb7b993d1a87b06ebeebb4..3951c47b5f275c300ae60c47d62d57b0b0af5a19 100644 --- a/app/views/profiles/history.html.haml +++ b/app/views/profiles/history.html.haml @@ -1,7 +1,7 @@ %h3.page-title Account history %p.light - You can see all events authored by your account here + All events created by your account are listed here %hr .profile_history = render @events diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml index 0704874763eb2ac71a8f25ca6e425016d02f4f14..79fdb164089cde6040e46235d913ee83805e0681 100644 --- a/app/views/profiles/keys/index.html.haml +++ b/app/views/profiles/keys/index.html.haml @@ -3,9 +3,9 @@ .pull-right = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new" %p.light - SSH key allows you to establish a secure connection between your computer and GitLab + SSH keys allow you to establish a secure connection between your computer and GitLab %br - Before you can add ssh key you need to + Before you can add an SSH key you need to = link_to "generate it", help_ssh_path %hr diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index d7963a88d5d6da23391c9e82605cb4ba8ea830db..356d5499f07ce1c5842cfe2c4860e046fd65b92b 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -1,7 +1,7 @@ %h3.page-title Notifications settings %p.light - Application use email specified in your profile for notifications + GitLab uses the email specified in your profile for notifications %hr .alert.alert-info %p @@ -11,7 +11,7 @@ %p %i.icon-circle.cblue %strong Participating - – You will receive only notifications from related resources(ex. from assigned issue or your commit) + – You will only receive notifications from related resources (e.g. from your commits or assigned issues) %p %i.icon-circle.cgreen %strong Watch diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml index 00b41e657b69fc3d59470b3f1be9b42e0e6f163c..d49b2204537cbcf13719b8fe46916bbfc54fb9bc 100644 --- a/app/views/projects/deploy_keys/_form.html.haml +++ b/app/views/projects/deploy_keys/_form.html.haml @@ -13,7 +13,7 @@ = f.label :key .controls %p.light - Paste a machine public key here. Read more about how generate it + Paste a machine public key here. Read more about how to generate it = link_to "here", help_ssh_path = f.text_area :key, class: "input-xxlarge thin_area" diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml index 3e7976912419617c46ee5f04180a54b55253f0f9..53d6e36c62c333378a71e38e2960cef98e125d17 100644 --- a/app/views/projects/deploy_keys/index.html.haml +++ b/app/views/projects/deploy_keys/index.html.haml @@ -1,13 +1,13 @@ %h3.page-title - Deploy keys allow read-only access to repository + Deploy keys allow read-only access to the repository = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do %i.icon-plus New Deploy Key %p.light - They can be used for CI, staging or production servers. - You can create a deploy key or add existing one + Deploy keys can be used for CI, staging or production servers. + You can create a deploy key or add an existing one %hr.clearfix @@ -20,13 +20,13 @@ = render @enabled_keys - if @enabled_keys.blank? .light-well - %p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one + %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one .span5.available-keys %h5 %strong Deploy keys - from projects available for you + from projects available to you %ul.bordered-list = render @available_keys - if @available_keys.blank? .light-well - %p.nothing_here_message All deploy keys created in projects you participate will be displayed here + %p.nothing_here_message Deploy keys from projects you have access to will be displayed here diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 75226afc1776dacecbcab61e8b62471506b8fcee..117ee13140e30668d0fadd42091d3b8c2fd8aff7 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -4,7 +4,7 @@ %div %h3.page-title Project settings: - %p.light Some settings like transferring project are hidden inside danger area below + %p.light Some settings, such as "Transfer Project", are hidden inside the danger area below %hr .form-holder = form_for(@project, remote: true) do |f| @@ -126,13 +126,13 @@ .control-group = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} %ul - %li Be careful. Changing project namespace can have unintended side effects - %li You can transfer project only to namespaces you can manage + %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. .form-actions = f.submit 'Transfer', class: "btn btn-remove" - else - %p.nothing_here_message Only project owner can transfer a project + %p.nothing_here_message Only the project owner can transfer a project .ui-box.ui-box-danger .title Rename repository @@ -146,7 +146,7 @@ .control-group = f.text_field :path %ul - %li Be careful. Rename of project repo can have unintended side effects + %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. .form-actions = f.submit 'Rename', class: "btn btn-remove" @@ -156,9 +156,9 @@ .title Remove project .ui-box-body %p - Remove of project will cause removing repository and all related resources like issues, merge requests etc. + Removing the project will delete its repository and all related resources including issues, merge requests etc. %br - %strong Removed project can not be restored! + %strong Removed projects cannot be restored! = link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove" - else diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index 53e541036170e827a6d714773f002ebba79ddefa..f748eb29294294b19ea61d55a26a57136df8fab2 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -1,10 +1,11 @@ -- if can? current_user, :admin_project, @project - .alert.alert-info - %span - Post receive hooks for binding events when someone push to repository. - %br - Read more about web hooks - %strong #{link_to "here", help_web_hooks_path, class: "vlink"} +%h3.page-title + Post-receive hooks + +%p.light + #{link_to "Post-receive hooks ", help_web_hooks_path, class: "vlink"} can be + used for binding events when someone pushes to the repository. + +%hr.clearfix = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f| -if @hook.errors.any? diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml index 99a23c169d2381a42325e413e4dacc0d2c922787..539c45edd947b11bf48cc90f8a5101f9fd8a32dc 100644 --- a/app/views/projects/issues/_issues.html.haml +++ b/app/views/projects/issues/_issues.html.haml @@ -83,7 +83,7 @@ = render @issues - if @issues.blank? %li - %h4.nothing_here_message Nothing to show here + %h4.nothing_here_message No issues to show - if @issues.present? .pull-right diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 35de9149d8219dde03350d90e16dd6644fea8d7c..2bd5a027a0289634bf0ab0d16c45ef34e212970a 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -65,7 +65,7 @@ = render @merge_requests - if @merge_requests.blank? %li - %h4.nothing_here_message Nothing to show here + %h4.nothing_here_message No merge requests to show - if @merge_requests.present? .pull-right %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 7cae196d0a1c29e09b357caf20d63361e26e1eaa..299e1bc1e08715feec50df76593a6b15abf8ba83 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -1,6 +1,6 @@ - unless @allowed_to_merge .alert - %strong You don't have enough permissions to merge this MR + %strong You don't have permission to merge this MR - if @show_merge_controls @@ -27,7 +27,7 @@ .automerge_widget.no_satellite{style: "display:none"} .alert.alert-error %span - %strong This repository does not have satellite. Ask administrator to fix this issue + %strong This repository does not have satellite. Ask an administrator to fix this issue .automerge_widget.cannot_be_merged{style: "display:none"} .alert.alert-disabled diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml index 0c0828c9064a3f312b808de944c22cecc601dc10..ddb46bcb5cb511660c16540df1f8e1ac289de95c 100644 --- a/app/views/projects/milestones/index.html.haml +++ b/app/views/projects/milestones/index.html.haml @@ -26,6 +26,6 @@ - if @milestones.blank? %li - %h3.nothing_here_message Nothing to show here + %h3.nothing_here_message No milestones to show = paginate @milestones, theme: "gitlab" diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml index ea73d2f85def3901a2edfa7217328bd53a47d134..82b85a18acdf44765d677a73735ec2b50ae1ef72 100644 --- a/app/views/projects/services/index.html.haml +++ b/app/views/projects/services/index.html.haml @@ -1,5 +1,5 @@ %h3.page-title Services -%p.light Service allows you to integrate GitLab with other applications +%p.light Services allow you to integrate GitLab with other applications %hr %ul.bordered-list diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml index 36ebe27805ba73640e5abb38750d1ee652537a4b..1d98b9862105b58204df61ead712ed7828163c36 100644 --- a/app/views/projects/team_members/import.html.haml +++ b/app/views/projects/team_members/import.html.haml @@ -1,7 +1,7 @@ %h3.page-title = "Import members from another project" %p.light - Only project members will be improted. Group members will be skipped. + Only project members will be imported. Group members will be skipped. %hr = form_tag apply_import_project_team_members_path(@project), method: 'post' do .padded diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml index 6f4852d8785580a6aafe24e163c6f3d4c656a39c..3b3888a50e9dcfc07b03bed2d4af792efc57e72e 100644 --- a/app/views/shared/_issues.html.haml +++ b/app/views/shared/_issues.html.haml @@ -11,5 +11,5 @@ = render 'projects/issues/issue', issue: issue = paginate @issues, theme: "gitlab" - else - %p.nothing_here_message Nothing to show here + %p.nothing_here_message No issues to show diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index 4be445e6a323dcdede11947d2581f7b68e54fd52..b7a7ca8fcc8874c9414f1898d6081c54ff1c5df4 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -10,4 +10,4 @@ = paginate @merge_requests, theme: "gitlab" - else - %h3.nothing_here_message Nothing to show here + %h3.nothing_here_message No merge requests to show