Merge pull request #4791 from h2s/wording

Improvements to English text

Merge pull request #4791 from h2s/wording
Improvements to English text
Dmitriy Zaporozhets
2 parents f2b37438 9b4e389b
Showing 22 changed files with 51 additions and 50 deletions Show diff stats
app/views/admin/hooks/index.html.haml
app/views/dashboard/_zero_authorized_projects.html.haml
app/views/dashboard/issues.html.haml
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/projects.html.haml
app/views/profiles/account.html.haml
app/views/profiles/groups/index.html.haml
app/views/profiles/history.html.haml
app/views/profiles/keys/index.html.haml
app/views/profiles/notifications/show.html.haml
app/views/projects/deploy_keys/_form.html.haml
app/views/projects/deploy_keys/index.html.haml
app/views/projects/edit.html.haml
app/views/projects/hooks/index.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/services/index.html.haml
app/views/projects/team_members/import.html.haml
 .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"}
 %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
@@ -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
@@ -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
 %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
 %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"
  
@@ -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
 %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
@@ -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
  
 %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
-    &ndash; You will receive only notifications from related resources(ex. from assigned issue or your commit)
+    &ndash; You will only receive notifications from related resources (e.g. from your commits or assigned issues)
   %p
     %i.icon-circle.cgreen
     %strong Watch
@@ -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"
  
 %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
@@ -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
-- 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?
@@ -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
@@ -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
 - 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
@@ -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"
 %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
 %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
@@ -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
  
@@ -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
1	1	.alert.alert-info
2	2	%span
3		- Post receive hooks for binding events.
	3	+ Post-receive hooks for binding events.
4	4	%br
5	5	Read more about system hooks
6	6	%strong #{link_to "here", help_system_hooks_path, class: "vlink"}
...	...
1	1	%h3.nothing_here_message
2		- There are no projects you have access to.
	2	+ You don't have access to any projects.
3	3	%br
4	4	- if current_user.can_create_project?
5	5	You can create up to
6		- = current_user.projects_limit
7		- projects. Click on button below to add a new one
	6	+ = pluralize(current_user.projects_limit, "project") + "."
	7	+ Click on the button below to add a new one
8	8	.link_holder
9	9	= link_to new_project_path, class: "btn btn-primary" do
10	10	New Project »
11	11	- else
12		- If you will be added to project - it will be displayed here
	12	+ If you are added to a project, it will be displayed here
...	...
...	...	@@ -3,7 +3,7 @@
3	3	%span.pull-right #{@issues.total_count} issues
4	4
5	5	%p.light
6		- For all issues you should visit project issues page. Or you can use search panel to find specific issue
	6	+ For all issues you should visit the project's issues page, or use the search panel to find a specific issue.
7	7	%hr
8	8
9	9	.row
...	...
...	...	@@ -4,7 +4,7 @@
4	4
5	5
6	6	%p.light
7		- Only merge requests authored or assigned to you are listed here.
	7	+ Only merge requests created by you or assigned to you are listed here.
8	8	%hr
9	9	.row
10	10	.span3
...	...
1	1	%h3.page-title My Projects
2	2	%p.light
3		- All projects you have access to are listed here. Public projects are not included here unless you have membership in it
	3	+ All projects you have access to are listed here. Public projects are not included here unless you are a member
4	4	%hr
5	5	.row
6	6	.span3
...	...
1	1	%h3.page-title
2	2	Account settings
3	3	%p.light
4		- You can change password, username, private token here.
	4	+ You can change your password, username and private token here.
5	5	- if current_user.ldap_user?
6	6	Some options are unavailable for LDAP accounts
7	7	%hr
...	...	@@ -20,7 +20,7 @@
20	20	%legend Password
21	21	= form_for @user, url: update_password_profile_path, method: :put do \|f\|
22	22	.padded
23		- %p.slead After successful password update you will be redirected to login page where you should login with new password
	23	+ %p.slead After a successful password update you will be redirected to login page where you should login with your new password
24	24	-if @user.errors.any?
25	25	.alert.alert-error
26	26	%ul
...	...	@@ -49,9 +49,9 @@
49	49	= form_for @user, url: reset_private_token_profile_path, method: :put do \|f\|
50	50	.data
51	51	%p.slead
52		- Private token used to access application resources without authentication.
	52	+ Your private token is used to access application resources without authentication.
53	53	%br
54		- It can be used for atom feed or API
	54	+ It can be used for atom feeds or the API.
55	55	%p.cgray
56	56	- if current_user.private_token
57	57	= text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text input-xpadding"
...	...	@@ -81,8 +81,8 @@
81	81	%i.icon-remove
82	82	Failed
83	83	%ul.cred
84		- %li It will change web url for personal projects.
85		- %li It will change the git path to repositories for personal projects.
	84	+ %li This will change the web URL for personal projects.
	85	+ %li This will change the git path to repositories for personal projects.
86	86	.controls
87	87	= f.submit 'Save username', class: "btn btn-save"
88	88
...	...
...	...	@@ -6,7 +6,7 @@
6	6	%i.icon-plus
7	7	New Group
8	8	%p.light
9		- Members of group have access to all group projects.
	9	+ Group members have access to all a group's projects
10	10	%hr
11	11	.ui-box
12	12	.title
...	...
1	1	%h3.page-title
2	2	Account history
3	3	%p.light
4		- You can see all events authored by your account here
	4	+ All events created by your account are listed here
5	5	%hr
6	6	.profile_history
7	7	= render @events
...	...
...	...	@@ -3,9 +3,9 @@
3	3	.pull-right
4	4	= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
5	5	%p.light
6		- SSH key allows you to establish a secure connection between your computer and GitLab
	6	+ SSH keys allow you to establish a secure connection between your computer and GitLab
7	7	%br
8		- Before you can add ssh key you need to
	8	+ Before you can add an SSH key you need to
9	9	= link_to "generate it", help_ssh_path
10	10	%hr
11	11
...	...
1	1	%h3.page-title
2	2	Notifications settings
3	3	%p.light
4		- Application use email specified in your profile for notifications
	4	+ GitLab uses the email specified in your profile for notifications
5	5	%hr
6	6	.alert.alert-info
7	7	%p
...	...	@@ -11,7 +11,7 @@
11	11	%p
12	12	%i.icon-circle.cblue
13	13	%strong Participating
14		- – You will receive only notifications from related resources(ex. from assigned issue or your commit)
	14	+ – You will only receive notifications from related resources (e.g. from your commits or assigned issues)
15	15	%p
16	16	%i.icon-circle.cgreen
17	17	%strong Watch
...	...