Merge branch 'stable'

Conflicts: test/unit/article_block_test.rb

Merge branch 'stable'
Conflicts: test/unit/article_block_test.rb
Antonio Terceiro
2 parents 0cdd5cb4 7621915d
Showing 61 changed files with 317 additions and 296 deletions Show diff stats
app/helpers/boxes_helper.rb
app/models/article_block.rb
app/models/doc_item.rb
app/models/doc_topic.rb
app/views/profile/private_profile.rhtml
app/views/shared/access_denied.rhtml
app/views/shared/not_found.rhtml
doc/noosfero/cms/adding-images-to-gallery.textile
doc/noosfero/cms/creating-blog.textile
doc/noosfero/cms/managing-content.textile
doc/noosfero/cms/posting-on-blog.textile
doc/noosfero/cms/writing-advanced-article.textile
doc/noosfero/cms/writing-article.textile
doc/noosfero/community/accepting-members.textile
doc/noosfero/community/creating-community.textile
doc/noosfero/community/editing-appearance.textile
doc/noosfero/community/editing-header-footer.textile
doc/noosfero/community/editing-sideboxes.textile
doc/noosfero/community/invite-contacts.textile
doc/noosfero/community/joining-community.textile
@@ -10,7 +10,7 @@ module BoxesHelper
       else
         content_tag('div',
           content_tag('div',
-            content_tag('div', content, :class => 'no-boxes-inner-2'),
+            content_tag('div', wrap_main_content(content), :class => 'no-boxes-inner-2'),
             :class => 'no-boxes-inner-1'
           ),
           :class => 'no-boxes'
@@ -115,11 +115,6 @@ module BoxesHelper
     (1..8).to_a.reverse.inject(content) { |acc,n| content_tag('div', acc, :id => 'main-content-wrapper-' + n.to_s) }
   end
-  def noosfero_wrap(&block)
-    text = capture(&block)
-    concat(wrap_main_content(text), block.binding)
-  end
-
   def extract_block_content(content)
     case content
     when Hash
@@ -9,7 +9,8 @@ class ArticleBlock &lt; Block
   end
   def content
-    article ? article.to_html : _('Article not selected yet.')
+    block_title(title) +
+    (article ? article.to_html : _('Article not selected yet.'))
   end
   def article_id
 class DocItem
   class  NotFound < Exception; end
-  attr_accessor :id, :title, :text, :language
+  attr_accessor :id, :title, :text, :language, :order
   def initialize(attrs = {})
     attrs.each do |name,value|
       self.send("#{name}=", value)
@@ -4,15 +4,29 @@ class DocTopic &lt; DocItem
       raise DocItem::NotFound
     end
     lines = File.readlines(file) 
-    title = _find_title(lines)
+    title_line = _find_title(lines)
     File.basename(file) =~ /(.*)\.([^\.]+)\.xhtml$/
     id = $1
     language = $2
-    new(:id => id, :title => title, :text => lines.join, :language => language)
+    new(:id => id, :title => title(title_line), :text => lines.join, :language => language, :order => order(title_line))
   end
   def self._find_title(lines)
-    lines.find {|line| line =~ /^<h1>(.*)<\/h1>/ }
+    lines.find {|line| line =~ /^(<h1.*>.*<\/h1>)/ }
     $1
   end
+
+  def self.title(line)
+    line =~ /<h1.*>(.*)<\/h1>/
+    $1
+  end
+
+  def self.order(line)
+    if line =~ /<h1 class="order-(.*)">.*<\/h1>/
+      $1.to_i
+    else
+      0
+    end
+  end
+
 end
@@ -1,6 +0,0 @@
-<html>
-  <!-- FIXME: should use a proper layout for this kind of message -->
-  <body>
-    <%= _("This profile is not public.") %>
-  </body>
-</html>
 <div id='access-denied'>
-  <% noosfero_wrap do %>
     <h1> <%= @title || _('Access denied') %> </h1>
     <% unless @message.nil? %>
@@ -15,6 +14,5 @@
       <%= button :home, _('Go to the site home page'), :controller => 'home' %>
     <% end %>
-  <% end %>
 </div>
 <div id='not-found'>
-  <% noosfero_wrap do %>
     <h1><%= _('There is no such page: %s') % (content_tag('tt', @path)) %></h1>
     <p>
     <%= _('You may have clicked an expired link or mistyped the address.') %>
@@ -9,5 +8,4 @@
       <%= button :back, _('Go back'), :back %>
       <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %>
     <% end %>
-  <% end %>
 </div>
-h1. Adding pictures to gallery
+h1(order-310). Adding pictures to gallery
 p.  _You can publish pictures on your image gallery_
-h1. Creating a blog
+h1(order-320). Creating a blog
 p.  _You can have a blog in your system._
-h1. Managing your content
+h1(order-350). Managing your content
 p.  _Folder is a structure used to organize files in a computer and can also be called a directory. It may contain other files and folders, which may also contain other directories_
-h1. Posting on blog
+h1(order-330). Posting on blog
 p.  _You can have a blog and publish posts on it._
-h1. Writing an advanced article (inserting images, links, videos and audio)
+h1(order-340). Writing an advanced article (inserting images, links, videos and audio)
 p.  _You can add images and links to the articles created on the system to make it more interesting._
-h1. Writing an article
+h1(order-300). Writing an article
 p.  _To publish your articles you can create an aticle, as explained below._
-h1. Accepting new members
+h1(order-130). Accepting new members
 p.  _If a community is moderated, the administrator/moderator needs to approve the requests of new members._
-h1. Creating a community
+h1(order-110). Creating a community
 p.  _You can create communities to interact to others users_
-h1. Editing appearance
+h1(order-150). Editing appearance
 p.  _You can customize the page of your community, changing the template of it._
-h1. Editing header and footer
+h1(order-170). Editing header and footer
 p.  _You can customize the page of your community, adding some text or image on header or footer._
-h1. Editing sideboxes
+h1(order-160). Editing sideboxes
 p.  _You can customize the page of your community, changing the blocks that will be displayed on it._
-h1. Inviting contacts from e-mail
+h1(order-120). Inviting contacts from e-mail
 p.  _If you are a community administrator, you can invite e-mail contacts to join your community. If the e-mail is registered on the system, the user will receive an invitation through the system. If it is not registered, the user will receive an invitation on his e-mail._
-h1. Joining a community
+h1(order-100). Joining a community
 p.  _You can be part of a community and interact with its others members. To do that, you can join a community, as explained below._
-h1. Moderating articles
+h1(order-140). Moderating articles
 p.  _Community's members can publish articles on community. If the community is moderated, the administrator/moderator needs to approve or deny the publication._
-h1. Activating your enterprise
+h1(order-200). Activating your enterprise
 p.  _If you have an enterprise that is registered in the system, you might have the activation code of the enterprise._
-h1. Disabling an enterprise
+h1(order-260). Disabling an enterprise
 p.  _If you are an administrator of any enterprise and you don't want that it appears in the system anymore, you can disable it by following this steps._
-h1. Editing appearance
+h1(order-240). Editing appearance
 p.  _You can customize the page of your enterprise, changing the template of it._
-h1. Editing enterprise settings
+h1(order-220). Editing enterprise settings
 p.  _If you are administrator of an enterprise, you can edit its settings._
-h1. Editing header and footer
+h1(order-250). Editing header and footer
 p.  _You can customize the page of your enterprise, adding some text or image on header or footer._
-h1. Editing sideboxes
+h1(order-230). Editing sideboxes
 p.  _You can customize the page of your enterprise, changing the blocks that will be displayed on it._
-h1. Managing and adding members to an enterprise
+h1(order-210). Managing and adding members to an enterprise
 p.  _If you are an enterprise administrator, you can add or remove members from enterprise and also define which permissions each member will have_
-h1. Advanced search
+h1(order-620). Advanced search
 p.  _When an user is navigating on the system, he can do a search to find articles, communities, people, enterprises or products._
-h1. Finding communities
+h1(order-600). Finding communities
 p.  _To find a community in the system, you can use the search specific for communities._
-h1. Finding enterprises
+h1(order-650). Finding enterprises
 p.  _To find an enterprise in the system, you can use the search specific for enterprises._
-h1. Finding people
+h1(order-610). Finding people
 p.  _To find an user in the system, you can use the search specific for people._
-h1. Finding products and services
+h1(order-640). Finding products and services
 p.  _To find a product or service in the system, you can use the search specific for products and services._
-h1. Searching on the system
+h1(order-630). Searching on the system
 p.  _To find articles, communities, people, enterprises or products and services, an user in the system, can do a search._
-h1. Accepting friends
+h1(order-460). Accepting friends
 p.  _When one person asks to be your friend, you should accept or reject the request. This is what will be explained._
-h1. Adding friends
+h1(order-450). Adding friends
 p.  _To interact with others system users, you can include them in your contact list, adding them as friends._
-h1. Changing password
+h1(order-510). Changing password
 p.  _Whenever you want, you can change your password._
-h1. Commenting articles
+h1(order-470). Commenting articles
 p.  _Articles, pictures and events of the system can be commented. When a person creates an article or upload a picture, she can allow other people to comment._
-h1. Editing appearance
+h1(order-530). Editing appearance
 p.  _You can customize your page, changing the template of it._
-h1. Editing header and footer
+h1(order-540). Editing header and footer
 p.  _You can customize your page, adding some text or image on header or footer._
-h1. Editing user settings
+h1(order-420). Editing user settings
 p.  _You can change your profile information and settings in the system._
-h1. Editing sideboxes
+h1(order-500). Editing sideboxes
 p.  _You can customize your page, changing the blocks that will be displayed on it._
-h1. Inviting contacts from e-mail
+h1(order-440). Inviting contacts from e-mail
 p.  _You can invite e-mail contacts to be your friend on the system. If the e-mail is registered on the system, the user will receive an invitation through the system. If it is not registered, the user will receive an invitation on his e-mail._
-h1. Login into the system
+h1(order-410). Login into the system
 p.  _Some system features only can be used when the user is logged in._
-h1. Leaving the system
+h1(order-430). Leaving the system
 p.  _After finishing your navigation, we recommend leaving the system._
-h1. Registering a new user
+h1(order-400). Registering a new user
 p.  _To be part of the system, you need to register yourself. After registering, you will be able to join communities, enterprises, add friends and much more._
-h1. Removing comments
+h1(order-480). Removing comments
 p.  _If you are the author of an article or if you have permission to moderate the comments of a profile (community/enterprise), you can remove the unwanted comments posted on it._
-h1. Removing friends
+h1(order-520). Removing friends
 p.  _How you can remove one friend from your contact list._
-h1. Sending messages
+h1(order-490). Sending messages
 p.  _To interact with other system users, you can send messages through the system. The messages will be received by email._
@@ -14,13 +14,13 @@ begin
     Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
       t.binary = vendored_cucumber_binary
       t.fork = true # You may get faster startup if you set this to false
-      t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+      t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
     end
     Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
       t.binary = vendored_cucumber_binary
       t.fork = true # You may get faster startup if you set this to false
-      t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+      t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
     end
     desc 'Run all features'
@@ -33,8 +33,11 @@ namespace :noosfero do
             section = File.basename(File.dirname(toc))
             output_file.puts "<!-- THIS FILE IS AUTOGENERATED. DO NOT EDIT -->"
             output_file.puts "<ul>"
+            topics = []
             section_topics.each do |item|
-              topic = DocTopic.loadfile(item)
+              topics << DocTopic.loadfile(item)
+            end
+            topics.sort_by { |t| t.order }.each do |topic|
               output_file.puts "<li> <a href=\"/doc/#{section}/#{topic.id}\">#{topic.title}</a> </li>"
             end
             output_file.puts "</ul>"
@@ -2,5 +2,5 @@ task :default =&gt; [:test, :cucumber, :selenium]
 desc 'Runs Seleniun acceptance tests'
 task :selenium do
-  sh "xvfb-run cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+  sh "xvfb-run cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
 end
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-16 20:53-0300\n"
+"POT-Creation-Date: 2010-04-22 19:54-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,12 +120,12 @@ msgid &quot;Related topics&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/cms/posting-on-blog.en.xhtml:31 doc/noosfero/cms/toc.en.xhtml:7
+#: doc/noosfero/cms/posting-on-blog.en.xhtml:31 doc/noosfero/cms/toc.en.xhtml:5
 msgid "<a href=\"/doc/cms/creating-blog\">Creating a blog</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/cms/posting-on-blog.en.xhtml:32 doc/noosfero/cms/adding-images-to-gallery.en.xhtml:31 doc/noosfero/cms/creating-blog.en.xhtml:38 doc/noosfero/cms/toc.en.xhtml:6
+#: doc/noosfero/cms/posting-on-blog.en.xhtml:32 doc/noosfero/cms/adding-images-to-gallery.en.xhtml:31 doc/noosfero/cms/creating-blog.en.xhtml:38 doc/noosfero/cms/toc.en.xhtml:8
 msgid "<a href=\"/doc/cms/managing-content\">Managing your content</a>"
 msgstr ""
@@ -429,7 +429,7 @@ msgid &quot;&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/cms/writing-advanced-article.en.xhtml:76 doc/noosfero/cms/managing-content.en.xhtml:61 doc/noosfero/cms/toc.en.xhtml:8
+#: doc/noosfero/cms/writing-advanced-article.en.xhtml:76 doc/noosfero/cms/managing-content.en.xhtml:61 doc/noosfero/cms/toc.en.xhtml:3
 msgid "<a href=\"/doc/cms/writing-article\">Writing an article</a>"
 msgstr ""
@@ -670,7 +670,7 @@ msgid &quot;Fill in with the blog&amp;#8217;s tags.&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/cms/creating-blog.en.xhtml:39 doc/noosfero/cms/toc.en.xhtml:3
+#: doc/noosfero/cms/creating-blog.en.xhtml:39 doc/noosfero/cms/toc.en.xhtml:6
 msgid "<a href=\"/doc/cms/posting-on-blog\">Posting on blog</a>"
 msgstr ""
@@ -1160,7 +1160,7 @@ msgid &quot;After editing your header and footer, click on &amp;#8220;Save&amp;#8221; button&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/editing-header-footer.en.xhtml:62 doc/noosfero/community/editing-appearance.en.xhtml:37 doc/noosfero/community/creating-community.en.xhtml:37 doc/noosfero/user/logout.en.xhtml:25 doc/noosfero/user/changing-password.en.xhtml:32 doc/noosfero/user/editing-header-footer.en.xhtml:61 doc/noosfero/user/removing-comments.en.xhtml:25 doc/noosfero/user/editing-appearance.en.xhtml:35 doc/noosfero/user/editing-person-info.en.xhtml:36 doc/noosfero/user/commenting.en.xhtml:31 doc/noosfero/enterprise/disabling-enterprise.en.xhtml:32 doc/noosfero/enterprise/editing-header-footer.en.xhtml:62 doc/noosfero/enterprise/editing-appearance.en.xhtml:37 doc/noosfero/enterprise/editing-enterprise-info.en.xhtml:45 doc/noosfero/user/toc.en.xhtml:17
+#: doc/noosfero/community/editing-header-footer.en.xhtml:62 doc/noosfero/community/editing-appearance.en.xhtml:37 doc/noosfero/community/creating-community.en.xhtml:37 doc/noosfero/user/logout.en.xhtml:25 doc/noosfero/user/changing-password.en.xhtml:32 doc/noosfero/user/editing-header-footer.en.xhtml:61 doc/noosfero/user/removing-comments.en.xhtml:25 doc/noosfero/user/editing-appearance.en.xhtml:35 doc/noosfero/user/editing-person-info.en.xhtml:36 doc/noosfero/user/commenting.en.xhtml:31 doc/noosfero/enterprise/disabling-enterprise.en.xhtml:32 doc/noosfero/enterprise/editing-header-footer.en.xhtml:62 doc/noosfero/enterprise/editing-appearance.en.xhtml:37 doc/noosfero/enterprise/editing-enterprise-info.en.xhtml:45 doc/noosfero/user/toc.en.xhtml:4
 msgid "<a href=\"/doc/user/login\">Login into the system</a>"
 msgstr ""
@@ -1228,7 +1228,7 @@ msgid &quot;Edit appearance&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/editing-appearance.en.xhtml:39 doc/noosfero/community/editing-sideboxes.en.xhtml:71 doc/noosfero/community/toc.en.xhtml:3
+#: doc/noosfero/community/editing-appearance.en.xhtml:39 doc/noosfero/community/editing-sideboxes.en.xhtml:71 doc/noosfero/community/toc.en.xhtml:10
 msgid ""
 "<a href=\"/doc/community/editing-header-footer\">Editing header and "
 "footer</a>"
@@ -1446,12 +1446,12 @@ msgid &quot;Import invitation for community. Step 2&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/invite-contacts.en.xhtml:45 doc/noosfero/community/moderating-articles.en.xhtml:41 doc/noosfero/community/accepting-members.en.xhtml:32 doc/noosfero/community/toc.en.xhtml:5
+#: doc/noosfero/community/invite-contacts.en.xhtml:45 doc/noosfero/community/moderating-articles.en.xhtml:41 doc/noosfero/community/accepting-members.en.xhtml:32 doc/noosfero/community/toc.en.xhtml:4
 msgid "<a href=\"/doc/community/creating-community\">Creating a community</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/invite-contacts.en.xhtml:46 doc/noosfero/community/moderating-articles.en.xhtml:42 doc/noosfero/community/accepting-members.en.xhtml:33 doc/noosfero/community/toc.en.xhtml:9
+#: doc/noosfero/community/invite-contacts.en.xhtml:46 doc/noosfero/community/moderating-articles.en.xhtml:42 doc/noosfero/community/accepting-members.en.xhtml:33 doc/noosfero/community/toc.en.xhtml:3
 msgid "<a href=\"/doc/community/joining-community\">Joining a community</a>"
 msgstr ""
@@ -1753,7 +1753,7 @@ msgid &quot;&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/editing-sideboxes.en.xhtml:72 doc/noosfero/community/toc.en.xhtml:4
+#: doc/noosfero/community/editing-sideboxes.en.xhtml:72 doc/noosfero/community/toc.en.xhtml:8
 msgid "<a href=\"/doc/community/editing-appearance\">Editing appearance</a>"
 msgstr ""
@@ -1903,7 +1903,7 @@ msgid &quot;&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/joining-community.en.xhtml:28 doc/noosfero/navigation/searching.en.xhtml:28 doc/noosfero/navigation/searching-people.en.xhtml:32 doc/noosfero/navigation/searching-products-services.en.xhtml:37 doc/noosfero/navigation/searching-enterprises.en.xhtml:37 doc/noosfero/navigation/advanced-search.en.xhtml:35 doc/noosfero/navigation/toc.en.xhtml:7
+#: doc/noosfero/community/joining-community.en.xhtml:28 doc/noosfero/navigation/searching.en.xhtml:28 doc/noosfero/navigation/searching-people.en.xhtml:32 doc/noosfero/navigation/searching-products-services.en.xhtml:37 doc/noosfero/navigation/searching-enterprises.en.xhtml:37 doc/noosfero/navigation/advanced-search.en.xhtml:35 doc/noosfero/navigation/toc.en.xhtml:3
 msgid "<a href=\"/doc/navigation/searching-communities\">Finding communities</a>"
 msgstr ""
@@ -2047,12 +2047,12 @@ msgid &quot;&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/user/removing-friends.en.xhtml:32 doc/noosfero/user/sending-messages.en.xhtml:30 doc/noosfero/user/accepting-friends.en.xhtml:30 doc/noosfero/user/registering-new-user.en.xhtml:33 doc/noosfero/user/toc.en.xhtml:15
+#: doc/noosfero/user/removing-friends.en.xhtml:32 doc/noosfero/user/sending-messages.en.xhtml:30 doc/noosfero/user/accepting-friends.en.xhtml:30 doc/noosfero/user/registering-new-user.en.xhtml:33 doc/noosfero/user/toc.en.xhtml:8
 msgid "<a href=\"/doc/user/adding-friends\">Adding friends</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/user/removing-friends.en.xhtml:33 doc/noosfero/user/sending-messages.en.xhtml:31 doc/noosfero/user/invite-contacts.en.xhtml:43 doc/noosfero/user/adding-friends.en.xhtml:26 doc/noosfero/user/registering-new-user.en.xhtml:35 doc/noosfero/user/toc.en.xhtml:10
+#: doc/noosfero/user/removing-friends.en.xhtml:33 doc/noosfero/user/sending-messages.en.xhtml:31 doc/noosfero/user/invite-contacts.en.xhtml:43 doc/noosfero/user/adding-friends.en.xhtml:26 doc/noosfero/user/registering-new-user.en.xhtml:35 doc/noosfero/user/toc.en.xhtml:9
 msgid "<a href=\"/doc/user/accepting-friends\">Accepting friends</a>"
 msgstr ""
@@ -2183,7 +2183,7 @@ msgid &quot;&lt;em&gt;You can customize your page, changing the template of it.&lt;/em&gt;&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/user/editing-appearance.en.xhtml:37 doc/noosfero/user/editing-sideboxes.en.xhtml:72 doc/noosfero/user/toc.en.xhtml:7
+#: doc/noosfero/user/editing-appearance.en.xhtml:37 doc/noosfero/user/editing-sideboxes.en.xhtml:72 doc/noosfero/user/toc.en.xhtml:17
 msgid "<a href=\"/doc/user/editing-header-footer\">Editing header and footer</a>"
 msgstr ""
@@ -2237,7 +2237,7 @@ msgid &quot;Related Topics&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/user/accepting-friends.en.xhtml:31 doc/noosfero/user/invite-contacts.en.xhtml:44 doc/noosfero/user/adding-friends.en.xhtml:25 doc/noosfero/user/registering-new-user.en.xhtml:34 doc/noosfero/user/toc.en.xhtml:5
+#: doc/noosfero/user/accepting-friends.en.xhtml:31 doc/noosfero/user/invite-contacts.en.xhtml:44 doc/noosfero/user/adding-friends.en.xhtml:25 doc/noosfero/user/registering-new-user.en.xhtml:34 doc/noosfero/user/toc.en.xhtml:15
 msgid "<a href=\"/doc/user/removing-friends\">Removing friends</a>"
 msgstr ""
@@ -2421,7 +2421,7 @@ msgid &quot;Enterprises block&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/user/editing-sideboxes.en.xhtml:73 doc/noosfero/user/toc.en.xhtml:9
+#: doc/noosfero/user/editing-sideboxes.en.xhtml:73 doc/noosfero/user/toc.en.xhtml:16
 msgid "<a href=\"/doc/user/editing-appearance\">Editing appearance</a>"
 msgstr ""
@@ -2790,7 +2790,7 @@ msgid &quot;&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/enterprise/editing-appearance.en.xhtml:39 doc/noosfero/enterprise/editing-sideboxes.en.xhtml:73 doc/noosfero/enterprise/toc.en.xhtml:4
+#: doc/noosfero/enterprise/editing-appearance.en.xhtml:39 doc/noosfero/enterprise/editing-sideboxes.en.xhtml:73 doc/noosfero/enterprise/toc.en.xhtml:8
 msgid ""
 "<a href=\"/doc/enterprise/editing-header-footer\">Editing header and "
 "footer</a>"
@@ -2934,7 +2934,7 @@ msgid &quot;Disabled enterprise block&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:74 doc/noosfero/enterprise/toc.en.xhtml:5
+#: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:74 doc/noosfero/enterprise/toc.en.xhtml:7
 msgid "<a href=\"/doc/enterprise/editing-appearance\">Editing appearance</a>"
 msgstr ""
@@ -3013,14 +3013,14 @@ msgid &quot;Conclusion of enterprise activation&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/enterprise/activating-enterprise.en.xhtml:34 doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:41 doc/noosfero/enterprise/toc.en.xhtml:9
+#: doc/noosfero/enterprise/activating-enterprise.en.xhtml:34 doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:41 doc/noosfero/enterprise/toc.en.xhtml:5
 msgid ""
 "<a href=\"/doc/enterprise/editing-enterprise-info\">Editing enterprise "
 "settings</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/enterprise/activating-enterprise.en.xhtml:35 doc/noosfero/user/toc.en.xhtml:16
+#: doc/noosfero/enterprise/activating-enterprise.en.xhtml:35 doc/noosfero/user/toc.en.xhtml:3
 msgid "<a href=\"/doc/user/registering-new-user\">Registering a new user</a>"
 msgstr ""
@@ -3116,7 +3116,7 @@ msgid &quot;Add member on manage member&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:42 doc/noosfero/enterprise/toc.en.xhtml:7
+#: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:42 doc/noosfero/enterprise/toc.en.xhtml:3
 msgid ""
 "<a href=\"/doc/enterprise/activating-enterprise\">Activating your "
 "enterprise</a>"
@@ -3278,19 +3278,19 @@ msgid &quot;View all results on search with example&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/navigation/searching.en.xhtml:29 doc/noosfero/navigation/searching-people.en.xhtml:33 doc/noosfero/navigation/searching-products-services.en.xhtml:38 doc/noosfero/navigation/searching-communities.en.xhtml:33 doc/noosfero/navigation/advanced-search.en.xhtml:36 doc/noosfero/navigation/toc.en.xhtml:6
+#: doc/noosfero/navigation/searching.en.xhtml:29 doc/noosfero/navigation/searching-people.en.xhtml:33 doc/noosfero/navigation/searching-products-services.en.xhtml:38 doc/noosfero/navigation/searching-communities.en.xhtml:33 doc/noosfero/navigation/advanced-search.en.xhtml:36 doc/noosfero/navigation/toc.en.xhtml:8
 msgid "<a href=\"/doc/navigation/searching-enterprises\">Finding enterprises</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/navigation/searching.en.xhtml:30 doc/noosfero/navigation/searching-people.en.xhtml:34 doc/noosfero/navigation/searching-enterprises.en.xhtml:38 doc/noosfero/navigation/searching-communities.en.xhtml:34 doc/noosfero/navigation/advanced-search.en.xhtml:37 doc/noosfero/navigation/toc.en.xhtml:5
+#: doc/noosfero/navigation/searching.en.xhtml:30 doc/noosfero/navigation/searching-people.en.xhtml:34 doc/noosfero/navigation/searching-enterprises.en.xhtml:38 doc/noosfero/navigation/searching-communities.en.xhtml:34 doc/noosfero/navigation/advanced-search.en.xhtml:37 doc/noosfero/navigation/toc.en.xhtml:7
 msgid ""
 "<a href=\"/doc/navigation/searching-products-services\">Finding products and "
 "services</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/navigation/searching.en.xhtml:31 doc/noosfero/navigation/searching-people.en.xhtml:35 doc/noosfero/navigation/searching-products-services.en.xhtml:39 doc/noosfero/navigation/searching-enterprises.en.xhtml:39 doc/noosfero/navigation/searching-communities.en.xhtml:35 doc/noosfero/navigation/toc.en.xhtml:8
+#: doc/noosfero/navigation/searching.en.xhtml:31 doc/noosfero/navigation/searching-people.en.xhtml:35 doc/noosfero/navigation/searching-products-services.en.xhtml:39 doc/noosfero/navigation/searching-enterprises.en.xhtml:39 doc/noosfero/navigation/searching-communities.en.xhtml:35 doc/noosfero/navigation/toc.en.xhtml:5
 msgid "<a href=\"/doc/navigation/advanced-search\">Advanced search</a>"
 msgstr ""
@@ -3590,75 +3590,77 @@ msgid &quot;&lt;a href=\&quot;/doc/cms/adding-images-to-gallery\&quot;&gt;Adding pictures to gallery&lt;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/cms/toc.en.xhtml:5
+#: doc/noosfero/cms/toc.en.xhtml:7
 msgid ""
 "<a href=\"/doc/cms/writing-advanced-article\">Writing an advanced article "
 "(inserting images, links, videos and audio)</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/toc.en.xhtml:6
+#: doc/noosfero/community/toc.en.xhtml:5
 msgid "<a href=\"/doc/community/invite-contacts\">Inviting contacts from e-mail</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/toc.en.xhtml:7
-msgid "<a href=\"/doc/community/editing-sideboxes\">Editing sideboxes</a>"
+#: doc/noosfero/community/toc.en.xhtml:6
+msgid "<a href=\"/doc/community/accepting-members\">Accepting new members</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/toc.en.xhtml:8
+#: doc/noosfero/community/toc.en.xhtml:7
 msgid "<a href=\"/doc/community/moderating-articles\">Moderating articles</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/community/toc.en.xhtml:10
-msgid "<a href=\"/doc/community/accepting-members\">Accepting new members</a>"
+#: doc/noosfero/community/toc.en.xhtml:9
+msgid "<a href=\"/doc/community/editing-sideboxes\">Editing sideboxes</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/user/toc.en.xhtml:3
-msgid "<a href=\"/doc/user/logout\">Leaving the system</a>"
+#: doc/noosfero/user/toc.en.xhtml:5
+msgid "<a href=\"/doc/user/editing-person-info\">Editing user settings</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/user/toc.en.xhtml:4
-msgid "<a href=\"/doc/user/changing-password\">Changing password</a>"
+#: doc/noosfero/user/toc.en.xhtml:6
+msgid "<a href=\"/doc/user/logout\">Leaving the system</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/user/toc.en.xhtml:6
-msgid "<a href=\"/doc/user/sending-messages\">Sending messages</a>"
+#: doc/noosfero/user/toc.en.xhtml:7
+msgid "<a href=\"/doc/user/invite-contacts\">Inviting contacts from e-mail</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/user/toc.en.xhtml:8
-msgid "<a href=\"/doc/user/removing-comments\">Removing comments</a>"
+#: doc/noosfero/user/toc.en.xhtml:10
+msgid "<a href=\"/doc/user/commenting\">Commenting articles</a>"
 msgstr ""
 # type: Content of: <ul><li>
 #: doc/noosfero/user/toc.en.xhtml:11
-msgid "<a href=\"/doc/user/invite-contacts\">Inviting contacts from e-mail</a>"
+msgid "<a href=\"/doc/user/removing-comments\">Removing comments</a>"
 msgstr ""
 # type: Content of: <ul><li>
 #: doc/noosfero/user/toc.en.xhtml:12
-msgid "<a href=\"/doc/user/editing-sideboxes\">Editing sideboxes</a>"
+msgid "<a href=\"/doc/user/sending-messages\">Sending messages</a>"
 msgstr ""
 # type: Content of: <ul><li>
 #: doc/noosfero/user/toc.en.xhtml:13
-msgid "<a href=\"/doc/user/editing-person-info\">Editing user settings</a>"
+msgid "<a href=\"/doc/user/editing-sideboxes\">Editing sideboxes</a>"
 msgstr ""
 # type: Content of: <ul><li>
 #: doc/noosfero/user/toc.en.xhtml:14
-msgid "<a href=\"/doc/user/commenting\">Commenting articles</a>"
+msgid "<a href=\"/doc/user/changing-password\">Changing password</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/enterprise/toc.en.xhtml:3
-msgid "<a href=\"/doc/enterprise/disabling-enterprise\">Disabling an enterprise</a>"
+#: doc/noosfero/enterprise/toc.en.xhtml:4
+msgid ""
+"<a href=\"/doc/enterprise/managing-enterprise-members\">Managing and adding "
+"members to an enterprise</a>"
 msgstr ""
 # type: Content of: <ul><li>
@@ -3667,14 +3669,12 @@ msgid &quot;&lt;a href=\&quot;/doc/enterprise/editing-sideboxes\&quot;&gt;Editing sideboxes&lt;/a&gt;&quot;
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/enterprise/toc.en.xhtml:8
-msgid ""
-"<a href=\"/doc/enterprise/managing-enterprise-members\">Managing and adding "
-"members to an enterprise</a>"
+#: doc/noosfero/enterprise/toc.en.xhtml:9
+msgid "<a href=\"/doc/enterprise/disabling-enterprise\">Disabling an enterprise</a>"
 msgstr ""
 # type: Content of: <ul><li>
-#: doc/noosfero/navigation/toc.en.xhtml:3
+#: doc/noosfero/navigation/toc.en.xhtml:6
 msgid "<a href=\"/doc/navigation/searching\">Searching on the system</a>"
 msgstr ""
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-16 20:53-0300\n"
-"PO-Revision-Date: 2010-04-12 16:13-0300\n"
+"POT-Creation-Date: 2010-04-22 19:54-0300\n"
+"PO-Revision-Date: 2010-04-22 20:23-0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr &quot;&quot;
 # type: Content of: <h1>
 #: doc/noosfero/cms/posting-on-blog.en.xhtml:1
 msgid "Posting on blog"
-msgstr "Postando no blog"
+msgstr "Postar no blog"
 # type: Content of: <p>
 #: doc/noosfero/cms/posting-on-blog.en.xhtml:3
@@ -205,7 +205,7 @@ msgid &quot;&quot;
 "instructions on <a href=\"/doc/cms/creating-blog\">Creating a blog</a> ."
 msgstr ""
 "Se você ainda não tem um blog, você pode criar um seguindo as orientações em "
-"<a href=\"/doc/cms/creating-blog\">Criando um blog</a>."
+"<a href=\"/doc/cms/creating-blog\">Criar um blog</a>."
 # type: Content of: <ol><li>
 #: doc/noosfero/cms/posting-on-blog.en.xhtml:15
@@ -441,16 +441,16 @@ msgstr &quot;Tópicos relacionados&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/cms/posting-on-blog.en.xhtml:31
-#: doc/noosfero/cms/toc.en.xhtml:7
+#: doc/noosfero/cms/toc.en.xhtml:5
 msgid "<a href=\"/doc/cms/creating-blog\">Creating a blog</a>"
-msgstr "<a href=\"/doc/cms/creating-blog\">Criando um blog</a>"
+msgstr "<a href=\"/doc/cms/creating-blog\">Criar um blog</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/cms/posting-on-blog.en.xhtml:32
 #: doc/noosfero/cms/adding-images-to-gallery.en.xhtml:31
-#: doc/noosfero/cms/creating-blog.en.xhtml:38 doc/noosfero/cms/toc.en.xhtml:6
+#: doc/noosfero/cms/creating-blog.en.xhtml:38 doc/noosfero/cms/toc.en.xhtml:8
 msgid "<a href=\"/doc/cms/managing-content\">Managing your content</a>"
-msgstr "<a href=\"/doc/cms/managing-content\">Gerenciando seu conteúdo</a>"
+msgstr "<a href=\"/doc/cms/managing-content\">Gerenciar seu conteúdo</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/cms/posting-on-blog.en.xhtml:35
@@ -501,12 +501,12 @@ msgstr &quot;&lt;a href=\&quot;#online-doc-text\&quot;&gt;Voltar ao topo&lt;/a&gt;&quot;
 # type: Content of: <h1>
 #: doc/noosfero/cms/index.en.xhtml:1
 msgid "Content Management"
-msgstr "Gerenciamento de conteúdo"
+msgstr "Gerenciar conteúdo"
 # type: Content of: <h1>
 #: doc/noosfero/cms/adding-images-to-gallery.en.xhtml:1
 msgid "Adding pictures to gallery"
-msgstr "Adicionando fotos na galeria"
+msgstr "Adicionar fotos na galeria"
 # type: Content of: <p>
 #: doc/noosfero/cms/adding-images-to-gallery.en.xhtml:3
@@ -522,9 +522,9 @@ msgid &quot;&quot;
 "gallery&#8221; in &#8220;Folder type&#8221;."
 msgstr ""
 "Se você ainda não tem uma galeria de imagens, você pode criar uma seguindo "
-"as orientações em <a href=\"/doc/cms/managing-content\">Gerenciando "
-"conteúdo</a> até o item 1 da descrição. Ao criar a pasta, escolha &#8220;"
-"Galeria de imagens&#8221; em &#8220;Tipo de Pasta&#8221;."
+"as orientações em <a href=\"/doc/cms/managing-content\">Gerenciar conteúdo</"
+"a> até o item 1 da descrição. Ao criar a pasta, escolha &#8220;Galeria de "
+"imagens&#8221; em &#8220;Tipo de Pasta&#8221;."
 # type: Content of: <ol><li>
 #: doc/noosfero/cms/adding-images-to-gallery.en.xhtml:15
@@ -575,8 +575,7 @@ msgstr &quot;enviando arquivos para a galeria&quot;
 # type: Content of: <h1>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:1
 msgid "Writing an advanced article (inserting images, links, videos and audio)"
-msgstr ""
-"Escrevendo um artigo avançado (inserindo imagens, links, vídeos e áudio)"
+msgstr "Escrever um artigo avançado (inserindo imagens, links, vídeos e áudio)"
 # type: Content of: <p>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:3
@@ -590,17 +589,17 @@ msgstr &quot;&quot;
 # type: Content of: <ul><li><ul><li>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:9
 msgid "<a href=\"#InsertingLinks\">Inserting links</a>"
-msgstr "<a href=\"#InsertingLinks\">Inserindo links</a>"
+msgstr "<a href=\"#InsertingLinks\">Inserir links</a>"
 # type: Content of: <ul><li><ul><li>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:10
 msgid "<a href=\"#InsertingImages\">Inserting images</a>"
-msgstr "<a href=\"#InsertingImages\">Inserindo imagens</a>"
+msgstr "<a href=\"#InsertingImages\">Inserir imagens</a>"
 # type: Content of: <ul><li><ul><li>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:11
 msgid "<a href=\"#InsertingVideosAudio\">Inserting videos and audio</a>"
-msgstr "<a href=\"#InsertingVideosAudio\">Inserindo vídeos e áudio</a>"
+msgstr "<a href=\"#InsertingVideosAudio\">Inserir vídeos e áudio</a>"
 # type: Content of: <p>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:18
@@ -690,7 +689,7 @@ msgstr &quot;Link criado num artigo&quot;
 # type: Content of: <h1>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:38
 msgid "Inserting images"
-msgstr "Inserindo imagens"
+msgstr "Inserir imagens"
 # type: Content of: <p>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:40
@@ -798,7 +797,7 @@ msgstr &quot;Lista de arquivos na edição de artigo&quot;
 # type: Content of: <h1>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:64
 msgid "Inserting videos and audio"
-msgstr "Inserindo vídeos e áudio"
+msgstr "Inserir vídeos e áudio"
 # type: Content of: <ol><li>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:67
@@ -842,14 +841,14 @@ msgstr &quot;&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:76
 #: doc/noosfero/cms/managing-content.en.xhtml:61
-#: doc/noosfero/cms/toc.en.xhtml:8
+#: doc/noosfero/cms/toc.en.xhtml:3
 msgid "<a href=\"/doc/cms/writing-article\">Writing an article</a>"
-msgstr "<a href=\"/doc/cms/writing-article\">Escrevendo um artigo</a>"
+msgstr "<a href=\"/doc/cms/writing-article\">Escrever um artigo</a>"
 # type: Content of: <h1>
 #: doc/noosfero/cms/managing-content.en.xhtml:1
 msgid "Managing your content"
-msgstr "Gerenciando seu conteúdo"
+msgstr "Gerenciar seu conteúdo"
 # type: Content of: <p>
 #: doc/noosfero/cms/managing-content.en.xhtml:3
@@ -1037,7 +1036,7 @@ msgstr &quot;&lt;strong&gt;Remover:&lt;/strong&gt; Apaga o artigo.&quot;
 # type: Content of: <h1>
 #: doc/noosfero/cms/creating-blog.en.xhtml:1
 msgid "Creating a blog"
-msgstr "Criando um blog"
+msgstr "Criar um blog"
 # type: Content of: <p>
 #: doc/noosfero/cms/creating-blog.en.xhtml:3
@@ -1122,14 +1121,14 @@ msgid &quot;Fill in with the blog&amp;#8217;s tags.&quot;
 msgstr "Preencha com as tags do blog."
 # type: Content of: <ul><li>
-#: doc/noosfero/cms/creating-blog.en.xhtml:39 doc/noosfero/cms/toc.en.xhtml:3
+#: doc/noosfero/cms/creating-blog.en.xhtml:39 doc/noosfero/cms/toc.en.xhtml:6
 msgid "<a href=\"/doc/cms/posting-on-blog\">Posting on blog</a>"
-msgstr "<a href=\"/doc/cms/posting-on-blog\">Postando no blog</a>"
+msgstr "<a href=\"/doc/cms/posting-on-blog\">Postar no blog</a>"
 # type: Content of: <h1>
 #: doc/noosfero/cms/writing-article.en.xhtml:1
 msgid "Writing an article"
-msgstr "Escrevendo um artigo básico"
+msgstr "Escrever um artigo básico"
 # type: Content of: <p>
 #: doc/noosfero/cms/writing-article.en.xhtml:3
@@ -1662,7 +1661,7 @@ msgstr &quot;&quot;
 msgid ""
 "<a href=\"/doc/cms/writing-advanced-article\">Writing advanced articles</a>"
 msgstr ""
-"<a href=\"/doc/cms/writing-advanced-article\">Escrevendo um artigo avançado "
+"<a href=\"/doc/cms/writing-advanced-article\">Escrever um artigo avançado "
 "(inserindo links e imagens)</a>"
 # type: Content of: <h1>
@@ -1895,9 +1894,9 @@ msgstr &quot;&quot;
 #: doc/noosfero/enterprise/editing-header-footer.en.xhtml:62
 #: doc/noosfero/enterprise/editing-appearance.en.xhtml:37
 #: doc/noosfero/enterprise/editing-enterprise-info.en.xhtml:45
-#: doc/noosfero/user/toc.en.xhtml:17
+#: doc/noosfero/user/toc.en.xhtml:4
 msgid "<a href=\"/doc/user/login\">Login into the system</a>"
-msgstr "<a href=\"/doc/user/login\">Entrando no sistema</a>"
+msgstr "<a href=\"/doc/user/login\">Entrar no sistema</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/community/editing-header-footer.en.xhtml:63
@@ -1909,14 +1908,14 @@ msgstr &quot;&lt;a href=\&quot;/doc/user/login\&quot;&gt;Entrando no sistema&lt;/a&gt;&quot;
 #: doc/noosfero/enterprise/editing-header-footer.en.xhtml:63
 #: doc/noosfero/enterprise/editing-appearance.en.xhtml:38
 msgid "<a href=\"/doc/user/logout\">Logout of the system</a>"
-msgstr "<a href=\"/doc/user/logout\">Saindo do sistema</a>"
+msgstr "<a href=\"/doc/user/logout\">Sair do sistema</a>"
 # type: Content of: <h1>
 #: doc/noosfero/community/editing-appearance.en.xhtml:1
 #: doc/noosfero/user/editing-appearance.en.xhtml:1
 #: doc/noosfero/enterprise/editing-appearance.en.xhtml:1
 msgid "Editing appearance"
-msgstr "Editando aparência"
+msgstr "Editar aparência"
 # type: Content of: <p>
 #: doc/noosfero/community/editing-appearance.en.xhtml:3
@@ -1997,7 +1996,7 @@ msgstr &quot;Editar aparência&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/community/editing-appearance.en.xhtml:39
 #: doc/noosfero/community/editing-sideboxes.en.xhtml:71
-#: doc/noosfero/community/toc.en.xhtml:3
+#: doc/noosfero/community/toc.en.xhtml:10
 msgid ""
 "<a href=\"/doc/community/editing-header-footer\">Editing header and footer</"
 "a>"
@@ -2013,7 +2012,7 @@ msgstr &quot;Funcionalidades da comunidade&quot;
 # type: Content of: <h1>
 #: doc/noosfero/community/creating-community.en.xhtml:1
 msgid "Creating a community"
-msgstr "Criando uma comunidade"
+msgstr "Criar uma comunidade"
 # type: Content of: <p>
 #: doc/noosfero/community/creating-community.en.xhtml:3
@@ -2117,7 +2116,7 @@ msgstr &quot;&quot;
 #: doc/noosfero/community/invite-contacts.en.xhtml:1
 #: doc/noosfero/user/invite-contacts.en.xhtml:1
 msgid "Inviting contacts from e-mail"
-msgstr "Convidando contatos por e-mail"
+msgstr "Convidar contatos por e-mail"
 # type: Content of: <p>
 #: doc/noosfero/community/invite-contacts.en.xhtml:3
@@ -2293,31 +2292,30 @@ msgstr &quot;Convite de importação para comunidade. Passo 2&quot;
 #: doc/noosfero/community/invite-contacts.en.xhtml:45
 #: doc/noosfero/community/moderating-articles.en.xhtml:41
 #: doc/noosfero/community/accepting-members.en.xhtml:32
-#: doc/noosfero/community/toc.en.xhtml:5
+#: doc/noosfero/community/toc.en.xhtml:4
 msgid "<a href=\"/doc/community/creating-community\">Creating a community</a>"
-msgstr ""
-"<a href=\"/doc/community/creating-community\">Criando uma comunidade</a>"
+msgstr "<a href=\"/doc/community/creating-community\">Criar uma comunidade</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/community/invite-contacts.en.xhtml:46
 #: doc/noosfero/community/moderating-articles.en.xhtml:42
 #: doc/noosfero/community/accepting-members.en.xhtml:33
-#: doc/noosfero/community/toc.en.xhtml:9
+#: doc/noosfero/community/toc.en.xhtml:3
 msgid "<a href=\"/doc/community/joining-community\">Joining a community</a>"
 msgstr ""
-"<a href=\"/doc/community/joining-community\">Entrando em uma comunidade</a>"
+"<a href=\"/doc/community/joining-community\">Entrar em uma comunidade</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/community/invite-contacts.en.xhtml:47
 msgid "<a href=\"/doc/community/accepting-members\">Accepting members</a>"
-msgstr "<a href=\"/doc/community/accepting-members\">Aceitando integrantes</a>"
+msgstr "<a href=\"/doc/community/accepting-members\">Aceitar integrantes</a>"
 # type: Content of: <h1>
 #: doc/noosfero/community/editing-sideboxes.en.xhtml:1
 #: doc/noosfero/user/editing-sideboxes.en.xhtml:1
 #: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:1
 msgid "Editing sideboxes"
-msgstr "Editando blocos laterais"
+msgstr "Editar blocos laterais"
 # type: Content of: <p>
 #: doc/noosfero/community/editing-sideboxes.en.xhtml:3
@@ -2735,14 +2733,14 @@ msgstr &quot;&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/community/editing-sideboxes.en.xhtml:72
-#: doc/noosfero/community/toc.en.xhtml:4
+#: doc/noosfero/community/toc.en.xhtml:8
 msgid "<a href=\"/doc/community/editing-appearance\">Editing appearance</a>"
-msgstr "<a href=\"/doc/community/editing-appearance\">Editando aparência</a>"
+msgstr "<a href=\"/doc/community/editing-appearance\">Editar aparência</a>"
 # type: Content of: <h1>
 #: doc/noosfero/community/moderating-articles.en.xhtml:1
 msgid "Moderating articles"
-msgstr "Moderando artigos"
+msgstr "Moderar artigos"
 # type: Content of: <ol><li>
 #: doc/noosfero/community/moderating-articles.en.xhtml:3
@@ -2848,7 +2846,7 @@ msgstr &quot;&quot;
 # type: Content of: <h1>
 #: doc/noosfero/community/joining-community.en.xhtml:1
 msgid "Joining a community"
-msgstr "Entrando em uma comunidade"
+msgstr "Entrar em uma comunidade"
 # type: Content of: <p>
 #: doc/noosfero/community/joining-community.en.xhtml:3
@@ -2893,7 +2891,7 @@ msgid &quot;&quot;
 "navigation/searching-communities\">Finding communities</a>."
 msgstr ""
 "Para aprender a encontrar comunidades no sistema, acesse: <a href=\"/doc/"
-"navigation/searching-communities\">Encontrando comunidades</a>."
+"navigation/searching-communities\">Encontrar comunidades</a>."
 # type: Content of: <ol><li>
 #: doc/noosfero/community/joining-community.en.xhtml:20
@@ -2937,16 +2935,16 @@ msgstr &quot;&quot;
 #: doc/noosfero/navigation/searching-products-services.en.xhtml:37
 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:37
 #: doc/noosfero/navigation/advanced-search.en.xhtml:35
-#: doc/noosfero/navigation/toc.en.xhtml:7
+#: doc/noosfero/navigation/toc.en.xhtml:3
 msgid ""
 "<a href=\"/doc/navigation/searching-communities\">Finding communities</a>"
 msgstr ""
-"<a href=\"/doc/navigation/searching-communities\">Encontrando comunidades</a>"
+"<a href=\"/doc/navigation/searching-communities\">Encontrar comunidades</a>"
 # type: Content of: <h1>
 #: doc/noosfero/community/accepting-members.en.xhtml:1
 msgid "Accepting new members"
-msgstr "Aceitando novos integrantes"
+msgstr "Aceitar novos integrantes"
 # type: Content of: <ol><li>
 #: doc/noosfero/community/accepting-members.en.xhtml:3
@@ -2971,7 +2969,7 @@ msgstr &quot;&quot;
 # type: Content of: <h1>
 #: doc/noosfero/user/logout.en.xhtml:1
 msgid "Leaving the system"
-msgstr "Saindo do sistema"
+msgstr "Sair do sistema"
 # type: Content of: <p>
 #: doc/noosfero/user/logout.en.xhtml:3
@@ -3038,7 +3036,7 @@ msgstr &quot;&quot;
 # type: Content of: <h1>
 #: doc/noosfero/user/removing-friends.en.xhtml:1
 msgid "Removing friends"
-msgstr "Removendo amigos"
+msgstr "Remover amigos"
 # type: Content of: <p>
 #: doc/noosfero/user/removing-friends.en.xhtml:3
@@ -3106,9 +3104,9 @@ msgstr &quot;&quot;
 #: doc/noosfero/user/sending-messages.en.xhtml:30
 #: doc/noosfero/user/accepting-friends.en.xhtml:30
 #: doc/noosfero/user/registering-new-user.en.xhtml:33
-#: doc/noosfero/user/toc.en.xhtml:15
+#: doc/noosfero/user/toc.en.xhtml:8
 msgid "<a href=\"/doc/user/adding-friends\">Adding friends</a>"
-msgstr "<a href=\"/doc/user/adding-friends\">Adicionando amigos</a>"
+msgstr "<a href=\"/doc/user/adding-friends\">Adicionar amigos</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/user/removing-friends.en.xhtml:33
@@ -3116,14 +3114,14 @@ msgstr &quot;&lt;a href=\&quot;/doc/user/adding-friends\&quot;&gt;Adicionando amigos&lt;/a&gt;&quot;
 #: doc/noosfero/user/invite-contacts.en.xhtml:43
 #: doc/noosfero/user/adding-friends.en.xhtml:26
 #: doc/noosfero/user/registering-new-user.en.xhtml:35
-#: doc/noosfero/user/toc.en.xhtml:10
+#: doc/noosfero/user/toc.en.xhtml:9
 msgid "<a href=\"/doc/user/accepting-friends\">Accepting friends</a>"
-msgstr "<a href=\"/doc/user/accepting-friends\">Aceitando amigos</a>"
+msgstr "<a href=\"/doc/user/accepting-friends\">Aceitar amigos</a>"
 # type: Content of: <h1>
 #: doc/noosfero/user/sending-messages.en.xhtml:1
 msgid "Sending messages"
-msgstr "Enviando mensagens"
+msgstr "Enviar mensagens"
 # type: Content of: <p>
 #: doc/noosfero/user/sending-messages.en.xhtml:3
@@ -3192,7 +3190,7 @@ msgstr &quot;Enviar mensagem&quot;
 #: doc/noosfero/navigation/searching-communities.en.xhtml:32
 #: doc/noosfero/navigation/toc.en.xhtml:4
 msgid "<a href=\"/doc/navigation/searching-people\">Finding people</a>"
-msgstr "<a href=\"/doc/navigation/searching-people\">Encontrando pessoas</a>"
+msgstr "<a href=\"/doc/navigation/searching-people\">Encontrar pessoas</a>"
 # type: Content of: <p>
 #: doc/noosfero/user/editing-header-footer.en.xhtml:3
@@ -3264,8 +3262,7 @@ msgstr &quot;Confirmação de remover comentário&quot;
 #: doc/noosfero/user/removing-comments.en.xhtml:26
 msgid ""
 "<a href=\"/doc/user/commenting\">Commenting articles, pictures and events</a>"
-msgstr ""
-"<a href=\"/doc/user/commenting\">Comentando artigos, fotos e eventos</a>"
+msgstr "<a href=\"/doc/user/commenting\">Comentar artigos, fotos e eventos</a>"
 # type: Content of: <p>
 #: doc/noosfero/user/editing-appearance.en.xhtml:3
@@ -3275,11 +3272,11 @@ msgstr &quot;&lt;em&gt;Você pode personalizar sua página, alterando o modelo dela.&lt;/em&gt;&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/user/editing-appearance.en.xhtml:37
 #: doc/noosfero/user/editing-sideboxes.en.xhtml:72
-#: doc/noosfero/user/toc.en.xhtml:7
+#: doc/noosfero/user/toc.en.xhtml:17
 msgid ""
 "<a href=\"/doc/user/editing-header-footer\">Editing header and footer</a>"
 msgstr ""
-"<a href=\"/doc/user/editing-header-footer\">Editando cabeçalho e rodapé</a>"
+"<a href=\"/doc/user/editing-header-footer\">Editar cabeçalho e rodapé</a>"
 # type: Content of: <h1>
 #: doc/noosfero/user/index.en.xhtml:1
@@ -3289,7 +3286,7 @@ msgstr &quot;Funcionalidades de Usuário&quot;
 # type: Content of: <h1>
 #: doc/noosfero/user/accepting-friends.en.xhtml:1
 msgid "Accepting friends"
-msgstr "Aceitando amigos"
+msgstr "Aceitar amigos"
 # type: Content of: <p>
 #: doc/noosfero/user/accepting-friends.en.xhtml:3
@@ -3348,9 +3345,9 @@ msgstr &quot;Tópicos Relacionados&quot;
 #: doc/noosfero/user/invite-contacts.en.xhtml:44
 #: doc/noosfero/user/adding-friends.en.xhtml:25
 #: doc/noosfero/user/registering-new-user.en.xhtml:34
-#: doc/noosfero/user/toc.en.xhtml:5
+#: doc/noosfero/user/toc.en.xhtml:15
 msgid "<a href=\"/doc/user/removing-friends\">Removing friends</a>"
-msgstr "<a href=\"/doc/user/removing-friends\">Removendo amigos</a>"
+msgstr "<a href=\"/doc/user/removing-friends\">Remover amigos</a>"
 # type: Content of: <p>
 #: doc/noosfero/user/invite-contacts.en.xhtml:3
@@ -3571,14 +3568,14 @@ msgstr &quot;Bloco de empreendimentos&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/user/editing-sideboxes.en.xhtml:73
-#: doc/noosfero/user/toc.en.xhtml:9
+#: doc/noosfero/user/toc.en.xhtml:16
 msgid "<a href=\"/doc/user/editing-appearance\">Editing appearance</a>"
-msgstr "<a href=\"/doc/user/editing-appearance\">Editando aparência</a>"
+msgstr "<a href=\"/doc/user/editing-appearance\">Editar aparência</a>"
 # type: Content of: <h1>
 #: doc/noosfero/user/editing-person-info.en.xhtml:1
 msgid "Editing user settings"
-msgstr "Alterando informações/configurações de um usuário"
+msgstr "Alterar informações/configurações de um usuário"
 # type: Content of: <p>
 #: doc/noosfero/user/editing-person-info.en.xhtml:3
@@ -3680,7 +3677,7 @@ msgstr &quot;&quot;
 # type: Content of: <h1>
 #: doc/noosfero/user/commenting.en.xhtml:1
 msgid "Commenting articles"
-msgstr "Comentando artigos"
+msgstr "Comentar artigos"
 # type: Content of: <p>
 #: doc/noosfero/user/commenting.en.xhtml:3
@@ -3760,7 +3757,7 @@ msgstr &quot;Comentário de uma pessoa logada&quot;
 # type: Content of: <h1>
 #: doc/noosfero/user/adding-friends.en.xhtml:1
 msgid "Adding friends"
-msgstr "Adicionando amigos"
+msgstr "Adicionar amigos"
 # type: Content of: <p>
 #: doc/noosfero/user/adding-friends.en.xhtml:3
@@ -3812,7 +3809,7 @@ msgstr &quot;Confirmação quando está adicionando um amigo&quot;
 # type: Content of: <h1>
 #: doc/noosfero/user/registering-new-user.en.xhtml:1
 msgid "Registering a new user"
-msgstr "Cadastrando no sistema"
+msgstr "Cadastrar um novo usuário"
 # type: Content of: <p>
 #: doc/noosfero/user/registering-new-user.en.xhtml:3
@@ -3888,7 +3885,7 @@ msgstr &quot;Formulário de registro&quot;
 # type: Content of: <h1>
 #: doc/noosfero/user/login.en.xhtml:1
 msgid "Login into the system"
-msgstr "Logar"
+msgstr "Logar no sistema"
 # type: Content of: <p>
 #: doc/noosfero/user/login.en.xhtml:3
@@ -3925,12 +3922,12 @@ msgstr &quot;&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/user/login.en.xhtml:25
 msgid "<a href=\"/doc/user/registering-new-user\">Registering new user</a>"
-msgstr "<a href=\"/doc/user/registering-new-user\">Cadastro no Cirandas</a>"
+msgstr "<a href=\"/doc/user/registering-new-user\">Cadastrar novo usuário</a>"
 # type: Content of: <h1>
 #: doc/noosfero/enterprise/disabling-enterprise.en.xhtml:1
 msgid "Disabling an enterprise"
-msgstr "Desabilitando um empreendimento"
+msgstr "Desabilitar um empreendimento"
 # type: Content of: <p>
 #: doc/noosfero/enterprise/disabling-enterprise.en.xhtml:3
@@ -3991,7 +3988,7 @@ msgstr &quot;Confirmação da desabilitação do empreendimento&quot;
 msgid ""
 "<a href=\"/doc/enterprise/activating-enterprise\">Activating enterprise</a>"
 msgstr ""
-"<a href=\"/doc/enterprise/activating-enterprise\">Ativando empreendimento</a>"
+"<a href=\"/doc/enterprise/activating-enterprise\">Ativar empreendimento</a>"
 # type: Content of: <p>
 #: doc/noosfero/enterprise/editing-header-footer.en.xhtml:3
@@ -4019,13 +4016,13 @@ msgstr &quot;&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/enterprise/editing-appearance.en.xhtml:39
 #: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:73
-#: doc/noosfero/enterprise/toc.en.xhtml:4
+#: doc/noosfero/enterprise/toc.en.xhtml:8
 msgid ""
 "<a href=\"/doc/enterprise/editing-header-footer\">Editing header and footer</"
 "a>"
 msgstr ""
-"<a href=\"/doc/enterprise/editing-header-footer\">Editando cabeçalho e "
-"rodapé</a>"
+"<a href=\"/doc/enterprise/editing-header-footer\">Editar cabeçalho e rodapé</"
+"a>"
 # type: Content of: <h1>
 #: doc/noosfero/enterprise/index.en.xhtml:1
@@ -4207,14 +4204,14 @@ msgstr &quot;Bloco de empreendimentos desabilitados&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:74
-#: doc/noosfero/enterprise/toc.en.xhtml:5
+#: doc/noosfero/enterprise/toc.en.xhtml:7
 msgid "<a href=\"/doc/enterprise/editing-appearance\">Editing appearance</a>"
-msgstr "<a href=\"/doc/enterprise/editing-appearance\">Editando aparência</a>"
+msgstr "<a href=\"/doc/enterprise/editing-appearance\">Editar aparência</a>"
 # type: Content of: <h1>
 #: doc/noosfero/enterprise/activating-enterprise.en.xhtml:1
 msgid "Activating your enterprise"
-msgstr "Ativando seu empreendimento"
+msgstr "Ativar seu empreendimento"
 # type: Content of: <p>
 #: doc/noosfero/enterprise/activating-enterprise.en.xhtml:3
@@ -4309,25 +4306,25 @@ msgstr &quot;Conclusão da ativação de empreendimento&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/enterprise/activating-enterprise.en.xhtml:34
 #: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:41
-#: doc/noosfero/enterprise/toc.en.xhtml:9
+#: doc/noosfero/enterprise/toc.en.xhtml:5
 msgid ""
 "<a href=\"/doc/enterprise/editing-enterprise-info\">Editing enterprise "
 "settings</a>"
 msgstr ""
-"<a href=\"/doc/enterprise/editing-enterprise-info\">Editando informações/"
+"<a href=\"/doc/enterprise/editing-enterprise-info\">Editar informações/"
 "configurações do empreendimento</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/enterprise/activating-enterprise.en.xhtml:35
-#: doc/noosfero/user/toc.en.xhtml:16
+#: doc/noosfero/user/toc.en.xhtml:3
 msgid "<a href=\"/doc/user/registering-new-user\">Registering a new user</a>"
 msgstr ""
-"<a href=\"/doc/user/registering-new-user\">Registrando um novo usuário</a>"
+"<a href=\"/doc/user/registering-new-user\">Cadastrar um novo usuário</a>"
 # type: Content of: <h1>
 #: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:1
 msgid "Managing and adding members to an enterprise"
-msgstr "Gerenciando e adicionando integrantes em um empreendimento"
+msgstr "Gerenciar e adicionar integrantes em um empreendimento"
 # type: Content of: <p>
 #: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:3
@@ -4442,18 +4439,18 @@ msgstr &quot;Adicionar membro em gerenciar membro&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:42
-#: doc/noosfero/enterprise/toc.en.xhtml:7
+#: doc/noosfero/enterprise/toc.en.xhtml:3
 msgid ""
 "<a href=\"/doc/enterprise/activating-enterprise\">Activating your "
 "enterprise</a>"
 msgstr ""
-"<a href=\"/doc/enterprise/activating-enterprise\">Ativando seu "
-"empreendimento</a>"
+"<a href=\"/doc/enterprise/activating-enterprise\">Ativar seu empreendimento</"
+"a>"
 # type: Content of: <h1>
 #: doc/noosfero/enterprise/editing-enterprise-info.en.xhtml:1
 msgid "Editing enterprise settings"
-msgstr "Editando configurações do empreendimento"
+msgstr "Editar configurações do empreendimento"
 # type: Content of: <p>
 #: doc/noosfero/enterprise/editing-enterprise-info.en.xhtml:3
@@ -4582,7 +4579,7 @@ msgstr &quot;&quot;
 # type: Content of: <h1>
 #: doc/noosfero/navigation/searching.en.xhtml:1
 msgid "Searching on the system"
-msgstr "Buscando na rede"
+msgstr "Buscar na rede"
 # type: Content of: <p>
 #: doc/noosfero/navigation/searching.en.xhtml:3
@@ -4649,12 +4646,12 @@ msgstr &quot;Ver todos os resultados da busca com exemplo&quot;
 #: doc/noosfero/navigation/searching-products-services.en.xhtml:38
 #: doc/noosfero/navigation/searching-communities.en.xhtml:33
 #: doc/noosfero/navigation/advanced-search.en.xhtml:36
-#: doc/noosfero/navigation/toc.en.xhtml:6
+#: doc/noosfero/navigation/toc.en.xhtml:8
 msgid ""
 "<a href=\"/doc/navigation/searching-enterprises\">Finding enterprises</a>"
 msgstr ""
-"<a href=\"/doc/navigation/searching-enterprises\">Encontrando "
-"empreendimentos</a>"
+"<a href=\"/doc/navigation/searching-enterprises\">Encontrar empreendimentos</"
+"a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/navigation/searching.en.xhtml:30
@@ -4662,13 +4659,13 @@ msgstr &quot;&quot;
 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:38
 #: doc/noosfero/navigation/searching-communities.en.xhtml:34
 #: doc/noosfero/navigation/advanced-search.en.xhtml:37
-#: doc/noosfero/navigation/toc.en.xhtml:5
+#: doc/noosfero/navigation/toc.en.xhtml:7
 msgid ""
 "<a href=\"/doc/navigation/searching-products-services\">Finding products and "
 "services</a>"
 msgstr ""
-"<a href=\"/doc/navigation/searching-products-services\">Encontrando produtos "
-"e serviços</a>"
+"<a href=\"/doc/navigation/searching-products-services\">Encontrar produtos e "
+"serviços</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/navigation/searching.en.xhtml:31
@@ -4676,14 +4673,14 @@ msgstr &quot;&quot;
 #: doc/noosfero/navigation/searching-products-services.en.xhtml:39
 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:39
 #: doc/noosfero/navigation/searching-communities.en.xhtml:35
-#: doc/noosfero/navigation/toc.en.xhtml:8
+#: doc/noosfero/navigation/toc.en.xhtml:5
 msgid "<a href=\"/doc/navigation/advanced-search\">Advanced search</a>"
 msgstr "<a href=\"/doc/navigation/advanced-search\">Busca avançada</a>"
 # type: Content of: <h1>
 #: doc/noosfero/navigation/searching-people.en.xhtml:1
 msgid "Finding people"
-msgstr "Encontrando pessoas"
+msgstr "Encontrar pessoas"
 # type: Content of: <p>
 #: doc/noosfero/navigation/searching-people.en.xhtml:3
@@ -4779,7 +4776,7 @@ msgstr &quot;&quot;
 #: doc/noosfero/navigation/searching-communities.en.xhtml:31
 #: doc/noosfero/navigation/advanced-search.en.xhtml:33
 msgid "<a href=\"/doc/navigation/searching\">Searching</a>"
-msgstr "<a href=\"/doc/navigation/searching\">Fazendo busca</a>"
+msgstr "<a href=\"/doc/navigation/searching\">Busca</a>"
 # type: Content of: <h1>
 #: doc/noosfero/navigation/index.en.xhtml:1
@@ -4789,7 +4786,7 @@ msgstr &quot;Navegação&quot;
 # type: Content of: <h1>
 #: doc/noosfero/navigation/searching-products-services.en.xhtml:1
 msgid "Finding products and services"
-msgstr "Encontrando produtos e serviços"
+msgstr "Encontrar produtos e serviços"
 # type: Content of: <p>
 #: doc/noosfero/navigation/searching-products-services.en.xhtml:3
@@ -4853,7 +4850,7 @@ msgstr &quot;&quot;
 # type: Content of: <h1>
 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:1
 msgid "Finding enterprises"
-msgstr "Encontrando empreendimentos"
+msgstr "Encontrar empreendimentos"
 # type: Content of: <p>
 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:3
@@ -4898,7 +4895,7 @@ msgstr &quot;&quot;
 # type: Content of: <h1>
 #: doc/noosfero/navigation/searching-communities.en.xhtml:1
 msgid "Finding communities"
-msgstr "Encontrando comunidades"
+msgstr "Encontrar comunidades"
 # type: Content of: <p>
 #: doc/noosfero/navigation/searching-communities.en.xhtml:3
@@ -5033,118 +5030,116 @@ msgstr &quot;Resultado da busca avançada com exemplo&quot;
 # type: Content of: <ul><li>
 #: doc/noosfero/navigation/advanced-search.en.xhtml:34
 msgid "<a href=\"/doc/navigation/searching-people\">Findind people</a>"
-msgstr "<a href=\"/doc/navigation/searching-people\";>Encontrando pessoas</a>"
+msgstr "<a href=\"/doc/navigation/searching-people\">Encontrarpessoas</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/cms/toc.en.xhtml:4
 msgid ""
 "<a href=\"/doc/cms/adding-images-to-gallery\">Adding pictures to gallery</a>"
 msgstr ""
-"<a href=\"/doc/cms/adding-images-to-gallery\">Adicionando imagens à galeria</"
-"a>"
+"<a href=\"/doc/cms/adding-images-to-gallery\">Adicionar imagens à galeria</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/cms/toc.en.xhtml:5
+#: doc/noosfero/cms/toc.en.xhtml:7
 msgid ""
 "<a href=\"/doc/cms/writing-advanced-article\">Writing an advanced article "
 "(inserting images, links, videos and audio)</a>"
 msgstr ""
-"<a href=\"/doc/cms/writing-advanced-article\">Escrevendo um artigo avançado"
+"<a href=\"/doc/cms/writing-advanced-article\">Escrever um artigo avançado"
 "(inserindo imagens, links, vídeos e áudio)</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/community/toc.en.xhtml:6
+#: doc/noosfero/community/toc.en.xhtml:5
 msgid ""
 "<a href=\"/doc/community/invite-contacts\">Inviting contacts from e-mail</a>"
 msgstr ""
-"<a href=\"/doc/community/invite-contacts\">Convidando contatos por e-mail</a>"
+"<a href=\"/doc/community/invite-contacts\">Convidar contatos por e-mail</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/community/toc.en.xhtml:7
-msgid "<a href=\"/doc/community/editing-sideboxes\">Editing sideboxes</a>"
+#: doc/noosfero/community/toc.en.xhtml:6
+msgid "<a href=\"/doc/community/accepting-members\">Accepting new members</a>"
 msgstr ""
-"<a href=\"/doc/community/editing-sideboxes\">Editando blocos laterais</a>"
+"<a href=\"/doc/community/accepting-members\">Aceitar novos integrantes</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/community/toc.en.xhtml:8
+#: doc/noosfero/community/toc.en.xhtml:7
 msgid "<a href=\"/doc/community/moderating-articles\">Moderating articles</a>"
-msgstr "<a href=\"/doc/community/moderating-articles\">Moderando artigos</a>"
+msgstr "<a href=\"/doc/community/moderating-articles\">Moderar artigos</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/community/toc.en.xhtml:10
-msgid "<a href=\"/doc/community/accepting-members\">Accepting new members</a>"
-msgstr ""
-"<a href=\"/doc/community/accepting-members\">Aceitando novos integrantes</a>"
+#: doc/noosfero/community/toc.en.xhtml:9
+msgid "<a href=\"/doc/community/editing-sideboxes\">Editing sideboxes</a>"
+msgstr "<a href=\"/doc/community/editing-sideboxes\">Editar blocos laterais</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/user/toc.en.xhtml:3
-msgid "<a href=\"/doc/user/logout\">Leaving the system</a>"
-msgstr "<a href=\"/doc/user/logout\">Saindo do Sistema</a>"
+#: doc/noosfero/user/toc.en.xhtml:5
+msgid "<a href=\"/doc/user/editing-person-info\">Editing user settings</a>"
+msgstr ""
+"<a href=\"/doc/user/editing-person-info\">Editar informações/configurações "
+"do usuário</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/user/toc.en.xhtml:4
-msgid "<a href=\"/doc/user/changing-password\">Changing password</a>"
-msgstr "<a href=\"/doc/user/changing-password\">Alterando a senha</a>"
+#: doc/noosfero/user/toc.en.xhtml:6
+msgid "<a href=\"/doc/user/logout\">Leaving the system</a>"
+msgstr "<a href=\"/doc/user/logout\">Sair do Sistema</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/user/toc.en.xhtml:6
-msgid "<a href=\"/doc/user/sending-messages\">Sending messages</a>"
-msgstr "<a href=\"/doc/user/sending-messages\">Enviando mensagens</a>"
+#: doc/noosfero/user/toc.en.xhtml:7
+msgid "<a href=\"/doc/user/invite-contacts\">Inviting contacts from e-mail</a>"
+msgstr "<a href=\"/doc/user/invite-contacts\">Convidar contatos por e-mail</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/user/toc.en.xhtml:8
-msgid "<a href=\"/doc/user/removing-comments\">Removing comments</a>"
-msgstr "<a href=\"/doc/user/removing-comments\">Removendo comentários</a>"
+#: doc/noosfero/user/toc.en.xhtml:10
+msgid "<a href=\"/doc/user/commenting\">Commenting articles</a>"
+msgstr "<a href=\"/doc/user/commenting\">Comentar artigos</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/user/toc.en.xhtml:11
-msgid "<a href=\"/doc/user/invite-contacts\">Inviting contacts from e-mail</a>"
-msgstr ""
-"<a href=\"/doc/user/invite-contacts\">Convidando contatos por e-mail</a>"
+msgid "<a href=\"/doc/user/removing-comments\">Removing comments</a>"
+msgstr "<a href=\"/doc/user/removing-comments\">Remover comentários</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/user/toc.en.xhtml:12
-msgid "<a href=\"/doc/user/editing-sideboxes\">Editing sideboxes</a>"
-msgstr "<a href=\"/doc/user/editing-sideboxes\">Editando blocos laterais</a>"
+msgid "<a href=\"/doc/user/sending-messages\">Sending messages</a>"
+msgstr "<a href=\"/doc/user/sending-messages\">Enviar mensagens</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/user/toc.en.xhtml:13
-msgid "<a href=\"/doc/user/editing-person-info\">Editing user settings</a>"
-msgstr ""
-"<a href=\"/doc/user/editing-person-info\">Editando informações/configurações "
-"do usuário</a>"
+msgid "<a href=\"/doc/user/editing-sideboxes\">Editing sideboxes</a>"
+msgstr "<a href=\"/doc/user/editing-sideboxes\">Editar blocos laterais</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/user/toc.en.xhtml:14
-msgid "<a href=\"/doc/user/commenting\">Commenting articles</a>"
-msgstr "<a href=\"/doc/user/commenting\">Comentando artigos</a>"
+msgid "<a href=\"/doc/user/changing-password\">Changing password</a>"
+msgstr "<a href=\"/doc/user/changing-password\">Alterar senha</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/enterprise/toc.en.xhtml:3
+#: doc/noosfero/enterprise/toc.en.xhtml:4
 msgid ""
-"<a href=\"/doc/enterprise/disabling-enterprise\">Disabling an enterprise</a>"
+"<a href=\"/doc/enterprise/managing-enterprise-members\">Managing and adding "
+"members to an enterprise</a>"
 msgstr ""
-"<a href=\"/doc/enterprise/disabling-enterprise\">Desabilitando um "
-"empreendimento</a>"
+"<a href=\"/doc/enterprise/managing-enterprise-members\">Gerenciar e "
+"adicionar integrantes em um empreendimento</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/enterprise/toc.en.xhtml:6
 msgid "<a href=\"/doc/enterprise/editing-sideboxes\">Editing sideboxes</a>"
-msgstr "<a href=\"/doc/enterprise/editing-sideboxes\">Editando blocos laterais</a>"
+msgstr ""
+"<a href=\"/doc/enterprise/editing-sideboxes\">Editar blocos laterais</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/enterprise/toc.en.xhtml:8
+#: doc/noosfero/enterprise/toc.en.xhtml:9
 msgid ""
-"<a href=\"/doc/enterprise/managing-enterprise-members\">Managing and adding "
-"members to an enterprise</a>"
+"<a href=\"/doc/enterprise/disabling-enterprise\">Disabling an enterprise</a>"
 msgstr ""
-"<a href=\"/doc/enterprise/managing-enterprise-members\">Gerenciando e "
-"adicionando integrantes em um empreendimento</a>"
+"<a href=\"/doc/enterprise/disabling-enterprise\">Desabilitar um "
+"empreendimento</a>"
 # type: Content of: <ul><li>
-#: doc/noosfero/navigation/toc.en.xhtml:3
+#: doc/noosfero/navigation/toc.en.xhtml:6
 msgid "<a href=\"/doc/navigation/searching\">Searching on the system</a>"
-msgstr "<a href=\"/doc/navigation/searching\">Fazendo buscas no sistema</a>"
+msgstr "<a href=\"/doc/navigation/searching\">Buscar no sistema</a>"
 # type: Content of: <ul><li>
 #: doc/noosfero/toc.en.xhtml:3
@@ -5172,20 +5167,9 @@ msgid &quot;&lt;a href=\&quot;/doc/navigation\&quot;&gt;Navigation&lt;/a&gt;&quot;
 msgstr "<a href=\"/doc/navigation\">Navegação</a>"
 # type: Content of: <ul><li>
-#, fuzzy
-#~ msgid "<a href=\"/doc/enterprise/editing-sideboxes\"></a>"
-#~ msgstr ""
-#~ "<a href=\"/doc/enterprise/editing-sideboxes\">Editando blocos laterais</a>"
-
-# type: Content of: <ul><li>
 #~ msgid "<a href=\"/doc/admin\">Administration</a>"
 #~ msgstr "<a href=\"/doc/admin\">Administração</a>"
-# type: Content of: <ul><li>
-#~ msgid "<a href=\"/doc/user/joining-community\">Joining a community</a>"
-#~ msgstr ""
-#~ "<a href=\"/doc/user/joining-community\">Entrando em uma comunidade</a>"
-
 # type: Content of: <h1>
 #~ msgid "Administration"
 #~ msgstr "Administração"
@@ -773,7 +773,7 @@ X.sep {
   width: 48%;
 }
-.controller-search #content .no-boxes h1 {
+#content .no-boxes h1 {
   font-variant: small-caps;
   color: #555753;
   font-size: 18px;
@@ -454,8 +454,6 @@ div.pending-tasks {
 #content #not-found,
 #content #access-denied {
   -moz-border-radius: 6px;
-  margin-left: 20%;
-  margin-right: 20%;
 }
 #content #not-found p,
@@ -1172,6 +1170,10 @@ a.comment-picture {
   display: inline;
 }
+#content #article .article-body img {
+  max-width: 100%;
+}
+
 /* NOT PUBLISHED BLOG POSTS */
 .blog-post.not-published {
@@ -1403,6 +1405,10 @@ input.disabled {
   border: none;
 }
+.block-title.empty {
+  display: none;
+}
+
 .invisible-block {
   background: url(/images/hachure.png);
   opacity: 0.25;
@@ -2998,12 +3004,8 @@ h1#agenda-title {
   display: inline;
 }
-.controller-profile .no-boxes {
-  margin: 0px 260px 0px 260px;
-}
-
-.controller-profile #content .no-boxes h1 {
-  margin: 1px 0px 1px 160px;
+.no-boxes {
+  margin: 0px 200px 0px 200px;
 }
 .controller-profile #content .no-boxes h1,
@@ -57,3 +57,7 @@ Modified : February 1, 2006
 	width:100%;
 	height:100%;
 }
+
+#lightbox select {
+  max-width: 100%;
+}
 #!/bin/sh
-export CUCUMBER_FORMAT=progress
 cp config/database.yml.sqlite3 config/database.yml && /usr/bin/rake db:schema:load && /usr/bin/rake
@@ -8,12 +8,11 @@ class ArticleBlockTest &lt; Test::Unit::TestCase
   should "take article's content" do
     block = ArticleBlock.new
-    html = mock
     article = mock
-    article.expects(:to_html).returns(html)
+    article.expects(:to_html).returns("Article content")
     block.stubs(:article).returns(article)
-    assert_same html, block.content
+    assert_match(/Article content/, block.content)
   end
   should 'refer to an article' do
@@ -52,6 +51,7 @@ class ArticleBlockTest &lt; Test::Unit::TestCase
     assert_nil block.article_id
   end
+<<<<<<< HEAD
   should "take available articles with a person as the box owner" do
     person = create_user('testuser').person
     person.articles.delete_all
@@ -81,4 +81,24 @@ class ArticleBlockTest &lt; Test::Unit::TestCase
     assert_equal [a],block.available_articles
   end
+  should "display empty title if title is blank" do
+    block = ArticleBlock.new
+    article = mock
+    article.expects(:to_html).returns("Article content")
+    block.expects(:title).returns('')
+    block.stubs(:article).returns(article)
+
+    assert_equal "<h3 class=\"block-title empty\"></h3>Article content", block.content
+  end
+
+  should "display title if defined" do
+    block = ArticleBlock.new
+    article = mock
+    article.expects(:to_html).returns("Article content")
+    block.expects(:title).returns('Article title')
+    block.stubs(:article).returns(article)
+
+    assert_equal "<h3 class=\"block-title\">Article title</h3>Article content", block.content
+  end
+
 end
@@ -17,6 +17,7 @@ class BlogHelperTest &lt; Test::Unit::TestCase
   attr :blog
   def _(s); s; end
+  def h(s); s; end
   should 'list published posts with class blog-post' do
     blog.children << published_post = TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => true)
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 class DocTopicTest < ActiveSupport::TestCase
   should 'be a DocItem' do
@@ -25,4 +25,12 @@ class DocTopicTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'read order from HTML' do
+    assert_equal 1, DocTopic.order('<h1 class="order-1">Some topic</h1>')
+  end
+
+  should 'use 0 as order by default' do
+    assert_equal 0, DocTopic.order('<h1>Some topic</h1>')
+  end
+
 end
	@@ -9,7 +9,8 @@ class ArticleBlock < Block		@@ -9,7 +9,8 @@ class ArticleBlock < Block
9	end	9	end
10		10
11	def content	11	def content
12	- article ? article.to_html : _('Article not selected yet.')	12	+ block_title(title) +
		13	+ (article ? article.to_html : _('Article not selected yet.'))
13	end	14	end
14		15
15	def article_id	16	def article_id
1	class DocItem	1	class DocItem
2	class NotFound < Exception; end	2	class NotFound < Exception; end
3	- attr_accessor :id, :title, :text, :language	3	+ attr_accessor :id, :title, :text, :language, :order
4	def initialize(attrs = {})	4	def initialize(attrs = {})
5	attrs.each do \|name,value\|	5	attrs.each do \|name,value\|
6	self.send("#{name}=", value)	6	self.send("#{name}=", value)
	@@ -1,6 +0,0 @@	@@ -1,6 +0,0 @@
1	-<html>
2	- <!-- FIXME: should use a proper layout for this kind of message -->
3	- <body>
4	- <%= _("This profile is not public.") %>
5	- </body>
6	-</html>
1	-h1. Adding pictures to gallery	1	+h1(order-310). Adding pictures to gallery
2		2
3	p. _You can publish pictures on your image gallery_	3	p. _You can publish pictures on your image gallery_
4		4
1	-h1. Creating a blog	1	+h1(order-320). Creating a blog
2		2
3	p. _You can have a blog in your system._	3	p. _You can have a blog in your system._
4		4
1	-h1. Managing your content	1	+h1(order-350). Managing your content
2		2
3	p. _Folder is a structure used to organize files in a computer and can also be called a directory. It may contain other files and folders, which may also contain other directories_	3	p. _Folder is a structure used to organize files in a computer and can also be called a directory. It may contain other files and folders, which may also contain other directories_
4		4
1	-h1. Posting on blog	1	+h1(order-330). Posting on blog
2		2
3	p. _You can have a blog and publish posts on it._	3	p. _You can have a blog and publish posts on it._
4		4
1	-h1. Writing an advanced article (inserting images, links, videos and audio)	1	+h1(order-340). Writing an advanced article (inserting images, links, videos and audio)
2		2
3	p. _You can add images and links to the articles created on the system to make it more interesting._	3	p. _You can add images and links to the articles created on the system to make it more interesting._
4		4
1	-h1. Writing an article	1	+h1(order-300). Writing an article
2		2
3	p. _To publish your articles you can create an aticle, as explained below._	3	p. _To publish your articles you can create an aticle, as explained below._
4		4
1	-h1. Accepting new members	1	+h1(order-130). Accepting new members
2		2
3	p. _If a community is moderated, the administrator/moderator needs to approve the requests of new members._	3	p. _If a community is moderated, the administrator/moderator needs to approve the requests of new members._
4		4