ActionItem544: add block to list links

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2181 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem544: add block to list links
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2181 3f533792-8f58-4932-b0fe-aaf55b0a4547
JoenioCosta
1 parent 20584f68
Showing 13 changed files with 2013 additions and 1174 deletions Show diff stats
app/controllers/admin/environment_design_controller.rb
app/helpers/boxes_helper.rb
app/models/link_list_block.rb
app/views/box_organizer/_link_list_block.rhtml
po/de/noosfero.po
po/fr/noosfero.po
po/hy/noosfero.po
po/nl/noosfero.po
po/noosfero.pot
po/pt_BR/noosfero.po
public/stylesheets/common.css
test/functional/environment_design_controller_test.rb
test/unit/link_list_block_test.rb
@@ -3,7 +3,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
   def available_blocks
-    @available_blocks ||= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock ]
+    @available_blocks ||= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock ]
   end
 end
@@ -130,7 +130,7 @@ module BoxesHelper
     end
     if block.editable?
-      buttons << lightbox_icon_button(:edit, _('Edit'), { :controller => 'profile_design', :action => 'edit', :id => block.id })
+      buttons << lightbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
     end
     if !block.main?
@@ -0,0 +1,25 @@
+class LinkListBlock < Block
+
+  settings_items :title, String
+  settings_items :links, Array, :default => []
+
+  before_save do |block|
+    block.links = block.links.delete_if {|i| i[:name].blank? and i[:address].blank?}
+  end
+
+  def self.description
+    _('Display a list of links.')
+  end
+  
+  def content
+    block_title(title) +
+    content_tag('ul',
+      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_to(i[:name], i[:address]))}
+    )
+  end
+
+  def editable?
+    true
+  end
+
+end
@@ -0,0 +1,27 @@
+<p>
+<label for='block_title'><strong><%= _('Block title') %></strong></label>
+<%= text_field_tag 'block[title]', @block.title %>
+</p>
+
+<p>
+<strong><%= _('Links') %></strong>
+<div id='edit-link-list-block'>
+<table id='links' class='noborder'>
+  <tr><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
+  <% for link in @block.links do %>
+    <tr>
+      <td><%= text_field_tag 'block[links][][name]', link[:name] %></td>
+      <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address] %></td>
+    </tr>
+  <% end %>
+  <tr>
+  <td><%= text_field_tag 'block[links][][name]' %></td>
+  <td class='cel-address'><%= text_field_tag 'block[links][][address]' %></td>
+  </tr>
+</table>
+</div>
+</p>
+
+<%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
+        page.insert_html :bottom, 'links', content_tag('tr', content_tag('td',text_field_tag('block[links][][name]')) + content_tag('td',text_field_tag('block[links][][address]', nil, :class => 'cel-address')))
+end %>
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.10.1\n"
-"POT-Creation-Date: 2008-06-27 14:57-0300\n"
+"POT-Creation-Date: 2008-07-08 19: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"
@@ -23,7 +23,7 @@ msgstr &quot;&quot;
 #: app/helpers/application_helper.rb:81
 #: app/views/box_organizer/add_block.rhtml:18
-#: app/views/search/_search_form.rhtml:56
+#: app/views/search/_search_form.rhtml:63
 msgid "Close"
 msgstr ""
@@ -31,61 +31,63 @@ msgstr &quot;&quot;
 msgid "This is %s, version %s"
 msgstr ""
-#: app/helpers/application_helper.rb:318
-#: app/views/memberships/new_community.rhtml:12
-#: app/views/box_organizer/edit.rhtml:9
-#: app/views/admin_panel/site_info.rhtml:11
-#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
-#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
-#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
-#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
-msgid "Cancel"
-msgstr ""
-
-#: app/helpers/application_helper.rb:360 app/models/product.rb:39
+#: app/helpers/application_helper.rb:246 app/models/product.rb:39
 msgid "Uncategorized product"
 msgstr ""
-#: app/helpers/application_helper.rb:366
+#: app/helpers/application_helper.rb:252
 msgid "No product"
 msgstr ""
-#: app/helpers/application_helper.rb:472
+#: app/helpers/application_helper.rb:338
+msgid "non registered gender"
+msgstr ""
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Male"
+msgstr ""
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Female"
+msgstr ""
+
+#: app/helpers/application_helper.rb:366
 msgid "Click on this icon to go to the <b>%s</b>'s home page"
 msgstr ""
-#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
+#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
 #: app/views/content_viewer/view_page.rhtml:65
 msgid "Categories"
 msgstr ""
-#: app/helpers/application_helper.rb:532
+#: app/helpers/application_helper.rb:417
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:568
+#: app/helpers/application_helper.rb:453
 msgid "Search..."
 msgstr ""
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:455
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:571
+#: app/helpers/application_helper.rb:456
 msgid "Click, write and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:577
+#: app/helpers/application_helper.rb:462
 #: app/views/region_validators/region.rhtml:23
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/_sellers_form.rhtml:22
+#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:16
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
 msgid "Search"
 msgstr ""
-#: app/helpers/application_helper.rb:652
+#: app/helpers/application_helper.rb:518
 msgid "Are you sure you want to visit this web site?"
 msgstr ""
@@ -97,6 +99,39 @@ msgstr &quot;&quot;
 msgid "Display in map"
 msgstr ""
+#: app/helpers/search_helper.rb:53
+msgid "E-Mail: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:56
+msgid "Phone(s): "
+msgstr ""
+
+#: app/helpers/search_helper.rb:59
+msgid "Location: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:62
+msgid "Address: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:65
+msgid "Products/Services: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:68
+msgid "Distance: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:81
+msgid "Previous"
+msgstr ""
+
+#: app/helpers/search_helper.rb:81
+#: app/views/enterprise_registration/basic_information.rhtml:32
+msgid "Next"
+msgstr ""
+
 #: app/helpers/dates_helper.rb:6
 msgid "January"
 msgstr ""
@@ -145,47 +180,47 @@ msgstr &quot;&quot;
 msgid "December"
 msgstr ""
-#: app/helpers/dates_helper.rb:23
-msgid "%d %B %Y"
+#: app/helpers/dates_helper.rb:27
+msgid "%{month} %{day}, %{year}"
 msgstr ""
-#: app/helpers/dates_helper.rb:32
+#: app/helpers/dates_helper.rb:36
 msgid "%d %B %Y, %H:%m"
 msgstr ""
-#: app/helpers/dates_helper.rb:42
+#: app/helpers/dates_helper.rb:46
 msgid "from %s to %s"
 msgstr ""
-#: app/helpers/dates_helper.rb:49
+#: app/helpers/dates_helper.rb:53
 msgid "Sunday"
 msgstr ""
-#: app/helpers/dates_helper.rb:50
+#: app/helpers/dates_helper.rb:54
 msgid "Monday"
 msgstr ""
-#: app/helpers/dates_helper.rb:51
+#: app/helpers/dates_helper.rb:55
 msgid "Tuesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:52
+#: app/helpers/dates_helper.rb:56
 msgid "Wednesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:53
+#: app/helpers/dates_helper.rb:57
 msgid "Thursday"
 msgstr ""
-#: app/helpers/dates_helper.rb:54
+#: app/helpers/dates_helper.rb:58
 msgid "Friday"
 msgstr ""
-#: app/helpers/dates_helper.rb:55
+#: app/helpers/dates_helper.rb:59
 msgid "Saturday"
 msgstr ""
-#: app/helpers/dates_helper.rb:71
+#: app/helpers/dates_helper.rb:72
 msgid "%{month} %{year}"
 msgstr ""
@@ -207,32 +242,68 @@ msgid &quot;&quot;
 "It does not affect the language of the content created by other users."
 msgstr ""
+#: app/helpers/enterprise_homepage_helper.rb:6
+#: app/views/enterprise_editor/index.rhtml:8
+msgid "Contact person:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:7
+msgid "e-Mail:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:8
+msgid "Phone(s):"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:9
+msgid "Location:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
+#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
+msgid "Address:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:11
+msgid "Legal form:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:12
+#: app/views/enterprise_editor/index.rhtml:10
+msgid "Foundation year:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:13
+#: app/views/enterprise_editor/index.rhtml:12
+msgid "Economic activity:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:21
+msgid "Distance:"
+msgstr ""
+
 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
 msgid "Main content"
 msgstr ""
-#: app/helpers/boxes_helper.rb:124
+#: app/helpers/boxes_helper.rb:125
 msgid "Move block up"
 msgstr ""
-#: app/helpers/boxes_helper.rb:125
+#: app/helpers/boxes_helper.rb:129
 msgid "Move block down"
 msgstr ""
-#: app/helpers/boxes_helper.rb:126
-msgid "Remove block"
-msgstr ""
-
-#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
+#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
 #: app/views/manage_products/index.rhtml:14
 #: app/views/manage_products/index.rhtml:40
-#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
+#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
 msgid "Edit"
 msgstr ""
-#: app/helpers/profile_helper.rb:7
-msgid "edit your information"
+#: app/helpers/boxes_helper.rb:137
+msgid "Remove block"
 msgstr ""
 #: app/helpers/tags_helper.rb:33
@@ -255,6 +326,24 @@ msgstr &quot;&quot;
 msgid "Administrator assigns validator organizations per region."
 msgstr ""
+#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
+#: app/views/box_organizer/edit.rhtml:9
+#: app/views/admin_panel/site_info.rhtml:11
+#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
+#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
+#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
+#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
+msgid "Cancel"
+msgstr ""
+
+#: app/helpers/forms_helper.rb:64
+msgid "State:"
+msgstr ""
+
+#: app/helpers/forms_helper.rb:65
+msgid "City:"
+msgstr ""
+
 #: app/helpers/categories_helper.rb:6
 msgid "Do not display at the menu"
 msgstr ""
@@ -296,39 +385,40 @@ msgid &quot;Type of category&quot;
 msgstr ""
 #: app/helpers/assets_helper.rb:7
-#: app/controllers/public/search_controller.rb:92
+#: app/controllers/public/search_controller.rb:133
 msgid "Articles"
 msgstr ""
 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
-#: app/controllers/public/search_controller.rb:94
+#: app/controllers/public/search_controller.rb:135
 msgid "People"
 msgstr ""
-#: app/helpers/assets_helper.rb:9
-#: app/controllers/public/search_controller.rb:96
-#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
+#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
+#: app/controllers/public/search_controller.rb:137
+#: app/views/search/_sellers_form.rhtml:7
 msgid "Products"
 msgstr ""
 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
-#: app/controllers/public/search_controller.rb:93
+#: app/controllers/public/search_controller.rb:134
 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
 msgid "Enterprises"
 msgstr ""
 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
-#: app/controllers/public/search_controller.rb:95
+#: app/controllers/public/search_controller.rb:136
 #: app/views/profile/index.rhtml:22
 msgid "Communities"
 msgstr ""
 #: app/helpers/assets_helper.rb:12
-#: app/controllers/public/search_controller.rb:97
+#: app/controllers/public/search_controller.rb:138
 msgid "Events"
 msgstr ""
 #: app/models/enterprise.rb:5 app/models/product.rb:-
+#: app/views/search/enterprises.rhtml:5
 msgid "Enterprise"
 msgstr ""
@@ -336,37 +426,37 @@ msgstr &quot;&quot;
 msgid "Community"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Contact person"
 msgstr ""
-#: app/models/organization.rb:43 app/models/environment.rb:-
+#: app/models/organization.rb:41 app/models/environment.rb:-
 msgid "Contact email"
 msgstr ""
-#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
+#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
 #: app/views/enterprise_validation/_details.rhtml:19
 msgid "Acronym"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Foundation year"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Legal form"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Economic activity"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #: app/views/enterprise_registration/basic_information.rhtml:27
 msgid "Management information"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Validated"
 msgstr ""
@@ -441,8 +531,12 @@ msgstr &quot;&quot;
 msgid "The task was cancelled at %s"
 msgstr ""
+#: app/models/link_list_block.rb:7
+msgid "Display a list of links."
+msgstr ""
+
 #: app/models/favorite_enterprises_block.rb:4
-#: app/views/profile_editor/index.rhtml:29
+#: app/views/profile_editor/index.rhtml:31
 msgid "Favorite Enterprises"
 msgstr ""
@@ -637,6 +731,10 @@ msgstr &quot;&quot;
 msgid "Virtual"
 msgstr ""
+#: app/models/products_block.rb:16
+msgid "View all products"
+msgstr ""
+
 #: app/models/tags_block.rb:8
 msgid "Block listing content count by tag"
 msgstr ""
@@ -647,8 +745,8 @@ msgid &quot;&quot;
 "       Try to add some tags to some articles and see your tag cloud to grow."
 msgstr ""
-#: app/models/tags_block.rb:17
-msgid "%s's tags"
+#: app/models/tags_block.rb:20
+msgid "tags"
 msgstr ""
 #: app/models/friendship.rb:-
@@ -742,7 +840,7 @@ msgstr &quot;&quot;
 msgid "Manage products"
 msgstr ""
-#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
+#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
 msgid "Manage friends"
 msgstr ""
@@ -754,25 +852,25 @@ msgstr &quot;&quot;
 msgid "Perform task"
 msgstr ""
-#: app/models/profile.rb:144
+#: app/models/profile.rb:155
 msgid "An existing profile cannot be renamed."
 msgstr ""
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid "%s's home page"
 msgstr ""
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid ""
 "<p>This is a default homepage created for %s. It can be changed though the "
 "control panel.</p>"
 msgstr ""
-#: app/models/profile.rb:318
+#: app/models/profile.rb:338
 msgid "%s can't has members"
 msgstr ""
-#: app/models/profile.rb:335
+#: app/models/profile.rb:355
 msgid "%s can't has moderators"
 msgstr ""
@@ -800,10 +898,6 @@ msgstr &quot;&quot;
 msgid "%{fn} was already assigned to another category."
 msgstr ""
-#: app/models/category.rb:13
-msgid "%{fn} must be the same as the parents'"
-msgstr ""
-
 #: app/models/article_block.rb:4
 msgid "Display one of your contents."
 msgstr ""
@@ -1009,7 +1103,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
 msgstr ""
 #: app/models/profile_list_block.rb:75
-#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
+#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
 msgid "None"
 msgstr ""
@@ -1053,6 +1147,14 @@ msgstr &quot;&quot;
 msgid "thumbnail"
 msgstr ""
+#: app/models/enterprise_homepage.rb:4
+msgid "Enterprise homepage."
+msgstr ""
+
+#: app/models/enterprise_homepage.rb:8
+msgid "Display the summary of profile."
+msgstr ""
+
 #: app/models/sellers_search_block.rb:4
 msgid "A search for enterprises by products selled and local"
 msgstr ""
@@ -1375,11 +1477,6 @@ msgstr &quot;&quot;
 msgid "URL:"
 msgstr ""
-#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
-#: app/views/cms/_event.rhtml:12
-msgid "Address:"
-msgstr ""
-
 #: app/models/event.rb:77
 msgid "When:"
 msgstr ""
@@ -1457,7 +1554,7 @@ msgstr &quot;&quot;
 msgid "%s still needs to accept being your friend."
 msgstr ""
-#: app/controllers/my_profile/cms_controller.rb:97
+#: app/controllers/my_profile/cms_controller.rb:103
 msgid "Article \"%s\" configured as home page."
 msgstr ""
@@ -1525,51 +1622,51 @@ msgstr &quot;&quot;
 msgid "This action is not available for \"%s\"."
 msgstr ""
-#: app/controllers/public/search_controller.rb:182
-msgid "Newer profiles"
+#: app/controllers/public/search_controller.rb:196
+msgid "Newer people"
 msgstr ""
-#: app/controllers/public/search_controller.rb:183
-msgid "Newer communities"
+#: app/controllers/public/search_controller.rb:197
+msgid "Newer enterprises"
 msgstr ""
-#: app/controllers/public/search_controller.rb:184
-msgid "Newer articles"
+#: app/controllers/public/search_controller.rb:199
+msgid "Upcoming events"
 msgstr ""
-#: app/controllers/public/search_controller.rb:185
-msgid "Most commented articles"
+#: app/controllers/public/search_controller.rb:200
+msgid "Newer communities"
 msgstr ""
-#: app/controllers/public/search_controller.rb:186
-msgid "Newer enterprises"
+#: app/controllers/public/search_controller.rb:201
+msgid "Newer articles"
 msgstr ""
-#: app/controllers/public/search_controller.rb:187
-msgid "Near events TODO"
+#: app/controllers/public/search_controller.rb:202
+msgid "Most commented articles"
 msgstr ""
-#: app/controllers/public/account_controller.rb:21
+#: app/controllers/public/account_controller.rb:23
 msgid "Logged in successfully"
 msgstr ""
-#: app/controllers/public/account_controller.rb:23
+#: app/controllers/public/account_controller.rb:25
 msgid "Incorrect username or password"
 msgstr ""
-#: app/controllers/public/account_controller.rb:51
+#: app/controllers/public/account_controller.rb:53
 msgid "Thanks for signing up!"
 msgstr ""
-#: app/controllers/public/account_controller.rb:69
+#: app/controllers/public/account_controller.rb:71
 msgid "You have been logged out."
 msgstr ""
-#: app/controllers/public/account_controller.rb:80
+#: app/controllers/public/account_controller.rb:82
 msgid "Your password has been changed successfully!"
 msgstr ""
-#: app/controllers/public/account_controller.rb:83
+#: app/controllers/public/account_controller.rb:85
 msgid "The supplied current password is incorrect."
 msgstr ""
@@ -1626,13 +1723,13 @@ msgid &quot;Leave&quot;
 msgstr ""
 #: app/views/memberships/index.rhtml:26
-#: app/views/profile_editor/index.rhtml:46
+#: app/views/profile_editor/index.rhtml:51
 #: app/views/profile/enterprises.rhtml:15
 msgid "Register a new Enterprise"
 msgstr ""
 #: app/views/memberships/index.rhtml:27
-#: app/views/profile_editor/index.rhtml:45
+#: app/views/profile_editor/index.rhtml:50
 #: app/views/profile/communities.rhtml:15
 msgid "Create a new community"
 msgstr ""
@@ -1926,6 +2023,11 @@ msgstr &quot;&quot;
 msgid "Add a block"
 msgstr ""
+#: app/views/box_organizer/_products_block.rhtml:5
+#: app/views/box_organizer/_link_list_block.rhtml:3
+msgid "Select the products that must be shown."
+msgstr ""
+
 #: app/views/box_organizer/edit.rhtml:1
 msgid "Editing block"
 msgstr ""
@@ -2124,10 +2226,6 @@ msgid &quot;&quot;
 "profile"
 msgstr ""
-#: app/views/enterprise_registration/basic_information.rhtml:32
-msgid "Next"
-msgstr ""
-
 #: app/views/enterprise_editor/_form.rhtml:7
 #: app/views/enterprise_validation/list_processed.rhtml:13
 #: app/views/enterprise_validation/index.rhtml:18
@@ -2174,26 +2272,14 @@ msgstr &quot;&quot;
 msgid "Contact phone:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:8
-msgid "Contact person:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:9
 msgid "Acronym:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:10
-msgid "Foundation year:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:11
 msgid "Legal Form:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:12
-msgid "Economic activity:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:13
 msgid "Management infomation:"
 msgstr ""
@@ -2234,51 +2320,51 @@ msgstr &quot;&quot;
 msgid "My profile"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:9
+#: app/views/profile_editor/index.rhtml:11
 msgid "Edit Profile"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:11
+#: app/views/profile_editor/index.rhtml:13
 msgid "Mail settings"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:13
+#: app/views/profile_editor/index.rhtml:15
 msgid "Pending tasks"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:15
+#: app/views/profile_editor/index.rhtml:17
 msgid "Edit Visual Design"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:17
+#: app/views/profile_editor/index.rhtml:19
 msgid "Manage Content"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:19
+#: app/views/profile_editor/index.rhtml:21
 msgid "Change Password"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:23
+#: app/views/profile_editor/index.rhtml:25
 msgid "Manage Members"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:25
+#: app/views/profile_editor/index.rhtml:27
 msgid "Manage Products and Services"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:27
+#: app/views/profile_editor/index.rhtml:29
 msgid "Enterprise Validation"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:33
+#: app/views/profile_editor/index.rhtml:35
 msgid "Disable Enterprise"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:35
+#: app/views/profile_editor/index.rhtml:37
 msgid "Enable Enterprise"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:42
+#: app/views/profile_editor/index.rhtml:47
 msgid "Manage my groups"
 msgstr ""
@@ -2330,15 +2416,8 @@ msgid &quot;Moderation options&quot;
 msgstr ""
 #: app/views/profile_editor/_organization.rhtml:12
-msgid "Closed organization"
-msgstr ""
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Male"
-msgstr ""
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Female"
+msgid ""
+"New members must be approved by an administrator before joining this group?"
 msgstr ""
 #: app/views/profile_editor/enable.rhtml:1
@@ -2419,7 +2498,7 @@ msgstr &quot;&quot;
 msgid "Homepage: "
 msgstr ""
-#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
+#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
 msgid "Products/Services"
 msgstr ""
@@ -2480,24 +2559,30 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
 msgstr ""
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
+msgid ""
+"Products and Services results for \"%{query}\" of enterprises in \"%"
+"{category}\""
 msgstr ""
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%s\""
+msgid "Products and Services results for \"%s\""
+msgstr ""
+
+#: app/views/search/products.rhtml:5
+msgid "Products and Services of enterprises in \"%s\""
 msgstr ""
 #: app/views/search/products.rhtml:5
-msgid "Products of enterprises in \"%s\""
+msgid "Products and Services"
 msgstr ""
-#: app/views/search/products.rhtml:10
+#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
 msgid "Within %s km from %s"
 msgstr ""
 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 msgid "Refine your search"
 msgstr ""
@@ -2505,40 +2590,58 @@ msgstr &quot;&quot;
 msgid "by %{author} on \"%{article}\""
 msgstr ""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%{query}\" in \"%{category}\""
 msgstr ""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%s\""
 msgstr ""
-#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
-#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
-msgid "(recently added)"
+#: app/views/search/_product_categories_menu.rhtml:13
+msgid "There is no sub-categories for %s."
 msgstr ""
-#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
-#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
-msgid "Browse by name"
+#: app/views/search/_product_categories_menu.rhtml:15
+msgid "There is no categories."
+msgstr ""
+
+#: app/views/search/enterprises.rhtml:3
+msgid "Enterprise results for \"%{query}\" in \"%{category}\""
+msgstr ""
+
+#: app/views/search/enterprises.rhtml:3
+msgid "Enterprise results for \"%s\""
 msgstr ""
