Download as
Browse Code »

Commit f1b610d310968dd3ca2d781c15a9649775afb73e

Authored by Moises Machado
1 parent 6b8af367
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

ActionItem715: recovered enterprise activation code form 0.10.3

Showing 24 changed files with 1645 additions and 971 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @f1b610d
... ... @@ -22,9 +22,9 @@ class AccountController < ApplicationController
22 22 cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
23 23 end
24 24 go_to_user_initial_page if redirect?
25   - flash[:notice] = _("Logged in successfully")
  25 + flash[:notice] = _("Logged in successfully") if redirect?
26 26 else
27   - flash[:notice] = _('Incorrect username or password')
  27 + flash[:notice] = _('Incorrect username or password') if redirect?
28 28 redirect_to :back if redirect?
29 29 end
30 30 end
... ... @@ -144,6 +144,27 @@ class AccountController < ApplicationController
144 144 def accept_terms
145 145 @enterprise = load_enterprise
146 146 @question = @enterprise.question
  147 +
  148 + if @enterprise.enabled
  149 + render :action => 'already_activated'
  150 + return
  151 + end
  152 +
  153 + @question = @enterprise.question
  154 + if !@question || @enterprise.blocked?
  155 + render :action => 'blocked'
  156 + return
  157 + end
  158 + end
  159 +
  160 + def accept_terms
  161 + @enterprise = load_enterprise
  162 + @question = @enterprise.question
  163 + if !@question || @enterprise.blocked?
  164 + render :action => 'blocked'
  165 + return
  166 + end
  167 +
147 168 check_answer
148 169 @terms_of_enterprise_use = environment.terms_of_enterprise_use
149 170 end
... ... @@ -159,7 +180,14 @@ class AccountController < ApplicationController
159 180 if activation && user
160 181 activation.requestor = user
161 182 activation.finish
162   - redirect_to :controller => 'profile_editor', :action => 'index', :profile => @enterprise.identifier
  183 + redirect_to :action => 'welcome', :enterprise => @enterprise.id
  184 + end
  185 + end
  186 +
  187 + def welcome
  188 + @enterprise = Enterprise.find(params[:enterprise])
  189 + unless @enterprise.enabled? && logged_in?
  190 + redirect_to :action => 'index'
163 191 end
164 192 end
165 193  
... ...
app/helpers/forms_helper.rb
  Diff comments   View file @f1b610d
... ... @@ -40,7 +40,8 @@ module FormsHelper
40 40 the_class << ' ' << html_options[:class]
41 41 end
42 42  
43   - bt_submit = submit_tag(label, html_options.merge(:class => the_class))
  43 + # FIXME: should be in stylesheet
  44 + bt_submit = submit_tag(label, html_options.merge(:style => 'height:28px; cursor:pointer', :class => the_class))
44 45  
45 46 bt_submit + bt_cancel
46 47 end
... ...
app/models/environment.rb
  Diff comments   View file @f1b610d
... ... @@ -154,6 +154,14 @@ class Environment &lt; ActiveRecord::Base
154 154 ! self.settings['terms_of_enterprise_use'].blank?
155 155 end
156 156  
  157 + def activation_blocked_text
  158 + self.settings['activation_blocked_text']
  159 + end
  160 +
  161 + def activation_blocked_text= value
  162 + self.settings['activation_blocked_text'] = value
  163 + end
  164 +
157 165 def message_for_disabled_enterprise
158 166 self.settings['message_for_disabled_enterprise']
159 167 end
... ...
app/models/environment_statistics_block.rb
  Diff comments   View file @f1b610d
... ... @@ -19,8 +19,8 @@ class EnvironmentStatisticsBlock &lt; Block
19 19  
20 20 info = [
21 21 n_('One user', '%{num} users', users) % { :num => users },
22   - n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
23   - n__('One community', '%{num} communities', communities) % { :num => communities },
  22 + n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
  23 + n_('One community', '%{num} communities', communities) % { :num => communities },
24 24 ]
25 25  
26 26 block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
... ...
app/views/account/_login_form.rhtml
  Diff comments   View file @f1b610d
1 1 <% labelled_form_for :user, @user,
2   - :url => login_url,
3   - :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'<p/>'+_('To join on this environment, click on "<b>I want to participate!</b>".')+'<p/>'+_('If you forgot your password, click on "<b>I forgot my password!</b>" link.') } do |f| %>
  2 + :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') },
  3 + :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'<p/>'+_('To join on this environment, click on "<b>I want to be an user!</b>".')+'<p/>'+_('If you forgot your password, click on "<b>I forgot my password!</b>" link.') } do |f| %>
4 4  
5 5 <%= f.text_field :login,
6 6 :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
... ... @@ -11,6 +11,12 @@
11 11 :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password',
12 12 :help => _('your password is personal, protect it.') %>
13 13  
  14 +<% if params[:enterprise_code] %>
  15 + <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
  16 + <%= hidden_field_tag :answer, params[:answer] %>
  17 + <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
  18 +<% end %>
  19 +
14 20 <% button_bar do %>
15 21 <%= submit_button( 'login', _('Log in') )%>
16 22 <%= lightbox_close_button(_('Cancel')) if lightbox? %>
... ...
app/views/account/_signup_form.rhtml
  Diff comments   View file @f1b610d
1   -<h1><%= _('Register') %></h1>
2   -
3 1 <%= error_messages_for :user %>
4 2 <% labelled_form_for :user, @user,
5 3 :html => { :help=>_('Fill all this fields to join in this environment.' +
... ... @@ -36,6 +34,13 @@
36 34 </p>
37 35 <% end %>
38 36  
  37 +<% if params[:enterprise_code] %>
  38 + <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
  39 + <%= hidden_field_tag :answer, params[:answer] %>
  40 + <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
  41 + <%= hidden_field_tag :new_user, true %>
  42 +<% end %>
  43 +
39 44 <% button_bar do %>
40 45 <%= submit_button('save', _('Sign up'), :cancel => {:action => 'index'}, :class => 'icon-menu-login') %>
41 46 <% end %>
... ...
app/views/account/accept_terms.rhtml
  Diff comments   View file @f1b610d
1   -<div id='terms-of-enterprise-use'><%= @terms_of_enterprise_use %></div>
  1 +<div class=activation-box>
  2 + <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
2 3  
3   -<% button_bar do %>
4   - <%= button_to(_('I accept the terms'), {:action => 'activate_enterprise', :terms_accepted => true, :enterprise_code => params[:enterprise_code], :answer => params[:answer]} ) %>
5   - <%= button_to(_('I do NOT accept the terms'), {:controller => 'home', :action => 'index'} ) %>
6   -<% end %>
  4 + <div id='terms-of-enterprise-use'><%= @terms_of_enterprise_use %></div>
  5 +
  6 + <% form_tag :action => 'activate_enterprise' do %>
  7 + <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
  8 + <%= hidden_field_tag :answer, params[:answer] %>
  9 +
  10 + <%= labelled_check_box _('I read the terms of use and accepted them'), :terms_accepted %>
  11 + <% button_bar do %>
  12 + <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
  13 + <%= submit_button 'forward', _('Continue') %>
  14 + <% end %>
  15 + <% end %>
  16 +</div>
... ...
app/views/account/activate_enterprise.rhtml
  Diff comments   View file @f1b610d
1   -<h1><%= _('What user should be the admin of the enterprise page') %></h1>
  1 +<div class='activation-box'>
  2 +<h2><%= _('Enterprise activation - part 3 of 3') %></h2>
2 3  
3 4 <%= error_messages_for :user %>
4 5  
  6 +<p><%= _('Well, now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
  7 +<p><%= _('Do you have a user account?') %></p>
  8 +
5 9 <div id="enterprise-activation-create-user-or-login-button">
6   - <%= link_to_function _('Already have user') %>
7   - <%= link_to_function _('Create new user') %>
  10 + <%= button_to_function 'login', _('Yes'), "$('enterprise-activation-create-user-form').hide(); $('enterprise-activation-login-form').show()" %>
  11 + <%= button_to_function 'add', _('No'), "$('enterprise-activation-login-form').hide(); $('enterprise-activation-create-user-form').show()" %>
8 12 </div>
9 13  
10   -<div id="enterprise-activation-create-user-form">
  14 +<div id="enterprise-activation-create-user-form" style="display: none">
11 15 <%= render :partial => 'signup_form' %>
12 16 </div>
13 17  
14   -<div id="enterprise-activation-login-form">
  18 +<div id="enterprise-activation-login-form" style="display: none">
15 19 <%= render :partial => 'login_form' %>
16 20 </div>
  21 +</div>
... ...
app/views/account/activation_question.rhtml
  Diff comments   View file @f1b610d
1   -<% form_tag :action => 'accept_terms' do %>
  1 +<script language="JavaScript1.2">
  2 + function check_valid_year(form) {
  3 + var answer = parseInt(form.answer.value);
  4 + var val = form.answer.value;
  5 + if (!answer || (val.length != 4) || val > <%= Time.now.year %> || val < 1900) {
  6 + alert(<%= (_('The year must be between %d and %d') % [1900, Time.now.year]).inspect %>);
  7 + return false;
  8 + } else {
  9 + return true;
  10 + }
  11 + }
2 12  
3   - <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? _('What year your enterprise was founded?') : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil,:help => help=_('We need to be sure that this is your enterprise'))) %>
  13 + function check_valid_cnpj(form) {
  14 + var answer = parseInt(form.answer.value);
  15 + var val = form.answer.value;
  16 + if (!answer || (val.length != 14)) {
  17 + alert(<%= _('An CNPJ have 14 digits').inspect %>);
  18 + return false;
  19 + } else {
  20 + return true;
  21 + }
  22 + }
  23 +</script>
4 24  
5   - <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
  25 +<div class='activation-box'>
  26 + <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
  27 + <% form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %>
6 28  
7   - <% button_bar do %>
8   - <%= submit_button('answer', _('Answer'), :cancel => {:action => 'index'} ) %>
  29 + <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? _('What year your enterprise was founded?') : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer', :help => help=_('We need to be sure that this is your enterprise'))) %>
  30 +
  31 + <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
  32 +
  33 + <% button_bar do %>
  34 + <%= button 'cancel', _('Cancel'), :action => 'index' %>
  35 + <%= submit_button 'forward', _('Continue') %>
  36 + <% end %>
9 37 <% end %>
10   -<% end %>
  38 +</div>
... ...
app/views/account/blocked.rhtml
  Diff comments   View file @f1b610d
1   -<%# FIXME: use environment blocked text %>
2   -<%= _('Your enterprise has been blocked') %>
  1 +<div class='blocked-warning' >
  2 +<center><h1><%= _('This enterprise can\'t be activated by the system') %></h1></center>
  3 +<p><%= _('Unfortunately this enterprise can\'t be activated via the system.') %></p>
  4 +<p>
  5 +<% if @enterprise.blocked? %>
  6 + <%= _('There was a failed atempt of activation and the automated acivation was disabled for your security.') %>
  7 +<% else %>
  8 + <%= _('We don\'t have enough information about your enterprise to identify you.') %>
  9 +<% end %>
  10 +</p>
  11 +
  12 +<% if @environment.activation_blocked_text.nil? %>
  13 + <%= _('Your enterprise has been blocked') %>
  14 +<% else %>
  15 + <%= @environment.activation_blocked_text %>
  16 +<% end %>
  17 +</div>
... ...
app/views/account/login.rhtml
  Diff comments   View file @f1b610d
... ... @@ -2,26 +2,25 @@
2 2  
3 3 <h2><%= _('Login') %></h2>
4 4  
5   -<% @user = User.new unless @user %>
  5 +<% @user ||= User.new %>
6 6  
7 7 <% labelled_form_for :user, @user,
8 8 :url => login_url,
9   - :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'<p/>'+_('To join on this environment, click on "<b>I want to participate!</b>".')+'<p/>'+_('If you forgot your password, click on "<b>I forgot my password!</b>" link.') } do |f| %>
  9 + :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'<p/>'+_('To join on this environment, click on "<b>I want to be an user!</b>".')+'<p/>'+_('If you forgot your password, click on "<b>I forgot my password!</b>" link.') } do |f| %>
10 10  
11   -<%= f.text_field :login,
12   - :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
13   - :help => _('Here goes the nickname that you give on the registration.'),
14   - :onchange => 'this.value = convToValidLogin( this.value )' %>
  11 + <%= f.text_field :login,
  12 + :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
  13 + :help => _('Here goes the nickname that you give on the registration.'),
  14 + :onchange => 'this.value = convToValidLogin( this.value )' %>
15 15  
16   -<%= f.password_field :password,
17   - :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password',
18   - :help => _('your password is personal, protect it.') %>
19   -
20   -<% button_bar do %>
21   - <%= submit_button( 'login', _('Log in') )%>
22   - <%= lightbox_close_button(_('Cancel')) if lightbox? %>
23   -<% end %>
  16 + <%= f.password_field :password,
  17 + :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password',
  18 + :help => _('your password is personal, protect it.') %>
24 19  
  20 + <% button_bar do %>
  21 + <%= submit_button( 'login', _('Log in') )%>
  22 + <%= lightbox_close_button(_('Cancel')) if lightbox? %>
  23 + <% end %>
25 24 <% end %>
26 25  
27 26 <p class="forgot-passwd" help="<%= _('You can recover your password clicking on this link.') %>">
... ...
app/views/account/signup.rhtml
  Diff comments   View file @f1b610d
  1 +<h1><%= _('Signup') %></h1>
1 2 <%= render :partial => 'signup_form' %>
... ...
app/views/account/welcome.rhtml 0 → 100644
  Diff comments   View file @f1b610d
