ActionItem715: recovered enterprise activation code form 0.10.3

Moises Machado
1 parent 6b8af367
Showing 24 changed files with 1645 additions and 971 deletions Show diff stats
app/controllers/public/account_controller.rb
app/helpers/forms_helper.rb
app/models/environment.rb
app/models/environment_statistics_block.rb
app/views/account/_login_form.rhtml
app/views/account/_signup_form.rhtml
app/views/account/accept_terms.rhtml
app/views/account/activate_enterprise.rhtml
app/views/account/activation_question.rhtml
app/views/account/blocked.rhtml
app/views/account/login.rhtml
app/views/account/signup.rhtml
app/views/account/welcome.rhtml
po/de/noosfero.po
po/es/noosfero.po
po/fr/noosfero.po
po/hy/noosfero.po
po/nl/noosfero.po
po/noosfero.pot
po/pt_BR/noosfero.po
@@ -22,9 +22,9 @@ class AccountController &lt; ApplicationController
         cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
       end
       go_to_user_initial_page if redirect?
-      flash[:notice] = _("Logged in successfully")
+      flash[:notice] = _("Logged in successfully") if redirect?
     else
-      flash[:notice] = _('Incorrect username or password')
+      flash[:notice] = _('Incorrect username or password') if redirect?
       redirect_to :back if redirect?
     end
   end
@@ -144,6 +144,27 @@ class AccountController &lt; ApplicationController
   def accept_terms
     @enterprise = load_enterprise
     @question = @enterprise.question
+
+    if @enterprise.enabled
+      render :action => 'already_activated'
+      return
+    end
+
+    @question = @enterprise.question
+    if !@question || @enterprise.blocked?
+      render :action => 'blocked'
+      return
+    end
+  end
+
+  def accept_terms
+    @enterprise = load_enterprise
+    @question = @enterprise.question
+    if !@question || @enterprise.blocked?
+      render :action => 'blocked'
+      return
+    end
+
     check_answer
     @terms_of_enterprise_use = environment.terms_of_enterprise_use
   end
@@ -159,7 +180,14 @@ class AccountController &lt; ApplicationController
     if activation && user
       activation.requestor = user
       activation.finish
-      redirect_to :controller => 'profile_editor', :action => 'index', :profile => @enterprise.identifier
+      redirect_to :action => 'welcome', :enterprise => @enterprise.id
+    end
+  end
+
+  def welcome
+    @enterprise = Enterprise.find(params[:enterprise])
+    unless @enterprise.enabled? && logged_in?
+      redirect_to :action => 'index'
     end
   end
@@ -40,7 +40,8 @@ module FormsHelper
       the_class << ' ' << html_options[:class]
     end
-    bt_submit = submit_tag(label, html_options.merge(:class => the_class))
+    # FIXME: should be in stylesheet
+    bt_submit = submit_tag(label, html_options.merge(:style => 'height:28px; cursor:pointer', :class => the_class))
     bt_submit + bt_cancel
   end
@@ -154,6 +154,14 @@ class Environment &lt; ActiveRecord::Base
     ! self.settings['terms_of_enterprise_use'].blank?
   end
+  def activation_blocked_text
+    self.settings['activation_blocked_text']
+  end
+  
+  def activation_blocked_text= value
+    self.settings['activation_blocked_text'] = value
+  end
+
   def message_for_disabled_enterprise
     self.settings['message_for_disabled_enterprise']
   end
@@ -19,8 +19,8 @@ class EnvironmentStatisticsBlock &lt; Block
     info = [
       n_('One user', '%{num} users', users) % { :num => users },
-      n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
-      n__('One community', '%{num} communities', communities) % { :num => communities },
+      n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
+      n_('One community', '%{num} communities', communities) % { :num => communities },
     ]
     block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
 <% labelled_form_for :user, @user,
-   :url => login_url,
-   :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| %>
+   :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') },
+   :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| %>
 <%= f.text_field :login,
                  :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
@@ -11,6 +11,12 @@
                      :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password',
                      :help => _('your password is personal, protect it.') %>
+<% if params[:enterprise_code] %>
+  <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+  <%= hidden_field_tag :answer, params[:answer] %>
+  <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
+<% end %>
+
 <% button_bar do %>
   <%= submit_button( 'login', _('Log in') )%>
   <%= lightbox_close_button(_('Cancel')) if lightbox? %>
