Download as
Browse Code »

Commit c0f4e12fa8ca1b5f27adcc8789f7923ed83e1d31

Authored by AntonioTerceiro
1 parent a72661ab
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem172: minor English and wording review 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1559 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 12 additions and 12 deletions   Show diff stats
app/models/communities_block.rb
  Diff comments   View file @c0f4e12
@@ -9,7 +9,7 @@ class CommunitiesBlock < ProfileListBlock @@ -9,7 +9,7 @@ class CommunitiesBlock < ProfileListBlock
9 end 9 end
10 10
11 def help 11 def help
12 - _('Here you can see the communities where this user is part.') 12 + _('The communities in which the user is a member')
13 end 13 end
14 14
15 def footer 15 def footer
app/models/enterprises_block.rb
  Diff comments   View file @c0f4e12
@@ -5,7 +5,7 @@ class EnterprisesBlock < ProfileListBlock @@ -5,7 +5,7 @@ class EnterprisesBlock < ProfileListBlock
5 end 5 end
6 6
7 def help 7 def help
8 - _('Here you can see the enterprises where this user works.') 8 + _('The enterprises where this user works.')
9 end 9 end
10 10
11 def self.description 11 def self.description
app/models/profile_info_block.rb
  Diff comments   View file @c0f4e12
@@ -5,7 +5,7 @@ class ProfileInfoBlock < Block @@ -5,7 +5,7 @@ class ProfileInfoBlock < Block
5 end 5 end
6 6
7 def help 7 def help
8 - _('Basic information about <i>%{user}</i>. Here you see how much time <i>%{user}</i> is part of the <i>%{env}</i> enviroment, and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() } 8 + _('Basic information about <i>%{user}</i>: how long <i>%{user}</i> is part of <i>%{env}</i> and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() }
9 end 9 end
10 10
11 def content 11 def content
app/views/layouts/application.rhtml
  Diff comments   View file @c0f4e12
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 <span><%= _('No') %></span></a> 155 <span><%= _('No') %></span></a>
156 </div><!-- end class="bts" --> 156 </div><!-- end class="bts" -->
157 <p/> 157 <p/>
158 - <%= _('If needed, you can activate or inactivate the automatic help mode by clicking the question mark symbol in the top-right corner') %> 158 + <%= _('If needed, you can activate or deactivate the automatic help mode by clicking the question mark symbol in the top-right corner') %>
159 </div> 159 </div>
160 <%= javascript_include_tag 'noosfero-show-help' %> 160 <%= javascript_include_tag 'noosfero-show-help' %>
161 161
app/views/shared/user_menu.rhtml
  Diff comments   View file @c0f4e12
1 <div id="user_menu" class="top_extra_menu AOM_paddingBottom_6"<%= 1 <div id="user_menu" class="top_extra_menu AOM_paddingBottom_6"<%=
2 - ' help="'+ _('This is your menu, for your personal functionalies.') +'"' if logged_in? 2 + ' help="'+ _('This menu gives you access to your personal functionalities.') +'"' if logged_in?
3 %>> 3 %>>
4 4
5 <% if logged_in? %> 5 <% if logged_in? %>
@@ -16,20 +16,20 @@ @@ -16,20 +16,20 @@
16 <ul> 16 <ul>
17 17
18 <li><a href="<%= homepage_path(:profile => current_user.login) %>" 18 <li><a href="<%= homepage_path(:profile => current_user.login) %>"
19 - help="<%= _('Go to your home page. <p/> Is good to see if it\'s cool enought and you can make this rock! <b>;-)</b>') %>" 19 + help="<%= _('Go to your home page.') %>"
20 ><span class="icon-menu-home"></span><%= _('My Home Page') %></a></li> 20 ><span class="icon-menu-home"></span><%= _('My Home Page') %></a></li>
21 21
22 <!-- li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li --> 22 <!-- li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li -->
23 23
24 <li><%= link_to_myprofile( '<span class="icon-menu-ctrl-panel"></span>'+ _('control panel'), 24 <li><%= link_to_myprofile( '<span class="icon-menu-ctrl-panel"></span>'+ _('control panel'),
25 {}, nil, :id => 'link_edit_profile', 25 {}, nil, :id => 'link_edit_profile',
26 - :help => _('The control panel is where you find all <b>cool features</b> to make your site rock! <p/> There you will find how to <b>change your picture</b>, or your <b>personal information</b>, add <b>content to your site</b>, <b>change your look</b>, and <b>more</b>...') 26 + :help => _('Control panel: change your picture, edit your personal information, create content or change the way your home page looks.')
27 ) %></li> 27 ) %></li>
28 28
29 <%= 29 <%=
30 '<li>'+ link_to( '<span class="icon-menu-"></span>'+ _('Admin'), 30 '<li>'+ link_to( '<span class="icon-menu-"></span>'+ _('Admin'),
31 { :controller => 'admin_panel' }, :id => 'link_admin_panel', 31 { :controller => 'admin_panel' }, :id => 'link_admin_panel',
32 - :help => _('This link will take you to the page where you can use your <b>super-powers</b>!') 32 + :help => _('Access the site administration panel.')
33 ) + 33 ) +
34 '</li>' if user.is_admin? 34 '</li>' if user.is_admin?
35 %> 35 %>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <li><%= lightbox_link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'), 37 <li><%= lightbox_link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'),
38 { :controller => 'account', :action => 'logout_popup'}, 38 { :controller => 'account', :action => 'logout_popup'},
39 :id => 'link_logout', 39 :id => 'link_logout',
40 - :help => _('If you\'ll not use more this web site (for now), or will exit from this computer, <b>where other peple may use</b>, is better to click on this <i>Logout</i> link.') 40 + :help => _('This link takes you out of the system. You should logout if other people are willing to use the same computer after you.')
41 ) %></li> 41 ) %></li>
42 42
43 </ul> 43 </ul>
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 <%= lightbox_link_to '<span class="icon-menu-login"></span>'+ _('Login'), 48 <%= lightbox_link_to '<span class="icon-menu-login"></span>'+ _('Login'),
49 { :controller => 'account', :action => 'login_popup' }, 49 { :controller => 'account', :action => 'login_popup' },
50 :id => 'link_login', 50 :id => 'link_login',
51 - :help => _('Open the login box to allow you to be recognized and to use the <b>cool features</b> of this enviroment.') %> 51 + :help => _('Click here to enter your username and password and be recognized by the system.') %>
52 52
53 <% end %> 53 <% end %>
54 54
app/views/tasks/_add_friend.rhtml
  Diff comments   View file @c0f4e12
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 <%= _('Accept') %> 11 <%= _('Accept') %>
12 12
13 <% 13 <%
14 - content_tag('div', :id => "group-for-friend-#{task.id}", :help => _('You can select one of the existing groups or type the name of a new group.')) do %>  
15 - <%= _('Classify your new friend %s: ') % task.requestor.name %> 14 + content_tag('div', :id => "group-for-friend-#{task.id}", :help => _('You can type the first letters of an existing group and have the system present you the available options, or you can type the name of a new group if you want.')) do %>
  15 + <%= _('Classify your new friend %s:') % task.requestor.name %>
16 <%= text_field_with_local_autocomplete("task[group_for_friend]", profile.suggested_friend_groups, :id => "field-group-for-friend-#{task.id}") %> 16 <%= text_field_with_local_autocomplete("task[group_for_friend]", profile.suggested_friend_groups, :id => "field-group-for-friend-#{task.id}") %>
17 <p> 17 <p>
18 <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %> 18 <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %>