diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index 32ef73b..095378c 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -194,10 +194,10 @@ class SearchController < ApplicationController
     @names = {}
     [
       [ :people, _('People'), @finder.recent('people', limit) ],
-      [ :enterprises, _('Enterprises'), @finder.recent('enterprises', limit) ],
+      [ :enterprises, __('Enterprises'), @finder.recent('enterprises', limit) ],
       [ :products, ('Products'), @finder.recent('products', limit) ],
       [ :events, _('Upcoming events'), @finder.upcoming_events({:per_page => limit}) ],
-      [ :communities, _('Communities'), @finder.recent('communities', limit) ],
+      [ :communities, __('Communities'), @finder.recent('communities', limit) ],
       [ :most_commented_articles, _('Most commented articles'), @finder.most_commented_articles(limit) ],
       [ :articles, _('Articles'), @finder.recent('text_articles', limit) ]
     ].each do |key, name, list|
diff --git a/app/helpers/assets_helper.rb b/app/helpers/assets_helper.rb
index bce1e10..089707e 100644
--- a/app/helpers/assets_helper.rb
+++ b/app/helpers/assets_helper.rb
@@ -7,7 +7,7 @@ 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 => 'enterprises'), "icon-menu-enterprise", __('Enterprises') ],
       [ options.merge(:asset => 'communities'), "icon-menu-community",  __('Communities') ],
       [ options.merge(:asset => 'events'), "icon-menu-events",   _('Events') ],
 
diff --git a/app/models/enterprises_block.rb b/app/models/enterprises_block.rb
index dc62772..e6fc46e 100644
--- a/app/models/enterprises_block.rb
+++ b/app/models/enterprises_block.rb
@@ -1,15 +1,15 @@
 class EnterprisesBlock < ProfileListBlock
 
   def default_title
-    _('Enterprises')
+    __('Enterprises')
   end
 
   def help
-    _('The enterprises where this user works.')
+    __('The enterprises where this user works.')
   end
 
   def self.description
-    _('A block that displays your enterprises')
+    __('A block that displays your enterprises')
   end
 
   def footer
@@ -17,11 +17,11 @@ class EnterprisesBlock < ProfileListBlock
     case owner
     when Profile
       lambda do
