diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml
index 424f254..78fab95 100644
--- a/app/views/shared/user_menu.rhtml
+++ b/app/views/shared/user_menu.rhtml
@@ -23,6 +23,10 @@
         <%= link_to('<span class="icon-menu-my-groups"></span>' + __('My communities'), { :controller => 'memberships', :profile => user.identifier, :action => 'index' }) %>
         </li>
 
+        <% for enterprise in user.enterprises %>
+          <li><%= link_to('<span class="icon-menu-enterprise"></span>' + (_('Manage %s') % enterprise.short_name), { :controller => 'profile_editor', :profile => enterprise.identifier, :action => 'index' }) %></li>
+        <% end %>
+
         <!-- li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li -->
 
         <% if MailConf.enabled? && current_user.enable_email %>
diff --git a/po/bg/noosfero.po b/po/bg/noosfero.po
index 6b340e0..0d33ec4 100644
--- a/po/bg/noosfero.po
+++ b/po/bg/noosfero.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.18.0\n"
-"POT-Creation-Date: 2009-05-26 18:17-0300\n"
+"POT-Creation-Date: 2009-05-26 19:20-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"
@@ -613,16 +613,16 @@ msgstr ""
 #: app/controllers/public/search_controller.rb:134
 #: app/controllers/public/search_controller.rb:207
 #: app/views/search/_sellers_form.rhtml:7 app/views/search/enterprises.rhtml:5
-#: app/views/profile/_person.rhtml:30
-#: app/views/content_viewer/_person.rhtml:30
+#: app/views/profile/_person.rhtml:31
+#: app/views/content_viewer/_person.rhtml:31
 msgid "Enterprises"
 msgstr ""
 
 #: app/helpers/assets_helper.rb:11
 #: app/controllers/public/search_controller.rb:136
 #: app/controllers/public/search_controller.rb:210
-#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:49
-#: app/views/content_viewer/_person.rhtml:49
+#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:50
+#: app/views/content_viewer/_person.rhtml:50
 #: app/views/layouts/application-ng.rhtml:93
 msgid "Communities"
 msgstr ""
@@ -665,8 +665,8 @@ msgid "Contact person:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:7
-#: app/views/profile/_person.rhtml:15
-#: app/views/content_viewer/_person.rhtml:15
+#: app/views/profile/_person.rhtml:16
+#: app/views/content_viewer/_person.rhtml:16
 msgid "e-Mail:"
 msgstr ""
 
@@ -675,15 +675,14 @@ msgid "Phone(s):"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:9
-#: app/views/profile/_person.rhtml:17
-#: app/views/content_viewer/_person.rhtml:17
+#: app/views/profile/_person.rhtml:7 app/views/content_viewer/_person.rhtml:7
 msgid "Location:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:78
 #: app/views/cms/_event.rhtml:14 app/views/enterprise_editor/index.rhtml:6
-#: app/views/profile/_person.rhtml:12
-#: app/views/content_viewer/_person.rhtml:12
+#: app/views/profile/_person.rhtml:13
+#: app/views/content_viewer/_person.rhtml:13
 msgid "Address:"
 msgstr ""
 
@@ -757,7 +756,7 @@ msgid "Help"
 msgstr ""
 
 #: app/helpers/boxes_helper.rb:209 app/helpers/application_helper.rb:89
-#: app/views/shared/user_menu.rhtml:66 app/views/account/wizard.rhtml:1
+#: app/views/shared/user_menu.rhtml:70 app/views/account/wizard.rhtml:1
 #: app/views/cms/why_categorize.rhtml:8 app/views/search/_search_form.rhtml:63
 #: app/views/layouts/application-ng.rhtml:69
 #: app/views/box_organizer/add_block.rhtml:19
@@ -2271,7 +2270,7 @@ msgid "Ok"
 msgstr ""
 
 #: app/models/link_list_block.rb:21 app/views/friends/invite.rhtml:31
-#: app/views/shared/user_menu.rhtml:63 app/views/account/login_block.rhtml:4
+#: app/views/shared/user_menu.rhtml:67 app/views/account/login_block.rhtml:4
 #: app/views/account/login.rhtml:3 app/views/layouts/application-ng.rhtml:66
 msgid "Login"
 msgstr ""
@@ -3238,44 +3237,48 @@ msgstr ""
 msgid "My communities"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:30
+#: app/views/shared/user_menu.rhtml:27
+msgid "Manage %s"
+msgstr ""
+
+#: app/views/shared/user_menu.rhtml:34
 msgid "Webmail"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35 app/views/blocks/my_network.rhtml:9
+#: app/views/shared/user_menu.rhtml:39 app/views/blocks/my_network.rhtml:9
 #: app/views/blocks/profile_info.rhtml:22
 #: app/views/blocks/profile_image.rhtml:19
 #: app/views/layouts/application-ng.rhtml:62
 msgid "Control panel"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35
+#: app/views/shared/user_menu.rhtml:39
 msgid ""
 "Control panel: change your picture, edit your personal information, create "
 "content or change the way your home page looks."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:39
+#: app/views/shared/user_menu.rhtml:43
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:42
+#: app/views/shared/user_menu.rhtml:46
 msgid "Access the site administration panel."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:46 app/views/account/user_info.rhtml:11
+#: app/views/shared/user_menu.rhtml:50 app/views/account/user_info.rhtml:11
 #: app/views/layouts/application-ng.rhtml:64
 msgid "Logout"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:49
+#: app/views/shared/user_menu.rhtml:53
 msgid ""
 "This link takes you out of the system. You should logout if other people are "
 "willing to use the same computer after you."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:63
+#: app/views/shared/user_menu.rhtml:67
 #: app/views/account/index_anonymous.rhtml:5
 #: app/views/layouts/application-ng.rhtml:66
 msgid ""
@@ -4341,7 +4344,8 @@ msgid "Add friend"
 msgstr ""
 
 #: app/views/blocks/profile_info_actions/person.rhtml:9
-#: app/views/profile/_person.rhtml:9 app/views/content_viewer/_person.rhtml:9
+#: app/views/profile/_person.rhtml:11
+#: app/views/content_viewer/_person.rhtml:11
 msgid "Contact"
 msgstr ""
 
@@ -4465,8 +4469,8 @@ msgid "Identifier:"
 msgstr ""
 
 #: app/views/enterprise_editor/index.rhtml:7
-#: app/views/profile/_person.rhtml:14
-#: app/views/content_viewer/_person.rhtml:14
+#: app/views/profile/_person.rhtml:15
+#: app/views/content_viewer/_person.rhtml:15
 msgid "Contact phone:"
 msgstr ""
 
@@ -4650,7 +4654,7 @@ msgstr ""
 msgid "%s's communities"
 msgstr ""
 
-#: app/views/profile/index.rhtml:8
+#: app/views/profile/index.rhtml:7
 msgid "%s's profile"
 msgstr ""
 
@@ -4724,38 +4728,38 @@ msgstr ""
 msgid "Date of birth:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:13
-#: app/views/content_viewer/_person.rhtml:13
+#: app/views/profile/_person.rhtml:14
+#: app/views/content_viewer/_person.rhtml:14
 msgid "ZIP code:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:21
-#: app/views/content_viewer/_person.rhtml:21
+#: app/views/profile/_person.rhtml:22
+#: app/views/content_viewer/_person.rhtml:22
 msgid "Work"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:24
-#: app/views/content_viewer/_person.rhtml:24
+#: app/views/profile/_person.rhtml:25
+#: app/views/content_viewer/_person.rhtml:25
 msgid "Organization:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:25
-#: app/views/content_viewer/_person.rhtml:25
+#: app/views/profile/_person.rhtml:26
+#: app/views/content_viewer/_person.rhtml:26
 msgid "Organization website:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:41
-#: app/views/content_viewer/_person.rhtml:41
+#: app/views/profile/_person.rhtml:42
+#: app/views/content_viewer/_person.rhtml:42
 msgid "Network"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:45
-#: app/views/content_viewer/_person.rhtml:45
+#: app/views/profile/_person.rhtml:46
+#: app/views/content_viewer/_person.rhtml:46
 msgid "Friends"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:57
-#: app/views/content_viewer/_person.rhtml:57
+#: app/views/profile/_person.rhtml:55
+#: app/views/content_viewer/_person.rhtml:55
 msgid "Interests"
 msgstr ""
 
diff --git a/po/de/noosfero.po b/po/de/noosfero.po
index 6b340e0..0d33ec4 100644
--- a/po/de/noosfero.po
+++ b/po/de/noosfero.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.18.0\n"
-"POT-Creation-Date: 2009-05-26 18:17-0300\n"
+"POT-Creation-Date: 2009-05-26 19:20-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"
@@ -613,16 +613,16 @@ msgstr ""
 #: app/controllers/public/search_controller.rb:134
 #: app/controllers/public/search_controller.rb:207
 #: app/views/search/_sellers_form.rhtml:7 app/views/search/enterprises.rhtml:5
-#: app/views/profile/_person.rhtml:30
-#: app/views/content_viewer/_person.rhtml:30
+#: app/views/profile/_person.rhtml:31
+#: app/views/content_viewer/_person.rhtml:31
 msgid "Enterprises"
 msgstr ""
 
 #: app/helpers/assets_helper.rb:11
 #: app/controllers/public/search_controller.rb:136
 #: app/controllers/public/search_controller.rb:210
