summaryrefslogtreecommitdiff
path: root/app/views/profiles/account.html.haml
diff options
context:
space:
mode:
authorHenry Smith <henry@henrysmith.org>2013-08-15 19:31:00 +0100
committerHenry Smith <henry@henrysmith.org>2013-08-15 19:31:00 +0100
commit3f28d9f7338cf0e061eba41881def195d61c6954 (patch)
treec08208d5430a8b87b270b0e5faff82a29dc65278 /app/views/profiles/account.html.haml
parent602e2e68d956a53cf411124e0548d7a93139768f (diff)
downloadgitlab-ce-3f28d9f7338cf0e061eba41881def195d61c6954.tar.gz
Improved wording for the settings in the "My Profile" section
Diffstat (limited to 'app/views/profiles/account.html.haml')
-rw-r--r--app/views/profiles/account.html.haml12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml
index 122ff1b4a01..d711d55ec99 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"