-<h1><%= _('Register') %></h1>
-
 <%= error_messages_for :user %>
 <% labelled_form_for :user, @user,
    :html => { :help=>_('Fill all this fields to join in this environment.' +
@@ -36,6 +34,13 @@
   </p>
 <% end %>
+<% if params[:enterprise_code] %>
+  <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+  <%= hidden_field_tag :answer, params[:answer] %>
+  <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
+  <%= hidden_field_tag :new_user, true %>
+<% end %>
+
 <% button_bar do %>
   <%= submit_button('save', _('Sign up'), :cancel => {:action => 'index'}, :class => 'icon-menu-login') %>
 <% end %>
-<div id='terms-of-enterprise-use'><%= @terms_of_enterprise_use %></div>
+<div class=activation-box>
+  <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
-<% button_bar do %>
-  <%= button_to(_('I accept the terms'), {:action => 'activate_enterprise', :terms_accepted => true, :enterprise_code => params[:enterprise_code], :answer => params[:answer]} ) %>
-  <%= button_to(_('I do NOT accept the terms'), {:controller => 'home', :action => 'index'} ) %>
-<% end %>
+  <div id='terms-of-enterprise-use'><%= @terms_of_enterprise_use %></div>
+
+  <% form_tag :action => 'activate_enterprise' do %>
+    <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+    <%= hidden_field_tag :answer, params[:answer] %>
+
+    <%= labelled_check_box _('I read the terms of use and accepted them'), :terms_accepted %>
+    <% button_bar do %>
+      <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
+      <%= submit_button 'forward', _('Continue') %>
+    <% end %>
+  <% end %>
+</div>
-<h1><%= _('What user should be the admin of the enterprise page') %></h1>
+<div class='activation-box'>
+<h2><%= _('Enterprise activation - part 3 of 3') %></h2>
 <%= error_messages_for :user %>
+<p><%= _('Well, now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
+<p><%= _('Do you have a user account?') %></p>
+
 <div id="enterprise-activation-create-user-or-login-button">
-  <%= link_to_function _('Already have user') %>
-  <%= link_to_function _('Create new user') %>
+  <%= button_to_function 'login', _('Yes'), "$('enterprise-activation-create-user-form').hide(); $('enterprise-activation-login-form').show()" %> 
+  <%= button_to_function 'add', _('No'),  "$('enterprise-activation-login-form').hide(); $('enterprise-activation-create-user-form').show()" %>
 </div>
-<div id="enterprise-activation-create-user-form">
+<div id="enterprise-activation-create-user-form" style="display: none">
   <%= render :partial => 'signup_form' %>
 </div>
-<div id="enterprise-activation-login-form">
+<div id="enterprise-activation-login-form" style="display: none">
   <%= render :partial => 'login_form' %>
 </div>
+</div>
-<% form_tag :action => 'accept_terms' do %>
+<script language="JavaScript1.2">
+  function check_valid_year(form) {
+    var answer = parseInt(form.answer.value);
+    var val = form.answer.value;
+    if (!answer || (val.length != 4) || val > <%= Time.now.year %> || val < 1900) {
+      alert(<%= (_('The year must be between %d and %d') % [1900, Time.now.year]).inspect %>);
+      return false;
+    } else {
+      return true;
+    }
+  }
-  <%= 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'))) %>
+  function check_valid_cnpj(form) {
+    var answer = parseInt(form.answer.value);
+    var val = form.answer.value;
+    if (!answer || (val.length != 14)) {
+      alert(<%= _('An CNPJ have 14 digits').inspect %>);
+      return false;
+    } else {
+      return true;
+    }
+  }
+</script>
-  <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+<div class='activation-box'>
+  <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
+  <% form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %> 
-  <% button_bar do %>
-    <%= submit_button('answer', _('Answer'), :cancel => {:action => 'index'} ) %>
+    <%= 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'))) %>
+
+    <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+
+    <% button_bar do %>
+      <%= button 'cancel', _('Cancel'), :action => 'index' %>
+      <%= submit_button 'forward', _('Continue') %>
+    <% end %>
   <% end %>
-<% end %>
+</div>
-<%# FIXME: use environment blocked text %>
-<%= _('Your enterprise has been blocked') %>
+<div class='blocked-warning' >
+<center><h1><%= _('This enterprise can\'t be activated by the system') %></h1></center>
+<p><%= _('Unfortunately this enterprise can\'t be activated via the system.') %></p>
+<p>
+<% if @enterprise.blocked? %>
+  <%= _('There was a failed atempt of activation and the automated acivation was disabled for your security.') %>
+<% else %>
+  <%= _('We don\'t have enough information about your enterprise to identify you.') %>
+<% end %>
+</p>
+
+<% if @environment.activation_blocked_text.nil? %>
+  <%= _('Your enterprise has been blocked') %>
+<% else %>
+  <%= @environment.activation_blocked_text %>
+<% end %>
+</div>
@@ -2,26 +2,25 @@
 <h2><%= _('Login') %></h2>
-<% @user = User.new unless @user %>
+<% @user ||= User.new %>
 <% labelled_form_for :user, @user,
    :url => login_url,
-   :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| %>
+   :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| %>
-<%= f.text_field :login,
-                 :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
-                 :help => _('Here goes the nickname that you give on the registration.'),
-                 :onchange => 'this.value = convToValidLogin( this.value )' %>
+  <%= f.text_field :login,
+                   :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
+                   :help => _('Here goes the nickname that you give on the registration.'),
+                   :onchange => 'this.value = convToValidLogin( this.value )' %>
-<%= f.password_field :password,
-                     :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password',
-                     :help => _('your password is personal, protect it.') %>
-
-<% button_bar do %>
-  <%= submit_button( 'login', _('Log in') )%>
-  <%= lightbox_close_button(_('Cancel')) if lightbox? %>
-<% end %>
+  <%= f.password_field :password,
+                       :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password',
+                       :help => _('your password is personal, protect it.') %>
+  <% button_bar do %>
+    <%= submit_button( 'login', _('Log in') )%>
+    <%= lightbox_close_button(_('Cancel')) if lightbox? %>
+  <% end %>
 <% end %>
 <p class="forgot-passwd" help="<%= _('You can recover your password clicking on this link.') %>">
+<h1><%= _('Signup') %></h1>
 <%= render :partial => 'signup_form' %>
@@ -0,0 +1,10 @@
+<% if @enterprise && logged_in? %>
+  <h1><%= _('Welcome to %s') % environment.name %></h1>
+
+  <%= _('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>
+
+  <% button_bar do %>
+    <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_user.person.identifier %> 
+    <%= button 'forward', _('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
+  <% end %>
+<% end %>
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.11.4\n"
-"POT-Creation-Date: 2008-09-12 19:55-0300\n"
+"POT-Creation-Date: 2008-09-18 12:03-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -299,11 +299,11 @@ msgstr &quot;&quot;
 msgid "Move block down"
 msgstr ""
-#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
+#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
 msgid "Move to the opposite side"
 msgstr ""
-#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
 #: app/views/content_viewer/view_page.rhtml:35
 #: app/views/categories/_category.rhtml:8
@@ -312,20 +312,20 @@ msgstr &quot;&quot;
 msgid "Edit"
 msgstr ""
-#: app/helpers/boxes_helper.rb:169
+#: app/helpers/boxes_helper.rb:170
 msgid "Remove block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173
+#: app/helpers/boxes_helper.rb:174
 msgid "Help on this block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
 msgid "Help"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
 #: app/views/box_organizer/add_block.rhtml:19
 msgid "Close"
@@ -476,7 +476,9 @@ msgstr &quot;&quot;
 #: app/views/admin_panel/site_info.rhtml:11
 #: app/views/shared/_select_categories.rhtml:22
 #: app/views/shared/_change_image.rhtml:2
-#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
+#: app/views/account/_login_form.rhtml:22
+#: app/views/account/activation_question.rhtml:34
+#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
 #: app/views/memberships/new_community.rhtml:31
@@ -486,19 +488,19 @@ msgstr &quot;&quot;
 msgid "Cancel"
 msgstr ""
-#: app/helpers/forms_helper.rb:63
+#: app/helpers/forms_helper.rb:64
 msgid "Select the State"
 msgstr ""
-#: app/helpers/forms_helper.rb:64
+#: app/helpers/forms_helper.rb:65
 msgid "Select the City"
 msgstr ""
-#: app/helpers/forms_helper.rb:87
+#: app/helpers/forms_helper.rb:88
 msgid "State:"
 msgstr ""
-#: app/helpers/forms_helper.rb:90
+#: app/helpers/forms_helper.rb:91
 msgid "City:"
 msgstr ""
@@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
 msgstr ""
 #: app/models/user.rb:-
-msgid "profile"
+msgid "article"
 msgstr ""
 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
@@ -787,85 +789,6 @@ msgstr &quot;&quot;
 msgid "Name"
 msgstr ""
-#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
-#: app/models/category.rb:- app/views/cms/view.rhtml:25
-msgid "Type"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:3
-#: app/views/enterprise_validation/_details.rhtml:23
-msgid "Identifier"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:26
-msgid "Active"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:5
-#: app/views/enterprise_editor/_form.rhtml:4
-#: app/views/enterprise_validation/index.rhtml:14
-#: app/views/enterprise_validation/_details.rhtml:7
-#: app/views/enterprise_validation/list_processed.rhtml:9
-#: app/views/box_organizer/_link_list_block.rhtml:5
-msgid "Address"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:6
-msgid "Contact phone"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Home page"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "User"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:-
-msgid "Data"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lat"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lng"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Geocode precision"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Enabled"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Nickname"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom header"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom footer"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Theme"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Public profile"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "article"
-msgstr ""
-
 #: app/models/user.rb:- app/models/category.rb:-
 msgid "Slug"
 msgstr ""
@@ -904,6 +827,11 @@ msgstr &quot;&quot;
 msgid "Lock version"
 msgstr ""
+#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
+#: app/models/category.rb:- app/views/cms/view.rhtml:25
+msgid "Type"
+msgstr ""
+
 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
 msgid "Size"
 msgstr ""
@@ -960,6 +888,80 @@ msgstr &quot;&quot;
 msgid "Reference article"
 msgstr ""
+#: app/models/user.rb:-
+msgid "profile"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
+msgid "Identifier"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:26
+msgid "Active"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
+#: app/views/enterprise_validation/index.rhtml:14
+#: app/views/enterprise_validation/_details.rhtml:7
+#: app/views/enterprise_validation/list_processed.rhtml:9
+#: app/views/box_organizer/_link_list_block.rhtml:5
+msgid "Address"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
+msgid "Contact phone"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Home page"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "User"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:-
+msgid "Data"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lat"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lng"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Geocode precision"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Enabled"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Nickname"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom header"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom footer"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Theme"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Public profile"
+msgstr ""
+
 #: app/models/user.rb:7
 msgid "Password"
 msgstr ""
@@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
 msgid "Disable products for enterprises"
 msgstr ""
-#: app/models/environment.rb:244
+#: app/models/environment.rb:252
 msgid "Only one Virtual Community can be the default one"
 msgstr ""
@@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
 msgstr ""
 #: app/views/account/blocked.rhtml:2
+msgid "This enterprise can't be activated by the system"
+msgstr ""
+
+#: app/views/account/blocked.rhtml:3
+msgid "Unfortunately this enterprise can't be activated via the system."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:6
+msgid ""
+"There was a failed atempt of activation and the automated acivation was "
+"disabled for your security."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:8
+msgid "We don't have enough information about your enterprise to identify you."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:13
 msgid "Your enterprise has been blocked"
 msgstr ""
@@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
 msgstr ""
 #: app/views/account/logout_popup.rhtml:4
+#: app/views/account/activate_enterprise.rhtml:10
 #: app/views/profile_editor/edit.rhtml:32
 #: app/views/profile_editor/edit.rhtml:35
 #: app/views/profile_editor/edit.rhtml:38
@@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
 msgstr ""
 #: app/views/account/login_block.rhtml:24
-#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
+#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
 msgid "Log in"
 msgstr ""
@@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
 msgid "New user"
 msgstr ""
-#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
+#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
 msgid "Click here to join to this environment, if you is not already an user."
 msgstr ""
-#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
+#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
 msgid "You can recover your password clicking on this link."
 msgstr ""
-#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
+#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
 msgid "I forgot my password!"
 msgstr ""
@@ -2409,44 +2430,43 @@ msgid &quot;&quot;
 "changing your password. You should receive it in a few minutes."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:1
-msgid "Register"
+#: app/views/account/signup.rhtml:1
+msgid "Signup"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:5
+#: app/views/account/_signup_form.rhtml:3
 msgid ""
 "Fill all this fields to join in this environment.<p/>If you forgot your "
 "password, do not create a new account, click on the \"<b>I forgot my "
 "password!</b>\" link. ;-)"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:11
+#: app/views/account/_signup_form.rhtml:9
 msgid "\"Username\" is a simple nickname to recognize you on this environment."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:16
+#: app/views/account/_signup_form.rhtml:14
 msgid "We'll send you an e-mail to validate your registration."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:20
+#: app/views/account/_signup_form.rhtml:18
 msgid "Do not use a obviously password, but try some unforgettable word."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:24
+#: app/views/account/_signup_form.rhtml:22
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:35
+#: app/views/account/_signup_form.rhtml:33
 msgid "I accept the terms of use"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:40
+#: app/views/account/_signup_form.rhtml:45
 msgid "Sign up"
 msgstr ""
 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
-msgid ""
-"To join on this environment, click on \"<b>I want to participate!</b>\"."
+msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
 msgstr ""
 #: app/views/account/change_password.rhtml:1
@@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
 msgid "You can <a href='%s'>login</a> now."
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:6
+msgid "The year must be between %d and %d"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:17
+msgid "An CNPJ have 14 digits"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+#: app/views/account/accept_terms.rhtml:2
+msgid "Enterprise activation"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 2"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 3"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:29
 msgid "What year your enterprise was founded?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "What is the CNPJ of your enterprise?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "We need to be sure that this is your enterprise"
 msgstr ""
-#: app/views/account/activation_question.rhtml:8
-msgid "Answer"
+#: app/views/account/activation_question.rhtml:35
+#: app/views/account/accept_terms.rhtml:13
+msgid "Continue"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:4
-msgid "I accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid "part 2 of 2"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:5
-msgid "I do NOT accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid " part 2 of 3"
+msgstr ""
+
+#: app/views/account/accept_terms.rhtml:10
+msgid "I read the terms of use and accepted them"
 msgstr ""
 #: app/views/account/index_anonymous.rhtml:1
@@ -2526,20 +2572,48 @@ msgid &quot;&quot;
 "this environment."
 msgstr ""
-#: app/views/account/login.rhtml:32
+#: app/views/account/login.rhtml:31
 msgid "I want to participate!"
 msgstr ""
-#: app/views/account/activate_enterprise.rhtml:1
-msgid "What user should be the admin of the enterprise page"
+#: app/views/account/activate_enterprise.rhtml:2
+msgid "Enterprise activation - part 3 of 3"
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:6
-msgid "Already have user"
+msgid ""
+"Well, now for you manage your enterprise you have to associate an individual "
+"account to the enterprise."
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:7
-msgid "Create new user"
+msgid "Do you have a user account?"
+msgstr ""
+
+#: app/views/account/activate_enterprise.rhtml:11
+#: app/views/profile_editor/edit.rhtml:35
+#: app/views/profile_editor/edit.rhtml:41
+#: app/views/profile_editor/edit.rhtml:51
+#: app/views/profile_editor/edit.rhtml:57
+msgid "No"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:2
+msgid "Welcome to %s"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:4
+msgid ""
+"%s was successfuly activated. Now you may go to your control panel or to the "
+"control panel of your enterprise"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:7
+msgid "Go to my control panel"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:8
+msgid "Go to my enterprise control panel"
 msgstr ""
 #: app/views/account/already_activated.rhtml:1
@@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
 msgid "Show my website to all internet users"
 msgstr ""
-#: app/views/profile_editor/edit.rhtml:35
-#: app/views/profile_editor/edit.rhtml:41
-#: app/views/profile_editor/edit.rhtml:51
-#: app/views/profile_editor/edit.rhtml:57
-msgid "No"
-msgstr ""
-
 #: app/views/profile_editor/edit.rhtml:38
 msgid "Show my website to my contacts (persons)"
 msgstr ""
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.11.4\n"
-"POT-Creation-Date: 2008-09-12 19:55-0300\n"
+"POT-Creation-Date: 2008-09-18 12:03-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -299,11 +299,11 @@ msgstr &quot;&quot;
 msgid "Move block down"
 msgstr ""
-#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
+#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
 msgid "Move to the opposite side"
 msgstr ""
-#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
 #: app/views/content_viewer/view_page.rhtml:35
 #: app/views/categories/_category.rhtml:8
@@ -312,20 +312,20 @@ msgstr &quot;&quot;
 msgid "Edit"
 msgstr ""
-#: app/helpers/boxes_helper.rb:169
+#: app/helpers/boxes_helper.rb:170
 msgid "Remove block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173
+#: app/helpers/boxes_helper.rb:174
 msgid "Help on this block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
 msgid "Help"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
 #: app/views/box_organizer/add_block.rhtml:19
 msgid "Close"
@@ -476,7 +476,9 @@ msgstr &quot;&quot;
 #: app/views/admin_panel/site_info.rhtml:11
 #: app/views/shared/_select_categories.rhtml:22
 #: app/views/shared/_change_image.rhtml:2
-#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
+#: app/views/account/_login_form.rhtml:22
+#: app/views/account/activation_question.rhtml:34
+#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
 #: app/views/memberships/new_community.rhtml:31
@@ -486,19 +488,19 @@ msgstr &quot;&quot;
 msgid "Cancel"
 msgstr ""
-#: app/helpers/forms_helper.rb:63
+#: app/helpers/forms_helper.rb:64
 msgid "Select the State"
 msgstr ""
-#: app/helpers/forms_helper.rb:64
+#: app/helpers/forms_helper.rb:65
 msgid "Select the City"
 msgstr ""
-#: app/helpers/forms_helper.rb:87
+#: app/helpers/forms_helper.rb:88
 msgid "State:"
 msgstr ""
-#: app/helpers/forms_helper.rb:90
+#: app/helpers/forms_helper.rb:91
 msgid "City:"
 msgstr ""
@@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
 msgstr ""
 #: app/models/user.rb:-
-msgid "profile"
+msgid "article"
 msgstr ""
 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
@@ -787,85 +789,6 @@ msgstr &quot;&quot;
 msgid "Name"
 msgstr ""
-#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
-#: app/models/category.rb:- app/views/cms/view.rhtml:25
-msgid "Type"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:3
-#: app/views/enterprise_validation/_details.rhtml:23
-msgid "Identifier"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:26
-msgid "Active"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:5
-#: app/views/enterprise_editor/_form.rhtml:4
-#: app/views/enterprise_validation/index.rhtml:14
-#: app/views/enterprise_validation/_details.rhtml:7
-#: app/views/enterprise_validation/list_processed.rhtml:9
-#: app/views/box_organizer/_link_list_block.rhtml:5
-msgid "Address"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:6
-msgid "Contact phone"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Home page"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "User"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:-
-msgid "Data"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lat"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lng"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Geocode precision"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Enabled"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Nickname"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom header"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom footer"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Theme"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Public profile"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "article"
-msgstr ""
-
 #: app/models/user.rb:- app/models/category.rb:-
 msgid "Slug"
 msgstr ""
@@ -904,6 +827,11 @@ msgstr &quot;&quot;
 msgid "Lock version"
 msgstr ""
+#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
+#: app/models/category.rb:- app/views/cms/view.rhtml:25
+msgid "Type"
+msgstr ""
+
 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
 msgid "Size"
 msgstr ""
@@ -960,6 +888,80 @@ msgstr &quot;&quot;
 msgid "Reference article"
 msgstr ""
+#: app/models/user.rb:-
+msgid "profile"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
+msgid "Identifier"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:26
+msgid "Active"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
+#: app/views/enterprise_validation/index.rhtml:14
+#: app/views/enterprise_validation/_details.rhtml:7
+#: app/views/enterprise_validation/list_processed.rhtml:9
+#: app/views/box_organizer/_link_list_block.rhtml:5
+msgid "Address"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
+msgid "Contact phone"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Home page"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "User"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:-
+msgid "Data"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lat"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lng"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Geocode precision"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Enabled"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Nickname"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom header"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom footer"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Theme"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Public profile"
+msgstr ""
+
 #: app/models/user.rb:7
 msgid "Password"
 msgstr ""
@@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
 msgid "Disable products for enterprises"
 msgstr ""
-#: app/models/environment.rb:244
+#: app/models/environment.rb:252
 msgid "Only one Virtual Community can be the default one"
 msgstr ""
@@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
 msgstr ""
 #: app/views/account/blocked.rhtml:2
+msgid "This enterprise can't be activated by the system"
+msgstr ""
+
+#: app/views/account/blocked.rhtml:3
+msgid "Unfortunately this enterprise can't be activated via the system."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:6
+msgid ""
+"There was a failed atempt of activation and the automated acivation was "
+"disabled for your security."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:8
+msgid "We don't have enough information about your enterprise to identify you."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:13
 msgid "Your enterprise has been blocked"
 msgstr ""
@@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
 msgstr ""
 #: app/views/account/logout_popup.rhtml:4
+#: app/views/account/activate_enterprise.rhtml:10
 #: app/views/profile_editor/edit.rhtml:32
 #: app/views/profile_editor/edit.rhtml:35
 #: app/views/profile_editor/edit.rhtml:38
@@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
 msgstr ""
 #: app/views/account/login_block.rhtml:24
-#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
+#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
 msgid "Log in"
 msgstr ""
@@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
 msgid "New user"
 msgstr ""
-#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
+#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
 msgid "Click here to join to this environment, if you is not already an user."
 msgstr ""
-#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
+#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
 msgid "You can recover your password clicking on this link."
 msgstr ""
-#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
+#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
 msgid "I forgot my password!"
 msgstr ""
@@ -2409,44 +2430,43 @@ msgid &quot;&quot;
 "changing your password. You should receive it in a few minutes."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:1
-msgid "Register"
+#: app/views/account/signup.rhtml:1
+msgid "Signup"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:5
+#: app/views/account/_signup_form.rhtml:3
 msgid ""
 "Fill all this fields to join in this environment.<p/>If you forgot your "
 "password, do not create a new account, click on the \"<b>I forgot my "
 "password!</b>\" link. ;-)"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:11
+#: app/views/account/_signup_form.rhtml:9
 msgid "\"Username\" is a simple nickname to recognize you on this environment."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:16
+#: app/views/account/_signup_form.rhtml:14
 msgid "We'll send you an e-mail to validate your registration."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:20
+#: app/views/account/_signup_form.rhtml:18
 msgid "Do not use a obviously password, but try some unforgettable word."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:24
+#: app/views/account/_signup_form.rhtml:22
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:35
+#: app/views/account/_signup_form.rhtml:33
 msgid "I accept the terms of use"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:40
+#: app/views/account/_signup_form.rhtml:45
 msgid "Sign up"
 msgstr ""
 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
-msgid ""
-"To join on this environment, click on \"<b>I want to participate!</b>\"."
+msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
 msgstr ""
 #: app/views/account/change_password.rhtml:1
@@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
 msgid "You can <a href='%s'>login</a> now."
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:6
+msgid "The year must be between %d and %d"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:17
+msgid "An CNPJ have 14 digits"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+#: app/views/account/accept_terms.rhtml:2
+msgid "Enterprise activation"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 2"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 3"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:29
 msgid "What year your enterprise was founded?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "What is the CNPJ of your enterprise?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "We need to be sure that this is your enterprise"
 msgstr ""
-#: app/views/account/activation_question.rhtml:8
-msgid "Answer"
+#: app/views/account/activation_question.rhtml:35
+#: app/views/account/accept_terms.rhtml:13
+msgid "Continue"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:4
-msgid "I accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid "part 2 of 2"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:5
-msgid "I do NOT accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid " part 2 of 3"
+msgstr ""
+
+#: app/views/account/accept_terms.rhtml:10
+msgid "I read the terms of use and accepted them"
 msgstr ""
 #: app/views/account/index_anonymous.rhtml:1
@@ -2526,20 +2572,48 @@ msgid &quot;&quot;
 "this environment."
 msgstr ""
-#: app/views/account/login.rhtml:32
+#: app/views/account/login.rhtml:31
 msgid "I want to participate!"
 msgstr ""
-#: app/views/account/activate_enterprise.rhtml:1
-msgid "What user should be the admin of the enterprise page"
+#: app/views/account/activate_enterprise.rhtml:2
+msgid "Enterprise activation - part 3 of 3"
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:6
-msgid "Already have user"
+msgid ""
+"Well, now for you manage your enterprise you have to associate an individual "
+"account to the enterprise."
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:7
-msgid "Create new user"
+msgid "Do you have a user account?"
+msgstr ""
+
+#: app/views/account/activate_enterprise.rhtml:11
+#: app/views/profile_editor/edit.rhtml:35
+#: app/views/profile_editor/edit.rhtml:41
+#: app/views/profile_editor/edit.rhtml:51
+#: app/views/profile_editor/edit.rhtml:57
+msgid "No"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:2
+msgid "Welcome to %s"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:4
+msgid ""
+"%s was successfuly activated. Now you may go to your control panel or to the "
+"control panel of your enterprise"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:7
+msgid "Go to my control panel"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:8
+msgid "Go to my enterprise control panel"
 msgstr ""
 #: app/views/account/already_activated.rhtml:1
@@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
 msgid "Show my website to all internet users"
 msgstr ""
-#: app/views/profile_editor/edit.rhtml:35
-#: app/views/profile_editor/edit.rhtml:41
-#: app/views/profile_editor/edit.rhtml:51
-#: app/views/profile_editor/edit.rhtml:57
-msgid "No"
-msgstr ""
-
 #: app/views/profile_editor/edit.rhtml:38
 msgid "Show my website to my contacts (persons)"
 msgstr ""
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.11.4\n"
-"POT-Creation-Date: 2008-09-12 19:55-0300\n"
+"POT-Creation-Date: 2008-09-18 12:03-0300\n"
 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -314,11 +314,11 @@ msgstr &quot;&quot;
 msgid "Move block down"
 msgstr "Vers le bas"
-#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
+#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
 msgid "Move to the opposite side"
 msgstr ""
-#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
 #: app/views/content_viewer/view_page.rhtml:35
 #: app/views/categories/_category.rhtml:8
@@ -327,20 +327,20 @@ msgstr &quot;&quot;
 msgid "Edit"
 msgstr "Éditer"
-#: app/helpers/boxes_helper.rb:169
+#: app/helpers/boxes_helper.rb:170
 msgid "Remove block"
 msgstr "Effacer le bloc"
-#: app/helpers/boxes_helper.rb:173
+#: app/helpers/boxes_helper.rb:174
 msgid "Help on this block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
 msgid "Help"
 msgstr "Aide"
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
 #: app/views/box_organizer/add_block.rhtml:19
 msgid "Close"
@@ -500,7 +500,9 @@ msgstr &quot;&quot;
 #: app/views/admin_panel/site_info.rhtml:11
 #: app/views/shared/_select_categories.rhtml:22
 #: app/views/shared/_change_image.rhtml:2
-#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
+#: app/views/account/_login_form.rhtml:22
+#: app/views/account/activation_question.rhtml:34
+#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
 #: app/views/memberships/new_community.rhtml:31
@@ -510,22 +512,22 @@ msgstr &quot;&quot;
 msgid "Cancel"
 msgstr "Annuler"
-#: app/helpers/forms_helper.rb:63
+#: app/helpers/forms_helper.rb:64
 #, fuzzy
 msgid "Select the State"
 msgstr "Choisissez une sous-catégorie :"
-#: app/helpers/forms_helper.rb:64
+#: app/helpers/forms_helper.rb:65
 #, fuzzy
 msgid "Select the City"
 msgstr "Choisissez une sous-catégorie :"
-#: app/helpers/forms_helper.rb:87
+#: app/helpers/forms_helper.rb:88
 #, fuzzy
 msgid "State:"
 msgstr "Statut"
-#: app/helpers/forms_helper.rb:90
+#: app/helpers/forms_helper.rb:91
 #, fuzzy
 msgid "City:"
 msgstr "Groupe"
@@ -828,8 +830,8 @@ msgid &quot;Enable email&quot;
 msgstr "Adresse e-mail"
 #: app/models/user.rb:-
-msgid "profile"
-msgstr "profil"
+msgid "article"
+msgstr "article"
 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
 #: app/models/product.rb:- app/models/create_enterprise.rb:4
@@ -841,94 +843,6 @@ msgstr &quot;profil&quot;
 msgid "Name"
 msgstr "Nom"
-#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
-#: app/models/category.rb:- app/views/cms/view.rhtml:25
-msgid "Type"
-msgstr "Type"
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:3
-#: app/views/enterprise_validation/_details.rhtml:23
-msgid "Identifier"
-msgstr "Identifiant"
-
-#: app/models/user.rb:- app/models/task.rb:26
-#, fuzzy
-msgid "Active"
-msgstr "Activer"
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:5
-#: app/views/enterprise_editor/_form.rhtml:4
-#: app/views/enterprise_validation/index.rhtml:14
-#: app/views/enterprise_validation/_details.rhtml:7
-#: app/views/enterprise_validation/list_processed.rhtml:9
-#: app/views/box_organizer/_link_list_block.rhtml:5
-msgid "Address"
-msgstr "Adresse"
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:6
-#, fuzzy
-msgid "Contact phone"
-msgstr "Téléphone de contact :"
-
-#: app/models/user.rb:-
-#, fuzzy
-msgid "Home page"
-msgstr "Accueil"
-
-#: app/models/user.rb:-
-#, fuzzy
-msgid "User"
-msgstr "utilisateur"
-
-#: app/models/user.rb:- app/models/task.rb:-
-#, fuzzy
-msgid "Data"
-msgstr "Données"
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lat"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lng"
-msgstr ""
-
-#: app/models/user.rb:-
-#, fuzzy
-msgid "Geocode precision"
-msgstr "Précision geocode"
-
-#: app/models/user.rb:-
-#, fuzzy
-msgid "Enabled"
-msgstr "Nom"
-
-#: app/models/user.rb:-
-#, fuzzy
-msgid "Nickname"
-msgstr "Nom"
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom header"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom footer"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Theme"
-msgstr ""
-
-#: app/models/user.rb:-
-#, fuzzy
-msgid "Public profile"
-msgstr "Éditer le profil"
-
-#: app/models/user.rb:-
-msgid "article"
-msgstr "article"
-
 #: app/models/user.rb:- app/models/category.rb:-
 msgid "Slug"
 msgstr ""
@@ -974,6 +888,11 @@ msgstr &quot;personne&quot;
 msgid "Lock version"
 msgstr "Verrouiller la version"
+#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
+#: app/models/category.rb:- app/views/cms/view.rhtml:25
+msgid "Type"
+msgstr "Type"
+
 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
 msgid "Size"
 msgstr ""
@@ -1041,6 +960,89 @@ msgstr &quot;Commentaires récents&quot;
 msgid "Reference article"
 msgstr "Articles récents"
+#: app/models/user.rb:-
+msgid "profile"
+msgstr "profil"
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
+msgid "Identifier"
+msgstr "Identifiant"
+
+#: app/models/user.rb:- app/models/task.rb:26
+#, fuzzy
+msgid "Active"
+msgstr "Activer"
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
+#: app/views/enterprise_validation/index.rhtml:14
+#: app/views/enterprise_validation/_details.rhtml:7
+#: app/views/enterprise_validation/list_processed.rhtml:9
+#: app/views/box_organizer/_link_list_block.rhtml:5
+msgid "Address"
+msgstr "Adresse"
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
+#, fuzzy
+msgid "Contact phone"
+msgstr "Téléphone de contact :"
+
+#: app/models/user.rb:-
+#, fuzzy
+msgid "Home page"
+msgstr "Accueil"
+
+#: app/models/user.rb:-
+#, fuzzy
+msgid "User"
+msgstr "utilisateur"
+
+#: app/models/user.rb:- app/models/task.rb:-
+#, fuzzy
+msgid "Data"
+msgstr "Données"
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lat"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lng"
+msgstr ""
+
+#: app/models/user.rb:-
+#, fuzzy
+msgid "Geocode precision"
+msgstr "Précision geocode"
+
+#: app/models/user.rb:-
+#, fuzzy
+msgid "Enabled"
+msgstr "Nom"
+
+#: app/models/user.rb:-
+#, fuzzy
+msgid "Nickname"
+msgstr "Nom"
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom header"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom footer"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Theme"
+msgstr ""
+
+#: app/models/user.rb:-
+#, fuzzy
+msgid "Public profile"
+msgstr "Éditer le profil"
+
 #: app/models/user.rb:7
 msgid "Password"
 msgstr "Mot de passe"
@@ -2001,7 +2003,7 @@ msgstr &quot;Rechercher :&quot;
 msgid "Disable products for enterprises"
 msgstr "Détruire l'entreprise"
-#: app/models/environment.rb:244
+#: app/models/environment.rb:252
 msgid "Only one Virtual Community can be the default one"
 msgstr "Seule une CoVi peut être celle par défaut"
@@ -2474,6 +2476,26 @@ msgid &quot;Destroy&quot;
 msgstr "Détruire"
 #: app/views/account/blocked.rhtml:2
+#, fuzzy
+msgid "This enterprise can't be activated by the system"
+msgstr "Validations d'entreprises en attente"
+
+#: app/views/account/blocked.rhtml:3
+msgid "Unfortunately this enterprise can't be activated via the system."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:6
+msgid ""
+"There was a failed atempt of activation and the automated acivation was "
+"disabled for your security."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:8
+#, fuzzy
+msgid "We don't have enough information about your enterprise to identify you."
+msgstr "Modifier les informations concernant l'entreprise"
+
+#: app/views/account/blocked.rhtml:13
 msgid "Your enterprise has been blocked"
 msgstr ""
@@ -2503,6 +2525,7 @@ msgid &quot;Are you sure you want to get out?&quot;
 msgstr "Êtes-vous sûr(e) de vouloir sortir ?"
 #: app/views/account/logout_popup.rhtml:4
+#: app/views/account/activate_enterprise.rhtml:10
 #: app/views/profile_editor/edit.rhtml:32
 #: app/views/profile_editor/edit.rhtml:35
 #: app/views/profile_editor/edit.rhtml:38
@@ -2551,7 +2574,7 @@ msgid &quot;your password is personal, protect it.&quot;
 msgstr "votre mot de passe est personnel, protégez-le."
 #: app/views/account/login_block.rhtml:24
-#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
+#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
 msgid "Log in"
 msgstr "Se connecter"
@@ -2559,17 +2582,17 @@ msgstr &quot;Se connecter&quot;
 msgid "New user"
 msgstr "Nouvel utilisateur"
-#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
+#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
 msgid "Click here to join to this environment, if you is not already an user."
 msgstr ""
 "Cliquez ici pour rejoindre cette communauté, si vous n'en êtes pas déjà "
 "membre."
-#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
+#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
 msgid "You can recover your password clicking on this link."
 msgstr "Vous pouvez retrouver votre mot de passe en cliquant sur ce lien."
-#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
+#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
 msgid "I forgot my password!"
 msgstr "J'ai oublié mon mot de passe !"
@@ -2643,11 +2666,13 @@ msgstr &quot;&quot;
 "les instructions sur comment modifier votre mot de passe. Vous devriez le "
 "recevoir dans quelques instants."
-#: app/views/account/_signup_form.rhtml:1
-msgid "Register"
+# Je ne suis pas sûr de la distinction "sign up" / "register"
+#: app/views/account/signup.rhtml:1
+#, fuzzy
+msgid "Signup"
 msgstr "S'enregistrer"
-#: app/views/account/_signup_form.rhtml:5
+#: app/views/account/_signup_form.rhtml:3
 msgid ""
 "Fill all this fields to join in this environment.<p/>If you forgot your "
 "password, do not create a new account, click on the \"<b>I forgot my "
@@ -2657,35 +2682,35 @@ msgstr &quot;&quot;
 "oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le "
 "lien «<b>J'ai oublié mon mot de passe</b>»."
-#: app/views/account/_signup_form.rhtml:11
+#: app/views/account/_signup_form.rhtml:9
 msgid "\"Username\" is a simple nickname to recognize you on this environment."
 msgstr ""
 "«Identifiant» est un simple surnom pour vous reconnaître dans cette "
 "communauté."
-#: app/views/account/_signup_form.rhtml:16
+#: app/views/account/_signup_form.rhtml:14
 msgid "We'll send you an e-mail to validate your registration."
 msgstr ""
 "Nous vous enverrons un courrier électronique pour valider votre "
 "enregistrement."
-#: app/views/account/_signup_form.rhtml:20
+#: app/views/account/_signup_form.rhtml:18
 msgid "Do not use a obviously password, but try some unforgettable word."
 msgstr ""
 "Ne choisissez pas un mot de passe évident, mais essayez de trouver quelque "
 "chose que vous n'oublierez pas."
-#: app/views/account/_signup_form.rhtml:24
+#: app/views/account/_signup_form.rhtml:22
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
 "Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
-#: app/views/account/_signup_form.rhtml:35
+#: app/views/account/_signup_form.rhtml:33
 msgid "I accept the terms of use"
 msgstr "J'accepte les conditions d'utilisation"
 # Je ne suis pas sûr de la distinction "sign up" / "register"
-#: app/views/account/_signup_form.rhtml:40
+#: app/views/account/_signup_form.rhtml:45
 #, fuzzy
 msgid "Sign up"
 msgstr "S'enregistrer"
@@ -2695,8 +2720,7 @@ msgstr &quot;S&#39;enregistrer&quot;
 #
 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
 #, fuzzy
-msgid ""
-"To join on this environment, click on \"<b>I want to participate!</b>\"."
+msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
 msgstr ""
 "Pour rejoindre cette communauté, cliquez sur  \"<b>Je rejoins cette "
 "communauté !</b>\"."
@@ -2731,33 +2755,59 @@ msgstr &quot;%s, votre nouveau mot de passe a bien été installé.&quot;
 msgid "You can <a href='%s'>login</a> now."
 msgstr "Maintenant, vous pouvez vous <a href='%s'>commecter</a>."
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:6
+msgid "The year must be between %d and %d"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:17
+msgid "An CNPJ have 14 digits"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+#: app/views/account/accept_terms.rhtml:2
+#, fuzzy
+msgid "Enterprise activation"
+msgstr "Validation d'entreprises"
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 2"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 3"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:29
 msgid "What year your enterprise was founded?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "What is the CNPJ of your enterprise?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 #, fuzzy
 msgid "We need to be sure that this is your enterprise"
 msgstr ""
 "Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
-#: app/views/account/activation_question.rhtml:8
+#: app/views/account/activation_question.rhtml:35
+#: app/views/account/accept_terms.rhtml:13
 #, fuzzy
-msgid "Answer"
-msgstr "utilisateur"
+msgid "Continue"
+msgstr "Groupes"
-#: app/views/account/accept_terms.rhtml:4
-#, fuzzy
-msgid "I accept the terms"
-msgstr "J'accepte les conditions d'utilisation"
+#: app/views/account/accept_terms.rhtml:2
+msgid "part 2 of 2"
+msgstr ""
+
+#: app/views/account/accept_terms.rhtml:2
+msgid " part 2 of 3"
+msgstr ""
-#: app/views/account/accept_terms.rhtml:5
+#: app/views/account/accept_terms.rhtml:10
 #, fuzzy
-msgid "I do NOT accept the terms"
+msgid "I read the terms of use and accepted them"
 msgstr "J'accepte les conditions d'utilisation"
 #: app/views/account/index_anonymous.rhtml:1
@@ -2787,23 +2837,53 @@ msgstr &quot;&quot;
 "Si vous ne n'avez pas déjà fait, vous pouvez vous enregistrer dès à présent "
 "pour devenir membre de cette communauté."
-#: app/views/account/login.rhtml:32
+#: app/views/account/login.rhtml:31
 #, fuzzy
 msgid "I want to participate!"
 msgstr "Je rejoins cette communauté !"
-#: app/views/account/activate_enterprise.rhtml:1
-msgid "What user should be the admin of the enterprise page"
-msgstr ""
+#: app/views/account/activate_enterprise.rhtml:2
+#, fuzzy
+msgid "Enterprise activation - part 3 of 3"
+msgstr "Validation d'entreprises"
 #: app/views/account/activate_enterprise.rhtml:6
-msgid "Already have user"
+msgid ""
+"Well, now for you manage your enterprise you have to associate an individual "
+"account to the enterprise."
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:7
+msgid "Do you have a user account?"
+msgstr ""
+
+#: app/views/account/activate_enterprise.rhtml:11
+#: app/views/profile_editor/edit.rhtml:35
+#: app/views/profile_editor/edit.rhtml:41
+#: app/views/profile_editor/edit.rhtml:51
+#: app/views/profile_editor/edit.rhtml:57
+msgid "No"
+msgstr "Non"
+
+#: app/views/account/welcome.rhtml:2
+msgid "Welcome to %s"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:4
+msgid ""
+"%s was successfuly activated. Now you may go to your control panel or to the "
+"control panel of your enterprise"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:7
 #, fuzzy
-msgid "Create new user"
-msgstr "Créer un nouveau groupe"
+msgid "Go to my control panel"
+msgstr "Retour au panneau de contrôle"
+
+#: app/views/account/welcome.rhtml:8
+#, fuzzy
+msgid "Go to my enterprise control panel"
+msgstr "Retourner au panneau de contrôle."
 #: app/views/account/already_activated.rhtml:1
 #, fuzzy
@@ -3771,13 +3851,6 @@ msgstr &quot;&quot;
 msgid "Show my website to all internet users"
 msgstr ""
-#: app/views/profile_editor/edit.rhtml:35
-#: app/views/profile_editor/edit.rhtml:41
-#: app/views/profile_editor/edit.rhtml:51
-#: app/views/profile_editor/edit.rhtml:57
-msgid "No"
-msgstr "Non"
-
 #: app/views/profile_editor/edit.rhtml:38
 msgid "Show my website to my contacts (persons)"
 msgstr ""
@@ -5003,6 +5076,25 @@ msgstr &quot;Développé par Colivre&quot;
 msgid "A Ynternet.org project"
 msgstr ""
+#~ msgid "Register"
+#~ msgstr "S'enregistrer"
+
+#, fuzzy
+#~ msgid "Answer"
+#~ msgstr "utilisateur"
+
+#, fuzzy
+#~ msgid "I accept the terms"
+#~ msgstr "J'accepte les conditions d'utilisation"
+
+#, fuzzy
+#~ msgid "I do NOT accept the terms"
+#~ msgstr "J'accepte les conditions d'utilisation"
+
+#, fuzzy
+#~ msgid "Create new user"
+#~ msgstr "Créer un nouveau groupe"
+
 #~ msgid "User|Password"
 #~ msgstr "Mot de passe"
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.11.4\n"
-"POT-Creation-Date: 2008-09-12 19:55-0300\n"
+"POT-Creation-Date: 2008-09-18 12:03-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -299,11 +299,11 @@ msgstr &quot;&quot;
 msgid "Move block down"
 msgstr ""
-#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
+#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
 msgid "Move to the opposite side"
 msgstr ""
-#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
 #: app/views/content_viewer/view_page.rhtml:35
 #: app/views/categories/_category.rhtml:8
@@ -312,20 +312,20 @@ msgstr &quot;&quot;
 msgid "Edit"
 msgstr ""
-#: app/helpers/boxes_helper.rb:169
+#: app/helpers/boxes_helper.rb:170
 msgid "Remove block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173
+#: app/helpers/boxes_helper.rb:174
 msgid "Help on this block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
 msgid "Help"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
 #: app/views/box_organizer/add_block.rhtml:19
 msgid "Close"
@@ -476,7 +476,9 @@ msgstr &quot;&quot;
 #: app/views/admin_panel/site_info.rhtml:11
 #: app/views/shared/_select_categories.rhtml:22
 #: app/views/shared/_change_image.rhtml:2
-#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
+#: app/views/account/_login_form.rhtml:22
+#: app/views/account/activation_question.rhtml:34
+#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
 #: app/views/memberships/new_community.rhtml:31
@@ -486,19 +488,19 @@ msgstr &quot;&quot;
 msgid "Cancel"
 msgstr ""
-#: app/helpers/forms_helper.rb:63
+#: app/helpers/forms_helper.rb:64
 msgid "Select the State"
 msgstr ""
-#: app/helpers/forms_helper.rb:64
+#: app/helpers/forms_helper.rb:65
 msgid "Select the City"
 msgstr ""
-#: app/helpers/forms_helper.rb:87
+#: app/helpers/forms_helper.rb:88
 msgid "State:"
 msgstr ""
-#: app/helpers/forms_helper.rb:90
+#: app/helpers/forms_helper.rb:91
 msgid "City:"
 msgstr ""
@@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
 msgstr ""
 #: app/models/user.rb:-
-msgid "profile"
+msgid "article"
 msgstr ""
 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
@@ -787,85 +789,6 @@ msgstr &quot;&quot;
 msgid "Name"
 msgstr ""
-#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
-#: app/models/category.rb:- app/views/cms/view.rhtml:25
-msgid "Type"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:3
-#: app/views/enterprise_validation/_details.rhtml:23
-msgid "Identifier"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:26
-msgid "Active"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:5
-#: app/views/enterprise_editor/_form.rhtml:4
-#: app/views/enterprise_validation/index.rhtml:14
-#: app/views/enterprise_validation/_details.rhtml:7
-#: app/views/enterprise_validation/list_processed.rhtml:9
-#: app/views/box_organizer/_link_list_block.rhtml:5
-msgid "Address"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:6
-msgid "Contact phone"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Home page"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "User"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:-
-msgid "Data"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lat"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lng"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Geocode precision"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Enabled"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Nickname"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom header"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom footer"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Theme"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Public profile"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "article"
-msgstr ""
-
 #: app/models/user.rb:- app/models/category.rb:-
 msgid "Slug"
 msgstr ""
@@ -904,6 +827,11 @@ msgstr &quot;&quot;
 msgid "Lock version"
 msgstr ""
+#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
+#: app/models/category.rb:- app/views/cms/view.rhtml:25
+msgid "Type"
+msgstr ""
+
 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
 msgid "Size"
 msgstr ""
@@ -960,6 +888,80 @@ msgstr &quot;&quot;
 msgid "Reference article"
 msgstr ""
+#: app/models/user.rb:-
+msgid "profile"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
+msgid "Identifier"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:26
+msgid "Active"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
+#: app/views/enterprise_validation/index.rhtml:14
+#: app/views/enterprise_validation/_details.rhtml:7
+#: app/views/enterprise_validation/list_processed.rhtml:9
+#: app/views/box_organizer/_link_list_block.rhtml:5
+msgid "Address"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
+msgid "Contact phone"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Home page"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "User"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:-
+msgid "Data"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lat"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lng"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Geocode precision"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Enabled"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Nickname"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom header"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom footer"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Theme"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Public profile"
+msgstr ""
+
 #: app/models/user.rb:7
 msgid "Password"
 msgstr ""
@@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
 msgid "Disable products for enterprises"
 msgstr ""
-#: app/models/environment.rb:244
+#: app/models/environment.rb:252
 msgid "Only one Virtual Community can be the default one"
 msgstr ""
@@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
 msgstr ""
 #: app/views/account/blocked.rhtml:2
+msgid "This enterprise can't be activated by the system"
+msgstr ""
+
+#: app/views/account/blocked.rhtml:3
+msgid "Unfortunately this enterprise can't be activated via the system."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:6
+msgid ""
+"There was a failed atempt of activation and the automated acivation was "
+"disabled for your security."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:8
+msgid "We don't have enough information about your enterprise to identify you."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:13
 msgid "Your enterprise has been blocked"
 msgstr ""
@@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
 msgstr ""
 #: app/views/account/logout_popup.rhtml:4
+#: app/views/account/activate_enterprise.rhtml:10
 #: app/views/profile_editor/edit.rhtml:32
 #: app/views/profile_editor/edit.rhtml:35
 #: app/views/profile_editor/edit.rhtml:38
@@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
 msgstr ""
 #: app/views/account/login_block.rhtml:24
-#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
+#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
 msgid "Log in"
 msgstr ""
@@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
 msgid "New user"
 msgstr ""
-#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
+#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
 msgid "Click here to join to this environment, if you is not already an user."
 msgstr ""
-#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
+#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
 msgid "You can recover your password clicking on this link."
 msgstr ""
-#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
+#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
 msgid "I forgot my password!"
 msgstr ""
@@ -2409,44 +2430,43 @@ msgid &quot;&quot;
 "changing your password. You should receive it in a few minutes."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:1
-msgid "Register"
+#: app/views/account/signup.rhtml:1
+msgid "Signup"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:5
+#: app/views/account/_signup_form.rhtml:3
 msgid ""
 "Fill all this fields to join in this environment.<p/>If you forgot your "
 "password, do not create a new account, click on the \"<b>I forgot my "
 "password!</b>\" link. ;-)"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:11
+#: app/views/account/_signup_form.rhtml:9
 msgid "\"Username\" is a simple nickname to recognize you on this environment."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:16
+#: app/views/account/_signup_form.rhtml:14
 msgid "We'll send you an e-mail to validate your registration."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:20
+#: app/views/account/_signup_form.rhtml:18
 msgid "Do not use a obviously password, but try some unforgettable word."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:24
+#: app/views/account/_signup_form.rhtml:22
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:35
+#: app/views/account/_signup_form.rhtml:33
 msgid "I accept the terms of use"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:40
+#: app/views/account/_signup_form.rhtml:45
 msgid "Sign up"
 msgstr ""
 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
-msgid ""
-"To join on this environment, click on \"<b>I want to participate!</b>\"."
+msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
 msgstr ""
 #: app/views/account/change_password.rhtml:1
@@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
 msgid "You can <a href='%s'>login</a> now."
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:6
+msgid "The year must be between %d and %d"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:17
+msgid "An CNPJ have 14 digits"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+#: app/views/account/accept_terms.rhtml:2
+msgid "Enterprise activation"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 2"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 3"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:29
 msgid "What year your enterprise was founded?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "What is the CNPJ of your enterprise?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "We need to be sure that this is your enterprise"
 msgstr ""
-#: app/views/account/activation_question.rhtml:8
-msgid "Answer"
+#: app/views/account/activation_question.rhtml:35
+#: app/views/account/accept_terms.rhtml:13
+msgid "Continue"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:4
-msgid "I accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid "part 2 of 2"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:5
-msgid "I do NOT accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid " part 2 of 3"
+msgstr ""
+
+#: app/views/account/accept_terms.rhtml:10
+msgid "I read the terms of use and accepted them"
 msgstr ""
 #: app/views/account/index_anonymous.rhtml:1
@@ -2526,20 +2572,48 @@ msgid &quot;&quot;
 "this environment."
 msgstr ""
-#: app/views/account/login.rhtml:32
+#: app/views/account/login.rhtml:31
 msgid "I want to participate!"
 msgstr ""
-#: app/views/account/activate_enterprise.rhtml:1
-msgid "What user should be the admin of the enterprise page"
+#: app/views/account/activate_enterprise.rhtml:2
+msgid "Enterprise activation - part 3 of 3"
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:6
-msgid "Already have user"
+msgid ""
+"Well, now for you manage your enterprise you have to associate an individual "
+"account to the enterprise."
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:7
-msgid "Create new user"
+msgid "Do you have a user account?"
+msgstr ""
+
+#: app/views/account/activate_enterprise.rhtml:11
+#: app/views/profile_editor/edit.rhtml:35
+#: app/views/profile_editor/edit.rhtml:41
+#: app/views/profile_editor/edit.rhtml:51
+#: app/views/profile_editor/edit.rhtml:57
+msgid "No"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:2
+msgid "Welcome to %s"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:4
+msgid ""
+"%s was successfuly activated. Now you may go to your control panel or to the "
+"control panel of your enterprise"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:7
+msgid "Go to my control panel"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:8
+msgid "Go to my enterprise control panel"
 msgstr ""
 #: app/views/account/already_activated.rhtml:1
@@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
 msgid "Show my website to all internet users"
 msgstr ""
-#: app/views/profile_editor/edit.rhtml:35
-#: app/views/profile_editor/edit.rhtml:41
-#: app/views/profile_editor/edit.rhtml:51
-#: app/views/profile_editor/edit.rhtml:57
-msgid "No"
-msgstr ""
-
 #: app/views/profile_editor/edit.rhtml:38
 msgid "Show my website to my contacts (persons)"
 msgstr ""
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.11.4\n"
-"POT-Creation-Date: 2008-09-12 19:55-0300\n"
+"POT-Creation-Date: 2008-09-18 12:03-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -299,11 +299,11 @@ msgstr &quot;&quot;
 msgid "Move block down"
 msgstr ""
-#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
+#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
 msgid "Move to the opposite side"
 msgstr ""
-#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
 #: app/views/content_viewer/view_page.rhtml:35
 #: app/views/categories/_category.rhtml:8
@@ -312,20 +312,20 @@ msgstr &quot;&quot;
 msgid "Edit"
 msgstr ""
-#: app/helpers/boxes_helper.rb:169
+#: app/helpers/boxes_helper.rb:170
 msgid "Remove block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173
+#: app/helpers/boxes_helper.rb:174
 msgid "Help on this block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
 msgid "Help"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
 #: app/views/box_organizer/add_block.rhtml:19
 msgid "Close"
@@ -476,7 +476,9 @@ msgstr &quot;&quot;
 #: app/views/admin_panel/site_info.rhtml:11
 #: app/views/shared/_select_categories.rhtml:22
 #: app/views/shared/_change_image.rhtml:2
-#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
+#: app/views/account/_login_form.rhtml:22
+#: app/views/account/activation_question.rhtml:34
+#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
 #: app/views/memberships/new_community.rhtml:31
@@ -486,19 +488,19 @@ msgstr &quot;&quot;
 msgid "Cancel"
 msgstr ""
-#: app/helpers/forms_helper.rb:63
+#: app/helpers/forms_helper.rb:64
 msgid "Select the State"
 msgstr ""
-#: app/helpers/forms_helper.rb:64
+#: app/helpers/forms_helper.rb:65
 msgid "Select the City"
 msgstr ""
-#: app/helpers/forms_helper.rb:87
+#: app/helpers/forms_helper.rb:88
 msgid "State:"
 msgstr ""
-#: app/helpers/forms_helper.rb:90
+#: app/helpers/forms_helper.rb:91
 msgid "City:"
 msgstr ""
@@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
 msgstr ""
 #: app/models/user.rb:-
-msgid "profile"
+msgid "article"
 msgstr ""
 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
@@ -787,85 +789,6 @@ msgstr &quot;&quot;
 msgid "Name"
 msgstr ""
-#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
-#: app/models/category.rb:- app/views/cms/view.rhtml:25
-msgid "Type"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:3
-#: app/views/enterprise_validation/_details.rhtml:23
-msgid "Identifier"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:26
-msgid "Active"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:5
-#: app/views/enterprise_editor/_form.rhtml:4
-#: app/views/enterprise_validation/index.rhtml:14
-#: app/views/enterprise_validation/_details.rhtml:7
-#: app/views/enterprise_validation/list_processed.rhtml:9
-#: app/views/box_organizer/_link_list_block.rhtml:5
-msgid "Address"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:6
-msgid "Contact phone"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Home page"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "User"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:-
-msgid "Data"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lat"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lng"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Geocode precision"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Enabled"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Nickname"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom header"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom footer"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Theme"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Public profile"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "article"
-msgstr ""
-
 #: app/models/user.rb:- app/models/category.rb:-
 msgid "Slug"
 msgstr ""
@@ -904,6 +827,11 @@ msgstr &quot;&quot;
 msgid "Lock version"
 msgstr ""
+#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
+#: app/models/category.rb:- app/views/cms/view.rhtml:25
+msgid "Type"
+msgstr ""
+
 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
 msgid "Size"
 msgstr ""
@@ -960,6 +888,80 @@ msgstr &quot;&quot;
 msgid "Reference article"
 msgstr ""
+#: app/models/user.rb:-
+msgid "profile"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
+msgid "Identifier"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:26
+msgid "Active"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
+#: app/views/enterprise_validation/index.rhtml:14
+#: app/views/enterprise_validation/_details.rhtml:7
+#: app/views/enterprise_validation/list_processed.rhtml:9
+#: app/views/box_organizer/_link_list_block.rhtml:5
+msgid "Address"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
+msgid "Contact phone"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Home page"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "User"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:-
+msgid "Data"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lat"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lng"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Geocode precision"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Enabled"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Nickname"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom header"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom footer"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Theme"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Public profile"
+msgstr ""
+
 #: app/models/user.rb:7
 msgid "Password"
 msgstr ""
@@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
 msgid "Disable products for enterprises"
 msgstr ""
-#: app/models/environment.rb:244
+#: app/models/environment.rb:252
 msgid "Only one Virtual Community can be the default one"
 msgstr ""
@@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
 msgstr ""
 #: app/views/account/blocked.rhtml:2
+msgid "This enterprise can't be activated by the system"
+msgstr ""
+
+#: app/views/account/blocked.rhtml:3
+msgid "Unfortunately this enterprise can't be activated via the system."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:6
+msgid ""
+"There was a failed atempt of activation and the automated acivation was "
+"disabled for your security."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:8
+msgid "We don't have enough information about your enterprise to identify you."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:13
 msgid "Your enterprise has been blocked"
 msgstr ""
@@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
 msgstr ""
 #: app/views/account/logout_popup.rhtml:4
+#: app/views/account/activate_enterprise.rhtml:10
 #: app/views/profile_editor/edit.rhtml:32
 #: app/views/profile_editor/edit.rhtml:35
 #: app/views/profile_editor/edit.rhtml:38
@@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
 msgstr ""
 #: app/views/account/login_block.rhtml:24
-#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
+#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
 msgid "Log in"
 msgstr ""
@@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
 msgid "New user"
 msgstr ""
-#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
+#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
 msgid "Click here to join to this environment, if you is not already an user."
 msgstr ""
-#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
+#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
 msgid "You can recover your password clicking on this link."
 msgstr ""
-#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
+#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
 msgid "I forgot my password!"
 msgstr ""
@@ -2409,44 +2430,43 @@ msgid &quot;&quot;
 "changing your password. You should receive it in a few minutes."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:1
-msgid "Register"
+#: app/views/account/signup.rhtml:1
+msgid "Signup"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:5
+#: app/views/account/_signup_form.rhtml:3
 msgid ""
 "Fill all this fields to join in this environment.<p/>If you forgot your "
 "password, do not create a new account, click on the \"<b>I forgot my "
 "password!</b>\" link. ;-)"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:11
+#: app/views/account/_signup_form.rhtml:9
 msgid "\"Username\" is a simple nickname to recognize you on this environment."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:16
+#: app/views/account/_signup_form.rhtml:14
 msgid "We'll send you an e-mail to validate your registration."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:20
+#: app/views/account/_signup_form.rhtml:18
 msgid "Do not use a obviously password, but try some unforgettable word."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:24
+#: app/views/account/_signup_form.rhtml:22
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:35
+#: app/views/account/_signup_form.rhtml:33
 msgid "I accept the terms of use"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:40
+#: app/views/account/_signup_form.rhtml:45
 msgid "Sign up"
 msgstr ""
 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
-msgid ""
-"To join on this environment, click on \"<b>I want to participate!</b>\"."
+msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
 msgstr ""
 #: app/views/account/change_password.rhtml:1
@@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
 msgid "You can <a href='%s'>login</a> now."
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:6
+msgid "The year must be between %d and %d"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:17
+msgid "An CNPJ have 14 digits"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+#: app/views/account/accept_terms.rhtml:2
+msgid "Enterprise activation"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 2"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 3"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:29
 msgid "What year your enterprise was founded?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "What is the CNPJ of your enterprise?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "We need to be sure that this is your enterprise"
 msgstr ""
-#: app/views/account/activation_question.rhtml:8
-msgid "Answer"
+#: app/views/account/activation_question.rhtml:35
+#: app/views/account/accept_terms.rhtml:13
+msgid "Continue"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:4
-msgid "I accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid "part 2 of 2"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:5
-msgid "I do NOT accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid " part 2 of 3"
+msgstr ""
+
+#: app/views/account/accept_terms.rhtml:10
+msgid "I read the terms of use and accepted them"
 msgstr ""
 #: app/views/account/index_anonymous.rhtml:1
@@ -2526,20 +2572,48 @@ msgid &quot;&quot;
 "this environment."
 msgstr ""
-#: app/views/account/login.rhtml:32
+#: app/views/account/login.rhtml:31
 msgid "I want to participate!"
 msgstr ""
-#: app/views/account/activate_enterprise.rhtml:1
-msgid "What user should be the admin of the enterprise page"
+#: app/views/account/activate_enterprise.rhtml:2
+msgid "Enterprise activation - part 3 of 3"
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:6
-msgid "Already have user"
+msgid ""
+"Well, now for you manage your enterprise you have to associate an individual "
+"account to the enterprise."
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:7
-msgid "Create new user"
+msgid "Do you have a user account?"
+msgstr ""
+
+#: app/views/account/activate_enterprise.rhtml:11
+#: app/views/profile_editor/edit.rhtml:35
+#: app/views/profile_editor/edit.rhtml:41
+#: app/views/profile_editor/edit.rhtml:51
+#: app/views/profile_editor/edit.rhtml:57
+msgid "No"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:2
+msgid "Welcome to %s"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:4
+msgid ""
+"%s was successfuly activated. Now you may go to your control panel or to the "
+"control panel of your enterprise"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:7
+msgid "Go to my control panel"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:8
+msgid "Go to my enterprise control panel"
 msgstr ""
 #: app/views/account/already_activated.rhtml:1
@@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
 msgid "Show my website to all internet users"
 msgstr ""
-#: app/views/profile_editor/edit.rhtml:35
-#: app/views/profile_editor/edit.rhtml:41
-#: app/views/profile_editor/edit.rhtml:51
-#: app/views/profile_editor/edit.rhtml:57
-msgid "No"
-msgstr ""
-
 #: app/views/profile_editor/edit.rhtml:38
 msgid "Show my website to my contacts (persons)"
 msgstr ""
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.11.4\n"
-"POT-Creation-Date: 2008-09-12 19:55-0300\n"
+"POT-Creation-Date: 2008-09-18 12:03-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -299,11 +299,11 @@ msgstr &quot;&quot;
 msgid "Move block down"
 msgstr ""
-#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
+#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
 msgid "Move to the opposite side"
 msgstr ""
-#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
 #: app/views/content_viewer/view_page.rhtml:35
 #: app/views/categories/_category.rhtml:8
@@ -312,20 +312,20 @@ msgstr &quot;&quot;
 msgid "Edit"
 msgstr ""
-#: app/helpers/boxes_helper.rb:169
+#: app/helpers/boxes_helper.rb:170
 msgid "Remove block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173
+#: app/helpers/boxes_helper.rb:174
 msgid "Help on this block"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
 msgid "Help"
 msgstr ""
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
 #: app/views/box_organizer/add_block.rhtml:19
 msgid "Close"
@@ -476,7 +476,9 @@ msgstr &quot;&quot;
 #: app/views/admin_panel/site_info.rhtml:11
 #: app/views/shared/_select_categories.rhtml:22
 #: app/views/shared/_change_image.rhtml:2
-#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
+#: app/views/account/_login_form.rhtml:22
+#: app/views/account/activation_question.rhtml:34
+#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
 #: app/views/memberships/new_community.rhtml:31
@@ -486,19 +488,19 @@ msgstr &quot;&quot;
 msgid "Cancel"
 msgstr ""
-#: app/helpers/forms_helper.rb:63
+#: app/helpers/forms_helper.rb:64
 msgid "Select the State"
 msgstr ""
-#: app/helpers/forms_helper.rb:64
+#: app/helpers/forms_helper.rb:65
 msgid "Select the City"
 msgstr ""
-#: app/helpers/forms_helper.rb:87
+#: app/helpers/forms_helper.rb:88
 msgid "State:"
 msgstr ""
-#: app/helpers/forms_helper.rb:90
+#: app/helpers/forms_helper.rb:91
 msgid "City:"
 msgstr ""
@@ -774,7 +776,7 @@ msgid &quot;Enable email&quot;
 msgstr ""
 #: app/models/user.rb:-
-msgid "profile"
+msgid "article"
 msgstr ""
 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
@@ -787,85 +789,6 @@ msgstr &quot;&quot;
 msgid "Name"
 msgstr ""
-#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
-#: app/models/category.rb:- app/views/cms/view.rhtml:25
-msgid "Type"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:3
-#: app/views/enterprise_validation/_details.rhtml:23
-msgid "Identifier"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:26
-msgid "Active"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:5
-#: app/views/enterprise_editor/_form.rhtml:4
-#: app/views/enterprise_validation/index.rhtml:14
-#: app/views/enterprise_validation/_details.rhtml:7
-#: app/views/enterprise_validation/list_processed.rhtml:9
-#: app/views/box_organizer/_link_list_block.rhtml:5
-msgid "Address"
-msgstr ""
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:6
-msgid "Contact phone"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Home page"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "User"
-msgstr ""
-
-#: app/models/user.rb:- app/models/task.rb:-
-msgid "Data"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lat"
-msgstr ""
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lng"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Geocode precision"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Enabled"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Nickname"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom header"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom footer"
-msgstr ""
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Theme"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "Public profile"
-msgstr ""
-
-#: app/models/user.rb:-
-msgid "article"
-msgstr ""
-
 #: app/models/user.rb:- app/models/category.rb:-
 msgid "Slug"
 msgstr ""
@@ -904,6 +827,11 @@ msgstr &quot;&quot;
 msgid "Lock version"
 msgstr ""
+#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
+#: app/models/category.rb:- app/views/cms/view.rhtml:25
+msgid "Type"
+msgstr ""
+
 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
 msgid "Size"
 msgstr ""
@@ -960,6 +888,80 @@ msgstr &quot;&quot;
 msgid "Reference article"
 msgstr ""
+#: app/models/user.rb:-
+msgid "profile"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
+msgid "Identifier"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:26
+msgid "Active"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
+#: app/views/enterprise_validation/index.rhtml:14
+#: app/views/enterprise_validation/_details.rhtml:7
+#: app/views/enterprise_validation/list_processed.rhtml:9
+#: app/views/box_organizer/_link_list_block.rhtml:5
+msgid "Address"
+msgstr ""
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
+msgid "Contact phone"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Home page"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "User"
+msgstr ""
+
+#: app/models/user.rb:- app/models/task.rb:-
+msgid "Data"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lat"
+msgstr ""
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lng"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Geocode precision"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Enabled"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Nickname"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom header"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom footer"
+msgstr ""
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Theme"
+msgstr ""
+
+#: app/models/user.rb:-
+msgid "Public profile"
+msgstr ""
+
 #: app/models/user.rb:7
 msgid "Password"
 msgstr ""
@@ -1813,7 +1815,7 @@ msgstr &quot;&quot;
 msgid "Disable products for enterprises"
 msgstr ""
-#: app/models/environment.rb:244
+#: app/models/environment.rb:252
 msgid "Only one Virtual Community can be the default one"
 msgstr ""
@@ -2258,6 +2260,24 @@ msgid &quot;Destroy&quot;
 msgstr ""
 #: app/views/account/blocked.rhtml:2
+msgid "This enterprise can't be activated by the system"
+msgstr ""
+
+#: app/views/account/blocked.rhtml:3
+msgid "Unfortunately this enterprise can't be activated via the system."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:6
+msgid ""
+"There was a failed atempt of activation and the automated acivation was "
+"disabled for your security."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:8
+msgid "We don't have enough information about your enterprise to identify you."
+msgstr ""
+
+#: app/views/account/blocked.rhtml:13
 msgid "Your enterprise has been blocked"
 msgstr ""
@@ -2282,6 +2302,7 @@ msgid &quot;Are you sure you want to get out?&quot;
 msgstr ""
 #: app/views/account/logout_popup.rhtml:4
+#: app/views/account/activate_enterprise.rhtml:10
 #: app/views/profile_editor/edit.rhtml:32
 #: app/views/profile_editor/edit.rhtml:35
 #: app/views/profile_editor/edit.rhtml:38
@@ -2325,7 +2346,7 @@ msgid &quot;your password is personal, protect it.&quot;
 msgstr ""
 #: app/views/account/login_block.rhtml:24
-#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
+#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
 msgid "Log in"
 msgstr ""
@@ -2333,15 +2354,15 @@ msgstr &quot;&quot;
 msgid "New user"
 msgstr ""
-#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
+#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
 msgid "Click here to join to this environment, if you is not already an user."
 msgstr ""
-#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
+#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
 msgid "You can recover your password clicking on this link."
 msgstr ""
-#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
+#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
 msgid "I forgot my password!"
 msgstr ""
@@ -2409,44 +2430,43 @@ msgid &quot;&quot;
 "changing your password. You should receive it in a few minutes."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:1
-msgid "Register"
+#: app/views/account/signup.rhtml:1
+msgid "Signup"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:5
+#: app/views/account/_signup_form.rhtml:3
 msgid ""
 "Fill all this fields to join in this environment.<p/>If you forgot your "
 "password, do not create a new account, click on the \"<b>I forgot my "
 "password!</b>\" link. ;-)"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:11
+#: app/views/account/_signup_form.rhtml:9
 msgid "\"Username\" is a simple nickname to recognize you on this environment."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:16
+#: app/views/account/_signup_form.rhtml:14
 msgid "We'll send you an e-mail to validate your registration."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:20
+#: app/views/account/_signup_form.rhtml:18
 msgid "Do not use a obviously password, but try some unforgettable word."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:24
+#: app/views/account/_signup_form.rhtml:22
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
-#: app/views/account/_signup_form.rhtml:35
+#: app/views/account/_signup_form.rhtml:33
 msgid "I accept the terms of use"
 msgstr ""
-#: app/views/account/_signup_form.rhtml:40
+#: app/views/account/_signup_form.rhtml:45
 msgid "Sign up"
 msgstr ""
 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
-msgid ""
-"To join on this environment, click on \"<b>I want to participate!</b>\"."
+msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
 msgstr ""
 #: app/views/account/change_password.rhtml:1
@@ -2479,28 +2499,54 @@ msgstr &quot;&quot;
 msgid "You can <a href='%s'>login</a> now."
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:6
+msgid "The year must be between %d and %d"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:17
+msgid "An CNPJ have 14 digits"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+#: app/views/account/accept_terms.rhtml:2
+msgid "Enterprise activation"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 2"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 3"
+msgstr ""
+
+#: app/views/account/activation_question.rhtml:29
 msgid "What year your enterprise was founded?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "What is the CNPJ of your enterprise?"
 msgstr ""
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "We need to be sure that this is your enterprise"
 msgstr ""
-#: app/views/account/activation_question.rhtml:8
-msgid "Answer"
+#: app/views/account/activation_question.rhtml:35
+#: app/views/account/accept_terms.rhtml:13
+msgid "Continue"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:4
-msgid "I accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid "part 2 of 2"
 msgstr ""
-#: app/views/account/accept_terms.rhtml:5
-msgid "I do NOT accept the terms"
+#: app/views/account/accept_terms.rhtml:2
+msgid " part 2 of 3"
+msgstr ""
+
+#: app/views/account/accept_terms.rhtml:10
+msgid "I read the terms of use and accepted them"
 msgstr ""
 #: app/views/account/index_anonymous.rhtml:1
@@ -2526,20 +2572,48 @@ msgid &quot;&quot;
 "this environment."
 msgstr ""
-#: app/views/account/login.rhtml:32
+#: app/views/account/login.rhtml:31
 msgid "I want to participate!"
 msgstr ""
-#: app/views/account/activate_enterprise.rhtml:1
-msgid "What user should be the admin of the enterprise page"
+#: app/views/account/activate_enterprise.rhtml:2
+msgid "Enterprise activation - part 3 of 3"
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:6
-msgid "Already have user"
+msgid ""
+"Well, now for you manage your enterprise you have to associate an individual "
+"account to the enterprise."
 msgstr ""
 #: app/views/account/activate_enterprise.rhtml:7
-msgid "Create new user"
+msgid "Do you have a user account?"
+msgstr ""
+
+#: app/views/account/activate_enterprise.rhtml:11
+#: app/views/profile_editor/edit.rhtml:35
+#: app/views/profile_editor/edit.rhtml:41
+#: app/views/profile_editor/edit.rhtml:51
+#: app/views/profile_editor/edit.rhtml:57
+msgid "No"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:2
+msgid "Welcome to %s"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:4
+msgid ""
+"%s was successfuly activated. Now you may go to your control panel or to the "
+"control panel of your enterprise"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:7
+msgid "Go to my control panel"
+msgstr ""
+
+#: app/views/account/welcome.rhtml:8
+msgid "Go to my enterprise control panel"
 msgstr ""
 #: app/views/account/already_activated.rhtml:1
@@ -3416,13 +3490,6 @@ msgstr &quot;&quot;
 msgid "Show my website to all internet users"
 msgstr ""
-#: app/views/profile_editor/edit.rhtml:35
-#: app/views/profile_editor/edit.rhtml:41
-#: app/views/profile_editor/edit.rhtml:51
-#: app/views/profile_editor/edit.rhtml:57
-msgid "No"
-msgstr ""
-
 #: app/views/profile_editor/edit.rhtml:38
 msgid "Show my website to my contacts (persons)"
 msgstr ""
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.11.4\n"
-"POT-Creation-Date: 2008-09-12 19:55-0300\n"
-"PO-Revision-Date: 2008-09-12 19:56-0300\n"
+"POT-Creation-Date: 2008-09-18 12:03-0300\n"
+"PO-Revision-Date: 2008-09-18 12:29-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -305,11 +305,11 @@ msgstr &quot;Impossível mover mais abaixo.&quot;
 msgid "Move block down"
 msgstr "Mover para baixo"
-#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
+#: app/helpers/boxes_helper.rb:159 app/helpers/boxes_helper.rb:161
 msgid "Move to the opposite side"
 msgstr "Mover para o lado oposto"
-#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:166 app/views/profile_members/index.rhtml:14
 #: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
 #: app/views/content_viewer/view_page.rhtml:35
 #: app/views/categories/_category.rhtml:8
@@ -318,20 +318,20 @@ msgstr &quot;Mover para o lado oposto&quot;
 msgid "Edit"
 msgstr "Editar"
-#: app/helpers/boxes_helper.rb:169
+#: app/helpers/boxes_helper.rb:170
 msgid "Remove block"
 msgstr "Remover bloco"
-#: app/helpers/boxes_helper.rb:173
+#: app/helpers/boxes_helper.rb:174
 msgid "Help on this block"
 msgstr "Ajuda sobre este bloco"
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:63
 #: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
 msgid "Help"
 msgstr "Ajuda"
-#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:174 app/helpers/application_helper.rb:83
 #: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
 #: app/views/box_organizer/add_block.rhtml:19
 msgid "Close"
@@ -486,7 +486,9 @@ msgstr &quot;&quot;
 #: app/views/admin_panel/site_info.rhtml:11
 #: app/views/shared/_select_categories.rhtml:22
 #: app/views/shared/_change_image.rhtml:2
-#: app/views/account/_login_form.rhtml:16 app/views/account/login.rhtml:22
+#: app/views/account/_login_form.rhtml:22
+#: app/views/account/activation_question.rhtml:34
+#: app/views/account/accept_terms.rhtml:12 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:39 app/views/cms/edit.rhtml:41
 #: app/views/cms/edit.rhtml:43 app/views/cms/select_article_type.rhtml:12
 #: app/views/memberships/new_community.rhtml:31
@@ -496,19 +498,19 @@ msgstr &quot;&quot;
 msgid "Cancel"
 msgstr "Cancelar"
-#: app/helpers/forms_helper.rb:63
+#: app/helpers/forms_helper.rb:64
 msgid "Select the State"
 msgstr "Selecione o Estado"
-#: app/helpers/forms_helper.rb:64
+#: app/helpers/forms_helper.rb:65
 msgid "Select the City"
 msgstr "Selecione a Cidade"
-#: app/helpers/forms_helper.rb:87
+#: app/helpers/forms_helper.rb:88
 msgid "State:"
 msgstr "Estado:"
-#: app/helpers/forms_helper.rb:90
+#: app/helpers/forms_helper.rb:91
 msgid "City:"
 msgstr "Cidade:"
@@ -787,8 +789,8 @@ msgid &quot;Enable email&quot;
 msgstr "Habilitar e-mail"
 #: app/models/user.rb:-
-msgid "profile"
-msgstr "perfil"
+msgid "article"
+msgstr "artigo"
 #: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
 #: app/models/product.rb:- app/models/create_enterprise.rb:4
@@ -800,85 +802,6 @@ msgstr &quot;perfil&quot;
 msgid "Name"
 msgstr "Nome"
-#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
-#: app/models/category.rb:- app/views/cms/view.rhtml:25
-msgid "Type"
-msgstr "Tipo"
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:3
-#: app/views/enterprise_validation/_details.rhtml:23
-msgid "Identifier"
-msgstr "Identificador"
-
-#: app/models/user.rb:- app/models/task.rb:26
-msgid "Active"
-msgstr "Ativar"
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:5
-#: app/views/enterprise_editor/_form.rhtml:4
-#: app/views/enterprise_validation/index.rhtml:14
-#: app/views/enterprise_validation/_details.rhtml:7
-#: app/views/enterprise_validation/list_processed.rhtml:9
-#: app/views/box_organizer/_link_list_block.rhtml:5
-msgid "Address"
-msgstr "Endereço"
-
-#: app/models/user.rb:- app/models/create_enterprise.rb:6
-msgid "Contact phone"
-msgstr "Telefone de contato"
-
-#: app/models/user.rb:-
-msgid "Home page"
-msgstr "Página inicial"
-
-#: app/models/user.rb:-
-msgid "User"
-msgstr "usuário"
-
-#: app/models/user.rb:- app/models/task.rb:-
-msgid "Data"
-msgstr "Dados"
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lat"
-msgstr "Lat"
-
-#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
-msgid "Lng"
-msgstr "Lng"
-
-#: app/models/user.rb:-
-msgid "Geocode precision"
-msgstr "Precisão do georeferenciamento"
-
-#: app/models/user.rb:-
-msgid "Enabled"
-msgstr "Habilitado"
-
-#: app/models/user.rb:-
-msgid "Nickname"
-msgstr "Apelido"
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom header"
-msgstr "Cabeçalho personalizado"
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Custom footer"
-msgstr "Rodapé personalizado"
-
-#: app/models/user.rb:- app/models/environment.rb:-
-msgid "Theme"
-msgstr "Tema"
-
-#: app/models/user.rb:-
-msgid "Public profile"
-msgstr "Perfil público"
-
-#: app/models/user.rb:-
-msgid "article"
-msgstr "artigo"
-
 #: app/models/user.rb:- app/models/category.rb:-
 msgid "Slug"
 msgstr "Atalho"
@@ -917,6 +840,11 @@ msgstr &quot;Versão&quot;
 msgid "Lock version"
 msgstr "Trancar a versão"
+#: app/models/user.rb:- app/models/task.rb:- app/models/block.rb:-
+#: app/models/category.rb:- app/views/cms/view.rhtml:25
+msgid "Type"
+msgstr "Tipo"
+
 #: app/models/user.rb:- app/models/image.rb:- app/models/thumbnail.rb:-
 msgid "Size"
 msgstr "Tamanho"
@@ -973,6 +901,80 @@ msgstr &quot;Aceitar comentários&quot;
 msgid "Reference article"
 msgstr "Artigo referenciado"
+#: app/models/user.rb:-
+msgid "profile"
+msgstr "perfil"
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
+msgid "Identifier"
+msgstr "Identificador"
+
+#: app/models/user.rb:- app/models/task.rb:26
+msgid "Active"
+msgstr "Ativar"
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
+#: app/views/enterprise_validation/index.rhtml:14
+#: app/views/enterprise_validation/_details.rhtml:7
+#: app/views/enterprise_validation/list_processed.rhtml:9
+#: app/views/box_organizer/_link_list_block.rhtml:5
+msgid "Address"
+msgstr "Endereço"
+
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
+msgid "Contact phone"
+msgstr "Telefone de contato"
+
+#: app/models/user.rb:-
+msgid "Home page"
+msgstr "Página inicial"
+
+#: app/models/user.rb:-
+msgid "User"
+msgstr "usuário"
+
+#: app/models/user.rb:- app/models/task.rb:-
+msgid "Data"
+msgstr "Dados"
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lat"
+msgstr "Lat"
+
+#: app/models/user.rb:- app/models/product.rb:- app/models/category.rb:-
+msgid "Lng"
+msgstr "Lng"
+
+#: app/models/user.rb:-
+msgid "Geocode precision"
+msgstr "Precisão do georeferenciamento"
+
+#: app/models/user.rb:-
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: app/models/user.rb:-
+msgid "Nickname"
+msgstr "Apelido"
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom header"
+msgstr "Cabeçalho personalizado"
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Custom footer"
+msgstr "Rodapé personalizado"
+
+#: app/models/user.rb:- app/models/environment.rb:-
+msgid "Theme"
+msgstr "Tema"
+
+#: app/models/user.rb:-
+msgid "Public profile"
+msgstr "Perfil público"
+
 #: app/models/user.rb:7
 msgid "Password"
 msgstr "Senha"
@@ -1853,7 +1855,7 @@ msgstr &quot;Desabilitar buscar por eventos&quot;
 msgid "Disable products for enterprises"
 msgstr "Desabilitar produtos para empreendimentos"
-#: app/models/environment.rb:244
+#: app/models/environment.rb:252
 msgid "Only one Virtual Community can be the default one"
 msgstr "Apenas uma comunidade virtual pode ser a padrão"
@@ -2314,6 +2316,24 @@ msgid &quot;Destroy&quot;
 msgstr "Destruir"
 #: app/views/account/blocked.rhtml:2
+msgid "This enterprise can't be activated by the system"
+msgstr "Este empreendimento não pôde ser ativado pelo sistema"
+
+#: app/views/account/blocked.rhtml:3
+msgid "Unfortunately this enterprise can't be activated via the system."
+msgstr "Infelizmente este empreendimento não pode ser ativado pelo sistema."
+
+#: app/views/account/blocked.rhtml:6
+msgid ""
+"There was a failed atempt of activation and the automated acivation was "
+"disabled for your security."
+msgstr "Houve uma tentativa falha de ativação e a ativação automática foi desativada para a sua segurança."
+
+#: app/views/account/blocked.rhtml:8
+msgid "We don't have enough information about your enterprise to identify you."
+msgstr "Nós não temos informação o suficiente sobre o seu empreendimento para identifica-lo"
+
+#: app/views/account/blocked.rhtml:13
 msgid "Your enterprise has been blocked"
 msgstr "Seu empreendimento foi bloqueado"
@@ -2341,6 +2361,7 @@ msgid &quot;Are you sure you want to get out?&quot;
 msgstr "Tem certeza que quer sair?"
 #: app/views/account/logout_popup.rhtml:4
+#: app/views/account/activate_enterprise.rhtml:10
 #: app/views/profile_editor/edit.rhtml:32
 #: app/views/profile_editor/edit.rhtml:35
 #: app/views/profile_editor/edit.rhtml:38
@@ -2388,7 +2409,7 @@ msgid &quot;your password is personal, protect it.&quot;
 msgstr "sua senha é pessoal, proteja-a."
 #: app/views/account/login_block.rhtml:24
-#: app/views/account/_login_form.rhtml:15 app/views/account/login.rhtml:21
+#: app/views/account/_login_form.rhtml:21 app/views/account/login.rhtml:21
 msgid "Log in"
 msgstr "Entrar"
@@ -2396,15 +2417,15 @@ msgstr &quot;Entrar&quot;
 msgid "New user"
 msgstr "Novo usuário"
-#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:31
+#: app/views/account/login_block.rhtml:27 app/views/account/login.rhtml:30
 msgid "Click here to join to this environment, if you is not already an user."
 msgstr "Clique aqui para entrar neste ambiente, se voce ainda não é um usurio."
-#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:27
+#: app/views/account/login_block.rhtml:33 app/views/account/login.rhtml:26
 msgid "You can recover your password clicking on this link."
 msgstr "Você pode recuperar sua senha clicando neste link."
-#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:28
+#: app/views/account/login_block.rhtml:34 app/views/account/login.rhtml:27
 msgid "I forgot my password!"
 msgstr "Eu esqueci a minha senha!"
@@ -2476,11 +2497,11 @@ msgstr &quot;&quot;
 "Um email foi enviado para seu endereço de e-mail, com as instruções para "
 "mudar a sua senha. Você deve recebê-lo em alguns minutos."
-#: app/views/account/_signup_form.rhtml:1
-msgid "Register"
-msgstr "Registrar"
+#: app/views/account/signup.rhtml:1
+msgid "Signup"
+msgstr "Registre-se"
-#: app/views/account/_signup_form.rhtml:5
+#: app/views/account/_signup_form.rhtml:3
 msgid ""
 "Fill all this fields to join in this environment.<p/>If you forgot your "
 "password, do not create a new account, click on the \"<b>I forgot my "
@@ -2490,35 +2511,34 @@ msgstr &quot;&quot;
 "senha, não crie uma nova conta, clique no link \"<b>Eu esqueci minha senha!</"
 "b>\". ;-)"
-#: app/views/account/_signup_form.rhtml:11
+#: app/views/account/_signup_form.rhtml:9
 msgid "\"Username\" is a simple nickname to recognize you on this environment."
 msgstr ""
 "\"Nome de usuário\" é um simples apelido para reconhece-lo neste ambiente."
-#: app/views/account/_signup_form.rhtml:16
+#: app/views/account/_signup_form.rhtml:14
 msgid "We'll send you an e-mail to validate your registration."
 msgstr "Nós iremos lhe enviar um e-mail para validar seu registro."
-#: app/views/account/_signup_form.rhtml:20
+#: app/views/account/_signup_form.rhtml:18
 msgid "Do not use a obviously password, but try some unforgettable word."
 msgstr "Não use uma senha óbvia, mas tente algo de ser lembrado facilmente."
-#: app/views/account/_signup_form.rhtml:24
+#: app/views/account/_signup_form.rhtml:22
 msgid "We need to be sure that you wrote correctly your password."
 msgstr "Nós precisamos ter certeza que você escreveu sua senha corretamente."
-#: app/views/account/_signup_form.rhtml:35
+#: app/views/account/_signup_form.rhtml:33
 msgid "I accept the terms of use"
 msgstr "Eu aceito os termos de uso"
-#: app/views/account/_signup_form.rhtml:40
+#: app/views/account/_signup_form.rhtml:45
 msgid "Sign up"
 msgstr "Registre-se"
 #: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
-msgid ""
-"To join on this environment, click on \"<b>I want to participate!</b>\"."
-msgstr "Para entrar neste ambiente, clique em \"<b>Quero participar!</b>\"."
+msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
+msgstr "Para entrar neste ambiente, clique em \"<b>Quero ser um usuário!</b>\"."
 #: app/views/account/change_password.rhtml:1
 #: app/views/account/change_password.rhtml:14
@@ -2550,29 +2570,55 @@ msgstr &quot;%s, sua nova senha foi alterada com sucesso.&quot;
 msgid "You can <a href='%s'>login</a> now."
 msgstr "Você pode <a href='%s'>logar</a> agora."
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:6
+msgid "The year must be between %d and %d"
+msgstr "O ano precisa estar entre %d e %d"
+
+#: app/views/account/activation_question.rhtml:17
+msgid "An CNPJ have 14 digits"
+msgstr "Um CNPJ tem 14 dígitos"
+
+#: app/views/account/activation_question.rhtml:26
+#: app/views/account/accept_terms.rhtml:2
+msgid "Enterprise activation"
+msgstr "Ativação de empreendimento"
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 2"
+msgstr "parte 1 de 2"
+
+#: app/views/account/activation_question.rhtml:26
+msgid "part 1 of 3"
+msgstr "parte 1 de 3"
+
+#: app/views/account/activation_question.rhtml:29
 msgid "What year your enterprise was founded?"
 msgstr "Qual o ano de fundação do seu empreendimento?"
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "What is the CNPJ of your enterprise?"
 msgstr "Qual o CNPJ do seu empreendimento?"
-#: app/views/account/activation_question.rhtml:3
+#: app/views/account/activation_question.rhtml:29
 msgid "We need to be sure that this is your enterprise"
 msgstr "Nós precisamos ter certeza que este empreendimento é seu"
-#: app/views/account/activation_question.rhtml:8
-msgid "Answer"
-msgstr "Resposta"
+#: app/views/account/activation_question.rhtml:35
+#: app/views/account/accept_terms.rhtml:13
+msgid "Continue"
+msgstr "Continuar"
-#: app/views/account/accept_terms.rhtml:4
-msgid "I accept the terms"
-msgstr "Eu aceito os termos"
+#: app/views/account/accept_terms.rhtml:2
+msgid "part 2 of 2"
+msgstr "parte 2 de 2"
-#: app/views/account/accept_terms.rhtml:5
-msgid "I do NOT accept the terms"
-msgstr "Eu NÃO aceito os termos"
+#: app/views/account/accept_terms.rhtml:2
+msgid " part 2 of 3"
+msgstr "parte 2 de 3"
+
+#: app/views/account/accept_terms.rhtml:10
+msgid "I read the terms of use and accepted them"
+msgstr "Eu li e aceito os termos de uso"
 #: app/views/account/index_anonymous.rhtml:1
 msgid "Identify yourself"
@@ -2601,21 +2647,49 @@ msgstr &quot;&quot;
 "Se você ainda não é um usuário, você pode se registrar agora e se tornar um "
 "membro desse comunidade virtual."
-#: app/views/account/login.rhtml:32
+#: app/views/account/login.rhtml:31
 msgid "I want to participate!"
 msgstr "Quero participar!"
-#: app/views/account/activate_enterprise.rhtml:1
-msgid "What user should be the admin of the enterprise page"
-msgstr "Qual usuário deve ser o administrados da página do empreendimento"
+#: app/views/account/activate_enterprise.rhtml:2
+msgid "Enterprise activation - part 3 of 3"
+msgstr "Ativação de empreendimento - parte 3 de 3"
 #: app/views/account/activate_enterprise.rhtml:6
-msgid "Already have user"
-msgstr "Já tenho usuário"
+msgid ""
+"Well, now for you manage your enterprise you have to associate an individual "
+"account to the enterprise."
+msgstr "Agora para gerenciar seu empreendimento você tem que associar uma conta de usuário individual ao empreendimento"
 #: app/views/account/activate_enterprise.rhtml:7
-msgid "Create new user"
-msgstr "Criar novo usuário"
+msgid "Do you have a user account?"
+msgstr "Você já tem uma conta de usuário no sistema?"
+
+#: app/views/account/activate_enterprise.rhtml:11
+#: app/views/profile_editor/edit.rhtml:35
+#: app/views/profile_editor/edit.rhtml:41
+#: app/views/profile_editor/edit.rhtml:51
+#: app/views/profile_editor/edit.rhtml:57
+msgid "No"
+msgstr "Não"
+
+#: app/views/account/welcome.rhtml:2
+msgid "Welcome to %s"
+msgstr "Bem-vindo a %s"
+
+#: app/views/account/welcome.rhtml:4
+msgid ""
+"%s was successfuly activated. Now you may go to your control panel or to the "
+"control panel of your enterprise"
+msgstr "%s foi ativado com sucesso. Agora você pode ir para o seu painel de controle ou ao painel de controle do seu empreendimento"
+
+#: app/views/account/welcome.rhtml:7
+msgid "Go to my control panel"
+msgstr "Ir para o meu painel de controle"
+
+#: app/views/account/welcome.rhtml:8
+msgid "Go to my enterprise control panel"
+msgstr "Ir para o painel de controle do meu empreendimento"
 #: app/views/account/already_activated.rhtml:1
 msgid "This enterprise is already active"
@@ -3518,13 +3592,6 @@ msgstr &quot;Ativar acesso a Intranet (área restrita somente para mim)&quot;
 msgid "Show my website to all internet users"
 msgstr "Exibir meu website para todos os usuários da internet"
-#: app/views/profile_editor/edit.rhtml:35
-#: app/views/profile_editor/edit.rhtml:41
-#: app/views/profile_editor/edit.rhtml:51
-#: app/views/profile_editor/edit.rhtml:57
-msgid "No"
-msgstr "Não"
-
 #: app/views/profile_editor/edit.rhtml:38
 msgid "Show my website to my contacts (persons)"
 msgstr "Exibir meu website para meus contatos (pessoas)"
@@ -4640,6 +4707,27 @@ msgstr &quot;Desenvolvimento Colivre&quot;
 msgid "A Ynternet.org project"
 msgstr "Um projeto da Ynternet.org"
+#~ msgid "Register"
+#~ msgstr "Registrar"
+
+#~ msgid "Answer"
+#~ msgstr "Resposta"
+
+#~ msgid "I accept the terms"
+#~ msgstr "Eu aceito os termos"
+
+#~ msgid "I do NOT accept the terms"
+#~ msgstr "Eu NÃO aceito os termos"
+
+#~ msgid "What user should be the admin of the enterprise page"
+#~ msgstr "Qual usuário deve ser o administrados da página do empreendimento"
+
+#~ msgid "Already have user"
+#~ msgstr "Já tenho usuário"
+
+#~ msgid "Create new user"
+#~ msgstr "Criar novo usuário"
+
 #~ msgid "Advanced search"
 #~ msgstr "Busca avançada"
@@ -24,6 +24,7 @@
 .icon-left-disabled  { background-image: url(go-left-disabled-HC.gif)  }
 .icon-right-disabled { background-image: url(go-right-disabled-HC.gif) }
 .icon-up-red    { background-image: url(go-up-red-HC.gif)        }
+.icon-forward   { background-image: url(go-forward-HC.gif)       }
 .icon-search    { background-image: url(search-HC.gif)           }
 .icon-ok        { background-image: url(ok-HC.gif)               }
 .icon-login     { background-image: url(key-HC.gif)              }
-
 .main-block form {
   border: 2px solid #3465A4;
   padding: 10px 5px 10px 20px;
   background: #B8CFE7;
 }
+.activation-box {
+  border: 2px solid #3465A4;
+  padding: 10px 5px 10px 20px;
+  background: #B8CFE7;
+}
+
+.activation-box form {
+  border: 0px;
+  padding: 0px 0px 0px 0px;
+}
+
 .main-block label {
   font-weight: bold;
 }
@@ -13,3 +23,17 @@
   color: #3465A4;
 }
+.blocked-warning {
+  border: 2px solid #3465A4;
+  padding: 10px 5px 10px 20px;
+  background: #E86F67;
+}
+
+/* FIXME: remove the important without breaking ie */
+.button {
+  * height: auto !IMPORTANT;
+}
+
+.button-bar * {
+  position: relative;
+}
@@ -486,6 +486,20 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'enterprise_code', :value => '0123456789'}
   end
+  should 'block who is blocked but directly arrive in the second step' do
+    ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
+    ent.block
+    ent.save
+
+    task = mock
+    task.expects(:enterprise).returns(ent).at_least_once
+    EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
+
+    get :accept_terms, :enterprise_code => '0123456789', :answer => 1998
+
+    assert_template 'blocked'
+  end
+
 # end of enterprise activation tests
   should 'not be able to signup while inverse captcha field filled' do
@@ -182,4 +182,8 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_routing('/', :controller => 'home', :action =>  'index')
   end
+  def test_myprofile_with_dot
+    assert_routing('/myprofile/profile.withdot', :controller => 'profile_editor', :action => 'index', :profile => 'profile.withdot')
+  end
+
 end
	@@ -22,9 +22,9 @@ class AccountController < ApplicationController		@@ -22,9 +22,9 @@ class AccountController < ApplicationController
22	cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }	22	cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
23	end	23	end
24	go_to_user_initial_page if redirect?	24	go_to_user_initial_page if redirect?
25	- flash[:notice] = _("Logged in successfully")	25	+ flash[:notice] = _("Logged in successfully") if redirect?
26	else	26	else
27	- flash[:notice] = _('Incorrect username or password')	27	+ flash[:notice] = _('Incorrect username or password') if redirect?
28	redirect_to :back if redirect?	28	redirect_to :back if redirect?
29	end	29	end
30	end	30	end
	@@ -144,6 +144,27 @@ class AccountController < ApplicationController		@@ -144,6 +144,27 @@ class AccountController < ApplicationController
144	def accept_terms	144	def accept_terms
145	@enterprise = load_enterprise	145	@enterprise = load_enterprise
146	@question = @enterprise.question	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	check_answer	168	check_answer
148	@terms_of_enterprise_use = environment.terms_of_enterprise_use	169	@terms_of_enterprise_use = environment.terms_of_enterprise_use
149	end	170	end
	@@ -159,7 +180,14 @@ class AccountController < ApplicationController		@@ -159,7 +180,14 @@ class AccountController < ApplicationController
159	if activation && user	180	if activation && user
160	activation.requestor = user	181	activation.requestor = user
161	activation.finish	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	end	191	end
164	end	192	end
165		193
	@@ -40,7 +40,8 @@ module FormsHelper		@@ -40,7 +40,8 @@ module FormsHelper
40	the_class << ' ' << html_options[:class]	40	the_class << ' ' << html_options[:class]
41	end	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	bt_submit + bt_cancel	46	bt_submit + bt_cancel
46	end	47	end
	@@ -154,6 +154,14 @@ class Environment < ActiveRecord::Base		@@ -154,6 +154,14 @@ class Environment < ActiveRecord::Base
154	! self.settings['terms_of_enterprise_use'].blank?	154	! self.settings['terms_of_enterprise_use'].blank?
155	end	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	def message_for_disabled_enterprise	165	def message_for_disabled_enterprise
158	self.settings['message_for_disabled_enterprise']	166	self.settings['message_for_disabled_enterprise']
159	end	167	end
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>
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	<% end %>	37	<% end %>
10	-<% end %>	38	+</div>
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>
		1	+<h1><%= _('Signup') %></h1>
1	<%= render :partial => 'signup_form' %>	2	<%= render :partial => 'signup_form' %>
@@ -0,0 +1,10 @@		@@ -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 %>
1	-
2	.main-block form {	1	.main-block form {
3	border: 2px solid #3465A4;	2	border: 2px solid #3465A4;
4	padding: 10px 5px 10px 20px;	3	padding: 10px 5px 10px 20px;
5	background: #B8CFE7;	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	.main-block label {	18	.main-block label {
9	font-weight: bold;	19	font-weight: bold;
10	}	20	}
	@@ -13,3 +23,17 @@		@@ -13,3 +23,17 @@
13	color: #3465A4;	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	+}
	@@ -486,6 +486,20 @@ class AccountControllerTest < Test::Unit::TestCase		@@ -486,6 +486,20 @@ class AccountControllerTest < Test::Unit::TestCase
486	assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'enterprise_code', :value => '0123456789'}	486	assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'enterprise_code', :value => '0123456789'}
487	end	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	# end of enterprise activation tests	503	# end of enterprise activation tests
490		504
491	should 'not be able to signup while inverse captcha field filled' do	505	should 'not be able to signup while inverse captcha field filled' do