-#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:49
-#: app/views/content_viewer/_person.rhtml:49
+#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:50
+#: app/views/content_viewer/_person.rhtml:50
 #: app/views/layouts/application-ng.rhtml:93
 msgid "Communities"
 msgstr ""
@@ -665,8 +665,8 @@ msgid "Contact person:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:7
-#: app/views/profile/_person.rhtml:15
-#: app/views/content_viewer/_person.rhtml:15
+#: app/views/profile/_person.rhtml:16
+#: app/views/content_viewer/_person.rhtml:16
 msgid "e-Mail:"
 msgstr ""
 
@@ -675,15 +675,14 @@ msgid "Phone(s):"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:9
-#: app/views/profile/_person.rhtml:17
-#: app/views/content_viewer/_person.rhtml:17
+#: app/views/profile/_person.rhtml:7 app/views/content_viewer/_person.rhtml:7
 msgid "Location:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:78
 #: app/views/cms/_event.rhtml:14 app/views/enterprise_editor/index.rhtml:6
-#: app/views/profile/_person.rhtml:12
-#: app/views/content_viewer/_person.rhtml:12
+#: app/views/profile/_person.rhtml:13
+#: app/views/content_viewer/_person.rhtml:13
 msgid "Address:"
 msgstr ""
 
@@ -757,7 +756,7 @@ msgid "Help"
 msgstr ""
 
 #: app/helpers/boxes_helper.rb:209 app/helpers/application_helper.rb:89
-#: app/views/shared/user_menu.rhtml:66 app/views/account/wizard.rhtml:1
+#: app/views/shared/user_menu.rhtml:70 app/views/account/wizard.rhtml:1
 #: app/views/cms/why_categorize.rhtml:8 app/views/search/_search_form.rhtml:63
 #: app/views/layouts/application-ng.rhtml:69
 #: app/views/box_organizer/add_block.rhtml:19
@@ -2271,7 +2270,7 @@ msgid "Ok"
 msgstr ""
 
 #: app/models/link_list_block.rb:21 app/views/friends/invite.rhtml:31
-#: app/views/shared/user_menu.rhtml:63 app/views/account/login_block.rhtml:4
+#: app/views/shared/user_menu.rhtml:67 app/views/account/login_block.rhtml:4
 #: app/views/account/login.rhtml:3 app/views/layouts/application-ng.rhtml:66
 msgid "Login"
 msgstr ""
@@ -3238,44 +3237,48 @@ msgstr ""
 msgid "My communities"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:30
+#: app/views/shared/user_menu.rhtml:27
+msgid "Manage %s"
+msgstr ""
+
+#: app/views/shared/user_menu.rhtml:34
 msgid "Webmail"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35 app/views/blocks/my_network.rhtml:9
+#: app/views/shared/user_menu.rhtml:39 app/views/blocks/my_network.rhtml:9
 #: app/views/blocks/profile_info.rhtml:22
 #: app/views/blocks/profile_image.rhtml:19
 #: app/views/layouts/application-ng.rhtml:62
 msgid "Control panel"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35
+#: app/views/shared/user_menu.rhtml:39
 msgid ""
 "Control panel: change your picture, edit your personal information, create "
 "content or change the way your home page looks."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:39
+#: app/views/shared/user_menu.rhtml:43
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:42
+#: app/views/shared/user_menu.rhtml:46
 msgid "Access the site administration panel."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:46 app/views/account/user_info.rhtml:11
+#: app/views/shared/user_menu.rhtml:50 app/views/account/user_info.rhtml:11
 #: app/views/layouts/application-ng.rhtml:64
 msgid "Logout"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:49
+#: app/views/shared/user_menu.rhtml:53
 msgid ""
 "This link takes you out of the system. You should logout if other people are "
 "willing to use the same computer after you."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:63
+#: app/views/shared/user_menu.rhtml:67
 #: app/views/account/index_anonymous.rhtml:5
 #: app/views/layouts/application-ng.rhtml:66
 msgid ""
@@ -4341,7 +4344,8 @@ msgid "Add friend"
 msgstr ""
 
 #: app/views/blocks/profile_info_actions/person.rhtml:9
-#: app/views/profile/_person.rhtml:9 app/views/content_viewer/_person.rhtml:9
+#: app/views/profile/_person.rhtml:11
+#: app/views/content_viewer/_person.rhtml:11
 msgid "Contact"
 msgstr ""
 
@@ -4465,8 +4469,8 @@ msgid "Identifier:"
 msgstr ""
 
 #: app/views/enterprise_editor/index.rhtml:7
-#: app/views/profile/_person.rhtml:14
-#: app/views/content_viewer/_person.rhtml:14
+#: app/views/profile/_person.rhtml:15
+#: app/views/content_viewer/_person.rhtml:15
 msgid "Contact phone:"
 msgstr ""
 
@@ -4650,7 +4654,7 @@ msgstr ""
 msgid "%s's communities"
 msgstr ""
 
-#: app/views/profile/index.rhtml:8
+#: app/views/profile/index.rhtml:7
 msgid "%s's profile"
 msgstr ""
 
@@ -4724,38 +4728,38 @@ msgstr ""
 msgid "Date of birth:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:13
-#: app/views/content_viewer/_person.rhtml:13
+#: app/views/profile/_person.rhtml:14
+#: app/views/content_viewer/_person.rhtml:14
 msgid "ZIP code:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:21
-#: app/views/content_viewer/_person.rhtml:21
+#: app/views/profile/_person.rhtml:22
+#: app/views/content_viewer/_person.rhtml:22
 msgid "Work"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:24
-#: app/views/content_viewer/_person.rhtml:24
+#: app/views/profile/_person.rhtml:25
+#: app/views/content_viewer/_person.rhtml:25
 msgid "Organization:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:25
-#: app/views/content_viewer/_person.rhtml:25
+#: app/views/profile/_person.rhtml:26
+#: app/views/content_viewer/_person.rhtml:26
 msgid "Organization website:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:41
-#: app/views/content_viewer/_person.rhtml:41
+#: app/views/profile/_person.rhtml:42
+#: app/views/content_viewer/_person.rhtml:42
 msgid "Network"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:45
-#: app/views/content_viewer/_person.rhtml:45
+#: app/views/profile/_person.rhtml:46
+#: app/views/content_viewer/_person.rhtml:46
 msgid "Friends"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:57
-#: app/views/content_viewer/_person.rhtml:57
+#: app/views/profile/_person.rhtml:55
+#: app/views/content_viewer/_person.rhtml:55
 msgid "Interests"
 msgstr ""
 
diff --git a/po/es/noosfero.po b/po/es/noosfero.po
index 6b340e0..0d33ec4 100644
--- a/po/es/noosfero.po
+++ b/po/es/noosfero.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.18.0\n"
-"POT-Creation-Date: 2009-05-26 18:17-0300\n"
+"POT-Creation-Date: 2009-05-26 19:20-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"
@@ -613,16 +613,16 @@ msgstr ""
 #: app/controllers/public/search_controller.rb:134
 #: app/controllers/public/search_controller.rb:207
 #: app/views/search/_sellers_form.rhtml:7 app/views/search/enterprises.rhtml:5
-#: app/views/profile/_person.rhtml:30
-#: app/views/content_viewer/_person.rhtml:30
+#: app/views/profile/_person.rhtml:31
+#: app/views/content_viewer/_person.rhtml:31
 msgid "Enterprises"
 msgstr ""
 
 #: app/helpers/assets_helper.rb:11
 #: app/controllers/public/search_controller.rb:136
 #: app/controllers/public/search_controller.rb:210
-#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:49
-#: app/views/content_viewer/_person.rhtml:49
+#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:50
+#: app/views/content_viewer/_person.rhtml:50
 #: app/views/layouts/application-ng.rhtml:93
 msgid "Communities"
 msgstr ""
@@ -665,8 +665,8 @@ msgid "Contact person:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:7
-#: app/views/profile/_person.rhtml:15
-#: app/views/content_viewer/_person.rhtml:15
+#: app/views/profile/_person.rhtml:16
+#: app/views/content_viewer/_person.rhtml:16
 msgid "e-Mail:"
 msgstr ""
 
@@ -675,15 +675,14 @@ msgid "Phone(s):"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:9
-#: app/views/profile/_person.rhtml:17
-#: app/views/content_viewer/_person.rhtml:17
+#: app/views/profile/_person.rhtml:7 app/views/content_viewer/_person.rhtml:7
 msgid "Location:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:78
 #: app/views/cms/_event.rhtml:14 app/views/enterprise_editor/index.rhtml:6
-#: app/views/profile/_person.rhtml:12
-#: app/views/content_viewer/_person.rhtml:12
+#: app/views/profile/_person.rhtml:13
+#: app/views/content_viewer/_person.rhtml:13
 msgid "Address:"
 msgstr ""
 
@@ -757,7 +756,7 @@ msgid "Help"
 msgstr ""
 
 #: app/helpers/boxes_helper.rb:209 app/helpers/application_helper.rb:89
-#: app/views/shared/user_menu.rhtml:66 app/views/account/wizard.rhtml:1
+#: app/views/shared/user_menu.rhtml:70 app/views/account/wizard.rhtml:1
 #: app/views/cms/why_categorize.rhtml:8 app/views/search/_search_form.rhtml:63
 #: app/views/layouts/application-ng.rhtml:69
 #: app/views/box_organizer/add_block.rhtml:19
@@ -2271,7 +2270,7 @@ msgid "Ok"
 msgstr ""
 
 #: app/models/link_list_block.rb:21 app/views/friends/invite.rhtml:31
-#: app/views/shared/user_menu.rhtml:63 app/views/account/login_block.rhtml:4
+#: app/views/shared/user_menu.rhtml:67 app/views/account/login_block.rhtml:4
 #: app/views/account/login.rhtml:3 app/views/layouts/application-ng.rhtml:66
 msgid "Login"
 msgstr ""
@@ -3238,44 +3237,48 @@ msgstr ""
 msgid "My communities"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:30
+#: app/views/shared/user_menu.rhtml:27
+msgid "Manage %s"
+msgstr ""
+
+#: app/views/shared/user_menu.rhtml:34
 msgid "Webmail"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35 app/views/blocks/my_network.rhtml:9
+#: app/views/shared/user_menu.rhtml:39 app/views/blocks/my_network.rhtml:9
 #: app/views/blocks/profile_info.rhtml:22
 #: app/views/blocks/profile_image.rhtml:19
 #: app/views/layouts/application-ng.rhtml:62
 msgid "Control panel"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35
+#: app/views/shared/user_menu.rhtml:39
 msgid ""
 "Control panel: change your picture, edit your personal information, create "
 "content or change the way your home page looks."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:39
+#: app/views/shared/user_menu.rhtml:43
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:42
+#: app/views/shared/user_menu.rhtml:46
 msgid "Access the site administration panel."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:46 app/views/account/user_info.rhtml:11
+#: app/views/shared/user_menu.rhtml:50 app/views/account/user_info.rhtml:11
 #: app/views/layouts/application-ng.rhtml:64
 msgid "Logout"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:49
+#: app/views/shared/user_menu.rhtml:53
 msgid ""
 "This link takes you out of the system. You should logout if other people are "
 "willing to use the same computer after you."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:63
+#: app/views/shared/user_menu.rhtml:67
 #: app/views/account/index_anonymous.rhtml:5
 #: app/views/layouts/application-ng.rhtml:66
 msgid ""
@@ -4341,7 +4344,8 @@ msgid "Add friend"
 msgstr ""
 
 #: app/views/blocks/profile_info_actions/person.rhtml:9
-#: app/views/profile/_person.rhtml:9 app/views/content_viewer/_person.rhtml:9
+#: app/views/profile/_person.rhtml:11
+#: app/views/content_viewer/_person.rhtml:11
 msgid "Contact"
 msgstr ""
 
@@ -4465,8 +4469,8 @@ msgid "Identifier:"
 msgstr ""
 
 #: app/views/enterprise_editor/index.rhtml:7
-#: app/views/profile/_person.rhtml:14
-#: app/views/content_viewer/_person.rhtml:14
+#: app/views/profile/_person.rhtml:15
+#: app/views/content_viewer/_person.rhtml:15
 msgid "Contact phone:"
 msgstr ""
 
@@ -4650,7 +4654,7 @@ msgstr ""
 msgid "%s's communities"
 msgstr ""
 
-#: app/views/profile/index.rhtml:8
+#: app/views/profile/index.rhtml:7
 msgid "%s's profile"
 msgstr ""
 
@@ -4724,38 +4728,38 @@ msgstr ""
 msgid "Date of birth:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:13
-#: app/views/content_viewer/_person.rhtml:13
+#: app/views/profile/_person.rhtml:14
+#: app/views/content_viewer/_person.rhtml:14
 msgid "ZIP code:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:21
-#: app/views/content_viewer/_person.rhtml:21
+#: app/views/profile/_person.rhtml:22
+#: app/views/content_viewer/_person.rhtml:22
 msgid "Work"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:24
-#: app/views/content_viewer/_person.rhtml:24
+#: app/views/profile/_person.rhtml:25
+#: app/views/content_viewer/_person.rhtml:25
 msgid "Organization:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:25
-#: app/views/content_viewer/_person.rhtml:25
+#: app/views/profile/_person.rhtml:26
+#: app/views/content_viewer/_person.rhtml:26
 msgid "Organization website:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:41
-#: app/views/content_viewer/_person.rhtml:41
+#: app/views/profile/_person.rhtml:42
+#: app/views/content_viewer/_person.rhtml:42
 msgid "Network"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:45
-#: app/views/content_viewer/_person.rhtml:45
+#: app/views/profile/_person.rhtml:46
+#: app/views/content_viewer/_person.rhtml:46
 msgid "Friends"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:57
-#: app/views/content_viewer/_person.rhtml:57
+#: app/views/profile/_person.rhtml:55
+#: app/views/content_viewer/_person.rhtml:55
 msgid "Interests"
 msgstr ""
 
diff --git a/po/fr/noosfero.po b/po/fr/noosfero.po
index 208dfda..defc6d4 100644
--- a/po/fr/noosfero.po
+++ b/po/fr/noosfero.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.18.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 18:17-0300\n"
+"POT-Creation-Date: 2009-05-26 19:20-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"
@@ -624,16 +624,16 @@ msgstr "Produits"
 #: app/controllers/public/search_controller.rb:134
 #: app/controllers/public/search_controller.rb:207
 #: app/views/search/_sellers_form.rhtml:7 app/views/search/enterprises.rhtml:5
-#: app/views/profile/_person.rhtml:30
-#: app/views/content_viewer/_person.rhtml:30
+#: app/views/profile/_person.rhtml:31
+#: app/views/content_viewer/_person.rhtml:31
 msgid "Enterprises"
 msgstr "Entreprises"
 
 #: app/helpers/assets_helper.rb:11
 #: app/controllers/public/search_controller.rb:136
 #: app/controllers/public/search_controller.rb:210
-#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:49
-#: app/views/content_viewer/_person.rhtml:49
+#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:50
+#: app/views/content_viewer/_person.rhtml:50
 #: app/views/layouts/application-ng.rhtml:93
 msgid "Communities"
 msgstr "Groupes"
@@ -677,8 +677,8 @@ msgid "Contact person:"
 msgstr "Personne de contact : "
 
 #: app/helpers/enterprise_homepage_helper.rb:7
-#: app/views/profile/_person.rhtml:15
-#: app/views/content_viewer/_person.rhtml:15
+#: app/views/profile/_person.rhtml:16
+#: app/views/content_viewer/_person.rhtml:16
 msgid "e-Mail:"
 msgstr "Courrier électronique : "
 
@@ -687,15 +687,14 @@ msgid "Phone(s):"
 msgstr "Téléphone(s) :"
 
 #: app/helpers/enterprise_homepage_helper.rb:9
-#: app/views/profile/_person.rhtml:17
-#: app/views/content_viewer/_person.rhtml:17
+#: app/views/profile/_person.rhtml:7 app/views/content_viewer/_person.rhtml:7
 msgid "Location:"
 msgstr "Localisation : "
 
 #: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:78
 #: app/views/cms/_event.rhtml:14 app/views/enterprise_editor/index.rhtml:6
-#: app/views/profile/_person.rhtml:12
-#: app/views/content_viewer/_person.rhtml:12
+#: app/views/profile/_person.rhtml:13
+#: app/views/content_viewer/_person.rhtml:13
 msgid "Address:"
 msgstr "Adresse :"
 
@@ -770,7 +769,7 @@ msgid "Help"
 msgstr "Aide"
 
 #: app/helpers/boxes_helper.rb:209 app/helpers/application_helper.rb:89
-#: app/views/shared/user_menu.rhtml:66 app/views/account/wizard.rhtml:1
+#: app/views/shared/user_menu.rhtml:70 app/views/account/wizard.rhtml:1
 #: app/views/cms/why_categorize.rhtml:8 app/views/search/_search_form.rhtml:63
 #: app/views/layouts/application-ng.rhtml:69
 #: app/views/box_organizer/add_block.rhtml:19
@@ -2388,7 +2387,7 @@ msgid "Ok"
 msgstr "Ok !"
 
 #: app/models/link_list_block.rb:21 app/views/friends/invite.rhtml:31
-#: app/views/shared/user_menu.rhtml:63 app/views/account/login_block.rhtml:4
+#: app/views/shared/user_menu.rhtml:67 app/views/account/login_block.rhtml:4
 #: app/views/account/login.rhtml:3 app/views/layouts/application-ng.rhtml:66
 msgid "Login"
 msgstr "Connexion"
@@ -3407,18 +3406,23 @@ msgstr "Aller à votre page d'accueil."
 msgid "My communities"
 msgstr "Groupes"
 
-#: app/views/shared/user_menu.rhtml:30
+#: app/views/shared/user_menu.rhtml:27
+#, fuzzy
+msgid "Manage %s"
+msgstr "Gérer"
+
+#: app/views/shared/user_menu.rhtml:34
 msgid "Webmail"
 msgstr "Webmail"
 
-#: app/views/shared/user_menu.rhtml:35 app/views/blocks/my_network.rhtml:9
+#: app/views/shared/user_menu.rhtml:39 app/views/blocks/my_network.rhtml:9
 #: app/views/blocks/profile_info.rhtml:22
 #: app/views/blocks/profile_image.rhtml:19
 #: app/views/layouts/application-ng.rhtml:62
 msgid "Control panel"
 msgstr "Panneau de contrôle"
 
-#: app/views/shared/user_menu.rhtml:35
+#: app/views/shared/user_menu.rhtml:39
 msgid ""
 "Control panel: change your picture, edit your personal information, create "
 "content or change the way your home page looks."
@@ -3426,21 +3430,21 @@ msgstr ""
 "Panneau de contrôle : modifiez votre photo, éditez vos informations "
 "personnelles, créez du contenu ou modifiez l'allure de votre page d'accueil."
 
-#: app/views/shared/user_menu.rhtml:39
+#: app/views/shared/user_menu.rhtml:43
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr "Admin"
 
-#: app/views/shared/user_menu.rhtml:42
+#: app/views/shared/user_menu.rhtml:46
 msgid "Access the site administration panel."
 msgstr "Accéder au panneau d'administration du site."
 
-#: app/views/shared/user_menu.rhtml:46 app/views/account/user_info.rhtml:11
+#: app/views/shared/user_menu.rhtml:50 app/views/account/user_info.rhtml:11
 #: app/views/layouts/application-ng.rhtml:64
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: app/views/shared/user_menu.rhtml:49
+#: app/views/shared/user_menu.rhtml:53
 msgid ""
 "This link takes you out of the system. You should logout if other people are "
 "willing to use the same computer after you."
@@ -3449,7 +3453,7 @@ msgstr ""
 "explicitement si d'autres personnes désirent utiliser le même ordinateur "
 "après vous."
 
-#: app/views/shared/user_menu.rhtml:63
+#: app/views/shared/user_menu.rhtml:67
 #: app/views/account/index_anonymous.rhtml:5
 #: app/views/layouts/application-ng.rhtml:66
 msgid ""
@@ -4618,7 +4622,8 @@ msgid "Add friend"
 msgstr "Ajouter un contact"
 
 #: app/views/blocks/profile_info_actions/person.rhtml:9
-#: app/views/profile/_person.rhtml:9 app/views/content_viewer/_person.rhtml:9
+#: app/views/profile/_person.rhtml:11
+#: app/views/content_viewer/_person.rhtml:11
 #, fuzzy
 msgid "Contact"
 msgstr "Personne de contact : "
@@ -4764,8 +4769,8 @@ msgid "Identifier:"
 msgstr "Identifiant :"
 
 #: app/views/enterprise_editor/index.rhtml:7
-#: app/views/profile/_person.rhtml:14
-#: app/views/content_viewer/_person.rhtml:14
+#: app/views/profile/_person.rhtml:15
+#: app/views/content_viewer/_person.rhtml:15
 msgid "Contact phone:"
 msgstr "Téléphone de contact :"
 
@@ -4965,7 +4970,7 @@ msgstr "Voici tous les groupes de <b>%s</b>."
 msgid "%s's communities"
 msgstr "Les groupes de <b>%s</b>"
 
-#: app/views/profile/index.rhtml:8
+#: app/views/profile/index.rhtml:7
 msgid "%s's profile"
 msgstr "Le profil de %s"
 
@@ -5044,43 +5049,43 @@ msgstr "Sexe : "
 msgid "Date of birth:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:13
-#: app/views/content_viewer/_person.rhtml:13
+#: app/views/profile/_person.rhtml:14
+#: app/views/content_viewer/_person.rhtml:14
 #, fuzzy
 msgid "ZIP code:"
 msgstr "Code postal"
 
-#: app/views/profile/_person.rhtml:21
-#: app/views/content_viewer/_person.rhtml:21
+#: app/views/profile/_person.rhtml:22
+#: app/views/content_viewer/_person.rhtml:22
 #, fuzzy
 msgid "Work"
 msgstr "travail"
 
-#: app/views/profile/_person.rhtml:24
-#: app/views/content_viewer/_person.rhtml:24
+#: app/views/profile/_person.rhtml:25
+#: app/views/content_viewer/_person.rhtml:25
 #, fuzzy
 msgid "Organization:"
 msgstr "Organisation"
 
-#: app/views/profile/_person.rhtml:25
-#: app/views/content_viewer/_person.rhtml:25
+#: app/views/profile/_person.rhtml:26
+#: app/views/content_viewer/_person.rhtml:26
 #, fuzzy
 msgid "Organization website:"
 msgstr "Site d'organisation"
 
-#: app/views/profile/_person.rhtml:41
-#: app/views/content_viewer/_person.rhtml:41
+#: app/views/profile/_person.rhtml:42
+#: app/views/content_viewer/_person.rhtml:42
 #, fuzzy
 msgid "Network"
 msgstr "travail"
 
-#: app/views/profile/_person.rhtml:45
-#: app/views/content_viewer/_person.rhtml:45
+#: app/views/profile/_person.rhtml:46
+#: app/views/content_viewer/_person.rhtml:46
 msgid "Friends"
 msgstr "Contacts"
 
-#: app/views/profile/_person.rhtml:57
-#: app/views/content_viewer/_person.rhtml:57
+#: app/views/profile/_person.rhtml:55
+#: app/views/content_viewer/_person.rhtml:55
 #, fuzzy
 msgid "Interests"
 msgstr "Mes centres d'intérêt"
diff --git a/po/hy/noosfero.po b/po/hy/noosfero.po
index 5ffdea1..96151e0 100644
--- a/po/hy/noosfero.po
+++ b/po/hy/noosfero.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.18.0\n"
-"POT-Creation-Date: 2009-05-26 18:17-0300\n"
+"POT-Creation-Date: 2009-05-26 19:20-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"
@@ -616,16 +616,16 @@ msgstr "Արտադրանք"
 #: app/controllers/public/search_controller.rb:134
 #: app/controllers/public/search_controller.rb:207
 #: app/views/search/_sellers_form.rhtml:7 app/views/search/enterprises.rhtml:5
-#: app/views/profile/_person.rhtml:30
-#: app/views/content_viewer/_person.rhtml:30
+#: app/views/profile/_person.rhtml:31
+#: app/views/content_viewer/_person.rhtml:31
 msgid "Enterprises"
 msgstr "Ձեռնարկություններ"
 
 #: app/helpers/assets_helper.rb:11
 #: app/controllers/public/search_controller.rb:136
 #: app/controllers/public/search_controller.rb:210
-#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:49
-#: app/views/content_viewer/_person.rhtml:49
+#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:50
+#: app/views/content_viewer/_person.rhtml:50
 #: app/views/layouts/application-ng.rhtml:93
 msgid "Communities"
 msgstr "Համայնքներ"
@@ -668,8 +668,8 @@ msgid "Contact person:"
 msgstr "Կապը պահպանող անձ"
 
 #: app/helpers/enterprise_homepage_helper.rb:7
-#: app/views/profile/_person.rhtml:15
-#: app/views/content_viewer/_person.rhtml:15
+#: app/views/profile/_person.rhtml:16
+#: app/views/content_viewer/_person.rhtml:16
 msgid "e-Mail:"
 msgstr "էլ. հասցե"
 
@@ -678,15 +678,14 @@ msgid "Phone(s):"
 msgstr "Հեռախոս(ներ)"
 
 #: app/helpers/enterprise_homepage_helper.rb:9
-#: app/views/profile/_person.rhtml:17
-#: app/views/content_viewer/_person.rhtml:17
+#: app/views/profile/_person.rhtml:7 app/views/content_viewer/_person.rhtml:7
 msgid "Location:"
 msgstr "Վայր"
 
 #: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:78
 #: app/views/cms/_event.rhtml:14 app/views/enterprise_editor/index.rhtml:6
-#: app/views/profile/_person.rhtml:12
-#: app/views/content_viewer/_person.rhtml:12
+#: app/views/profile/_person.rhtml:13
+#: app/views/content_viewer/_person.rhtml:13
 msgid "Address:"
 msgstr "Հասցե"
 
@@ -761,7 +760,7 @@ msgid "Help"
 msgstr "Օգնություն"
 
 #: app/helpers/boxes_helper.rb:209 app/helpers/application_helper.rb:89
-#: app/views/shared/user_menu.rhtml:66 app/views/account/wizard.rhtml:1
+#: app/views/shared/user_menu.rhtml:70 app/views/account/wizard.rhtml:1
 #: app/views/cms/why_categorize.rhtml:8 app/views/search/_search_form.rhtml:63
 #: app/views/layouts/application-ng.rhtml:69
 #: app/views/box_organizer/add_block.rhtml:19
@@ -2312,7 +2311,7 @@ msgid "Ok"
 msgstr "Այո"
 
 #: app/models/link_list_block.rb:21 app/views/friends/invite.rhtml:31
-#: app/views/shared/user_menu.rhtml:63 app/views/account/login_block.rhtml:4
+#: app/views/shared/user_menu.rhtml:67 app/views/account/login_block.rhtml:4
 #: app/views/account/login.rhtml:3 app/views/layouts/application-ng.rhtml:66
 msgid "Login"
 msgstr "Մուտք"
@@ -3304,18 +3303,23 @@ msgstr "Գնալ Ձեր գլխավոր էջ"
 msgid "My communities"
 msgstr "Բոլոր համայնքները"
 
-#: app/views/shared/user_menu.rhtml:30
+#: app/views/shared/user_menu.rhtml:27
+#, fuzzy
+msgid "Manage %s"
+msgstr "Կառավարել"
+
+#: app/views/shared/user_menu.rhtml:34
 msgid "Webmail"
 msgstr "Webmail"
 
-#: app/views/shared/user_menu.rhtml:35 app/views/blocks/my_network.rhtml:9
+#: app/views/shared/user_menu.rhtml:39 app/views/blocks/my_network.rhtml:9
 #: app/views/blocks/profile_info.rhtml:22
 #: app/views/blocks/profile_image.rhtml:19
 #: app/views/layouts/application-ng.rhtml:62
 msgid "Control panel"
 msgstr "Կառավարման վահանակ"
 
-#: app/views/shared/user_menu.rhtml:35
+#: app/views/shared/user_menu.rhtml:39
 msgid ""
 "Control panel: change your picture, edit your personal information, create "
 "content or change the way your home page looks."
@@ -3323,21 +3327,21 @@ msgstr ""
 "Կառավարման վահանակ. այստեղ կարող եք փոխել Ձեր նկարը, անձնական տվյալները, "
 "գլխավոր էջի արտաքին տեսքը, ինչպես նաև կարող եք ստեղծել հոդվածները:  "
 
-#: app/views/shared/user_menu.rhtml:39
+#: app/views/shared/user_menu.rhtml:43
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr "Ադմինիստրատոր"
 
-#: app/views/shared/user_menu.rhtml:42
+#: app/views/shared/user_menu.rhtml:46
 msgid "Access the site administration panel."
 msgstr "Մուտք գործել կայքի կառավարման վահանակ:"
 
-#: app/views/shared/user_menu.rhtml:46 app/views/account/user_info.rhtml:11
+#: app/views/shared/user_menu.rhtml:50 app/views/account/user_info.rhtml:11
 #: app/views/layouts/application-ng.rhtml:64
 msgid "Logout"
 msgstr "Դուրս գալ:"
 
-#: app/views/shared/user_menu.rhtml:49
+#: app/views/shared/user_menu.rhtml:53
 msgid ""
 "This link takes you out of the system. You should logout if other people are "
 "willing to use the same computer after you."
@@ -3345,7 +3349,7 @@ msgstr ""
 "Այս հղումը Ձեձ համակարգից հանում է դուրս: Դուք պետք է դուրս գաք համակարգից "
 "եթե այլ մարդիկ ցանկանում են օգտվել դրանից:"
 
-#: app/views/shared/user_menu.rhtml:63
+#: app/views/shared/user_menu.rhtml:67
 #: app/views/account/index_anonymous.rhtml:5
 #: app/views/layouts/application-ng.rhtml:66
 msgid ""
@@ -4453,7 +4457,8 @@ msgid "Add friend"
 msgstr "Ավելացնել ընկեր"
 
 #: app/views/blocks/profile_info_actions/person.rhtml:9
-#: app/views/profile/_person.rhtml:9 app/views/content_viewer/_person.rhtml:9
+#: app/views/profile/_person.rhtml:11
+#: app/views/content_viewer/_person.rhtml:11
 msgid "Contact"
 msgstr ""
 
@@ -4589,8 +4594,8 @@ msgid "Identifier:"
 msgstr "Որոշիչ"
 
 #: app/views/enterprise_editor/index.rhtml:7
-#: app/views/profile/_person.rhtml:14
-#: app/views/content_viewer/_person.rhtml:14
+#: app/views/profile/_person.rhtml:15
+#: app/views/content_viewer/_person.rhtml:15
 msgid "Contact phone:"
 msgstr "Հեռախոս"
 
@@ -4780,7 +4785,7 @@ msgstr "Այստեղ<b>%s</b>-ի բոլոր համայնքներն են:"
 msgid "%s's communities"
 msgstr "%s-ի համայնքները"
 
-#: app/views/profile/index.rhtml:8
+#: app/views/profile/index.rhtml:7
 msgid "%s's profile"
 msgstr "%s-ի անհատական էջ"
 
@@ -4858,42 +4863,42 @@ msgstr "Սեռ"
 msgid "Date of birth:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:13
-#: app/views/content_viewer/_person.rhtml:13
+#: app/views/profile/_person.rhtml:14
+#: app/views/content_viewer/_person.rhtml:14
 msgid "ZIP code:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:21
-#: app/views/content_viewer/_person.rhtml:21
+#: app/views/profile/_person.rhtml:22
+#: app/views/content_viewer/_person.rhtml:22
 #, fuzzy
 msgid "Work"
 msgstr "աշխատավայր"
 
-#: app/views/profile/_person.rhtml:24
-#: app/views/content_viewer/_person.rhtml:24
+#: app/views/profile/_person.rhtml:25
+#: app/views/content_viewer/_person.rhtml:25
 #, fuzzy
 msgid "Organization:"
 msgstr "Կազմակերպություն"
 
-#: app/views/profile/_person.rhtml:25
-#: app/views/content_viewer/_person.rhtml:25
+#: app/views/profile/_person.rhtml:26
+#: app/views/content_viewer/_person.rhtml:26
 #, fuzzy
 msgid "Organization website:"
 msgstr "Կազմակերպություններ"
 
-#: app/views/profile/_person.rhtml:41
-#: app/views/content_viewer/_person.rhtml:41
+#: app/views/profile/_person.rhtml:42
+#: app/views/content_viewer/_person.rhtml:42
 #, fuzzy
 msgid "Network"
 msgstr "աշխատավայր"
 
-#: app/views/profile/_person.rhtml:45
-#: app/views/content_viewer/_person.rhtml:45
+#: app/views/profile/_person.rhtml:46
+#: app/views/content_viewer/_person.rhtml:46
 msgid "Friends"
 msgstr "Ընկերներ"
 
-#: app/views/profile/_person.rhtml:57
-#: app/views/content_viewer/_person.rhtml:57
+#: app/views/profile/_person.rhtml:55
+#: app/views/content_viewer/_person.rhtml:55
 #, fuzzy
 msgid "Interests"
 msgstr "Ձեռնարկություններ"
diff --git a/po/it/noosfero.po b/po/it/noosfero.po
index 6b340e0..0d33ec4 100644
--- a/po/it/noosfero.po
+++ b/po/it/noosfero.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.18.0\n"
-"POT-Creation-Date: 2009-05-26 18:17-0300\n"
+"POT-Creation-Date: 2009-05-26 19:20-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"
@@ -613,16 +613,16 @@ msgstr ""
 #: app/controllers/public/search_controller.rb:134
 #: app/controllers/public/search_controller.rb:207
 #: app/views/search/_sellers_form.rhtml:7 app/views/search/enterprises.rhtml:5
-#: app/views/profile/_person.rhtml:30
-#: app/views/content_viewer/_person.rhtml:30
+#: app/views/profile/_person.rhtml:31
+#: app/views/content_viewer/_person.rhtml:31
 msgid "Enterprises"
 msgstr ""
 
 #: app/helpers/assets_helper.rb:11
 #: app/controllers/public/search_controller.rb:136
 #: app/controllers/public/search_controller.rb:210
-#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:49
-#: app/views/content_viewer/_person.rhtml:49
+#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:50
+#: app/views/content_viewer/_person.rhtml:50
 #: app/views/layouts/application-ng.rhtml:93
 msgid "Communities"
 msgstr ""
@@ -665,8 +665,8 @@ msgid "Contact person:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:7
-#: app/views/profile/_person.rhtml:15
-#: app/views/content_viewer/_person.rhtml:15
+#: app/views/profile/_person.rhtml:16
+#: app/views/content_viewer/_person.rhtml:16
 msgid "e-Mail:"
 msgstr ""
 
@@ -675,15 +675,14 @@ msgid "Phone(s):"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:9
-#: app/views/profile/_person.rhtml:17
-#: app/views/content_viewer/_person.rhtml:17
+#: app/views/profile/_person.rhtml:7 app/views/content_viewer/_person.rhtml:7
 msgid "Location:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:78
 #: app/views/cms/_event.rhtml:14 app/views/enterprise_editor/index.rhtml:6
-#: app/views/profile/_person.rhtml:12
-#: app/views/content_viewer/_person.rhtml:12
+#: app/views/profile/_person.rhtml:13
+#: app/views/content_viewer/_person.rhtml:13
 msgid "Address:"
 msgstr ""
 
@@ -757,7 +756,7 @@ msgid "Help"
 msgstr ""
 
 #: app/helpers/boxes_helper.rb:209 app/helpers/application_helper.rb:89
-#: app/views/shared/user_menu.rhtml:66 app/views/account/wizard.rhtml:1
+#: app/views/shared/user_menu.rhtml:70 app/views/account/wizard.rhtml:1
 #: app/views/cms/why_categorize.rhtml:8 app/views/search/_search_form.rhtml:63
 #: app/views/layouts/application-ng.rhtml:69
 #: app/views/box_organizer/add_block.rhtml:19
@@ -2271,7 +2270,7 @@ msgid "Ok"
 msgstr ""
 
 #: app/models/link_list_block.rb:21 app/views/friends/invite.rhtml:31
-#: app/views/shared/user_menu.rhtml:63 app/views/account/login_block.rhtml:4
+#: app/views/shared/user_menu.rhtml:67 app/views/account/login_block.rhtml:4
 #: app/views/account/login.rhtml:3 app/views/layouts/application-ng.rhtml:66
 msgid "Login"
 msgstr ""
@@ -3238,44 +3237,48 @@ msgstr ""
 msgid "My communities"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:30
+#: app/views/shared/user_menu.rhtml:27
+msgid "Manage %s"
+msgstr ""
+
+#: app/views/shared/user_menu.rhtml:34
 msgid "Webmail"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35 app/views/blocks/my_network.rhtml:9
+#: app/views/shared/user_menu.rhtml:39 app/views/blocks/my_network.rhtml:9
 #: app/views/blocks/profile_info.rhtml:22
 #: app/views/blocks/profile_image.rhtml:19
 #: app/views/layouts/application-ng.rhtml:62
 msgid "Control panel"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35
+#: app/views/shared/user_menu.rhtml:39
 msgid ""
 "Control panel: change your picture, edit your personal information, create "
 "content or change the way your home page looks."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:39
+#: app/views/shared/user_menu.rhtml:43
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:42
+#: app/views/shared/user_menu.rhtml:46
 msgid "Access the site administration panel."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:46 app/views/account/user_info.rhtml:11
+#: app/views/shared/user_menu.rhtml:50 app/views/account/user_info.rhtml:11
 #: app/views/layouts/application-ng.rhtml:64
 msgid "Logout"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:49
+#: app/views/shared/user_menu.rhtml:53
 msgid ""
 "This link takes you out of the system. You should logout if other people are "
 "willing to use the same computer after you."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:63
+#: app/views/shared/user_menu.rhtml:67
 #: app/views/account/index_anonymous.rhtml:5
 #: app/views/layouts/application-ng.rhtml:66
 msgid ""
@@ -4341,7 +4344,8 @@ msgid "Add friend"
 msgstr ""
 
 #: app/views/blocks/profile_info_actions/person.rhtml:9
-#: app/views/profile/_person.rhtml:9 app/views/content_viewer/_person.rhtml:9
+#: app/views/profile/_person.rhtml:11
+#: app/views/content_viewer/_person.rhtml:11
 msgid "Contact"
 msgstr ""
 
@@ -4465,8 +4469,8 @@ msgid "Identifier:"
 msgstr ""
 
 #: app/views/enterprise_editor/index.rhtml:7
-#: app/views/profile/_person.rhtml:14
-#: app/views/content_viewer/_person.rhtml:14
+#: app/views/profile/_person.rhtml:15
+#: app/views/content_viewer/_person.rhtml:15
 msgid "Contact phone:"
 msgstr ""
 
@@ -4650,7 +4654,7 @@ msgstr ""
 msgid "%s's communities"
 msgstr ""
 
-#: app/views/profile/index.rhtml:8
+#: app/views/profile/index.rhtml:7
 msgid "%s's profile"
 msgstr ""
 
@@ -4724,38 +4728,38 @@ msgstr ""
 msgid "Date of birth:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:13
-#: app/views/content_viewer/_person.rhtml:13
+#: app/views/profile/_person.rhtml:14
+#: app/views/content_viewer/_person.rhtml:14
 msgid "ZIP code:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:21
-#: app/views/content_viewer/_person.rhtml:21
+#: app/views/profile/_person.rhtml:22
+#: app/views/content_viewer/_person.rhtml:22
 msgid "Work"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:24
-#: app/views/content_viewer/_person.rhtml:24
+#: app/views/profile/_person.rhtml:25
+#: app/views/content_viewer/_person.rhtml:25
 msgid "Organization:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:25
-#: app/views/content_viewer/_person.rhtml:25
+#: app/views/profile/_person.rhtml:26
+#: app/views/content_viewer/_person.rhtml:26
 msgid "Organization website:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:41
-#: app/views/content_viewer/_person.rhtml:41
+#: app/views/profile/_person.rhtml:42
+#: app/views/content_viewer/_person.rhtml:42
 msgid "Network"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:45
-#: app/views/content_viewer/_person.rhtml:45
+#: app/views/profile/_person.rhtml:46
+#: app/views/content_viewer/_person.rhtml:46
 msgid "Friends"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:57
-#: app/views/content_viewer/_person.rhtml:57
+#: app/views/profile/_person.rhtml:55
+#: app/views/content_viewer/_person.rhtml:55
 msgid "Interests"
 msgstr ""
 
diff --git a/po/nl/noosfero.po b/po/nl/noosfero.po
index 6b340e0..0d33ec4 100644
--- a/po/nl/noosfero.po
+++ b/po/nl/noosfero.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.18.0\n"
-"POT-Creation-Date: 2009-05-26 18:17-0300\n"
+"POT-Creation-Date: 2009-05-26 19:20-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"
@@ -613,16 +613,16 @@ msgstr ""
 #: app/controllers/public/search_controller.rb:134
 #: app/controllers/public/search_controller.rb:207
 #: app/views/search/_sellers_form.rhtml:7 app/views/search/enterprises.rhtml:5
-#: app/views/profile/_person.rhtml:30
-#: app/views/content_viewer/_person.rhtml:30
+#: app/views/profile/_person.rhtml:31
+#: app/views/content_viewer/_person.rhtml:31
 msgid "Enterprises"
 msgstr ""
 
 #: app/helpers/assets_helper.rb:11
 #: app/controllers/public/search_controller.rb:136
 #: app/controllers/public/search_controller.rb:210
-#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:49
-#: app/views/content_viewer/_person.rhtml:49
+#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:50
+#: app/views/content_viewer/_person.rhtml:50
 #: app/views/layouts/application-ng.rhtml:93
 msgid "Communities"
 msgstr ""
@@ -665,8 +665,8 @@ msgid "Contact person:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:7
-#: app/views/profile/_person.rhtml:15
-#: app/views/content_viewer/_person.rhtml:15
+#: app/views/profile/_person.rhtml:16
+#: app/views/content_viewer/_person.rhtml:16
 msgid "e-Mail:"
 msgstr ""
 
@@ -675,15 +675,14 @@ msgid "Phone(s):"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:9
-#: app/views/profile/_person.rhtml:17
-#: app/views/content_viewer/_person.rhtml:17
+#: app/views/profile/_person.rhtml:7 app/views/content_viewer/_person.rhtml:7
 msgid "Location:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:78
 #: app/views/cms/_event.rhtml:14 app/views/enterprise_editor/index.rhtml:6
-#: app/views/profile/_person.rhtml:12
-#: app/views/content_viewer/_person.rhtml:12
+#: app/views/profile/_person.rhtml:13
+#: app/views/content_viewer/_person.rhtml:13
 msgid "Address:"
 msgstr ""
 
@@ -757,7 +756,7 @@ msgid "Help"
 msgstr ""
 
 #: app/helpers/boxes_helper.rb:209 app/helpers/application_helper.rb:89
-#: app/views/shared/user_menu.rhtml:66 app/views/account/wizard.rhtml:1
+#: app/views/shared/user_menu.rhtml:70 app/views/account/wizard.rhtml:1
 #: app/views/cms/why_categorize.rhtml:8 app/views/search/_search_form.rhtml:63
 #: app/views/layouts/application-ng.rhtml:69
 #: app/views/box_organizer/add_block.rhtml:19
@@ -2271,7 +2270,7 @@ msgid "Ok"
 msgstr ""
 
 #: app/models/link_list_block.rb:21 app/views/friends/invite.rhtml:31
-#: app/views/shared/user_menu.rhtml:63 app/views/account/login_block.rhtml:4
+#: app/views/shared/user_menu.rhtml:67 app/views/account/login_block.rhtml:4
 #: app/views/account/login.rhtml:3 app/views/layouts/application-ng.rhtml:66
 msgid "Login"
 msgstr ""
@@ -3238,44 +3237,48 @@ msgstr ""
 msgid "My communities"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:30
+#: app/views/shared/user_menu.rhtml:27
+msgid "Manage %s"
+msgstr ""
+
+#: app/views/shared/user_menu.rhtml:34
 msgid "Webmail"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35 app/views/blocks/my_network.rhtml:9
+#: app/views/shared/user_menu.rhtml:39 app/views/blocks/my_network.rhtml:9
 #: app/views/blocks/profile_info.rhtml:22
 #: app/views/blocks/profile_image.rhtml:19
 #: app/views/layouts/application-ng.rhtml:62
 msgid "Control panel"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35
+#: app/views/shared/user_menu.rhtml:39
 msgid ""
 "Control panel: change your picture, edit your personal information, create "
 "content or change the way your home page looks."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:39
+#: app/views/shared/user_menu.rhtml:43
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:42
+#: app/views/shared/user_menu.rhtml:46
 msgid "Access the site administration panel."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:46 app/views/account/user_info.rhtml:11
+#: app/views/shared/user_menu.rhtml:50 app/views/account/user_info.rhtml:11
 #: app/views/layouts/application-ng.rhtml:64
 msgid "Logout"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:49
+#: app/views/shared/user_menu.rhtml:53
 msgid ""
 "This link takes you out of the system. You should logout if other people are "
 "willing to use the same computer after you."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:63
+#: app/views/shared/user_menu.rhtml:67
 #: app/views/account/index_anonymous.rhtml:5
 #: app/views/layouts/application-ng.rhtml:66
 msgid ""
@@ -4341,7 +4344,8 @@ msgid "Add friend"
 msgstr ""
 
 #: app/views/blocks/profile_info_actions/person.rhtml:9
-#: app/views/profile/_person.rhtml:9 app/views/content_viewer/_person.rhtml:9
+#: app/views/profile/_person.rhtml:11
+#: app/views/content_viewer/_person.rhtml:11
 msgid "Contact"
 msgstr ""
 
@@ -4465,8 +4469,8 @@ msgid "Identifier:"
 msgstr ""
 
 #: app/views/enterprise_editor/index.rhtml:7
-#: app/views/profile/_person.rhtml:14
-#: app/views/content_viewer/_person.rhtml:14
+#: app/views/profile/_person.rhtml:15
+#: app/views/content_viewer/_person.rhtml:15
 msgid "Contact phone:"
 msgstr ""
 
@@ -4650,7 +4654,7 @@ msgstr ""
 msgid "%s's communities"
 msgstr ""
 
-#: app/views/profile/index.rhtml:8
+#: app/views/profile/index.rhtml:7
 msgid "%s's profile"
 msgstr ""
 
