Improved wording for the settings in the "My Profile" section

diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml
index 122ff1b..d711d55 100644 (file)
--- 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 59ee696..d3ff233 100644 (file)
--- 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 5e59463..3951c47 100644 (file)
--- 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 0704874..79fdb16 100644 (file)
--- 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 d7963a8..356d549 100644 (file)
--- 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