-#: app/views/search/_directory.rhtml:2
-msgid "Recent"
+#: app/views/search/enterprises.rhtml:5
+msgid "Enterprises in \"%s\""
 msgstr ""
-#: app/views/search/_display_results.rhtml:18
-msgid "more..."
+#: app/views/search/_display_results.rhtml:21
+msgid "see all (%d)"
+msgstr ""
+
+#: app/views/search/_display_results.rhtml:21
+msgid "see all..."
 msgstr ""
 #: app/views/search/popup.rhtml:3
 msgid "Search %s"
 msgstr ""
+#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
+#: app/views/search/articles.rhtml:11
+msgid "(recently added)"
+msgstr ""
+
+#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
+#: app/views/search/articles.rhtml:17
+msgid "Browse by name"
+msgstr ""
+
 #: app/views/search/_sellers_form.rhtml:1
 msgid "Search for sellers"
 msgstr ""
@@ -2547,21 +2650,15 @@ msgstr &quot;&quot;
 msgid "Search in:"
 msgstr ""
-#: app/views/search/_sellers_form.rhtml:13
-#: app/views/search/_search_form.rhtml:27
+#: app/views/search/_sellers_form.rhtml:17
 msgid "Distance (km): "
 msgstr ""
-#: app/views/search/_sellers_form.rhtml:16
-#: app/views/search/_search_form.rhtml:28
-msgid "From: "
-msgstr ""
-
-#: app/views/search/_product.rhtml:10
+#: app/views/search/_product.rhtml:15
 msgid "Price: %d"
 msgstr ""
-#: app/views/search/_product.rhtml:12
+#: app/views/search/_product.rhtml:17
 msgid "Suplier: %s"
 msgstr ""
@@ -2581,11 +2678,19 @@ msgstr &quot;&quot;
 msgid "Search within:"
 msgstr ""
-#: app/views/search/_search_form.rhtml:35
+#: app/views/search/_search_form.rhtml:28
+msgid "Distance (km):"
+msgstr ""
+
+#: app/views/search/_search_form.rhtml:33
+msgid "From:"
+msgstr ""
+
+#: app/views/search/_search_form.rhtml:42
 msgid "Search for:"
 msgstr ""
-#: app/views/search/_search_form.rhtml:49
+#: app/views/search/_search_form.rhtml:56
 msgid "Advanced search"
 msgstr ""
@@ -2597,7 +2702,7 @@ msgstr &quot;&quot;
 msgid "Last update: %s."
 msgstr ""
-#: app/views/search/_google_maps.rhtml:48
+#: app/views/search/_google_maps.rhtml:68
 msgid ""
 "One or more items don't have geographical information, and won't be shown in "
 "the map. Choose \"Display in list\" to see them."
@@ -2655,19 +2760,19 @@ msgstr &quot;&quot;
 msgid "Join this enterprise"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:6
+#: app/views/blocks/profile_info.rhtml:17
 msgid "Since %{year}/%{month}"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
+#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
 msgid "Homepage"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:8
+#: app/views/blocks/profile_info.rhtml:19
 msgid "View profile"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
+#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
 msgid "Control panel"
 msgstr ""
@@ -2792,25 +2897,25 @@ msgstr &quot;&quot;
 msgid "Properties"
 msgstr ""
-#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
+#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
 msgid "Public view"
 msgstr ""
 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
+msgid "Use as homepage"
+msgstr ""
+
+#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
 msgid "Delete"
 msgstr ""
-#: app/views/cms/view.rhtml:42
+#: app/views/cms/view.rhtml:43
 msgid ""
 "Are you sure that you want to remove this folder? Note that all the items "
 "inside it will also be removed!"
 msgstr ""
-#: app/views/cms/view.rhtml:67
-msgid "Use as homepage"
-msgstr ""
-
-#: app/views/cms/view.rhtml:68
+#: app/views/cms/view.rhtml:69
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
@@ -3412,12 +3517,12 @@ msgstr &quot;&quot;
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
-#: app/views/account/signup.rhtml:33
+#: app/views/account/signup.rhtml:35
 #: app/views/account/activate_enterprise.rhtml:37
 msgid "I accept the terms of use"
 msgstr ""
-#: app/views/account/signup.rhtml:38
+#: app/views/account/signup.rhtml:40
 #: app/views/account/activate_enterprise.rhtml:42
 msgid "Sign up"
 msgstr ""
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.10.1\n"
-"POT-Creation-Date: 2008-06-27 14:57-0300\n"
+"POT-Creation-Date: 2008-07-08 19: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"
@@ -23,7 +23,7 @@ msgstr &quot;Aide&quot;
 #: app/helpers/application_helper.rb:81
 #: app/views/box_organizer/add_block.rhtml:18
-#: app/views/search/_search_form.rhtml:56
+#: app/views/search/_search_form.rhtml:63
 msgid "Close"
 msgstr "Fermer"
@@ -31,63 +31,66 @@ msgstr &quot;Fermer&quot;
 msgid "This is %s, version %s"
 msgstr "Site sous %s, version %s"
-#: app/helpers/application_helper.rb:318
-#: app/views/memberships/new_community.rhtml:12
-#: app/views/box_organizer/edit.rhtml:9
-#: app/views/admin_panel/site_info.rhtml:11
-#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
-#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
-#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
-#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
-msgid "Cancel"
-msgstr "Annuler"
-
-#: app/helpers/application_helper.rb:360 app/models/product.rb:39
+#: app/helpers/application_helper.rb:246 app/models/product.rb:39
 msgid "Uncategorized product"
 msgstr "Produit sans catégorie"
-#: app/helpers/application_helper.rb:366
+#: app/helpers/application_helper.rb:252
 msgid "No product"
 msgstr "Pas de produit"
-#: app/helpers/application_helper.rb:472
+#: app/helpers/application_helper.rb:338
+#, fuzzy
+msgid "non registered gender"
+msgstr "Personnes enregistrées récemment"
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Male"
+msgstr "Homme"
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Female"
+msgstr "Femme"
+
+#: app/helpers/application_helper.rb:366
 msgid "Click on this icon to go to the <b>%s</b>'s home page"
 msgstr ""
 "Cliquez sur cet icône pour vous rendre sur la page d'accueil de <b>%s</b>"
-#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
+#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
 #: app/views/content_viewer/view_page.rhtml:65
 msgid "Categories"
 msgstr "Catégories"
-#: app/helpers/application_helper.rb:532
+#: app/helpers/application_helper.rb:417
 msgid "open"
 msgstr "ouvrir"
-#: app/helpers/application_helper.rb:568
+#: app/helpers/application_helper.rb:453
 #, fuzzy
 msgid "Search..."
 msgstr "Chercher"
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:455
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:571
+#: app/helpers/application_helper.rb:456
 msgid "Click, write and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:577
+#: app/helpers/application_helper.rb:462
 #: app/views/region_validators/region.rhtml:23
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/_sellers_form.rhtml:22
+#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:16
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
 msgid "Search"
 msgstr "Chercher"
-#: app/helpers/application_helper.rb:652
+#: app/helpers/application_helper.rb:518
 msgid "Are you sure you want to visit this web site?"
 msgstr "Êtes-vous sûr(e) de vouloir visiter ce site web ?"
@@ -99,6 +102,44 @@ msgstr &quot;&quot;
 msgid "Display in map"
 msgstr ""
+#: app/helpers/search_helper.rb:53
+#, fuzzy
+msgid "E-Mail: "
+msgstr "Courrier électronique"
+
+#: app/helpers/search_helper.rb:56
+msgid "Phone(s): "
+msgstr ""
+
+#: app/helpers/search_helper.rb:59
+#, fuzzy
+msgid "Location: "
+msgstr "Actions"
+
+#: app/helpers/search_helper.rb:62
+#, fuzzy
+msgid "Address: "
+msgstr "Adresse :"
+
+#: app/helpers/search_helper.rb:65
+#, fuzzy
+msgid "Products/Services: "
+msgstr "Prix"
+
+#: app/helpers/search_helper.rb:68
+msgid "Distance: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:81
+#, fuzzy
+msgid "Previous"
+msgstr "Produits"
+
+#: app/helpers/search_helper.rb:81
+#: app/views/enterprise_registration/basic_information.rhtml:32
+msgid "Next"
+msgstr "Suivant"
+
 #: app/helpers/dates_helper.rb:6
 msgid "January"
 msgstr "Janvier"
@@ -147,52 +188,50 @@ msgstr &quot;Novembre&quot;
 msgid "December"
 msgstr "Décembre"
-# How is this used? (which function/method?)
-#: app/helpers/dates_helper.rb:23
-#, fuzzy
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
+#: app/helpers/dates_helper.rb:27
+msgid "%{month} %{day}, %{year}"
+msgstr ""
 # How is this used? (By which function/method?)
-#: app/helpers/dates_helper.rb:32
+#: app/helpers/dates_helper.rb:36
 #, fuzzy
 msgid "%d %B %Y, %H:%m"
 msgstr "%d %B %Y, %H:%m"
-#: app/helpers/dates_helper.rb:42
+#: app/helpers/dates_helper.rb:46
 msgid "from %s to %s"
 msgstr ""
-#: app/helpers/dates_helper.rb:49
+#: app/helpers/dates_helper.rb:53
 msgid "Sunday"
 msgstr ""
-#: app/helpers/dates_helper.rb:50
+#: app/helpers/dates_helper.rb:54
 msgid "Monday"
 msgstr ""
-#: app/helpers/dates_helper.rb:51
+#: app/helpers/dates_helper.rb:55
 msgid "Tuesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:52
+#: app/helpers/dates_helper.rb:56
 msgid "Wednesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:53
+#: app/helpers/dates_helper.rb:57
 msgid "Thursday"
 msgstr ""
-#: app/helpers/dates_helper.rb:54
+#: app/helpers/dates_helper.rb:58
 #, fuzzy
 msgid "Friday"
 msgstr "Amis"
-#: app/helpers/dates_helper.rb:55
+#: app/helpers/dates_helper.rb:59
 msgid "Saturday"
 msgstr ""
-#: app/helpers/dates_helper.rb:71
+#: app/helpers/dates_helper.rb:72
 msgid "%{month} %{year}"
 msgstr ""
@@ -217,34 +256,72 @@ msgstr &quot;&quot;
 "boutons, etc. Elle n'affecte pas la langue du contenu créé par d'autres "
 "utilisateurs."
+#: app/helpers/enterprise_homepage_helper.rb:6
+#: app/views/enterprise_editor/index.rhtml:8
+msgid "Contact person:"
+msgstr "Personne de contact : "
+
+#: app/helpers/enterprise_homepage_helper.rb:7
+#, fuzzy
+msgid "e-Mail:"
+msgstr "Courrier électronique"
+
+#: app/helpers/enterprise_homepage_helper.rb:8
+msgid "Phone(s):"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:9
+#, fuzzy
+msgid "Location:"
+msgstr "Actions"
+
+#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
+#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
+msgid "Address:"
+msgstr "Adresse :"
+
+#: app/helpers/enterprise_homepage_helper.rb:11
+#, fuzzy
+msgid "Legal form:"
+msgstr "Forme juridique"
+
+#: app/helpers/enterprise_homepage_helper.rb:12
+#: app/views/enterprise_editor/index.rhtml:10
+msgid "Foundation year:"
+msgstr "Année de création :"
+
+#: app/helpers/enterprise_homepage_helper.rb:13
+#: app/views/enterprise_editor/index.rhtml:12
+msgid "Economic activity:"
+msgstr "Activité économique :"
+
+#: app/helpers/enterprise_homepage_helper.rb:21
+msgid "Distance:"
+msgstr ""
+
 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
 msgid "Main content"
 msgstr "Contenu principal"
-#: app/helpers/boxes_helper.rb:124
+#: app/helpers/boxes_helper.rb:125
 msgid "Move block up"
 msgstr "Vers le haut"
-#: app/helpers/boxes_helper.rb:125
+#: app/helpers/boxes_helper.rb:129
 msgid "Move block down"
 msgstr "Vers le bas"
-#: app/helpers/boxes_helper.rb:126
-msgid "Remove block"
-msgstr "Effacer le bloc"
-
-#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
+#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
 #: app/views/manage_products/index.rhtml:14
 #: app/views/manage_products/index.rhtml:40
-#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
+#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
 msgid "Edit"
 msgstr "Éditer"
-#: app/helpers/profile_helper.rb:7
-#, fuzzy
-msgid "edit your information"
-msgstr "Éditer vos informations"
+#: app/helpers/boxes_helper.rb:137
+msgid "Remove block"
+msgstr "Effacer le bloc"
 #: app/helpers/tags_helper.rb:33
 msgid "No tags yet."
@@ -266,6 +343,26 @@ msgstr &quot;Toute nouvelle organisation doit être approuvée&quot;
 msgid "Administrator assigns validator organizations per region."
 msgstr "Les validateurs sont assignés par région par les administrateurs."
+#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
+#: app/views/box_organizer/edit.rhtml:9
+#: app/views/admin_panel/site_info.rhtml:11
+#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
+#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
+#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
+#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
+msgid "Cancel"
+msgstr "Annuler"
+
+#: app/helpers/forms_helper.rb:64
+#, fuzzy
+msgid "State:"
+msgstr "Statut"
+
+#: app/helpers/forms_helper.rb:65
+#, fuzzy
+msgid "City:"
+msgstr "Groupe"
+
 #: app/helpers/categories_helper.rb:6
 msgid "Do not display at the menu"
 msgstr "Ne pas afficher dans le menu"
@@ -307,39 +404,40 @@ msgid &quot;Type of category&quot;
 msgstr "Type de catégorie"
 #: app/helpers/assets_helper.rb:7
-#: app/controllers/public/search_controller.rb:92
+#: app/controllers/public/search_controller.rb:133
 msgid "Articles"
 msgstr "Articles"
 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
-#: app/controllers/public/search_controller.rb:94
+#: app/controllers/public/search_controller.rb:135
 msgid "People"
 msgstr "Personnes"
-#: app/helpers/assets_helper.rb:9
-#: app/controllers/public/search_controller.rb:96
-#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
+#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
+#: app/controllers/public/search_controller.rb:137
+#: app/views/search/_sellers_form.rhtml:7
 msgid "Products"
 msgstr "Produits"
 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
-#: app/controllers/public/search_controller.rb:93
+#: app/controllers/public/search_controller.rb:134
 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
 msgid "Enterprises"
 msgstr "Entreprises"
 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
-#: app/controllers/public/search_controller.rb:95
+#: app/controllers/public/search_controller.rb:136
 #: app/views/profile/index.rhtml:22
 msgid "Communities"
 msgstr "Groupes"
 #: app/helpers/assets_helper.rb:12
-#: app/controllers/public/search_controller.rb:97
+#: app/controllers/public/search_controller.rb:138
 msgid "Events"
 msgstr ""
 #: app/models/enterprise.rb:5 app/models/product.rb:-
+#: app/views/search/enterprises.rhtml:5
 msgid "Enterprise"
 msgstr "Entreprise"
@@ -347,42 +445,42 @@ msgstr &quot;Entreprise&quot;
 msgid "Community"
 msgstr "Groupe"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #, fuzzy
 msgid "Contact person"
 msgstr "Personne de contact : "
-#: app/models/organization.rb:43 app/models/environment.rb:-
+#: app/models/organization.rb:41 app/models/environment.rb:-
 #, fuzzy
 msgid "Contact email"
 msgstr "Téléphone de contact"
-#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
+#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
 #: app/views/enterprise_validation/_details.rhtml:19
 msgid "Acronym"
 msgstr "Sigle"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #, fuzzy
 msgid "Foundation year"
 msgstr "Année de création :"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #, fuzzy
 msgid "Legal form"
 msgstr "Forme juridique"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #, fuzzy
 msgid "Economic activity"
 msgstr "Activité économique :"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #: app/views/enterprise_registration/basic_information.rhtml:27
 msgid "Management information"
 msgstr "Information sur les dirigeants"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #, fuzzy
 msgid "Validated"
 msgstr "Un validateur"
@@ -465,8 +563,12 @@ msgstr &quot;La tâche a été achevée à %s&quot;
 msgid "The task was cancelled at %s"
 msgstr "La tâche a été annulée à %s"
+#: app/models/link_list_block.rb:7
+msgid "Display a list of links."
+msgstr ""
+
 #: app/models/favorite_enterprises_block.rb:4
-#: app/views/profile_editor/index.rhtml:29
+#: app/views/profile_editor/index.rhtml:31
 #, fuzzy
 msgid "Favorite Enterprises"
 msgstr "Valider l'entreprise"
@@ -528,8 +630,9 @@ msgid &quot;Slug&quot;
 msgstr ""
 #: app/models/article.rb:- app/models/category.rb:-
+#, fuzzy
 msgid "Path"
-msgstr ""
+msgstr "Parent"
 #: app/models/article.rb:- app/models/category.rb:- app/models/image.rb:-
 #: app/models/thumbnail.rb:-
@@ -686,6 +789,11 @@ msgstr &quot;Catégorie :&quot;
 msgid "Virtual"
 msgstr ""
+#: app/models/products_block.rb:16
+#, fuzzy
+msgid "View all products"
+msgstr "Nouveau produit"
+
 #: app/models/tags_block.rb:8
 msgid "Block listing content count by tag"
 msgstr "Bloc listant le nombre de contenus par tag"
@@ -699,9 +807,10 @@ msgstr &quot;&quot;
 "       Essayer d'ajouter quelques tags à des articles et vous verrez le "
 "nuage grossir."
-#: app/models/tags_block.rb:17
-msgid "%s's tags"
-msgstr "Les tags de %s"
+#: app/models/tags_block.rb:20
+#, fuzzy
+msgid "tags"
+msgstr "tâche"
 #: app/models/friendship.rb:-
 msgid "friendship"
@@ -803,7 +912,7 @@ msgstr &quot;Éditer l&#39;identité visuelle du profil&quot;
 msgid "Manage products"
 msgstr "Gérer les produits"
-#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
+#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
 msgid "Manage friends"
 msgstr "Gérer les amis"
@@ -816,15 +925,15 @@ msgstr &quot;Valider l&#39;entreprise&quot;
 msgid "Perform task"
 msgstr "Réaliser une tâche"
-#: app/models/profile.rb:144
+#: app/models/profile.rb:155
 msgid "An existing profile cannot be renamed."
 msgstr "Un profil existant ne peut pas être renommé."
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid "%s's home page"
 msgstr "Page d'accueil de %s"
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid ""
 "<p>This is a default homepage created for %s. It can be changed though the "
 "control panel.</p>"
@@ -832,12 +941,12 @@ msgstr &quot;&quot;
 "<p>C'est la page d'accueil par défaut créée pour %s. Elle peut être modifiée "
 "dans le panneau de contrôle.</p>"
-#: app/models/profile.rb:318
+#: app/models/profile.rb:338
 #, fuzzy
 msgid "%s can't has members"
 msgstr "Les membres de %s"
-#: app/models/profile.rb:335
+#: app/models/profile.rb:355
 msgid "%s can't has moderators"
 msgstr ""
@@ -867,10 +976,6 @@ msgstr &quot;%{fn} est déjà utilisé par une autre catégorie.&quot;
 msgid "%{fn} was already assigned to another category."
 msgstr "%{fn} était déjà assigné à une autre catégorie."
-#: app/models/category.rb:13
-msgid "%{fn} must be the same as the parents'"
-msgstr "%{fn} doit être le même que celui de ses parents"
-
 #: app/models/article_block.rb:4
 msgid "Display one of your contents."
 msgstr "Afficher un de vos contenus."
@@ -1093,7 +1198,7 @@ msgstr &quot;&quot;
 "Cliquer sur les personnes ou groupes vous amène sur leur page personnelle."
 #: app/models/profile_list_block.rb:75
-#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
+#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
 msgid "None"
 msgstr "Aucun(e)"
@@ -1140,6 +1245,15 @@ msgstr &quot;Un ensemble de photos, logos ou autres types d&#39;images.&quot;
 msgid "thumbnail"
 msgstr "aperçu"
+#: app/models/enterprise_homepage.rb:4
+#, fuzzy
+msgid "Enterprise homepage."
+msgstr "Entreprise"
+
+#: app/models/enterprise_homepage.rb:8
+msgid "Display the summary of profile."
+msgstr ""
+
 #: app/models/sellers_search_block.rb:4
 msgid "A search for enterprises by products selled and local"
 msgstr ""
@@ -1503,11 +1617,6 @@ msgstr &quot;&quot;
 msgid "URL:"
 msgstr ""
-#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
-#: app/views/cms/_event.rhtml:12
-msgid "Address:"
-msgstr "Adresse :"
-
 #: app/models/event.rb:77
 msgid "When:"
 msgstr ""
@@ -1587,7 +1696,7 @@ msgstr &quot;&quot;
 msgid "%s still needs to accept being your friend."
 msgstr "Il faut encore que %s accepte d'être votre ami."
-#: app/controllers/my_profile/cms_controller.rb:97
+#: app/controllers/my_profile/cms_controller.rb:103
 msgid "Article \"%s\" configured as home page."
 msgstr "L'article «%s» est bien configuré pour être votre page d'accueil."
@@ -1662,55 +1771,55 @@ msgstr &quot;L&#39;entreprise a bien été effacée du système&quot;
 msgid "This action is not available for \"%s\"."
 msgstr "Cette action n'est pas disponible pour «%s»."
-#: app/controllers/public/search_controller.rb:182
+#: app/controllers/public/search_controller.rb:196
 #, fuzzy
-msgid "Newer profiles"
+msgid "Newer people"
 msgstr "Voir le profil"
-#: app/controllers/public/search_controller.rb:183
+#: app/controllers/public/search_controller.rb:197
+#, fuzzy
+msgid "Newer enterprises"
+msgstr "Enregistrer une entreprise"
+
+#: app/controllers/public/search_controller.rb:199
+msgid "Upcoming events"
+msgstr ""
+
+#: app/controllers/public/search_controller.rb:200
 #, fuzzy
 msgid "Newer communities"
 msgstr "Tous ses groupes"
-#: app/controllers/public/search_controller.rb:184
+#: app/controllers/public/search_controller.rb:201
 #, fuzzy
 msgid "Newer articles"
 msgstr "Nouvel article"