@@ -4724,38 +4728,38 @@ msgstr ""
 msgid "Date of birth:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:13
-#: app/views/content_viewer/_person.rhtml:13
+#: app/views/profile/_person.rhtml:14
+#: app/views/content_viewer/_person.rhtml:14
 msgid "ZIP code:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:21
-#: app/views/content_viewer/_person.rhtml:21
+#: app/views/profile/_person.rhtml:22
+#: app/views/content_viewer/_person.rhtml:22
 msgid "Work"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:24
-#: app/views/content_viewer/_person.rhtml:24
+#: app/views/profile/_person.rhtml:25
+#: app/views/content_viewer/_person.rhtml:25
 msgid "Organization:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:25
-#: app/views/content_viewer/_person.rhtml:25
+#: app/views/profile/_person.rhtml:26
+#: app/views/content_viewer/_person.rhtml:26
 msgid "Organization website:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:41
-#: app/views/content_viewer/_person.rhtml:41
+#: app/views/profile/_person.rhtml:42
+#: app/views/content_viewer/_person.rhtml:42
 msgid "Network"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:45
-#: app/views/content_viewer/_person.rhtml:45
+#: app/views/profile/_person.rhtml:46
+#: app/views/content_viewer/_person.rhtml:46
 msgid "Friends"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:57
-#: app/views/content_viewer/_person.rhtml:57
+#: app/views/profile/_person.rhtml:55
+#: app/views/content_viewer/_person.rhtml:55
 msgid "Interests"
 msgstr ""
 
diff --git a/po/noosfero.pot b/po/noosfero.pot
index 6b340e0..0d33ec4 100644
--- a/po/noosfero.pot
+++ b/po/noosfero.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.18.0\n"
-"POT-Creation-Date: 2009-05-26 18:17-0300\n"
+"POT-Creation-Date: 2009-05-26 19:20-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"
@@ -613,16 +613,16 @@ msgstr ""
 #: app/controllers/public/search_controller.rb:134
 #: app/controllers/public/search_controller.rb:207
 #: app/views/search/_sellers_form.rhtml:7 app/views/search/enterprises.rhtml:5
-#: app/views/profile/_person.rhtml:30
-#: app/views/content_viewer/_person.rhtml:30
+#: app/views/profile/_person.rhtml:31
+#: app/views/content_viewer/_person.rhtml:31
 msgid "Enterprises"
 msgstr ""
 
 #: app/helpers/assets_helper.rb:11
 #: app/controllers/public/search_controller.rb:136
 #: app/controllers/public/search_controller.rb:210
-#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:49
-#: app/views/content_viewer/_person.rhtml:49
+#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:50
+#: app/views/content_viewer/_person.rhtml:50
 #: app/views/layouts/application-ng.rhtml:93
 msgid "Communities"
 msgstr ""
@@ -665,8 +665,8 @@ msgid "Contact person:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:7
-#: app/views/profile/_person.rhtml:15
-#: app/views/content_viewer/_person.rhtml:15
+#: app/views/profile/_person.rhtml:16
+#: app/views/content_viewer/_person.rhtml:16
 msgid "e-Mail:"
 msgstr ""
 
@@ -675,15 +675,14 @@ msgid "Phone(s):"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:9
-#: app/views/profile/_person.rhtml:17
-#: app/views/content_viewer/_person.rhtml:17
+#: app/views/profile/_person.rhtml:7 app/views/content_viewer/_person.rhtml:7
 msgid "Location:"
 msgstr ""
 
 #: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:78
 #: app/views/cms/_event.rhtml:14 app/views/enterprise_editor/index.rhtml:6
-#: app/views/profile/_person.rhtml:12
-#: app/views/content_viewer/_person.rhtml:12
+#: app/views/profile/_person.rhtml:13
+#: app/views/content_viewer/_person.rhtml:13
 msgid "Address:"
 msgstr ""
 
@@ -757,7 +756,7 @@ msgid "Help"
 msgstr ""
 
 #: app/helpers/boxes_helper.rb:209 app/helpers/application_helper.rb:89
-#: app/views/shared/user_menu.rhtml:66 app/views/account/wizard.rhtml:1
+#: app/views/shared/user_menu.rhtml:70 app/views/account/wizard.rhtml:1
 #: app/views/cms/why_categorize.rhtml:8 app/views/search/_search_form.rhtml:63
 #: app/views/layouts/application-ng.rhtml:69
 #: app/views/box_organizer/add_block.rhtml:19
@@ -2271,7 +2270,7 @@ msgid "Ok"
 msgstr ""
 
 #: app/models/link_list_block.rb:21 app/views/friends/invite.rhtml:31
-#: app/views/shared/user_menu.rhtml:63 app/views/account/login_block.rhtml:4
+#: app/views/shared/user_menu.rhtml:67 app/views/account/login_block.rhtml:4
 #: app/views/account/login.rhtml:3 app/views/layouts/application-ng.rhtml:66
 msgid "Login"
 msgstr ""
@@ -3238,44 +3237,48 @@ msgstr ""
 msgid "My communities"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:30
+#: app/views/shared/user_menu.rhtml:27
+msgid "Manage %s"
+msgstr ""
+
+#: app/views/shared/user_menu.rhtml:34
 msgid "Webmail"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35 app/views/blocks/my_network.rhtml:9
+#: app/views/shared/user_menu.rhtml:39 app/views/blocks/my_network.rhtml:9
 #: app/views/blocks/profile_info.rhtml:22
 #: app/views/blocks/profile_image.rhtml:19
 #: app/views/layouts/application-ng.rhtml:62
 msgid "Control panel"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:35
+#: app/views/shared/user_menu.rhtml:39
 msgid ""
 "Control panel: change your picture, edit your personal information, create "
 "content or change the way your home page looks."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:39
+#: app/views/shared/user_menu.rhtml:43
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:42
+#: app/views/shared/user_menu.rhtml:46
 msgid "Access the site administration panel."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:46 app/views/account/user_info.rhtml:11
+#: app/views/shared/user_menu.rhtml:50 app/views/account/user_info.rhtml:11
 #: app/views/layouts/application-ng.rhtml:64
 msgid "Logout"
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:49
+#: app/views/shared/user_menu.rhtml:53
 msgid ""
 "This link takes you out of the system. You should logout if other people are "
 "willing to use the same computer after you."
 msgstr ""
 
-#: app/views/shared/user_menu.rhtml:63
+#: app/views/shared/user_menu.rhtml:67
 #: app/views/account/index_anonymous.rhtml:5
 #: app/views/layouts/application-ng.rhtml:66
 msgid ""
@@ -4341,7 +4344,8 @@ msgid "Add friend"
 msgstr ""
 
 #: app/views/blocks/profile_info_actions/person.rhtml:9
-#: app/views/profile/_person.rhtml:9 app/views/content_viewer/_person.rhtml:9
+#: app/views/profile/_person.rhtml:11
+#: app/views/content_viewer/_person.rhtml:11
 msgid "Contact"
 msgstr ""
 
@@ -4465,8 +4469,8 @@ msgid "Identifier:"
 msgstr ""
 
 #: app/views/enterprise_editor/index.rhtml:7
-#: app/views/profile/_person.rhtml:14
-#: app/views/content_viewer/_person.rhtml:14
+#: app/views/profile/_person.rhtml:15
+#: app/views/content_viewer/_person.rhtml:15
 msgid "Contact phone:"
 msgstr ""
 
@@ -4650,7 +4654,7 @@ msgstr ""
 msgid "%s's communities"
 msgstr ""
 
-#: app/views/profile/index.rhtml:8
+#: app/views/profile/index.rhtml:7
 msgid "%s's profile"
 msgstr ""
 
@@ -4724,38 +4728,38 @@ msgstr ""
 msgid "Date of birth:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:13
-#: app/views/content_viewer/_person.rhtml:13
+#: app/views/profile/_person.rhtml:14
+#: app/views/content_viewer/_person.rhtml:14
 msgid "ZIP code:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:21
-#: app/views/content_viewer/_person.rhtml:21
+#: app/views/profile/_person.rhtml:22
+#: app/views/content_viewer/_person.rhtml:22
 msgid "Work"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:24
-#: app/views/content_viewer/_person.rhtml:24
+#: app/views/profile/_person.rhtml:25
+#: app/views/content_viewer/_person.rhtml:25
 msgid "Organization:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:25
-#: app/views/content_viewer/_person.rhtml:25
+#: app/views/profile/_person.rhtml:26
+#: app/views/content_viewer/_person.rhtml:26
 msgid "Organization website:"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:41
-#: app/views/content_viewer/_person.rhtml:41
+#: app/views/profile/_person.rhtml:42
+#: app/views/content_viewer/_person.rhtml:42
 msgid "Network"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:45
-#: app/views/content_viewer/_person.rhtml:45
+#: app/views/profile/_person.rhtml:46
+#: app/views/content_viewer/_person.rhtml:46
 msgid "Friends"
 msgstr ""
 
-#: app/views/profile/_person.rhtml:57
-#: app/views/content_viewer/_person.rhtml:57
+#: app/views/profile/_person.rhtml:55
+#: app/views/content_viewer/_person.rhtml:55
 msgid "Interests"
 msgstr ""
 
