Commit 3f28d9f7338cf0e061eba41881def195d61c6954

Authored by Henry Smith
1 parent 602e2e68

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

app/views/profiles/account.html.haml
1 %h3.page-title 1 %h3.page-title
2 Account settings 2 Account settings
3 %p.light 3 %p.light
4 - You can change password, username, private token here. 4 + You can change your password, username and private token here.
5 - if current_user.ldap_user? 5 - if current_user.ldap_user?
6 Some options are unavailable for LDAP accounts 6 Some options are unavailable for LDAP accounts
7 %hr 7 %hr
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 %legend Password 20 %legend Password
21 = form_for @user, url: update_password_profile_path, method: :put do |f| 21 = form_for @user, url: update_password_profile_path, method: :put do |f|
22 .padded 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 -if @user.errors.any? 24 -if @user.errors.any?
25 .alert.alert-error 25 .alert.alert-error
26 %ul 26 %ul
@@ -49,9 +49,9 @@ @@ -49,9 +49,9 @@
49 = form_for @user, url: reset_private_token_profile_path, method: :put do |f| 49 = form_for @user, url: reset_private_token_profile_path, method: :put do |f|
50 .data 50 .data
51 %p.slead 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 %br 53 %br
54 - It can be used for atom feed or API 54 + It can be used for atom feeds or the API.
55 %p.cgray 55 %p.cgray
56 - if current_user.private_token 56 - if current_user.private_token
57 = text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text input-xpadding" 57 = text_field_tag "token", current_user.private_token, class: "input-xxlarge large_text input-xpadding"
@@ -81,8 +81,8 @@ @@ -81,8 +81,8 @@
81 %i.icon-remove 81 %i.icon-remove
82 Failed 82 Failed
83 %ul.cred 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 .controls 86 .controls
87 = f.submit 'Save username', class: "btn btn-save" 87 = f.submit 'Save username', class: "btn btn-save"
88 88
app/views/profiles/groups/index.html.haml
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 %i.icon-plus 6 %i.icon-plus
7 New Group 7 New Group
8 %p.light 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 %hr 10 %hr
11 .ui-box 11 .ui-box
12 .title 12 .title
app/views/profiles/history.html.haml
1 %h3.page-title 1 %h3.page-title
2 Account history 2 Account history
3 %p.light 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 %hr 5 %hr
6 .profile_history 6 .profile_history
7 = render @events 7 = render @events
app/views/profiles/keys/index.html.haml
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 .pull-right 3 .pull-right
4 = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new" 4 = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
5 %p.light 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 %br 7 %br
8 - Before you can add ssh key you need to 8 + Before you can add an SSH key you need to
9 = link_to "generate it", help_ssh_path 9 = link_to "generate it", help_ssh_path
10 %hr 10 %hr
11 11
app/views/profiles/notifications/show.html.haml
1 %h3.page-title 1 %h3.page-title
2 Notifications settings 2 Notifications settings
3 %p.light 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 %hr 5 %hr
6 .alert.alert-info 6 .alert.alert-info
7 %p 7 %p
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 %p 11 %p
12 %i.icon-circle.cblue 12 %i.icon-circle.cblue
13 %strong Participating 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 %p 15 %p
16 %i.icon-circle.cgreen 16 %i.icon-circle.cgreen
17 %strong Watch 17 %strong Watch