-#: app/controllers/public/search_controller.rb:185
+#: app/controllers/public/search_controller.rb:202
 msgid "Most commented articles"
 msgstr "Articles les plus commentés"
-#: app/controllers/public/search_controller.rb:186
-#, fuzzy
-msgid "Newer enterprises"
-msgstr "Enregistrer une entreprise"
-
-#: app/controllers/public/search_controller.rb:187
-msgid "Near events TODO"
-msgstr ""
-
-#: app/controllers/public/account_controller.rb:21
+#: app/controllers/public/account_controller.rb:23
 msgid "Logged in successfully"
 msgstr "Connexion réussie"
-#: app/controllers/public/account_controller.rb:23
+#: app/controllers/public/account_controller.rb:25
 msgid "Incorrect username or password"
 msgstr "Identifiant ou mot de passe incorrect"
-#: app/controllers/public/account_controller.rb:51
+#: app/controllers/public/account_controller.rb:53
 msgid "Thanks for signing up!"
 msgstr "Merci de vous être inscrit(e) !"
-#: app/controllers/public/account_controller.rb:69
+#: app/controllers/public/account_controller.rb:71
 msgid "You have been logged out."
 msgstr "Vous avez été déconnecté(e)."
-#: app/controllers/public/account_controller.rb:80
+#: app/controllers/public/account_controller.rb:82
 msgid "Your password has been changed successfully!"
 msgstr "Votre mot de passe a bien été modifié !"
-#: app/controllers/public/account_controller.rb:83
+#: app/controllers/public/account_controller.rb:85
 msgid "The supplied current password is incorrect."
 msgstr "Le mot de passe actuel fourni est incorrect."
@@ -1774,13 +1883,13 @@ msgid &quot;Leave&quot;
 msgstr "Enregistrer"
 #: app/views/memberships/index.rhtml:26
-#: app/views/profile_editor/index.rhtml:46
+#: app/views/profile_editor/index.rhtml:51
 #: app/views/profile/enterprises.rhtml:15
 msgid "Register a new Enterprise"
 msgstr "Enregistrer une nouvelle entreprise"
 #: app/views/memberships/index.rhtml:27
-#: app/views/profile_editor/index.rhtml:45
+#: app/views/profile_editor/index.rhtml:50
 #: app/views/profile/communities.rhtml:15
 msgid "Create a new community"
 msgstr "Créer un nouveau groupe"
@@ -2087,6 +2196,11 @@ msgstr &quot;Organisation du visuel&quot;
 msgid "Add a block"
 msgstr "Ajouter un bloc"
+#: app/views/box_organizer/_products_block.rhtml:5
+#: app/views/box_organizer/_link_list_block.rhtml:3
+msgid "Select the products that must be shown."
+msgstr ""
+
 #: app/views/box_organizer/edit.rhtml:1
 msgid "Editing block"
 msgstr "Édition du bloc"
@@ -2306,10 +2420,6 @@ msgstr &quot;&quot;
 "(de votre état) ; lorsque l'entreprise est validée, vous pourrez activer son "
 "profil"
-#: app/views/enterprise_registration/basic_information.rhtml:32
-msgid "Next"
-msgstr "Suivant"
-
 #: app/views/enterprise_editor/_form.rhtml:7
 #: app/views/enterprise_validation/list_processed.rhtml:13
 #: app/views/enterprise_validation/index.rhtml:18
@@ -2358,26 +2468,14 @@ msgstr &quot;Identifiant :&quot;
 msgid "Contact phone:"
 msgstr "Téléphone de contact :"
-#: app/views/enterprise_editor/index.rhtml:8
-msgid "Contact person:"
-msgstr "Personne de contact : "
-
 #: app/views/enterprise_editor/index.rhtml:9
 msgid "Acronym:"
 msgstr "Sigle :"
-#: app/views/enterprise_editor/index.rhtml:10
-msgid "Foundation year:"
-msgstr "Année de création :"
-
 #: app/views/enterprise_editor/index.rhtml:11
 msgid "Legal Form:"
 msgstr "Forme juridique :"
-#: app/views/enterprise_editor/index.rhtml:12
-msgid "Economic activity:"
-msgstr "Activité économique :"
-
 #: app/views/enterprise_editor/index.rhtml:13
 msgid "Management infomation:"
 msgstr "Information sur les dirigeants :"
@@ -2420,54 +2518,54 @@ msgstr &quot;Mise à jour&quot;
 msgid "My profile"
 msgstr "Mon profil"
-#: app/views/profile_editor/index.rhtml:9
+#: app/views/profile_editor/index.rhtml:11
 msgid "Edit Profile"
 msgstr "Éditer le profil"
-#: app/views/profile_editor/index.rhtml:11
+#: app/views/profile_editor/index.rhtml:13
 msgid "Mail settings"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:13
+#: app/views/profile_editor/index.rhtml:15
 msgid "Pending tasks"
 msgstr "Tâches en attente"
-#: app/views/profile_editor/index.rhtml:15
+#: app/views/profile_editor/index.rhtml:17
 msgid "Edit Visual Design"
 msgstr "Éditer l'apparence"
-#: app/views/profile_editor/index.rhtml:17
+#: app/views/profile_editor/index.rhtml:19
 msgid "Manage Content"
 msgstr "Gérer le contenu"
-#: app/views/profile_editor/index.rhtml:19
+#: app/views/profile_editor/index.rhtml:21
 msgid "Change Password"
 msgstr "Modifier le mot de passe"
-#: app/views/profile_editor/index.rhtml:23
+#: app/views/profile_editor/index.rhtml:25
 msgid "Manage Members"
 msgstr "Gérer les membres"
-#: app/views/profile_editor/index.rhtml:25
+#: app/views/profile_editor/index.rhtml:27
 #, fuzzy
 msgid "Manage Products and Services"
 msgstr "Gérer les produits"
-#: app/views/profile_editor/index.rhtml:27
+#: app/views/profile_editor/index.rhtml:29
 msgid "Enterprise Validation"
 msgstr "Validation d'entreprises"
-#: app/views/profile_editor/index.rhtml:33
+#: app/views/profile_editor/index.rhtml:35
 #, fuzzy
 msgid "Disable Enterprise"
 msgstr "Détruire l'entreprise"
-#: app/views/profile_editor/index.rhtml:35
+#: app/views/profile_editor/index.rhtml:37
 #, fuzzy
 msgid "Enable Enterprise"
 msgstr "Entreprises"
-#: app/views/profile_editor/index.rhtml:42
+#: app/views/profile_editor/index.rhtml:47
 #, fuzzy
 msgid "Manage my groups"
 msgstr "Mes groupes"
@@ -2526,17 +2624,9 @@ msgid &quot;Moderation options&quot;
 msgstr "Recherche détaillée"
 #: app/views/profile_editor/_organization.rhtml:12
-#, fuzzy
-msgid "Closed organization"
-msgstr "info organisation"
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Male"
-msgstr "Homme"
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Female"
-msgstr "Femme"
+msgid ""
+"New members must be approved by an administrator before joining this group?"
+msgstr ""
 #: app/views/profile_editor/enable.rhtml:1
 #, fuzzy
@@ -2625,7 +2715,7 @@ msgstr &quot;Le profil de %s&quot;
 msgid "Homepage: "
 msgstr "Page personnelle : "
-#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
+#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
 #, fuzzy
 msgid "Products/Services"
 msgstr "Prix"
@@ -2692,26 +2782,33 @@ msgstr &quot;Les entreprises de &lt;b&gt;%s&lt;/b&gt;&quot;
 #: app/views/search/products.rhtml:3
 #, fuzzy
-msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
+msgid ""
+"Products and Services results for \"%{query}\" of enterprises in \"%"
+"{category}\""
 msgstr "Résultats de la recherche sur «%{query}» dans «%{category}»"
 #: app/views/search/products.rhtml:3
 #, fuzzy
-msgid "Products results for \"%s\""
+msgid "Products and Services results for \"%s\""
 msgstr "Résultats de recherche pour «%s»"
 #: app/views/search/products.rhtml:5
 #, fuzzy
-msgid "Products of enterprises in \"%s\""
+msgid "Products and Services of enterprises in \"%s\""
 msgstr "Entrprise"
-#: app/views/search/products.rhtml:10
+#: app/views/search/products.rhtml:5
+#, fuzzy
+msgid "Products and Services"
+msgstr "Gérer les produits"
+
+#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
 msgid "Within %s km from %s"
 msgstr ""
 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 msgid "Refine your search"
 msgstr "Affiner votre recherche"
@@ -2719,40 +2816,63 @@ msgstr &quot;Affiner votre recherche&quot;
 msgid "by %{author} on \"%{article}\""
 msgstr "par %{author} sur «%{article}»"
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%{query}\" in \"%{category}\""
 msgstr "Résultats de la recherche sur «%{query}» dans «%{category}»"
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%s\""
 msgstr "Résultats de recherche pour «%s»"
-#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
-#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
-msgid "(recently added)"
-msgstr ""
+#: app/views/search/_product_categories_menu.rhtml:13
+#, fuzzy
+msgid "There is no sub-categories for %s."
+msgstr "Il n'existe pas une telle page : %s"
-#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
-#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
-msgid "Browse by name"
-msgstr ""
+#: app/views/search/_product_categories_menu.rhtml:15
+#, fuzzy
+msgid "There is no categories."
+msgstr "Il n'existe pas une telle page : %s"
+
+#: app/views/search/enterprises.rhtml:3
+#, fuzzy
+msgid "Enterprise results for \"%{query}\" in \"%{category}\""
+msgstr "Résultats de la recherche sur «%{query}» dans «%{category}»"
-#: app/views/search/_directory.rhtml:2
-msgid "Recent"
-msgstr "Récents"
+#: app/views/search/enterprises.rhtml:3
+#, fuzzy
+msgid "Enterprise results for \"%s\""
+msgstr "Résultats de recherche pour «%s»"
-#: app/views/search/_display_results.rhtml:18
-msgid "more..."
+#: app/views/search/enterprises.rhtml:5
+#, fuzzy
+msgid "Enterprises in \"%s\""
+msgstr "Enregistrement de l'enterprise : \"%s\""
+
+#: app/views/search/_display_results.rhtml:21
+msgid "see all (%d)"
+msgstr ""
+
+#: app/views/search/_display_results.rhtml:21
+msgid "see all..."
 msgstr ""
 #: app/views/search/popup.rhtml:3
 msgid "Search %s"
 msgstr "Recherche sur «%s»"
+#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
+#: app/views/search/articles.rhtml:11
+msgid "(recently added)"
+msgstr ""
+
+#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
+#: app/views/search/articles.rhtml:17
+msgid "Browse by name"
+msgstr ""
+
 #: app/views/search/_sellers_form.rhtml:1
 #, fuzzy
 msgid "Search for sellers"
@@ -2762,21 +2882,15 @@ msgstr &quot;Rechercher :&quot;
 msgid "Search in:"
 msgstr "Recherche dans :"
-#: app/views/search/_sellers_form.rhtml:13
-#: app/views/search/_search_form.rhtml:27
+#: app/views/search/_sellers_form.rhtml:17
 msgid "Distance (km): "
 msgstr ""
-#: app/views/search/_sellers_form.rhtml:16
-#: app/views/search/_search_form.rhtml:28
-msgid "From: "
-msgstr ""
-
-#: app/views/search/_product.rhtml:10
+#: app/views/search/_product.rhtml:15
 msgid "Price: %d"
 msgstr "Prix : %d"
-#: app/views/search/_product.rhtml:12
+#: app/views/search/_product.rhtml:17
 msgid "Suplier: %s"
 msgstr "Fournisseur : %s"
@@ -2798,11 +2912,20 @@ msgstr &quot;Recherche de «%s» dans tout le site&quot;
 msgid "Search within:"
 msgstr "Recherche dans :"
-#: app/views/search/_search_form.rhtml:35
+#: app/views/search/_search_form.rhtml:28
+msgid "Distance (km):"
+msgstr ""
+
+#: app/views/search/_search_form.rhtml:33
+#, fuzzy
+msgid "From:"
+msgstr "Sigle :"
+
+#: app/views/search/_search_form.rhtml:42
 msgid "Search for:"
 msgstr "Rechercher :"
-#: app/views/search/_search_form.rhtml:49
+#: app/views/search/_search_form.rhtml:56
 msgid "Advanced search"
 msgstr ""
@@ -2814,7 +2937,7 @@ msgstr &quot;par %s&quot;
 msgid "Last update: %s."
 msgstr "Dernière mise à jour : %s."
-#: app/views/search/_google_maps.rhtml:48
+#: app/views/search/_google_maps.rhtml:68
 msgid ""
 "One or more items don't have geographical information, and won't be shown in "
 "the map. Choose \"Display in list\" to see them."
@@ -2878,19 +3001,19 @@ msgstr &quot;Détruire l&#39;entreprise&quot;
 msgid "Join this enterprise"
 msgstr "Éditer l'entreprise"
-#: app/views/blocks/profile_info.rhtml:6
+#: app/views/blocks/profile_info.rhtml:17
 msgid "Since %{year}/%{month}"
 msgstr "Depuis %{month}/%{year}"
-#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
+#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
 msgid "Homepage"
 msgstr "Accueil"
-#: app/views/blocks/profile_info.rhtml:8
+#: app/views/blocks/profile_info.rhtml:19
 msgid "View profile"
 msgstr "Voir le profil"
-#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
+#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
 msgid "Control panel"
 msgstr "Panneau de contrôle"
@@ -3027,25 +3150,25 @@ msgstr &quot;Nouvel article&quot;
 msgid "Properties"
 msgstr ""
-#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
+#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
 msgid "Public view"
 msgstr ""
 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
+msgid "Use as homepage"
+msgstr "Utiliser comme page d'accueil"
+
+#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
 msgid "Delete"
 msgstr "Détruire"
-#: app/views/cms/view.rhtml:42
+#: app/views/cms/view.rhtml:43
 msgid ""
 "Are you sure that you want to remove this folder? Note that all the items "
 "inside it will also be removed!"
 msgstr ""
-#: app/views/cms/view.rhtml:67
-msgid "Use as homepage"
-msgstr "Utiliser comme page d'accueil"
-
-#: app/views/cms/view.rhtml:68
+#: app/views/cms/view.rhtml:69
 #, fuzzy
 msgid "Are you sure that you want to remove this item?"
 msgstr "Êtes-vous sûr(e) de vouloir ôter cet article ?"
@@ -3734,13 +3857,13 @@ msgid &quot;We need to be sure that you wrote correctly your password.&quot;
 msgstr ""
 "Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
-#: app/views/account/signup.rhtml:33
+#: app/views/account/signup.rhtml:35
 #: app/views/account/activate_enterprise.rhtml:37
 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.rhtml:38
+#: app/views/account/signup.rhtml:40
 #: app/views/account/activate_enterprise.rhtml:42
 #, fuzzy
 msgid "Sign up"
@@ -3880,6 +4003,28 @@ msgstr &quot;Un projet du FBES&quot;
 msgid "Developed by Colivre"
 msgstr "Développé par Colivre"
+# How is this used? (which function/method?)
+#, fuzzy
+#~ msgid "%d %B %Y"
+#~ msgstr "%d %B %Y"
+
+#, fuzzy
+#~ msgid "edit your information"
+#~ msgstr "Éditer vos informations"
+
+#~ msgid "%s's tags"
+#~ msgstr "Les tags de %s"
+
+#~ msgid "%{fn} must be the same as the parents'"
+#~ msgstr "%{fn} doit être le même que celui de ses parents"
+
+#, fuzzy
+#~ msgid "Closed organization"
+#~ msgstr "info organisation"
+
+#~ msgid "Recent"
+#~ msgstr "Récents"
+
 #, fuzzy
 #~ msgid "Closed %s"
 #~ msgstr "Fermer"
@@ -4195,9 +4340,6 @@ msgstr &quot;Développé par Colivre&quot;
 #~ msgid "Category: %s"
 #~ msgstr "Catégorie : %s"
-#~ msgid "Recently registered people"
-#~ msgstr "Personnes enregistrées récemment"
-
 #~ msgid "Recently created communities"
 #~ msgstr "Groupes créés récemment"
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.10.1\n"
-"POT-Creation-Date: 2008-06-27 14:57-0300\n"
+"POT-Creation-Date: 2008-07-08 19: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"
@@ -23,7 +23,7 @@ msgstr &quot;&quot;
 #: app/helpers/application_helper.rb:81
 #: app/views/box_organizer/add_block.rhtml:18
-#: app/views/search/_search_form.rhtml:56
+#: app/views/search/_search_form.rhtml:63
 msgid "Close"
 msgstr ""
@@ -31,61 +31,63 @@ msgstr &quot;&quot;
 msgid "This is %s, version %s"
 msgstr ""
-#: app/helpers/application_helper.rb:318
-#: app/views/memberships/new_community.rhtml:12
-#: app/views/box_organizer/edit.rhtml:9
-#: app/views/admin_panel/site_info.rhtml:11
-#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
-#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
-#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
-#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
-msgid "Cancel"
-msgstr ""
-
-#: app/helpers/application_helper.rb:360 app/models/product.rb:39
+#: app/helpers/application_helper.rb:246 app/models/product.rb:39
 msgid "Uncategorized product"
 msgstr ""
-#: app/helpers/application_helper.rb:366
+#: app/helpers/application_helper.rb:252
 msgid "No product"
 msgstr ""
-#: app/helpers/application_helper.rb:472
+#: app/helpers/application_helper.rb:338
+msgid "non registered gender"
+msgstr ""
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Male"
+msgstr ""
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Female"
+msgstr ""
+
+#: app/helpers/application_helper.rb:366
 msgid "Click on this icon to go to the <b>%s</b>'s home page"
 msgstr ""
-#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
+#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
 #: app/views/content_viewer/view_page.rhtml:65
 msgid "Categories"
 msgstr ""
-#: app/helpers/application_helper.rb:532
+#: app/helpers/application_helper.rb:417
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:568
+#: app/helpers/application_helper.rb:453
 msgid "Search..."
 msgstr ""
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:455
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:571
+#: app/helpers/application_helper.rb:456
 msgid "Click, write and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:577
+#: app/helpers/application_helper.rb:462
 #: app/views/region_validators/region.rhtml:23
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/_sellers_form.rhtml:22
+#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:16
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
 msgid "Search"
 msgstr ""
-#: app/helpers/application_helper.rb:652
+#: app/helpers/application_helper.rb:518
 msgid "Are you sure you want to visit this web site?"
 msgstr ""
@@ -97,6 +99,39 @@ msgstr &quot;&quot;
 msgid "Display in map"
 msgstr ""
+#: app/helpers/search_helper.rb:53
+msgid "E-Mail: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:56
+msgid "Phone(s): "
+msgstr ""
+
+#: app/helpers/search_helper.rb:59
+msgid "Location: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:62
+msgid "Address: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:65
+msgid "Products/Services: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:68
+msgid "Distance: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:81
+msgid "Previous"
+msgstr ""
+
+#: app/helpers/search_helper.rb:81
+#: app/views/enterprise_registration/basic_information.rhtml:32
+msgid "Next"
+msgstr ""
+
 #: app/helpers/dates_helper.rb:6
 msgid "January"
 msgstr ""
@@ -145,47 +180,47 @@ msgstr &quot;&quot;
 msgid "December"
 msgstr ""
-#: app/helpers/dates_helper.rb:23
-msgid "%d %B %Y"
+#: app/helpers/dates_helper.rb:27
+msgid "%{month} %{day}, %{year}"
 msgstr ""
-#: app/helpers/dates_helper.rb:32
+#: app/helpers/dates_helper.rb:36
 msgid "%d %B %Y, %H:%m"
 msgstr ""
-#: app/helpers/dates_helper.rb:42
+#: app/helpers/dates_helper.rb:46
 msgid "from %s to %s"
 msgstr ""
-#: app/helpers/dates_helper.rb:49
+#: app/helpers/dates_helper.rb:53
 msgid "Sunday"
 msgstr ""
-#: app/helpers/dates_helper.rb:50
+#: app/helpers/dates_helper.rb:54
 msgid "Monday"
 msgstr ""
-#: app/helpers/dates_helper.rb:51
+#: app/helpers/dates_helper.rb:55
 msgid "Tuesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:52
+#: app/helpers/dates_helper.rb:56
 msgid "Wednesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:53
+#: app/helpers/dates_helper.rb:57
 msgid "Thursday"
 msgstr ""
-#: app/helpers/dates_helper.rb:54
+#: app/helpers/dates_helper.rb:58
 msgid "Friday"
 msgstr ""
-#: app/helpers/dates_helper.rb:55
+#: app/helpers/dates_helper.rb:59
 msgid "Saturday"
 msgstr ""
-#: app/helpers/dates_helper.rb:71
+#: app/helpers/dates_helper.rb:72
 msgid "%{month} %{year}"
 msgstr ""
@@ -207,32 +242,68 @@ msgid &quot;&quot;
 "It does not affect the language of the content created by other users."
 msgstr ""
+#: app/helpers/enterprise_homepage_helper.rb:6
+#: app/views/enterprise_editor/index.rhtml:8
+msgid "Contact person:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:7
+msgid "e-Mail:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:8
+msgid "Phone(s):"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:9
+msgid "Location:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
+#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
+msgid "Address:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:11
+msgid "Legal form:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:12
+#: app/views/enterprise_editor/index.rhtml:10
+msgid "Foundation year:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:13
+#: app/views/enterprise_editor/index.rhtml:12
+msgid "Economic activity:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:21
+msgid "Distance:"
+msgstr ""
+
 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
 msgid "Main content"
 msgstr ""
-#: app/helpers/boxes_helper.rb:124
+#: app/helpers/boxes_helper.rb:125
 msgid "Move block up"
 msgstr ""
-#: app/helpers/boxes_helper.rb:125
+#: app/helpers/boxes_helper.rb:129
 msgid "Move block down"
 msgstr ""
-#: app/helpers/boxes_helper.rb:126
-msgid "Remove block"
-msgstr ""
-
-#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
+#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
 #: app/views/manage_products/index.rhtml:14
 #: app/views/manage_products/index.rhtml:40
-#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
+#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
 msgid "Edit"
 msgstr ""
-#: app/helpers/profile_helper.rb:7
-msgid "edit your information"
+#: app/helpers/boxes_helper.rb:137
+msgid "Remove block"
 msgstr ""
 #: app/helpers/tags_helper.rb:33
@@ -255,6 +326,24 @@ msgstr &quot;&quot;
 msgid "Administrator assigns validator organizations per region."
 msgstr ""
+#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
+#: app/views/box_organizer/edit.rhtml:9
+#: app/views/admin_panel/site_info.rhtml:11
+#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
+#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
+#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
+#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
+msgid "Cancel"
+msgstr ""
+
+#: app/helpers/forms_helper.rb:64
+msgid "State:"
+msgstr ""
+
+#: app/helpers/forms_helper.rb:65
+msgid "City:"
+msgstr ""
+
 #: app/helpers/categories_helper.rb:6
 msgid "Do not display at the menu"
 msgstr ""
@@ -296,39 +385,40 @@ msgid &quot;Type of category&quot;
 msgstr ""
 #: app/helpers/assets_helper.rb:7
-#: app/controllers/public/search_controller.rb:92
+#: app/controllers/public/search_controller.rb:133
 msgid "Articles"
 msgstr ""
 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
-#: app/controllers/public/search_controller.rb:94
+#: app/controllers/public/search_controller.rb:135
 msgid "People"
 msgstr ""
-#: app/helpers/assets_helper.rb:9
-#: app/controllers/public/search_controller.rb:96
-#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
+#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
+#: app/controllers/public/search_controller.rb:137
+#: app/views/search/_sellers_form.rhtml:7
 msgid "Products"
 msgstr ""
 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
-#: app/controllers/public/search_controller.rb:93
+#: app/controllers/public/search_controller.rb:134
 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
 msgid "Enterprises"
 msgstr ""
 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
-#: app/controllers/public/search_controller.rb:95
+#: app/controllers/public/search_controller.rb:136
 #: app/views/profile/index.rhtml:22
 msgid "Communities"
 msgstr ""
 #: app/helpers/assets_helper.rb:12
-#: app/controllers/public/search_controller.rb:97
+#: app/controllers/public/search_controller.rb:138
 msgid "Events"
 msgstr ""
 #: app/models/enterprise.rb:5 app/models/product.rb:-
+#: app/views/search/enterprises.rhtml:5
 msgid "Enterprise"
 msgstr ""
@@ -336,37 +426,37 @@ msgstr &quot;&quot;
 msgid "Community"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Contact person"
 msgstr ""
-#: app/models/organization.rb:43 app/models/environment.rb:-
+#: app/models/organization.rb:41 app/models/environment.rb:-
 msgid "Contact email"
 msgstr ""
-#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
+#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
 #: app/views/enterprise_validation/_details.rhtml:19
 msgid "Acronym"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Foundation year"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Legal form"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Economic activity"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #: app/views/enterprise_registration/basic_information.rhtml:27
 msgid "Management information"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Validated"
 msgstr ""
@@ -441,8 +531,12 @@ msgstr &quot;&quot;
 msgid "The task was cancelled at %s"
 msgstr ""
+#: app/models/link_list_block.rb:7
+msgid "Display a list of links."
+msgstr ""
+
 #: app/models/favorite_enterprises_block.rb:4
-#: app/views/profile_editor/index.rhtml:29
+#: app/views/profile_editor/index.rhtml:31
 msgid "Favorite Enterprises"
 msgstr ""
@@ -637,6 +731,10 @@ msgstr &quot;&quot;
 msgid "Virtual"
 msgstr ""
+#: app/models/products_block.rb:16
+msgid "View all products"
+msgstr ""
+
 #: app/models/tags_block.rb:8
 msgid "Block listing content count by tag"
 msgstr ""
@@ -647,8 +745,8 @@ msgid &quot;&quot;
 "       Try to add some tags to some articles and see your tag cloud to grow."
 msgstr ""
-#: app/models/tags_block.rb:17
-msgid "%s's tags"
+#: app/models/tags_block.rb:20
+msgid "tags"
 msgstr ""
 #: app/models/friendship.rb:-
@@ -742,7 +840,7 @@ msgstr &quot;&quot;
 msgid "Manage products"
 msgstr ""
-#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
+#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
 msgid "Manage friends"
 msgstr ""
@@ -754,25 +852,25 @@ msgstr &quot;&quot;
 msgid "Perform task"
 msgstr ""
-#: app/models/profile.rb:144
+#: app/models/profile.rb:155
 msgid "An existing profile cannot be renamed."
 msgstr ""
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid "%s's home page"
 msgstr ""
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid ""
 "<p>This is a default homepage created for %s. It can be changed though the "
 "control panel.</p>"
 msgstr ""
-#: app/models/profile.rb:318
+#: app/models/profile.rb:338
 msgid "%s can't has members"
 msgstr ""
-#: app/models/profile.rb:335
+#: app/models/profile.rb:355
 msgid "%s can't has moderators"
 msgstr ""
@@ -800,10 +898,6 @@ msgstr &quot;&quot;
 msgid "%{fn} was already assigned to another category."
 msgstr ""
-#: app/models/category.rb:13
-msgid "%{fn} must be the same as the parents'"
-msgstr ""
-
 #: app/models/article_block.rb:4
 msgid "Display one of your contents."
 msgstr ""
@@ -1009,7 +1103,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
 msgstr ""
 #: app/models/profile_list_block.rb:75
-#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
+#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
 msgid "None"
 msgstr ""
@@ -1053,6 +1147,14 @@ msgstr &quot;&quot;
 msgid "thumbnail"
 msgstr ""
+#: app/models/enterprise_homepage.rb:4
+msgid "Enterprise homepage."
+msgstr ""
+
+#: app/models/enterprise_homepage.rb:8
+msgid "Display the summary of profile."
+msgstr ""
+
 #: app/models/sellers_search_block.rb:4
 msgid "A search for enterprises by products selled and local"
 msgstr ""
@@ -1375,11 +1477,6 @@ msgstr &quot;&quot;
 msgid "URL:"
 msgstr ""
-#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
-#: app/views/cms/_event.rhtml:12
-msgid "Address:"
-msgstr ""
-
 #: app/models/event.rb:77
 msgid "When:"
 msgstr ""
@@ -1457,7 +1554,7 @@ msgstr &quot;&quot;
 msgid "%s still needs to accept being your friend."
 msgstr ""
-#: app/controllers/my_profile/cms_controller.rb:97
+#: app/controllers/my_profile/cms_controller.rb:103
 msgid "Article \"%s\" configured as home page."
 msgstr ""
@@ -1525,51 +1622,51 @@ msgstr &quot;&quot;
 msgid "This action is not available for \"%s\"."
 msgstr ""
-#: app/controllers/public/search_controller.rb:182
-msgid "Newer profiles"
+#: app/controllers/public/search_controller.rb:196
+msgid "Newer people"
 msgstr ""
-#: app/controllers/public/search_controller.rb:183
-msgid "Newer communities"
+#: app/controllers/public/search_controller.rb:197
+msgid "Newer enterprises"
 msgstr ""
-#: app/controllers/public/search_controller.rb:184
-msgid "Newer articles"
+#: app/controllers/public/search_controller.rb:199
+msgid "Upcoming events"
 msgstr ""
-#: app/controllers/public/search_controller.rb:185
-msgid "Most commented articles"
+#: app/controllers/public/search_controller.rb:200
+msgid "Newer communities"
 msgstr ""
-#: app/controllers/public/search_controller.rb:186
-msgid "Newer enterprises"
+#: app/controllers/public/search_controller.rb:201
+msgid "Newer articles"
 msgstr ""
-#: app/controllers/public/search_controller.rb:187
-msgid "Near events TODO"
+#: app/controllers/public/search_controller.rb:202
+msgid "Most commented articles"
 msgstr ""
-#: app/controllers/public/account_controller.rb:21
+#: app/controllers/public/account_controller.rb:23
 msgid "Logged in successfully"
 msgstr ""
-#: app/controllers/public/account_controller.rb:23
+#: app/controllers/public/account_controller.rb:25
 msgid "Incorrect username or password"
 msgstr ""
-#: app/controllers/public/account_controller.rb:51
+#: app/controllers/public/account_controller.rb:53
 msgid "Thanks for signing up!"
 msgstr ""
-#: app/controllers/public/account_controller.rb:69
+#: app/controllers/public/account_controller.rb:71
 msgid "You have been logged out."
 msgstr ""
-#: app/controllers/public/account_controller.rb:80
+#: app/controllers/public/account_controller.rb:82
 msgid "Your password has been changed successfully!"
 msgstr ""
-#: app/controllers/public/account_controller.rb:83
+#: app/controllers/public/account_controller.rb:85
 msgid "The supplied current password is incorrect."
 msgstr ""
@@ -1626,13 +1723,13 @@ msgid &quot;Leave&quot;
 msgstr ""
 #: app/views/memberships/index.rhtml:26
-#: app/views/profile_editor/index.rhtml:46
+#: app/views/profile_editor/index.rhtml:51
 #: app/views/profile/enterprises.rhtml:15
 msgid "Register a new Enterprise"
 msgstr ""
 #: app/views/memberships/index.rhtml:27
-#: app/views/profile_editor/index.rhtml:45
+#: app/views/profile_editor/index.rhtml:50
 #: app/views/profile/communities.rhtml:15
 msgid "Create a new community"
 msgstr ""
@@ -1926,6 +2023,11 @@ msgstr &quot;&quot;
 msgid "Add a block"
 msgstr ""
+#: app/views/box_organizer/_products_block.rhtml:5
+#: app/views/box_organizer/_link_list_block.rhtml:3
+msgid "Select the products that must be shown."
+msgstr ""
+
 #: app/views/box_organizer/edit.rhtml:1
 msgid "Editing block"
 msgstr ""
@@ -2124,10 +2226,6 @@ msgid &quot;&quot;
 "profile"
 msgstr ""
-#: app/views/enterprise_registration/basic_information.rhtml:32
-msgid "Next"
-msgstr ""
-
 #: app/views/enterprise_editor/_form.rhtml:7
 #: app/views/enterprise_validation/list_processed.rhtml:13
 #: app/views/enterprise_validation/index.rhtml:18
@@ -2174,26 +2272,14 @@ msgstr &quot;&quot;
 msgid "Contact phone:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:8
-msgid "Contact person:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:9
 msgid "Acronym:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:10
-msgid "Foundation year:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:11
 msgid "Legal Form:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:12
-msgid "Economic activity:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:13
 msgid "Management infomation:"
 msgstr ""
@@ -2234,51 +2320,51 @@ msgstr &quot;&quot;
 msgid "My profile"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:9
+#: app/views/profile_editor/index.rhtml:11
 msgid "Edit Profile"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:11
+#: app/views/profile_editor/index.rhtml:13
 msgid "Mail settings"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:13
+#: app/views/profile_editor/index.rhtml:15
 msgid "Pending tasks"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:15
+#: app/views/profile_editor/index.rhtml:17
 msgid "Edit Visual Design"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:17
+#: app/views/profile_editor/index.rhtml:19
 msgid "Manage Content"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:19
+#: app/views/profile_editor/index.rhtml:21
 msgid "Change Password"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:23
+#: app/views/profile_editor/index.rhtml:25
 msgid "Manage Members"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:25
+#: app/views/profile_editor/index.rhtml:27
 msgid "Manage Products and Services"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:27
+#: app/views/profile_editor/index.rhtml:29
 msgid "Enterprise Validation"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:33
+#: app/views/profile_editor/index.rhtml:35
 msgid "Disable Enterprise"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:35
+#: app/views/profile_editor/index.rhtml:37
 msgid "Enable Enterprise"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:42
+#: app/views/profile_editor/index.rhtml:47
 msgid "Manage my groups"
 msgstr ""
@@ -2330,15 +2416,8 @@ msgid &quot;Moderation options&quot;
 msgstr ""
 #: app/views/profile_editor/_organization.rhtml:12
-msgid "Closed organization"
-msgstr ""
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Male"
-msgstr ""
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Female"
+msgid ""
+"New members must be approved by an administrator before joining this group?"
 msgstr ""
 #: app/views/profile_editor/enable.rhtml:1
@@ -2419,7 +2498,7 @@ msgstr &quot;&quot;
 msgid "Homepage: "
 msgstr ""
-#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
+#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
 msgid "Products/Services"
 msgstr ""
@@ -2480,24 +2559,30 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
 msgstr ""
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
+msgid ""
+"Products and Services results for \"%{query}\" of enterprises in \"%"
+"{category}\""
 msgstr ""
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%s\""
+msgid "Products and Services results for \"%s\""
+msgstr ""
+
+#: app/views/search/products.rhtml:5
+msgid "Products and Services of enterprises in \"%s\""
 msgstr ""
 #: app/views/search/products.rhtml:5
-msgid "Products of enterprises in \"%s\""
+msgid "Products and Services"
 msgstr ""
-#: app/views/search/products.rhtml:10
+#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
 msgid "Within %s km from %s"
 msgstr ""
 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 msgid "Refine your search"
 msgstr ""
@@ -2505,40 +2590,58 @@ msgstr &quot;&quot;
 msgid "by %{author} on \"%{article}\""
 msgstr ""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%{query}\" in \"%{category}\""
 msgstr ""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%s\""
 msgstr ""
-#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
-#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
-msgid "(recently added)"
+#: app/views/search/_product_categories_menu.rhtml:13
+msgid "There is no sub-categories for %s."
 msgstr ""
-#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
-#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
-msgid "Browse by name"
+#: app/views/search/_product_categories_menu.rhtml:15
+msgid "There is no categories."
+msgstr ""
+
+#: app/views/search/enterprises.rhtml:3
+msgid "Enterprise results for \"%{query}\" in \"%{category}\""
+msgstr ""
+
+#: app/views/search/enterprises.rhtml:3
+msgid "Enterprise results for \"%s\""
 msgstr ""
-#: app/views/search/_directory.rhtml:2
-msgid "Recent"
+#: app/views/search/enterprises.rhtml:5
+msgid "Enterprises in \"%s\""
 msgstr ""
-#: app/views/search/_display_results.rhtml:18
-msgid "more..."
+#: app/views/search/_display_results.rhtml:21
+msgid "see all (%d)"
+msgstr ""
+
+#: app/views/search/_display_results.rhtml:21
+msgid "see all..."
 msgstr ""
 #: app/views/search/popup.rhtml:3
 msgid "Search %s"
 msgstr ""
+#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
+#: app/views/search/articles.rhtml:11
+msgid "(recently added)"
+msgstr ""
+
+#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
+#: app/views/search/articles.rhtml:17
+msgid "Browse by name"
+msgstr ""
+
 #: app/views/search/_sellers_form.rhtml:1
 msgid "Search for sellers"
 msgstr ""
@@ -2547,21 +2650,15 @@ msgstr &quot;&quot;
 msgid "Search in:"
 msgstr ""
-#: app/views/search/_sellers_form.rhtml:13
-#: app/views/search/_search_form.rhtml:27
+#: app/views/search/_sellers_form.rhtml:17
 msgid "Distance (km): "
 msgstr ""
-#: app/views/search/_sellers_form.rhtml:16
-#: app/views/search/_search_form.rhtml:28
-msgid "From: "
-msgstr ""
-
-#: app/views/search/_product.rhtml:10
+#: app/views/search/_product.rhtml:15
 msgid "Price: %d"
 msgstr ""
-#: app/views/search/_product.rhtml:12
+#: app/views/search/_product.rhtml:17
 msgid "Suplier: %s"
 msgstr ""
@@ -2581,11 +2678,19 @@ msgstr &quot;&quot;
 msgid "Search within:"
 msgstr ""
-#: app/views/search/_search_form.rhtml:35
+#: app/views/search/_search_form.rhtml:28
+msgid "Distance (km):"
+msgstr ""
+
+#: app/views/search/_search_form.rhtml:33
+msgid "From:"
+msgstr ""
+
+#: app/views/search/_search_form.rhtml:42
 msgid "Search for:"
 msgstr ""
-#: app/views/search/_search_form.rhtml:49
+#: app/views/search/_search_form.rhtml:56
 msgid "Advanced search"
 msgstr ""
@@ -2597,7 +2702,7 @@ msgstr &quot;&quot;
 msgid "Last update: %s."
 msgstr ""
-#: app/views/search/_google_maps.rhtml:48
+#: app/views/search/_google_maps.rhtml:68
 msgid ""
 "One or more items don't have geographical information, and won't be shown in "
 "the map. Choose \"Display in list\" to see them."
@@ -2655,19 +2760,19 @@ msgstr &quot;&quot;
 msgid "Join this enterprise"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:6
+#: app/views/blocks/profile_info.rhtml:17
 msgid "Since %{year}/%{month}"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
+#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
 msgid "Homepage"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:8
+#: app/views/blocks/profile_info.rhtml:19
 msgid "View profile"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
+#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
 msgid "Control panel"
 msgstr ""
@@ -2792,25 +2897,25 @@ msgstr &quot;&quot;
 msgid "Properties"
 msgstr ""
-#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
+#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
 msgid "Public view"
 msgstr ""
 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
+msgid "Use as homepage"
+msgstr ""
+
+#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
 msgid "Delete"
 msgstr ""
-#: app/views/cms/view.rhtml:42
+#: app/views/cms/view.rhtml:43
 msgid ""
 "Are you sure that you want to remove this folder? Note that all the items "
 "inside it will also be removed!"
 msgstr ""
-#: app/views/cms/view.rhtml:67
-msgid "Use as homepage"
-msgstr ""
-
-#: app/views/cms/view.rhtml:68
+#: app/views/cms/view.rhtml:69
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
@@ -3412,12 +3517,12 @@ msgstr &quot;&quot;
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
-#: app/views/account/signup.rhtml:33
+#: app/views/account/signup.rhtml:35
 #: app/views/account/activate_enterprise.rhtml:37
 msgid "I accept the terms of use"
 msgstr ""
-#: app/views/account/signup.rhtml:38
+#: app/views/account/signup.rhtml:40
 #: app/views/account/activate_enterprise.rhtml:42
 msgid "Sign up"
 msgstr ""
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.10.1\n"
-"POT-Creation-Date: 2008-06-27 14:57-0300\n"
+"POT-Creation-Date: 2008-07-08 19: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"
@@ -23,7 +23,7 @@ msgstr &quot;&quot;
 #: app/helpers/application_helper.rb:81
 #: app/views/box_organizer/add_block.rhtml:18
-#: app/views/search/_search_form.rhtml:56
+#: app/views/search/_search_form.rhtml:63
 msgid "Close"
 msgstr ""
@@ -31,61 +31,63 @@ msgstr &quot;&quot;
 msgid "This is %s, version %s"
 msgstr ""
-#: app/helpers/application_helper.rb:318
-#: app/views/memberships/new_community.rhtml:12
-#: app/views/box_organizer/edit.rhtml:9
-#: app/views/admin_panel/site_info.rhtml:11
-#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
-#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
-#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
-#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
-msgid "Cancel"
-msgstr ""
-
-#: app/helpers/application_helper.rb:360 app/models/product.rb:39
+#: app/helpers/application_helper.rb:246 app/models/product.rb:39
 msgid "Uncategorized product"
 msgstr ""
-#: app/helpers/application_helper.rb:366
+#: app/helpers/application_helper.rb:252
 msgid "No product"
 msgstr ""
-#: app/helpers/application_helper.rb:472
+#: app/helpers/application_helper.rb:338
+msgid "non registered gender"
+msgstr ""
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Male"
+msgstr ""
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Female"
+msgstr ""
+
+#: app/helpers/application_helper.rb:366
 msgid "Click on this icon to go to the <b>%s</b>'s home page"
 msgstr ""
-#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
+#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
 #: app/views/content_viewer/view_page.rhtml:65
 msgid "Categories"
 msgstr ""
-#: app/helpers/application_helper.rb:532
+#: app/helpers/application_helper.rb:417
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:568
+#: app/helpers/application_helper.rb:453
 msgid "Search..."
 msgstr ""
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:455
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:571
+#: app/helpers/application_helper.rb:456
 msgid "Click, write and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:577
+#: app/helpers/application_helper.rb:462
 #: app/views/region_validators/region.rhtml:23
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/_sellers_form.rhtml:22
+#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:16
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
 msgid "Search"
 msgstr ""
-#: app/helpers/application_helper.rb:652
+#: app/helpers/application_helper.rb:518
 msgid "Are you sure you want to visit this web site?"
 msgstr ""
@@ -97,6 +99,39 @@ msgstr &quot;&quot;
 msgid "Display in map"
 msgstr ""
+#: app/helpers/search_helper.rb:53
+msgid "E-Mail: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:56
+msgid "Phone(s): "
+msgstr ""
+
+#: app/helpers/search_helper.rb:59
+msgid "Location: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:62
+msgid "Address: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:65
+msgid "Products/Services: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:68
+msgid "Distance: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:81
+msgid "Previous"
+msgstr ""
+
+#: app/helpers/search_helper.rb:81
+#: app/views/enterprise_registration/basic_information.rhtml:32
+msgid "Next"
+msgstr ""
+
 #: app/helpers/dates_helper.rb:6
 msgid "January"
 msgstr ""
@@ -145,47 +180,47 @@ msgstr &quot;&quot;
 msgid "December"
 msgstr ""
-#: app/helpers/dates_helper.rb:23
-msgid "%d %B %Y"
+#: app/helpers/dates_helper.rb:27
+msgid "%{month} %{day}, %{year}"
 msgstr ""
-#: app/helpers/dates_helper.rb:32
+#: app/helpers/dates_helper.rb:36
 msgid "%d %B %Y, %H:%m"
 msgstr ""
-#: app/helpers/dates_helper.rb:42
+#: app/helpers/dates_helper.rb:46
 msgid "from %s to %s"
 msgstr ""
-#: app/helpers/dates_helper.rb:49
+#: app/helpers/dates_helper.rb:53
 msgid "Sunday"
 msgstr ""
-#: app/helpers/dates_helper.rb:50
+#: app/helpers/dates_helper.rb:54
 msgid "Monday"
 msgstr ""
-#: app/helpers/dates_helper.rb:51
+#: app/helpers/dates_helper.rb:55
 msgid "Tuesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:52
+#: app/helpers/dates_helper.rb:56
 msgid "Wednesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:53
+#: app/helpers/dates_helper.rb:57
 msgid "Thursday"
 msgstr ""
-#: app/helpers/dates_helper.rb:54
+#: app/helpers/dates_helper.rb:58
 msgid "Friday"
 msgstr ""
-#: app/helpers/dates_helper.rb:55
+#: app/helpers/dates_helper.rb:59
 msgid "Saturday"
 msgstr ""
-#: app/helpers/dates_helper.rb:71
+#: app/helpers/dates_helper.rb:72
 msgid "%{month} %{year}"
 msgstr ""
@@ -207,32 +242,68 @@ msgid &quot;&quot;
 "It does not affect the language of the content created by other users."
 msgstr ""
+#: app/helpers/enterprise_homepage_helper.rb:6
+#: app/views/enterprise_editor/index.rhtml:8
+msgid "Contact person:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:7
+msgid "e-Mail:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:8
+msgid "Phone(s):"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:9
+msgid "Location:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
+#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
+msgid "Address:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:11
+msgid "Legal form:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:12
+#: app/views/enterprise_editor/index.rhtml:10
+msgid "Foundation year:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:13
+#: app/views/enterprise_editor/index.rhtml:12
+msgid "Economic activity:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:21
+msgid "Distance:"
+msgstr ""
+
 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
 msgid "Main content"
 msgstr ""
-#: app/helpers/boxes_helper.rb:124
+#: app/helpers/boxes_helper.rb:125
 msgid "Move block up"
 msgstr ""
-#: app/helpers/boxes_helper.rb:125
+#: app/helpers/boxes_helper.rb:129
 msgid "Move block down"
 msgstr ""
-#: app/helpers/boxes_helper.rb:126
-msgid "Remove block"
-msgstr ""
-
-#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
+#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
 #: app/views/manage_products/index.rhtml:14
 #: app/views/manage_products/index.rhtml:40
-#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
+#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
 msgid "Edit"
 msgstr ""
-#: app/helpers/profile_helper.rb:7
-msgid "edit your information"
+#: app/helpers/boxes_helper.rb:137
+msgid "Remove block"
 msgstr ""
 #: app/helpers/tags_helper.rb:33
@@ -255,6 +326,24 @@ msgstr &quot;&quot;
 msgid "Administrator assigns validator organizations per region."
 msgstr ""
+#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
+#: app/views/box_organizer/edit.rhtml:9
+#: app/views/admin_panel/site_info.rhtml:11
+#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
+#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
+#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
+#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
+msgid "Cancel"
+msgstr ""
+
+#: app/helpers/forms_helper.rb:64
+msgid "State:"
+msgstr ""
+
+#: app/helpers/forms_helper.rb:65
+msgid "City:"
+msgstr ""
+
 #: app/helpers/categories_helper.rb:6
 msgid "Do not display at the menu"
 msgstr ""
@@ -296,39 +385,40 @@ msgid &quot;Type of category&quot;
 msgstr ""
 #: app/helpers/assets_helper.rb:7
-#: app/controllers/public/search_controller.rb:92
+#: app/controllers/public/search_controller.rb:133
 msgid "Articles"
 msgstr ""
 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
-#: app/controllers/public/search_controller.rb:94
+#: app/controllers/public/search_controller.rb:135
 msgid "People"
 msgstr ""
-#: app/helpers/assets_helper.rb:9
-#: app/controllers/public/search_controller.rb:96
-#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
+#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
+#: app/controllers/public/search_controller.rb:137
+#: app/views/search/_sellers_form.rhtml:7
 msgid "Products"
 msgstr ""
 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
-#: app/controllers/public/search_controller.rb:93
+#: app/controllers/public/search_controller.rb:134
 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
 msgid "Enterprises"
 msgstr ""
 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
-#: app/controllers/public/search_controller.rb:95
+#: app/controllers/public/search_controller.rb:136
 #: app/views/profile/index.rhtml:22
 msgid "Communities"
 msgstr ""
 #: app/helpers/assets_helper.rb:12
-#: app/controllers/public/search_controller.rb:97
+#: app/controllers/public/search_controller.rb:138
 msgid "Events"
 msgstr ""
 #: app/models/enterprise.rb:5 app/models/product.rb:-
+#: app/views/search/enterprises.rhtml:5
 msgid "Enterprise"
 msgstr ""
@@ -336,37 +426,37 @@ msgstr &quot;&quot;
 msgid "Community"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Contact person"
 msgstr ""
-#: app/models/organization.rb:43 app/models/environment.rb:-
+#: app/models/organization.rb:41 app/models/environment.rb:-
 msgid "Contact email"
 msgstr ""
-#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
+#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
 #: app/views/enterprise_validation/_details.rhtml:19
 msgid "Acronym"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Foundation year"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Legal form"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Economic activity"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #: app/views/enterprise_registration/basic_information.rhtml:27
 msgid "Management information"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Validated"
 msgstr ""
@@ -441,8 +531,12 @@ msgstr &quot;&quot;
 msgid "The task was cancelled at %s"
 msgstr ""
+#: app/models/link_list_block.rb:7
+msgid "Display a list of links."
+msgstr ""
+
 #: app/models/favorite_enterprises_block.rb:4
-#: app/views/profile_editor/index.rhtml:29
+#: app/views/profile_editor/index.rhtml:31
 msgid "Favorite Enterprises"
 msgstr ""
@@ -637,6 +731,10 @@ msgstr &quot;&quot;
 msgid "Virtual"
 msgstr ""
+#: app/models/products_block.rb:16
+msgid "View all products"
+msgstr ""
+
 #: app/models/tags_block.rb:8
 msgid "Block listing content count by tag"
 msgstr ""
@@ -647,8 +745,8 @@ msgid &quot;&quot;
 "       Try to add some tags to some articles and see your tag cloud to grow."
 msgstr ""
-#: app/models/tags_block.rb:17
-msgid "%s's tags"
+#: app/models/tags_block.rb:20
+msgid "tags"
 msgstr ""
 #: app/models/friendship.rb:-
@@ -742,7 +840,7 @@ msgstr &quot;&quot;
 msgid "Manage products"
 msgstr ""
-#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
+#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
 msgid "Manage friends"
 msgstr ""
@@ -754,25 +852,25 @@ msgstr &quot;&quot;
 msgid "Perform task"
 msgstr ""
-#: app/models/profile.rb:144
+#: app/models/profile.rb:155
 msgid "An existing profile cannot be renamed."
 msgstr ""
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid "%s's home page"
 msgstr ""
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid ""
 "<p>This is a default homepage created for %s. It can be changed though the "
 "control panel.</p>"
 msgstr ""
-#: app/models/profile.rb:318
+#: app/models/profile.rb:338
 msgid "%s can't has members"
 msgstr ""
-#: app/models/profile.rb:335
+#: app/models/profile.rb:355
 msgid "%s can't has moderators"
 msgstr ""
@@ -800,10 +898,6 @@ msgstr &quot;&quot;
 msgid "%{fn} was already assigned to another category."
 msgstr ""
-#: app/models/category.rb:13
-msgid "%{fn} must be the same as the parents'"
-msgstr ""
-
 #: app/models/article_block.rb:4
 msgid "Display one of your contents."
 msgstr ""
@@ -1009,7 +1103,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
 msgstr ""
 #: app/models/profile_list_block.rb:75
-#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
+#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
 msgid "None"
 msgstr ""
@@ -1053,6 +1147,14 @@ msgstr &quot;&quot;
 msgid "thumbnail"
 msgstr ""
+#: app/models/enterprise_homepage.rb:4
+msgid "Enterprise homepage."
+msgstr ""
+
+#: app/models/enterprise_homepage.rb:8
+msgid "Display the summary of profile."
+msgstr ""
+
 #: app/models/sellers_search_block.rb:4
 msgid "A search for enterprises by products selled and local"
 msgstr ""
@@ -1375,11 +1477,6 @@ msgstr &quot;&quot;
 msgid "URL:"
 msgstr ""
-#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
-#: app/views/cms/_event.rhtml:12
-msgid "Address:"
-msgstr ""
-
 #: app/models/event.rb:77
 msgid "When:"
 msgstr ""
@@ -1457,7 +1554,7 @@ msgstr &quot;&quot;
 msgid "%s still needs to accept being your friend."
 msgstr ""
-#: app/controllers/my_profile/cms_controller.rb:97
+#: app/controllers/my_profile/cms_controller.rb:103
 msgid "Article \"%s\" configured as home page."
 msgstr ""
@@ -1525,51 +1622,51 @@ msgstr &quot;&quot;
 msgid "This action is not available for \"%s\"."
 msgstr ""
-#: app/controllers/public/search_controller.rb:182
-msgid "Newer profiles"
+#: app/controllers/public/search_controller.rb:196
+msgid "Newer people"
 msgstr ""
-#: app/controllers/public/search_controller.rb:183
-msgid "Newer communities"
+#: app/controllers/public/search_controller.rb:197
+msgid "Newer enterprises"
 msgstr ""
-#: app/controllers/public/search_controller.rb:184
-msgid "Newer articles"
+#: app/controllers/public/search_controller.rb:199
+msgid "Upcoming events"
 msgstr ""
-#: app/controllers/public/search_controller.rb:185
-msgid "Most commented articles"
+#: app/controllers/public/search_controller.rb:200
+msgid "Newer communities"
 msgstr ""
-#: app/controllers/public/search_controller.rb:186
-msgid "Newer enterprises"
+#: app/controllers/public/search_controller.rb:201
+msgid "Newer articles"
 msgstr ""
-#: app/controllers/public/search_controller.rb:187
-msgid "Near events TODO"
+#: app/controllers/public/search_controller.rb:202
+msgid "Most commented articles"
 msgstr ""
-#: app/controllers/public/account_controller.rb:21
+#: app/controllers/public/account_controller.rb:23
 msgid "Logged in successfully"
 msgstr ""
-#: app/controllers/public/account_controller.rb:23
+#: app/controllers/public/account_controller.rb:25
 msgid "Incorrect username or password"
 msgstr ""
-#: app/controllers/public/account_controller.rb:51
+#: app/controllers/public/account_controller.rb:53
 msgid "Thanks for signing up!"
 msgstr ""
-#: app/controllers/public/account_controller.rb:69
+#: app/controllers/public/account_controller.rb:71
 msgid "You have been logged out."
 msgstr ""
-#: app/controllers/public/account_controller.rb:80
+#: app/controllers/public/account_controller.rb:82
 msgid "Your password has been changed successfully!"
 msgstr ""
-#: app/controllers/public/account_controller.rb:83
+#: app/controllers/public/account_controller.rb:85
 msgid "The supplied current password is incorrect."
 msgstr ""
@@ -1626,13 +1723,13 @@ msgid &quot;Leave&quot;
 msgstr ""
 #: app/views/memberships/index.rhtml:26
-#: app/views/profile_editor/index.rhtml:46
+#: app/views/profile_editor/index.rhtml:51
 #: app/views/profile/enterprises.rhtml:15
 msgid "Register a new Enterprise"
 msgstr ""
 #: app/views/memberships/index.rhtml:27
-#: app/views/profile_editor/index.rhtml:45
+#: app/views/profile_editor/index.rhtml:50
 #: app/views/profile/communities.rhtml:15
 msgid "Create a new community"
 msgstr ""
@@ -1926,6 +2023,11 @@ msgstr &quot;&quot;
 msgid "Add a block"
 msgstr ""
+#: app/views/box_organizer/_products_block.rhtml:5
+#: app/views/box_organizer/_link_list_block.rhtml:3
+msgid "Select the products that must be shown."
+msgstr ""
+
 #: app/views/box_organizer/edit.rhtml:1
 msgid "Editing block"
 msgstr ""
@@ -2124,10 +2226,6 @@ msgid &quot;&quot;
 "profile"
 msgstr ""
-#: app/views/enterprise_registration/basic_information.rhtml:32
-msgid "Next"
-msgstr ""
-
 #: app/views/enterprise_editor/_form.rhtml:7
 #: app/views/enterprise_validation/list_processed.rhtml:13
 #: app/views/enterprise_validation/index.rhtml:18
@@ -2174,26 +2272,14 @@ msgstr &quot;&quot;
 msgid "Contact phone:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:8
-msgid "Contact person:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:9
 msgid "Acronym:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:10
-msgid "Foundation year:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:11
 msgid "Legal Form:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:12
-msgid "Economic activity:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:13
 msgid "Management infomation:"
 msgstr ""
@@ -2234,51 +2320,51 @@ msgstr &quot;&quot;
 msgid "My profile"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:9
+#: app/views/profile_editor/index.rhtml:11
 msgid "Edit Profile"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:11
+#: app/views/profile_editor/index.rhtml:13
 msgid "Mail settings"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:13
+#: app/views/profile_editor/index.rhtml:15
 msgid "Pending tasks"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:15
+#: app/views/profile_editor/index.rhtml:17
 msgid "Edit Visual Design"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:17
+#: app/views/profile_editor/index.rhtml:19
 msgid "Manage Content"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:19
+#: app/views/profile_editor/index.rhtml:21
 msgid "Change Password"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:23
+#: app/views/profile_editor/index.rhtml:25
 msgid "Manage Members"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:25
+#: app/views/profile_editor/index.rhtml:27
 msgid "Manage Products and Services"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:27
+#: app/views/profile_editor/index.rhtml:29
 msgid "Enterprise Validation"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:33
+#: app/views/profile_editor/index.rhtml:35
 msgid "Disable Enterprise"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:35
+#: app/views/profile_editor/index.rhtml:37
 msgid "Enable Enterprise"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:42
+#: app/views/profile_editor/index.rhtml:47
 msgid "Manage my groups"
 msgstr ""
@@ -2330,15 +2416,8 @@ msgid &quot;Moderation options&quot;
 msgstr ""
 #: app/views/profile_editor/_organization.rhtml:12
-msgid "Closed organization"
-msgstr ""
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Male"
-msgstr ""
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Female"
+msgid ""
+"New members must be approved by an administrator before joining this group?"
 msgstr ""
 #: app/views/profile_editor/enable.rhtml:1
@@ -2419,7 +2498,7 @@ msgstr &quot;&quot;
 msgid "Homepage: "
 msgstr ""
-#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
+#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
 msgid "Products/Services"
 msgstr ""
@@ -2480,24 +2559,30 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
 msgstr ""
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
+msgid ""
+"Products and Services results for \"%{query}\" of enterprises in \"%"
+"{category}\""
 msgstr ""
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%s\""
+msgid "Products and Services results for \"%s\""
+msgstr ""
+
+#: app/views/search/products.rhtml:5
+msgid "Products and Services of enterprises in \"%s\""
 msgstr ""
 #: app/views/search/products.rhtml:5
-msgid "Products of enterprises in \"%s\""
+msgid "Products and Services"
 msgstr ""
-#: app/views/search/products.rhtml:10
+#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
 msgid "Within %s km from %s"
 msgstr ""
 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 msgid "Refine your search"
 msgstr ""
@@ -2505,40 +2590,58 @@ msgstr &quot;&quot;
 msgid "by %{author} on \"%{article}\""
 msgstr ""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%{query}\" in \"%{category}\""
 msgstr ""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%s\""
 msgstr ""
-#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
-#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
-msgid "(recently added)"
+#: app/views/search/_product_categories_menu.rhtml:13
+msgid "There is no sub-categories for %s."
 msgstr ""
-#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
-#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
-msgid "Browse by name"
+#: app/views/search/_product_categories_menu.rhtml:15
+msgid "There is no categories."
+msgstr ""
+
+#: app/views/search/enterprises.rhtml:3
+msgid "Enterprise results for \"%{query}\" in \"%{category}\""
+msgstr ""
+
+#: app/views/search/enterprises.rhtml:3
+msgid "Enterprise results for \"%s\""
 msgstr ""
-#: app/views/search/_directory.rhtml:2
-msgid "Recent"
+#: app/views/search/enterprises.rhtml:5
+msgid "Enterprises in \"%s\""
 msgstr ""
-#: app/views/search/_display_results.rhtml:18
-msgid "more..."
+#: app/views/search/_display_results.rhtml:21
+msgid "see all (%d)"
+msgstr ""
+
+#: app/views/search/_display_results.rhtml:21
+msgid "see all..."
 msgstr ""
 #: app/views/search/popup.rhtml:3
 msgid "Search %s"
 msgstr ""
+#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
+#: app/views/search/articles.rhtml:11
+msgid "(recently added)"
+msgstr ""
+
+#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
+#: app/views/search/articles.rhtml:17
+msgid "Browse by name"
+msgstr ""
+
 #: app/views/search/_sellers_form.rhtml:1
 msgid "Search for sellers"
 msgstr ""
@@ -2547,21 +2650,15 @@ msgstr &quot;&quot;
 msgid "Search in:"
 msgstr ""
-#: app/views/search/_sellers_form.rhtml:13
-#: app/views/search/_search_form.rhtml:27
+#: app/views/search/_sellers_form.rhtml:17
 msgid "Distance (km): "
 msgstr ""
-#: app/views/search/_sellers_form.rhtml:16
-#: app/views/search/_search_form.rhtml:28
-msgid "From: "
-msgstr ""
-
-#: app/views/search/_product.rhtml:10
+#: app/views/search/_product.rhtml:15
 msgid "Price: %d"
 msgstr ""
-#: app/views/search/_product.rhtml:12
+#: app/views/search/_product.rhtml:17
 msgid "Suplier: %s"
 msgstr ""
@@ -2581,11 +2678,19 @@ msgstr &quot;&quot;
 msgid "Search within:"
 msgstr ""
-#: app/views/search/_search_form.rhtml:35
+#: app/views/search/_search_form.rhtml:28
+msgid "Distance (km):"
+msgstr ""
+
+#: app/views/search/_search_form.rhtml:33
+msgid "From:"
+msgstr ""
+
+#: app/views/search/_search_form.rhtml:42
 msgid "Search for:"
 msgstr ""
-#: app/views/search/_search_form.rhtml:49
+#: app/views/search/_search_form.rhtml:56
 msgid "Advanced search"
 msgstr ""
@@ -2597,7 +2702,7 @@ msgstr &quot;&quot;
 msgid "Last update: %s."
 msgstr ""
-#: app/views/search/_google_maps.rhtml:48
+#: app/views/search/_google_maps.rhtml:68
 msgid ""
 "One or more items don't have geographical information, and won't be shown in "
 "the map. Choose \"Display in list\" to see them."
@@ -2655,19 +2760,19 @@ msgstr &quot;&quot;
 msgid "Join this enterprise"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:6
+#: app/views/blocks/profile_info.rhtml:17
 msgid "Since %{year}/%{month}"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
+#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
 msgid "Homepage"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:8
+#: app/views/blocks/profile_info.rhtml:19
 msgid "View profile"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
+#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
 msgid "Control panel"
 msgstr ""
@@ -2792,25 +2897,25 @@ msgstr &quot;&quot;
 msgid "Properties"
 msgstr ""
-#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
+#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
 msgid "Public view"
 msgstr ""
 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
+msgid "Use as homepage"
+msgstr ""
+
+#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
 msgid "Delete"
 msgstr ""
-#: app/views/cms/view.rhtml:42
+#: app/views/cms/view.rhtml:43
 msgid ""
 "Are you sure that you want to remove this folder? Note that all the items "
 "inside it will also be removed!"
 msgstr ""
-#: app/views/cms/view.rhtml:67
-msgid "Use as homepage"
-msgstr ""
-
-#: app/views/cms/view.rhtml:68
+#: app/views/cms/view.rhtml:69
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
@@ -3412,12 +3517,12 @@ msgstr &quot;&quot;
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
-#: app/views/account/signup.rhtml:33
+#: app/views/account/signup.rhtml:35
 #: app/views/account/activate_enterprise.rhtml:37
 msgid "I accept the terms of use"
 msgstr ""
-#: app/views/account/signup.rhtml:38
+#: app/views/account/signup.rhtml:40
 #: app/views/account/activate_enterprise.rhtml:42
 msgid "Sign up"
 msgstr ""
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.10.1\n"
-"POT-Creation-Date: 2008-06-27 14:57-0300\n"
+"POT-Creation-Date: 2008-07-08 19: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"
@@ -23,7 +23,7 @@ msgstr &quot;&quot;
 #: app/helpers/application_helper.rb:81
 #: app/views/box_organizer/add_block.rhtml:18
-#: app/views/search/_search_form.rhtml:56
+#: app/views/search/_search_form.rhtml:63
 msgid "Close"
 msgstr ""
@@ -31,61 +31,63 @@ msgstr &quot;&quot;
 msgid "This is %s, version %s"
 msgstr ""
-#: app/helpers/application_helper.rb:318
-#: app/views/memberships/new_community.rhtml:12
-#: app/views/box_organizer/edit.rhtml:9
-#: app/views/admin_panel/site_info.rhtml:11
-#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
-#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
-#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
-#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
-msgid "Cancel"
-msgstr ""
-
-#: app/helpers/application_helper.rb:360 app/models/product.rb:39
+#: app/helpers/application_helper.rb:246 app/models/product.rb:39
 msgid "Uncategorized product"
 msgstr ""
-#: app/helpers/application_helper.rb:366
+#: app/helpers/application_helper.rb:252
 msgid "No product"
 msgstr ""
-#: app/helpers/application_helper.rb:472
+#: app/helpers/application_helper.rb:338
+msgid "non registered gender"
+msgstr ""
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Male"
+msgstr ""
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Female"
+msgstr ""
+
+#: app/helpers/application_helper.rb:366
 msgid "Click on this icon to go to the <b>%s</b>'s home page"
 msgstr ""
-#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
+#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
 #: app/views/content_viewer/view_page.rhtml:65
 msgid "Categories"
 msgstr ""
-#: app/helpers/application_helper.rb:532
+#: app/helpers/application_helper.rb:417
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:568
+#: app/helpers/application_helper.rb:453
 msgid "Search..."
 msgstr ""
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:455
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:571
+#: app/helpers/application_helper.rb:456
 msgid "Click, write and press enter to find"
 msgstr ""
-#: app/helpers/application_helper.rb:577
+#: app/helpers/application_helper.rb:462
 #: app/views/region_validators/region.rhtml:23
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/_sellers_form.rhtml:22
+#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:16
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
 msgid "Search"
 msgstr ""
-#: app/helpers/application_helper.rb:652
+#: app/helpers/application_helper.rb:518
 msgid "Are you sure you want to visit this web site?"
 msgstr ""
@@ -97,6 +99,39 @@ msgstr &quot;&quot;
 msgid "Display in map"
 msgstr ""
+#: app/helpers/search_helper.rb:53
+msgid "E-Mail: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:56
+msgid "Phone(s): "
+msgstr ""
+
+#: app/helpers/search_helper.rb:59
+msgid "Location: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:62
+msgid "Address: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:65
+msgid "Products/Services: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:68
+msgid "Distance: "
+msgstr ""
+
+#: app/helpers/search_helper.rb:81
+msgid "Previous"
+msgstr ""
+
+#: app/helpers/search_helper.rb:81
+#: app/views/enterprise_registration/basic_information.rhtml:32
+msgid "Next"
+msgstr ""
+
 #: app/helpers/dates_helper.rb:6
 msgid "January"
 msgstr ""
