diff --git a/app/controllers/admin/admin_panel_controller.rb b/app/controllers/admin/admin_panel_controller.rb
index e31e33c..14106cc 100644
--- a/app/controllers/admin/admin_panel_controller.rb
+++ b/app/controllers/admin/admin_panel_controller.rb
@@ -42,7 +42,7 @@ class AdminPanelController < AdminController
         end
         redirect_to :action => 'set_portal_folders'
       else
-        session[:notice] = __('Community not found. You must insert the identifier of a community from this environment')
+        session[:notice] = _('Community not found. You must insert the identifier of a community from this environment')
       end
     end
   end
diff --git a/app/controllers/admin/features_controller.rb b/app/controllers/admin/features_controller.rb
index c2aadae..1cf6a00 100644
--- a/app/controllers/admin/features_controller.rb
+++ b/app/controllers/admin/features_controller.rb
@@ -34,9 +34,9 @@ class FeaturesController < AdminController
   def manage_enterprise_fields
     environment.custom_enterprise_fields = params[:enterprise_fields]
     if environment.save!
-      session[:notice] = __('Enterprise fields updated successfully.')
+      session[:notice] = _('Enterprise fields updated successfully.')
     else
-      flash[:error] = __('Enterprise fields not updated successfully.')
+      flash[:error] = _('Enterprise fields not updated successfully.')
     end
     redirect_to :action => 'manage_fields'
   end
diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index 2a7bd73..c82f1b4 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -167,7 +167,7 @@ class ProfileController < PublicController
       session[:notice] = _("You have unblocked %s successfully. ") % profile.name
       redirect_to :controller => 'profile', :action => 'index'
     else
-      message = __('You are not allowed to unblock enterprises in this environment.')
+      message = _('You are not allowed to unblock enterprises in this environment.')
       render_access_denied(message)
     end
   end
diff --git a/app/helpers/assets_helper.rb b/app/helpers/assets_helper.rb
index fb8d45d..4d4b839 100644
--- a/app/helpers/assets_helper.rb
+++ b/app/helpers/assets_helper.rb
@@ -7,9 +7,9 @@ module AssetsHelper
       [ options.merge(:asset => 'articles'), "icon-menu-articles",   _('Articles') ],
       [ options.merge(:asset => 'people'), "icon-menu-people",     _('People') ],
       [ options.merge(:asset => 'products'), "icon-menu-product",    _('Products') ],