... ... @@ -0,0 +1,10 @@
  1 +<% if @enterprise && logged_in? %>
  2 + <h1><%= _('Welcome to %s') % environment.name %></h1>
  3 +
  4 + <%= _('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>
  5 +
  6 + <% button_bar do %>
  7 + <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_user.person.identifier %>
  8 + <%= button 'forward', _('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
  9 + <% end %>
  10 +<% end %>
... ...
po/de/noosfero.po
  Diff comments   View file @f1b610d
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.4\n"
10   -"POT-Creation-Date: 2008-09-12 19:55-0300\n"
  10 +"POT-Creation-Date: 2008-09-18 12:03-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -299,11 +299,11 @@ msgstr &quot;&quot;
299 299 msgid "Move block down"
300 300 msgstr ""
301 301  
302   -#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
  302 +#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
303 303 msgid "Move to the opposite side"
304 304 msgstr ""
305 305  
306   -#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
  306 +#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
307 307 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
308 308 #: app/views/content_viewer/view_page.rhtml:35
309 309 #: app/views/categories/_category.rhtml:8
... ... @@ -312,20 +312,20 @@ msgstr &quot;&quot;
312 312 msgid "Edit"
313 313 msgstr ""
314 314  
315   -#: app/helpers/boxes_helper.rb:169
  315 +#: app/helpers/boxes_helper.rb:170
316 316 msgid "Remove block"
317 317 msgstr ""
318 318  
319   -#: app/helpers/boxes_helper.rb:173
  319 +#: app/helpers/boxes_helper.rb:174
320 320 msgid "Help on this block"
321 321 msgstr ""
322 322  
323   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
  323 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
324 324 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
325 325 msgid "Help"
326 326 msgstr ""
327 327  
328   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
  328 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
329 329 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
330 330 #: app/views/box_organizer/add_block.rhtml:19
331 331 msgid "Close"
... ... @@ -476,7 +476,9 @@ msgstr &quot;&quot;
476 476 #: app/views/admin_panel/site_info.rhtml:11
477 477 #: app/views/shared/_select_categories.rhtml:22
478 478 #: app/views/shared/_change_image.rhtml:2
479   -#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
  479 +#: app/views/account/_login_form.rhtml:22
  480 +#: app/views/account/activation_question.rhtml:34
  481 +#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
480 482 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
481 483 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
482 484 #: app/views/memberships/new_community.rhtml:31
... ... @@ -486,19 +488,19 @@ msgstr &quot;&quot;
486 488 msgid "Cancel"
487 489 msgstr ""
488 490  
489   -#: app/helpers/forms_helper.rb:63
  491 +#: app/helpers/forms_helper.rb:64
490 492 msgid "Select the State"
491 493 msgstr ""
492 494  
493   -#: app/helpers/forms_helper.rb:64
  495 +#: app/helpers/forms_helper.rb:65
494 496 msgid "Select the City"
495 497 msgstr ""
496 498  
497   -#: app/helpers/forms_helper.rb:87
  499 +#: app/helpers/forms_helper.rb:88
498 500 msgid "State:"
499 501 msgstr ""
500 502  
501   -#: app/helpers/forms_helper.rb:90
  503 +#: app/helpers/forms_helper.rb:91
502 504 msgid "City:"
503 505 msgstr ""
504 506  
... ... @@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
774 776 msgstr ""
775 777  
776 778 #: app/models/user.rb:-
777   -msgid "profile"
  779 +msgid "article"
778 780 msgstr ""
779 781  
780 782 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
... ... @@ -787,85 +789,6 @@ msgstr &quot;&quot;
787 789 msgid "Name"
788 790 msgstr ""
789 791  
790   -#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
791   -#: app/models/category.rb:- app/views/cms/view.rhtml:25
792   -msgid "Type"
793   -msgstr ""
794   -
795   -#: app/models/user.rb:- app/models/create_enterprise.rb:3
796   -#: app/views/enterprise_validation/_details.rhtml:23
797   -msgid "Identifier"
798   -msgstr ""
799   -
800   -#: app/models/user.rb:- app/models/task.rb:26
801   -msgid "Active"
802   -msgstr ""
803   -
804   -#: app/models/user.rb:- app/models/create_enterprise.rb:5
805   -#: app/views/enterprise_editor/_form.rhtml:4
806   -#: app/views/enterprise_validation/index.rhtml:14
807   -#: app/views/enterprise_validation/_details.rhtml:7
808   -#: app/views/enterprise_validation/list_processed.rhtml:9
809   -#: app/views/box_organizer/_link_list_block.rhtml:5
810   -msgid "Address"
811   -msgstr ""
812   -
813   -#: app/models/user.rb:- app/models/create_enterprise.rb:6
814   -msgid "Contact phone"
815   -msgstr ""
816   -
817   -#: app/models/user.rb:-
818   -msgid "Home page"
819   -msgstr ""
820   -
821   -#: app/models/user.rb:-
822   -msgid "User"
823   -msgstr ""
824   -
825   -#: app/models/user.rb:- app/models/task.rb:-
826   -msgid "Data"
827   -msgstr ""
828   -
829   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
830   -msgid "Lat"
831   -msgstr ""
832   -
833   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
834   -msgid "Lng"
835   -msgstr ""
836   -
837   -#: app/models/user.rb:-
838   -msgid "Geocode precision"
839   -msgstr ""
840   -
841   -#: app/models/user.rb:-
842   -msgid "Enabled"
843   -msgstr ""
844   -
845   -#: app/models/user.rb:-
846   -msgid "Nickname"
847   -msgstr ""
848   -
849   -#: app/models/user.rb:- app/models/environment.rb:-
850   -msgid "Custom header"
851   -msgstr ""
852   -
853   -#: app/models/user.rb:- app/models/environment.rb:-
854   -msgid "Custom footer"
855   -msgstr ""
856   -
857   -#: app/models/user.rb:- app/models/environment.rb:-
858   -msgid "Theme"
859   -msgstr ""
860   -
861   -#: app/models/user.rb:-
862   -msgid "Public profile"
863   -msgstr ""
864   -
865   -#: app/models/user.rb:-
866   -msgid "article"
867   -msgstr ""
868   -
869 792 #: app/models/user.rb:- app/models/category.rb:-
870 793 msgid "Slug"
871 794 msgstr ""
... ... @@ -904,6 +827,11 @@ msgstr &quot;&quot;
904 827 msgid "Lock version"
905 828 msgstr ""
906 829  
  830 +#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
  831 +#: app/models/category.rb:- app/views/cms/view.rhtml:25
  832 +msgid "Type"
  833 +msgstr ""
  834 +
907 835 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
908 836 msgid "Size"
909 837 msgstr ""
... ... @@ -960,6 +888,80 @@ msgstr &quot;&quot;
960 888 msgid "Reference article"
961 889 msgstr ""
962 890  
  891 +#: app/models/user.rb:-
  892 +msgid "profile"
  893 +msgstr ""
  894 +
  895 +#: app/models/user.rb:- app/models/create_enterprise.rb:3
  896 +#: app/views/enterprise_validation/_details.rhtml:23
  897 +msgid "Identifier"
  898 +msgstr ""
  899 +
  900 +#: app/models/user.rb:- app/models/task.rb:26
  901 +msgid "Active"
  902 +msgstr ""
  903 +
  904 +#: app/models/user.rb:- app/models/create_enterprise.rb:5
  905 +#: app/views/enterprise_editor/_form.rhtml:4
  906 +#: app/views/enterprise_validation/index.rhtml:14
  907 +#: app/views/enterprise_validation/_details.rhtml:7
  908 +#: app/views/enterprise_validation/list_processed.rhtml:9
  909 +#: app/views/box_organizer/_link_list_block.rhtml:5
  910 +msgid "Address"
  911 +msgstr ""
  912 +
  913 +#: app/models/user.rb:- app/models/create_enterprise.rb:6
  914 +msgid "Contact phone"
  915 +msgstr ""
  916 +
  917 +#: app/models/user.rb:-
  918 +msgid "Home page"
  919 +msgstr ""
  920 +
  921 +#: app/models/user.rb:-
  922 +msgid "User"
  923 +msgstr ""
  924 +
  925 +#: app/models/user.rb:- app/models/task.rb:-
  926 +msgid "Data"
  927 +msgstr ""
  928 +
  929 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  930 +msgid "Lat"
  931 +msgstr ""
  932 +
  933 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  934 +msgid "Lng"
  935 +msgstr ""
  936 +
  937 +#: app/models/user.rb:-
  938 +msgid "Geocode precision"
  939 +msgstr ""
  940 +
  941 +#: app/models/user.rb:-
  942 +msgid "Enabled"
  943 +msgstr ""
  944 +
  945 +#: app/models/user.rb:-
  946 +msgid "Nickname"
  947 +msgstr ""
  948 +
  949 +#: app/models/user.rb:- app/models/environment.rb:-
  950 +msgid "Custom header"
  951 +msgstr ""
  952 +
  953 +#: app/models/user.rb:- app/models/environment.rb:-
  954 +msgid "Custom footer"
  955 +msgstr ""
  956 +
  957 +#: app/models/user.rb:- app/models/environment.rb:-
  958 +msgid "Theme"
  959 +msgstr ""
  960 +
  961 +#: app/models/user.rb:-
  962 +msgid "Public profile"
  963 +msgstr ""
  964 +
963 965 #: app/models/user.rb:7
964 966 msgid "Password"
965 967 msgstr ""
... ... @@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
1813 1815 msgid "Disable products for enterprises"
1814 1816 msgstr ""
1815 1817  
1816   -#: app/models/environment.rb:244
  1818 +#: app/models/environment.rb:252
1817 1819 msgid "Only one Virtual Community can be the default one"
1818 1820 msgstr ""
1819 1821  
... ... @@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
2258 2260 msgstr ""
2259 2261  
2260 2262 #: app/views/account/blocked.rhtml:2
  2263 +msgid "This enterprise can't be activated by the system"
  2264 +msgstr ""
  2265 +
  2266 +#: app/views/account/blocked.rhtml:3
  2267 +msgid "Unfortunately this enterprise can't be activated via the system."
  2268 +msgstr ""
  2269 +
  2270 +#: app/views/account/blocked.rhtml:6
  2271 +msgid ""
  2272 +"There was a failed atempt of activation and the automated acivation was "
  2273 +"disabled for your security."
  2274 +msgstr ""
  2275 +
  2276 +#: app/views/account/blocked.rhtml:8
  2277 +msgid "We don't have enough information about your enterprise to identify you."
  2278 +msgstr ""
  2279 +
  2280 +#: app/views/account/blocked.rhtml:13
2261 2281 msgid "Your enterprise has been blocked"
2262 2282 msgstr ""
2263 2283  
... ... @@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
2282 2302 msgstr ""
2283 2303  
2284 2304 #: app/views/account/logout_popup.rhtml:4
  2305 +#: app/views/account/activate_enterprise.rhtml:10
2285 2306 #: app/views/profile_editor/edit.rhtml:32
2286 2307 #: app/views/profile_editor/edit.rhtml:35
2287 2308 #: app/views/profile_editor/edit.rhtml:38
... ... @@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
2325 2346 msgstr ""
2326 2347  
2327 2348 #: app/views/account/login_block.rhtml:24
2328   -#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
  2349 +#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
2329 2350 msgid "Log in"
2330 2351 msgstr ""
2331 2352  
... ... @@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
2333 2354 msgid "New user"
2334 2355 msgstr ""
2335 2356  
2336   -#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
  2357 +#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
2337 2358 msgid "Click here to join to this environment, if you is not already an user."
2338 2359 msgstr ""
2339 2360  
2340   -#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
  2361 +#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
2341 2362 msgid "You can recover your password clicking on this link."
2342 2363 msgstr ""
2343 2364  
2344   -#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
  2365 +#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
2345 2366 msgid "I forgot my password!"
2346 2367 msgstr ""
2347 2368  
... ... @@ -2409,44 +2430,43 @@ msgid &quot;&quot;
2409 2430 "changing your password. You should receive it in a few minutes."
2410 2431 msgstr ""
2411 2432  
2412   -#: app/views/account/_signup_form.rhtml:1
2413   -msgid "Register"
  2433 +#: app/views/account/signup.rhtml:1
  2434 +msgid "Signup"
2414 2435 msgstr ""
2415 2436  
2416   -#: app/views/account/_signup_form.rhtml:5
  2437 +#: app/views/account/_signup_form.rhtml:3
2417 2438 msgid ""
2418 2439 "Fill all this fields to join in this environment.<p/>If you forgot your "
2419 2440 "password, do not create a new account, click on the \"<b>I forgot my "
2420 2441 "password!</b>\" link. ;-)"
2421 2442 msgstr ""
2422 2443  
2423   -#: app/views/account/_signup_form.rhtml:11
  2444 +#: app/views/account/_signup_form.rhtml:9
2424 2445 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2425 2446 msgstr ""
2426 2447  
2427   -#: app/views/account/_signup_form.rhtml:16
  2448 +#: app/views/account/_signup_form.rhtml:14
2428 2449 msgid "We'll send you an e-mail to validate your registration."
2429 2450 msgstr ""
2430 2451  
2431   -#: app/views/account/_signup_form.rhtml:20
  2452 +#: app/views/account/_signup_form.rhtml:18
2432 2453 msgid "Do not use a obviously password, but try some unforgettable word."
2433 2454 msgstr ""
2434 2455  
2435   -#: app/views/account/_signup_form.rhtml:24
  2456 +#: app/views/account/_signup_form.rhtml:22
2436 2457 msgid "We need to be sure that you wrote correctly your password."
2437 2458 msgstr ""
2438 2459  
2439   -#: app/views/account/_signup_form.rhtml:35
  2460 +#: app/views/account/_signup_form.rhtml:33
2440 2461 msgid "I accept the terms of use"
2441 2462 msgstr ""
2442 2463  
2443   -#: app/views/account/_signup_form.rhtml:40
  2464 +#: app/views/account/_signup_form.rhtml:45
2444 2465 msgid "Sign up"
2445 2466 msgstr ""
2446 2467  
2447 2468 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
2448   -msgid ""
2449   -"To join on this environment, click on \"<b>I want to participate!</b>\"."
  2469 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
2450 2470 msgstr ""
2451 2471  
2452 2472 #: app/views/account/change_password.rhtml:1
... ... @@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
2479 2499 msgid "You can <a href='%s'>login</a> now."
2480 2500 msgstr ""
2481 2501  
2482   -#: app/views/account/activation_question.rhtml:3
  2502 +#: app/views/account/activation_question.rhtml:6
  2503 +msgid "The year must be between %d and %d"
  2504 +msgstr ""
  2505 +
  2506 +#: app/views/account/activation_question.rhtml:17
  2507 +msgid "An CNPJ have 14 digits"
  2508 +msgstr ""
  2509 +
  2510 +#: app/views/account/activation_question.rhtml:26
  2511 +#: app/views/account/accept_terms.rhtml:2
  2512 +msgid "Enterprise activation"
  2513 +msgstr ""
  2514 +
  2515 +#: app/views/account/activation_question.rhtml:26
  2516 +msgid "part 1 of 2"
  2517 +msgstr ""
  2518 +
  2519 +#: app/views/account/activation_question.rhtml:26
  2520 +msgid "part 1 of 3"
  2521 +msgstr ""
  2522 +
  2523 +#: app/views/account/activation_question.rhtml:29
2483 2524 msgid "What year your enterprise was founded?"
2484 2525 msgstr ""
2485 2526  
2486   -#: app/views/account/activation_question.rhtml:3
  2527 +#: app/views/account/activation_question.rhtml:29
2487 2528 msgid "What is the CNPJ of your enterprise?"
2488 2529 msgstr ""
2489 2530  
2490   -#: app/views/account/activation_question.rhtml:3
  2531 +#: app/views/account/activation_question.rhtml:29
2491 2532 msgid "We need to be sure that this is your enterprise"
2492 2533 msgstr ""
2493 2534  
2494   -#: app/views/account/activation_question.rhtml:8
2495   -msgid "Answer"
  2535 +#: app/views/account/activation_question.rhtml:35
  2536 +#: app/views/account/accept_terms.rhtml:13
  2537 +msgid "Continue"
2496 2538 msgstr ""
2497 2539  
2498   -#: app/views/account/accept_terms.rhtml:4
2499   -msgid "I accept the terms"
  2540 +#: app/views/account/accept_terms.rhtml:2
  2541 +msgid "part 2 of 2"
2500 2542 msgstr ""
2501 2543  
2502   -#: app/views/account/accept_terms.rhtml:5
2503   -msgid "I do NOT accept the terms"
  2544 +#: app/views/account/accept_terms.rhtml:2
  2545 +msgid " part 2 of 3"
  2546 +msgstr ""
  2547 +
  2548 +#: app/views/account/accept_terms.rhtml:10
  2549 +msgid "I read the terms of use and accepted them"
2504 2550 msgstr ""
2505 2551  
2506 2552 #: app/views/account/index_anonymous.rhtml:1
... ... @@ -2526,20 +2572,48 @@ msgid &quot;&quot;
2526 2572 "this environment."
2527 2573 msgstr ""
2528 2574  
2529   -#: app/views/account/login.rhtml:32
  2575 +#: app/views/account/login.rhtml:31
2530 2576 msgid "I want to participate!"
2531 2577 msgstr ""
2532 2578  
2533   -#: app/views/account/activate_enterprise.rhtml:1
2534   -msgid "What user should be the admin of the enterprise page"
  2579 +#: app/views/account/activate_enterprise.rhtml:2
  2580 +msgid "Enterprise activation - part 3 of 3"
2535 2581 msgstr ""
2536 2582  
2537 2583 #: app/views/account/activate_enterprise.rhtml:6
2538   -msgid "Already have user"
  2584 +msgid ""
  2585 +"Well, now for you manage your enterprise you have to associate an individual "
  2586 +"account to the enterprise."
2539 2587 msgstr ""
2540 2588  
2541 2589 #: app/views/account/activate_enterprise.rhtml:7
2542   -msgid "Create new user"
  2590 +msgid "Do you have a user account?"
  2591 +msgstr ""
  2592 +
  2593 +#: app/views/account/activate_enterprise.rhtml:11
  2594 +#: app/views/profile_editor/edit.rhtml:35
  2595 +#: app/views/profile_editor/edit.rhtml:41
  2596 +#: app/views/profile_editor/edit.rhtml:51
  2597 +#: app/views/profile_editor/edit.rhtml:57
  2598 +msgid "No"
  2599 +msgstr ""
  2600 +
  2601 +#: app/views/account/welcome.rhtml:2
  2602 +msgid "Welcome to %s"
  2603 +msgstr ""
  2604 +
  2605 +#: app/views/account/welcome.rhtml:4
  2606 +msgid ""
  2607 +"%s was successfuly activated. Now you may go to your control panel or to the "
  2608 +"control panel of your enterprise"
  2609 +msgstr ""
  2610 +
  2611 +#: app/views/account/welcome.rhtml:7
  2612 +msgid "Go to my control panel"
  2613 +msgstr ""
  2614 +
  2615 +#: app/views/account/welcome.rhtml:8
  2616 +msgid "Go to my enterprise control panel"
2543 2617 msgstr ""
2544 2618  
2545 2619 #: app/views/account/already_activated.rhtml:1
... ... @@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
3416 3490 msgid "Show my website to all internet users"
3417 3491 msgstr ""
3418 3492  
3419   -#: app/views/profile_editor/edit.rhtml:35
3420   -#: app/views/profile_editor/edit.rhtml:41
3421   -#: app/views/profile_editor/edit.rhtml:51
3422   -#: app/views/profile_editor/edit.rhtml:57
3423   -msgid "No"
3424   -msgstr ""
3425   -
3426 3493 #: app/views/profile_editor/edit.rhtml:38
3427 3494 msgid "Show my website to my contacts (persons)"
3428 3495 msgstr ""
... ...
po/es/noosfero.po
  Diff comments   View file @f1b610d
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.4\n"
10   -"POT-Creation-Date: 2008-09-12 19:55-0300\n"
  10 +"POT-Creation-Date: 2008-09-18 12:03-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -299,11 +299,11 @@ msgstr &quot;&quot;
299 299 msgid "Move block down"
300 300 msgstr ""
301 301  
302   -#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
  302 +#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
303 303 msgid "Move to the opposite side"
304 304 msgstr ""
305 305  
306   -#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
  306 +#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
307 307 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
308 308 #: app/views/content_viewer/view_page.rhtml:35
309 309 #: app/views/categories/_category.rhtml:8
... ... @@ -312,20 +312,20 @@ msgstr &quot;&quot;
312 312 msgid "Edit"
313 313 msgstr ""
314 314  
315   -#: app/helpers/boxes_helper.rb:169
  315 +#: app/helpers/boxes_helper.rb:170
316 316 msgid "Remove block"
317 317 msgstr ""
318 318  
319   -#: app/helpers/boxes_helper.rb:173
  319 +#: app/helpers/boxes_helper.rb:174
320 320 msgid "Help on this block"
321 321 msgstr ""
322 322  
323   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
  323 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
324 324 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
325 325 msgid "Help"
326 326 msgstr ""
327 327  
328   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
  328 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
329 329 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
330 330 #: app/views/box_organizer/add_block.rhtml:19
331 331 msgid "Close"
... ... @@ -476,7 +476,9 @@ msgstr &quot;&quot;
476 476 #: app/views/admin_panel/site_info.rhtml:11
477 477 #: app/views/shared/_select_categories.rhtml:22
478 478 #: app/views/shared/_change_image.rhtml:2
479   -#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
  479 +#: app/views/account/_login_form.rhtml:22
  480 +#: app/views/account/activation_question.rhtml:34
  481 +#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
480 482 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
481 483 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
482 484 #: app/views/memberships/new_community.rhtml:31
... ... @@ -486,19 +488,19 @@ msgstr &quot;&quot;
486 488 msgid "Cancel"
487 489 msgstr ""
488 490  
489   -#: app/helpers/forms_helper.rb:63
  491 +#: app/helpers/forms_helper.rb:64
490 492 msgid "Select the State"
491 493 msgstr ""
492 494  
493   -#: app/helpers/forms_helper.rb:64
  495 +#: app/helpers/forms_helper.rb:65
494 496 msgid "Select the City"
495 497 msgstr ""
496 498  
497   -#: app/helpers/forms_helper.rb:87
  499 +#: app/helpers/forms_helper.rb:88
498 500 msgid "State:"
499 501 msgstr ""
500 502  
501   -#: app/helpers/forms_helper.rb:90
  503 +#: app/helpers/forms_helper.rb:91
502 504 msgid "City:"
503 505 msgstr ""
504 506  
... ... @@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
774 776 msgstr ""
775 777  
776 778 #: app/models/user.rb:-
777   -msgid "profile"
  779 +msgid "article"
778 780 msgstr ""
779 781  
780 782 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
... ... @@ -787,85 +789,6 @@ msgstr &quot;&quot;
787 789 msgid "Name"
788 790 msgstr ""
789 791  
790   -#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
791   -#: app/models/category.rb:- app/views/cms/view.rhtml:25
792   -msgid "Type"
793   -msgstr ""
794   -
795   -#: app/models/user.rb:- app/models/create_enterprise.rb:3
796   -#: app/views/enterprise_validation/_details.rhtml:23
797   -msgid "Identifier"
798   -msgstr ""
799   -
800   -#: app/models/user.rb:- app/models/task.rb:26
801   -msgid "Active"
802   -msgstr ""
803   -
804   -#: app/models/user.rb:- app/models/create_enterprise.rb:5
805   -#: app/views/enterprise_editor/_form.rhtml:4
806   -#: app/views/enterprise_validation/index.rhtml:14
807   -#: app/views/enterprise_validation/_details.rhtml:7
808   -#: app/views/enterprise_validation/list_processed.rhtml:9
809   -#: app/views/box_organizer/_link_list_block.rhtml:5
810   -msgid "Address"
811   -msgstr ""
812   -
813   -#: app/models/user.rb:- app/models/create_enterprise.rb:6
814   -msgid "Contact phone"
815   -msgstr ""
816   -
817   -#: app/models/user.rb:-
818   -msgid "Home page"
819   -msgstr ""
820   -
821   -#: app/models/user.rb:-
822   -msgid "User"
823   -msgstr ""
824   -
825   -#: app/models/user.rb:- app/models/task.rb:-
826   -msgid "Data"
827   -msgstr ""
828   -
829   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
830   -msgid "Lat"
831   -msgstr ""
832   -
833   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
834   -msgid "Lng"
835   -msgstr ""
836   -
837   -#: app/models/user.rb:-
838   -msgid "Geocode precision"
839   -msgstr ""
840   -
841   -#: app/models/user.rb:-
842   -msgid "Enabled"
843   -msgstr ""
844   -
845   -#: app/models/user.rb:-
846   -msgid "Nickname"
847   -msgstr ""
848   -
849   -#: app/models/user.rb:- app/models/environment.rb:-
850   -msgid "Custom header"
851   -msgstr ""
852   -
853   -#: app/models/user.rb:- app/models/environment.rb:-
854   -msgid "Custom footer"
855   -msgstr ""
856   -
857   -#: app/models/user.rb:- app/models/environment.rb:-
858   -msgid "Theme"
859   -msgstr ""
860   -
861   -#: app/models/user.rb:-
862   -msgid "Public profile"
863   -msgstr ""
864   -
865   -#: app/models/user.rb:-
866   -msgid "article"
867   -msgstr ""
868   -
869 792 #: app/models/user.rb:- app/models/category.rb:-
870 793 msgid "Slug"
871 794 msgstr ""
... ... @@ -904,6 +827,11 @@ msgstr &quot;&quot;
904 827 msgid "Lock version"
905 828 msgstr ""
906 829  
  830 +#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
  831 +#: app/models/category.rb:- app/views/cms/view.rhtml:25
  832 +msgid "Type"
  833 +msgstr ""
  834 +
907 835 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
908 836 msgid "Size"
909 837 msgstr ""
... ... @@ -960,6 +888,80 @@ msgstr &quot;&quot;
960 888 msgid "Reference article"
961 889 msgstr ""
962 890  
  891 +#: app/models/user.rb:-
  892 +msgid "profile"
  893 +msgstr ""
  894 +
  895 +#: app/models/user.rb:- app/models/create_enterprise.rb:3
  896 +#: app/views/enterprise_validation/_details.rhtml:23
  897 +msgid "Identifier"
  898 +msgstr ""
  899 +
  900 +#: app/models/user.rb:- app/models/task.rb:26
  901 +msgid "Active"
  902 +msgstr ""
  903 +
  904 +#: app/models/user.rb:- app/models/create_enterprise.rb:5
  905 +#: app/views/enterprise_editor/_form.rhtml:4
  906 +#: app/views/enterprise_validation/index.rhtml:14
  907 +#: app/views/enterprise_validation/_details.rhtml:7
  908 +#: app/views/enterprise_validation/list_processed.rhtml:9
  909 +#: app/views/box_organizer/_link_list_block.rhtml:5
  910 +msgid "Address"
  911 +msgstr ""
  912 +
  913 +#: app/models/user.rb:- app/models/create_enterprise.rb:6
  914 +msgid "Contact phone"
  915 +msgstr ""
  916 +
  917 +#: app/models/user.rb:-
  918 +msgid "Home page"
  919 +msgstr ""
  920 +
  921 +#: app/models/user.rb:-
  922 +msgid "User"
  923 +msgstr ""
  924 +
  925 +#: app/models/user.rb:- app/models/task.rb:-
  926 +msgid "Data"
  927 +msgstr ""
  928 +
  929 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  930 +msgid "Lat"
  931 +msgstr ""
  932 +
  933 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  934 +msgid "Lng"
  935 +msgstr ""
  936 +
  937 +#: app/models/user.rb:-
  938 +msgid "Geocode precision"
  939 +msgstr ""
  940 +
  941 +#: app/models/user.rb:-
  942 +msgid "Enabled"
  943 +msgstr ""
  944 +
  945 +#: app/models/user.rb:-
  946 +msgid "Nickname"
  947 +msgstr ""
  948 +
  949 +#: app/models/user.rb:- app/models/environment.rb:-
  950 +msgid "Custom header"
  951 +msgstr ""
  952 +
  953 +#: app/models/user.rb:- app/models/environment.rb:-
  954 +msgid "Custom footer"
  955 +msgstr ""
  956 +
  957 +#: app/models/user.rb:- app/models/environment.rb:-
  958 +msgid "Theme"
  959 +msgstr ""
  960 +
  961 +#: app/models/user.rb:-
  962 +msgid "Public profile"
  963 +msgstr ""
  964 +
963 965 #: app/models/user.rb:7
964 966 msgid "Password"
965 967 msgstr ""
... ... @@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
1813 1815 msgid "Disable products for enterprises"
1814 1816 msgstr ""
1815 1817  
1816   -#: app/models/environment.rb:244
  1818 +#: app/models/environment.rb:252
1817 1819 msgid "Only one Virtual Community can be the default one"
1818 1820 msgstr ""
1819 1821  
... ... @@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
2258 2260 msgstr ""
2259 2261  
2260 2262 #: app/views/account/blocked.rhtml:2
  2263 +msgid "This enterprise can't be activated by the system"
  2264 +msgstr ""
  2265 +
  2266 +#: app/views/account/blocked.rhtml:3
  2267 +msgid "Unfortunately this enterprise can't be activated via the system."
  2268 +msgstr ""
  2269 +
  2270 +#: app/views/account/blocked.rhtml:6
  2271 +msgid ""
  2272 +"There was a failed atempt of activation and the automated acivation was "
  2273 +"disabled for your security."
  2274 +msgstr ""
  2275 +
  2276 +#: app/views/account/blocked.rhtml:8
  2277 +msgid "We don't have enough information about your enterprise to identify you."
  2278 +msgstr ""
  2279 +
  2280 +#: app/views/account/blocked.rhtml:13
2261 2281 msgid "Your enterprise has been blocked"
2262 2282 msgstr ""
2263 2283  
... ... @@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
2282 2302 msgstr ""
2283 2303  
2284 2304 #: app/views/account/logout_popup.rhtml:4
  2305 +#: app/views/account/activate_enterprise.rhtml:10
2285 2306 #: app/views/profile_editor/edit.rhtml:32
2286 2307 #: app/views/profile_editor/edit.rhtml:35
2287 2308 #: app/views/profile_editor/edit.rhtml:38
... ... @@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
2325 2346 msgstr ""
2326 2347  
2327 2348 #: app/views/account/login_block.rhtml:24
2328   -#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
  2349 +#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
2329 2350 msgid "Log in"
2330 2351 msgstr ""
2331 2352  
... ... @@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
2333 2354 msgid "New user"
2334 2355 msgstr ""
2335 2356  
2336   -#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
  2357 +#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
2337 2358 msgid "Click here to join to this environment, if you is not already an user."
2338 2359 msgstr ""
2339 2360  
2340   -#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
  2361 +#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
2341 2362 msgid "You can recover your password clicking on this link."
2342 2363 msgstr ""
2343 2364  
2344   -#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
  2365 +#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
2345 2366 msgid "I forgot my password!"
2346 2367 msgstr ""
2347 2368  
... ... @@ -2409,44 +2430,43 @@ msgid &quot;&quot;
2409 2430 "changing your password. You should receive it in a few minutes."
2410 2431 msgstr ""
2411 2432  
2412   -#: app/views/account/_signup_form.rhtml:1
2413   -msgid "Register"
  2433 +#: app/views/account/signup.rhtml:1
  2434 +msgid "Signup"
2414 2435 msgstr ""
2415 2436  
2416   -#: app/views/account/_signup_form.rhtml:5
  2437 +#: app/views/account/_signup_form.rhtml:3
2417 2438 msgid ""
2418 2439 "Fill all this fields to join in this environment.<p/>If you forgot your "
2419 2440 "password, do not create a new account, click on the \"<b>I forgot my "
2420 2441 "password!</b>\" link. ;-)"
2421 2442 msgstr ""
2422 2443  
2423   -#: app/views/account/_signup_form.rhtml:11
  2444 +#: app/views/account/_signup_form.rhtml:9
2424 2445 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2425 2446 msgstr ""
2426 2447  
2427   -#: app/views/account/_signup_form.rhtml:16
  2448 +#: app/views/account/_signup_form.rhtml:14
2428 2449 msgid "We'll send you an e-mail to validate your registration."
2429 2450 msgstr ""
2430 2451  
2431   -#: app/views/account/_signup_form.rhtml:20
  2452 +#: app/views/account/_signup_form.rhtml:18
2432 2453 msgid "Do not use a obviously password, but try some unforgettable word."
2433 2454 msgstr ""
2434 2455  
2435   -#: app/views/account/_signup_form.rhtml:24
  2456 +#: app/views/account/_signup_form.rhtml:22
2436 2457 msgid "We need to be sure that you wrote correctly your password."
2437 2458 msgstr ""
2438 2459  
2439   -#: app/views/account/_signup_form.rhtml:35
  2460 +#: app/views/account/_signup_form.rhtml:33
2440 2461 msgid "I accept the terms of use"
2441 2462 msgstr ""
2442 2463  
2443   -#: app/views/account/_signup_form.rhtml:40
  2464 +#: app/views/account/_signup_form.rhtml:45
2444 2465 msgid "Sign up"
2445 2466 msgstr ""
2446 2467  
2447 2468 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
2448   -msgid ""
2449   -"To join on this environment, click on \"<b>I want to participate!</b>\"."
  2469 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
2450 2470 msgstr ""
2451 2471  
2452 2472 #: app/views/account/change_password.rhtml:1
... ... @@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
2479 2499 msgid "You can <a href='%s'>login</a> now."
2480 2500 msgstr ""
2481 2501  
2482   -#: app/views/account/activation_question.rhtml:3
  2502 +#: app/views/account/activation_question.rhtml:6
  2503 +msgid "The year must be between %d and %d"
  2504 +msgstr ""
  2505 +
  2506 +#: app/views/account/activation_question.rhtml:17
  2507 +msgid "An CNPJ have 14 digits"
  2508 +msgstr ""
  2509 +
  2510 +#: app/views/account/activation_question.rhtml:26
  2511 +#: app/views/account/accept_terms.rhtml:2
  2512 +msgid "Enterprise activation"
  2513 +msgstr ""
  2514 +
  2515 +#: app/views/account/activation_question.rhtml:26
  2516 +msgid "part 1 of 2"
  2517 +msgstr ""
  2518 +
  2519 +#: app/views/account/activation_question.rhtml:26
  2520 +msgid "part 1 of 3"
  2521 +msgstr ""
  2522 +
  2523 +#: app/views/account/activation_question.rhtml:29
2483 2524 msgid "What year your enterprise was founded?"
2484 2525 msgstr ""
2485 2526  
2486   -#: app/views/account/activation_question.rhtml:3
  2527 +#: app/views/account/activation_question.rhtml:29
2487 2528 msgid "What is the CNPJ of your enterprise?"
2488 2529 msgstr ""
2489 2530  
2490   -#: app/views/account/activation_question.rhtml:3
  2531 +#: app/views/account/activation_question.rhtml:29
2491 2532 msgid "We need to be sure that this is your enterprise"
2492 2533 msgstr ""
2493 2534  
2494   -#: app/views/account/activation_question.rhtml:8
2495   -msgid "Answer"
  2535 +#: app/views/account/activation_question.rhtml:35
  2536 +#: app/views/account/accept_terms.rhtml:13
  2537 +msgid "Continue"
2496 2538 msgstr ""
2497 2539  
2498   -#: app/views/account/accept_terms.rhtml:4
2499   -msgid "I accept the terms"
  2540 +#: app/views/account/accept_terms.rhtml:2
  2541 +msgid "part 2 of 2"
2500 2542 msgstr ""
2501 2543  
2502   -#: app/views/account/accept_terms.rhtml:5
2503   -msgid "I do NOT accept the terms"
  2544 +#: app/views/account/accept_terms.rhtml:2
  2545 +msgid " part 2 of 3"
  2546 +msgstr ""
  2547 +
  2548 +#: app/views/account/accept_terms.rhtml:10
  2549 +msgid "I read the terms of use and accepted them"
2504 2550 msgstr ""
2505 2551  
2506 2552 #: app/views/account/index_anonymous.rhtml:1
... ... @@ -2526,20 +2572,48 @@ msgid &quot;&quot;
2526 2572 "this environment."
2527 2573 msgstr ""
2528 2574  
2529   -#: app/views/account/login.rhtml:32
  2575 +#: app/views/account/login.rhtml:31
2530 2576 msgid "I want to participate!"
2531 2577 msgstr ""
2532 2578  
2533   -#: app/views/account/activate_enterprise.rhtml:1
2534   -msgid "What user should be the admin of the enterprise page"
  2579 +#: app/views/account/activate_enterprise.rhtml:2
  2580 +msgid "Enterprise activation - part 3 of 3"
2535 2581 msgstr ""
2536 2582  
2537 2583 #: app/views/account/activate_enterprise.rhtml:6
2538   -msgid "Already have user"
  2584 +msgid ""
  2585 +"Well, now for you manage your enterprise you have to associate an individual "
  2586 +"account to the enterprise."
2539 2587 msgstr ""
2540 2588  
2541 2589 #: app/views/account/activate_enterprise.rhtml:7
2542   -msgid "Create new user"
  2590 +msgid "Do you have a user account?"
  2591 +msgstr ""
  2592 +
  2593 +#: app/views/account/activate_enterprise.rhtml:11
  2594 +#: app/views/profile_editor/edit.rhtml:35
  2595 +#: app/views/profile_editor/edit.rhtml:41
  2596 +#: app/views/profile_editor/edit.rhtml:51
  2597 +#: app/views/profile_editor/edit.rhtml:57
  2598 +msgid "No"
  2599 +msgstr ""
  2600 +
  2601 +#: app/views/account/welcome.rhtml:2
  2602 +msgid "Welcome to %s"
  2603 +msgstr ""
  2604 +
  2605 +#: app/views/account/welcome.rhtml:4
  2606 +msgid ""
  2607 +"%s was successfuly activated. Now you may go to your control panel or to the "
  2608 +"control panel of your enterprise"
  2609 +msgstr ""
  2610 +
  2611 +#: app/views/account/welcome.rhtml:7
  2612 +msgid "Go to my control panel"
  2613 +msgstr ""
  2614 +
  2615 +#: app/views/account/welcome.rhtml:8
  2616 +msgid "Go to my enterprise control panel"
2543 2617 msgstr ""
2544 2618  
2545 2619 #: app/views/account/already_activated.rhtml:1
... ... @@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
3416 3490 msgid "Show my website to all internet users"
3417 3491 msgstr ""
3418 3492  
3419   -#: app/views/profile_editor/edit.rhtml:35
3420   -#: app/views/profile_editor/edit.rhtml:41
3421   -#: app/views/profile_editor/edit.rhtml:51
3422   -#: app/views/profile_editor/edit.rhtml:57
3423   -msgid "No"
3424   -msgstr ""
3425   -
3426 3493 #: app/views/profile_editor/edit.rhtml:38
3427 3494 msgid "Show my website to my contacts (persons)"
3428 3495 msgstr ""
... ...
po/fr/noosfero.po
  Diff comments   View file @f1b610d
... ... @@ -6,7 +6,7 @@
6 6 msgid ""
7 7 msgstr ""
8 8 "Project-Id-Version: noosfero 0.11.4\n"
9   -"POT-Creation-Date: 2008-09-12 19:55-0300\n"
  9 +"POT-Creation-Date: 2008-09-18 12:03-0300\n"
10 10 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
11 11 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
12 12 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -314,11 +314,11 @@ msgstr &quot;&quot;
314 314 msgid "Move block down"
315 315 msgstr "Vers le bas"
316 316  
317   -#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
  317 +#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
318 318 msgid "Move to the opposite side"
319 319 msgstr ""
320 320  
321   -#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
  321 +#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
322 322 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
323 323 #: app/views/content_viewer/view_page.rhtml:35
324 324 #: app/views/categories/_category.rhtml:8
... ... @@ -327,20 +327,20 @@ msgstr &quot;&quot;
327 327 msgid "Edit"
328 328 msgstr "Éditer"
329 329  
330   -#: app/helpers/boxes_helper.rb:169
  330 +#: app/helpers/boxes_helper.rb:170
331 331 msgid "Remove block"
332 332 msgstr "Effacer le bloc"
333 333  
334   -#: app/helpers/boxes_helper.rb:173
  334 +#: app/helpers/boxes_helper.rb:174
335 335 msgid "Help on this block"
336 336 msgstr ""
337 337  
338   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
  338 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
339 339 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
340 340 msgid "Help"
341 341 msgstr "Aide"
342 342  
343   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
  343 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
344 344 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
345 345 #: app/views/box_organizer/add_block.rhtml:19
346 346 msgid "Close"
... ... @@ -500,7 +500,9 @@ msgstr &quot;&quot;
500 500 #: app/views/admin_panel/site_info.rhtml:11
501 501 #: app/views/shared/_select_categories.rhtml:22
502 502 #: app/views/shared/_change_image.rhtml:2
503   -#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
  503 +#: app/views/account/_login_form.rhtml:22
  504 +#: app/views/account/activation_question.rhtml:34
  505 +#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
504 506 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
505 507 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
506 508 #: app/views/memberships/new_community.rhtml:31
... ... @@ -510,22 +512,22 @@ msgstr &quot;&quot;
510 512 msgid "Cancel"
511 513 msgstr "Annuler"
512 514  
513   -#: app/helpers/forms_helper.rb:63
  515 +#: app/helpers/forms_helper.rb:64
514 516 #, fuzzy
515 517 msgid "Select the State"
516 518 msgstr "Choisissez une sous-catégorie :"
517 519  
518   -#: app/helpers/forms_helper.rb:64
  520 +#: app/helpers/forms_helper.rb:65
519 521 #, fuzzy
520 522 msgid "Select the City"
521 523 msgstr "Choisissez une sous-catégorie :"
522 524  
523   -#: app/helpers/forms_helper.rb:87
  525 +#: app/helpers/forms_helper.rb:88
524 526 #, fuzzy
525 527 msgid "State:"
526 528 msgstr "Statut"
527 529  
528   -#: app/helpers/forms_helper.rb:90
  530 +#: app/helpers/forms_helper.rb:91
529 531 #, fuzzy
530 532 msgid "City:"
531 533 msgstr "Groupe"
... ... @@ -828,8 +830,8 @@ msgid &quot;Enable email&quot;
828 830 msgstr "Adresse e-mail"
829 831  
830 832 #: app/models/user.rb:-
831   -msgid "profile"
832   -msgstr "profil"
  833 +msgid "article"
  834 +msgstr "article"
833 835  
834 836 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
835 837 #: app/models/product.rb:- app/models/create_enterprise.rb:4
... ... @@ -841,94 +843,6 @@ msgstr &quot;profil&quot;
841 843 msgid "Name"
842 844 msgstr "Nom"
843 845  
844   -#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
845   -#: app/models/category.rb:- app/views/cms/view.rhtml:25
846   -msgid "Type"
847   -msgstr "Type"
848   -
849   -#: app/models/user.rb:- app/models/create_enterprise.rb:3
850   -#: app/views/enterprise_validation/_details.rhtml:23
851   -msgid "Identifier"
852   -msgstr "Identifiant"
853   -
854   -#: app/models/user.rb:- app/models/task.rb:26
855   -#, fuzzy
856   -msgid "Active"
857   -msgstr "Activer"
858   -
859   -#: app/models/user.rb:- app/models/create_enterprise.rb:5
860   -#: app/views/enterprise_editor/_form.rhtml:4
861   -#: app/views/enterprise_validation/index.rhtml:14
862   -#: app/views/enterprise_validation/_details.rhtml:7
863   -#: app/views/enterprise_validation/list_processed.rhtml:9
864   -#: app/views/box_organizer/_link_list_block.rhtml:5
865   -msgid "Address"
866   -msgstr "Adresse"
867   -
868   -#: app/models/user.rb:- app/models/create_enterprise.rb:6
869   -#, fuzzy
870   -msgid "Contact phone"
871   -msgstr "Téléphone de contact :"
872   -
873   -#: app/models/user.rb:-
874   -#, fuzzy
875   -msgid "Home page"
876   -msgstr "Accueil"
877   -
878   -#: app/models/user.rb:-
879   -#, fuzzy
880   -msgid "User"
881   -msgstr "utilisateur"
882   -
883   -#: app/models/user.rb:- app/models/task.rb:-
884   -#, fuzzy
885   -msgid "Data"
886   -msgstr "Données"
887   -
888   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
889   -msgid "Lat"
890   -msgstr ""
891   -
892   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
893   -msgid "Lng"
894   -msgstr ""
895   -
896   -#: app/models/user.rb:-
897   -#, fuzzy
898   -msgid "Geocode precision"
899   -msgstr "Précision geocode"
900   -
901   -#: app/models/user.rb:-
902   -#, fuzzy
903   -msgid "Enabled"
904   -msgstr "Nom"
905   -
906   -#: app/models/user.rb:-
907   -#, fuzzy
908   -msgid "Nickname"
909   -msgstr "Nom"
910   -
911   -#: app/models/user.rb:- app/models/environment.rb:-
912   -msgid "Custom header"
913   -msgstr ""
914   -
915   -#: app/models/user.rb:- app/models/environment.rb:-
916   -msgid "Custom footer"
917   -msgstr ""
918   -
919   -#: app/models/user.rb:- app/models/environment.rb:-
920   -msgid "Theme"
921   -msgstr ""
922   -
923   -#: app/models/user.rb:-
924   -#, fuzzy
925   -msgid "Public profile"
926   -msgstr "Éditer le profil"
927   -
928   -#: app/models/user.rb:-
929   -msgid "article"
930   -msgstr "article"
931   -
932 846 #: app/models/user.rb:- app/models/category.rb:-
933 847 msgid "Slug"
934 848 msgstr ""
... ... @@ -974,6 +888,11 @@ msgstr &quot;personne&quot;
974 888 msgid "Lock version"
975 889 msgstr "Verrouiller la version"
976 890  
  891 +#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
  892 +#: app/models/category.rb:- app/views/cms/view.rhtml:25
  893 +msgid "Type"
  894 +msgstr "Type"
  895 +
977 896 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
978 897 msgid "Size"
979 898 msgstr ""
... ... @@ -1041,6 +960,89 @@ msgstr &quot;Commentaires récents&quot;
1041 960 msgid "Reference article"
1042 961 msgstr "Articles récents"
1043 962  
  963 +#: app/models/user.rb:-
  964 +msgid "profile"
  965 +msgstr "profil"
  966 +
  967 +#: app/models/user.rb:- app/models/create_enterprise.rb:3
  968 +#: app/views/enterprise_validation/_details.rhtml:23
  969 +msgid "Identifier"
  970 +msgstr "Identifiant"
  971 +
  972 +#: app/models/user.rb:- app/models/task.rb:26
  973 +#, fuzzy
  974 +msgid "Active"
  975 +msgstr "Activer"
  976 +
  977 +#: app/models/user.rb:- app/models/create_enterprise.rb:5
  978 +#: app/views/enterprise_editor/_form.rhtml:4
  979 +#: app/views/enterprise_validation/index.rhtml:14
  980 +#: app/views/enterprise_validation/_details.rhtml:7
  981 +#: app/views/enterprise_validation/list_processed.rhtml:9
  982 +#: app/views/box_organizer/_link_list_block.rhtml:5
  983 +msgid "Address"
  984 +msgstr "Adresse"
  985 +
  986 +#: app/models/user.rb:- app/models/create_enterprise.rb:6
  987 +#, fuzzy
  988 +msgid "Contact phone"
  989 +msgstr "Téléphone de contact :"
  990 +
  991 +#: app/models/user.rb:-
  992 +#, fuzzy
  993 +msgid "Home page"
  994 +msgstr "Accueil"
  995 +
  996 +#: app/models/user.rb:-
  997 +#, fuzzy
  998 +msgid "User"
  999 +msgstr "utilisateur"
  1000 +
  1001 +#: app/models/user.rb:- app/models/task.rb:-
  1002 +#, fuzzy
  1003 +msgid "Data"
  1004 +msgstr "Données"
  1005 +
  1006 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  1007 +msgid "Lat"
  1008 +msgstr ""
  1009 +
  1010 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  1011 +msgid "Lng"
  1012 +msgstr ""
  1013 +
  1014 +#: app/models/user.rb:-
  1015 +#, fuzzy
  1016 +msgid "Geocode precision"
  1017 +msgstr "Précision geocode"
  1018 +
  1019 +#: app/models/user.rb:-
  1020 +#, fuzzy
  1021 +msgid "Enabled"
  1022 +msgstr "Nom"
  1023 +
  1024 +#: app/models/user.rb:-
  1025 +#, fuzzy
  1026 +msgid "Nickname"
  1027 +msgstr "Nom"
  1028 +
  1029 +#: app/models/user.rb:- app/models/environment.rb:-
  1030 +msgid "Custom header"
  1031 +msgstr ""
  1032 +
  1033 +#: app/models/user.rb:- app/models/environment.rb:-
  1034 +msgid "Custom footer"
  1035 +msgstr ""
  1036 +
  1037 +#: app/models/user.rb:- app/models/environment.rb:-
  1038 +msgid "Theme"
  1039 +msgstr ""
  1040 +
  1041 +#: app/models/user.rb:-
  1042 +#, fuzzy
  1043 +msgid "Public profile"
  1044 +msgstr "Éditer le profil"
  1045 +
1044 1046 #: app/models/user.rb:7
1045 1047 msgid "Password"
1046 1048 msgstr "Mot de passe"
... ... @@ -2001,7 +2003,7 @@ msgstr &quot;Rechercher :&quot;
2001 2003 msgid "Disable products for enterprises"
2002 2004 msgstr "Détruire l'entreprise"
2003 2005  
2004   -#: app/models/environment.rb:244
  2006 +#: app/models/environment.rb:252
2005 2007 msgid "Only one Virtual Community can be the default one"
2006 2008 msgstr "Seule une CoVi peut être celle par défaut"
2007 2009  
... ... @@ -2474,6 +2476,26 @@ msgid &quot;Destroy&quot;
2474 2476 msgstr "Détruire"
2475 2477  
2476 2478 #: app/views/account/blocked.rhtml:2
  2479 +#, fuzzy
  2480 +msgid "This enterprise can't be activated by the system"
  2481 +msgstr "Validations d'entreprises en attente"
  2482 +
  2483 +#: app/views/account/blocked.rhtml:3
  2484 +msgid "Unfortunately this enterprise can't be activated via the system."
  2485 +msgstr ""
  2486 +
  2487 +#: app/views/account/blocked.rhtml:6
  2488 +msgid ""
  2489 +"There was a failed atempt of activation and the automated acivation was "
  2490 +"disabled for your security."
  2491 +msgstr ""
  2492 +
  2493 +#: app/views/account/blocked.rhtml:8
  2494 +#, fuzzy
  2495 +msgid "We don't have enough information about your enterprise to identify you."
  2496 +msgstr "Modifier les informations concernant l'entreprise"
  2497 +
  2498 +#: app/views/account/blocked.rhtml:13
2477 2499 msgid "Your enterprise has been blocked"
2478 2500 msgstr ""
2479 2501  
... ... @@ -2503,6 +2525,7 @@ msgid &quot;Are you sure you want to get out?&quot;
2503 2525 msgstr "Êtes-vous sûr(e) de vouloir sortir ?"
2504 2526  
2505 2527 #: app/views/account/logout_popup.rhtml:4
  2528 +#: app/views/account/activate_enterprise.rhtml:10
2506 2529 #: app/views/profile_editor/edit.rhtml:32
2507 2530 #: app/views/profile_editor/edit.rhtml:35
2508 2531 #: app/views/profile_editor/edit.rhtml:38
... ... @@ -2551,7 +2574,7 @@ msgid &quot;your password is personal, protect it.&quot;
2551 2574 msgstr "votre mot de passe est personnel, protégez-le."
2552 2575  
2553 2576 #: app/views/account/login_block.rhtml:24
2554   -#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
  2577 +#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
2555 2578 msgid "Log in"
2556 2579 msgstr "Se connecter"
2557 2580  
... ... @@ -2559,17 +2582,17 @@ msgstr &quot;Se connecter&quot;
2559 2582 msgid "New user"
2560 2583 msgstr "Nouvel utilisateur"
2561 2584  
2562   -#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
  2585 +#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
2563 2586 msgid "Click here to join to this environment, if you is not already an user."
2564 2587 msgstr ""
2565 2588 "Cliquez ici pour rejoindre cette communauté, si vous n'en êtes pas déjà "
2566 2589 "membre."
2567 2590  
2568   -#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
  2591 +#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
2569 2592 msgid "You can recover your password clicking on this link."
2570 2593 msgstr "Vous pouvez retrouver votre mot de passe en cliquant sur ce lien."
2571 2594  
2572   -#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
  2595 +#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
2573 2596 msgid "I forgot my password!"
2574 2597 msgstr "J'ai oublié mon mot de passe !"
2575 2598  
... ... @@ -2643,11 +2666,13 @@ msgstr &quot;&quot;
2643 2666 "les instructions sur comment modifier votre mot de passe. Vous devriez le "
2644 2667 "recevoir dans quelques instants."
2645 2668  
2646   -#: app/views/account/_signup_form.rhtml:1
2647   -msgid "Register"
  2669 +# Je ne suis pas sûr de la distinction "sign up" / "register"
  2670 +#: app/views/account/signup.rhtml:1
  2671 +#, fuzzy
  2672 +msgid "Signup"
2648 2673 msgstr "S'enregistrer"
2649 2674  
2650   -#: app/views/account/_signup_form.rhtml:5
  2675 +#: app/views/account/_signup_form.rhtml:3
2651 2676 msgid ""
2652 2677 "Fill all this fields to join in this environment.<p/>If you forgot your "
2653 2678 "password, do not create a new account, click on the \"<b>I forgot my "
... ... @@ -2657,35 +2682,35 @@ msgstr &quot;&quot;
2657 2682 "oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le "
2658 2683 "lien «<b>J'ai oublié mon mot de passe</b>»."
2659 2684  
2660   -#: app/views/account/_signup_form.rhtml:11
  2685 +#: app/views/account/_signup_form.rhtml:9
2661 2686 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2662 2687 msgstr ""
2663 2688 "«Identifiant» est un simple surnom pour vous reconnaître dans cette "
2664 2689 "communauté."
2665 2690  
2666   -#: app/views/account/_signup_form.rhtml:16
  2691 +#: app/views/account/_signup_form.rhtml:14
2667 2692 msgid "We'll send you an e-mail to validate your registration."
2668 2693 msgstr ""
2669 2694 "Nous vous enverrons un courrier électronique pour valider votre "
2670 2695 "enregistrement."
2671 2696  
2672   -#: app/views/account/_signup_form.rhtml:20
  2697 +#: app/views/account/_signup_form.rhtml:18
2673 2698 msgid "Do not use a obviously password, but try some unforgettable word."
2674 2699 msgstr ""
2675 2700 "Ne choisissez pas un mot de passe évident, mais essayez de trouver quelque "
2676 2701 "chose que vous n'oublierez pas."
2677 2702  
2678   -#: app/views/account/_signup_form.rhtml:24
  2703 +#: app/views/account/_signup_form.rhtml:22
2679 2704 msgid "We need to be sure that you wrote correctly your password."
2680 2705 msgstr ""
2681 2706 "Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
2682 2707  
2683   -#: app/views/account/_signup_form.rhtml:35
  2708 +#: app/views/account/_signup_form.rhtml:33
2684 2709 msgid "I accept the terms of use"
2685 2710 msgstr "J'accepte les conditions d'utilisation"
2686 2711  
2687 2712 # Je ne suis pas sûr de la distinction "sign up" / "register"
2688   -#: app/views/account/_signup_form.rhtml:40
  2713 +#: app/views/account/_signup_form.rhtml:45
2689 2714 #, fuzzy
2690 2715 msgid "Sign up"
2691 2716 msgstr "S'enregistrer"
... ... @@ -2695,8 +2720,7 @@ msgstr &quot;S&#39;enregistrer&quot;
2695 2720 #
2696 2721 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
2697 2722 #, fuzzy
2698   -msgid ""
2699   -"To join on this environment, click on \"<b>I want to participate!</b>\"."
  2723 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
2700 2724 msgstr ""
2701 2725 "Pour rejoindre cette communauté, cliquez sur \"<b>Je rejoins cette "
2702 2726 "communauté !</b>\"."
... ... @@ -2731,33 +2755,59 @@ msgstr &quot;%s, votre nouveau mot de passe a bien été installé.&quot;
2731 2755 msgid "You can <a href='%s'>login</a> now."
2732 2756 msgstr "Maintenant, vous pouvez vous <a href='%s'>commecter</a>."
2733 2757  
2734   -#: app/views/account/activation_question.rhtml:3
  2758 +#: app/views/account/activation_question.rhtml:6
  2759 +msgid "The year must be between %d and %d"
  2760 +msgstr ""
  2761 +
  2762 +#: app/views/account/activation_question.rhtml:17
  2763 +msgid "An CNPJ have 14 digits"
  2764 +msgstr ""
  2765 +
  2766 +#: app/views/account/activation_question.rhtml:26
  2767 +#: app/views/account/accept_terms.rhtml:2
  2768 +#, fuzzy
  2769 +msgid "Enterprise activation"
  2770 +msgstr "Validation d'entreprises"
  2771 +
  2772 +#: app/views/account/activation_question.rhtml:26
  2773 +msgid "part 1 of 2"
  2774 +msgstr ""
  2775 +
  2776 +#: app/views/account/activation_question.rhtml:26
  2777 +msgid "part 1 of 3"
  2778 +msgstr ""
  2779 +
  2780 +#: app/views/account/activation_question.rhtml:29
2735 2781 msgid "What year your enterprise was founded?"
2736 2782 msgstr ""
2737 2783  
2738   -#: app/views/account/activation_question.rhtml:3
  2784 +#: app/views/account/activation_question.rhtml:29
2739 2785 msgid "What is the CNPJ of your enterprise?"
2740 2786 msgstr ""
2741 2787  
2742   -#: app/views/account/activation_question.rhtml:3
  2788 +#: app/views/account/activation_question.rhtml:29
2743 2789 #, fuzzy
2744 2790 msgid "We need to be sure that this is your enterprise"
2745 2791 msgstr ""
2746 2792 "Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
2747 2793  
2748   -#: app/views/account/activation_question.rhtml:8
  2794 +#: app/views/account/activation_question.rhtml:35
  2795 +#: app/views/account/accept_terms.rhtml:13
2749 2796 #, fuzzy
2750   -msgid "Answer"
2751   -msgstr "utilisateur"
  2797 +msgid "Continue"
  2798 +msgstr "Groupes"
2752 2799  
2753   -#: app/views/account/accept_terms.rhtml:4
2754   -#, fuzzy
2755   -msgid "I accept the terms"
2756   -msgstr "J'accepte les conditions d'utilisation"
  2800 +#: app/views/account/accept_terms.rhtml:2
  2801 +msgid "part 2 of 2"
  2802 +msgstr ""
  2803 +
  2804 +#: app/views/account/accept_terms.rhtml:2
  2805 +msgid " part 2 of 3"
  2806 +msgstr ""
2757 2807  
2758   -#: app/views/account/accept_terms.rhtml:5
  2808 +#: app/views/account/accept_terms.rhtml:10
2759 2809 #, fuzzy
2760   -msgid "I do NOT accept the terms"
  2810 +msgid "I read the terms of use and accepted them"
2761 2811 msgstr "J'accepte les conditions d'utilisation"
2762 2812  
2763 2813 #: app/views/account/index_anonymous.rhtml:1
... ... @@ -2787,23 +2837,53 @@ msgstr &quot;&quot;
2787 2837 "Si vous ne n'avez pas déjà fait, vous pouvez vous enregistrer dès à présent "
2788 2838 "pour devenir membre de cette communauté."
2789 2839  
2790   -#: app/views/account/login.rhtml:32
  2840 +#: app/views/account/login.rhtml:31
2791 2841 #, fuzzy
2792 2842 msgid "I want to participate!"
2793 2843 msgstr "Je rejoins cette communauté !"
2794 2844  
2795   -#: app/views/account/activate_enterprise.rhtml:1
2796   -msgid "What user should be the admin of the enterprise page"
2797   -msgstr ""
  2845 +#: app/views/account/activate_enterprise.rhtml:2
  2846 +#, fuzzy
  2847 +msgid "Enterprise activation - part 3 of 3"
  2848 +msgstr "Validation d'entreprises"
2798 2849  
2799 2850 #: app/views/account/activate_enterprise.rhtml:6
2800   -msgid "Already have user"
  2851 +msgid ""
  2852 +"Well, now for you manage your enterprise you have to associate an individual "
  2853 +"account to the enterprise."
2801 2854 msgstr ""
2802 2855  
2803 2856 #: app/views/account/activate_enterprise.rhtml:7
  2857 +msgid "Do you have a user account?"
  2858 +msgstr ""
  2859 +
  2860 +#: app/views/account/activate_enterprise.rhtml:11
  2861 +#: app/views/profile_editor/edit.rhtml:35
  2862 +#: app/views/profile_editor/edit.rhtml:41
  2863 +#: app/views/profile_editor/edit.rhtml:51
  2864 +#: app/views/profile_editor/edit.rhtml:57
  2865 +msgid "No"
  2866 +msgstr "Non"
  2867 +
  2868 +#: app/views/account/welcome.rhtml:2
  2869 +msgid "Welcome to %s"
  2870 +msgstr ""
  2871 +
  2872 +#: app/views/account/welcome.rhtml:4
  2873 +msgid ""
  2874 +"%s was successfuly activated. Now you may go to your control panel or to the "
  2875 +"control panel of your enterprise"
  2876 +msgstr ""
  2877 +
  2878 +#: app/views/account/welcome.rhtml:7
2804 2879 #, fuzzy
2805   -msgid "Create new user"
2806   -msgstr "Créer un nouveau groupe"
  2880 +msgid "Go to my control panel"
  2881 +msgstr "Retour au panneau de contrôle"
  2882 +
  2883 +#: app/views/account/welcome.rhtml:8
  2884 +#, fuzzy
  2885 +msgid "Go to my enterprise control panel"
  2886 +msgstr "Retourner au panneau de contrôle."
2807 2887  
2808 2888 #: app/views/account/already_activated.rhtml:1
2809 2889 #, fuzzy
... ... @@ -3771,13 +3851,6 @@ msgstr &quot;&quot;
3771 3851 msgid "Show my website to all internet users"
3772 3852 msgstr ""
3773 3853  
3774   -#: app/views/profile_editor/edit.rhtml:35
3775   -#: app/views/profile_editor/edit.rhtml:41
3776   -#: app/views/profile_editor/edit.rhtml:51
3777   -#: app/views/profile_editor/edit.rhtml:57
3778   -msgid "No"
3779   -msgstr "Non"
3780   -
3781 3854 #: app/views/profile_editor/edit.rhtml:38
3782 3855 msgid "Show my website to my contacts (persons)"
3783 3856 msgstr ""
... ... @@ -5003,6 +5076,25 @@ msgstr &quot;Développé par Colivre&quot;
5003 5076 msgid "A Ynternet.org project"
5004 5077 msgstr ""
5005 5078  
  5079 +#~ msgid "Register"
  5080 +#~ msgstr "S'enregistrer"
  5081 +
  5082 +#, fuzzy
  5083 +#~ msgid "Answer"
  5084 +#~ msgstr "utilisateur"
  5085 +
  5086 +#, fuzzy
  5087 +#~ msgid "I accept the terms"
  5088 +#~ msgstr "J'accepte les conditions d'utilisation"
  5089 +
  5090 +#, fuzzy
  5091 +#~ msgid "I do NOT accept the terms"
  5092 +#~ msgstr "J'accepte les conditions d'utilisation"
  5093 +
  5094 +#, fuzzy
  5095 +#~ msgid "Create new user"
  5096 +#~ msgstr "Créer un nouveau groupe"
  5097 +
5006 5098 #~ msgid "User|Password"
5007 5099 #~ msgstr "Mot de passe"
5008 5100  
... ...
po/hy/noosfero.po
  Diff comments   View file @f1b610d
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.4\n"
10   -"POT-Creation-Date: 2008-09-12 19:55-0300\n"
  10 +"POT-Creation-Date: 2008-09-18 12:03-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -299,11 +299,11 @@ msgstr &quot;&quot;
299 299 msgid "Move block down"
300 300 msgstr ""
301 301  
302   -#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
  302 +#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
303 303 msgid "Move to the opposite side"
304 304 msgstr ""
305 305  
306   -#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
  306 +#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
307 307 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
308 308 #: app/views/content_viewer/view_page.rhtml:35
309 309 #: app/views/categories/_category.rhtml:8
... ... @@ -312,20 +312,20 @@ msgstr &quot;&quot;
312 312 msgid "Edit"
313 313 msgstr ""
314 314  
315   -#: app/helpers/boxes_helper.rb:169
  315 +#: app/helpers/boxes_helper.rb:170
316 316 msgid "Remove block"
317 317 msgstr ""
318 318  
319   -#: app/helpers/boxes_helper.rb:173
  319 +#: app/helpers/boxes_helper.rb:174
320 320 msgid "Help on this block"
321 321 msgstr ""
322 322  
323   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
  323 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
324 324 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
325 325 msgid "Help"
326 326 msgstr ""
327 327  
328   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
  328 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
329 329 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
330 330 #: app/views/box_organizer/add_block.rhtml:19
331 331 msgid "Close"
... ... @@ -476,7 +476,9 @@ msgstr &quot;&quot;
476 476 #: app/views/admin_panel/site_info.rhtml:11
477 477 #: app/views/shared/_select_categories.rhtml:22
478 478 #: app/views/shared/_change_image.rhtml:2
479   -#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
  479 +#: app/views/account/_login_form.rhtml:22
  480 +#: app/views/account/activation_question.rhtml:34
  481 +#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
480 482 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
481 483 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
482 484 #: app/views/memberships/new_community.rhtml:31
... ... @@ -486,19 +488,19 @@ msgstr &quot;&quot;
486 488 msgid "Cancel"
487 489 msgstr ""
488 490  
489   -#: app/helpers/forms_helper.rb:63
  491 +#: app/helpers/forms_helper.rb:64
490 492 msgid "Select the State"
491 493 msgstr ""
492 494  
493   -#: app/helpers/forms_helper.rb:64
  495 +#: app/helpers/forms_helper.rb:65
494 496 msgid "Select the City"
495 497 msgstr ""
496 498  
497   -#: app/helpers/forms_helper.rb:87
  499 +#: app/helpers/forms_helper.rb:88
498 500 msgid "State:"
499 501 msgstr ""
500 502  
501   -#: app/helpers/forms_helper.rb:90
  503 +#: app/helpers/forms_helper.rb:91
502 504 msgid "City:"
503 505 msgstr ""
504 506  
... ... @@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
774 776 msgstr ""
775 777  
776 778 #: app/models/user.rb:-
777   -msgid "profile"
  779 +msgid "article"
778 780 msgstr ""
779 781  
780 782 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
... ... @@ -787,85 +789,6 @@ msgstr &quot;&quot;
787 789 msgid "Name"
788 790 msgstr ""
789 791  
790   -#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
791   -#: app/models/category.rb:- app/views/cms/view.rhtml:25
792   -msgid "Type"
793   -msgstr ""
794   -
795   -#: app/models/user.rb:- app/models/create_enterprise.rb:3
796   -#: app/views/enterprise_validation/_details.rhtml:23
797   -msgid "Identifier"
798   -msgstr ""
799   -
800   -#: app/models/user.rb:- app/models/task.rb:26
801   -msgid "Active"
802   -msgstr ""
803   -
804   -#: app/models/user.rb:- app/models/create_enterprise.rb:5
805   -#: app/views/enterprise_editor/_form.rhtml:4
806   -#: app/views/enterprise_validation/index.rhtml:14
807   -#: app/views/enterprise_validation/_details.rhtml:7
808   -#: app/views/enterprise_validation/list_processed.rhtml:9
809   -#: app/views/box_organizer/_link_list_block.rhtml:5
810   -msgid "Address"
811   -msgstr ""
812   -
813   -#: app/models/user.rb:- app/models/create_enterprise.rb:6
814   -msgid "Contact phone"
815   -msgstr ""
816   -
817   -#: app/models/user.rb:-
818   -msgid "Home page"
819   -msgstr ""
820   -
821   -#: app/models/user.rb:-
822   -msgid "User"
823   -msgstr ""
824   -
825   -#: app/models/user.rb:- app/models/task.rb:-
826   -msgid "Data"
827   -msgstr ""
828   -
829   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
830   -msgid "Lat"
831   -msgstr ""
832   -
833   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
834   -msgid "Lng"
835   -msgstr ""
836   -
837   -#: app/models/user.rb:-
838   -msgid "Geocode precision"
839   -msgstr ""
840   -
841   -#: app/models/user.rb:-
842   -msgid "Enabled"
843   -msgstr ""
844   -
845   -#: app/models/user.rb:-
846   -msgid "Nickname"
847   -msgstr ""
848   -
849   -#: app/models/user.rb:- app/models/environment.rb:-
850   -msgid "Custom header"
851   -msgstr ""
852   -
853   -#: app/models/user.rb:- app/models/environment.rb:-
854   -msgid "Custom footer"
855   -msgstr ""
856   -
857   -#: app/models/user.rb:- app/models/environment.rb:-
858   -msgid "Theme"
859   -msgstr ""
860   -
861   -#: app/models/user.rb:-
862   -msgid "Public profile"
863   -msgstr ""
864   -
865   -#: app/models/user.rb:-
866   -msgid "article"
867   -msgstr ""
868   -
869 792 #: app/models/user.rb:- app/models/category.rb:-
870 793 msgid "Slug"
871 794 msgstr ""
... ... @@ -904,6 +827,11 @@ msgstr &quot;&quot;
904 827 msgid "Lock version"
905 828 msgstr ""
906 829  
  830 +#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
  831 +#: app/models/category.rb:- app/views/cms/view.rhtml:25
  832 +msgid "Type"
  833 +msgstr ""
  834 +
907 835 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
908 836 msgid "Size"
909 837 msgstr ""
... ... @@ -960,6 +888,80 @@ msgstr &quot;&quot;
960 888 msgid "Reference article"
961 889 msgstr ""
962 890  
  891 +#: app/models/user.rb:-
  892 +msgid "profile"
  893 +msgstr ""
  894 +
  895 +#: app/models/user.rb:- app/models/create_enterprise.rb:3
  896 +#: app/views/enterprise_validation/_details.rhtml:23
  897 +msgid "Identifier"
  898 +msgstr ""
  899 +
  900 +#: app/models/user.rb:- app/models/task.rb:26
  901 +msgid "Active"
  902 +msgstr ""
  903 +
  904 +#: app/models/user.rb:- app/models/create_enterprise.rb:5
  905 +#: app/views/enterprise_editor/_form.rhtml:4
  906 +#: app/views/enterprise_validation/index.rhtml:14
  907 +#: app/views/enterprise_validation/_details.rhtml:7
  908 +#: app/views/enterprise_validation/list_processed.rhtml:9
  909 +#: app/views/box_organizer/_link_list_block.rhtml:5
  910 +msgid "Address"
  911 +msgstr ""
  912 +
  913 +#: app/models/user.rb:- app/models/create_enterprise.rb:6
  914 +msgid "Contact phone"
  915 +msgstr ""
  916 +
  917 +#: app/models/user.rb:-
  918 +msgid "Home page"
  919 +msgstr ""
  920 +
  921 +#: app/models/user.rb:-
  922 +msgid "User"
  923 +msgstr ""
  924 +
  925 +#: app/models/user.rb:- app/models/task.rb:-
  926 +msgid "Data"
  927 +msgstr ""
  928 +
  929 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  930 +msgid "Lat"
  931 +msgstr ""
  932 +
  933 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  934 +msgid "Lng"
  935 +msgstr ""
  936 +
  937 +#: app/models/user.rb:-
  938 +msgid "Geocode precision"
  939 +msgstr ""
  940 +
  941 +#: app/models/user.rb:-
  942 +msgid "Enabled"
  943 +msgstr ""
  944 +
  945 +#: app/models/user.rb:-
  946 +msgid "Nickname"
  947 +msgstr ""
  948 +
  949 +#: app/models/user.rb:- app/models/environment.rb:-
  950 +msgid "Custom header"
  951 +msgstr ""
  952 +
  953 +#: app/models/user.rb:- app/models/environment.rb:-
  954 +msgid "Custom footer"
  955 +msgstr ""
  956 +
  957 +#: app/models/user.rb:- app/models/environment.rb:-
  958 +msgid "Theme"
  959 +msgstr ""
  960 +
  961 +#: app/models/user.rb:-
  962 +msgid "Public profile"
  963 +msgstr ""
  964 +
963 965 #: app/models/user.rb:7
964 966 msgid "Password"
965 967 msgstr ""
... ... @@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
1813 1815 msgid "Disable products for enterprises"
1814 1816 msgstr ""
1815 1817  
1816   -#: app/models/environment.rb:244
  1818 +#: app/models/environment.rb:252
1817 1819 msgid "Only one Virtual Community can be the default one"
1818 1820 msgstr ""
1819 1821  
... ... @@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
2258 2260 msgstr ""
2259 2261  
2260 2262 #: app/views/account/blocked.rhtml:2
  2263 +msgid "This enterprise can't be activated by the system"
  2264 +msgstr ""
  2265 +
  2266 +#: app/views/account/blocked.rhtml:3
  2267 +msgid "Unfortunately this enterprise can't be activated via the system."
  2268 +msgstr ""
  2269 +
  2270 +#: app/views/account/blocked.rhtml:6
  2271 +msgid ""
  2272 +"There was a failed atempt of activation and the automated acivation was "
  2273 +"disabled for your security."
  2274 +msgstr ""
  2275 +
  2276 +#: app/views/account/blocked.rhtml:8
  2277 +msgid "We don't have enough information about your enterprise to identify you."
  2278 +msgstr ""
  2279 +
  2280 +#: app/views/account/blocked.rhtml:13
2261 2281 msgid "Your enterprise has been blocked"
2262 2282 msgstr ""
2263 2283  
... ... @@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
2282 2302 msgstr ""
2283 2303  
2284 2304 #: app/views/account/logout_popup.rhtml:4
  2305 +#: app/views/account/activate_enterprise.rhtml:10
2285 2306 #: app/views/profile_editor/edit.rhtml:32
2286 2307 #: app/views/profile_editor/edit.rhtml:35
2287 2308 #: app/views/profile_editor/edit.rhtml:38
... ... @@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
2325 2346 msgstr ""
2326 2347  
2327 2348 #: app/views/account/login_block.rhtml:24
2328   -#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
  2349 +#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
2329 2350 msgid "Log in"
2330 2351 msgstr ""
2331 2352  
... ... @@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
2333 2354 msgid "New user"
2334 2355 msgstr ""
2335 2356  
2336   -#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
  2357 +#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
2337 2358 msgid "Click here to join to this environment, if you is not already an user."
2338 2359 msgstr ""
2339 2360  
2340   -#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
  2361 +#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
2341 2362 msgid "You can recover your password clicking on this link."
2342 2363 msgstr ""
2343 2364  
2344   -#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
  2365 +#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
2345 2366 msgid "I forgot my password!"
2346 2367 msgstr ""
2347 2368  
... ... @@ -2409,44 +2430,43 @@ msgid &quot;&quot;
2409 2430 "changing your password. You should receive it in a few minutes."
2410 2431 msgstr ""
2411 2432  
2412   -#: app/views/account/_signup_form.rhtml:1
2413   -msgid "Register"
  2433 +#: app/views/account/signup.rhtml:1
  2434 +msgid "Signup"
2414 2435 msgstr ""
2415 2436  
2416   -#: app/views/account/_signup_form.rhtml:5
  2437 +#: app/views/account/_signup_form.rhtml:3
2417 2438 msgid ""
2418 2439 "Fill all this fields to join in this environment.<p/>If you forgot your "
2419 2440 "password, do not create a new account, click on the \"<b>I forgot my "
2420 2441 "password!</b>\" link. ;-)"
2421 2442 msgstr ""
2422 2443  
2423   -#: app/views/account/_signup_form.rhtml:11
  2444 +#: app/views/account/_signup_form.rhtml:9
2424 2445 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2425 2446 msgstr ""
2426 2447  
2427   -#: app/views/account/_signup_form.rhtml:16
  2448 +#: app/views/account/_signup_form.rhtml:14
2428 2449 msgid "We'll send you an e-mail to validate your registration."
2429 2450 msgstr ""
2430 2451  
2431   -#: app/views/account/_signup_form.rhtml:20
  2452 +#: app/views/account/_signup_form.rhtml:18
2432 2453 msgid "Do not use a obviously password, but try some unforgettable word."
2433 2454 msgstr ""
2434 2455  
2435   -#: app/views/account/_signup_form.rhtml:24
  2456 +#: app/views/account/_signup_form.rhtml:22
2436 2457 msgid "We need to be sure that you wrote correctly your password."
2437 2458 msgstr ""
2438 2459  
2439   -#: app/views/account/_signup_form.rhtml:35
  2460 +#: app/views/account/_signup_form.rhtml:33
2440 2461 msgid "I accept the terms of use"
2441 2462 msgstr ""
2442 2463  
2443   -#: app/views/account/_signup_form.rhtml:40
  2464 +#: app/views/account/_signup_form.rhtml:45
2444 2465 msgid "Sign up"
2445 2466 msgstr ""
2446 2467  
2447 2468 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
2448   -msgid ""
2449   -"To join on this environment, click on \"<b>I want to participate!</b>\"."
  2469 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
2450 2470 msgstr ""
2451 2471  
2452 2472 #: app/views/account/change_password.rhtml:1
... ... @@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
2479 2499 msgid "You can <a href='%s'>login</a> now."
2480 2500 msgstr ""
2481 2501  
2482   -#: app/views/account/activation_question.rhtml:3
  2502 +#: app/views/account/activation_question.rhtml:6
  2503 +msgid "The year must be between %d and %d"
  2504 +msgstr ""
  2505 +
  2506 +#: app/views/account/activation_question.rhtml:17
  2507 +msgid "An CNPJ have 14 digits"
  2508 +msgstr ""
  2509 +
  2510 +#: app/views/account/activation_question.rhtml:26
  2511 +#: app/views/account/accept_terms.rhtml:2
  2512 +msgid "Enterprise activation"
  2513 +msgstr ""
  2514 +
  2515 +#: app/views/account/activation_question.rhtml:26
  2516 +msgid "part 1 of 2"
  2517 +msgstr ""
  2518 +
  2519 +#: app/views/account/activation_question.rhtml:26
  2520 +msgid "part 1 of 3"
  2521 +msgstr ""
  2522 +
  2523 +#: app/views/account/activation_question.rhtml:29
2483 2524 msgid "What year your enterprise was founded?"
2484 2525 msgstr ""
2485 2526  
2486   -#: app/views/account/activation_question.rhtml:3
  2527 +#: app/views/account/activation_question.rhtml:29
2487 2528 msgid "What is the CNPJ of your enterprise?"
2488 2529 msgstr ""
2489 2530  
2490   -#: app/views/account/activation_question.rhtml:3
  2531 +#: app/views/account/activation_question.rhtml:29
2491 2532 msgid "We need to be sure that this is your enterprise"
2492 2533 msgstr ""
2493 2534  
2494   -#: app/views/account/activation_question.rhtml:8
2495   -msgid "Answer"
  2535 +#: app/views/account/activation_question.rhtml:35
  2536 +#: app/views/account/accept_terms.rhtml:13
  2537 +msgid "Continue"
2496 2538 msgstr ""
2497 2539  
2498   -#: app/views/account/accept_terms.rhtml:4
2499   -msgid "I accept the terms"
  2540 +#: app/views/account/accept_terms.rhtml:2
  2541 +msgid "part 2 of 2"
2500 2542 msgstr ""
2501 2543  
2502   -#: app/views/account/accept_terms.rhtml:5
2503   -msgid "I do NOT accept the terms"
  2544 +#: app/views/account/accept_terms.rhtml:2
  2545 +msgid " part 2 of 3"
  2546 +msgstr ""
  2547 +
  2548 +#: app/views/account/accept_terms.rhtml:10
  2549 +msgid "I read the terms of use and accepted them"
2504 2550 msgstr ""
2505 2551  
2506 2552 #: app/views/account/index_anonymous.rhtml:1
... ... @@ -2526,20 +2572,48 @@ msgid &quot;&quot;
2526 2572 "this environment."
2527 2573 msgstr ""
2528 2574  
2529   -#: app/views/account/login.rhtml:32
  2575 +#: app/views/account/login.rhtml:31
2530 2576 msgid "I want to participate!"
2531 2577 msgstr ""
2532 2578  
2533   -#: app/views/account/activate_enterprise.rhtml:1
2534   -msgid "What user should be the admin of the enterprise page"
  2579 +#: app/views/account/activate_enterprise.rhtml:2
  2580 +msgid "Enterprise activation - part 3 of 3"
2535 2581 msgstr ""
2536 2582  
2537 2583 #: app/views/account/activate_enterprise.rhtml:6
2538   -msgid "Already have user"
  2584 +msgid ""
  2585 +"Well, now for you manage your enterprise you have to associate an individual "
  2586 +"account to the enterprise."
2539 2587 msgstr ""
2540 2588  
2541 2589 #: app/views/account/activate_enterprise.rhtml:7
2542   -msgid "Create new user"
  2590 +msgid "Do you have a user account?"
  2591 +msgstr ""
  2592 +
  2593 +#: app/views/account/activate_enterprise.rhtml:11
  2594 +#: app/views/profile_editor/edit.rhtml:35
  2595 +#: app/views/profile_editor/edit.rhtml:41
  2596 +#: app/views/profile_editor/edit.rhtml:51
  2597 +#: app/views/profile_editor/edit.rhtml:57
  2598 +msgid "No"
  2599 +msgstr ""
  2600 +
  2601 +#: app/views/account/welcome.rhtml:2
  2602 +msgid "Welcome to %s"
  2603 +msgstr ""
  2604 +
  2605 +#: app/views/account/welcome.rhtml:4
  2606 +msgid ""
  2607 +"%s was successfuly activated. Now you may go to your control panel or to the "
  2608 +"control panel of your enterprise"
  2609 +msgstr ""
  2610 +
  2611 +#: app/views/account/welcome.rhtml:7
  2612 +msgid "Go to my control panel"
  2613 +msgstr ""
  2614 +
  2615 +#: app/views/account/welcome.rhtml:8
  2616 +msgid "Go to my enterprise control panel"
2543 2617 msgstr ""
2544 2618  
2545 2619 #: app/views/account/already_activated.rhtml:1
... ... @@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
3416 3490 msgid "Show my website to all internet users"
3417 3491 msgstr ""
3418 3492  
3419   -#: app/views/profile_editor/edit.rhtml:35
3420   -#: app/views/profile_editor/edit.rhtml:41
3421   -#: app/views/profile_editor/edit.rhtml:51
3422   -#: app/views/profile_editor/edit.rhtml:57
3423   -msgid "No"
3424   -msgstr ""
3425   -
3426 3493 #: app/views/profile_editor/edit.rhtml:38
3427 3494 msgid "Show my website to my contacts (persons)"
3428 3495 msgstr ""
... ...
po/nl/noosfero.po
  Diff comments   View file @f1b610d
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.4\n"
10   -"POT-Creation-Date: 2008-09-12 19:55-0300\n"
  10 +"POT-Creation-Date: 2008-09-18 12:03-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -299,11 +299,11 @@ msgstr &quot;&quot;
299 299 msgid "Move block down"
300 300 msgstr ""
301 301  
302   -#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
  302 +#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
303 303 msgid "Move to the opposite side"
304 304 msgstr ""
305 305  
306   -#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
  306 +#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
307 307 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
308 308 #: app/views/content_viewer/view_page.rhtml:35
309 309 #: app/views/categories/_category.rhtml:8
... ... @@ -312,20 +312,20 @@ msgstr &quot;&quot;
312 312 msgid "Edit"
313 313 msgstr ""
314 314  
315   -#: app/helpers/boxes_helper.rb:169
  315 +#: app/helpers/boxes_helper.rb:170
316 316 msgid "Remove block"
317 317 msgstr ""
318 318  
319   -#: app/helpers/boxes_helper.rb:173
  319 +#: app/helpers/boxes_helper.rb:174
320 320 msgid "Help on this block"
321 321 msgstr ""
322 322  
323   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
  323 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
324 324 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
325 325 msgid "Help"
326 326 msgstr ""
327 327  
328   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
  328 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
329 329 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
330 330 #: app/views/box_organizer/add_block.rhtml:19
331 331 msgid "Close"
... ... @@ -476,7 +476,9 @@ msgstr &quot;&quot;
476 476 #: app/views/admin_panel/site_info.rhtml:11
477 477 #: app/views/shared/_select_categories.rhtml:22
478 478 #: app/views/shared/_change_image.rhtml:2
479   -#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
  479 +#: app/views/account/_login_form.rhtml:22
  480 +#: app/views/account/activation_question.rhtml:34
  481 +#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
480 482 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
481 483 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
482 484 #: app/views/memberships/new_community.rhtml:31
... ... @@ -486,19 +488,19 @@ msgstr &quot;&quot;
486 488 msgid "Cancel"
487 489 msgstr ""
488 490  
489   -#: app/helpers/forms_helper.rb:63
  491 +#: app/helpers/forms_helper.rb:64
490 492 msgid "Select the State"
491 493 msgstr ""
492 494  
493   -#: app/helpers/forms_helper.rb:64
  495 +#: app/helpers/forms_helper.rb:65
494 496 msgid "Select the City"
495 497 msgstr ""
496 498  
497   -#: app/helpers/forms_helper.rb:87
  499 +#: app/helpers/forms_helper.rb:88
498 500 msgid "State:"
499 501 msgstr ""
500 502  
501   -#: app/helpers/forms_helper.rb:90
  503 +#: app/helpers/forms_helper.rb:91
502 504 msgid "City:"
503 505 msgstr ""
504 506  
... ... @@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
774 776 msgstr ""
775 777  
776 778 #: app/models/user.rb:-
777   -msgid "profile"
  779 +msgid "article"
778 780 msgstr ""
779 781  
780 782 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
... ... @@ -787,85 +789,6 @@ msgstr &quot;&quot;
787 789 msgid "Name"
788 790 msgstr ""
789 791  
790   -#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
791   -#: app/models/category.rb:- app/views/cms/view.rhtml:25
792   -msgid "Type"
793   -msgstr ""
794   -
795   -#: app/models/user.rb:- app/models/create_enterprise.rb:3
796   -#: app/views/enterprise_validation/_details.rhtml:23
797   -msgid "Identifier"
798   -msgstr ""
799   -
800   -#: app/models/user.rb:- app/models/task.rb:26
801   -msgid "Active"
802   -msgstr ""
803   -
804   -#: app/models/user.rb:- app/models/create_enterprise.rb:5
805   -#: app/views/enterprise_editor/_form.rhtml:4
806   -#: app/views/enterprise_validation/index.rhtml:14
807   -#: app/views/enterprise_validation/_details.rhtml:7
808   -#: app/views/enterprise_validation/list_processed.rhtml:9
809   -#: app/views/box_organizer/_link_list_block.rhtml:5
810   -msgid "Address"
811   -msgstr ""
812   -
813   -#: app/models/user.rb:- app/models/create_enterprise.rb:6
814   -msgid "Contact phone"
815   -msgstr ""
816   -
817   -#: app/models/user.rb:-
818   -msgid "Home page"
819   -msgstr ""
820   -
821   -#: app/models/user.rb:-
822   -msgid "User"
823   -msgstr ""
824   -
825   -#: app/models/user.rb:- app/models/task.rb:-
826   -msgid "Data"
827   -msgstr ""
828   -
829   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
830   -msgid "Lat"
831   -msgstr ""
832   -
833   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
834   -msgid "Lng"
835   -msgstr ""
836   -
837   -#: app/models/user.rb:-
838   -msgid "Geocode precision"
839   -msgstr ""
840   -
841   -#: app/models/user.rb:-
842   -msgid "Enabled"
843   -msgstr ""
844   -
845   -#: app/models/user.rb:-
846   -msgid "Nickname"
847   -msgstr ""
848   -
849   -#: app/models/user.rb:- app/models/environment.rb:-
850   -msgid "Custom header"
851   -msgstr ""
852   -
853   -#: app/models/user.rb:- app/models/environment.rb:-
854   -msgid "Custom footer"
855   -msgstr ""
856   -
857   -#: app/models/user.rb:- app/models/environment.rb:-
858   -msgid "Theme"
859   -msgstr ""
860   -
861   -#: app/models/user.rb:-
862   -msgid "Public profile"
863   -msgstr ""
864   -
865   -#: app/models/user.rb:-
866   -msgid "article"
867   -msgstr ""
868   -
869 792 #: app/models/user.rb:- app/models/category.rb:-
870 793 msgid "Slug"
871 794 msgstr ""
... ... @@ -904,6 +827,11 @@ msgstr &quot;&quot;
904 827 msgid "Lock version"
905 828 msgstr ""
906 829  
  830 +#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
  831 +#: app/models/category.rb:- app/views/cms/view.rhtml:25
  832 +msgid "Type"
  833 +msgstr ""
  834 +
907 835 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
908 836 msgid "Size"
909 837 msgstr ""
... ... @@ -960,6 +888,80 @@ msgstr &quot;&quot;
960 888 msgid "Reference article"
961 889 msgstr ""
962 890  
  891 +#: app/models/user.rb:-
  892 +msgid "profile"
  893 +msgstr ""
  894 +
  895 +#: app/models/user.rb:- app/models/create_enterprise.rb:3
  896 +#: app/views/enterprise_validation/_details.rhtml:23
  897 +msgid "Identifier"
  898 +msgstr ""
  899 +
  900 +#: app/models/user.rb:- app/models/task.rb:26
  901 +msgid "Active"
  902 +msgstr ""
  903 +
  904 +#: app/models/user.rb:- app/models/create_enterprise.rb:5
  905 +#: app/views/enterprise_editor/_form.rhtml:4
  906 +#: app/views/enterprise_validation/index.rhtml:14
  907 +#: app/views/enterprise_validation/_details.rhtml:7
  908 +#: app/views/enterprise_validation/list_processed.rhtml:9
  909 +#: app/views/box_organizer/_link_list_block.rhtml:5
  910 +msgid "Address"
  911 +msgstr ""
  912 +
  913 +#: app/models/user.rb:- app/models/create_enterprise.rb:6
  914 +msgid "Contact phone"
  915 +msgstr ""
  916 +
  917 +#: app/models/user.rb:-
  918 +msgid "Home page"
  919 +msgstr ""
  920 +
  921 +#: app/models/user.rb:-
  922 +msgid "User"
  923 +msgstr ""
  924 +
  925 +#: app/models/user.rb:- app/models/task.rb:-
  926 +msgid "Data"
  927 +msgstr ""
  928 +
  929 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  930 +msgid "Lat"
  931 +msgstr ""
  932 +
  933 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  934 +msgid "Lng"
  935 +msgstr ""
  936 +
  937 +#: app/models/user.rb:-
  938 +msgid "Geocode precision"
  939 +msgstr ""
  940 +
  941 +#: app/models/user.rb:-
  942 +msgid "Enabled"
  943 +msgstr ""
  944 +
  945 +#: app/models/user.rb:-
  946 +msgid "Nickname"
  947 +msgstr ""
  948 +
  949 +#: app/models/user.rb:- app/models/environment.rb:-
  950 +msgid "Custom header"
  951 +msgstr ""
  952 +
  953 +#: app/models/user.rb:- app/models/environment.rb:-
  954 +msgid "Custom footer"
  955 +msgstr ""
  956 +
  957 +#: app/models/user.rb:- app/models/environment.rb:-
  958 +msgid "Theme"
  959 +msgstr ""
  960 +
  961 +#: app/models/user.rb:-
  962 +msgid "Public profile"
  963 +msgstr ""
  964 +
963 965 #: app/models/user.rb:7
964 966 msgid "Password"
965 967 msgstr ""
... ... @@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
1813 1815 msgid "Disable products for enterprises"
1814 1816 msgstr ""
1815 1817  
1816   -#: app/models/environment.rb:244
  1818 +#: app/models/environment.rb:252
1817 1819 msgid "Only one Virtual Community can be the default one"
1818 1820 msgstr ""
1819 1821  
... ... @@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
2258 2260 msgstr ""
2259 2261  
2260 2262 #: app/views/account/blocked.rhtml:2
  2263 +msgid "This enterprise can't be activated by the system"
  2264 +msgstr ""
  2265 +
  2266 +#: app/views/account/blocked.rhtml:3
  2267 +msgid "Unfortunately this enterprise can't be activated via the system."
  2268 +msgstr ""
  2269 +
  2270 +#: app/views/account/blocked.rhtml:6
  2271 +msgid ""
  2272 +"There was a failed atempt of activation and the automated acivation was "
  2273 +"disabled for your security."
  2274 +msgstr ""
  2275 +
  2276 +#: app/views/account/blocked.rhtml:8
  2277 +msgid "We don't have enough information about your enterprise to identify you."
  2278 +msgstr ""
  2279 +
  2280 +#: app/views/account/blocked.rhtml:13
2261 2281 msgid "Your enterprise has been blocked"
2262 2282 msgstr ""
2263 2283  
... ... @@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
2282 2302 msgstr ""
2283 2303  
2284 2304 #: app/views/account/logout_popup.rhtml:4
  2305 +#: app/views/account/activate_enterprise.rhtml:10
2285 2306 #: app/views/profile_editor/edit.rhtml:32
2286 2307 #: app/views/profile_editor/edit.rhtml:35
2287 2308 #: app/views/profile_editor/edit.rhtml:38
... ... @@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
2325 2346 msgstr ""
2326 2347  
2327 2348 #: app/views/account/login_block.rhtml:24
2328   -#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
  2349 +#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
2329 2350 msgid "Log in"
2330 2351 msgstr ""
2331 2352  
... ... @@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
2333 2354 msgid "New user"
2334 2355 msgstr ""
2335 2356  
2336   -#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
  2357 +#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
2337 2358 msgid "Click here to join to this environment, if you is not already an user."
2338 2359 msgstr ""
2339 2360  
2340   -#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
  2361 +#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
2341 2362 msgid "You can recover your password clicking on this link."
2342 2363 msgstr ""
2343 2364  
2344   -#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
  2365 +#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
2345 2366 msgid "I forgot my password!"
2346 2367 msgstr ""
2347 2368  
... ... @@ -2409,44 +2430,43 @@ msgid &quot;&quot;
2409 2430 "changing your password. You should receive it in a few minutes."
2410 2431 msgstr ""
2411 2432  
2412   -#: app/views/account/_signup_form.rhtml:1
2413   -msgid "Register"
  2433 +#: app/views/account/signup.rhtml:1
  2434 +msgid "Signup"
2414 2435 msgstr ""
2415 2436  
2416   -#: app/views/account/_signup_form.rhtml:5
  2437 +#: app/views/account/_signup_form.rhtml:3
2417 2438 msgid ""
2418 2439 "Fill all this fields to join in this environment.<p/>If you forgot your "
2419 2440 "password, do not create a new account, click on the \"<b>I forgot my "
2420 2441 "password!</b>\" link. ;-)"
2421 2442 msgstr ""
2422 2443  
2423   -#: app/views/account/_signup_form.rhtml:11
  2444 +#: app/views/account/_signup_form.rhtml:9
2424 2445 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2425 2446 msgstr ""
2426 2447  
2427   -#: app/views/account/_signup_form.rhtml:16
  2448 +#: app/views/account/_signup_form.rhtml:14
2428 2449 msgid "We'll send you an e-mail to validate your registration."
2429 2450 msgstr ""
2430 2451  
2431   -#: app/views/account/_signup_form.rhtml:20
  2452 +#: app/views/account/_signup_form.rhtml:18
2432 2453 msgid "Do not use a obviously password, but try some unforgettable word."
2433 2454 msgstr ""
2434 2455  
2435   -#: app/views/account/_signup_form.rhtml:24
  2456 +#: app/views/account/_signup_form.rhtml:22
2436 2457 msgid "We need to be sure that you wrote correctly your password."
2437 2458 msgstr ""
2438 2459  
2439   -#: app/views/account/_signup_form.rhtml:35
  2460 +#: app/views/account/_signup_form.rhtml:33
2440 2461 msgid "I accept the terms of use"
2441 2462 msgstr ""
2442 2463  
2443   -#: app/views/account/_signup_form.rhtml:40
  2464 +#: app/views/account/_signup_form.rhtml:45
2444 2465 msgid "Sign up"
2445 2466 msgstr ""
2446 2467  
2447 2468 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
2448   -msgid ""
2449   -"To join on this environment, click on \"<b>I want to participate!</b>\"."
  2469 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
2450 2470 msgstr ""
2451 2471  
2452 2472 #: app/views/account/change_password.rhtml:1
... ... @@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
2479 2499 msgid "You can <a href='%s'>login</a> now."
2480 2500 msgstr ""
2481 2501  
2482   -#: app/views/account/activation_question.rhtml:3
  2502 +#: app/views/account/activation_question.rhtml:6
  2503 +msgid "The year must be between %d and %d"
  2504 +msgstr ""
  2505 +
  2506 +#: app/views/account/activation_question.rhtml:17
  2507 +msgid "An CNPJ have 14 digits"
  2508 +msgstr ""
  2509 +
  2510 +#: app/views/account/activation_question.rhtml:26
  2511 +#: app/views/account/accept_terms.rhtml:2
  2512 +msgid "Enterprise activation"
  2513 +msgstr ""
  2514 +
  2515 +#: app/views/account/activation_question.rhtml:26
  2516 +msgid "part 1 of 2"
  2517 +msgstr ""
  2518 +
  2519 +#: app/views/account/activation_question.rhtml:26
  2520 +msgid "part 1 of 3"
  2521 +msgstr ""
  2522 +
  2523 +#: app/views/account/activation_question.rhtml:29
2483 2524 msgid "What year your enterprise was founded?"
2484 2525 msgstr ""
2485 2526  
2486   -#: app/views/account/activation_question.rhtml:3
  2527 +#: app/views/account/activation_question.rhtml:29
2487 2528 msgid "What is the CNPJ of your enterprise?"
2488 2529 msgstr ""
2489 2530  
2490   -#: app/views/account/activation_question.rhtml:3
  2531 +#: app/views/account/activation_question.rhtml:29
2491 2532 msgid "We need to be sure that this is your enterprise"
2492 2533 msgstr ""
2493 2534  
2494   -#: app/views/account/activation_question.rhtml:8
2495   -msgid "Answer"
  2535 +#: app/views/account/activation_question.rhtml:35
  2536 +#: app/views/account/accept_terms.rhtml:13
  2537 +msgid "Continue"
2496 2538 msgstr ""
2497 2539  
2498   -#: app/views/account/accept_terms.rhtml:4
2499   -msgid "I accept the terms"
  2540 +#: app/views/account/accept_terms.rhtml:2
  2541 +msgid "part 2 of 2"
2500 2542 msgstr ""
2501 2543  
2502   -#: app/views/account/accept_terms.rhtml:5
2503   -msgid "I do NOT accept the terms"
  2544 +#: app/views/account/accept_terms.rhtml:2
  2545 +msgid " part 2 of 3"
  2546 +msgstr ""
  2547 +
  2548 +#: app/views/account/accept_terms.rhtml:10
  2549 +msgid "I read the terms of use and accepted them"
2504 2550 msgstr ""
2505 2551  
2506 2552 #: app/views/account/index_anonymous.rhtml:1
... ... @@ -2526,20 +2572,48 @@ msgid &quot;&quot;
2526 2572 "this environment."
2527 2573 msgstr ""
2528 2574  
2529   -#: app/views/account/login.rhtml:32
  2575 +#: app/views/account/login.rhtml:31
2530 2576 msgid "I want to participate!"
2531 2577 msgstr ""
2532 2578  
2533   -#: app/views/account/activate_enterprise.rhtml:1
2534   -msgid "What user should be the admin of the enterprise page"
  2579 +#: app/views/account/activate_enterprise.rhtml:2
  2580 +msgid "Enterprise activation - part 3 of 3"
2535 2581 msgstr ""
2536 2582  
2537 2583 #: app/views/account/activate_enterprise.rhtml:6
2538   -msgid "Already have user"
  2584 +msgid ""
  2585 +"Well, now for you manage your enterprise you have to associate an individual "
  2586 +"account to the enterprise."
2539 2587 msgstr ""
2540 2588  
2541 2589 #: app/views/account/activate_enterprise.rhtml:7
2542   -msgid "Create new user"
  2590 +msgid "Do you have a user account?"
  2591 +msgstr ""
  2592 +
  2593 +#: app/views/account/activate_enterprise.rhtml:11
  2594 +#: app/views/profile_editor/edit.rhtml:35
  2595 +#: app/views/profile_editor/edit.rhtml:41
  2596 +#: app/views/profile_editor/edit.rhtml:51
  2597 +#: app/views/profile_editor/edit.rhtml:57
  2598 +msgid "No"
  2599 +msgstr ""
  2600 +
  2601 +#: app/views/account/welcome.rhtml:2
  2602 +msgid "Welcome to %s"
  2603 +msgstr ""
  2604 +
  2605 +#: app/views/account/welcome.rhtml:4
  2606 +msgid ""
  2607 +"%s was successfuly activated. Now you may go to your control panel or to the "
  2608 +"control panel of your enterprise"
  2609 +msgstr ""
  2610 +
  2611 +#: app/views/account/welcome.rhtml:7
  2612 +msgid "Go to my control panel"
  2613 +msgstr ""
  2614 +
  2615 +#: app/views/account/welcome.rhtml:8
  2616 +msgid "Go to my enterprise control panel"
2543 2617 msgstr ""
2544 2618  
2545 2619 #: app/views/account/already_activated.rhtml:1
... ... @@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
3416 3490 msgid "Show my website to all internet users"
3417 3491 msgstr ""
3418 3492  
3419   -#: app/views/profile_editor/edit.rhtml:35
3420   -#: app/views/profile_editor/edit.rhtml:41
3421   -#: app/views/profile_editor/edit.rhtml:51
3422   -#: app/views/profile_editor/edit.rhtml:57
3423   -msgid "No"
3424   -msgstr ""
3425   -
3426 3493 #: app/views/profile_editor/edit.rhtml:38
3427 3494 msgid "Show my website to my contacts (persons)"
3428 3495 msgstr ""
... ...
po/noosfero.pot
  Diff comments   View file @f1b610d
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.4\n"
10   -"POT-Creation-Date: 2008-09-12 19:55-0300\n"
  10 +"POT-Creation-Date: 2008-09-18 12:03-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -299,11 +299,11 @@ msgstr &quot;&quot;
299 299 msgid "Move block down"
300 300 msgstr ""
301 301  
302   -#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
  302 +#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
303 303 msgid "Move to the opposite side"
304 304 msgstr ""
305 305  
306   -#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
  306 +#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
307 307 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
308 308 #: app/views/content_viewer/view_page.rhtml:35
309 309 #: app/views/categories/_category.rhtml:8
... ... @@ -312,20 +312,20 @@ msgstr &quot;&quot;
312 312 msgid "Edit"
313 313 msgstr ""
314 314  
315   -#: app/helpers/boxes_helper.rb:169
  315 +#: app/helpers/boxes_helper.rb:170
316 316 msgid "Remove block"
317 317 msgstr ""
318 318  
319   -#: app/helpers/boxes_helper.rb:173
  319 +#: app/helpers/boxes_helper.rb:174
320 320 msgid "Help on this block"
321 321 msgstr ""
322 322  
323   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
  323 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
324 324 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
325 325 msgid "Help"
326 326 msgstr ""
327 327  
328   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
  328 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
329 329 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
330 330 #: app/views/box_organizer/add_block.rhtml:19
331 331 msgid "Close"
... ... @@ -476,7 +476,9 @@ msgstr &quot;&quot;
476 476 #: app/views/admin_panel/site_info.rhtml:11
477 477 #: app/views/shared/_select_categories.rhtml:22
478 478 #: app/views/shared/_change_image.rhtml:2
479   -#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
  479 +#: app/views/account/_login_form.rhtml:22
  480 +#: app/views/account/activation_question.rhtml:34
  481 +#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
480 482 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
481 483 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
482 484 #: app/views/memberships/new_community.rhtml:31
... ... @@ -486,19 +488,19 @@ msgstr &quot;&quot;
486 488 msgid "Cancel"
487 489 msgstr ""
488 490  
489   -#: app/helpers/forms_helper.rb:63
  491 +#: app/helpers/forms_helper.rb:64
490 492 msgid "Select the State"
491 493 msgstr ""
492 494  
493   -#: app/helpers/forms_helper.rb:64
  495 +#: app/helpers/forms_helper.rb:65
494 496 msgid "Select the City"
495 497 msgstr ""
496 498  
497   -#: app/helpers/forms_helper.rb:87
  499 +#: app/helpers/forms_helper.rb:88
498 500 msgid "State:"
499 501 msgstr ""
500 502  
501   -#: app/helpers/forms_helper.rb:90
  503 +#: app/helpers/forms_helper.rb:91
502 504 msgid "City:"
503 505 msgstr ""
504 506  
... ... @@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
774 776 msgstr ""
775 777  
776 778 #: app/models/user.rb:-
777   -msgid "profile"
  779 +msgid "article"
778 780 msgstr ""
779 781  
780 782 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
... ... @@ -787,85 +789,6 @@ msgstr &quot;&quot;
787 789 msgid "Name"
788 790 msgstr ""
789 791  
790   -#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
791   -#: app/models/category.rb:- app/views/cms/view.rhtml:25
792   -msgid "Type"
793   -msgstr ""
794   -
795   -#: app/models/user.rb:- app/models/create_enterprise.rb:3
796   -#: app/views/enterprise_validation/_details.rhtml:23
797   -msgid "Identifier"
798   -msgstr ""
799   -
800   -#: app/models/user.rb:- app/models/task.rb:26
801   -msgid "Active"
802   -msgstr ""
803   -
804   -#: app/models/user.rb:- app/models/create_enterprise.rb:5
805   -#: app/views/enterprise_editor/_form.rhtml:4
806   -#: app/views/enterprise_validation/index.rhtml:14
807   -#: app/views/enterprise_validation/_details.rhtml:7
808   -#: app/views/enterprise_validation/list_processed.rhtml:9
809   -#: app/views/box_organizer/_link_list_block.rhtml:5
810   -msgid "Address"
811   -msgstr ""
812   -
813   -#: app/models/user.rb:- app/models/create_enterprise.rb:6
814   -msgid "Contact phone"
815   -msgstr ""
816   -
817   -#: app/models/user.rb:-
818   -msgid "Home page"
819   -msgstr ""
820   -
821   -#: app/models/user.rb:-
822   -msgid "User"
823   -msgstr ""
824   -
825   -#: app/models/user.rb:- app/models/task.rb:-
826   -msgid "Data"
827   -msgstr ""
828   -
829   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
830   -msgid "Lat"
831   -msgstr ""
832   -
833   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
834   -msgid "Lng"
835   -msgstr ""
836   -
837   -#: app/models/user.rb:-
838   -msgid "Geocode precision"
839   -msgstr ""
840   -
841   -#: app/models/user.rb:-
842   -msgid "Enabled"
843   -msgstr ""
844   -
845   -#: app/models/user.rb:-
846   -msgid "Nickname"
847   -msgstr ""
848   -
849   -#: app/models/user.rb:- app/models/environment.rb:-
850   -msgid "Custom header"
851   -msgstr ""
852   -
853   -#: app/models/user.rb:- app/models/environment.rb:-
854   -msgid "Custom footer"
855   -msgstr ""
856   -
857   -#: app/models/user.rb:- app/models/environment.rb:-
858   -msgid "Theme"
859   -msgstr ""
860   -
861   -#: app/models/user.rb:-
862   -msgid "Public profile"
863   -msgstr ""
864   -
865   -#: app/models/user.rb:-
866   -msgid "article"
867   -msgstr ""
868   -
869 792 #: app/models/user.rb:- app/models/category.rb:-
870 793 msgid "Slug"
871 794 msgstr ""
... ... @@ -904,6 +827,11 @@ msgstr &quot;&quot;
904 827 msgid "Lock version"
905 828 msgstr ""
906 829  
  830 +#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
  831 +#: app/models/category.rb:- app/views/cms/view.rhtml:25
  832 +msgid "Type"
  833 +msgstr ""
  834 +
907 835 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
908 836 msgid "Size"
909 837 msgstr ""
... ... @@ -960,6 +888,80 @@ msgstr &quot;&quot;
960 888 msgid "Reference article"
961 889 msgstr ""
962 890  
  891 +#: app/models/user.rb:-
  892 +msgid "profile"
  893 +msgstr ""
  894 +
  895 +#: app/models/user.rb:- app/models/create_enterprise.rb:3
  896 +#: app/views/enterprise_validation/_details.rhtml:23
  897 +msgid "Identifier"
  898 +msgstr ""
  899 +
  900 +#: app/models/user.rb:- app/models/task.rb:26
  901 +msgid "Active"
  902 +msgstr ""
  903 +
  904 +#: app/models/user.rb:- app/models/create_enterprise.rb:5
  905 +#: app/views/enterprise_editor/_form.rhtml:4
  906 +#: app/views/enterprise_validation/index.rhtml:14
  907 +#: app/views/enterprise_validation/_details.rhtml:7
  908 +#: app/views/enterprise_validation/list_processed.rhtml:9
  909 +#: app/views/box_organizer/_link_list_block.rhtml:5
  910 +msgid "Address"
  911 +msgstr ""
  912 +
  913 +#: app/models/user.rb:- app/models/create_enterprise.rb:6
  914 +msgid "Contact phone"
  915 +msgstr ""
  916 +
  917 +#: app/models/user.rb:-
  918 +msgid "Home page"
  919 +msgstr ""
  920 +
  921 +#: app/models/user.rb:-
  922 +msgid "User"
  923 +msgstr ""
  924 +
  925 +#: app/models/user.rb:- app/models/task.rb:-
  926 +msgid "Data"
  927 +msgstr ""
  928 +
  929 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  930 +msgid "Lat"
  931 +msgstr ""
  932 +
  933 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  934 +msgid "Lng"
  935 +msgstr ""
  936 +
  937 +#: app/models/user.rb:-
  938 +msgid "Geocode precision"
  939 +msgstr ""
  940 +
  941 +#: app/models/user.rb:-
  942 +msgid "Enabled"
  943 +msgstr ""
  944 +
  945 +#: app/models/user.rb:-
  946 +msgid "Nickname"
  947 +msgstr ""
  948 +
  949 +#: app/models/user.rb:- app/models/environment.rb:-
  950 +msgid "Custom header"
  951 +msgstr ""
  952 +
  953 +#: app/models/user.rb:- app/models/environment.rb:-
  954 +msgid "Custom footer"
  955 +msgstr ""
  956 +
  957 +#: app/models/user.rb:- app/models/environment.rb:-
  958 +msgid "Theme"
  959 +msgstr ""
  960 +
  961 +#: app/models/user.rb:-
  962 +msgid "Public profile"
  963 +msgstr ""
  964 +
963 965 #: app/models/user.rb:7
964 966 msgid "Password"
965 967 msgstr ""
... ... @@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
1813 1815 msgid "Disable products for enterprises"
1814 1816 msgstr ""
1815 1817  
1816   -#: app/models/environment.rb:244
  1818 +#: app/models/environment.rb:252
1817 1819 msgid "Only one Virtual Community can be the default one"
1818 1820 msgstr ""
1819 1821  
... ... @@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
2258 2260 msgstr ""
2259 2261  
2260 2262 #: app/views/account/blocked.rhtml:2
  2263 +msgid "This enterprise can't be activated by the system"
  2264 +msgstr ""
  2265 +
  2266 +#: app/views/account/blocked.rhtml:3
  2267 +msgid "Unfortunately this enterprise can't be activated via the system."
  2268 +msgstr ""
  2269 +
  2270 +#: app/views/account/blocked.rhtml:6
  2271 +msgid ""
  2272 +"There was a failed atempt of activation and the automated acivation was "
  2273 +"disabled for your security."
  2274 +msgstr ""
  2275 +
  2276 +#: app/views/account/blocked.rhtml:8
  2277 +msgid "We don't have enough information about your enterprise to identify you."
  2278 +msgstr ""
  2279 +
  2280 +#: app/views/account/blocked.rhtml:13
2261 2281 msgid "Your enterprise has been blocked"
2262 2282 msgstr ""
2263 2283  
... ... @@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
2282 2302 msgstr ""
2283 2303  
2284 2304 #: app/views/account/logout_popup.rhtml:4
  2305 +#: app/views/account/activate_enterprise.rhtml:10
2285 2306 #: app/views/profile_editor/edit.rhtml:32
2286 2307 #: app/views/profile_editor/edit.rhtml:35
2287 2308 #: app/views/profile_editor/edit.rhtml:38
... ... @@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
2325 2346 msgstr ""
2326 2347  
2327 2348 #: app/views/account/login_block.rhtml:24
2328   -#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
  2349 +#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
2329 2350 msgid "Log in"
2330 2351 msgstr ""
2331 2352  
... ... @@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
2333 2354 msgid "New user"
2334 2355 msgstr ""
2335 2356  
2336   -#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
  2357 +#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
2337 2358 msgid "Click here to join to this environment, if you is not already an user."
2338 2359 msgstr ""
2339 2360  
2340   -#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
  2361 +#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
2341 2362 msgid "You can recover your password clicking on this link."
2342 2363 msgstr ""
2343 2364  
2344   -#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
  2365 +#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
2345 2366 msgid "I forgot my password!"
2346 2367 msgstr ""
2347 2368  
... ... @@ -2409,44 +2430,43 @@ msgid &quot;&quot;
2409 2430 "changing your password. You should receive it in a few minutes."
2410 2431 msgstr ""
2411 2432  
2412   -#: app/views/account/_signup_form.rhtml:1
2413   -msgid "Register"
  2433 +#: app/views/account/signup.rhtml:1
  2434 +msgid "Signup"
2414 2435 msgstr ""
2415 2436  
2416   -#: app/views/account/_signup_form.rhtml:5
  2437 +#: app/views/account/_signup_form.rhtml:3
2417 2438 msgid ""
2418 2439 "Fill all this fields to join in this environment.<p/>If you forgot your "
2419 2440 "password, do not create a new account, click on the \"<b>I forgot my "
2420 2441 "password!</b>\" link. ;-)"
2421 2442 msgstr ""
2422 2443  
2423   -#: app/views/account/_signup_form.rhtml:11
  2444 +#: app/views/account/_signup_form.rhtml:9
2424 2445 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2425 2446 msgstr ""
2426 2447  
2427   -#: app/views/account/_signup_form.rhtml:16
  2448 +#: app/views/account/_signup_form.rhtml:14
2428 2449 msgid "We'll send you an e-mail to validate your registration."
2429 2450 msgstr ""
2430 2451  
2431   -#: app/views/account/_signup_form.rhtml:20
  2452 +#: app/views/account/_signup_form.rhtml:18
2432 2453 msgid "Do not use a obviously password, but try some unforgettable word."
2433 2454 msgstr ""
2434 2455  
2435   -#: app/views/account/_signup_form.rhtml:24
  2456 +#: app/views/account/_signup_form.rhtml:22
2436 2457 msgid "We need to be sure that you wrote correctly your password."
2437 2458 msgstr ""
2438 2459  
2439   -#: app/views/account/_signup_form.rhtml:35
  2460 +#: app/views/account/_signup_form.rhtml:33
2440 2461 msgid "I accept the terms of use"
2441 2462 msgstr ""
2442 2463  
2443   -#: app/views/account/_signup_form.rhtml:40
  2464 +#: app/views/account/_signup_form.rhtml:45
2444 2465 msgid "Sign up"
2445 2466 msgstr ""
2446 2467  
2447 2468 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
2448   -msgid ""
2449   -"To join on this environment, click on \"<b>I want to participate!</b>\"."
  2469 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
2450 2470 msgstr ""
2451 2471  
2452 2472 #: app/views/account/change_password.rhtml:1
... ... @@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
2479 2499 msgid "You can <a href='%s'>login</a> now."
2480 2500 msgstr ""
2481 2501  
2482   -#: app/views/account/activation_question.rhtml:3
  2502 +#: app/views/account/activation_question.rhtml:6
  2503 +msgid "The year must be between %d and %d"
  2504 +msgstr ""
  2505 +
  2506 +#: app/views/account/activation_question.rhtml:17
  2507 +msgid "An CNPJ have 14 digits"
  2508 +msgstr ""
  2509 +
  2510 +#: app/views/account/activation_question.rhtml:26
  2511 +#: app/views/account/accept_terms.rhtml:2
  2512 +msgid "Enterprise activation"
  2513 +msgstr ""
  2514 +
  2515 +#: app/views/account/activation_question.rhtml:26
  2516 +msgid "part 1 of 2"
  2517 +msgstr ""
  2518 +
  2519 +#: app/views/account/activation_question.rhtml:26
  2520 +msgid "part 1 of 3"
  2521 +msgstr ""
  2522 +
  2523 +#: app/views/account/activation_question.rhtml:29
2483 2524 msgid "What year your enterprise was founded?"
2484 2525 msgstr ""
2485 2526  
2486   -#: app/views/account/activation_question.rhtml:3
  2527 +#: app/views/account/activation_question.rhtml:29
2487 2528 msgid "What is the CNPJ of your enterprise?"
2488 2529 msgstr ""
2489 2530  
2490   -#: app/views/account/activation_question.rhtml:3
  2531 +#: app/views/account/activation_question.rhtml:29
2491 2532 msgid "We need to be sure that this is your enterprise"
2492 2533 msgstr ""
2493 2534  
2494   -#: app/views/account/activation_question.rhtml:8
2495   -msgid "Answer"
  2535 +#: app/views/account/activation_question.rhtml:35
  2536 +#: app/views/account/accept_terms.rhtml:13
  2537 +msgid "Continue"
2496 2538 msgstr ""
2497 2539  
2498   -#: app/views/account/accept_terms.rhtml:4
2499   -msgid "I accept the terms"
  2540 +#: app/views/account/accept_terms.rhtml:2
  2541 +msgid "part 2 of 2"
2500 2542 msgstr ""
2501 2543  
2502   -#: app/views/account/accept_terms.rhtml:5
2503   -msgid "I do NOT accept the terms"
  2544 +#: app/views/account/accept_terms.rhtml:2
  2545 +msgid " part 2 of 3"
  2546 +msgstr ""
  2547 +
  2548 +#: app/views/account/accept_terms.rhtml:10
  2549 +msgid "I read the terms of use and accepted them"
2504 2550 msgstr ""
2505 2551  
2506 2552 #: app/views/account/index_anonymous.rhtml:1
... ... @@ -2526,20 +2572,48 @@ msgid &quot;&quot;
2526 2572 "this environment."
2527 2573 msgstr ""
2528 2574  
2529   -#: app/views/account/login.rhtml:32
  2575 +#: app/views/account/login.rhtml:31
2530 2576 msgid "I want to participate!"
2531 2577 msgstr ""
2532 2578  
2533   -#: app/views/account/activate_enterprise.rhtml:1
2534   -msgid "What user should be the admin of the enterprise page"
  2579 +#: app/views/account/activate_enterprise.rhtml:2
  2580 +msgid "Enterprise activation - part 3 of 3"
2535 2581 msgstr ""
2536 2582  
2537 2583 #: app/views/account/activate_enterprise.rhtml:6
2538   -msgid "Already have user"
  2584 +msgid ""
  2585 +"Well, now for you manage your enterprise you have to associate an individual "
  2586 +"account to the enterprise."
2539 2587 msgstr ""
2540 2588  
2541 2589 #: app/views/account/activate_enterprise.rhtml:7
2542   -msgid "Create new user"
  2590 +msgid "Do you have a user account?"
  2591 +msgstr ""
  2592 +
  2593 +#: app/views/account/activate_enterprise.rhtml:11
  2594 +#: app/views/profile_editor/edit.rhtml:35
  2595 +#: app/views/profile_editor/edit.rhtml:41
  2596 +#: app/views/profile_editor/edit.rhtml:51
  2597 +#: app/views/profile_editor/edit.rhtml:57
  2598 +msgid "No"
  2599 +msgstr ""
  2600 +
  2601 +#: app/views/account/welcome.rhtml:2
  2602 +msgid "Welcome to %s"
  2603 +msgstr ""
  2604 +
  2605 +#: app/views/account/welcome.rhtml:4
  2606 +msgid ""
  2607 +"%s was successfuly activated. Now you may go to your control panel or to the "
  2608 +"control panel of your enterprise"
  2609 +msgstr ""
  2610 +
  2611 +#: app/views/account/welcome.rhtml:7
  2612 +msgid "Go to my control panel"
  2613 +msgstr ""
  2614 +
  2615 +#: app/views/account/welcome.rhtml:8
  2616 +msgid "Go to my enterprise control panel"
2543 2617 msgstr ""
2544 2618  
2545 2619 #: app/views/account/already_activated.rhtml:1
... ... @@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
3416 3490 msgid "Show my website to all internet users"
3417 3491 msgstr ""
3418 3492  
3419   -#: app/views/profile_editor/edit.rhtml:35
3420   -#: app/views/profile_editor/edit.rhtml:41
3421   -#: app/views/profile_editor/edit.rhtml:51
3422   -#: app/views/profile_editor/edit.rhtml:57
3423   -msgid "No"
3424   -msgstr ""
3425   -
3426 3493 #: app/views/profile_editor/edit.rhtml:38
3427 3494 msgid "Show my website to my contacts (persons)"
3428 3495 msgstr ""
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @f1b610d
... ... @@ -12,8 +12,8 @@
12 12 msgid ""
13 13 msgstr ""
14 14 "Project-Id-Version: noosfero 0.11.4\n"
15   -"POT-Creation-Date: 2008-09-12 19:55-0300\n"
16   -"PO-Revision-Date: 2008-09-12 19:56-0300\n"
  15 +"POT-Creation-Date: 2008-09-18 12:03-0300\n"
  16 +"PO-Revision-Date: 2008-09-18 12:29-0300\n"
17 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 18 "Language-Team: LANGUAGE <LL@li.org>\n"
19 19 "MIME-Version: 1.0\n"
... ... @@ -305,11 +305,11 @@ msgstr &quot;Impossível mover mais abaixo.&quot;
305 305 msgid "Move block down"
306 306 msgstr "Mover para baixo"
307 307  
308   -#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
  308 +#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
309 309 msgid "Move to the opposite side"
310 310 msgstr "Mover para o lado oposto"
311 311  
312   -#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
  312 +#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
313 313 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
314 314 #: app/views/content_viewer/view_page.rhtml:35
315 315 #: app/views/categories/_category.rhtml:8
... ... @@ -318,20 +318,20 @@ msgstr &quot;Mover para o lado oposto&quot;
318 318 msgid "Edit"
319 319 msgstr "Editar"
320 320  
321   -#: app/helpers/boxes_helper.rb:169
  321 +#: app/helpers/boxes_helper.rb:170
322 322 msgid "Remove block"
323 323 msgstr "Remover bloco"
324 324  
325   -#: app/helpers/boxes_helper.rb:173
  325 +#: app/helpers/boxes_helper.rb:174
326 326 msgid "Help on this block"
327 327 msgstr "Ajuda sobre este bloco"
328 328  
329   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
  329 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
330 330 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
331 331 msgid "Help"
332 332 msgstr "Ajuda"
333 333  
334   -#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
  334 +#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
335 335 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
336 336 #: app/views/box_organizer/add_block.rhtml:19
337 337 msgid "Close"
... ... @@ -486,7 +486,9 @@ msgstr &quot;&quot;
486 486 #: app/views/admin_panel/site_info.rhtml:11
487 487 #: app/views/shared/_select_categories.rhtml:22
488 488 #: app/views/shared/_change_image.rhtml:2
489   -#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
  489 +#: app/views/account/_login_form.rhtml:22
  490 +#: app/views/account/activation_question.rhtml:34
  491 +#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
490 492 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
491 493 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
492 494 #: app/views/memberships/new_community.rhtml:31
... ... @@ -496,19 +498,19 @@ msgstr &quot;&quot;
496 498 msgid "Cancel"
497 499 msgstr "Cancelar"
498 500  
499   -#: app/helpers/forms_helper.rb:63
  501 +#: app/helpers/forms_helper.rb:64
500 502 msgid "Select the State"
501 503 msgstr "Selecione o Estado"
502 504  
503   -#: app/helpers/forms_helper.rb:64
  505 +#: app/helpers/forms_helper.rb:65
504 506 msgid "Select the City"
505 507 msgstr "Selecione a Cidade"
506 508  
507   -#: app/helpers/forms_helper.rb:87
  509 +#: app/helpers/forms_helper.rb:88
508 510 msgid "State:"
509 511 msgstr "Estado:"
510 512  
511   -#: app/helpers/forms_helper.rb:90
  513 +#: app/helpers/forms_helper.rb:91
512 514 msgid "City:"
513 515 msgstr "Cidade:"
514 516  
... ... @@ -787,8 +789,8 @@ msgid &quot;Enable email&quot;
787 789 msgstr "Habilitar e-mail"
788 790  
789 791 #: app/models/user.rb:-
790   -msgid "profile"
791   -msgstr "perfil"
  792 +msgid "article"
  793 +msgstr "artigo"
792 794  
793 795 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
794 796 #: app/models/product.rb:- app/models/create_enterprise.rb:4
... ... @@ -800,85 +802,6 @@ msgstr &quot;perfil&quot;
800 802 msgid "Name"
801 803 msgstr "Nome"
802 804  
803   -#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
804   -#: app/models/category.rb:- app/views/cms/view.rhtml:25
805   -msgid "Type"
806   -msgstr "Tipo"
807   -
808   -#: app/models/user.rb:- app/models/create_enterprise.rb:3
809   -#: app/views/enterprise_validation/_details.rhtml:23
810   -msgid "Identifier"
811   -msgstr "Identificador"
812   -
813   -#: app/models/user.rb:- app/models/task.rb:26
814   -msgid "Active"
815   -msgstr "Ativar"
816   -
817   -#: app/models/user.rb:- app/models/create_enterprise.rb:5
818   -#: app/views/enterprise_editor/_form.rhtml:4
819   -#: app/views/enterprise_validation/index.rhtml:14
820   -#: app/views/enterprise_validation/_details.rhtml:7
821   -#: app/views/enterprise_validation/list_processed.rhtml:9
822   -#: app/views/box_organizer/_link_list_block.rhtml:5
823   -msgid "Address"
824   -msgstr "Endereço"
825   -
826   -#: app/models/user.rb:- app/models/create_enterprise.rb:6
827   -msgid "Contact phone"
828   -msgstr "Telefone de contato"
829   -
830   -#: app/models/user.rb:-
831   -msgid "Home page"
832   -msgstr "Página inicial"
833   -
834   -#: app/models/user.rb:-
835   -msgid "User"
836   -msgstr "usuário"
837   -
838   -#: app/models/user.rb:- app/models/task.rb:-
839   -msgid "Data"
840   -msgstr "Dados"
841   -
842   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
843   -msgid "Lat"
844   -msgstr "Lat"
845   -
846   -#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
847   -msgid "Lng"
848   -msgstr "Lng"
849   -
850   -#: app/models/user.rb:-
851   -msgid "Geocode precision"
852   -msgstr "Precisão do georeferenciamento"
853   -
854   -#: app/models/user.rb:-
855   -msgid "Enabled"
856   -msgstr "Habilitado"
857   -
858   -#: app/models/user.rb:-
859   -msgid "Nickname"
860   -msgstr "Apelido"
861   -
862   -#: app/models/user.rb:- app/models/environment.rb:-
863   -msgid "Custom header"
864   -msgstr "Cabeçalho personalizado"
865   -
866   -#: app/models/user.rb:- app/models/environment.rb:-
867   -msgid "Custom footer"
868   -msgstr "Rodapé personalizado"
869   -
870   -#: app/models/user.rb:- app/models/environment.rb:-
871   -msgid "Theme"
872   -msgstr "Tema"
873   -
874   -#: app/models/user.rb:-
875   -msgid "Public profile"
876   -msgstr "Perfil público"
877   -
878   -#: app/models/user.rb:-
879   -msgid "article"
880   -msgstr "artigo"
881   -
882 805 #: app/models/user.rb:- app/models/category.rb:-
883 806 msgid "Slug"
884 807 msgstr "Atalho"
... ... @@ -917,6 +840,11 @@ msgstr &quot;Versão&quot;
917 840 msgid "Lock version"
918 841 msgstr "Trancar a versão"
919 842  
  843 +#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
  844 +#: app/models/category.rb:- app/views/cms/view.rhtml:25
  845 +msgid "Type"
  846 +msgstr "Tipo"
  847 +
920 848 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
921 849 msgid "Size"
922 850 msgstr "Tamanho"
... ... @@ -973,6 +901,80 @@ msgstr &quot;Aceitar comentários&quot;
973 901 msgid "Reference article"
974 902 msgstr "Artigo referenciado"
975 903  
  904 +#: app/models/user.rb:-
  905 +msgid "profile"
  906 +msgstr "perfil"
  907 +
  908 +#: app/models/user.rb:- app/models/create_enterprise.rb:3
  909 +#: app/views/enterprise_validation/_details.rhtml:23
  910 +msgid "Identifier"
  911 +msgstr "Identificador"
  912 +
  913 +#: app/models/user.rb:- app/models/task.rb:26
  914 +msgid "Active"
  915 +msgstr "Ativar"
  916 +
  917 +#: app/models/user.rb:- app/models/create_enterprise.rb:5
  918 +#: app/views/enterprise_editor/_form.rhtml:4
  919 +#: app/views/enterprise_validation/index.rhtml:14
  920 +#: app/views/enterprise_validation/_details.rhtml:7
  921 +#: app/views/enterprise_validation/list_processed.rhtml:9
  922 +#: app/views/box_organizer/_link_list_block.rhtml:5
  923 +msgid "Address"
  924 +msgstr "Endereço"
  925 +
  926 +#: app/models/user.rb:- app/models/create_enterprise.rb:6
  927 +msgid "Contact phone"
  928 +msgstr "Telefone de contato"
  929 +
  930 +#: app/models/user.rb:-
  931 +msgid "Home page"
  932 +msgstr "Página inicial"
  933 +
  934 +#: app/models/user.rb:-
  935 +msgid "User"
  936 +msgstr "usuário"
  937 +
  938 +#: app/models/user.rb:- app/models/task.rb:-
  939 +msgid "Data"
  940 +msgstr "Dados"
  941 +
  942 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  943 +msgid "Lat"
  944 +msgstr "Lat"
  945 +
  946 +#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
  947 +msgid "Lng"
  948 +msgstr "Lng"
  949 +
  950 +#: app/models/user.rb:-
  951 +msgid "Geocode precision"
  952 +msgstr "Precisão do georeferenciamento"
  953 +
  954 +#: app/models/user.rb:-
  955 +msgid "Enabled"
  956 +msgstr "Habilitado"
  957 +
  958 +#: app/models/user.rb:-
  959 +msgid "Nickname"
  960 +msgstr "Apelido"
  961 +
  962 +#: app/models/user.rb:- app/models/environment.rb:-
  963 +msgid "Custom header"
  964 +msgstr "Cabeçalho personalizado"
  965 +
  966 +#: app/models/user.rb:- app/models/environment.rb:-
  967 +msgid "Custom footer"
  968 +msgstr "Rodapé personalizado"
  969 +
  970 +#: app/models/user.rb:- app/models/environment.rb:-
  971 +msgid "Theme"
  972 +msgstr "Tema"
  973 +
  974 +#: app/models/user.rb:-
  975 +msgid "Public profile"
  976 +msgstr "Perfil público"
  977 +
976 978 #: app/models/user.rb:7
977 979 msgid "Password"
978 980 msgstr "Senha"
... ... @@ -1853,7 +1855,7 @@ msgstr &quot;Desabilitar buscar por eventos&quot;
1853 1855 msgid "Disable products for enterprises"
1854 1856 msgstr "Desabilitar produtos para empreendimentos"
1855 1857  
1856   -#: app/models/environment.rb:244
  1858 +#: app/models/environment.rb:252
1857 1859 msgid "Only one Virtual Community can be the default one"
1858 1860 msgstr "Apenas uma comunidade virtual pode ser a padrão"
1859 1861  
... ... @@ -2314,6 +2316,24 @@ msgid &quot;Destroy&quot;
2314 2316 msgstr "Destruir"
2315 2317  
2316 2318 #: app/views/account/blocked.rhtml:2
  2319 +msgid "This enterprise can't be activated by the system"
  2320 +msgstr "Este empreendimento não pôde ser ativado pelo sistema"
  2321 +
  2322 +#: app/views/account/blocked.rhtml:3
  2323 +msgid "Unfortunately this enterprise can't be activated via the system."
  2324 +msgstr "Infelizmente este empreendimento não pode ser ativado pelo sistema."
  2325 +
  2326 +#: app/views/account/blocked.rhtml:6
  2327 +msgid ""
  2328 +"There was a failed atempt of activation and the automated acivation was "
  2329 +"disabled for your security."
  2330 +msgstr "Houve uma tentativa falha de ativação e a ativação automática foi desativada para a sua segurança."
  2331 +
  2332 +#: app/views/account/blocked.rhtml:8
  2333 +msgid "We don't have enough information about your enterprise to identify you."
  2334 +msgstr "Nós não temos informação o suficiente sobre o seu empreendimento para identifica-lo"
  2335 +
  2336 +#: app/views/account/blocked.rhtml:13
2317 2337 msgid "Your enterprise has been blocked"
2318 2338 msgstr "Seu empreendimento foi bloqueado"
2319 2339  
... ... @@ -2341,6 +2361,7 @@ msgid &quot;Are you sure you want to get out?&quot;
2341 2361 msgstr "Tem certeza que quer sair?"
2342 2362  
2343 2363 #: app/views/account/logout_popup.rhtml:4
  2364 +#: app/views/account/activate_enterprise.rhtml:10
2344 2365 #: app/views/profile_editor/edit.rhtml:32
2345 2366 #: app/views/profile_editor/edit.rhtml:35
2346 2367 #: app/views/profile_editor/edit.rhtml:38
... ... @@ -2388,7 +2409,7 @@ msgid &quot;your password is personal, protect it.&quot;
2388 2409 msgstr "sua senha é pessoal, proteja-a."
2389 2410  
2390 2411 #: app/views/account/login_block.rhtml:24
2391   -#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
  2412 +#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
2392 2413 msgid "Log in"
2393 2414 msgstr "Entrar"
2394 2415  
... ... @@ -2396,15 +2417,15 @@ msgstr &quot;Entrar&quot;
2396 2417 msgid "New user"
2397 2418 msgstr "Novo usuário"
2398 2419  
2399   -#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
  2420 +#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
2400 2421 msgid "Click here to join to this environment, if you is not already an user."
2401 2422 msgstr "Clique aqui para entrar neste ambiente, se voce ainda não é um usurio."
2402 2423  
2403   -#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
  2424 +#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
2404 2425 msgid "You can recover your password clicking on this link."
2405 2426 msgstr "Você pode recuperar sua senha clicando neste link."
2406 2427  
2407   -#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
  2428 +#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
2408 2429 msgid "I forgot my password!"
2409 2430 msgstr "Eu esqueci a minha senha!"
2410 2431  
... ... @@ -2476,11 +2497,11 @@ msgstr &quot;&quot;
2476 2497 "Um email foi enviado para seu endereço de e-mail, com as instruções para "
2477 2498 "mudar a sua senha. Você deve recebê-lo em alguns minutos."
2478 2499  
2479   -#: app/views/account/_signup_form.rhtml:1
2480   -msgid "Register"
2481   -msgstr "Registrar"
  2500 +#: app/views/account/signup.rhtml:1
  2501 +msgid "Signup"
  2502 +msgstr "Registre-se"
2482 2503  
2483   -#: app/views/account/_signup_form.rhtml:5
  2504 +#: app/views/account/_signup_form.rhtml:3
2484 2505 msgid ""
2485 2506 "Fill all this fields to join in this environment.<p/>If you forgot your "
2486 2507 "password, do not create a new account, click on the \"<b>I forgot my "
... ... @@ -2490,35 +2511,34 @@ msgstr &quot;&quot;
2490 2511 "senha, não crie uma nova conta, clique no link \"<b>Eu esqueci minha senha!</"
2491 2512 "b>\". ;-)"
2492 2513  
2493   -#: app/views/account/_signup_form.rhtml:11
  2514 +#: app/views/account/_signup_form.rhtml:9
2494 2515 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2495 2516 msgstr ""
2496 2517 "\"Nome de usuário\" é um simples apelido para reconhece-lo neste ambiente."
2497 2518  
2498   -#: app/views/account/_signup_form.rhtml:16
  2519 +#: app/views/account/_signup_form.rhtml:14
2499 2520 msgid "We'll send you an e-mail to validate your registration."
2500 2521 msgstr "Nós iremos lhe enviar um e-mail para validar seu registro."
2501 2522  
2502   -#: app/views/account/_signup_form.rhtml:20
  2523 +#: app/views/account/_signup_form.rhtml:18
2503 2524 msgid "Do not use a obviously password, but try some unforgettable word."
2504 2525 msgstr "Não use uma senha óbvia, mas tente algo de ser lembrado facilmente."
2505 2526  
2506   -#: app/views/account/_signup_form.rhtml:24
  2527 +#: app/views/account/_signup_form.rhtml:22
2507 2528 msgid "We need to be sure that you wrote correctly your password."
2508 2529 msgstr "Nós precisamos ter certeza que você escreveu sua senha corretamente."
2509 2530  
2510   -#: app/views/account/_signup_form.rhtml:35
  2531 +#: app/views/account/_signup_form.rhtml:33
2511 2532 msgid "I accept the terms of use"
2512 2533 msgstr "Eu aceito os termos de uso"
2513 2534  
2514   -#: app/views/account/_signup_form.rhtml:40
  2535 +#: app/views/account/_signup_form.rhtml:45
2515 2536 msgid "Sign up"
2516 2537 msgstr "Registre-se"
2517 2538  
2518 2539 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
2519   -msgid ""
2520   -"To join on this environment, click on \"<b>I want to participate!</b>\"."
2521   -msgstr "Para entrar neste ambiente, clique em \"<b>Quero participar!</b>\"."
  2540 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
  2541 +msgstr "Para entrar neste ambiente, clique em \"<b>Quero ser um usuário!</b>\"."
2522 2542  
2523 2543 #: app/views/account/change_password.rhtml:1
2524 2544 #: app/views/account/change_password.rhtml:14
... ... @@ -2550,29 +2570,55 @@ msgstr &quot;%s, sua nova senha foi alterada com sucesso.&quot;
2550 2570 msgid "You can <a href='%s'>login</a> now."
2551 2571 msgstr "Você pode <a href='%s'>logar</a> agora."
2552 2572  
2553   -#: app/views/account/activation_question.rhtml:3
  2573 +#: app/views/account/activation_question.rhtml:6
  2574 +msgid "The year must be between %d and %d"
  2575 +msgstr "O ano precisa estar entre %d e %d"
  2576 +
  2577 +#: app/views/account/activation_question.rhtml:17
  2578 +msgid "An CNPJ have 14 digits"
  2579 +msgstr "Um CNPJ tem 14 dígitos"
  2580 +
  2581 +#: app/views/account/activation_question.rhtml:26
  2582 +#: app/views/account/accept_terms.rhtml:2
  2583 +msgid "Enterprise activation"
  2584 +msgstr "Ativação de empreendimento"
  2585 +
  2586 +#: app/views/account/activation_question.rhtml:26
  2587 +msgid "part 1 of 2"
  2588 +msgstr "parte 1 de 2"
  2589 +
  2590 +#: app/views/account/activation_question.rhtml:26
  2591 +msgid "part 1 of 3"
  2592 +msgstr "parte 1 de 3"
  2593 +
  2594 +#: app/views/account/activation_question.rhtml:29
2554 2595 msgid "What year your enterprise was founded?"
2555 2596 msgstr "Qual o ano de fundação do seu empreendimento?"
2556 2597  
2557   -#: app/views/account/activation_question.rhtml:3
  2598 +#: app/views/account/activation_question.rhtml:29
2558 2599 msgid "What is the CNPJ of your enterprise?"
2559 2600 msgstr "Qual o CNPJ do seu empreendimento?"
2560 2601  
2561   -#: app/views/account/activation_question.rhtml:3
  2602 +#: app/views/account/activation_question.rhtml:29
2562 2603 msgid "We need to be sure that this is your enterprise"
2563 2604 msgstr "Nós precisamos ter certeza que este empreendimento é seu"
2564 2605  
2565   -#: app/views/account/activation_question.rhtml:8
2566   -msgid "Answer"
2567   -msgstr "Resposta"
  2606 +#: app/views/account/activation_question.rhtml:35
  2607 +#: app/views/account/accept_terms.rhtml:13
  2608 +msgid "Continue"
  2609 +msgstr "Continuar"
2568 2610  
2569   -#: app/views/account/accept_terms.rhtml:4
2570   -msgid "I accept the terms"
2571   -msgstr "Eu aceito os termos"
  2611 +#: app/views/account/accept_terms.rhtml:2
  2612 +msgid "part 2 of 2"
  2613 +msgstr "parte 2 de 2"
2572 2614  
2573   -#: app/views/account/accept_terms.rhtml:5
2574   -msgid "I do NOT accept the terms"
2575   -msgstr "Eu NÃO aceito os termos"
  2615 +#: app/views/account/accept_terms.rhtml:2
  2616 +msgid " part 2 of 3"
  2617 +msgstr "parte 2 de 3"
  2618 +
  2619 +#: app/views/account/accept_terms.rhtml:10
  2620 +msgid "I read the terms of use and accepted them"
  2621 +msgstr "Eu li e aceito os termos de uso"
2576 2622  
2577 2623 #: app/views/account/index_anonymous.rhtml:1
2578 2624 msgid "Identify yourself"
... ... @@ -2601,21 +2647,49 @@ msgstr &quot;&quot;
2601 2647 "Se você ainda não é um usuário, você pode se registrar agora e se tornar um "
2602 2648 "membro desse comunidade virtual."
2603 2649  
2604   -#: app/views/account/login.rhtml:32
  2650 +#: app/views/account/login.rhtml:31
2605 2651 msgid "I want to participate!"
2606 2652 msgstr "Quero participar!"
2607 2653  
2608   -#: app/views/account/activate_enterprise.rhtml:1
2609   -msgid "What user should be the admin of the enterprise page"
2610   -msgstr "Qual usuário deve ser o administrados da página do empreendimento"
  2654 +#: app/views/account/activate_enterprise.rhtml:2
  2655 +msgid "Enterprise activation - part 3 of 3"
  2656 +msgstr "Ativação de empreendimento - parte 3 de 3"
2611 2657  
2612 2658 #: app/views/account/activate_enterprise.rhtml:6
2613   -msgid "Already have user"
2614   -msgstr "Já tenho usuário"
  2659 +msgid ""
  2660 +"Well, now for you manage your enterprise you have to associate an individual "
  2661 +"account to the enterprise."
  2662 +msgstr "Agora para gerenciar seu empreendimento você tem que associar uma conta de usuário individual ao empreendimento"
2615 2663  
2616 2664 #: app/views/account/activate_enterprise.rhtml:7
2617   -msgid "Create new user"
2618   -msgstr "Criar novo usuário"
  2665 +msgid "Do you have a user account?"
  2666 +msgstr "Você já tem uma conta de usuário no sistema?"
  2667 +
  2668 +#: app/views/account/activate_enterprise.rhtml:11
  2669 +#: app/views/profile_editor/edit.rhtml:35
  2670 +#: app/views/profile_editor/edit.rhtml:41
  2671 +#: app/views/profile_editor/edit.rhtml:51
  2672 +#: app/views/profile_editor/edit.rhtml:57
  2673 +msgid "No"
  2674 +msgstr "Não"
  2675 +
  2676 +#: app/views/account/welcome.rhtml:2
  2677 +msgid "Welcome to %s"
  2678 +msgstr "Bem-vindo a %s"
  2679 +
  2680 +#: app/views/account/welcome.rhtml:4
  2681 +msgid ""
  2682 +"%s was successfuly activated. Now you may go to your control panel or to the "
  2683 +"control panel of your enterprise"
  2684 +msgstr "%s foi ativado com sucesso. Agora você pode ir para o seu painel de controle ou ao painel de controle do seu empreendimento"
  2685 +
  2686 +#: app/views/account/welcome.rhtml:7
  2687 +msgid "Go to my control panel"
  2688 +msgstr "Ir para o meu painel de controle"
  2689 +
  2690 +#: app/views/account/welcome.rhtml:8
  2691 +msgid "Go to my enterprise control panel"
  2692 +msgstr "Ir para o painel de controle do meu empreendimento"
2619 2693  
2620 2694 #: app/views/account/already_activated.rhtml:1
2621 2695 msgid "This enterprise is already active"
... ... @@ -3518,13 +3592,6 @@ msgstr &quot;Ativar acesso a Intranet (área restrita somente para mim)&quot;
3518 3592 msgid "Show my website to all internet users"
3519 3593 msgstr "Exibir meu website para todos os usuários da internet"
3520 3594  
3521   -#: app/views/profile_editor/edit.rhtml:35
3522   -#: app/views/profile_editor/edit.rhtml:41
3523   -#: app/views/profile_editor/edit.rhtml:51
3524   -#: app/views/profile_editor/edit.rhtml:57
3525   -msgid "No"
3526   -msgstr "Não"
3527   -
3528 3595 #: app/views/profile_editor/edit.rhtml:38
3529 3596 msgid "Show my website to my contacts (persons)"
3530 3597 msgstr "Exibir meu website para meus contatos (pessoas)"
... ... @@ -4640,6 +4707,27 @@ msgstr &quot;Desenvolvimento Colivre&quot;
4640 4707 msgid "A Ynternet.org project"
4641 4708 msgstr "Um projeto da Ynternet.org"
4642 4709  
  4710 +#~ msgid "Register"
  4711 +#~ msgstr "Registrar"
  4712 +
  4713 +#~ msgid "Answer"
  4714 +#~ msgstr "Resposta"
  4715 +
  4716 +#~ msgid "I accept the terms"
  4717 +#~ msgstr "Eu aceito os termos"
  4718 +
  4719 +#~ msgid "I do NOT accept the terms"
  4720 +#~ msgstr "Eu NÃO aceito os termos"
  4721 +
  4722 +#~ msgid "What user should be the admin of the enterprise page"
  4723 +#~ msgstr "Qual usuário deve ser o administrados da página do empreendimento"
  4724 +
  4725 +#~ msgid "Already have user"
  4726 +#~ msgstr "Já tenho usuário"
  4727 +
  4728 +#~ msgid "Create new user"
  4729 +#~ msgstr "Criar novo usuário"
  4730 +
4643 4731 #~ msgid "Advanced search"
4644 4732 #~ msgstr "Busca avançada"
4645 4733  
... ...
public/designs/icons/default/style.css
  Diff comments   View file @f1b610d
... ... @@ -24,6 +24,7 @@
24 24 .icon-left-disabled { background-image: url(go-left-disabled-HC.gif) }
25 25 .icon-right-disabled { background-image: url(go-right-disabled-HC.gif) }
26 26 .icon-up-red { background-image: url(go-up-red-HC.gif) }
  27 +.icon-forward { background-image: url(go-forward-HC.gif) }
27 28 .icon-search { background-image: url(search-HC.gif) }
28 29 .icon-ok { background-image: url(ok-HC.gif) }
29 30 .icon-login { background-image: url(key-HC.gif) }
... ...
public/designs/themes/ecosol/stylesheets/controller_account.css
  Diff comments   View file @f1b610d
1   -
2 1 .main-block form {
3 2 border: 2px solid #3465A4;
4 3 padding: 10px 5px 10px 20px;
5 4 background: #B8CFE7;
6 5 }
7 6  
  7 +.activation-box {
  8 + border: 2px solid #3465A4;
  9 + padding: 10px 5px 10px 20px;
  10 + background: #B8CFE7;
  11 +}
  12 +
  13 +.activation-box form {
  14 + border: 0px;
  15 + padding: 0px 0px 0px 0px;
  16 +}
  17 +
8 18 .main-block label {
9 19 font-weight: bold;
10 20 }
... ... @@ -13,3 +23,17 @@
13 23 color: #3465A4;
14 24 }
15 25  
  26 +.blocked-warning {
  27 + border: 2px solid #3465A4;
  28 + padding: 10px 5px 10px 20px;
  29 + background: #E86F67;
  30 +}
  31 +
  32 +/* FIXME: remove the important without breaking ie */
  33 +.button {
  34 + * height: auto !IMPORTANT;
  35 +}
  36 +
  37 +.button-bar * {
  38 + position: relative;
  39 +}
... ...
test/functional/account_controller_test.rb
  Diff comments   View file @f1b610d
... ... @@ -486,6 +486,20 @@ class AccountControllerTest &lt; Test::Unit::TestCase
486 486 assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'enterprise_code', :value => '0123456789'}
487 487 end
488 488  
  489 + should 'block who is blocked but directly arrive in the second step' do
  490 + ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
  491 + ent.block
  492 + ent.save
  493 +
  494 + task = mock
  495 + task.expects(:enterprise).returns(ent).at_least_once
  496 + EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
  497 +
  498 + get :accept_terms, :enterprise_code => '0123456789', :answer => 1998
  499 +
  500 + assert_template 'blocked'
  501 + end
  502 +
489 503 # end of enterprise activation tests
490 504  
491 505 should 'not be able to signup while inverse captcha field filled' do
... ...
test/integration/routing_test.rb
  Diff comments   View file @f1b610d
... ... @@ -182,4 +182,8 @@ class RoutingTest &lt; ActionController::IntegrationTest
182 182 assert_routing('/', :controller => 'home', :action => 'index')
183 183 end
184 184  
  185 + def test_myprofile_with_dot
  186 + assert_routing('/myprofile/profile.withdot', :controller => 'profile_editor', :action => 'index', :profile => 'profile.withdot')
  187 + end
  188 +
185 189 end
... ...