@@ -145,47 +180,47 @@ msgstr &quot;&quot;
 msgid "December"
 msgstr ""
-#: app/helpers/dates_helper.rb:23
-msgid "%d %B %Y"
+#: app/helpers/dates_helper.rb:27
+msgid "%{month} %{day}, %{year}"
 msgstr ""
-#: app/helpers/dates_helper.rb:32
+#: app/helpers/dates_helper.rb:36
 msgid "%d %B %Y, %H:%m"
 msgstr ""
-#: app/helpers/dates_helper.rb:42
+#: app/helpers/dates_helper.rb:46
 msgid "from %s to %s"
 msgstr ""
-#: app/helpers/dates_helper.rb:49
+#: app/helpers/dates_helper.rb:53
 msgid "Sunday"
 msgstr ""
-#: app/helpers/dates_helper.rb:50
+#: app/helpers/dates_helper.rb:54
 msgid "Monday"
 msgstr ""
-#: app/helpers/dates_helper.rb:51
+#: app/helpers/dates_helper.rb:55
 msgid "Tuesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:52
+#: app/helpers/dates_helper.rb:56
 msgid "Wednesday"
 msgstr ""
-#: app/helpers/dates_helper.rb:53
+#: app/helpers/dates_helper.rb:57
 msgid "Thursday"
 msgstr ""
-#: app/helpers/dates_helper.rb:54
+#: app/helpers/dates_helper.rb:58
 msgid "Friday"
 msgstr ""
-#: app/helpers/dates_helper.rb:55
+#: app/helpers/dates_helper.rb:59
 msgid "Saturday"
 msgstr ""
-#: app/helpers/dates_helper.rb:71
+#: app/helpers/dates_helper.rb:72
 msgid "%{month} %{year}"
 msgstr ""
@@ -207,32 +242,68 @@ msgid &quot;&quot;
 "It does not affect the language of the content created by other users."
 msgstr ""
+#: app/helpers/enterprise_homepage_helper.rb:6
+#: app/views/enterprise_editor/index.rhtml:8
+msgid "Contact person:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:7
+msgid "e-Mail:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:8
+msgid "Phone(s):"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:9
+msgid "Location:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
+#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
+msgid "Address:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:11
+msgid "Legal form:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:12
+#: app/views/enterprise_editor/index.rhtml:10
+msgid "Foundation year:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:13
+#: app/views/enterprise_editor/index.rhtml:12
+msgid "Economic activity:"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:21
+msgid "Distance:"
+msgstr ""
+
 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
 msgid "Main content"
 msgstr ""
-#: app/helpers/boxes_helper.rb:124
+#: app/helpers/boxes_helper.rb:125
 msgid "Move block up"
 msgstr ""
-#: app/helpers/boxes_helper.rb:125
+#: app/helpers/boxes_helper.rb:129
 msgid "Move block down"
 msgstr ""
-#: app/helpers/boxes_helper.rb:126
-msgid "Remove block"
-msgstr ""
-
-#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
+#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
 #: app/views/manage_products/index.rhtml:14
 #: app/views/manage_products/index.rhtml:40
-#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
+#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
 msgid "Edit"
 msgstr ""
-#: app/helpers/profile_helper.rb:7
-msgid "edit your information"
+#: app/helpers/boxes_helper.rb:137
+msgid "Remove block"
 msgstr ""
 #: app/helpers/tags_helper.rb:33
@@ -255,6 +326,24 @@ msgstr &quot;&quot;
 msgid "Administrator assigns validator organizations per region."
 msgstr ""
+#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
+#: app/views/box_organizer/edit.rhtml:9
+#: app/views/admin_panel/site_info.rhtml:11
+#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
+#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
+#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
+#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
+msgid "Cancel"
+msgstr ""
+
+#: app/helpers/forms_helper.rb:64
+msgid "State:"
+msgstr ""
+
+#: app/helpers/forms_helper.rb:65
+msgid "City:"
+msgstr ""
+
 #: app/helpers/categories_helper.rb:6
 msgid "Do not display at the menu"
 msgstr ""
@@ -296,39 +385,40 @@ msgid &quot;Type of category&quot;
 msgstr ""
 #: app/helpers/assets_helper.rb:7
-#: app/controllers/public/search_controller.rb:92
+#: app/controllers/public/search_controller.rb:133
 msgid "Articles"
 msgstr ""
 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
-#: app/controllers/public/search_controller.rb:94
+#: app/controllers/public/search_controller.rb:135
 msgid "People"
 msgstr ""
-#: app/helpers/assets_helper.rb:9
-#: app/controllers/public/search_controller.rb:96
-#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
+#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
+#: app/controllers/public/search_controller.rb:137
+#: app/views/search/_sellers_form.rhtml:7
 msgid "Products"
 msgstr ""
 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
-#: app/controllers/public/search_controller.rb:93
+#: app/controllers/public/search_controller.rb:134
 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
 msgid "Enterprises"
 msgstr ""
 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
-#: app/controllers/public/search_controller.rb:95
+#: app/controllers/public/search_controller.rb:136
 #: app/views/profile/index.rhtml:22
 msgid "Communities"
 msgstr ""
 #: app/helpers/assets_helper.rb:12
-#: app/controllers/public/search_controller.rb:97
+#: app/controllers/public/search_controller.rb:138
 msgid "Events"
 msgstr ""
 #: app/models/enterprise.rb:5 app/models/product.rb:-
+#: app/views/search/enterprises.rhtml:5
 msgid "Enterprise"
 msgstr ""
@@ -336,37 +426,37 @@ msgstr &quot;&quot;
 msgid "Community"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Contact person"
 msgstr ""
-#: app/models/organization.rb:43 app/models/environment.rb:-
+#: app/models/organization.rb:41 app/models/environment.rb:-
 msgid "Contact email"
 msgstr ""
-#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
+#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
 #: app/views/enterprise_validation/_details.rhtml:19
 msgid "Acronym"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Foundation year"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Legal form"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Economic activity"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #: app/views/enterprise_registration/basic_information.rhtml:27
 msgid "Management information"
 msgstr ""
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Validated"
 msgstr ""
@@ -441,8 +531,12 @@ msgstr &quot;&quot;
 msgid "The task was cancelled at %s"
 msgstr ""
+#: app/models/link_list_block.rb:7
+msgid "Display a list of links."
+msgstr ""
+
 #: app/models/favorite_enterprises_block.rb:4
-#: app/views/profile_editor/index.rhtml:29
+#: app/views/profile_editor/index.rhtml:31
 msgid "Favorite Enterprises"
 msgstr ""
@@ -637,6 +731,10 @@ msgstr &quot;&quot;
 msgid "Virtual"
 msgstr ""
+#: app/models/products_block.rb:16
+msgid "View all products"
+msgstr ""
+
 #: app/models/tags_block.rb:8
 msgid "Block listing content count by tag"
 msgstr ""
@@ -647,8 +745,8 @@ msgid &quot;&quot;
 "       Try to add some tags to some articles and see your tag cloud to grow."
 msgstr ""
-#: app/models/tags_block.rb:17
-msgid "%s's tags"
+#: app/models/tags_block.rb:20
+msgid "tags"
 msgstr ""
 #: app/models/friendship.rb:-
@@ -742,7 +840,7 @@ msgstr &quot;&quot;
 msgid "Manage products"
 msgstr ""
-#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
+#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
 msgid "Manage friends"
 msgstr ""
@@ -754,25 +852,25 @@ msgstr &quot;&quot;
 msgid "Perform task"
 msgstr ""
-#: app/models/profile.rb:144
+#: app/models/profile.rb:155
 msgid "An existing profile cannot be renamed."
 msgstr ""
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid "%s's home page"
 msgstr ""
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid ""
 "<p>This is a default homepage created for %s. It can be changed though the "
 "control panel.</p>"
 msgstr ""
-#: app/models/profile.rb:318
+#: app/models/profile.rb:338
 msgid "%s can't has members"
 msgstr ""
-#: app/models/profile.rb:335
+#: app/models/profile.rb:355
 msgid "%s can't has moderators"
 msgstr ""
@@ -800,10 +898,6 @@ msgstr &quot;&quot;
 msgid "%{fn} was already assigned to another category."
 msgstr ""
-#: app/models/category.rb:13
-msgid "%{fn} must be the same as the parents'"
-msgstr ""
-
 #: app/models/article_block.rb:4
 msgid "Display one of your contents."
 msgstr ""
@@ -1009,7 +1103,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
 msgstr ""
 #: app/models/profile_list_block.rb:75
-#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
+#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
 msgid "None"
 msgstr ""
@@ -1053,6 +1147,14 @@ msgstr &quot;&quot;
 msgid "thumbnail"
 msgstr ""
+#: app/models/enterprise_homepage.rb:4
+msgid "Enterprise homepage."
+msgstr ""
+
+#: app/models/enterprise_homepage.rb:8
+msgid "Display the summary of profile."
+msgstr ""
+
 #: app/models/sellers_search_block.rb:4
 msgid "A search for enterprises by products selled and local"
 msgstr ""
@@ -1375,11 +1477,6 @@ msgstr &quot;&quot;
 msgid "URL:"
 msgstr ""
-#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
-#: app/views/cms/_event.rhtml:12
-msgid "Address:"
-msgstr ""
-
 #: app/models/event.rb:77
 msgid "When:"
 msgstr ""
@@ -1457,7 +1554,7 @@ msgstr &quot;&quot;
 msgid "%s still needs to accept being your friend."
 msgstr ""
-#: app/controllers/my_profile/cms_controller.rb:97
+#: app/controllers/my_profile/cms_controller.rb:103
 msgid "Article \"%s\" configured as home page."
 msgstr ""
@@ -1525,51 +1622,51 @@ msgstr &quot;&quot;
 msgid "This action is not available for \"%s\"."
 msgstr ""
-#: app/controllers/public/search_controller.rb:182
-msgid "Newer profiles"
+#: app/controllers/public/search_controller.rb:196
+msgid "Newer people"
 msgstr ""
-#: app/controllers/public/search_controller.rb:183
-msgid "Newer communities"
+#: app/controllers/public/search_controller.rb:197
+msgid "Newer enterprises"
 msgstr ""
-#: app/controllers/public/search_controller.rb:184
-msgid "Newer articles"
+#: app/controllers/public/search_controller.rb:199
+msgid "Upcoming events"
 msgstr ""
-#: app/controllers/public/search_controller.rb:185
-msgid "Most commented articles"
+#: app/controllers/public/search_controller.rb:200
+msgid "Newer communities"
 msgstr ""
-#: app/controllers/public/search_controller.rb:186
-msgid "Newer enterprises"
+#: app/controllers/public/search_controller.rb:201
+msgid "Newer articles"
 msgstr ""
-#: app/controllers/public/search_controller.rb:187
-msgid "Near events TODO"
+#: app/controllers/public/search_controller.rb:202
+msgid "Most commented articles"
 msgstr ""
-#: app/controllers/public/account_controller.rb:21
+#: app/controllers/public/account_controller.rb:23
 msgid "Logged in successfully"
 msgstr ""
-#: app/controllers/public/account_controller.rb:23
+#: app/controllers/public/account_controller.rb:25
 msgid "Incorrect username or password"
 msgstr ""
-#: app/controllers/public/account_controller.rb:51
+#: app/controllers/public/account_controller.rb:53
 msgid "Thanks for signing up!"
 msgstr ""
-#: app/controllers/public/account_controller.rb:69
+#: app/controllers/public/account_controller.rb:71
 msgid "You have been logged out."
 msgstr ""
-#: app/controllers/public/account_controller.rb:80
+#: app/controllers/public/account_controller.rb:82
 msgid "Your password has been changed successfully!"
 msgstr ""
-#: app/controllers/public/account_controller.rb:83
+#: app/controllers/public/account_controller.rb:85
 msgid "The supplied current password is incorrect."
 msgstr ""
@@ -1626,13 +1723,13 @@ msgid &quot;Leave&quot;
 msgstr ""
 #: app/views/memberships/index.rhtml:26
-#: app/views/profile_editor/index.rhtml:46
+#: app/views/profile_editor/index.rhtml:51
 #: app/views/profile/enterprises.rhtml:15
 msgid "Register a new Enterprise"
 msgstr ""
 #: app/views/memberships/index.rhtml:27
-#: app/views/profile_editor/index.rhtml:45
+#: app/views/profile_editor/index.rhtml:50
 #: app/views/profile/communities.rhtml:15
 msgid "Create a new community"
 msgstr ""
@@ -1926,6 +2023,11 @@ msgstr &quot;&quot;
 msgid "Add a block"
 msgstr ""
+#: app/views/box_organizer/_products_block.rhtml:5
+#: app/views/box_organizer/_link_list_block.rhtml:3
+msgid "Select the products that must be shown."
+msgstr ""
+
 #: app/views/box_organizer/edit.rhtml:1
 msgid "Editing block"
 msgstr ""
@@ -2124,10 +2226,6 @@ msgid &quot;&quot;
 "profile"
 msgstr ""
-#: app/views/enterprise_registration/basic_information.rhtml:32
-msgid "Next"
-msgstr ""
-
 #: app/views/enterprise_editor/_form.rhtml:7
 #: app/views/enterprise_validation/list_processed.rhtml:13
 #: app/views/enterprise_validation/index.rhtml:18
@@ -2174,26 +2272,14 @@ msgstr &quot;&quot;
 msgid "Contact phone:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:8
-msgid "Contact person:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:9
 msgid "Acronym:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:10
-msgid "Foundation year:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:11
 msgid "Legal Form:"
 msgstr ""
-#: app/views/enterprise_editor/index.rhtml:12
-msgid "Economic activity:"
-msgstr ""
-
 #: app/views/enterprise_editor/index.rhtml:13
 msgid "Management infomation:"
 msgstr ""
@@ -2234,51 +2320,51 @@ msgstr &quot;&quot;
 msgid "My profile"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:9
+#: app/views/profile_editor/index.rhtml:11
 msgid "Edit Profile"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:11
+#: app/views/profile_editor/index.rhtml:13
 msgid "Mail settings"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:13
+#: app/views/profile_editor/index.rhtml:15
 msgid "Pending tasks"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:15
+#: app/views/profile_editor/index.rhtml:17
 msgid "Edit Visual Design"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:17
+#: app/views/profile_editor/index.rhtml:19
 msgid "Manage Content"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:19
+#: app/views/profile_editor/index.rhtml:21
 msgid "Change Password"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:23
+#: app/views/profile_editor/index.rhtml:25
 msgid "Manage Members"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:25
+#: app/views/profile_editor/index.rhtml:27
 msgid "Manage Products and Services"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:27
+#: app/views/profile_editor/index.rhtml:29
 msgid "Enterprise Validation"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:33
+#: app/views/profile_editor/index.rhtml:35
 msgid "Disable Enterprise"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:35
+#: app/views/profile_editor/index.rhtml:37
 msgid "Enable Enterprise"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:42
+#: app/views/profile_editor/index.rhtml:47
 msgid "Manage my groups"
 msgstr ""
@@ -2330,15 +2416,8 @@ msgid &quot;Moderation options&quot;
 msgstr ""
 #: app/views/profile_editor/_organization.rhtml:12
-msgid "Closed organization"
-msgstr ""
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Male"
-msgstr ""
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Female"
+msgid ""
+"New members must be approved by an administrator before joining this group?"
 msgstr ""
 #: app/views/profile_editor/enable.rhtml:1
@@ -2419,7 +2498,7 @@ msgstr &quot;&quot;
 msgid "Homepage: "
 msgstr ""
-#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
+#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
 msgid "Products/Services"
 msgstr ""
@@ -2480,24 +2559,30 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
 msgstr ""
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
+msgid ""
+"Products and Services results for \"%{query}\" of enterprises in \"%"
+"{category}\""
 msgstr ""
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%s\""
+msgid "Products and Services results for \"%s\""
+msgstr ""
+
+#: app/views/search/products.rhtml:5
+msgid "Products and Services of enterprises in \"%s\""
 msgstr ""
 #: app/views/search/products.rhtml:5
-msgid "Products of enterprises in \"%s\""
+msgid "Products and Services"
 msgstr ""
-#: app/views/search/products.rhtml:10
+#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
 msgid "Within %s km from %s"
 msgstr ""
 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 msgid "Refine your search"
 msgstr ""
@@ -2505,40 +2590,58 @@ msgstr &quot;&quot;
 msgid "by %{author} on \"%{article}\""
 msgstr ""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%{query}\" in \"%{category}\""
 msgstr ""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%s\""
 msgstr ""
-#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
-#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
-msgid "(recently added)"
+#: app/views/search/_product_categories_menu.rhtml:13
+msgid "There is no sub-categories for %s."
 msgstr ""
-#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
-#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
-msgid "Browse by name"
+#: app/views/search/_product_categories_menu.rhtml:15
+msgid "There is no categories."
+msgstr ""
+
+#: app/views/search/enterprises.rhtml:3
+msgid "Enterprise results for \"%{query}\" in \"%{category}\""
+msgstr ""
+
+#: app/views/search/enterprises.rhtml:3
+msgid "Enterprise results for \"%s\""
 msgstr ""
-#: app/views/search/_directory.rhtml:2
-msgid "Recent"
+#: app/views/search/enterprises.rhtml:5
+msgid "Enterprises in \"%s\""
 msgstr ""
-#: app/views/search/_display_results.rhtml:18
-msgid "more..."
+#: app/views/search/_display_results.rhtml:21
+msgid "see all (%d)"
+msgstr ""
+
+#: app/views/search/_display_results.rhtml:21
+msgid "see all..."
 msgstr ""
 #: app/views/search/popup.rhtml:3
 msgid "Search %s"
 msgstr ""
+#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
+#: app/views/search/articles.rhtml:11
+msgid "(recently added)"
+msgstr ""
+
+#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
+#: app/views/search/articles.rhtml:17
+msgid "Browse by name"
+msgstr ""
+
 #: app/views/search/_sellers_form.rhtml:1
 msgid "Search for sellers"
 msgstr ""
@@ -2547,21 +2650,15 @@ msgstr &quot;&quot;
 msgid "Search in:"
 msgstr ""
-#: app/views/search/_sellers_form.rhtml:13
-#: app/views/search/_search_form.rhtml:27
+#: app/views/search/_sellers_form.rhtml:17
 msgid "Distance (km): "
 msgstr ""
-#: app/views/search/_sellers_form.rhtml:16
-#: app/views/search/_search_form.rhtml:28
-msgid "From: "
-msgstr ""
-
-#: app/views/search/_product.rhtml:10
+#: app/views/search/_product.rhtml:15
 msgid "Price: %d"
 msgstr ""
-#: app/views/search/_product.rhtml:12
+#: app/views/search/_product.rhtml:17
 msgid "Suplier: %s"
 msgstr ""
@@ -2581,11 +2678,19 @@ msgstr &quot;&quot;
 msgid "Search within:"
 msgstr ""
-#: app/views/search/_search_form.rhtml:35
+#: app/views/search/_search_form.rhtml:28
+msgid "Distance (km):"
+msgstr ""
+
+#: app/views/search/_search_form.rhtml:33
+msgid "From:"
+msgstr ""
+
+#: app/views/search/_search_form.rhtml:42
 msgid "Search for:"
 msgstr ""
-#: app/views/search/_search_form.rhtml:49
+#: app/views/search/_search_form.rhtml:56
 msgid "Advanced search"
 msgstr ""
@@ -2597,7 +2702,7 @@ msgstr &quot;&quot;
 msgid "Last update: %s."
 msgstr ""
-#: app/views/search/_google_maps.rhtml:48
+#: app/views/search/_google_maps.rhtml:68
 msgid ""
 "One or more items don't have geographical information, and won't be shown in "
 "the map. Choose \"Display in list\" to see them."
@@ -2655,19 +2760,19 @@ msgstr &quot;&quot;
 msgid "Join this enterprise"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:6
+#: app/views/blocks/profile_info.rhtml:17
 msgid "Since %{year}/%{month}"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
+#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
 msgid "Homepage"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:8
+#: app/views/blocks/profile_info.rhtml:19
 msgid "View profile"
 msgstr ""
-#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
+#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
 msgid "Control panel"
 msgstr ""
@@ -2792,25 +2897,25 @@ msgstr &quot;&quot;
 msgid "Properties"
 msgstr ""
-#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
+#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
 msgid "Public view"
 msgstr ""
 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
+msgid "Use as homepage"
+msgstr ""
+
+#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
 msgid "Delete"
 msgstr ""
-#: app/views/cms/view.rhtml:42
+#: app/views/cms/view.rhtml:43
 msgid ""
 "Are you sure that you want to remove this folder? Note that all the items "
 "inside it will also be removed!"
 msgstr ""
-#: app/views/cms/view.rhtml:67
-msgid "Use as homepage"
-msgstr ""
-
-#: app/views/cms/view.rhtml:68
+#: app/views/cms/view.rhtml:69
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
@@ -3412,12 +3517,12 @@ msgstr &quot;&quot;
 msgid "We need to be sure that you wrote correctly your password."
 msgstr ""
-#: app/views/account/signup.rhtml:33
+#: app/views/account/signup.rhtml:35
 #: app/views/account/activate_enterprise.rhtml:37
 msgid "I accept the terms of use"
 msgstr ""
-#: app/views/account/signup.rhtml:38
+#: app/views/account/signup.rhtml:40
 #: app/views/account/activate_enterprise.rhtml:42
 msgid "Sign up"
 msgstr ""
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.10.1\n"
-"POT-Creation-Date: 2008-06-27 14:57-0300\n"
-"PO-Revision-Date: 2008-07-08 18:56-0300\n"
+"POT-Creation-Date: 2008-07-08 19:03-0300\n"
+"PO-Revision-Date: 2008-06-27 14:54-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr &quot;Ajuda&quot;
 #: app/helpers/application_helper.rb:81
 #: app/views/box_organizer/add_block.rhtml:18
-#: app/views/search/_search_form.rhtml:56
+#: app/views/search/_search_form.rhtml:63
 msgid "Close"
 msgstr "Fechar"
@@ -34,63 +34,66 @@ msgstr &quot;Fechar&quot;
 msgid "This is %s, version %s"
 msgstr "%s, versão %s"
