<%= _("
Welcome to %s!
Thanks for signing up, we're thrilled to have you on our social network!
-
Firsty, some tips for getting started:
+
Firstly, some tips for getting started:
Confirm your account!
You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.
You won't appear as a user until your account is confirmed.
What to do next?
-
Customize your profile. Upload an avatar and sign up for activity notifications under Account.
+
Customize your profile. Upload an avatar and let your friends find you easily :)
Learn the guidelines. Read the Documentation for more details on how to use new social network!
Invite and find your Gmail, Yahoo and Hotmail contacts!
Start exploring and Have fun!
" % [environment.name, url_for(:controller => :browse, :action => :people, :filter => 'more_recent')]) %>
diff --git a/app/views/profile_editor/edit.rhtml b/app/views/profile_editor/edit.rhtml
index 7ef894f..d761f75 100644
--- a/app/views/profile_editor/edit.rhtml
+++ b/app/views/profile_editor/edit.rhtml
@@ -77,7 +77,7 @@
<%= _('Translations') %>
<%= labelled_check_box(
- _('Automatic redirect the visitor to the translated article of him language'),
+ _('Automaticaly redirect the visitor to the article translated to his/her language'),
'profile_data[redirect_l10n]', true, @profile.redirect_l10n
)%>
diff --git a/features/language_redirection.feature b/features/language_redirection.feature
index 0475e84..a8ca61e 100644
--- a/features/language_redirection.feature
+++ b/features/language_redirection.feature
@@ -27,7 +27,7 @@ Feature: language redirection
Given I am logged in as "manuel"
And my browser prefers English
And I go to manuel's profile editor
- And I check "Automatic redirect the visitor to the translated article of him language"
+ And I check "Automaticaly redirect the visitor to the article translated to his/her language"
And I press "save"
When I go to /manuel/meu-artigo
Then the site should be in English
diff --git a/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb b/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
index ba45e67..f914c94 100644
--- a/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
+++ b/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
@@ -10,12 +10,12 @@
<%= labelled_form_field(_('Status'), f.select(:status, BscPlugin::Contract::Status.types.
map { |s| [BscPlugin::Contract::Status.names[s], s] })) %>
<%= f.text_field(:number_of_producers, :size => 8, :id => 'bsc-plugin-contract-spinner') %>
- <%= _('Empreendimentos')+':' %>
+ <%= _('Enterprises')+':' %>
<% search_action = {:action => 'search_contract_enterprises', :profile => profile.identifier} %>
<%= token_input_field_tag(:enterprises, 'involved-enterprises', search_action,
{ :pre_populate => @contract.enterprises_to_token_input,
- :hint_text => _('Type in serach term for enterprise') }) %>
+ :hint_text => _('Type in search term for enterprise') }) %>