diff --git a/po/pt_BR/noosfero.po b/po/pt_BR/noosfero.po
index e341a01..d82f6b0 100644
--- a/po/pt_BR/noosfero.po
+++ b/po/pt_BR/noosfero.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.18.0\n"
-"POT-Creation-Date: 2009-05-26 18:17-0300\n"
+"POT-Creation-Date: 2009-05-26 19:20-0300\n"
 "PO-Revision-Date: 2009-05-26 18:18-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -619,16 +619,16 @@ msgstr "Produtos"
 #: app/controllers/public/search_controller.rb:134
 #: app/controllers/public/search_controller.rb:207
 #: app/views/search/_sellers_form.rhtml:7 app/views/search/enterprises.rhtml:5
-#: app/views/profile/_person.rhtml:30
-#: app/views/content_viewer/_person.rhtml:30
+#: app/views/profile/_person.rhtml:31
+#: app/views/content_viewer/_person.rhtml:31
 msgid "Enterprises"
 msgstr "Empreendimentos"
 
 #: app/helpers/assets_helper.rb:11
 #: app/controllers/public/search_controller.rb:136
 #: app/controllers/public/search_controller.rb:210
-#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:49
-#: app/views/content_viewer/_person.rhtml:49
+#: app/views/search/communities.rhtml:1 app/views/profile/_person.rhtml:50
+#: app/views/content_viewer/_person.rhtml:50
 #: app/views/layouts/application-ng.rhtml:93
 msgid "Communities"
 msgstr "Comunidades"
@@ -671,8 +671,8 @@ msgid "Contact person:"
 msgstr "Pessoa de contato:"
 
 #: app/helpers/enterprise_homepage_helper.rb:7
-#: app/views/profile/_person.rhtml:15
-#: app/views/content_viewer/_person.rhtml:15
+#: app/views/profile/_person.rhtml:16
+#: app/views/content_viewer/_person.rhtml:16
 msgid "e-Mail:"
 msgstr "e-Mail:"
 
@@ -681,15 +681,14 @@ msgid "Phone(s):"
 msgstr "Telefone(s)"
 
 #: app/helpers/enterprise_homepage_helper.rb:9
-#: app/views/profile/_person.rhtml:17
-#: app/views/content_viewer/_person.rhtml:17
+#: app/views/profile/_person.rhtml:7 app/views/content_viewer/_person.rhtml:7
 msgid "Location:"
 msgstr "Localização:"
 
 #: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:78
 #: app/views/cms/_event.rhtml:14 app/views/enterprise_editor/index.rhtml:6
-#: app/views/profile/_person.rhtml:12
-#: app/views/content_viewer/_person.rhtml:12
+#: app/views/profile/_person.rhtml:13
+#: app/views/content_viewer/_person.rhtml:13
 msgid "Address:"
 msgstr "Endereço:"
 
@@ -763,7 +762,7 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: app/helpers/boxes_helper.rb:209 app/helpers/application_helper.rb:89
-#: app/views/shared/user_menu.rhtml:66 app/views/account/wizard.rhtml:1
+#: app/views/shared/user_menu.rhtml:70 app/views/account/wizard.rhtml:1
 #: app/views/cms/why_categorize.rhtml:8 app/views/search/_search_form.rhtml:63
 #: app/views/layouts/application-ng.rhtml:69
 #: app/views/box_organizer/add_block.rhtml:19
@@ -2319,7 +2318,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #: app/models/link_list_block.rb:21 app/views/friends/invite.rhtml:31
-#: app/views/shared/user_menu.rhtml:63 app/views/account/login_block.rhtml:4
+#: app/views/shared/user_menu.rhtml:67 app/views/account/login_block.rhtml:4
 #: app/views/account/login.rhtml:3 app/views/layouts/application-ng.rhtml:66
 msgid "Login"
 msgstr "Entrar"
@@ -3312,18 +3311,23 @@ msgstr "Vá à sua página inicial."
 msgid "My communities"
 msgstr "Minhas comunidades"
 
-#: app/views/shared/user_menu.rhtml:30
+#: app/views/shared/user_menu.rhtml:27
+#, fuzzy
+msgid "Manage %s"
+msgstr "Gerenciar"
+
+#: app/views/shared/user_menu.rhtml:34
 msgid "Webmail"
 msgstr "Webmail"
 
-#: app/views/shared/user_menu.rhtml:35 app/views/blocks/my_network.rhtml:9
+#: app/views/shared/user_menu.rhtml:39 app/views/blocks/my_network.rhtml:9
 #: app/views/blocks/profile_info.rhtml:22
 #: app/views/blocks/profile_image.rhtml:19
 #: app/views/layouts/application-ng.rhtml:62
 msgid "Control panel"
 msgstr "Painel de controle"
 
-#: app/views/shared/user_menu.rhtml:35
+#: app/views/shared/user_menu.rhtml:39
 msgid ""
 "Control panel: change your picture, edit your personal information, create "
 "content or change the way your home page looks."
@@ -3331,21 +3335,21 @@ msgstr ""
 "Painel de controle: altere sua foto, edite suas informações pessoais, crie "
 "conteúdo ou altere o visual da sua página."
 
-#: app/views/shared/user_menu.rhtml:39
+#: app/views/shared/user_menu.rhtml:43
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr "Administrador"
 
-#: app/views/shared/user_menu.rhtml:42
+#: app/views/shared/user_menu.rhtml:46
 msgid "Access the site administration panel."
 msgstr "Acesso o painel de administrador do site."
 
-#: app/views/shared/user_menu.rhtml:46 app/views/account/user_info.rhtml:11
+#: app/views/shared/user_menu.rhtml:50 app/views/account/user_info.rhtml:11
 #: app/views/layouts/application-ng.rhtml:64
 msgid "Logout"
 msgstr "Sair"
 
-#: app/views/shared/user_menu.rhtml:49
+#: app/views/shared/user_menu.rhtml:53
 msgid ""
 "This link takes you out of the system. You should logout if other people are "
 "willing to use the same computer after you."
@@ -3353,7 +3357,7 @@ msgstr ""
 "Este link te leva pra fora do sistema. Você deve sair se outras pessoas vão "
 "usar o mesmo computador depois de você."
 
-#: app/views/shared/user_menu.rhtml:63
+#: app/views/shared/user_menu.rhtml:67
 #: app/views/account/index_anonymous.rhtml:5
 #: app/views/layouts/application-ng.rhtml:66
 msgid ""
@@ -4489,7 +4493,8 @@ msgid "Add friend"
 msgstr "Adicionar amigo"
 
 #: app/views/blocks/profile_info_actions/person.rhtml:9
-#: app/views/profile/_person.rhtml:9 app/views/content_viewer/_person.rhtml:9
+#: app/views/profile/_person.rhtml:11
+#: app/views/content_viewer/_person.rhtml:11
 msgid "Contact"
 msgstr "Contato"
 
@@ -4622,8 +4627,8 @@ msgid "Identifier:"
 msgstr "Identificador: "
 
 #: app/views/enterprise_editor/index.rhtml:7
-#: app/views/profile/_person.rhtml:14
-#: app/views/content_viewer/_person.rhtml:14
+#: app/views/profile/_person.rhtml:15
+#: app/views/content_viewer/_person.rhtml:15
 msgid "Contact phone:"
 msgstr "Telefone de contato:"
 
@@ -4813,7 +4818,7 @@ msgstr "Aqui estão todas a comunidades de <b>%s</b>"
 msgid "%s's communities"
 msgstr "Comunidades de %s"
 
-#: app/views/profile/index.rhtml:8
+#: app/views/profile/index.rhtml:7
 msgid "%s's profile"
 msgstr "Perfil de %s"
 
@@ -4887,38 +4892,38 @@ msgstr "Sexo:"
 msgid "Date of birth:"
 msgstr "Data de nascimento:"
 
-#: app/views/profile/_person.rhtml:13
-#: app/views/content_viewer/_person.rhtml:13
+#: app/views/profile/_person.rhtml:14
+#: app/views/content_viewer/_person.rhtml:14
 msgid "ZIP code:"
 msgstr "CEP:"
 
-#: app/views/profile/_person.rhtml:21
-#: app/views/content_viewer/_person.rhtml:21
+#: app/views/profile/_person.rhtml:22
+#: app/views/content_viewer/_person.rhtml:22
 msgid "Work"
 msgstr "Trabalho"
 
-#: app/views/profile/_person.rhtml:24
-#: app/views/content_viewer/_person.rhtml:24
+#: app/views/profile/_person.rhtml:25
+#: app/views/content_viewer/_person.rhtml:25
 msgid "Organization:"
 msgstr "Organização:"
 
-#: app/views/profile/_person.rhtml:25
-#: app/views/content_viewer/_person.rhtml:25
+#: app/views/profile/_person.rhtml:26
+#: app/views/content_viewer/_person.rhtml:26
 msgid "Organization website:"
 msgstr "Website da organização:"
 
-#: app/views/profile/_person.rhtml:41
-#: app/views/content_viewer/_person.rhtml:41
+#: app/views/profile/_person.rhtml:42
+#: app/views/content_viewer/_person.rhtml:42
 msgid "Network"
 msgstr "Rede"
 
-#: app/views/profile/_person.rhtml:45
-#: app/views/content_viewer/_person.rhtml:45
+#: app/views/profile/_person.rhtml:46
+#: app/views/content_viewer/_person.rhtml:46
 msgid "Friends"
 msgstr "Amigos"
 
-#: app/views/profile/_person.rhtml:57
-#: app/views/content_viewer/_person.rhtml:57
+#: app/views/profile/_person.rhtml:55
+#: app/views/content_viewer/_person.rhtml:55
 msgid "Interests"
 msgstr "Interesses"
 
--
libgit2 0.21.2