-        link_to _('All enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
+        link_to __('All enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
       end
     when Environment
       lambda do
-        link_to _('All enterprises'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
+        link_to __('All enterprises'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
       end
     else
       ''
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 5f3af7a..eecefc6 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -23,7 +23,7 @@ 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_products' => _('Disable search for products'),
diff --git a/app/models/environment_statistics_block.rb b/app/models/environment_statistics_block.rb
index a74093c..b895e38 100644
--- a/app/models/environment_statistics_block.rb
+++ b/app/models/environment_statistics_block.rb
@@ -15,7 +15,7 @@ class EnvironmentStatisticsBlock < Block
 
     info = [
       n_('One user', '%{num} users', users) % { :num => users },
-      n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
+      n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
       n__('One community', '%{num} communities', communities) % { :num => communities },
     ]
 
diff --git a/app/models/favorite_enterprises_block.rb b/app/models/favorite_enterprises_block.rb
index fec5d63..4d47ad6 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 user\'s favorite enterprises.')
+    __('This user\'s favorite enterprises.')
   end
 
   def self.description
-    _('A block that displays your favorite enterprises')
+    __('A block that displays your favorite enterprises')
   end
 
   def footer
     owner = self.owner
     return '' unless owner.kind_of?(Person)
     lambda do
-      link_to _('All favorite enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
+      link_to __('All favorite enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
     end
   end
 
diff --git a/app/models/sellers_search_block.rb b/app/models/sellers_search_block.rb
index 7cf52d6..d5ca69d 100644
--- a/app/models/sellers_search_block.rb
+++ b/app/models/sellers_search_block.rb
@@ -1,7 +1,7 @@
 class SellersSearchBlock < Block
 
   def self.description
-    _('A search for enterprises by products selled and local')
+    __('A search for enterprises by products selled and local')
   end
 
   def self.short_description
diff --git a/app/views/admin_panel/index.rhtml b/app/views/admin_panel/index.rhtml
index 974ad9b..154c393 100644
--- a/app/views/admin_panel/index.rhtml
+++ b/app/views/admin_panel/index.rhtml
@@ -4,7 +4,7 @@
 
 <ul>
   <li><%= link_to _('Edit site info'), :action => 'site_info' %></li>
-  <li><%= link_to _('Edit message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></li>
+  <li><%= link_to __('Edit message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></li>
   <li><%= link_to _('Enable/disable features'), :controller => 'features' %></li>
   <li><%= link_to _('Edit the Visual Design'), :controller => 'environment_design'%></li>
   <li><%= link_to _('Manage Categories'), :controller => 'categories'%></li>
diff --git a/app/views/blocks/profile_info_actions/enterprise.rhtml b/app/views/blocks/profile_info_actions/enterprise.rhtml
index baff518..cc0b357 100644
--- a/app/views/blocks/profile_info_actions/enterprise.rhtml
+++ b/app/views/blocks/profile_info_actions/enterprise.rhtml
@@ -1,12 +1,12 @@
 <ul>
   <%if logged_in? %>
     <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= link_to content_tag('span', _('Add favorite enterprise')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add' %></li>
+      <li><%= link_to content_tag('span', __('Add favorite enterprise')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add' %></li>
     <% end %>
     <% if profile.members.include?(user) %>
-      <li><%= link_to content_tag('span', _('Leave this enterprise')), { :profile => user.identifier, :controller => 'memberships', :action => 'leave', :id => profile.id }, :class => 'button with-text icon-delete' %></li>
+      <li><%= link_to content_tag('span', __('Leave this enterprise')), { :profile => user.identifier, :controller => 'memberships', :action => 'leave', :id => profile.id }, :class => 'button with-text icon-delete' %></li>
     <% else %>
-      <li><%= link_to content_tag('span', _('Join this enterprise')), { :profile => user.identifier, :controller => 'memberships', :action => 'join', :id => profile.id }, :class => 'button with-text icon-add' %></li>
+      <li><%= link_to content_tag('span', __('Join this enterprise')), { :profile => user.identifier, :controller => 'memberships', :action => 'join', :id => profile.id }, :class => 'button with-text icon-add' %></li>
     <% end %>
   <% end %>
 </ul>
diff --git a/app/views/enterprise_validation/index.rhtml b/app/views/enterprise_validation/index.rhtml
index cc3e373..f461305 100644
--- a/app/views/enterprise_validation/index.rhtml
+++ b/app/views/enterprise_validation/index.rhtml
@@ -1,11 +1,11 @@
-<h1><%= _('Enterprise validations') %></h1>
+<h1><%= __('Enterprise validations') %></h1>
 
 <% button_bar do %>
-  <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }, :help => _('Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.'))  %>
+  <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }, :help => __('Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.'))  %>
   <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }, :help => _('Go back to the control panel.')) %>
 <% 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/profile/enterprises.rhtml b/app/views/profile/enterprises.rhtml
index 455cfc9..0dcb7dd 100644
--- a/app/views/profile/enterprises.rhtml
+++ b/app/views/profile/enterprises.rhtml
@@ -1,7 +1,7 @@
 <div class="common-profile-list-block"
-     help="<%= _('Here are all <b>%s</b>\'s enterprises.') % profile.name %>">
+     help="<%= __('Here are all <b>%s</b>\'s enterprises.') % profile.name %>">
 
-<h1><%= _("%s's enterprises") % profile.name %></h1>
+<h1><%= __("%s's enterprises") % profile.name %></h1>
 
 <ul class='profile-list'>
 <% @enterprises.each do |enterprise| %>
@@ -12,7 +12,7 @@
 <% button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' },
       :help => _('Back to the page where you come from.') %>
-  <%= button :add, _('Register a new Enterprise'),
+  <%= button :add, __('Register a new Enterprise'),
       :controller => 'enterprise_registration' if logged_in? %>
 <% end %>
 
diff --git a/app/views/profile/favorite_enterprises.rhtml b/app/views/profile/favorite_enterprises.rhtml
index 5d67a0e..22ece81 100644
--- a/app/views/profile/favorite_enterprises.rhtml
+++ b/app/views/profile/favorite_enterprises.rhtml
@@ -1,7 +1,7 @@
 <div class="common-profile-list-block"
-     help="<%= _('Here are all <b>%s</b>\'s favorite enterprises.') % profile.name %>">
+     help="<%= __('Here are all <b>%s</b>\'s favorite enterprises.') % profile.name %>">
 
-<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/index.rhtml b/app/views/profile/index.rhtml
index 71ee239..f926eca 100644
--- a/app/views/profile/index.rhtml
+++ b/app/views/profile/index.rhtml
@@ -20,7 +20,7 @@
   <% if profile.kind_of? Person %>
     <li><%= link_to _('Friends'), :action => 'friends' %></li>
     <li><%= link_to __('Communities'), :action => 'communities' %></li>
-    <li><%= link_to _('Enterprises'), :action => 'enterprises' %></li>
+    <li><%= link_to __('Enterprises'), :action => 'enterprises' %></li>
   <% end %>
   <% if profile.kind_of? Organization %>
     <li><%= link_to _('Members'), :action => 'members' %></li>
diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml
index 909d14d..94288d7 100644
--- a/app/views/profile_editor/index.rhtml
+++ b/app/views/profile_editor/index.rhtml
@@ -26,15 +26,15 @@
 
   <%= file_manager_button(_('Manage Products and Services'), 'icons-app/products.png', :controller => 'manage_products') if profile.enterprise? %>
 
-  <%= file_manager_button(_('Enterprise Validation'), 'icons-app/validation.png', :controller => 'enterprise_validation') if profile.is_validation_entity? %>
+  <%= file_manager_button(__('Enterprise Validation'), 'icons-app/validation.png', :controller => 'enterprise_validation') if profile.is_validation_entity? %>
 
-  <%= file_manager_button(_('Favorite Enterprises'), 'icons-app/favorites.png', :controller => 'favorite_enterprises') if profile.person? %>
+  <%= file_manager_button(__('Favorite Enterprises'), 'icons-app/favorites.png', :controller => 'favorite_enterprises') if profile.person? %>
 
   <% if profile.enterprise? %>
     <% if profile.enabled? %>
-      <%= file_manager_button(_('Disable Enterprise'), 'icons-app/disable.png', :action => 'disable') %>
+      <%= file_manager_button(__('Disable Enterprise'), 'icons-app/disable.png', :action => 'disable') %>
     <% else %>
-      <%= file_manager_button(_('Enable Enterprise'), 'icons-app/enable.png', :action => 'enable') %>
+      <%= file_manager_button(__('Enable Enterprise'), 'icons-app/enable.png', :action => 'enable') %>
     <% end %>
   <% end %>
 
diff --git a/app/views/search/_sellers_form.rhtml b/app/views/search/_sellers_form.rhtml
index 40a5534..c21b293 100644
--- a/app/views/search/_sellers_form.rhtml
+++ b/app/views/search/_sellers_form.rhtml
@@ -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/enterprises.rhtml b/app/views/search/enterprises.rhtml
index a74eefb..0c82a03 100644
--- a/app/views/search/enterprises.rhtml
+++ b/app/views/search/enterprises.rhtml
@@ -1,8 +1,8 @@
 <h1> 
   <% if !@query.blank? %>
-    <%=h @category ? (_('Enterprise results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Enterprise results for "%s"') % @query) %>
+    <%=h @category ? (__('Enterprise results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (__('Enterprise results for "%s"') % @query) %>
   <% else %>
-    <%=h @category ? (_('Enterprises in "%s"') % @category.name) : _('Enterprise') %>
+    <%=h @category ? (__('Enterprises in "%s"') % @category.name) : __('Enterprises') %>
   <% end %>
 </h1>
 
diff --git a/lib/zen3_terminology.rb b/lib/zen3_terminology.rb
index 69ffb67..c13ee03 100644
--- a/lib/zen3_terminology.rb
+++ b/lib/zen3_terminology.rb
@@ -8,6 +8,7 @@ class Zen3Terminology < Noosfero::Terminology::Custom
     super({
       'My Home Page' => N_('My ePortfolio'),
       'Homepage' => N_('ePortfolio'),
+
       'Communities' => N_('Groups'),
       'A block that displays your communities' => N_('A block that displays your groups'),
       'The communities in which the user is a member' => N_('The groups in which the user is a member'),
@@ -16,6 +17,26 @@ class Zen3Terminology < Noosfero::Terminology::Custom
       'One community' => N_('One group'),
       '%{num} communities' => N_('%{num} groups'),
       'Disable search for communities' => N_('Disable search for groups'),
+
+      'Enterprises' => N_('Organizations'),
+      'The enterprises where this user works.' => N_('The organizations where this user works.'),
+      'A block that displays your enterprises' => N_('A block that displays your organizations.'),
+      'All enterprises' => N_('All organizations'),
+      'Disable search for enterprises' => N_('Disable search for organizations'),
+      'One enterprise' => N_('One organization'),
+      '%{num} enterprises' => N_('%{num} organizations'),
+      'Favorite Enterprises' => N_('Favorite Organizations'),
+      'This user\'s favorite enterprises.' => N_('This user\'s favorite organizations'),
+      'A block that displays your favorite enterprises' => N_('A block that displays your favorite organizations'),
+      'All favorite enterprises' => N_('All favorite organizations'),
+      'A search for enterprises by products selled and local' => N_('A search for organizations by products selled and local'),
+      'Edit message for disabled enterprises' => N_('Edit message for disabled organizations'),
+      'Add favorite enterprise' => N_('Add favorite organization'),
+      'Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.' => N_('Validation info is the information the organizations will see about how your organization processes the organizations validations it receives: validation methodology, restrictions to the types of organizations the organization validates etc.'),
+      'Here are all <b>%s</b>\'s enterprises.' => N_('Here all all <b>%s</b>\'s organizations.'),
+      'Here are all <b>%s</b>\'s favorite enterprises.' => N_('Here are all <b>%s</b>\'s favorite organizations.'),
+      'Favorite Enterprises' => N_('Favorite Organizations'),
+      'Enterprises in "%s"' => N_('Organizations in "%s"'),
     })
   end
 
--
libgit2 0.21.2