-      [ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", __('Enterprises') ],
-      [ options.merge(:asset => 'communities'), "icon-menu-community",  __('Communities') ],
-      [ options.merge(:asset => 'events'), "icon-event",   __('Events') ],
+      [ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", _('Enterprises') ],
+      [ options.merge(:asset => 'communities'), "icon-menu-community",  _('Communities') ],
+      [ options.merge(:asset => 'events'), "icon-event",   _('Events') ],
 
     ].select do |target, css_class, name|
       !environment.enabled?('disable_asset_' + target[:asset])
diff --git a/app/helpers/profile_editor_helper.rb b/app/helpers/profile_editor_helper.rb
index 08d0a5c..56d369b 100644
--- a/app/helpers/profile_editor_helper.rb
+++ b/app/helpers/profile_editor_helper.rb
@@ -129,7 +129,7 @@ module ProfileEditorHelper
     else
       domains = environment.domains
     end
-    labelled_form_field(__('Preferred domain name:'), select(object, :preferred_domain_id, domains.map {|item| [item.name, item.id]}, :prompt => '&lt;' + _('Select domain') + '&gt;'))
+    labelled_form_field(_('Preferred domain name:'), select(object, :preferred_domain_id, domains.map {|item| [item.name, item.id]}, :prompt => '&lt;' + _('Select domain') + '&gt;'))
   end
 
   def control_panel(&block)
diff --git a/app/models/communities_block.rb b/app/models/communities_block.rb
index 2534537..570738e 100644
--- a/app/models/communities_block.rb
+++ b/app/models/communities_block.rb
@@ -1,15 +1,15 @@
 class CommunitiesBlock < ProfileListBlock
 
   def self.description
-    __('Communities')
+    _('Communities')
   end
 
   def default_title
-    n__('{#} community', '{#} communities', profile_count)
+    n_('{#} community', '{#} communities', profile_count)
   end
 
   def help
-    __('This block displays the communities in which the user is a member.')
+    _('This block displays the communities in which the user is a member.')
   end
 
   def footer
diff --git a/app/models/community.rb b/app/models/community.rb
index 53671ec..21c32f3 100644
--- a/app/models/community.rb
+++ b/app/models/community.rb
@@ -84,7 +84,7 @@ class Community < Organization
   end
 
   def control_panel_settings_button
-    {:title => __('Community Info and settings'), :icon => 'edit-profile-group'}
+    {:title => _('Community Info and settings'), :icon => 'edit-profile-group'}
   end
 
   def activities
diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb
index df11e4b..4a5ff04 100644
--- a/app/models/create_enterprise.rb
+++ b/app/models/create_enterprise.rb
@@ -165,18 +165,18 @@ class CreateEnterprise < Task
   end
 
   def task_finished_message
-    __('Your request for registering the enterprise "%{enterprise}" was approved. You can access %{environment} now and provide start providing all relevant information your new enterprise.') % { :enterprise => self.name, :environment => self.environment }
+    _('Your request for registering the enterprise "%{enterprise}" was approved. You can access %{environment} now and provide start providing all relevant information your new enterprise.') % { :enterprise => self.name, :environment => self.environment }
   end
 
   def task_cancelled_message
-    __("Your request for registering the enterprise %{enterprise} at %{environment} was NOT approved by the validator organization. The following explanation was given: \n\n%{explanation}") % { :enterprise => self.name, :environment => self.environment, :explanation => self.reject_explanation }
+    _("Your request for registering the enterprise %{enterprise} at %{environment} was NOT approved by the validator organization. The following explanation was given: \n\n%{explanation}") % { :enterprise => self.name, :environment => self.environment, :explanation => self.reject_explanation }
   end
 
   def target_notification_message
     msg = ""
-    msg << __("Enterprise \"%{enterprise}\" just requested to enter %{environment}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :enterprise => self.name, :environment => self.environment }
+    msg << _("Enterprise \"%{enterprise}\" just requested to enter %{environment}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :enterprise => self.name, :environment => self.environment }
     msg << "\n"
-    msg << __("The data provided by the enterprise was the following:\n") << "\n"
+    msg << _("The data provided by the enterprise was the following:\n") << "\n"
 
 
     msg << (_("Name: %s") % self.name) << "\n"
@@ -186,12 +186,12 @@ class CreateEnterprise < Task
     msg << (_("Foundation Year: %d") % self.foundation_year) << "\n" unless self.foundation_year.blank?
     msg << (_("Economic activity: %s") % self.economic_activity) << "\n"
 
-    msg << __("Information about enterprise's management:\n") << self.management_information.to_s << "\n"
+    msg << _("Information about enterprise's management:\n") << self.management_information.to_s << "\n"
 
     msg << (_("Contact phone: %s") % self.contact_phone) << "\n"
     msg << (_("Contact person: %s") % self.contact_person) << "\n"
 
-    msg << __('CreateEnterprise|Identifier')
+    msg << _('CreateEnterprise|Identifier')
 
     msg
   end
diff --git a/app/models/disabled_enterprise_message_block.rb b/app/models/disabled_enterprise_message_block.rb
index d9882f3..2ed1f99 100644
--- a/app/models/disabled_enterprise_message_block.rb
+++ b/app/models/disabled_enterprise_message_block.rb
@@ -1,11 +1,11 @@
 class DisabledEnterpriseMessageBlock < Block
 
   def self.description
-    __('"Disabled enterprise" message')
+    _('"Disabled enterprise" message')
   end
 
   def help
-    __('Shows a message for disabled enterprises.')
+    _('Shows a message for disabled enterprises.')
   end
 
   def default_title
diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index bbcf53c..8773e40 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -163,7 +163,7 @@ class Enterprise < Organization
   alias_method_chain :template, :inactive_enterprise
 
   def control_panel_settings_button
-    {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
+    {:title => _('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
   end
 
   settings_items :enable_contact_us, :type => :boolean, :default => true
@@ -173,7 +173,7 @@ class Enterprise < Organization
   end
 
   def control_panel_settings_button
-    {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
+    {:title => _('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
   end
 
   def create_product?
diff --git a/app/models/enterprise_homepage.rb b/app/models/enterprise_homepage.rb
index 004922a..80b6af2 100644
--- a/app/models/enterprise_homepage.rb
+++ b/app/models/enterprise_homepage.rb
@@ -5,7 +5,7 @@ class EnterpriseHomepage < Article
   end
 
   def self.short_description
-    __('Enterprise homepage')
+    _('Enterprise homepage')
   end
 
   def self.description
diff --git a/app/models/enterprises_block.rb b/app/models/enterprises_block.rb
index 309a4d2..31ccb41 100644
--- a/app/models/enterprises_block.rb
+++ b/app/models/enterprises_block.rb
@@ -1,15 +1,15 @@
 class EnterprisesBlock < ProfileListBlock
 
   def default_title
-    n__('{#} enterprise', '{#} enterprises', profile_count)
+    n_('{#} enterprise', '{#} enterprises', profile_count)
   end
 
   def help
-    __('This block displays the enterprises where this user works.')
+    _('This block displays the enterprises where this user works.')
   end
 
   def self.description
-    __('Enterprises')
+    _('Enterprises')
   end
 
   def footer
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 12b3671..0c1b3fb 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -91,12 +91,12 @@ class Environment < ActiveRecord::Base
   def self.available_features
     {
       'disable_asset_articles' => _('Disable search for articles '),
-      'disable_asset_enterprises' => __('Disable search for enterprises'),
+      'disable_asset_enterprises' => _('Disable search for enterprises'),
       'disable_asset_people' => _('Disable search for people'),
-      'disable_asset_communities' => __('Disable search for communities'),
+      'disable_asset_communities' => _('Disable search for communities'),
       'disable_asset_products' => _('Disable search for products'),
       'disable_asset_events' => _('Disable search for events'),
-      'disable_products_for_enterprises' => __('Disable products for enterprises'),
+      'disable_products_for_enterprises' => _('Disable products for enterprises'),
       'disable_categories' => _('Disable categories'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
       'disable_gender_icon' => _('Disable gender icon'),
@@ -104,9 +104,9 @@ class Environment < ActiveRecord::Base
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
-      'enterprise_registration' => __('Enterprise registration'),
+      'enterprise_registration' => _('Enterprise registration'),
 
-      'enterprise_activation' => __('Enable activation of enterprises'),
+      'enterprise_activation' => _('Enable activation of enterprises'),
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
       'use_portal_community' => _('Use the portal as news source for front page'),
@@ -119,8 +119,8 @@ class Environment < ActiveRecord::Base
       'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
       'enable_organization_url_change' => _("Allow organizations to change their URL"),
       'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
-      'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),
-      'enterprises_are_validated_when_created' => __('Enterprises are validated when created'),
+      'enterprises_are_disabled_when_created' => _('Enterprises are disabled when created'),
+      'enterprises_are_validated_when_created' => _('Enterprises are validated when created'),
       'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
diff --git a/app/models/environment_statistics_block.rb b/app/models/environment_statistics_block.rb
index 598edf7..69b4cb5 100644
--- a/app/models/environment_statistics_block.rb
+++ b/app/models/environment_statistics_block.rb
@@ -20,9 +20,9 @@ class EnvironmentStatisticsBlock < Block
     info = []
     info << (n_('One user', '%{num} users', users) % { :num => users })
     unless owner.enabled?('disable_asset_enterprises')
-      info << (n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
+      info << (n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
     end
-    info << (n__('One community', '%{num} communities', communities) % { :num => communities })
+    info << (n_('One community', '%{num} communities', communities) % { :num => communities })
 
     block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
   end
diff --git a/app/models/fans_block.rb b/app/models/fans_block.rb
index ae97bc8..5785539 100644
--- a/app/models/fans_block.rb
+++ b/app/models/fans_block.rb
@@ -5,7 +5,7 @@ class FansBlock < ProfileListBlock
   end
 
   def default_title
-    n__('{#} fan', '{#} fans', profile_count)
+    n_('{#} fan', '{#} fans', profile_count)
   end
 
   def help
diff --git a/app/models/favorite_enterprises_block.rb b/app/models/favorite_enterprises_block.rb
index e4b407b..74474d8 100644
--- a/app/models/favorite_enterprises_block.rb
+++ b/app/models/favorite_enterprises_block.rb
@@ -1,22 +1,22 @@
 class FavoriteEnterprisesBlock < ProfileListBlock
 
   def default_title
-    __('Favorite Enterprises')
+    _('Favorite Enterprises')
   end
 
   def help
-    __('This block lists your favorite enterprises.')
+    _('This block lists your favorite enterprises.')
   end
 
   def self.description
-    __('Favorite Enterprises')
+    _('Favorite Enterprises')
   end
 
   def footer
     owner = self.owner
     return '' unless owner.kind_of?(Person)
     lambda do
-      link_to __('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
+      link_to _('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
     end
   end
 
diff --git a/app/models/friends_block.rb b/app/models/friends_block.rb
index 4fbde10..b4d81f3 100644
--- a/app/models/friends_block.rb
+++ b/app/models/friends_block.rb
@@ -1,11 +1,11 @@
 class FriendsBlock < ProfileListBlock
 
   def self.description
-    __('Friends')
+    _('Friends')
   end
 
   def default_title
-    n__('{#} friend', '{#} friends', profile_count)
+    n_('{#} friend', '{#} friends', profile_count)
   end
 
   def help
diff --git a/app/models/sellers_search_block.rb b/app/models/sellers_search_block.rb
index 617ca27..c0b3cc8 100644
--- a/app/models/sellers_search_block.rb
+++ b/app/models/sellers_search_block.rb
@@ -1,11 +1,11 @@
 class SellersSearchBlock < Block
 
   def self.description
-    __('Search for enterprises and products')
+    _('Search for enterprises and products')
   end
 
   def self.short_description
-    __('Products/Enterprises search')
+    _('Products/Enterprises search')
   end
 
   def default_title
diff --git a/app/views/account/accept_terms.html.erb b/app/views/account/accept_terms.html.erb
index 7aa7b9b..7a03f64 100644
--- a/app/views/account/accept_terms.html.erb
+++ b/app/views/account/accept_terms.html.erb
@@ -11,7 +11,7 @@
   }
 </script>
 <div class=activation-box>
-  <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
+  <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
 
   <div id='terms-of-enterprise-use' class='height: 200px; overflow: auto;'><%= @terms_of_enterprise_use %></div>
 
diff --git a/app/views/account/activate_enterprise.html.erb b/app/views/account/activate_enterprise.html.erb
index 5debce6..779af71 100644
--- a/app/views/account/activate_enterprise.html.erb
+++ b/app/views/account/activate_enterprise.html.erb
@@ -1,9 +1,9 @@
 <div class='activation-box'>
-<h2><%= __('Enterprise activation - part 3 of 3') %></h2>
+<h2><%= _('Enterprise activation - part 3 of 3') %></h2>
 
 <%= error_messages_for :user %>
 
-<p><%= __('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
+<p><%= _('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
 <p><%= _('Do you have a personal user account in the system?') %></p>
 
 <div id="enterprise-activation-create-user-or-login-button">
@@ -14,7 +14,7 @@
 <div id="enterprise-activation-create-user-form" style="display: none">
   <h3><%= _('Personal signup form') %></h3>
   <%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>
-  <p><%= message = __('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
+  <p><%= message = _('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
 </div>
 
 <div id="enterprise-activation-login-form" style="display: none">
diff --git a/app/views/account/activation_question.html.erb b/app/views/account/activation_question.html.erb
index 170b9cf..9e89df3 100644
--- a/app/views/account/activation_question.html.erb
+++ b/app/views/account/activation_question.html.erb
@@ -23,14 +23,14 @@
 </script>
 
 <div class='activation-box'>
-  <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
+  <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 %> 
 
   <p>  <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
 
-  <p><%= __("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
+  <p><%= _("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
 
-  <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (__("What year your enterprise was founded? It must have 4 digits, eg 1990. %s") % environment.tip_message_enterprise_activation_question) : __('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>
+  <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (_("What year your enterprise was founded? It must have 4 digits, eg 1990. %s") % environment.tip_message_enterprise_activation_question) : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>
 
     <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
 
diff --git a/app/views/account/already_activated.html.erb b/app/views/account/already_activated.html.erb
index 6da29b1..4eca7b1 100644
--- a/app/views/account/already_activated.html.erb
+++ b/app/views/account/already_activated.html.erb
@@ -1 +1 @@
-<%= __('This enterprise is already active') %>
+<%= _('This enterprise is already active') %>
diff --git a/app/views/account/blocked.html.erb b/app/views/account/blocked.html.erb
index 279843c..4151790 100644
--- a/app/views/account/blocked.html.erb
+++ b/app/views/account/blocked.html.erb
@@ -1,16 +1,16 @@
 <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>
+<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 activation was disabled for your security.') %>
 <% else %>
-  <%= __('We don\'t have enough information about your enterprise to identify you.') %>
+  <%= _('We don\'t have enough information about your enterprise to identify you.') %>
 <% end %>
 </p>
 
 <% if @environment.activation_blocked_text.blank? %>
-  <%= __('Your enterprise has been blocked') %>
+  <%= _('Your enterprise has been blocked') %>
 <% else %>
   <%= @environment.activation_blocked_text %>
 <% end %>
diff --git a/app/views/account/invalid_enterprise_code.html.erb b/app/views/account/invalid_enterprise_code.html.erb
index d0006b4..70cfb2d 100644
--- a/app/views/account/invalid_enterprise_code.html.erb
+++ b/app/views/account/invalid_enterprise_code.html.erb
@@ -1,5 +1,5 @@
-<h1><%= __("Invalid enterprise code") %></h1>
+<h1><%= _("Invalid enterprise code") %></h1>
 
 <p>
-<%= __('The code you are using for validate your enterprise is not valid. Please check if you are typing it correctly.') %>
+<%= _('The code you are using for validate your enterprise is not valid. Please check if you are typing it correctly.') %>
 </p>
diff --git a/app/views/account/welcome.html.erb b/app/views/account/welcome.html.erb
index 3469b3d..21956a8 100644
--- a/app/views/account/welcome.html.erb
+++ b/app/views/account/welcome.html.erb
@@ -1,10 +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 %>
+  <%= _('%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 %>
+    <%= button 'forward', _('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
   <% end %>
 <% end %>
diff --git a/app/views/admin_panel/index.html.erb b/app/views/admin_panel/index.html.erb
index cac3be8..59fca4d 100644
--- a/app/views/admin_panel/index.html.erb
+++ b/app/views/admin_panel/index.html.erb
@@ -36,7 +36,7 @@
 <h2><%= _('Enterprise-related settings') %></h2>
 
 <table>
-  <tr><td><%= link_to __('Message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
+  <tr><td><%= link_to _('Message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
   <tr><td><%= link_to _('Validators by region'), :controller => 'region_validators' %></td></tr>
   <tr><td><%= link_to _('Categories'), :controller => 'categories'%></td></tr>
 </table>
diff --git a/app/views/blocks/my_network.html.erb b/app/views/blocks/my_network.html.erb
index 14d39a3..e6b7762 100644
--- a/app/views/blocks/my_network.html.erb
+++ b/app/views/blocks/my_network.html.erb
@@ -3,7 +3,7 @@
 <%= render :file => 'blocks/my_network/' + owner.class.name.underscore, :locals => { :owner => owner } %>
 
 <ul>
-  <li><%= link_to(__('Homepage'), owner.url, :class => 'url') %></li>
+  <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
   <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
   <% if !user.nil? and owner.organization? and user.has_permission?('edit_profile', profile) %>
     <li><%= link_to _('Control panel'), :controller => 'profile_editor', :profile => profile.identifier %></li>
diff --git a/app/views/blocks/my_network/person.html.erb b/app/views/blocks/my_network/person.html.erb
index 2aa9f85..6c783e7 100644
--- a/app/views/blocks/my_network/person.html.erb
+++ b/app/views/blocks/my_network/person.html.erb
@@ -1,9 +1,9 @@
 <ul>
   <li><%= link_to(n_( 'One article published', '%s articles published', owner.articles.count) %
   content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') ) %></li>
-  <li><%= link_to(n__('One friend', '%s friends', owner.friends.count) %
+  <li><%= link_to(n_('One friend', '%s friends', owner.friends.count) %
   content_tag('b', owner.friends.count), owner.public_profile_url.merge(:action => 'friends')) %></li>
-  <li><%= link_to(n__('One community', '%{num} communities', owner.communities.visible.size) %
+  <li><%= link_to(n_('One community', '%{num} communities', owner.communities.visible.size) %
   {:num => content_tag('b', owner.communities.visible.size)}, owner.public_profile_url.merge(:action => 'communities')) %></li>
   <li><%= link_to(n_('One tag', '%s tags', owner.article_tags.size) %
   content_tag('b', owner.article_tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
diff --git a/app/views/blocks/profile_info.html.erb b/app/views/blocks/profile_info.html.erb
index 012ffc8..3e934ab 100644
--- a/app/views/blocks/profile_info.html.erb
+++ b/app/views/blocks/profile_info.html.erb
@@ -15,7 +15,7 @@
 </div>
 
 <ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
-  <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
+  <li><%= link_to _('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
   <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
diff --git a/app/views/blocks/profile_info_actions/community.html.erb b/app/views/blocks/profile_info_actions/community.html.erb
index 96cb8f7..3d88d6b 100644
--- a/app/views/blocks/profile_info_actions/community.html.erb
+++ b/app/views/blocks/profile_info_actions/community.html.erb
@@ -2,11 +2,11 @@
   <% if logged_in? %>
     <% if profile.members.include?(user) %>
       <li>
-        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
+        <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
           :class => 'leave-community',
           :title => _("Leave community"),
           :style => 'position: relative;') %>
-        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
+        <%= button(:add, content_tag('span', _('Join')), profile.join_url,
           :class => 'join-community',
           :title => _("Join community"),
           :style => 'position: relative; display: none;') %>
@@ -14,11 +14,11 @@
     <% else %>
       <% unless profile.already_request_membership?(user) %>
         <li>
-        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
+        <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
           :class => 'leave-community',
           :title => _("Leave community"),
           :style => 'position: relative; display: none;') %>
-        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
+        <%= button(:add, content_tag('span', _('Join')), profile.join_url,
           :class => 'join-community',
           :title => _("Join community"),
           :style => 'position: relative;') %>
diff --git a/app/views/blocks/profile_info_actions/enterprise.html.erb b/app/views/blocks/profile_info_actions/enterprise.html.erb
index 134a67e..34ada88 100644
--- a/app/views/blocks/profile_info_actions/enterprise.html.erb
+++ b/app/views/blocks/profile_info_actions/enterprise.html.erb
@@ -1,7 +1,7 @@
 <ul>
   <%if logged_in? %>
     <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => __('Add enterprise as favorite') %></li>
+      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
     <% end %>
   <% end %>
   <% if profile.enable_contact? %>
diff --git a/app/views/blocks/profile_info_actions/person.html.erb b/app/views/blocks/profile_info_actions/person.html.erb
index 5b430c1..0af33fe 100644
--- a/app/views/blocks/profile_info_actions/person.html.erb
+++ b/app/views/blocks/profile_info_actions/person.html.erb
@@ -3,7 +3,7 @@
 
     <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
       <li>
-      <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+      <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
       </li>
     <% end %>
 
diff --git a/app/views/enterprise_registration/basic_information.html.erb b/app/views/enterprise_registration/basic_information.html.erb
index 8f375ab..d1b015c 100644
--- a/app/views/enterprise_registration/basic_information.html.erb
+++ b/app/views/enterprise_registration/basic_information.html.erb
@@ -1,11 +1,11 @@
 <%= error_messages_for 'create_enterprise' %>
 
-<h1><%= __('Enterprise registration') %></h1>
+<h1><%= _('Enterprise registration') %></h1>
 
 
 <% if @validation == :region && @regions.empty? %>
   <div class='atention'>
-    <%= __('There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions.') %>
+    <%= _('There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions.') %>
   </div>
 
   <% button_bar do %>
@@ -13,7 +13,7 @@
   <% end %>
 <% else %>
   <div class='atention'>
-    <%= __('To register a new enterprise, fill in the form and hit the Register button. Then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state) and when the enterprise is aproved you will be able to activate its profile.')  %>
+    <%= _('To register a new enterprise, fill in the form and hit the Register button. Then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state) and when the enterprise is aproved you will be able to activate its profile.')  %>
   </div>
 
   <%= required_fields_message %>
diff --git a/app/views/enterprise_registration/confirmation.html.erb b/app/views/enterprise_registration/confirmation.html.erb
index f7e2b15..73a6694 100644
--- a/app/views/enterprise_registration/confirmation.html.erb
+++ b/app/views/enterprise_registration/confirmation.html.erb
@@ -1,7 +1,7 @@
-<h1><%= __('Enterprise registration completed') %></h1>
+<h1><%= _('Enterprise registration completed') %></h1>
 
 <p>
-<%= __("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %>
+<%= _("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %>
 </p>
 
 <p>
diff --git a/app/views/enterprise_registration/creation.html.erb b/app/views/enterprise_registration/creation.html.erb
index 77e742c..aae75da 100644
--- a/app/views/enterprise_registration/creation.html.erb
+++ b/app/views/enterprise_registration/creation.html.erb
@@ -1,9 +1,9 @@
-<h1><%= __('Enterprise registration completed') %></h1>
+<h1><%= _('Enterprise registration completed') %></h1>
 
 <p>
-<%= __("Your enterprise (%s) was successfully registered.") % @enterprise.name %>
+<%= _("Your enterprise (%s) was successfully registered.") % @enterprise.name %>
 </p>
 
 <p>
-<%= link_to __('You can manage your enterprise now.'), @enterprise.admin_url %>
+<%= link_to _('You can manage your enterprise now.'), @enterprise.admin_url %>
 </p>
diff --git a/app/views/enterprise_registration/select_validator.html.erb b/app/views/enterprise_registration/select_validator.html.erb
index 689486c..6603527 100644
--- a/app/views/enterprise_registration/select_validator.html.erb
+++ b/app/views/enterprise_registration/select_validator.html.erb
@@ -1,7 +1,7 @@
-<h1><%= __('Enterprise registration: validator organization') %></h1>
+<h1><%= _('Enterprise registration: validator organization') %></h1>
 
 <p>
-<%= __('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
+<%= _('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
 </p>
 
 <% form_tag do %>
diff --git a/app/views/enterprise_validation/details.html.erb b/app/views/enterprise_validation/details.html.erb
index 5d46c4d..7fe9d27 100644
--- a/app/views/enterprise_validation/details.html.erb
+++ b/app/views/enterprise_validation/details.html.erb
@@ -12,7 +12,7 @@
 
 <h4><%= _('Approve') %></h4>
 
-<p><%= __('If this enterprise passes the criteria to be considered an solidarity enconomy enterprise, you can approve it by click the button below.') %></p>
+<p><%= _('If this enterprise passes the criteria to be considered an solidarity enconomy enterprise, you can approve it by click the button below.') %></p>
 
 <% form_tag :action => 'approve', :id => @pending.code do %>
   <% button_bar do %>
@@ -22,7 +22,7 @@
 
 <h4><%= _('Reject') %></h4>
 
-<p><%= __('If this enterprise does not pass the criteria do be considered, use this form.') %></p>
+<p><%= _('If this enterprise does not pass the criteria do be considered, use this form.') %></p>
 
 <% form_tag :action => 'reject', :id => @pending.code do %>
   <%= labelled_form_field(_('Please provide an explanation for the rejection. This explanation will be sent to the requestor (required).'), text_area_tag('reject_explanation'))%>
diff --git a/app/views/enterprise_validation/index.html.erb b/app/views/enterprise_validation/index.html.erb
index 90d3152..5b226f9 100644
--- a/app/views/enterprise_validation/index.html.erb
+++ b/app/views/enterprise_validation/index.html.erb
@@ -1,11 +1,11 @@
-<h1><%= __('Enterprise validations') %></h1>
+<h1><%= _('Enterprise validations') %></h1>
 
 <% button_bar do %>
   <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }) %>
   <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }) %>
 <% end %>
 
-<h2><%= __("Pending enterprise validations") %></h2>
+<h2><%= _("Pending enterprise validations") %></h2>
 
 <% for pending in @pending_validations %>
   <h3><%= pending.name %></h3>
@@ -27,7 +27,7 @@
   <%= link_to _("See details/approve/reject"), :action => 'details', :id => pending.code %>
 <% end %>
 
-<h2><%= __('Processed enterprise validations') %></h2>
+<h2><%= _('Processed enterprise validations') %></h2>
 
-<p><%= link_to __("See the list of processed enterprise validations"), :action => 'list_processed' %></p>
+<p><%= link_to _("See the list of processed enterprise validations"), :action => 'list_processed' %></p>
 
diff --git a/app/views/enterprise_validation/list_processed.html.erb b/app/views/enterprise_validation/list_processed.html.erb
index c3dcc8e..14a300c 100644
--- a/app/views/enterprise_validation/list_processed.html.erb
+++ b/app/views/enterprise_validation/list_processed.html.erb
@@ -1,4 +1,4 @@
-<h2><%= __("Processed enterprise validations") %></h2>
+<h2><%= _("Processed enterprise validations") %></h2>
 
 <%= link_to _("Back"), :action => 'index' %>
 
diff --git a/app/views/favorite_enterprises/add.html.erb b/app/views/favorite_enterprises/add.html.erb
index b75d1bd..90bd323 100644
--- a/app/views/favorite_enterprises/add.html.erb
+++ b/app/views/favorite_enterprises/add.html.erb
@@ -1,12 +1,12 @@
-<h1><%= __('Adding %s as a favorite enterprise') % @favorite_enterprise.name %></h1>
+<h1><%= _('Adding %s as a favorite enterprise') % @favorite_enterprise.name %></h1>
 
 <p>
-<%= __('Are you sure you want to add %s as your favorite enterprise?') % @favorite_enterprise.name %>
+<%= _('Are you sure you want to add %s as your favorite enterprise?') % @favorite_enterprise.name %>
 </p>
 
 <% form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
 
-  <%= submit_button(:ok, __("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
+  <%= submit_button(:ok, _("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
   <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
 <% end %>
diff --git a/app/views/favorite_enterprises/index.html.erb b/app/views/favorite_enterprises/index.html.erb
index aded584..e7bd63f 100644
--- a/app/views/favorite_enterprises/index.html.erb
+++ b/app/views/favorite_enterprises/index.html.erb
@@ -1,6 +1,6 @@
 <div id="manage_favorite_enterprises">
 
-<h1><%= __("%s's favorite enterprises") % profile.name %></h1>
+<h1><%= _("%s's favorite enterprises") % profile.name %></h1>
 
 <ul class="profile-list">
 <% @favorite_enterprises.each do |enterprise| %>
@@ -21,7 +21,7 @@
 <% if @favorite_enterprises.empty? %>
 <p>
 <em>
-  <%= __('You have no favorite enterprises yet.') %>
+  <%= _('You have no favorite enterprises yet.') %>
 </em>
 </p>
 <% end %>
diff --git a/app/views/favorite_enterprises/remove.html.erb b/app/views/favorite_enterprises/remove.html.erb
index c497f3c..3b5fa43 100644
--- a/app/views/favorite_enterprises/remove.html.erb
+++ b/app/views/favorite_enterprises/remove.html.erb
@@ -1,17 +1,17 @@
 <div id="remove_favorite_enterprise">
 
-<h1><%= __('Removing favorite enterprise: %s') % @favorite_enterprise.name %></h1>
+<h1><%= _('Removing favorite enterprise: %s') % @favorite_enterprise.name %></h1>
 
 <%= profile_image @favorite_enterprise, :thumb, :class => 'favorite_enterprise_picture' %>
 
 <p>
-<%= __('Are you sure you want to remove %s from your favorite enterprise list?') % @favorite_enterprise.name %>
+<%= _('Are you sure you want to remove %s from your favorite enterprise list?') % @favorite_enterprise.name %>
 </p>
 
 <% form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
 
-  <%= submit_button(:ok, __("Yes, I want to remove %s from my favorite enterprise list") % @favorite_enterprise.name) %>
+  <%= submit_button(:ok, _("Yes, I want to remove %s from my favorite enterprise list") % @favorite_enterprise.name) %>
   <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
 <% end %>
 
diff --git a/app/views/features/_manage_community_fields.html.erb b/app/views/features/_manage_community_fields.html.erb
index f5972be..55d7013 100644
--- a/app/views/features/_manage_community_fields.html.erb
+++ b/app/views/features/_manage_community_fields.html.erb
@@ -1,4 +1,4 @@
-<h2><%= __('Manage community fields') %></h2>
+<h2><%= _('Manage community fields') %></h2>
 
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
 
diff --git a/app/views/features/_manage_enterprise_fields.html.erb b/app/views/features/_manage_enterprise_fields.html.erb
index 6c4b731..ff412e5 100644
--- a/app/views/features/_manage_enterprise_fields.html.erb
+++ b/app/views/features/_manage_enterprise_fields.html.erb
@@ -1,4 +1,4 @@
-<h2><%= __('Manage enterprise fields') %></h2>
+<h2><%= _('Manage enterprise fields') %></h2>
 
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
 
diff --git a/app/views/friends/index.html.erb b/app/views/friends/index.html.erb
index 710cd30..94bed84 100644
--- a/app/views/friends/index.html.erb
+++ b/app/views/friends/index.html.erb
@@ -1,12 +1,12 @@
 <div id="manage_friends">
 
-<h1><%= __("%s's friends") % profile.name %></h1>
+<h1><%= _("%s's friends") % profile.name %></h1>
 
 <% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
   <% if @friends.empty? %>
     <p>
       <em>
-        <%= __('You have no friends yet.') %>
+        <%= _('You have no friends yet.') %>
         <%= link_to _('Do you want to see other people in this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %>
       </em>
     </p>
diff --git a/app/views/friends/remove.html.erb b/app/views/friends/remove.html.erb
index 7692da3..b5213e7 100644
--- a/app/views/friends/remove.html.erb
+++ b/app/views/friends/remove.html.erb
@@ -1,23 +1,23 @@
 <div id="remove_friend">
 
-<h1><%= __('Removing friend: %s') % @friend.name %></h1>
+<h1><%= _('Removing friend: %s') % @friend.name %></h1>
 
 <%= profile_image @friend, :thumb, :class => 'friend_picture' %>
 
 <p>
-<%= __('Are you sure you want to remove %s from your friends list?') % @friend.name %>
+<%= _('Are you sure you want to remove %s from your friends list?') % @friend.name %>
 </p>
 
 <p>
 <em>
-<%= __('Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.') % @friend.name %>
+<%= _('Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.') % @friend.name %>
 </em>
 </p>
 
 <% form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
 
-  <%= submit_button(:ok, __("Yes") % @friend.name) %>
+  <%= submit_button(:ok, _("Yes") % @friend.name) %>
   <%= button(:cancel, _("No"), :action => 'index') %>
 <% end %>
 
diff --git a/app/views/layouts/_javascript.html.erb b/app/views/layouts/_javascript.html.erb
index 1c9e5dd..9bcf78d 100644
--- a/app/views/layouts/_javascript.html.erb
+++ b/app/views/layouts/_javascript.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag :defaults, 'jquery-latest.js',
+<%= javascript_include_tag 'prototype.js', 'effects.js', 'dragdrop.js', 'controls.js', 'jquery-latest.js',
 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
diff --git a/app/views/layouts/application-ng.html.erb b/app/views/layouts/application-ng.html.erb
index e785ce3..6a42fed 100644
--- a/app/views/layouts/application-ng.html.erb
+++ b/app/views/layouts/application-ng.html.erb
@@ -8,7 +8,7 @@
     <meta name="description" content="<%= @environment.name %>" />
     <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
     <%= noosfero_javascript %>
-    <%= stylesheet_link_tag noosfero_stylesheets, :cache => 'cache' %>
+    <%= stylesheet_link_tag *noosfero_stylesheets, :cache => 'cache' %>
     <%= stylesheet_link_tag template_stylesheet_path %>
     <%= stylesheet_link_tag icon_theme_stylesheet_path %>
     <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
diff --git a/app/views/memberships/index.html.erb b/app/views/memberships/index.html.erb
index 66aeeb6..039076d 100644
--- a/app/views/memberships/index.html.erb
+++ b/app/views/memberships/index.html.erb
@@ -3,8 +3,8 @@
 <h1><%= _('Manage my groups') %></h1>
 
 <% button_bar do %>
-  <%= button(:add, __('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
-  <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if environment.enabled?('enterprise_registration') %>
+  <%= button(:add, _('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
+  <%= button :add, _('Register a new enterprise'), :controller => 'enterprise_registration' if environment.enabled?('enterprise_registration') %>
   <%= button :back, _('Go back'), :controller => 'profile_editor' %>
 <% end %>
 
diff --git a/app/views/memberships/new_community.html.erb b/app/views/memberships/new_community.html.erb
index d21aa42..f3238fa 100644
--- a/app/views/memberships/new_community.html.erb
+++ b/app/views/memberships/new_community.html.erb
@@ -1,4 +1,4 @@
-<h1><%= __('Creating new community') %></h1>
+<h1><%= _('Creating new community') %></h1>
 
 <% if environment.enabled?('admin_must_approve_new_communities') %>
   <div class='explanation'>
diff --git a/app/views/profile/_person_profile.html.erb b/app/views/profile/_person_profile.html.erb
index 9fac130..8fb174d 100644
--- a/app/views/profile/_person_profile.html.erb
+++ b/app/views/profile/_person_profile.html.erb
@@ -20,7 +20,7 @@
 
     <% if !environment.enabled?('disable_asset_enterprises') && !profile.enterprises.empty? %>
       <tr>
-        <th colspan='2'><%= __('Enterprises') %></th>
+        <th colspan='2'><%= _('Enterprises') %></th>
       </tr>
       <% profile.enterprises.includes(:environment,:domains, :preferred_domain).each do |item| %>
         <tr>
@@ -34,11 +34,11 @@
       <th colspan='2'><%= _('Network')%></th>
     </tr>
     <tr>
-      <td><%= __('Friends') + ':' %></td>
+      <td><%= _('Friends') + ':' %></td>
       <td><%= link_to  profile.friends.count, { :controller => 'profile', :action => 'friends' } %></td>
     </tr>
     <tr>
-      <td><%= __('Communities') + ':' %></td>
+      <td><%= _('Communities') + ':' %></td>
       <td><%= link_to profile.communities.count, :controller => "profile", :action => 'communities' %></td>
     </tr>
 
diff --git a/app/views/profile/_private_profile.html.erb b/app/views/profile/_private_profile.html.erb
index 1d5cae3..1f0205c 100644
--- a/app/views/profile/_private_profile.html.erb
+++ b/app/views/profile/_private_profile.html.erb
@@ -7,10 +7,10 @@
 
 <% button_bar do %>
   <% if @action == :join && logged_in? %>
-    <%= button(:add, content_tag('span', __('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
+    <%= button(:add, content_tag('span', _('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
   <% end %>
   <% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>
-    <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+    <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
   <% end %>
   <%= button :back, _('Go back'), :back %>
   <%= button :home, _("Go to %s home page") % environment.name, :controller => 'home' %>
diff --git a/app/views/profile/enterprises.html.erb b/app/views/profile/enterprises.html.erb
index d292177..f3b2473 100644
--- a/app/views/profile/enterprises.html.erb
+++ b/app/views/profile/enterprises.html.erb
@@ -1,6 +1,6 @@
 <div class="common-profile-list-block">
 
-<h1><%= __("%s's enterprises") % profile.name %></h1>
+<h1><%= _("%s's enterprises") % profile.name %></h1>
 
 <ul class='profile-list'>
 <% @enterprises.each do |enterprise| %>
@@ -10,7 +10,7 @@
 
 <% button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
-  <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if logged_in? && environment.enabled?('enterprise_registration') %>
+  <%= button :add, _('Register a new enterprise'), :controller => 'enterprise_registration' if logged_in? && environment.enabled?('enterprise_registration') %>
 <% end %>
 
 </div><!-- fim class="common-profile-list-block" -->
diff --git a/app/views/profile/fans.html.erb b/app/views/profile/fans.html.erb
index f634123..ee06586 100644
--- a/app/views/profile/fans.html.erb
+++ b/app/views/profile/fans.html.erb
@@ -1,6 +1,6 @@
 <div class="common-profile-list-block">
 
-<h1><%= __("%s's fans") % profile.name %></h1>
+<h1><%= _("%s's fans") % profile.name %></h1>
 
 <ul class='profile-list'>
 <% @fans.each do |person| %>
diff --git a/app/views/profile/favorite_enterprises.html.erb b/app/views/profile/favorite_enterprises.html.erb
index 6484312..3943a77 100644
--- a/app/views/profile/favorite_enterprises.html.erb
+++ b/app/views/profile/favorite_enterprises.html.erb
@@ -1,6 +1,6 @@
 <div class="common-profile-list-block">
 
-<h1><%= __("%s's favorite enterprises") % profile.name %></h1>
+<h1><%= _("%s's favorite enterprises") % profile.name %></h1>
 
 <ul class='profile-list'>
 <% @favorite_enterprises.each do |enterprise| %>
diff --git a/app/views/profile/friends.html.erb b/app/views/profile/friends.html.erb
index 1da9c59..cae5b13 100644
--- a/app/views/profile/friends.html.erb
+++ b/app/views/profile/friends.html.erb
@@ -1,6 +1,6 @@
 <div class="common-profile-list-block">
 
-<h1><%= __("%s's friends") % profile.name %></h1>
+<h1><%= _("%s's friends") % profile.name %></h1>
 
 <% cache_timeout(profile.friends_cache_key(params), 4.hours) do %>
 <ul class='profile-list'>
diff --git a/app/views/profile_editor/disable.html.erb b/app/views/profile_editor/disable.html.erb
index effea8c..575c96c 100644
--- a/app/views/profile_editor/disable.html.erb
+++ b/app/views/profile_editor/disable.html.erb
@@ -1,4 +1,4 @@
-<h1><%= __("Disabling '%s' enterprise") % @to_disable.name %></h1>
+<h1><%= _("Disabling '%s' enterprise") % @to_disable.name %></h1>
 
 <p>
 <%= _('Are you sure you want to disable %s?') % @to_disable.name %>
diff --git a/app/views/profile_editor/enable.html.erb b/app/views/profile_editor/enable.html.erb
index 497cb2f..1852691 100644
--- a/app/views/profile_editor/enable.html.erb
+++ b/app/views/profile_editor/enable.html.erb
@@ -1,4 +1,4 @@
-<h1><%= __("Enabling '%s' enterprise") % @to_enable.name %></h1>
+<h1><%= _("Enabling '%s' enterprise") % @to_enable.name %></h1>
 
 <p>
 <%= _('Are you sure you want to enable %s?') % @to_enable.name %>
diff --git a/app/views/profile_editor/index.html.erb b/app/views/profile_editor/index.html.erb
index 4044a64..d656c0e 100644
--- a/app/views/profile_editor/index.html.erb
+++ b/app/views/profile_editor/index.html.erb
@@ -41,7 +41,7 @@
 
   <%= control_panel_button(_('Change Password'), 'change-password', :controller => 'account', :action => 'change_password') if profile.person? %>
 
-  <%= control_panel_button(__('Manage friends'), 'friends', :controller => 'friends', :action => 'index') if profile.person? %>
+  <%= control_panel_button(_('Manage friends'), 'friends', :controller => 'friends', :action => 'index') if profile.person? %>
 
   <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
 
@@ -49,18 +49,18 @@
 
   <% if !environment.enabled?('disable_asset_enterprises') %>
     <% if profile.is_validation_entity? %>
-      <%= control_panel_button(__('Enterprise Validation'), 'validation', :controller => 'enterprise_validation') %>
+      <%= control_panel_button(_('Enterprise Validation'), 'validation', :controller => 'enterprise_validation') %>
     <% end %>
     <% if profile.person? %>
-      <%= control_panel_button(__('Favorite Enterprises'), 'favorites', :controller => 'favorite_enterprises') %>
+      <%= control_panel_button(_('Favorite Enterprises'), 'favorites', :controller => 'favorite_enterprises') %>
     <% end %>
   <% end %>
 
   <% if profile.enterprise? %>
     <% if profile.enabled? %>
-      <%= control_panel_button(__('Disable'), 'disable', :action => 'disable') %>
+      <%= control_panel_button(_('Disable'), 'disable', :action => 'disable') %>
     <% else %>
-      <%= control_panel_button(__('Enable'), 'enable', :action => 'enable') %>
+      <%= control_panel_button(_('Enable'), 'enable', :action => 'enable') %>
     <% end %>
   <% end %>
 
@@ -78,10 +78,10 @@
 
       <div id='activation_enterprise'>
       <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
-        <p><strong><%= __('Activate your enterprise') %></strong></p>
-	<p><%= __("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %></p>
+        <p><strong><%= _('Activate your enterprise') %></strong></p>
+	<p><%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %></p>
 	<p><%= environment.help_message_to_add_enterprise %> </p>
-        <%= labelled_form_field(__('Enterprise activation code') + ': ', text_field_tag('enterprise_code')) %>
+        <%= labelled_form_field(_('Enterprise activation code') + ': ', text_field_tag('enterprise_code')) %>
         <%= submit_button(:ok, _('Activate')) %>
       <% end %>
     </div>
diff --git a/app/views/search/_sellers_form.html.erb b/app/views/search/_sellers_form.html.erb
index c21b293..40a5534 100644
--- a/app/views/search/_sellers_form.html.erb
+++ b/app/views/search/_sellers_form.html.erb
@@ -4,7 +4,7 @@
 
   <div class="search-in-opt"><%= _('Search in:') %>
     <dir>
-      <%= labelled_radio_button __('Enterprises'), 'asset', 'enterprises', true %><br />
+      <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
       <%= labelled_radio_button _('Products'), 'asset', 'products', false %>
     </dir>
   </div>
diff --git a/app/views/search/communities.html.erb b/app/views/search/communities.html.erb
index 4566cf5..95c7c59 100644
--- a/app/views/search/communities.html.erb
+++ b/app/views/search/communities.html.erb
@@ -4,7 +4,7 @@
   <% if logged_in? %>
     <% button_bar do %>
       <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
-      <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
+      <%= button(:add, _('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
     <% end %>
   <% end %>
 
diff --git a/app/views/search/enterprises.html.erb b/app/views/search/enterprises.html.erb
index e8bfedf..3ffd68c 100644
--- a/app/views/search/enterprises.html.erb
+++ b/app/views/search/enterprises.html.erb
@@ -3,7 +3,7 @@
 <div id="search-column-left">
   <% if logged_in? && environment.enabled?('enterprise_registration') %>
     <% button_bar do %>
-      <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) %>
+      <%= button(:add, _('New enterprise'), {:controller => 'enterprise_registration'}) %>
     <% end %>
   <% end %>
 
diff --git a/app/views/shared/user_menu.html.erb b/app/views/shared/user_menu.html.erb
index 4ed6547..4a40cde 100644
--- a/app/views/shared/user_menu.html.erb
+++ b/app/views/shared/user_menu.html.erb
@@ -12,7 +12,7 @@
       <ul>
 
         <li>
-          <%= link_to( '<span class="icon-menu-home"></span>' + __('My Home Page'), '/{login}')%>
+          <%= link_to( '<span class="icon-menu-home"></span>' + _('My Home Page'), '/{login}')%>
         </li>
 
         <li>
diff --git a/lib/noosfero/core_ext.rb b/lib/noosfero/core_ext.rb
index aa0459e..ad34b3b 100644
--- a/lib/noosfero/core_ext.rb
+++ b/lib/noosfero/core_ext.rb
@@ -1,4 +1,3 @@
 require 'noosfero/core_ext/string'
 require 'noosfero/core_ext/integer'
-require 'noosfero/core_ext/object'
 require 'noosfero/core_ext/active_record'
diff --git a/lib/noosfero/core_ext/object.rb b/lib/noosfero/core_ext/object.rb
deleted file mode 100644
index fed788d..0000000
--- a/lib/noosfero/core_ext/object.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class Object
-  def __(*args)
-    gettext(Noosfero.term(*args))
-  end
-  alias :getterm :__
-
-  def n__(for_one, for_many, num)
-    ngettext(getterm(for_one), getterm(for_many), num)
-  end
-end
--
libgit2 0.21.2