Merge pull request #5395 from dpursehouse/more-label-fixes

More label fixes

Merge pull request #5395 from dpursehouse/more-label-fixes
More label fixes
Jacob Vosmaer
2 parents 88519e90 03dec79c
Showing 6 changed files with 6 additions and 6 deletions Show diff stats
app/views/admin/groups/show.html.haml
app/views/groups/edit.html.haml
app/views/profiles/accounts/show.html.haml
app/views/profiles/keys/show.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
app/views/projects/show.html.haml
@@ -25,7 +25,7 @@
             = @group.description
  
         %li
-          %span.light Created at:
+          %span.light Created on:
           %strong
             = @group.created_at.stamp("March 1, 1999")
  
@@ -68,7 +68,7 @@
           .title Remove group
           .ui-box-body
             %p
-              Remove of group will cause removing all child projects and resources.
+              Removing group will cause all child projects and resources to be removed.
             %p
               %strong Removed group can not be restored!
  
@@ -68,6 +68,6 @@
             %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
           - if current_user.solo_owned_groups.present?
             %li
-              Next groups will be abandoned. You should transfer or remove them:
+              The following groups will be abandoned. You should transfer or remove them:
               %strong #{current_user.solo_owned_groups.map(&:name).join(', ')}
         = link_to 'Delete account', user_registration_path, confirm: "REMOVE #{current_user.name}? Are you sure?", method: :delete, class: "btn btn-remove"
@@ -8,7 +8,7 @@
           %span.light Title:
           %strong= @key.title
         %li
-          %span.light Created at:
+          %span.light Created on:
           %strong= @key.created_at.stamp("Aug 21, 2011")
  
   .span8
@@ -13,7 +13,7 @@
   .ui-box-body
     %div
       %cite.cgray
-        Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
+        Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
         - if @merge_request.assignee
           \, currently assigned to #{link_to_member(@project, @merge_request.assignee)}
       - if @merge_request.milestone
@@ -59,7 +59,7 @@
     %br
     .light-well
       %p
-        %span.light Created at
+        %span.light Created on
         #{@project.created_at.stamp('Aug 22, 2013')}
       %p
         %span.light Owned by
...	...	@@ -25,7 +25,7 @@
25	25	= @group.description
26	26
27	27	%li
28		- %span.light Created at:
	28	+ %span.light Created on:
29	29	%strong
30	30	= @group.created_at.stamp("March 1, 1999")
31	31
...	...
...	...	@@ -68,7 +68,7 @@
68	68	.title Remove group
69	69	.ui-box-body
70	70	%p
71		- Remove of group will cause removing all child projects and resources.
	71	+ Removing group will cause all child projects and resources to be removed.
72	72	%p
73	73	%strong Removed group can not be restored!
74	74
...	...
...	...	@@ -68,6 +68,6 @@
68	68	%li #{pluralize rp, 'personal project'} will be removed and cannot be restored
69	69	- if current_user.solo_owned_groups.present?
70	70	%li
71		- Next groups will be abandoned. You should transfer or remove them:
	71	+ The following groups will be abandoned. You should transfer or remove them:
72	72	%strong #{current_user.solo_owned_groups.map(&:name).join(', ')}
73	73	= link_to 'Delete account', user_registration_path, confirm: "REMOVE #{current_user.name}? Are you sure?", method: :delete, class: "btn btn-remove"
...	...
...	...	@@ -8,7 +8,7 @@
8	8	%span.light Title:
9	9	%strong= @key.title
10	10	%li
11		- %span.light Created at:
	11	+ %span.light Created on:
12	12	%strong= @key.created_at.stamp("Aug 21, 2011")
13	13
14	14	.span8
...	...
...	...	@@ -13,7 +13,7 @@
13	13	.ui-box-body
14	14	%div
15	15	%cite.cgray
16		- Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
	16	+ Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
17	17	- if @merge_request.assignee
18	18	\, currently assigned to #{link_to_member(@project, @merge_request.assignee)}
19	19	- if @merge_request.milestone
...	...
...	...	@@ -59,7 +59,7 @@
59	59	%br
60	60	.light-well
61	61	%p
62		- %span.light Created at
	62	+ %span.light Created on
63	63	#{@project.created_at.stamp('Aug 22, 2013')}
64	64	%p
65	65	%span.light Owned by
...	...