-#: app/helpers/application_helper.rb:318
-#: app/views/memberships/new_community.rhtml:12
-#: app/views/box_organizer/edit.rhtml:9
-#: app/views/admin_panel/site_info.rhtml:11
-#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
-#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
-#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
-#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: app/helpers/application_helper.rb:360 app/models/product.rb:39
+#: app/helpers/application_helper.rb:246 app/models/product.rb:39
 msgid "Uncategorized product"
 msgstr "Produto não categorizado"
-#: app/helpers/application_helper.rb:366
+#: app/helpers/application_helper.rb:252
 msgid "No product"
 msgstr "Sem produto"
-#: app/helpers/application_helper.rb:472
+#: app/helpers/application_helper.rb:338
+#, fuzzy
+msgid "non registered gender"
+msgstr "Pessoas registradas recentemente"
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Male"
+msgstr "Masculino"
+
+#: app/helpers/application_helper.rb:338
+#: app/views/profile_editor/_person.rhtml:5
+msgid "Female"
+msgstr "Feminino"
+
+#: app/helpers/application_helper.rb:366
 msgid "Click on this icon to go to the <b>%s</b>'s home page"
 msgstr "Clique nesse ícone para ir para a página inicial de <b>%s</b>"
-#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
+#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
 #: app/views/content_viewer/view_page.rhtml:65
 msgid "Categories"
 msgstr "Categorias"
-#: app/helpers/application_helper.rb:532
+#: app/helpers/application_helper.rb:417
 msgid "open"
 msgstr "aberto"
-#: app/helpers/application_helper.rb:568
+#: app/helpers/application_helper.rb:453
 msgid "Search..."
 msgstr "Busca..."
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:455
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
 "Isto é uma caixa de busca. Clique, escreva sua consulta, e pressione enter "
 "para pesquisar"
-#: app/helpers/application_helper.rb:571
+#: app/helpers/application_helper.rb:456
 msgid "Click, write and press enter to find"
 msgstr "Clique, escreva e pressione enter para pesquisar"
-#: app/helpers/application_helper.rb:577
+#: app/helpers/application_helper.rb:462
 #: app/views/region_validators/region.rhtml:23
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/_sellers_form.rhtml:22
+#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:16
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
 msgid "Search"
 msgstr "Busca"
-#: app/helpers/application_helper.rb:652
+#: app/helpers/application_helper.rb:518
 msgid "Are you sure you want to visit this web site?"
 msgstr "Tem certeza que quer visitar este web site?"
@@ -102,6 +105,44 @@ msgstr &quot;Mostrar como lista&quot;
 msgid "Display in map"
 msgstr "Mostrar no mapa"
+#: app/helpers/search_helper.rb:53
+#, fuzzy
+msgid "E-Mail: "
+msgstr "e-Mail"
+
+#: app/helpers/search_helper.rb:56
+msgid "Phone(s): "
+msgstr ""
+
+#: app/helpers/search_helper.rb:59
+#, fuzzy
+msgid "Location: "
+msgstr "Ações: %s"
+
+#: app/helpers/search_helper.rb:62
+#, fuzzy
+msgid "Address: "
+msgstr "Endereço:"
+
+#: app/helpers/search_helper.rb:65
+#, fuzzy
+msgid "Products/Services: "
+msgstr "Produtos/Serviços"
+
+#: app/helpers/search_helper.rb:68
+#, fuzzy
+msgid "Distance: "
+msgstr "Distância (km): "
+
+#: app/helpers/search_helper.rb:81
+msgid "Previous"
+msgstr "Anterior"
+
+#: app/helpers/search_helper.rb:81
+#: app/views/enterprise_registration/basic_information.rhtml:32
+msgid "Next"
+msgstr "Próximo"
+
 #: app/helpers/dates_helper.rb:6
 msgid "January"
 msgstr "Janeiro"
@@ -150,47 +191,48 @@ msgstr &quot;Novembro&quot;
 msgid "December"
 msgstr "Dezembro"
-#: app/helpers/dates_helper.rb:23
-msgid "%d %B %Y"
-msgstr "%d de %B de %Y"
+#: app/helpers/dates_helper.rb:27
+#, fuzzy
+msgid "%{month} %{day}, %{year}"
+msgstr "%{month} %{year}"
-#: app/helpers/dates_helper.rb:32
+#: app/helpers/dates_helper.rb:36
 msgid "%d %B %Y, %H:%m"
 msgstr "%d de %B de %Y, %H:%m"
-#: app/helpers/dates_helper.rb:42
+#: app/helpers/dates_helper.rb:46
 msgid "from %s to %s"
-msgstr "%s a %s"
+msgstr "de %s para %s"
-#: app/helpers/dates_helper.rb:49
+#: app/helpers/dates_helper.rb:53
 msgid "Sunday"
 msgstr "Domingo"
-#: app/helpers/dates_helper.rb:50
+#: app/helpers/dates_helper.rb:54
 msgid "Monday"
 msgstr "Segunda"
-#: app/helpers/dates_helper.rb:51
+#: app/helpers/dates_helper.rb:55
 msgid "Tuesday"
 msgstr "Terça"
-#: app/helpers/dates_helper.rb:52
+#: app/helpers/dates_helper.rb:56
 msgid "Wednesday"
 msgstr "Quarta"
-#: app/helpers/dates_helper.rb:53
+#: app/helpers/dates_helper.rb:57
 msgid "Thursday"
 msgstr "Quinta"
-#: app/helpers/dates_helper.rb:54
+#: app/helpers/dates_helper.rb:58
 msgid "Friday"
 msgstr "Sexta"
-#: app/helpers/dates_helper.rb:55
+#: app/helpers/dates_helper.rb:59
 msgid "Saturday"
 msgstr "Sábado"
-#: app/helpers/dates_helper.rb:71
+#: app/helpers/dates_helper.rb:72
 msgid "%{month} %{year}"
 msgstr "%{month} %{year}"
@@ -214,33 +256,73 @@ msgstr &quot;&quot;
 "O idioma que você escolher aqui será usado para opções, botões, etc. Ele não "
 "afeta o idioma do conteúdo criado por outros usuários."
+#: app/helpers/enterprise_homepage_helper.rb:6
+#: app/views/enterprise_editor/index.rhtml:8
+msgid "Contact person:"
+msgstr "Pessoa de contato:"
+
+#: app/helpers/enterprise_homepage_helper.rb:7
+#, fuzzy
+msgid "e-Mail:"
+msgstr "e-Mail"
+
+#: app/helpers/enterprise_homepage_helper.rb:8
+msgid "Phone(s):"
+msgstr ""
+
+#: app/helpers/enterprise_homepage_helper.rb:9
+#, fuzzy
+msgid "Location:"
+msgstr "Ações"
+
+#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
+#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
+msgid "Address:"
+msgstr "Endereço:"
+
+#: app/helpers/enterprise_homepage_helper.rb:11
+#, fuzzy
+msgid "Legal form:"
+msgstr "Formulário Legal"
+
+#: app/helpers/enterprise_homepage_helper.rb:12
+#: app/views/enterprise_editor/index.rhtml:10
+msgid "Foundation year:"
+msgstr "Ano de fundação:"
+
+#: app/helpers/enterprise_homepage_helper.rb:13
+#: app/views/enterprise_editor/index.rhtml:12
+msgid "Economic activity:"
+msgstr "Atividade econômica:"
+
+#: app/helpers/enterprise_homepage_helper.rb:21
+#, fuzzy
+msgid "Distance:"
+msgstr "Distância (km): "
+
 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
 msgid "Main content"
 msgstr "Gerenciar conteúdo"
-#: app/helpers/boxes_helper.rb:124
+#: app/helpers/boxes_helper.rb:125
 msgid "Move block up"
 msgstr "Mover para cima"
-#: app/helpers/boxes_helper.rb:125
+#: app/helpers/boxes_helper.rb:129
 msgid "Move block down"
 msgstr "Mover para baixo"
-#: app/helpers/boxes_helper.rb:126
-msgid "Remove block"
-msgstr "Remover bloco"
-
-#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
+#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
 #: app/views/manage_products/index.rhtml:14
 #: app/views/manage_products/index.rhtml:40
-#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
+#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
 msgid "Edit"
 msgstr "Editar"
-#: app/helpers/profile_helper.rb:7
-msgid "edit your information"
-msgstr "editar suas informações"
+#: app/helpers/boxes_helper.rb:137
+msgid "Remove block"
+msgstr "Remover bloco"
 #: app/helpers/tags_helper.rb:33
 msgid "No tags yet."
@@ -262,6 +344,26 @@ msgstr &quot;Administrador tem que aprovar todas as novas organizações&quot;
 msgid "Administrator assigns validator organizations per region."
 msgstr "Administrador atribui organizações validadoras por região."
+#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
+#: app/views/box_organizer/edit.rhtml:9
+#: app/views/admin_panel/site_info.rhtml:11
+#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
+#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
+#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
+#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: app/helpers/forms_helper.rb:64
+#, fuzzy
+msgid "State:"
+msgstr "Estado"
+
+#: app/helpers/forms_helper.rb:65
+#, fuzzy
+msgid "City:"
+msgstr "Cidade"
+
 #: app/helpers/categories_helper.rb:6
 msgid "Do not display at the menu"
 msgstr "Não exibir no menu"
@@ -303,39 +405,40 @@ msgid &quot;Type of category&quot;
 msgstr "Tipo de categoria"
 #: app/helpers/assets_helper.rb:7
-#: app/controllers/public/search_controller.rb:92
+#: app/controllers/public/search_controller.rb:133
 msgid "Articles"
 msgstr "Artigos"
 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
-#: app/controllers/public/search_controller.rb:94
+#: app/controllers/public/search_controller.rb:135
 msgid "People"
 msgstr "Pessoas"
-#: app/helpers/assets_helper.rb:9
-#: app/controllers/public/search_controller.rb:96
-#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
+#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
+#: app/controllers/public/search_controller.rb:137
+#: app/views/search/_sellers_form.rhtml:7
 msgid "Products"
 msgstr "Produtos"
 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
-#: app/controllers/public/search_controller.rb:93
+#: app/controllers/public/search_controller.rb:134
 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
 msgid "Enterprises"
 msgstr "Empreendimentos"
 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
-#: app/controllers/public/search_controller.rb:95
+#: app/controllers/public/search_controller.rb:136
 #: app/views/profile/index.rhtml:22
 msgid "Communities"
 msgstr "Comunidades"
 #: app/helpers/assets_helper.rb:12
-#: app/controllers/public/search_controller.rb:97
+#: app/controllers/public/search_controller.rb:138
 msgid "Events"
 msgstr "Eventos"
 #: app/models/enterprise.rb:5 app/models/product.rb:-
+#: app/views/search/enterprises.rhtml:5
 msgid "Enterprise"
 msgstr "Empreendimento"
@@ -343,37 +446,37 @@ msgstr &quot;Empreendimento&quot;
 msgid "Community"
 msgstr "Comunidade"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Contact person"
 msgstr "Pessoa de contato"
-#: app/models/organization.rb:43 app/models/environment.rb:-
+#: app/models/organization.rb:41 app/models/environment.rb:-
 msgid "Contact email"
 msgstr "Email de contato"
-#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
+#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
 #: app/views/enterprise_validation/_details.rhtml:19
 msgid "Acronym"
 msgstr "Sigla"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Foundation year"
 msgstr "Ano de fundação"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Legal form"
 msgstr "Formulário Legal"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 msgid "Economic activity"
 msgstr "Atividade econômica"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #: app/views/enterprise_registration/basic_information.rhtml:27
 msgid "Management information"
 msgstr "Gerenciamento de informação"
-#: app/models/organization.rb:43
+#: app/models/organization.rb:41
 #, fuzzy
 msgid "Validated"
 msgstr "1 validador"
@@ -451,8 +554,13 @@ msgstr &quot;A tarefa foi finalizada em %s&quot;
 msgid "The task was cancelled at %s"
 msgstr "A tarefa foi cancelada em %s"
+#: app/models/link_list_block.rb:7
+#, fuzzy
+msgid "Display a list of links."
+msgstr "Mostrar como lista"
+
 #: app/models/favorite_enterprises_block.rb:4
-#: app/views/profile_editor/index.rhtml:29
+#: app/views/profile_editor/index.rhtml:31
 msgid "Favorite Enterprises"
 msgstr "Empreendimentos Favoritos"
@@ -664,6 +772,11 @@ msgstr &quot;Categoria&quot;
 msgid "Virtual"
 msgstr ""
+#: app/models/products_block.rb:16
+#, fuzzy
+msgid "View all products"
+msgstr "Novo produto"
+
 #: app/models/tags_block.rb:8
 msgid "Block listing content count by tag"
 msgstr "Block que lista a contagem de conteúdo por tag"
@@ -676,9 +789,10 @@ msgstr &quot;&quot;
 "A tag é criada quando você a adiciona ao seu artigo.<p/>Trente adicionar "
 "algumas tags para alguns artigos e veja sua nuvem de tags crescer."
-#: app/models/tags_block.rb:17
-msgid "%s's tags"
-msgstr "Tags de %s"
+#: app/models/tags_block.rb:20
+#, fuzzy
+msgid "tags"
+msgstr "tarefa"
 #: app/models/friendship.rb:-
 msgid "friendship"
@@ -772,7 +886,7 @@ msgstr &quot;Editar design de perfil&quot;
 msgid "Manage products"
 msgstr "Gerenciar produtos"
-#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
+#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
 msgid "Manage friends"
 msgstr "Gerenciar amigos"
@@ -784,15 +898,15 @@ msgstr &quot;validar empreendimento&quot;
 msgid "Perform task"
 msgstr "Realizar tarefa"
-#: app/models/profile.rb:144
+#: app/models/profile.rb:155
 msgid "An existing profile cannot be renamed."
 msgstr "Um perfil existente não pode ser renomeado"
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid "%s's home page"
 msgstr "Página inicial de %s"
-#: app/models/profile.rb:299
+#: app/models/profile.rb:319
 msgid ""
 "<p>This is a default homepage created for %s. It can be changed though the "
 "control panel.</p>"
@@ -800,11 +914,11 @@ msgstr &quot;&quot;
 "<p>Esta é a pagina inicial padrão criada para %s. Esta página pode ser "
 "modificada pelo painel de controle.</p>"
-#: app/models/profile.rb:318
+#: app/models/profile.rb:338
 msgid "%s can't has members"
 msgstr "%s não pode ter integrantes"
-#: app/models/profile.rb:335
+#: app/models/profile.rb:355
 msgid "%s can't has moderators"
 msgstr "%s não pode ter moderadores"
@@ -834,10 +948,6 @@ msgstr &quot;%{fn} já está sendo usado por outra categoria.&quot;
 msgid "%{fn} was already assigned to another category."
 msgstr "%{fn} já foi atribuído a outra categoria."
-#: app/models/category.rb:13
-msgid "%{fn} must be the same as the parents'"
-msgstr "%{fn} tem que ser o mesmo que o dos pais'"
-
 #: app/models/article_block.rb:4
 msgid "Display one of your contents."
 msgstr "Apresentar um dos seus conteúdos."
@@ -1060,7 +1170,7 @@ msgstr &quot;&quot;
 "Clicando em uma pessoa ou grupo você será enviado para sua página inicial."
 #: app/models/profile_list_block.rb:75
-#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
+#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
 msgid "None"
 msgstr "Nenhum(a)"
@@ -1107,6 +1217,15 @@ msgstr &quot;Uma coleção de fotos, logos ou outros tipos de imagens.&quot;
 msgid "thumbnail"
 msgstr "miniatura"
+#: app/models/enterprise_homepage.rb:4
+#, fuzzy
+msgid "Enterprise homepage."
+msgstr "Empreendimento"
+
+#: app/models/enterprise_homepage.rb:8
+msgid "Display the summary of profile."
+msgstr ""
+
 #: app/models/sellers_search_block.rb:4
 msgid "A search for enterprises by products selled and local"
 msgstr "Uma busca de empreendimentos por produtos vendidos e localização"
@@ -1453,11 +1572,6 @@ msgstr &quot;Evento&quot;
 msgid "URL:"
 msgstr "URL:"
-#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
-#: app/views/cms/_event.rhtml:12
-msgid "Address:"
-msgstr "Endereço:"
-
 #: app/models/event.rb:77
 msgid "When:"
 msgstr "Quando:"
@@ -1535,7 +1649,7 @@ msgstr &quot;%s não foi desabilitado.&quot;
 msgid "%s still needs to accept being your friend."
 msgstr "%s ainda precisa aceitar ser seu(sua) amigo(a)."
-#: app/controllers/my_profile/cms_controller.rb:97
+#: app/controllers/my_profile/cms_controller.rb:103
 msgid "Article \"%s\" configured as home page."
 msgstr "Artigo \"%s\" configurado como página inicial."
@@ -1603,55 +1717,55 @@ msgstr &quot;Empreendimento ativado com sucesso&quot;
 msgid "This action is not available for \"%s\"."
 msgstr "Esta ação não está disponível para \"%s\"."
-#: app/controllers/public/search_controller.rb:182
+#: app/controllers/public/search_controller.rb:196
 #, fuzzy
-msgid "Newer profiles"
+msgid "Newer people"
 msgstr "Ver perfil"
-#: app/controllers/public/search_controller.rb:183
+#: app/controllers/public/search_controller.rb:197
+#, fuzzy
+msgid "Newer enterprises"
+msgstr "Registrar empreendimento"
+
+#: app/controllers/public/search_controller.rb:199
+msgid "Upcoming events"
+msgstr ""
+
+#: app/controllers/public/search_controller.rb:200
 #, fuzzy
 msgid "Newer communities"
 msgstr "Todas comunidades"
-#: app/controllers/public/search_controller.rb:184
+#: app/controllers/public/search_controller.rb:201
 #, fuzzy
 msgid "Newer articles"
 msgstr "Novo artigo"
-#: app/controllers/public/search_controller.rb:185
+#: app/controllers/public/search_controller.rb:202
 msgid "Most commented articles"
 msgstr "Artigos mais comentados"
-#: app/controllers/public/search_controller.rb:186
-#, fuzzy
-msgid "Newer enterprises"
-msgstr "Registrar empreendimento"
-
-#: app/controllers/public/search_controller.rb:187
-msgid "Near events TODO"
-msgstr ""
-
-#: app/controllers/public/account_controller.rb:21
+#: app/controllers/public/account_controller.rb:23
 msgid "Logged in successfully"
 msgstr "Login bem sucedido"
-#: app/controllers/public/account_controller.rb:23
+#: app/controllers/public/account_controller.rb:25
 msgid "Incorrect username or password"
 msgstr "Nome ou senha incorreto"
-#: app/controllers/public/account_controller.rb:51
+#: app/controllers/public/account_controller.rb:53
 msgid "Thanks for signing up!"
 msgstr "Obrigado por se registrar!"
-#: app/controllers/public/account_controller.rb:69
+#: app/controllers/public/account_controller.rb:71
 msgid "You have been logged out."
 msgstr "Você saiu do sistema."
-#: app/controllers/public/account_controller.rb:80
+#: app/controllers/public/account_controller.rb:82
 msgid "Your password has been changed successfully!"
 msgstr "Sua senha foi alterada com sucesso!"
-#: app/controllers/public/account_controller.rb:83
+#: app/controllers/public/account_controller.rb:85
 msgid "The supplied current password is incorrect."
 msgstr "A senha informada está incorreta"
@@ -1708,13 +1822,13 @@ msgid &quot;Leave&quot;
 msgstr "Sair"
 #: app/views/memberships/index.rhtml:26
-#: app/views/profile_editor/index.rhtml:46
+#: app/views/profile_editor/index.rhtml:51
 #: app/views/profile/enterprises.rhtml:15
 msgid "Register a new Enterprise"
 msgstr "Registrar novo Empreendimento"
 #: app/views/memberships/index.rhtml:27
-#: app/views/profile_editor/index.rhtml:45
+#: app/views/profile_editor/index.rhtml:50
 #: app/views/profile/communities.rhtml:15
 msgid "Create a new community"
 msgstr "Criar nova comunidade"
@@ -2008,6 +2122,11 @@ msgstr &quot;Editar aparência&quot;
 msgid "Add a block"
 msgstr "Adicionar um bloco"
+#: app/views/box_organizer/_products_block.rhtml:5
+#: app/views/box_organizer/_link_list_block.rhtml:3
+msgid "Select the products that must be shown."
+msgstr ""
+
 #: app/views/box_organizer/edit.rhtml:1
 msgid "Editing block"
 msgstr "Editando bloco"
@@ -2218,10 +2337,6 @@ msgstr &quot;&quot;
 "empreendimento seja submetido a avaliação pela entidade de sua escolha. Uma "
 "vez aprovada, você poderá ativar o perfil do empreendimento"
-#: app/views/enterprise_registration/basic_information.rhtml:32
-msgid "Next"
-msgstr "Próximo"
-
 #: app/views/enterprise_editor/_form.rhtml:7
 #: app/views/enterprise_validation/list_processed.rhtml:13
 #: app/views/enterprise_validation/index.rhtml:18
@@ -2268,26 +2383,14 @@ msgstr &quot;Identificador: &quot;
 msgid "Contact phone:"
 msgstr "Telefone de contato:"
-#: app/views/enterprise_editor/index.rhtml:8
-msgid "Contact person:"
-msgstr "Pessoa de contato:"
-
 #: app/views/enterprise_editor/index.rhtml:9
 msgid "Acronym:"
 msgstr "Sigla:"
-#: app/views/enterprise_editor/index.rhtml:10
-msgid "Foundation year:"
-msgstr "Ano de fundação:"
-
 #: app/views/enterprise_editor/index.rhtml:11
 msgid "Legal Form:"
 msgstr "Estaturo jurídico:"
-#: app/views/enterprise_editor/index.rhtml:12
-msgid "Economic activity:"
-msgstr "Atividade econômica:"
-
 #: app/views/enterprise_editor/index.rhtml:13
 msgid "Management infomation:"
 msgstr "Informação de gerenciamento:"
@@ -2328,51 +2431,51 @@ msgstr &quot;Atualizar&quot;
 msgid "My profile"
 msgstr "Meu perfil"
-#: app/views/profile_editor/index.rhtml:9
+#: app/views/profile_editor/index.rhtml:11
 msgid "Edit Profile"
 msgstr "Editar Perfil"
