Commit 28c9f045d4bd4499ed603fe996cebd702c17f88b
1 parent
bde7a2f8
Exists in
master
and in
28 other branches
Fixed some strings
Showing
4 changed files
with
6 additions
and
6 deletions
Show diff stats
app/views/account/signup.rhtml
| ... | ... | @@ -2,12 +2,12 @@ |
| 2 | 2 | <div id='thanks-for-signing'> |
| 3 | 3 | <%= _("<h1>Welcome to %s!</h1> |
| 4 | 4 | <h3>Thanks for signing up, we're thrilled to have you on our social network!</h3> |
| 5 | - <p>Firsty, some tips for getting started:</p> | |
| 5 | + <p>Firstly, some tips for getting started:</p> | |
| 6 | 6 | <h4>Confirm your account!</h4> |
| 7 | 7 | <p>You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.</p> |
| 8 | 8 | <p>You won't appear as a <a href=\"%s\" target=\"_blank\">user</a> until your account is confirmed.</p> |
| 9 | 9 | <h4>What to do next?</h4> |
| 10 | - <p><a href=\"/doc/user/editing-person-info\" target=\"_blank\">Customize your profile</a>. Upload an avatar and sign up for activity notifications under Account.</p> | |
| 10 | + <p><a href=\"/doc/user/editing-person-info\" target=\"_blank\">Customize your profile</a>. Upload an avatar and let your friends find you easily :)</p> | |
| 11 | 11 | <p>Learn the guidelines. Read the <a href=\"/doc\" target=\"_blank\">Documentation</a> for more details on how to use new social network!</p> |
| 12 | 12 | <p><a href=\"/doc/user/invite-contacts\" target=\"_blank\">Invite and find</a> your Gmail, Yahoo and Hotmail contacts!</p> |
| 13 | 13 | <p>Start exploring and Have fun!</p>" % [environment.name, url_for(:controller => :browse, :action => :people, :filter => 'more_recent')]) %> | ... | ... |
app/views/profile_editor/edit.rhtml
| ... | ... | @@ -77,7 +77,7 @@ |
| 77 | 77 | |
| 78 | 78 | <h2><%= _('Translations') %></h2> |
| 79 | 79 | <%= labelled_check_box( |
| 80 | - _('Automatic redirect the visitor to the translated article of him language'), | |
| 80 | + _('Automaticaly redirect the visitor to the article translated to his/her language'), | |
| 81 | 81 | 'profile_data[redirect_l10n]', true, @profile.redirect_l10n |
| 82 | 82 | )%> |
| 83 | 83 | ... | ... |
features/language_redirection.feature
| ... | ... | @@ -27,7 +27,7 @@ Feature: language redirection |
| 27 | 27 | Given I am logged in as "manuel" |
| 28 | 28 | And my browser prefers English |
| 29 | 29 | And I go to manuel's profile editor |
| 30 | - And I check "Automatic redirect the visitor to the translated article of him language" | |
| 30 | + And I check "Automaticaly redirect the visitor to the article translated to his/her language" | |
| 31 | 31 | And I press "save" |
| 32 | 32 | When I go to /manuel/meu-artigo |
| 33 | 33 | Then the site should be in English | ... | ... |
plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
| ... | ... | @@ -10,12 +10,12 @@ |
| 10 | 10 | <%= labelled_form_field(_('Status'), f.select(:status, BscPlugin::Contract::Status.types. |
| 11 | 11 | map { |s| [BscPlugin::Contract::Status.names[s], s] })) %> |
| 12 | 12 | <%= f.text_field(:number_of_producers, :size => 8, :id => 'bsc-plugin-contract-spinner') %> |
| 13 | - <%= _('Empreendimentos')+':' %> | |
| 13 | + <%= _('Enterprises')+':' %> | |
| 14 | 14 | |
| 15 | 15 | <% search_action = {:action => 'search_contract_enterprises', :profile => profile.identifier} %> |
| 16 | 16 | <%= token_input_field_tag(:enterprises, 'involved-enterprises', search_action, |
| 17 | 17 | { :pre_populate => @contract.enterprises_to_token_input, |
| 18 | - :hint_text => _('Type in serach term for enterprise') }) %> | |
| 18 | + :hint_text => _('Type in search term for enterprise') }) %> | |
| 19 | 19 | |
| 20 | 20 | <table id="bsc-plugin-sales-table" class="alternate-colors"> |
| 21 | 21 | <tr> | ... | ... |