-#: app/views/profile_editor/index.rhtml:11
+#: app/views/profile_editor/index.rhtml:13
 msgid "Mail settings"
 msgstr "Configurações de e-mail"
-#: app/views/profile_editor/index.rhtml:13
+#: app/views/profile_editor/index.rhtml:15
 msgid "Pending tasks"
 msgstr "Tarefas pendentes"
-#: app/views/profile_editor/index.rhtml:15
+#: app/views/profile_editor/index.rhtml:17
 msgid "Edit Visual Design"
 msgstr "Editar Aparência"
-#: app/views/profile_editor/index.rhtml:17
+#: app/views/profile_editor/index.rhtml:19
 msgid "Manage Content"
 msgstr "Gerenciar conteúdo"
-#: app/views/profile_editor/index.rhtml:19
+#: app/views/profile_editor/index.rhtml:21
 msgid "Change Password"
 msgstr "Alterar Senha"
-#: app/views/profile_editor/index.rhtml:23
+#: app/views/profile_editor/index.rhtml:25
 msgid "Manage Members"
 msgstr "Gerenciar Integrantes"
-#: app/views/profile_editor/index.rhtml:25
+#: app/views/profile_editor/index.rhtml:27
 msgid "Manage Products and Services"
 msgstr "Gerenciar Produtos e Serviços"
-#: app/views/profile_editor/index.rhtml:27
+#: app/views/profile_editor/index.rhtml:29
 msgid "Enterprise Validation"
 msgstr "Validações de empreendimento"
-#: app/views/profile_editor/index.rhtml:33
+#: app/views/profile_editor/index.rhtml:35
 msgid "Disable Enterprise"
 msgstr "Desabilitar Empreendimento"
-#: app/views/profile_editor/index.rhtml:35
+#: app/views/profile_editor/index.rhtml:37
 msgid "Enable Enterprise"
 msgstr "Habilitar Empreendimento"
-#: app/views/profile_editor/index.rhtml:42
+#: app/views/profile_editor/index.rhtml:47
 msgid "Manage my groups"
 msgstr "Gerenciar meus grupos"
@@ -2424,16 +2527,9 @@ msgid &quot;Moderation options&quot;
 msgstr "Opções de moderação"
 #: app/views/profile_editor/_organization.rhtml:12
-msgid "Closed organization"
-msgstr "Organização fechada"
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Male"
-msgstr "Masculino"
-
-#: app/views/profile_editor/_person.rhtml:5
-msgid "Female"
-msgstr "Feminino"
+msgid ""
+"New members must be approved by an administrator before joining this group?"
+msgstr ""
 #: app/views/profile_editor/enable.rhtml:1
 msgid "Enabling '%s' enterprise"
@@ -2515,7 +2611,7 @@ msgstr &quot;Perfil de %s&quot;
 msgid "Homepage: "
 msgstr "Página: "
-#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
+#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
 msgid "Products/Services"
 msgstr "Produtos/Serviços"
@@ -2576,25 +2672,35 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
 msgstr "Empreendimentos favoritos de %s"
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
+#, fuzzy
+msgid ""
+"Products and Services results for \"%{query}\" of enterprises in \"%"
+"{category}\""
 msgstr ""
 "Resultados da busca por \"%{query}\" de empreendimentos em \"%{category}\""
 #: app/views/search/products.rhtml:3
-msgid "Products results for \"%s\""
+#, fuzzy
+msgid "Products and Services results for \"%s\""
 msgstr "Produtos encontrados por \"%s\""
 #: app/views/search/products.rhtml:5
-msgid "Products of enterprises in \"%s\""
+#, fuzzy
+msgid "Products and Services of enterprises in \"%s\""
 msgstr "Produtos de empreendimento em \"%s\""
-#: app/views/search/products.rhtml:10
+#: app/views/search/products.rhtml:5
+#, fuzzy
+msgid "Products and Services"
+msgstr "Gerenciar Produtos e Serviços"
+
+#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
 msgid "Within %s km from %s"
 msgstr "No raio de %s km até %s"
 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
-#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
-#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
+#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
+#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
 msgid "Refine your search"
 msgstr "Refine sua busca"
@@ -2602,40 +2708,63 @@ msgstr &quot;Refine sua busca&quot;
 msgid "by %{author} on \"%{article}\""
 msgstr "por %{author} em \"%{article}\""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%{query}\" in \"%{category}\""
 msgstr "Resultados da busca por \"%{query}\" em \"%{category}\""
-#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
-#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
-#: app/views/search/articles.rhtml:12
+#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
+#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
 msgid "Search results for \"%s\""
 msgstr "Resultados da busca por \"%s\""
-#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
-#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
-msgid "(recently added)"
-msgstr "(adicionado recentemente)"
+#: app/views/search/_product_categories_menu.rhtml:13
+#, fuzzy
+msgid "There is no sub-categories for %s."
+msgstr "Não há página: %s"
-#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
-#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
-msgid "Browse by name"
-msgstr "Navegar por nome"
+#: app/views/search/_product_categories_menu.rhtml:15
+#, fuzzy
+msgid "There is no categories."
+msgstr "Não há página: %s"
+
+#: app/views/search/enterprises.rhtml:3
+#, fuzzy
+msgid "Enterprise results for \"%{query}\" in \"%{category}\""
+msgstr "Resultados da busca por \"%{query}\" em \"%{category}\""
-#: app/views/search/_directory.rhtml:2
-msgid "Recent"
-msgstr "Recentes"
+#: app/views/search/enterprises.rhtml:3
+#, fuzzy
+msgid "Enterprise results for \"%s\""
+msgstr "Resultados da busca por \"%s\""
-#: app/views/search/_display_results.rhtml:18
-msgid "more..."
-msgstr "mais ..."
+#: app/views/search/enterprises.rhtml:5
+#, fuzzy
+msgid "Enterprises in \"%s\""
+msgstr "Cadastro de empreendimento: \"%s\""
+
+#: app/views/search/_display_results.rhtml:21
+msgid "see all (%d)"
+msgstr ""
+
+#: app/views/search/_display_results.rhtml:21
+msgid "see all..."
+msgstr ""
 #: app/views/search/popup.rhtml:3
 msgid "Search %s"
 msgstr "Busca em %s"
+#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
+#: app/views/search/articles.rhtml:11
+msgid "(recently added)"
+msgstr "(adicionado recentemente)"
+
+#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
+#: app/views/search/articles.rhtml:17
+msgid "Browse by name"
+msgstr "Navegar por nome"
+
 #: app/views/search/_sellers_form.rhtml:1
 msgid "Search for sellers"
 msgstr "Buscar por vendedores:"
@@ -2644,21 +2773,15 @@ msgstr &quot;Buscar por vendedores:&quot;
 msgid "Search in:"
 msgstr "Buscar em:"
-#: app/views/search/_sellers_form.rhtml:13
-#: app/views/search/_search_form.rhtml:27
+#: app/views/search/_sellers_form.rhtml:17
 msgid "Distance (km): "
 msgstr "Distância (km): "
-#: app/views/search/_sellers_form.rhtml:16
-#: app/views/search/_search_form.rhtml:28
-msgid "From: "
-msgstr "De: "
-
-#: app/views/search/_product.rhtml:10
+#: app/views/search/_product.rhtml:15
 msgid "Price: %d"
 msgstr "Preço: %d"
-#: app/views/search/_product.rhtml:12
+#: app/views/search/_product.rhtml:17
 msgid "Suplier: %s"
 msgstr "Fornecedor: %s"
@@ -2678,11 +2801,21 @@ msgstr &quot;Pesquisar em todo o site&quot;
 msgid "Search within:"
 msgstr "Buscar dentro de:"
-#: app/views/search/_search_form.rhtml:35
+#: app/views/search/_search_form.rhtml:28
+#, fuzzy
+msgid "Distance (km):"
+msgstr "Distância (km): "
+
+#: app/views/search/_search_form.rhtml:33
+#, fuzzy
+msgid "From:"
+msgstr "De: "
+
+#: app/views/search/_search_form.rhtml:42
 msgid "Search for:"
 msgstr "Buscar por:"
-#: app/views/search/_search_form.rhtml:49
+#: app/views/search/_search_form.rhtml:56
 msgid "Advanced search"
 msgstr "Busca avançada"
@@ -2694,7 +2827,7 @@ msgstr &quot;por %s&quot;
 msgid "Last update: %s."
 msgstr "Última atualização: %s."
-#: app/views/search/_google_maps.rhtml:48
+#: app/views/search/_google_maps.rhtml:68
 msgid ""
 "One or more items don't have geographical information, and won't be shown in "
 "the map. Choose \"Display in list\" to see them."
@@ -2754,19 +2887,19 @@ msgstr &quot;Sair deste empreendimento&quot;
 msgid "Join this enterprise"
 msgstr "Entrar neste empreendimento"
-#: app/views/blocks/profile_info.rhtml:6
+#: app/views/blocks/profile_info.rhtml:17
 msgid "Since %{year}/%{month}"
 msgstr "Desde %{month}/%{year}"
-#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
+#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
 msgid "Homepage"
 msgstr "Página inicial"
-#: app/views/blocks/profile_info.rhtml:8
+#: app/views/blocks/profile_info.rhtml:19
 msgid "View profile"
 msgstr "Ver perfil"
-#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
+#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
 msgid "Control panel"
 msgstr "Painel de controle"
@@ -2902,15 +3035,19 @@ msgstr &quot;Novo artigo&quot;
 msgid "Properties"
 msgstr "Características"
-#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
+#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
 msgid "Public view"
 msgstr "Visualização pública"
 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
+msgid "Use as homepage"
+msgstr "Usar como página incial"
+
+#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
 msgid "Delete"
 msgstr "Remover"
-#: app/views/cms/view.rhtml:42
+#: app/views/cms/view.rhtml:43
 msgid ""
 "Are you sure that you want to remove this folder? Note that all the items "
 "inside it will also be removed!"
@@ -2918,11 +3055,7 @@ msgstr &quot;&quot;
 "Tem certeza que quer excluir esta pasta? Perceba que todos os ítens dentro "
 "dela também serão removidos!"
-#: app/views/cms/view.rhtml:67
-msgid "Use as homepage"
-msgstr "Usar como página incial"
-
-#: app/views/cms/view.rhtml:68
+#: app/views/cms/view.rhtml:69
 msgid "Are you sure that you want to remove this item?"
 msgstr "Tem certeza que quer excluir este ítem?"
@@ -3577,12 +3710,12 @@ msgstr &quot;Não use uma senha óbvia, mas tente algo de ser lembrado facilmente.&quot;
 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.rhtml:33
+#: app/views/account/signup.rhtml:35
 #: app/views/account/activate_enterprise.rhtml:37
 msgid "I accept the terms of use"
 msgstr "Eu aceito os termos de uso"
-#: app/views/account/signup.rhtml:38
+#: app/views/account/signup.rhtml:40
 #: app/views/account/activate_enterprise.rhtml:42
 msgid "Sign up"
 msgstr "Registre-se."
@@ -3715,6 +3848,27 @@ msgstr &quot;Um projeto FBES&quot;
 msgid "Developed by Colivre"
 msgstr "Desenvolvimento Colivre"
+#~ msgid "%d %B %Y"
+#~ msgstr "%d de %B de %Y"
+
+#~ msgid "edit your information"
+#~ msgstr "editar suas informações"
+
+#~ msgid "%s's tags"
+#~ msgstr "Tags de %s"
+
+#~ msgid "%{fn} must be the same as the parents'"
+#~ msgstr "%{fn} tem que ser o mesmo que o dos pais'"
+
+#~ msgid "Closed organization"
+#~ msgstr "Organização fechada"
+
+#~ msgid "Recent"
+#~ msgstr "Recentes"
+
+#~ msgid "more..."
+#~ msgstr "mais ..."
+
 #~ msgid "Closed %s"
 #~ msgstr "%s fechado(a)"
@@ -4036,9 +4190,6 @@ msgstr &quot;Desenvolvimento Colivre&quot;
 #~ msgid "Category: %s"
 #~ msgstr "Categoria: %s"
-#~ msgid "Recently registered people"
-#~ msgstr "Pessoas registradas recentemente"
-
 #~ msgid "Recently created communities"
 #~ msgstr "Comunidades criadas recentemente"
@@ -4415,9 +4566,6 @@ msgstr &quot;Desenvolvimento Colivre&quot;
 #~ msgid "Max number of links"
 #~ msgstr "Número máximo de links"
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
 #~ msgid "Adicionar"
 #~ msgstr "Adicionar"
@@ -4723,9 +4871,6 @@ msgstr &quot;Desenvolvimento Colivre&quot;
 #~ msgid "Main content block"
 #~ msgstr "Bloco de conteúdo principal"
-#~ msgid "There is no page %s"
-#~ msgstr "Não há página: %s"
-
 #~ msgid "Edit enterprise info"
 #~ msgstr "Editar informação de empreendimento"
@@ -218,6 +218,7 @@ div#notice {
 }
 /* tables */
+
 table {
   border-collapse: collapse;
 }
@@ -243,6 +244,24 @@ table.noborder th, table.noborder td{
   border: none;
 }
+#edit-link-list-block {
+  overflow: auto;
+  overflow-x: hidden;
+  height: 120px;
+}
+ 
+#edit-link-list-block table {
+  width: 100%;
+}
+
+#edit-link-list-block table .cel-address {
+  width: 300px;
+}
+
+#edit-link-list-block table .cel-address input {
+  width: 100%;
+}
+
 /* for fields with auto-completion */
 div.auto-complete {
   display: block;
@@ -22,4 +22,29 @@ class EnvironmentDesignControllerTest &lt; Test::Unit::TestCase
   should 'indicate only actual blocks as such' do
     assert(@controller.available_blocks.all? {|item| item.new.is_a? Block})
   end
+
+  should 'LinkListBlock is available' do
+    assert_includes @controller.available_blocks, LinkListBlock
+  end
+
+  should 'be able to edit LinkListBlock' do
+    login_as(create_admin_user(Environment.default))
+    l = LinkListBlock.create!()
+    Environment.default.boxes.create!
+    Environment.default.boxes.first.blocks << l
+    get :edit, :id => l.id
+    assert_tag :tag => 'input', :attributes => { :name => 'block[links][][name]' }
+    assert_tag :tag => 'input', :attributes => { :name => 'block[links][][address]' }
+  end
+
+  should 'be able to save LinkListBlock' do
+    login_as(create_admin_user(Environment.default))
+    l = LinkListBlock.create!()
+    Environment.default.boxes.create!
+    Environment.default.boxes.first.blocks << l
+    post :save, :id => l.id, :block => { :links => [{:name => 'link 1', :address => '/address_1'}] }
+    l.reload
+    assert_equal [{'name' => 'link 1', 'address' => '/address_1'}], l.links
+  end
+  
 end
@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class LinkListBlockTest < ActiveSupport::TestCase
+
+  should 'default describe' do
+    assert_not_equal Block.description, LinkListBlock.description
+  end
+
+  should 'have field links' do
+    l = LinkListBlock.new
+    assert_respond_to l, :links
+  end
+  
+  should 'default value of links' do
+    l = LinkListBlock.new
+    assert_equal [], l.links
+  end
+
+  should 'is editable' do
+    l = LinkListBlock.new
+    assert l.editable?
+  end
+
+  should 'list links' do
+    l = LinkListBlock.new(:links => [{:name => 'products', :address => '/cat/products'}])
+    l.expects(:links).returns([{:name => 'products', :address => '/cat/products'}])
+    assert_match /products/, l.content
+  end
+
+  should 'remove links with blank fields' do
+    l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/address'}, {:name => '', :address => ''}])
+    l.save!
+    assert_equal [{:name => 'categ', :address => '/address'}], l.links
+  end
+
+end
	@@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController		@@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController
3	protect 'edit_environment_design', :environment	3	protect 'edit_environment_design', :environment
4		4
5	def available_blocks	5	def available_blocks
6	- @available_blocks \|\|= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock ]	6	+ @available_blocks \|\|= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock ]
7	end	7	end
8		8
9	end	9	end
	@@ -130,7 +130,7 @@ module BoxesHelper		@@ -130,7 +130,7 @@ module BoxesHelper
130	end	130	end
131		131
132	if block.editable?	132	if block.editable?
133	- buttons << lightbox_icon_button(:edit, _('Edit'), { :controller => 'profile_design', :action => 'edit', :id => block.id })	133	+ buttons << lightbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
134	end	134	end
135		135
136	if !block.main?	136	if !block.main?
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+class LinkListBlock < Block
	2	+
	3	+ settings_items :title, String
	4	+ settings_items :links, Array, :default => []
	5	+
	6	+ before_save do \|block\|
	7	+ block.links = block.links.delete_if {\|i\| i[:name].blank? and i[:address].blank?}
	8	+ end
	9	+
	10	+ def self.description
	11	+ _('Display a list of links.')
	12	+ end
	13	+
	14	+ def content
	15	+ block_title(title) +
	16	+ content_tag('ul',
	17	+ links.select{\|i\| !i[:name].blank? and !i[:address].blank?}.map{\|i\| content_tag('li', link_to(i[:name], i[:address]))}
	18	+ )
	19	+ end
	20	+
	21	+ def editable?
	22	+ true
	23	+ end
	24	+
	25	+end
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+<p>
	2	+<label for='block_title'><strong><%= _('Block title') %></strong></label>
	3	+<%= text_field_tag 'block[title]', @block.title %>
	4	+</p>
	5	+
	6	+<p>
	7	+<strong><%= _('Links') %></strong>
	8	+<div id='edit-link-list-block'>
	9	+<table id='links' class='noborder'>
	10	+ <tr><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
	11	+ <% for link in @block.links do %>
	12	+ <tr>
	13	+ <td><%= text_field_tag 'block[links][][name]', link[:name] %></td>
	14	+ <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address] %></td>
	15	+ </tr>
	16	+ <% end %>
	17	+ <tr>
	18	+ <td><%= text_field_tag 'block[links][][name]' %></td>
	19	+ <td class='cel-address'><%= text_field_tag 'block[links][][address]' %></td>
	20	+ </tr>
	21	+</table>
	22	+</div>
	23	+</p>
	24	+
	25	+<%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do \|page\|
	26	+ page.insert_html :bottom, 'links', content_tag('tr', content_tag('td',text_field_tag('block[links][][name]')) + content_tag('td',text_field_tag('block[links][][address]', nil, :class => 'cel-address')))
	27	+end %>
	@@ -218,6 +218,7 @@ div#notice {		@@ -218,6 +218,7 @@ div#notice {
218	}	218	}
219		219
220	/* tables */	220	/* tables */
		221	+
221	table {	222	table {
222	border-collapse: collapse;	223	border-collapse: collapse;
223	}	224	}
	@@ -243,6 +244,24 @@ table.noborder th, table.noborder td{		@@ -243,6 +244,24 @@ table.noborder th, table.noborder td{
243	border: none;	244	border: none;
244	}	245	}
245		246
		247	+#edit-link-list-block {
		248	+ overflow: auto;
		249	+ overflow-x: hidden;
		250	+ height: 120px;
		251	+}
		252	+
		253	+#edit-link-list-block table {
		254	+ width: 100%;
		255	+}
		256	+
		257	+#edit-link-list-block table .cel-address {
		258	+ width: 300px;
		259	+}
		260	+
		261	+#edit-link-list-block table .cel-address input {
		262	+ width: 100%;
		263	+}
		264	+
246	/* for fields with auto-completion */	265	/* for fields with auto-completion */
247	div.auto-complete {	266	div.auto-complete {
248	display: block;	267	display: block;
	@@ -22,4 +22,29 @@ class EnvironmentDesignControllerTest < Test::Unit::TestCase		@@ -22,4 +22,29 @@ class EnvironmentDesignControllerTest < Test::Unit::TestCase
22	should 'indicate only actual blocks as such' do	22	should 'indicate only actual blocks as such' do
23	assert(@controller.available_blocks.all? {\|item\| item.new.is_a? Block})	23	assert(@controller.available_blocks.all? {\|item\| item.new.is_a? Block})
24	end	24	end
		25	+
		26	+ should 'LinkListBlock is available' do
		27	+ assert_includes @controller.available_blocks, LinkListBlock
		28	+ end
		29	+
		30	+ should 'be able to edit LinkListBlock' do
		31	+ login_as(create_admin_user(Environment.default))
		32	+ l = LinkListBlock.create!()
		33	+ Environment.default.boxes.create!
		34	+ Environment.default.boxes.first.blocks << l
		35	+ get :edit, :id => l.id
		36	+ assert_tag :tag => 'input', :attributes => { :name => 'block[links][][name]' }
		37	+ assert_tag :tag => 'input', :attributes => { :name => 'block[links][][address]' }
		38	+ end
		39	+
		40	+ should 'be able to save LinkListBlock' do
		41	+ login_as(create_admin_user(Environment.default))
		42	+ l = LinkListBlock.create!()
		43	+ Environment.default.boxes.create!
		44	+ Environment.default.boxes.first.blocks << l
		45	+ post :save, :id => l.id, :block => { :links => [{:name => 'link 1', :address => '/address_1'}] }
		46	+ l.reload
		47	+ assert_equal [{'name' => 'link 1', 'address' => '/address_1'}], l.links
		48	+ end
		49	+
25	end	50	end
@@ -0,0 +1,36 @@		@@ -0,0 +1,36 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class LinkListBlockTest < ActiveSupport::TestCase
	4	+
	5	+ should 'default describe' do
	6	+ assert_not_equal Block.description, LinkListBlock.description
	7	+ end
	8	+
	9	+ should 'have field links' do
	10	+ l = LinkListBlock.new
	11	+ assert_respond_to l, :links
	12	+ end
	13	+
	14	+ should 'default value of links' do
	15	+ l = LinkListBlock.new
	16	+ assert_equal [], l.links
	17	+ end
	18	+
	19	+ should 'is editable' do
	20	+ l = LinkListBlock.new
	21	+ assert l.editable?
	22	+ end
	23	+
	24	+ should 'list links' do
	25	+ l = LinkListBlock.new(:links => [{:name => 'products', :address => '/cat/products'}])
	26	+ l.expects(:links).returns([{:name => 'products', :address => '/cat/products'}])
	27	+ assert_match /products/, l.content
	28	+ end
	29	+
	30	+ should 'remove links with blank fields' do
	31	+ l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/address'}, {:name => '', :address => ''}])
	32	+ l.save!
	33	+ assert_equal [{:name => 'categ', :address => '/address'}], l.links
	34	+ end
	35	+
	36	+end