Download as
Browse Code »

Commit 1091ed791e42b2f223d1bc116b90754bcfa639fb

Authored by Antonio Terceiro
2 parents 0cdd5cb4 7621915d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'stable' 

Conflicts:
	test/unit/article_block_test.rb
Showing 61 changed files with 317 additions and 296 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @1091ed7
... ... @@ -10,7 +10,7 @@ module BoxesHelper
10 10 else
11 11 content_tag('div',
12 12 content_tag('div',
13   - content_tag('div', content, :class => 'no-boxes-inner-2'),
  13 + content_tag('div', wrap_main_content(content), :class => 'no-boxes-inner-2'),
14 14 :class => 'no-boxes-inner-1'
15 15 ),
16 16 :class => 'no-boxes'
... ... @@ -115,11 +115,6 @@ module BoxesHelper
115 115 (1..8).to_a.reverse.inject(content) { |acc,n| content_tag('div', acc, :id => 'main-content-wrapper-' + n.to_s) }
116 116 end
117 117  
118   - def noosfero_wrap(&block)
119   - text = capture(&block)
120   - concat(wrap_main_content(text), block.binding)
121   - end
122   -
123 118 def extract_block_content(content)
124 119 case content
125 120 when Hash
... ...
app/models/article_block.rb
  Diff comments   View file @1091ed7
... ... @@ -9,7 +9,8 @@ class ArticleBlock < Block
9 9 end
10 10  
11 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 14 end
14 15  
15 16 def article_id
... ...
app/models/doc_item.rb
  Diff comments   View file @1091ed7
1 1 class DocItem
2 2 class NotFound < Exception; end
3   - attr_accessor :id, :title, :text, :language
  3 + attr_accessor :id, :title, :text, :language, :order
4 4 def initialize(attrs = {})
5 5 attrs.each do |name,value|
6 6 self.send("#{name}=", value)
... ...
app/models/doc_topic.rb
  Diff comments   View file @1091ed7
... ... @@ -4,15 +4,29 @@ class DocTopic &lt; DocItem
4 4 raise DocItem::NotFound
5 5 end
6 6 lines = File.readlines(file)
7   - title = _find_title(lines)
  7 + title_line = _find_title(lines)
8 8 File.basename(file) =~ /(.*)\.([^\.]+)\.xhtml$/
9 9 id = $1
10 10 language = $2
11   - new(:id => id, :title => title, :text => lines.join, :language => language)
  11 + new(:id => id, :title => title(title_line), :text => lines.join, :language => language, :order => order(title_line))
12 12 end
13 13  
14 14 def self._find_title(lines)
15   - lines.find {|line| line =~ /^<h1>(.*)<\/h1>/ }
  15 + lines.find {|line| line =~ /^(<h1.*>.*<\/h1>)/ }
16 16 $1
17 17 end
  18 +
  19 + def self.title(line)
  20 + line =~ /<h1.*>(.*)<\/h1>/
  21 + $1
  22 + end
  23 +
  24 + def self.order(line)
  25 + if line =~ /<h1 class="order-(.*)">.*<\/h1>/
  26 + $1.to_i
  27 + else
  28 + 0
  29 + end
  30 + end
  31 +
18 32 end
... ...
app/views/profile/private_profile.rhtml
View file @0cdd5cb
... ... @@ -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>
app/views/shared/access_denied.rhtml
  Diff comments   View file @1091ed7
1 1 <div id='access-denied'>
2 2  
3   - <% noosfero_wrap do %>
4 3 <h1> <%= @title || _('Access denied') %> </h1>
5 4  
6 5 <% unless @message.nil? %>
... ... @@ -15,6 +14,5 @@
15 14 <%= button :home, _('Go to the site home page'), :controller => 'home' %>
16 15 <% end %>
17 16  
18   - <% end %>
19 17  
20 18 </div>
... ...
app/views/shared/not_found.rhtml
  Diff comments   View file @1091ed7
1 1 <div id='not-found'>
2   - <% noosfero_wrap do %>
3 2 <h1><%= _('There is no such page: %s') % (content_tag('tt', @path)) %></h1>
4 3 <p>
5 4 <%= _('You may have clicked an expired link or mistyped the address.') %>
... ... @@ -9,5 +8,4 @@
9 8 <%= button :back, _('Go back'), :back %>
10 9 <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %>
11 10 <% end %>
12   - <% end %>
13 11 </div>
... ...
doc/noosfero/cms/adding-images-to-gallery.textile
  Diff comments   View file @1091ed7
1   -h1. Adding pictures to gallery
  1 +h1(order-310). Adding pictures to gallery
2 2  
3 3 p. _You can publish pictures on your image gallery_
4 4  
... ...
doc/noosfero/cms/creating-blog.textile
  Diff comments   View file @1091ed7
1   -h1. Creating a blog
  1 +h1(order-320). Creating a blog
2 2  
3 3 p. _You can have a blog in your system._
4 4  
... ...
doc/noosfero/cms/managing-content.textile
  Diff comments   View file @1091ed7
1   -h1. Managing your content
  1 +h1(order-350). Managing your content
2 2  
3 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  
... ...
doc/noosfero/cms/posting-on-blog.textile
  Diff comments   View file @1091ed7
1   -h1. Posting on blog
  1 +h1(order-330). Posting on blog
2 2  
3 3 p. _You can have a blog and publish posts on it._
4 4  
... ...
doc/noosfero/cms/writing-advanced-article.textile
  Diff comments   View file @1091ed7
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 3 p. _You can add images and links to the articles created on the system to make it more interesting._
4 4  
... ...
doc/noosfero/cms/writing-article.textile
  Diff comments   View file @1091ed7
1   -h1. Writing an article
  1 +h1(order-300). Writing an article
2 2  
3 3 p. _To publish your articles you can create an aticle, as explained below._
4 4  
... ...
doc/noosfero/community/accepting-members.textile
  Diff comments   View file @1091ed7
1   -h1. Accepting new members
  1 +h1(order-130). Accepting new members
2 2  
3 3 p. _If a community is moderated, the administrator/moderator needs to approve the requests of new members._
4 4  
... ...
doc/noosfero/community/creating-community.textile
  Diff comments   View file @1091ed7
1   -h1. Creating a community
  1 +h1(order-110). Creating a community
2 2  
3 3 p. _You can create communities to interact to others users_
4 4  
... ...
doc/noosfero/community/editing-appearance.textile
  Diff comments   View file @1091ed7
1   -h1. Editing appearance
  1 +h1(order-150). Editing appearance
2 2  
3 3 p. _You can customize the page of your community, changing the template of it._
4 4  
... ...
doc/noosfero/community/editing-header-footer.textile
  Diff comments   View file @1091ed7
1   -h1. Editing header and footer
  1 +h1(order-170). Editing header and footer
2 2  
3 3 p. _You can customize the page of your community, adding some text or image on header or footer._
4 4  
... ...
doc/noosfero/community/editing-sideboxes.textile
  Diff comments   View file @1091ed7
1   -h1. Editing sideboxes
  1 +h1(order-160). Editing sideboxes
2 2  
3 3 p. _You can customize the page of your community, changing the blocks that will be displayed on it._
4 4  
... ...
doc/noosfero/community/invite-contacts.textile
  Diff comments   View file @1091ed7
1   -h1. Inviting contacts from e-mail
  1 +h1(order-120). Inviting contacts from e-mail
2 2  
3 3 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._
4 4  
... ...
doc/noosfero/community/joining-community.textile
  Diff comments   View file @1091ed7
1   -h1. Joining a community
  1 +h1(order-100). Joining a community
2 2  
3 3 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._
4 4  
... ...
doc/noosfero/community/moderating-articles.textile
  Diff comments   View file @1091ed7
1   -h1. Moderating articles
  1 +h1(order-140). Moderating articles
2 2  
3 3 p. _Community's members can publish articles on community. If the community is moderated, the administrator/moderator needs to approve or deny the publication._
4 4  
... ...
doc/noosfero/enterprise/activating-enterprise.textile
  Diff comments   View file @1091ed7
1   -h1. Activating your enterprise
  1 +h1(order-200). Activating your enterprise
2 2  
3 3 p. _If you have an enterprise that is registered in the system, you might have the activation code of the enterprise._
4 4  
... ...
doc/noosfero/enterprise/disabling-enterprise.textile
  Diff comments   View file @1091ed7
1   -h1. Disabling an enterprise
  1 +h1(order-260). Disabling an enterprise
2 2  
3 3 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._
4 4  
... ...
doc/noosfero/enterprise/editing-appearance.textile
  Diff comments   View file @1091ed7
1   -h1. Editing appearance
  1 +h1(order-240). Editing appearance
2 2  
3 3 p. _You can customize the page of your enterprise, changing the template of it._
4 4  
... ...
doc/noosfero/enterprise/editing-enterprise-info.textile
  Diff comments   View file @1091ed7
1   -h1. Editing enterprise settings
  1 +h1(order-220). Editing enterprise settings
2 2  
3 3 p. _If you are administrator of an enterprise, you can edit its settings._
4 4  
... ...
doc/noosfero/enterprise/editing-header-footer.textile
  Diff comments   View file @1091ed7
1   -h1. Editing header and footer
  1 +h1(order-250). Editing header and footer
2 2  
3 3 p. _You can customize the page of your enterprise, adding some text or image on header or footer._
4 4  
... ...
doc/noosfero/enterprise/editing-sideboxes.textile
  Diff comments   View file @1091ed7
1   -h1. Editing sideboxes
  1 +h1(order-230). Editing sideboxes
2 2  
3 3 p. _You can customize the page of your enterprise, changing the blocks that will be displayed on it._
4 4  
... ...
doc/noosfero/enterprise/managing-enterprise-members.textile
  Diff comments   View file @1091ed7
1   -h1. Managing and adding members to an enterprise
  1 +h1(order-210). Managing and adding members to an enterprise
2 2  
3 3 p. _If you are an enterprise administrator, you can add or remove members from enterprise and also define which permissions each member will have_
4 4  
... ...
doc/noosfero/navigation/advanced-search.textile
  Diff comments   View file @1091ed7
1   -h1. Advanced search
  1 +h1(order-620). Advanced search
2 2  
3 3 p. _When an user is navigating on the system, he can do a search to find articles, communities, people, enterprises or products._
4 4  
... ...
doc/noosfero/navigation/searching-communities.textile
  Diff comments   View file @1091ed7
1   -h1. Finding communities
  1 +h1(order-600). Finding communities
2 2  
3 3 p. _To find a community in the system, you can use the search specific for communities._
4 4  
... ...
doc/noosfero/navigation/searching-enterprises.textile
  Diff comments   View file @1091ed7
1   -h1. Finding enterprises
  1 +h1(order-650). Finding enterprises
2 2  
3 3 p. _To find an enterprise in the system, you can use the search specific for enterprises._
4 4  
... ...
doc/noosfero/navigation/searching-people.textile
  Diff comments   View file @1091ed7
1   -h1. Finding people
  1 +h1(order-610). Finding people
2 2  
3 3 p. _To find an user in the system, you can use the search specific for people._
4 4  
... ...
doc/noosfero/navigation/searching-products-services.textile
  Diff comments   View file @1091ed7
1   -h1. Finding products and services
  1 +h1(order-640). Finding products and services
2 2  
3 3 p. _To find a product or service in the system, you can use the search specific for products and services._
4 4  
... ...
doc/noosfero/navigation/searching.textile
  Diff comments   View file @1091ed7
1   -h1. Searching on the system
  1 +h1(order-630). Searching on the system
2 2  
3 3 p. _To find articles, communities, people, enterprises or products and services, an user in the system, can do a search._
4 4  
... ...
doc/noosfero/user/accepting-friends.textile
  Diff comments   View file @1091ed7
1   -h1. Accepting friends
  1 +h1(order-460). Accepting friends
2 2  
3 3 p. _When one person asks to be your friend, you should accept or reject the request. This is what will be explained._
4 4  
... ...
doc/noosfero/user/adding-friends.textile
  Diff comments   View file @1091ed7
1   -h1. Adding friends
  1 +h1(order-450). Adding friends
2 2  
3 3 p. _To interact with others system users, you can include them in your contact list, adding them as friends._
4 4  
... ...
doc/noosfero/user/changing-password.textile
  Diff comments   View file @1091ed7
1   -h1. Changing password
  1 +h1(order-510). Changing password
2 2  
3 3 p. _Whenever you want, you can change your password._
4 4  
... ...
doc/noosfero/user/commenting.textile
  Diff comments   View file @1091ed7
1   -h1. Commenting articles
  1 +h1(order-470). Commenting articles
2 2  
3 3 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._
4 4  
... ...
doc/noosfero/user/editing-appearance.textile
  Diff comments   View file @1091ed7
1   -h1. Editing appearance
  1 +h1(order-530). Editing appearance
2 2  
3 3 p. _You can customize your page, changing the template of it._
4 4  
... ...
doc/noosfero/user/editing-header-footer.textile
  Diff comments   View file @1091ed7
1   -h1. Editing header and footer
  1 +h1(order-540). Editing header and footer
2 2  
3 3 p. _You can customize your page, adding some text or image on header or footer._
4 4  
... ...
doc/noosfero/user/editing-person-info.textile
  Diff comments   View file @1091ed7
1   -h1. Editing user settings
  1 +h1(order-420). Editing user settings
2 2  
3 3 p. _You can change your profile information and settings in the system._
4 4  
... ...
doc/noosfero/user/editing-sideboxes.textile
  Diff comments   View file @1091ed7
1   -h1. Editing sideboxes
  1 +h1(order-500). Editing sideboxes
2 2  
3 3 p. _You can customize your page, changing the blocks that will be displayed on it._
4 4  
... ...
doc/noosfero/user/invite-contacts.textile
  Diff comments   View file @1091ed7
1   -h1. Inviting contacts from e-mail
  1 +h1(order-440). Inviting contacts from e-mail
2 2  
3 3 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._
4 4  
... ...
doc/noosfero/user/login.textile
  Diff comments   View file @1091ed7
1   -h1. Login into the system
  1 +h1(order-410). Login into the system
2 2  
3 3 p. _Some system features only can be used when the user is logged in._
4 4  
... ...
doc/noosfero/user/logout.textile
  Diff comments   View file @1091ed7
1   -h1. Leaving the system
  1 +h1(order-430). Leaving the system
2 2  
3 3 p. _After finishing your navigation, we recommend leaving the system._
4 4  
... ...
doc/noosfero/user/registering-new-user.textile
  Diff comments   View file @1091ed7
1   -h1. Registering a new user
  1 +h1(order-400). Registering a new user
2 2  
3 3 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._
4 4  
... ...
doc/noosfero/user/removing-comments.textile
  Diff comments   View file @1091ed7
1   -h1. Removing comments
  1 +h1(order-480). Removing comments
2 2  
3 3 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._
4 4  
... ...
doc/noosfero/user/removing-friends.textile
  Diff comments   View file @1091ed7
1   -h1. Removing friends
  1 +h1(order-520). Removing friends
2 2  
3 3 p. _How you can remove one friend from your contact list._
4 4  
... ...
doc/noosfero/user/sending-messages.textile
  Diff comments   View file @1091ed7
1   -h1. Sending messages
  1 +h1(order-490). Sending messages
2 2  
3 3 p. _To interact with other system users, you can send messages through the system. The messages will be received by email._
4 4  
... ...
lib/tasks/cucumber.rake
  Diff comments   View file @1091ed7
... ... @@ -14,13 +14,13 @@ begin
14 14 Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
15 15 t.binary = vendored_cucumber_binary
16 16 t.fork = true # You may get faster startup if you set this to false
17   - t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
  17 + t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
18 18 end
19 19  
20 20 Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
21 21 t.binary = vendored_cucumber_binary
22 22 t.fork = true # You may get faster startup if you set this to false
23   - t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
  23 + t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
24 24 end
25 25  
26 26 desc 'Run all features'
... ...
lib/tasks/doc.rake
  Diff comments   View file @1091ed7
... ... @@ -33,8 +33,11 @@ namespace :noosfero do
33 33 section = File.basename(File.dirname(toc))
34 34 output_file.puts "<!-- THIS FILE IS AUTOGENERATED. DO NOT EDIT -->"
35 35 output_file.puts "<ul>"
  36 + topics = []
36 37 section_topics.each do |item|
37   - topic = DocTopic.loadfile(item)
  38 + topics << DocTopic.loadfile(item)
  39 + end
  40 + topics.sort_by { |t| t.order }.each do |topic|
38 41 output_file.puts "<li> <a href=\"/doc/#{section}/#{topic.id}\">#{topic.title}</a> </li>"
39 42 end
40 43 output_file.puts "</ul>"
... ...
lib/tasks/test.rake
  Diff comments   View file @1091ed7
... ... @@ -2,5 +2,5 @@ task :default =&gt; [:test, :cucumber, :selenium]
2 2  
3 3 desc 'Runs Seleniun acceptance tests'
4 4 task :selenium do
5   - sh "xvfb-run cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
  5 + sh "xvfb-run cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
6 6 end
... ...
po/noosfero-doc.pot
  Diff comments   View file @1091ed7
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10   -"POT-Creation-Date: 2010-03-16 20:53-0300\n"
  10 +"POT-Creation-Date: 2010-04-22 19:54-0300\n"
11 11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -120,12 +120,12 @@ msgid &quot;Related topics&quot;
120 120 msgstr ""
121 121  
122 122 # type: Content of: <ul><li>
123   -#: doc/noosfero/cms/posting-on-blog.en.xhtml:31 doc/noosfero/cms/toc.en.xhtml:7
  123 +#: doc/noosfero/cms/posting-on-blog.en.xhtml:31 doc/noosfero/cms/toc.en.xhtml:5
124 124 msgid "<a href=\"/doc/cms/creating-blog\">Creating a blog</a>"
125 125 msgstr ""
126 126  
127 127 # type: Content of: <ul><li>
128   -#: 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
  128 +#: 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
129 129 msgid "<a href=\"/doc/cms/managing-content\">Managing your content</a>"
130 130 msgstr ""
131 131  
... ... @@ -429,7 +429,7 @@ msgid &quot;&quot;
429 429 msgstr ""
430 430  
431 431 # type: Content of: <ul><li>
432   -#: doc/noosfero/cms/writing-advanced-article.en.xhtml:76 doc/noosfero/cms/managing-content.en.xhtml:61 doc/noosfero/cms/toc.en.xhtml:8
  432 +#: doc/noosfero/cms/writing-advanced-article.en.xhtml:76 doc/noosfero/cms/managing-content.en.xhtml:61 doc/noosfero/cms/toc.en.xhtml:3
433 433 msgid "<a href=\"/doc/cms/writing-article\">Writing an article</a>"
434 434 msgstr ""
435 435  
... ... @@ -670,7 +670,7 @@ msgid &quot;Fill in with the blog&amp;#8217;s tags.&quot;
670 670 msgstr ""
671 671  
672 672 # type: Content of: <ul><li>
673   -#: doc/noosfero/cms/creating-blog.en.xhtml:39 doc/noosfero/cms/toc.en.xhtml:3
  673 +#: doc/noosfero/cms/creating-blog.en.xhtml:39 doc/noosfero/cms/toc.en.xhtml:6
674 674 msgid "<a href=\"/doc/cms/posting-on-blog\">Posting on blog</a>"
675 675 msgstr ""
676 676  
... ... @@ -1160,7 +1160,7 @@ msgid &quot;After editing your header and footer, click on &amp;#8220;Save&amp;#8221; button&quot;
1160 1160 msgstr ""
1161 1161  
1162 1162 # type: Content of: <ul><li>
1163   -#: 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
  1163 +#: 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
1164 1164 msgid "<a href=\"/doc/user/login\">Login into the system</a>"
1165 1165 msgstr ""
1166 1166  
... ... @@ -1228,7 +1228,7 @@ msgid &quot;Edit appearance&quot;
1228 1228 msgstr ""
1229 1229  
1230 1230 # type: Content of: <ul><li>
1231   -#: doc/noosfero/community/editing-appearance.en.xhtml:39 doc/noosfero/community/editing-sideboxes.en.xhtml:71 doc/noosfero/community/toc.en.xhtml:3
  1231 +#: doc/noosfero/community/editing-appearance.en.xhtml:39 doc/noosfero/community/editing-sideboxes.en.xhtml:71 doc/noosfero/community/toc.en.xhtml:10
1232 1232 msgid ""
1233 1233 "<a href=\"/doc/community/editing-header-footer\">Editing header and "
1234 1234 "footer</a>"
... ... @@ -1446,12 +1446,12 @@ msgid &quot;Import invitation for community. Step 2&quot;
1446 1446 msgstr ""
1447 1447  
1448 1448 # type: Content of: <ul><li>
1449   -#: 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
  1449 +#: 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
1450 1450 msgid "<a href=\"/doc/community/creating-community\">Creating a community</a>"
1451 1451 msgstr ""
1452 1452  
1453 1453 # type: Content of: <ul><li>
1454   -#: 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
  1454 +#: 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
1455 1455 msgid "<a href=\"/doc/community/joining-community\">Joining a community</a>"
1456 1456 msgstr ""
1457 1457  
... ... @@ -1753,7 +1753,7 @@ msgid &quot;&quot;
1753 1753 msgstr ""
1754 1754  
1755 1755 # type: Content of: <ul><li>
1756   -#: doc/noosfero/community/editing-sideboxes.en.xhtml:72 doc/noosfero/community/toc.en.xhtml:4
  1756 +#: doc/noosfero/community/editing-sideboxes.en.xhtml:72 doc/noosfero/community/toc.en.xhtml:8
1757 1757 msgid "<a href=\"/doc/community/editing-appearance\">Editing appearance</a>"
1758 1758 msgstr ""
1759 1759  
... ... @@ -1903,7 +1903,7 @@ msgid &quot;&quot;
1903 1903 msgstr ""
1904 1904  
1905 1905 # type: Content of: <ul><li>
1906   -#: 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
  1906 +#: 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
1907 1907 msgid "<a href=\"/doc/navigation/searching-communities\">Finding communities</a>"
1908 1908 msgstr ""
1909 1909  
... ... @@ -2047,12 +2047,12 @@ msgid &quot;&quot;
2047 2047 msgstr ""
2048 2048  
2049 2049 # type: Content of: <ul><li>
2050   -#: 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
  2050 +#: 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
2051 2051 msgid "<a href=\"/doc/user/adding-friends\">Adding friends</a>"
2052 2052 msgstr ""
2053 2053  
2054 2054 # type: Content of: <ul><li>
2055   -#: 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
  2055 +#: 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
2056 2056 msgid "<a href=\"/doc/user/accepting-friends\">Accepting friends</a>"
2057 2057 msgstr ""
2058 2058  
... ... @@ -2183,7 +2183,7 @@ msgid &quot;&lt;em&gt;You can customize your page, changing the template of it.&lt;/em&gt;&quot;
2183 2183 msgstr ""
2184 2184  
2185 2185 # type: Content of: <ul><li>
2186   -#: doc/noosfero/user/editing-appearance.en.xhtml:37 doc/noosfero/user/editing-sideboxes.en.xhtml:72 doc/noosfero/user/toc.en.xhtml:7
  2186 +#: doc/noosfero/user/editing-appearance.en.xhtml:37 doc/noosfero/user/editing-sideboxes.en.xhtml:72 doc/noosfero/user/toc.en.xhtml:17
2187 2187 msgid "<a href=\"/doc/user/editing-header-footer\">Editing header and footer</a>"
2188 2188 msgstr ""
2189 2189  
... ... @@ -2237,7 +2237,7 @@ msgid &quot;Related Topics&quot;
2237 2237 msgstr ""
2238 2238  
2239 2239 # type: Content of: <ul><li>
2240   -#: 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
  2240 +#: 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
2241 2241 msgid "<a href=\"/doc/user/removing-friends\">Removing friends</a>"
2242 2242 msgstr ""
2243 2243  
... ... @@ -2421,7 +2421,7 @@ msgid &quot;Enterprises block&quot;
2421 2421 msgstr ""
2422 2422  
2423 2423 # type: Content of: <ul><li>
2424   -#: doc/noosfero/user/editing-sideboxes.en.xhtml:73 doc/noosfero/user/toc.en.xhtml:9
  2424 +#: doc/noosfero/user/editing-sideboxes.en.xhtml:73 doc/noosfero/user/toc.en.xhtml:16
2425 2425 msgid "<a href=\"/doc/user/editing-appearance\">Editing appearance</a>"
2426 2426 msgstr ""
2427 2427  
... ... @@ -2790,7 +2790,7 @@ msgid &quot;&quot;
2790 2790 msgstr ""
2791 2791  
2792 2792 # type: Content of: <ul><li>
2793   -#: doc/noosfero/enterprise/editing-appearance.en.xhtml:39 doc/noosfero/enterprise/editing-sideboxes.en.xhtml:73 doc/noosfero/enterprise/toc.en.xhtml:4
  2793 +#: doc/noosfero/enterprise/editing-appearance.en.xhtml:39 doc/noosfero/enterprise/editing-sideboxes.en.xhtml:73 doc/noosfero/enterprise/toc.en.xhtml:8
2794 2794 msgid ""
2795 2795 "<a href=\"/doc/enterprise/editing-header-footer\">Editing header and "
2796 2796 "footer</a>"
... ... @@ -2934,7 +2934,7 @@ msgid &quot;Disabled enterprise block&quot;
2934 2934 msgstr ""
2935 2935  
2936 2936 # type: Content of: <ul><li>
2937   -#: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:74 doc/noosfero/enterprise/toc.en.xhtml:5
  2937 +#: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:74 doc/noosfero/enterprise/toc.en.xhtml:7
2938 2938 msgid "<a href=\"/doc/enterprise/editing-appearance\">Editing appearance</a>"
2939 2939 msgstr ""
2940 2940  
... ... @@ -3013,14 +3013,14 @@ msgid &quot;Conclusion of enterprise activation&quot;
3013 3013 msgstr ""
3014 3014  
3015 3015 # type: Content of: <ul><li>
3016   -#: doc/noosfero/enterprise/activating-enterprise.en.xhtml:34 doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:41 doc/noosfero/enterprise/toc.en.xhtml:9
  3016 +#: doc/noosfero/enterprise/activating-enterprise.en.xhtml:34 doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:41 doc/noosfero/enterprise/toc.en.xhtml:5
3017 3017 msgid ""
3018 3018 "<a href=\"/doc/enterprise/editing-enterprise-info\">Editing enterprise "
3019 3019 "settings</a>"
3020 3020 msgstr ""
3021 3021  
3022 3022 # type: Content of: <ul><li>
3023   -#: doc/noosfero/enterprise/activating-enterprise.en.xhtml:35 doc/noosfero/user/toc.en.xhtml:16
  3023 +#: doc/noosfero/enterprise/activating-enterprise.en.xhtml:35 doc/noosfero/user/toc.en.xhtml:3
3024 3024 msgid "<a href=\"/doc/user/registering-new-user\">Registering a new user</a>"
3025 3025 msgstr ""
3026 3026  
... ... @@ -3116,7 +3116,7 @@ msgid &quot;Add member on manage member&quot;
3116 3116 msgstr ""
3117 3117  
3118 3118 # type: Content of: <ul><li>
3119   -#: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:42 doc/noosfero/enterprise/toc.en.xhtml:7
  3119 +#: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:42 doc/noosfero/enterprise/toc.en.xhtml:3
3120 3120 msgid ""
3121 3121 "<a href=\"/doc/enterprise/activating-enterprise\">Activating your "
3122 3122 "enterprise</a>"
... ... @@ -3278,19 +3278,19 @@ msgid &quot;View all results on search with example&quot;
3278 3278 msgstr ""
3279 3279  
3280 3280 # type: Content of: <ul><li>
3281   -#: 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
  3281 +#: 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
3282 3282 msgid "<a href=\"/doc/navigation/searching-enterprises\">Finding enterprises</a>"
3283 3283 msgstr ""
3284 3284  
3285 3285 # type: Content of: <ul><li>
3286   -#: 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
  3286 +#: 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
3287 3287 msgid ""
3288 3288 "<a href=\"/doc/navigation/searching-products-services\">Finding products and "
3289 3289 "services</a>"
3290 3290 msgstr ""
3291 3291  
3292 3292 # type: Content of: <ul><li>
3293   -#: 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
  3293 +#: 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
3294 3294 msgid "<a href=\"/doc/navigation/advanced-search\">Advanced search</a>"
3295 3295 msgstr ""
3296 3296  
... ... @@ -3590,75 +3590,77 @@ msgid &quot;&lt;a href=\&quot;/doc/cms/adding-images-to-gallery\&quot;&gt;Adding pictures to gallery&lt;
3590 3590 msgstr ""
3591 3591  
3592 3592 # type: Content of: <ul><li>
3593   -#: doc/noosfero/cms/toc.en.xhtml:5
  3593 +#: doc/noosfero/cms/toc.en.xhtml:7
3594 3594 msgid ""
3595 3595 "<a href=\"/doc/cms/writing-advanced-article\">Writing an advanced article "
3596 3596 "(inserting images, links, videos and audio)</a>"
3597 3597 msgstr ""
3598 3598  
3599 3599 # type: Content of: <ul><li>
3600   -#: doc/noosfero/community/toc.en.xhtml:6
  3600 +#: doc/noosfero/community/toc.en.xhtml:5
3601 3601 msgid "<a href=\"/doc/community/invite-contacts\">Inviting contacts from e-mail</a>"
3602 3602 msgstr ""
3603 3603  
3604 3604 # type: Content of: <ul><li>
3605   -#: doc/noosfero/community/toc.en.xhtml:7
3606   -msgid "<a href=\"/doc/community/editing-sideboxes\">Editing sideboxes</a>"
  3605 +#: doc/noosfero/community/toc.en.xhtml:6
  3606 +msgid "<a href=\"/doc/community/accepting-members\">Accepting new members</a>"
3607 3607 msgstr ""
3608 3608  
3609 3609 # type: Content of: <ul><li>
3610   -#: doc/noosfero/community/toc.en.xhtml:8
  3610 +#: doc/noosfero/community/toc.en.xhtml:7
3611 3611 msgid "<a href=\"/doc/community/moderating-articles\">Moderating articles</a>"
3612 3612 msgstr ""
3613 3613  
3614 3614 # type: Content of: <ul><li>
3615   -#: doc/noosfero/community/toc.en.xhtml:10
3616   -msgid "<a href=\"/doc/community/accepting-members\">Accepting new members</a>"
  3615 +#: doc/noosfero/community/toc.en.xhtml:9
  3616 +msgid "<a href=\"/doc/community/editing-sideboxes\">Editing sideboxes</a>"
3617 3617 msgstr ""
3618 3618  
3619 3619 # type: Content of: <ul><li>
3620   -#: doc/noosfero/user/toc.en.xhtml:3
3621   -msgid "<a href=\"/doc/user/logout\">Leaving the system</a>"
  3620 +#: doc/noosfero/user/toc.en.xhtml:5
  3621 +msgid "<a href=\"/doc/user/editing-person-info\">Editing user settings</a>"
3622 3622 msgstr ""
3623 3623  
3624 3624 # type: Content of: <ul><li>
3625   -#: doc/noosfero/user/toc.en.xhtml:4
3626   -msgid "<a href=\"/doc/user/changing-password\">Changing password</a>"
  3625 +#: doc/noosfero/user/toc.en.xhtml:6
  3626 +msgid "<a href=\"/doc/user/logout\">Leaving the system</a>"
3627 3627 msgstr ""
3628 3628  
3629 3629 # type: Content of: <ul><li>
3630   -#: doc/noosfero/user/toc.en.xhtml:6
3631   -msgid "<a href=\"/doc/user/sending-messages\">Sending messages</a>"
  3630 +#: doc/noosfero/user/toc.en.xhtml:7
  3631 +msgid "<a href=\"/doc/user/invite-contacts\">Inviting contacts from e-mail</a>"
3632 3632 msgstr ""
3633 3633  
3634 3634 # type: Content of: <ul><li>
3635   -#: doc/noosfero/user/toc.en.xhtml:8
3636   -msgid "<a href=\"/doc/user/removing-comments\">Removing comments</a>"
  3635 +#: doc/noosfero/user/toc.en.xhtml:10
  3636 +msgid "<a href=\"/doc/user/commenting\">Commenting articles</a>"
3637 3637 msgstr ""
3638 3638  
3639 3639 # type: Content of: <ul><li>
3640 3640 #: doc/noosfero/user/toc.en.xhtml:11
3641   -msgid "<a href=\"/doc/user/invite-contacts\">Inviting contacts from e-mail</a>"
  3641 +msgid "<a href=\"/doc/user/removing-comments\">Removing comments</a>"
3642 3642 msgstr ""
3643 3643  
3644 3644 # type: Content of: <ul><li>
3645 3645 #: doc/noosfero/user/toc.en.xhtml:12
3646   -msgid "<a href=\"/doc/user/editing-sideboxes\">Editing sideboxes</a>"
  3646 +msgid "<a href=\"/doc/user/sending-messages\">Sending messages</a>"
3647 3647 msgstr ""
3648 3648  
3649 3649 # type: Content of: <ul><li>
3650 3650 #: doc/noosfero/user/toc.en.xhtml:13
3651   -msgid "<a href=\"/doc/user/editing-person-info\">Editing user settings</a>"
  3651 +msgid "<a href=\"/doc/user/editing-sideboxes\">Editing sideboxes</a>"
3652 3652 msgstr ""
3653 3653  
3654 3654 # type: Content of: <ul><li>
3655 3655 #: doc/noosfero/user/toc.en.xhtml:14
3656   -msgid "<a href=\"/doc/user/commenting\">Commenting articles</a>"
  3656 +msgid "<a href=\"/doc/user/changing-password\">Changing password</a>"
3657 3657 msgstr ""
3658 3658  
3659 3659 # type: Content of: <ul><li>
3660   -#: doc/noosfero/enterprise/toc.en.xhtml:3
3661   -msgid "<a href=\"/doc/enterprise/disabling-enterprise\">Disabling an enterprise</a>"
  3660 +#: doc/noosfero/enterprise/toc.en.xhtml:4
  3661 +msgid ""
  3662 +"<a href=\"/doc/enterprise/managing-enterprise-members\">Managing and adding "
  3663 +"members to an enterprise</a>"
3662 3664 msgstr ""
3663 3665  
3664 3666 # 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;
3667 3669 msgstr ""
3668 3670  
3669 3671 # type: Content of: <ul><li>
3670   -#: doc/noosfero/enterprise/toc.en.xhtml:8
3671   -msgid ""
3672   -"<a href=\"/doc/enterprise/managing-enterprise-members\">Managing and adding "
3673   -"members to an enterprise</a>"
  3672 +#: doc/noosfero/enterprise/toc.en.xhtml:9
  3673 +msgid "<a href=\"/doc/enterprise/disabling-enterprise\">Disabling an enterprise</a>"
3674 3674 msgstr ""
3675 3675  
3676 3676 # type: Content of: <ul><li>
3677   -#: doc/noosfero/navigation/toc.en.xhtml:3
  3677 +#: doc/noosfero/navigation/toc.en.xhtml:6
3678 3678 msgid "<a href=\"/doc/navigation/searching\">Searching on the system</a>"
3679 3679 msgstr ""
3680 3680  
... ...
po/pt/noosfero-doc.po
  Diff comments   View file @1091ed7
... ... @@ -6,8 +6,8 @@
6 6 msgid ""
7 7 msgstr ""
8 8 "Project-Id-Version: PACKAGE VERSION\n"
9   -"POT-Creation-Date: 2010-03-16 20:53-0300\n"
10   -"PO-Revision-Date: 2010-04-12 16:13-0300\n"
  9 +"POT-Creation-Date: 2010-04-22 19:54-0300\n"
  10 +"PO-Revision-Date: 2010-04-22 20:23-0300\n"
11 11 "Last-Translator: Automatically generated\n"
12 12 "Language-Team: none\n"
13 13 "MIME-Version: 1.0\n"
... ... @@ -18,7 +18,7 @@ msgstr &quot;&quot;
18 18 # type: Content of: <h1>
19 19 #: doc/noosfero/cms/posting-on-blog.en.xhtml:1
20 20 msgid "Posting on blog"
21   -msgstr "Postando no blog"
  21 +msgstr "Postar no blog"
22 22  
23 23 # type: Content of: <p>
24 24 #: doc/noosfero/cms/posting-on-blog.en.xhtml:3
... ... @@ -205,7 +205,7 @@ msgid &quot;&quot;
205 205 "instructions on <a href=\"/doc/cms/creating-blog\">Creating a blog</a> ."
206 206 msgstr ""
207 207 "Se você ainda não tem um blog, você pode criar um seguindo as orientações em "
208   -"<a href=\"/doc/cms/creating-blog\">Criando um blog</a>."
  208 +"<a href=\"/doc/cms/creating-blog\">Criar um blog</a>."
209 209  
210 210 # type: Content of: <ol><li>
211 211 #: doc/noosfero/cms/posting-on-blog.en.xhtml:15
... ... @@ -441,16 +441,16 @@ msgstr &quot;Tópicos relacionados&quot;
441 441  
442 442 # type: Content of: <ul><li>
443 443 #: doc/noosfero/cms/posting-on-blog.en.xhtml:31
444   -#: doc/noosfero/cms/toc.en.xhtml:7
  444 +#: doc/noosfero/cms/toc.en.xhtml:5
445 445 msgid "<a href=\"/doc/cms/creating-blog\">Creating a blog</a>"
446   -msgstr "<a href=\"/doc/cms/creating-blog\">Criando um blog</a>"
  446 +msgstr "<a href=\"/doc/cms/creating-blog\">Criar um blog</a>"
447 447  
448 448 # type: Content of: <ul><li>
449 449 #: doc/noosfero/cms/posting-on-blog.en.xhtml:32
450 450 #: doc/noosfero/cms/adding-images-to-gallery.en.xhtml:31
451   -#: doc/noosfero/cms/creating-blog.en.xhtml:38 doc/noosfero/cms/toc.en.xhtml:6
  451 +#: doc/noosfero/cms/creating-blog.en.xhtml:38 doc/noosfero/cms/toc.en.xhtml:8
452 452 msgid "<a href=\"/doc/cms/managing-content\">Managing your content</a>"
453   -msgstr "<a href=\"/doc/cms/managing-content\">Gerenciando seu conteúdo</a>"
  453 +msgstr "<a href=\"/doc/cms/managing-content\">Gerenciar seu conteúdo</a>"
454 454  
455 455 # type: Content of: <ul><li>
456 456 #: 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;
501 501 # type: Content of: <h1>
502 502 #: doc/noosfero/cms/index.en.xhtml:1
503 503 msgid "Content Management"
504   -msgstr "Gerenciamento de conteúdo"
  504 +msgstr "Gerenciar conteúdo"
505 505  
506 506 # type: Content of: <h1>
507 507 #: doc/noosfero/cms/adding-images-to-gallery.en.xhtml:1
508 508 msgid "Adding pictures to gallery"
509   -msgstr "Adicionando fotos na galeria"
  509 +msgstr "Adicionar fotos na galeria"
510 510  
511 511 # type: Content of: <p>
512 512 #: doc/noosfero/cms/adding-images-to-gallery.en.xhtml:3
... ... @@ -522,9 +522,9 @@ msgid &quot;&quot;
522 522 "gallery&#8221; in &#8220;Folder type&#8221;."
523 523 msgstr ""
524 524 "Se você ainda não tem uma galeria de imagens, você pode criar uma seguindo "
525   -"as orientações em <a href=\"/doc/cms/managing-content\">Gerenciando "
526   -"conteúdo</a> até o item 1 da descrição. Ao criar a pasta, escolha &#8220;"
527   -"Galeria de imagens&#8221; em &#8220;Tipo de Pasta&#8221;."
  525 +"as orientações em <a href=\"/doc/cms/managing-content\">Gerenciar conteúdo</"
  526 +"a> até o item 1 da descrição. Ao criar a pasta, escolha &#8220;Galeria de "
  527 +"imagens&#8221; em &#8220;Tipo de Pasta&#8221;."
528 528  
529 529 # type: Content of: <ol><li>
530 530 #: doc/noosfero/cms/adding-images-to-gallery.en.xhtml:15
... ... @@ -575,8 +575,7 @@ msgstr &quot;enviando arquivos para a galeria&quot;
575 575 # type: Content of: <h1>
576 576 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:1
577 577 msgid "Writing an advanced article (inserting images, links, videos and audio)"
578   -msgstr ""
579   -"Escrevendo um artigo avançado (inserindo imagens, links, vídeos e áudio)"
  578 +msgstr "Escrever um artigo avançado (inserindo imagens, links, vídeos e áudio)"
580 579  
581 580 # type: Content of: <p>
582 581 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:3
... ... @@ -590,17 +589,17 @@ msgstr &quot;&quot;
590 589 # type: Content of: <ul><li><ul><li>
591 590 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:9
592 591 msgid "<a href=\"#InsertingLinks\">Inserting links</a>"
593   -msgstr "<a href=\"#InsertingLinks\">Inserindo links</a>"
  592 +msgstr "<a href=\"#InsertingLinks\">Inserir links</a>"
594 593  
595 594 # type: Content of: <ul><li><ul><li>
596 595 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:10
597 596 msgid "<a href=\"#InsertingImages\">Inserting images</a>"
598   -msgstr "<a href=\"#InsertingImages\">Inserindo imagens</a>"
  597 +msgstr "<a href=\"#InsertingImages\">Inserir imagens</a>"
599 598  
600 599 # type: Content of: <ul><li><ul><li>
601 600 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:11
602 601 msgid "<a href=\"#InsertingVideosAudio\">Inserting videos and audio</a>"
603   -msgstr "<a href=\"#InsertingVideosAudio\">Inserindo vídeos e áudio</a>"
  602 +msgstr "<a href=\"#InsertingVideosAudio\">Inserir vídeos e áudio</a>"
604 603  
605 604 # type: Content of: <p>
606 605 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:18
... ... @@ -690,7 +689,7 @@ msgstr &quot;Link criado num artigo&quot;
690 689 # type: Content of: <h1>
691 690 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:38
692 691 msgid "Inserting images"
693   -msgstr "Inserindo imagens"
  692 +msgstr "Inserir imagens"
694 693  
695 694 # type: Content of: <p>
696 695 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:40
... ... @@ -798,7 +797,7 @@ msgstr &quot;Lista de arquivos na edição de artigo&quot;
798 797 # type: Content of: <h1>
799 798 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:64
800 799 msgid "Inserting videos and audio"
801   -msgstr "Inserindo vídeos e áudio"
  800 +msgstr "Inserir vídeos e áudio"
802 801  
803 802 # type: Content of: <ol><li>
804 803 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:67
... ... @@ -842,14 +841,14 @@ msgstr &quot;&quot;
842 841 # type: Content of: <ul><li>
843 842 #: doc/noosfero/cms/writing-advanced-article.en.xhtml:76
844 843 #: doc/noosfero/cms/managing-content.en.xhtml:61
845   -#: doc/noosfero/cms/toc.en.xhtml:8
  844 +#: doc/noosfero/cms/toc.en.xhtml:3
846 845 msgid "<a href=\"/doc/cms/writing-article\">Writing an article</a>"
847   -msgstr "<a href=\"/doc/cms/writing-article\">Escrevendo um artigo</a>"
  846 +msgstr "<a href=\"/doc/cms/writing-article\">Escrever um artigo</a>"
848 847  
849 848 # type: Content of: <h1>
850 849 #: doc/noosfero/cms/managing-content.en.xhtml:1
851 850 msgid "Managing your content"
852   -msgstr "Gerenciando seu conteúdo"
  851 +msgstr "Gerenciar seu conteúdo"
853 852  
854 853 # type: Content of: <p>
855 854 #: 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;
1037 1036 # type: Content of: <h1>
1038 1037 #: doc/noosfero/cms/creating-blog.en.xhtml:1
1039 1038 msgid "Creating a blog"
1040   -msgstr "Criando um blog"
  1039 +msgstr "Criar um blog"
1041 1040  
1042 1041 # type: Content of: <p>
1043 1042 #: doc/noosfero/cms/creating-blog.en.xhtml:3
... ... @@ -1122,14 +1121,14 @@ msgid &quot;Fill in with the blog&amp;#8217;s tags.&quot;
1122 1121 msgstr "Preencha com as tags do blog."
1123 1122  
1124 1123 # type: Content of: <ul><li>
1125   -#: doc/noosfero/cms/creating-blog.en.xhtml:39 doc/noosfero/cms/toc.en.xhtml:3
  1124 +#: doc/noosfero/cms/creating-blog.en.xhtml:39 doc/noosfero/cms/toc.en.xhtml:6
1126 1125 msgid "<a href=\"/doc/cms/posting-on-blog\">Posting on blog</a>"
1127   -msgstr "<a href=\"/doc/cms/posting-on-blog\">Postando no blog</a>"
  1126 +msgstr "<a href=\"/doc/cms/posting-on-blog\">Postar no blog</a>"
1128 1127  
1129 1128 # type: Content of: <h1>
1130 1129 #: doc/noosfero/cms/writing-article.en.xhtml:1
1131 1130 msgid "Writing an article"
1132   -msgstr "Escrevendo um artigo básico"
  1131 +msgstr "Escrever um artigo básico"
1133 1132  
1134 1133 # type: Content of: <p>
1135 1134 #: doc/noosfero/cms/writing-article.en.xhtml:3
... ... @@ -1662,7 +1661,7 @@ msgstr &quot;&quot;
1662 1661 msgid ""
1663 1662 "<a href=\"/doc/cms/writing-advanced-article\">Writing advanced articles</a>"
1664 1663 msgstr ""
1665   -"<a href=\"/doc/cms/writing-advanced-article\">Escrevendo um artigo avançado "
  1664 +"<a href=\"/doc/cms/writing-advanced-article\">Escrever um artigo avançado "
1666 1665 "(inserindo links e imagens)</a>"
1667 1666  
1668 1667 # type: Content of: <h1>
... ... @@ -1895,9 +1894,9 @@ msgstr &quot;&quot;
1895 1894 #: doc/noosfero/enterprise/editing-header-footer.en.xhtml:62
1896 1895 #: doc/noosfero/enterprise/editing-appearance.en.xhtml:37
1897 1896 #: doc/noosfero/enterprise/editing-enterprise-info.en.xhtml:45
1898   -#: doc/noosfero/user/toc.en.xhtml:17
  1897 +#: doc/noosfero/user/toc.en.xhtml:4
1899 1898 msgid "<a href=\"/doc/user/login\">Login into the system</a>"
1900   -msgstr "<a href=\"/doc/user/login\">Entrando no sistema</a>"
  1899 +msgstr "<a href=\"/doc/user/login\">Entrar no sistema</a>"
1901 1900  
1902 1901 # type: Content of: <ul><li>
1903 1902 #: 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;
1909 1908 #: doc/noosfero/enterprise/editing-header-footer.en.xhtml:63
1910 1909 #: doc/noosfero/enterprise/editing-appearance.en.xhtml:38
1911 1910 msgid "<a href=\"/doc/user/logout\">Logout of the system</a>"
1912   -msgstr "<a href=\"/doc/user/logout\">Saindo do sistema</a>"
  1911 +msgstr "<a href=\"/doc/user/logout\">Sair do sistema</a>"
1913 1912  
1914 1913 # type: Content of: <h1>
1915 1914 #: doc/noosfero/community/editing-appearance.en.xhtml:1
1916 1915 #: doc/noosfero/user/editing-appearance.en.xhtml:1
1917 1916 #: doc/noosfero/enterprise/editing-appearance.en.xhtml:1
1918 1917 msgid "Editing appearance"
1919   -msgstr "Editando aparência"
  1918 +msgstr "Editar aparência"
1920 1919  
1921 1920 # type: Content of: <p>
1922 1921 #: doc/noosfero/community/editing-appearance.en.xhtml:3
... ... @@ -1997,7 +1996,7 @@ msgstr &quot;Editar aparência&quot;
1997 1996 # type: Content of: <ul><li>
1998 1997 #: doc/noosfero/community/editing-appearance.en.xhtml:39
1999 1998 #: doc/noosfero/community/editing-sideboxes.en.xhtml:71
2000   -#: doc/noosfero/community/toc.en.xhtml:3
  1999 +#: doc/noosfero/community/toc.en.xhtml:10
2001 2000 msgid ""
2002 2001 "<a href=\"/doc/community/editing-header-footer\">Editing header and footer</"
2003 2002 "a>"
... ... @@ -2013,7 +2012,7 @@ msgstr &quot;Funcionalidades da comunidade&quot;
2013 2012 # type: Content of: <h1>
2014 2013 #: doc/noosfero/community/creating-community.en.xhtml:1
2015 2014 msgid "Creating a community"
2016   -msgstr "Criando uma comunidade"
  2015 +msgstr "Criar uma comunidade"
2017 2016  
2018 2017 # type: Content of: <p>
2019 2018 #: doc/noosfero/community/creating-community.en.xhtml:3
... ... @@ -2117,7 +2116,7 @@ msgstr &quot;&quot;
2117 2116 #: doc/noosfero/community/invite-contacts.en.xhtml:1
2118 2117 #: doc/noosfero/user/invite-contacts.en.xhtml:1
2119 2118 msgid "Inviting contacts from e-mail"
2120   -msgstr "Convidando contatos por e-mail"
  2119 +msgstr "Convidar contatos por e-mail"
2121 2120  
2122 2121 # type: Content of: <p>
2123 2122 #: doc/noosfero/community/invite-contacts.en.xhtml:3
... ... @@ -2293,31 +2292,30 @@ msgstr &quot;Convite de importação para comunidade. Passo 2&quot;
2293 2292 #: doc/noosfero/community/invite-contacts.en.xhtml:45
2294 2293 #: doc/noosfero/community/moderating-articles.en.xhtml:41
2295 2294 #: doc/noosfero/community/accepting-members.en.xhtml:32
2296   -#: doc/noosfero/community/toc.en.xhtml:5
  2295 +#: doc/noosfero/community/toc.en.xhtml:4
2297 2296 msgid "<a href=\"/doc/community/creating-community\">Creating a community</a>"
2298   -msgstr ""
2299   -"<a href=\"/doc/community/creating-community\">Criando uma comunidade</a>"
  2297 +msgstr "<a href=\"/doc/community/creating-community\">Criar uma comunidade</a>"
2300 2298  
2301 2299 # type: Content of: <ul><li>
2302 2300 #: doc/noosfero/community/invite-contacts.en.xhtml:46
2303 2301 #: doc/noosfero/community/moderating-articles.en.xhtml:42
2304 2302 #: doc/noosfero/community/accepting-members.en.xhtml:33
2305   -#: doc/noosfero/community/toc.en.xhtml:9
  2303 +#: doc/noosfero/community/toc.en.xhtml:3
2306 2304 msgid "<a href=\"/doc/community/joining-community\">Joining a community</a>"
2307 2305 msgstr ""
2308   -"<a href=\"/doc/community/joining-community\">Entrando em uma comunidade</a>"
  2306 +"<a href=\"/doc/community/joining-community\">Entrar em uma comunidade</a>"
2309 2307  
2310 2308 # type: Content of: <ul><li>
2311 2309 #: doc/noosfero/community/invite-contacts.en.xhtml:47
2312 2310 msgid "<a href=\"/doc/community/accepting-members\">Accepting members</a>"
2313   -msgstr "<a href=\"/doc/community/accepting-members\">Aceitando integrantes</a>"
  2311 +msgstr "<a href=\"/doc/community/accepting-members\">Aceitar integrantes</a>"
2314 2312  
2315 2313 # type: Content of: <h1>
2316 2314 #: doc/noosfero/community/editing-sideboxes.en.xhtml:1
2317 2315 #: doc/noosfero/user/editing-sideboxes.en.xhtml:1
2318 2316 #: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:1
2319 2317 msgid "Editing sideboxes"
2320   -msgstr "Editando blocos laterais"
  2318 +msgstr "Editar blocos laterais"
2321 2319  
2322 2320 # type: Content of: <p>
2323 2321 #: doc/noosfero/community/editing-sideboxes.en.xhtml:3
... ... @@ -2735,14 +2733,14 @@ msgstr &quot;&quot;
2735 2733  
2736 2734 # type: Content of: <ul><li>
2737 2735 #: doc/noosfero/community/editing-sideboxes.en.xhtml:72
2738   -#: doc/noosfero/community/toc.en.xhtml:4
  2736 +#: doc/noosfero/community/toc.en.xhtml:8
2739 2737 msgid "<a href=\"/doc/community/editing-appearance\">Editing appearance</a>"
2740   -msgstr "<a href=\"/doc/community/editing-appearance\">Editando aparência</a>"
  2738 +msgstr "<a href=\"/doc/community/editing-appearance\">Editar aparência</a>"
2741 2739  
2742 2740 # type: Content of: <h1>
2743 2741 #: doc/noosfero/community/moderating-articles.en.xhtml:1
2744 2742 msgid "Moderating articles"
2745   -msgstr "Moderando artigos"
  2743 +msgstr "Moderar artigos"
2746 2744  
2747 2745 # type: Content of: <ol><li>
2748 2746 #: doc/noosfero/community/moderating-articles.en.xhtml:3
... ... @@ -2848,7 +2846,7 @@ msgstr &quot;&quot;
2848 2846 # type: Content of: <h1>
2849 2847 #: doc/noosfero/community/joining-community.en.xhtml:1
2850 2848 msgid "Joining a community"
2851   -msgstr "Entrando em uma comunidade"
  2849 +msgstr "Entrar em uma comunidade"
2852 2850  
2853 2851 # type: Content of: <p>
2854 2852 #: doc/noosfero/community/joining-community.en.xhtml:3
... ... @@ -2893,7 +2891,7 @@ msgid &quot;&quot;
2893 2891 "navigation/searching-communities\">Finding communities</a>."
2894 2892 msgstr ""
2895 2893 "Para aprender a encontrar comunidades no sistema, acesse: <a href=\"/doc/"
2896   -"navigation/searching-communities\">Encontrando comunidades</a>."
  2894 +"navigation/searching-communities\">Encontrar comunidades</a>."
2897 2895  
2898 2896 # type: Content of: <ol><li>
2899 2897 #: doc/noosfero/community/joining-community.en.xhtml:20
... ... @@ -2937,16 +2935,16 @@ msgstr &quot;&quot;
2937 2935 #: doc/noosfero/navigation/searching-products-services.en.xhtml:37
2938 2936 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:37
2939 2937 #: doc/noosfero/navigation/advanced-search.en.xhtml:35
2940   -#: doc/noosfero/navigation/toc.en.xhtml:7
  2938 +#: doc/noosfero/navigation/toc.en.xhtml:3
2941 2939 msgid ""
2942 2940 "<a href=\"/doc/navigation/searching-communities\">Finding communities</a>"
2943 2941 msgstr ""
2944   -"<a href=\"/doc/navigation/searching-communities\">Encontrando comunidades</a>"
  2942 +"<a href=\"/doc/navigation/searching-communities\">Encontrar comunidades</a>"
2945 2943  
2946 2944 # type: Content of: <h1>
2947 2945 #: doc/noosfero/community/accepting-members.en.xhtml:1
2948 2946 msgid "Accepting new members"
2949   -msgstr "Aceitando novos integrantes"
  2947 +msgstr "Aceitar novos integrantes"
2950 2948  
2951 2949 # type: Content of: <ol><li>
2952 2950 #: doc/noosfero/community/accepting-members.en.xhtml:3
... ... @@ -2971,7 +2969,7 @@ msgstr &quot;&quot;
2971 2969 # type: Content of: <h1>
2972 2970 #: doc/noosfero/user/logout.en.xhtml:1
2973 2971 msgid "Leaving the system"
2974   -msgstr "Saindo do sistema"
  2972 +msgstr "Sair do sistema"
2975 2973  
2976 2974 # type: Content of: <p>
2977 2975 #: doc/noosfero/user/logout.en.xhtml:3
... ... @@ -3038,7 +3036,7 @@ msgstr &quot;&quot;
3038 3036 # type: Content of: <h1>
3039 3037 #: doc/noosfero/user/removing-friends.en.xhtml:1
3040 3038 msgid "Removing friends"
3041   -msgstr "Removendo amigos"
  3039 +msgstr "Remover amigos"
3042 3040  
3043 3041 # type: Content of: <p>
3044 3042 #: doc/noosfero/user/removing-friends.en.xhtml:3
... ... @@ -3106,9 +3104,9 @@ msgstr &quot;&quot;
3106 3104 #: doc/noosfero/user/sending-messages.en.xhtml:30
3107 3105 #: doc/noosfero/user/accepting-friends.en.xhtml:30
3108 3106 #: doc/noosfero/user/registering-new-user.en.xhtml:33
3109   -#: doc/noosfero/user/toc.en.xhtml:15
  3107 +#: doc/noosfero/user/toc.en.xhtml:8
3110 3108 msgid "<a href=\"/doc/user/adding-friends\">Adding friends</a>"
3111   -msgstr "<a href=\"/doc/user/adding-friends\">Adicionando amigos</a>"
  3109 +msgstr "<a href=\"/doc/user/adding-friends\">Adicionar amigos</a>"
3112 3110  
3113 3111 # type: Content of: <ul><li>
3114 3112 #: 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;
3116 3114 #: doc/noosfero/user/invite-contacts.en.xhtml:43
3117 3115 #: doc/noosfero/user/adding-friends.en.xhtml:26
3118 3116 #: doc/noosfero/user/registering-new-user.en.xhtml:35
3119   -#: doc/noosfero/user/toc.en.xhtml:10
  3117 +#: doc/noosfero/user/toc.en.xhtml:9
3120 3118 msgid "<a href=\"/doc/user/accepting-friends\">Accepting friends</a>"
3121   -msgstr "<a href=\"/doc/user/accepting-friends\">Aceitando amigos</a>"
  3119 +msgstr "<a href=\"/doc/user/accepting-friends\">Aceitar amigos</a>"
3122 3120  
3123 3121 # type: Content of: <h1>
3124 3122 #: doc/noosfero/user/sending-messages.en.xhtml:1
3125 3123 msgid "Sending messages"
3126   -msgstr "Enviando mensagens"
  3124 +msgstr "Enviar mensagens"
3127 3125  
3128 3126 # type: Content of: <p>
3129 3127 #: doc/noosfero/user/sending-messages.en.xhtml:3
... ... @@ -3192,7 +3190,7 @@ msgstr &quot;Enviar mensagem&quot;
3192 3190 #: doc/noosfero/navigation/searching-communities.en.xhtml:32
3193 3191 #: doc/noosfero/navigation/toc.en.xhtml:4
3194 3192 msgid "<a href=\"/doc/navigation/searching-people\">Finding people</a>"
3195   -msgstr "<a href=\"/doc/navigation/searching-people\">Encontrando pessoas</a>"
  3193 +msgstr "<a href=\"/doc/navigation/searching-people\">Encontrar pessoas</a>"
3196 3194  
3197 3195 # type: Content of: <p>
3198 3196 #: doc/noosfero/user/editing-header-footer.en.xhtml:3
... ... @@ -3264,8 +3262,7 @@ msgstr &quot;Confirmação de remover comentário&quot;
3264 3262 #: doc/noosfero/user/removing-comments.en.xhtml:26
3265 3263 msgid ""
3266 3264 "<a href=\"/doc/user/commenting\">Commenting articles, pictures and events</a>"
3267   -msgstr ""
3268   -"<a href=\"/doc/user/commenting\">Comentando artigos, fotos e eventos</a>"
  3265 +msgstr "<a href=\"/doc/user/commenting\">Comentar artigos, fotos e eventos</a>"
3269 3266  
3270 3267 # type: Content of: <p>
3271 3268 #: 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;
3275 3272 # type: Content of: <ul><li>
3276 3273 #: doc/noosfero/user/editing-appearance.en.xhtml:37
3277 3274 #: doc/noosfero/user/editing-sideboxes.en.xhtml:72
3278   -#: doc/noosfero/user/toc.en.xhtml:7
  3275 +#: doc/noosfero/user/toc.en.xhtml:17
3279 3276 msgid ""
3280 3277 "<a href=\"/doc/user/editing-header-footer\">Editing header and footer</a>"
3281 3278 msgstr ""
3282   -"<a href=\"/doc/user/editing-header-footer\">Editando cabeçalho e rodapé</a>"
  3279 +"<a href=\"/doc/user/editing-header-footer\">Editar cabeçalho e rodapé</a>"
3283 3280  
3284 3281 # type: Content of: <h1>
3285 3282 #: doc/noosfero/user/index.en.xhtml:1
... ... @@ -3289,7 +3286,7 @@ msgstr &quot;Funcionalidades de Usuário&quot;
3289 3286 # type: Content of: <h1>
3290 3287 #: doc/noosfero/user/accepting-friends.en.xhtml:1
3291 3288 msgid "Accepting friends"
3292   -msgstr "Aceitando amigos"
  3289 +msgstr "Aceitar amigos"
3293 3290  
3294 3291 # type: Content of: <p>
3295 3292 #: doc/noosfero/user/accepting-friends.en.xhtml:3
... ... @@ -3348,9 +3345,9 @@ msgstr &quot;Tópicos Relacionados&quot;
3348 3345 #: doc/noosfero/user/invite-contacts.en.xhtml:44
3349 3346 #: doc/noosfero/user/adding-friends.en.xhtml:25
3350 3347 #: doc/noosfero/user/registering-new-user.en.xhtml:34
3351   -#: doc/noosfero/user/toc.en.xhtml:5
  3348 +#: doc/noosfero/user/toc.en.xhtml:15
3352 3349 msgid "<a href=\"/doc/user/removing-friends\">Removing friends</a>"
3353   -msgstr "<a href=\"/doc/user/removing-friends\">Removendo amigos</a>"
  3350 +msgstr "<a href=\"/doc/user/removing-friends\">Remover amigos</a>"
3354 3351  
3355 3352 # type: Content of: <p>
3356 3353 #: doc/noosfero/user/invite-contacts.en.xhtml:3
... ... @@ -3571,14 +3568,14 @@ msgstr &quot;Bloco de empreendimentos&quot;
3571 3568  
3572 3569 # type: Content of: <ul><li>
3573 3570 #: doc/noosfero/user/editing-sideboxes.en.xhtml:73
3574   -#: doc/noosfero/user/toc.en.xhtml:9
  3571 +#: doc/noosfero/user/toc.en.xhtml:16
3575 3572 msgid "<a href=\"/doc/user/editing-appearance\">Editing appearance</a>"
3576   -msgstr "<a href=\"/doc/user/editing-appearance\">Editando aparência</a>"
  3573 +msgstr "<a href=\"/doc/user/editing-appearance\">Editar aparência</a>"
3577 3574  
3578 3575 # type: Content of: <h1>
3579 3576 #: doc/noosfero/user/editing-person-info.en.xhtml:1
3580 3577 msgid "Editing user settings"
3581   -msgstr "Alterando informações/configurações de um usuário"
  3578 +msgstr "Alterar informações/configurações de um usuário"
3582 3579  
3583 3580 # type: Content of: <p>
3584 3581 #: doc/noosfero/user/editing-person-info.en.xhtml:3
... ... @@ -3680,7 +3677,7 @@ msgstr &quot;&quot;
3680 3677 # type: Content of: <h1>
3681 3678 #: doc/noosfero/user/commenting.en.xhtml:1
3682 3679 msgid "Commenting articles"
3683   -msgstr "Comentando artigos"
  3680 +msgstr "Comentar artigos"
3684 3681  
3685 3682 # type: Content of: <p>
3686 3683 #: doc/noosfero/user/commenting.en.xhtml:3
... ... @@ -3760,7 +3757,7 @@ msgstr &quot;Comentário de uma pessoa logada&quot;
3760 3757 # type: Content of: <h1>
3761 3758 #: doc/noosfero/user/adding-friends.en.xhtml:1
3762 3759 msgid "Adding friends"
3763   -msgstr "Adicionando amigos"
  3760 +msgstr "Adicionar amigos"
3764 3761  
3765 3762 # type: Content of: <p>
3766 3763 #: doc/noosfero/user/adding-friends.en.xhtml:3
... ... @@ -3812,7 +3809,7 @@ msgstr &quot;Confirmação quando está adicionando um amigo&quot;
3812 3809 # type: Content of: <h1>
3813 3810 #: doc/noosfero/user/registering-new-user.en.xhtml:1
3814 3811 msgid "Registering a new user"
3815   -msgstr "Cadastrando no sistema"
  3812 +msgstr "Cadastrar um novo usuário"
3816 3813  
3817 3814 # type: Content of: <p>
3818 3815 #: doc/noosfero/user/registering-new-user.en.xhtml:3
... ... @@ -3888,7 +3885,7 @@ msgstr &quot;Formulário de registro&quot;
3888 3885 # type: Content of: <h1>
3889 3886 #: doc/noosfero/user/login.en.xhtml:1
3890 3887 msgid "Login into the system"
3891   -msgstr "Logar"
  3888 +msgstr "Logar no sistema"
3892 3889  
3893 3890 # type: Content of: <p>
3894 3891 #: doc/noosfero/user/login.en.xhtml:3
... ... @@ -3925,12 +3922,12 @@ msgstr &quot;&quot;
3925 3922 # type: Content of: <ul><li>
3926 3923 #: doc/noosfero/user/login.en.xhtml:25
3927 3924 msgid "<a href=\"/doc/user/registering-new-user\">Registering new user</a>"
3928   -msgstr "<a href=\"/doc/user/registering-new-user\">Cadastro no Cirandas</a>"
  3925 +msgstr "<a href=\"/doc/user/registering-new-user\">Cadastrar novo usuário</a>"
3929 3926  
3930 3927 # type: Content of: <h1>
3931 3928 #: doc/noosfero/enterprise/disabling-enterprise.en.xhtml:1
3932 3929 msgid "Disabling an enterprise"
3933   -msgstr "Desabilitando um empreendimento"
  3930 +msgstr "Desabilitar um empreendimento"
3934 3931  
3935 3932 # type: Content of: <p>
3936 3933 #: doc/noosfero/enterprise/disabling-enterprise.en.xhtml:3
... ... @@ -3991,7 +3988,7 @@ msgstr &quot;Confirmação da desabilitação do empreendimento&quot;
3991 3988 msgid ""
3992 3989 "<a href=\"/doc/enterprise/activating-enterprise\">Activating enterprise</a>"
3993 3990 msgstr ""
3994   -"<a href=\"/doc/enterprise/activating-enterprise\">Ativando empreendimento</a>"
  3991 +"<a href=\"/doc/enterprise/activating-enterprise\">Ativar empreendimento</a>"
3995 3992  
3996 3993 # type: Content of: <p>
3997 3994 #: doc/noosfero/enterprise/editing-header-footer.en.xhtml:3
... ... @@ -4019,13 +4016,13 @@ msgstr &quot;&quot;
4019 4016 # type: Content of: <ul><li>
4020 4017 #: doc/noosfero/enterprise/editing-appearance.en.xhtml:39
4021 4018 #: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:73
4022   -#: doc/noosfero/enterprise/toc.en.xhtml:4
  4019 +#: doc/noosfero/enterprise/toc.en.xhtml:8
4023 4020 msgid ""
4024 4021 "<a href=\"/doc/enterprise/editing-header-footer\">Editing header and footer</"
4025 4022 "a>"
4026 4023 msgstr ""
4027   -"<a href=\"/doc/enterprise/editing-header-footer\">Editando cabeçalho e "
4028   -"rodapé</a>"
  4024 +"<a href=\"/doc/enterprise/editing-header-footer\">Editar cabeçalho e rodapé</"
  4025 +"a>"
4029 4026  
4030 4027 # type: Content of: <h1>
4031 4028 #: doc/noosfero/enterprise/index.en.xhtml:1
... ... @@ -4207,14 +4204,14 @@ msgstr &quot;Bloco de empreendimentos desabilitados&quot;
4207 4204  
4208 4205 # type: Content of: <ul><li>
4209 4206 #: doc/noosfero/enterprise/editing-sideboxes.en.xhtml:74
4210   -#: doc/noosfero/enterprise/toc.en.xhtml:5
  4207 +#: doc/noosfero/enterprise/toc.en.xhtml:7
4211 4208 msgid "<a href=\"/doc/enterprise/editing-appearance\">Editing appearance</a>"
4212   -msgstr "<a href=\"/doc/enterprise/editing-appearance\">Editando aparência</a>"
  4209 +msgstr "<a href=\"/doc/enterprise/editing-appearance\">Editar aparência</a>"
4213 4210  
4214 4211 # type: Content of: <h1>
4215 4212 #: doc/noosfero/enterprise/activating-enterprise.en.xhtml:1
4216 4213 msgid "Activating your enterprise"
4217   -msgstr "Ativando seu empreendimento"
  4214 +msgstr "Ativar seu empreendimento"
4218 4215  
4219 4216 # type: Content of: <p>
4220 4217 #: doc/noosfero/enterprise/activating-enterprise.en.xhtml:3
... ... @@ -4309,25 +4306,25 @@ msgstr &quot;Conclusão da ativação de empreendimento&quot;
4309 4306 # type: Content of: <ul><li>
4310 4307 #: doc/noosfero/enterprise/activating-enterprise.en.xhtml:34
4311 4308 #: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:41
4312   -#: doc/noosfero/enterprise/toc.en.xhtml:9
  4309 +#: doc/noosfero/enterprise/toc.en.xhtml:5
4313 4310 msgid ""
4314 4311 "<a href=\"/doc/enterprise/editing-enterprise-info\">Editing enterprise "
4315 4312 "settings</a>"
4316 4313 msgstr ""
4317   -"<a href=\"/doc/enterprise/editing-enterprise-info\">Editando informações/"
  4314 +"<a href=\"/doc/enterprise/editing-enterprise-info\">Editar informações/"
4318 4315 "configurações do empreendimento</a>"
4319 4316  
4320 4317 # type: Content of: <ul><li>
4321 4318 #: doc/noosfero/enterprise/activating-enterprise.en.xhtml:35
4322   -#: doc/noosfero/user/toc.en.xhtml:16
  4319 +#: doc/noosfero/user/toc.en.xhtml:3
4323 4320 msgid "<a href=\"/doc/user/registering-new-user\">Registering a new user</a>"
4324 4321 msgstr ""
4325   -"<a href=\"/doc/user/registering-new-user\">Registrando um novo usuário</a>"
  4322 +"<a href=\"/doc/user/registering-new-user\">Cadastrar um novo usuário</a>"
4326 4323  
4327 4324 # type: Content of: <h1>
4328 4325 #: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:1
4329 4326 msgid "Managing and adding members to an enterprise"
4330   -msgstr "Gerenciando e adicionando integrantes em um empreendimento"
  4327 +msgstr "Gerenciar e adicionar integrantes em um empreendimento"
4331 4328  
4332 4329 # type: Content of: <p>
4333 4330 #: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:3
... ... @@ -4442,18 +4439,18 @@ msgstr &quot;Adicionar membro em gerenciar membro&quot;
4442 4439  
4443 4440 # type: Content of: <ul><li>
4444 4441 #: doc/noosfero/enterprise/managing-enterprise-members.en.xhtml:42
4445   -#: doc/noosfero/enterprise/toc.en.xhtml:7
  4442 +#: doc/noosfero/enterprise/toc.en.xhtml:3
4446 4443 msgid ""
4447 4444 "<a href=\"/doc/enterprise/activating-enterprise\">Activating your "
4448 4445 "enterprise</a>"
4449 4446 msgstr ""
4450   -"<a href=\"/doc/enterprise/activating-enterprise\">Ativando seu "
4451   -"empreendimento</a>"
  4447 +"<a href=\"/doc/enterprise/activating-enterprise\">Ativar seu empreendimento</"
  4448 +"a>"
4452 4449  
4453 4450 # type: Content of: <h1>
4454 4451 #: doc/noosfero/enterprise/editing-enterprise-info.en.xhtml:1
4455 4452 msgid "Editing enterprise settings"
4456   -msgstr "Editando configurações do empreendimento"
  4453 +msgstr "Editar configurações do empreendimento"
4457 4454  
4458 4455 # type: Content of: <p>
4459 4456 #: doc/noosfero/enterprise/editing-enterprise-info.en.xhtml:3
... ... @@ -4582,7 +4579,7 @@ msgstr &quot;&quot;
4582 4579 # type: Content of: <h1>
4583 4580 #: doc/noosfero/navigation/searching.en.xhtml:1
4584 4581 msgid "Searching on the system"
4585   -msgstr "Buscando na rede"
  4582 +msgstr "Buscar na rede"
4586 4583  
4587 4584 # type: Content of: <p>
4588 4585 #: doc/noosfero/navigation/searching.en.xhtml:3
... ... @@ -4649,12 +4646,12 @@ msgstr &quot;Ver todos os resultados da busca com exemplo&quot;
4649 4646 #: doc/noosfero/navigation/searching-products-services.en.xhtml:38
4650 4647 #: doc/noosfero/navigation/searching-communities.en.xhtml:33
4651 4648 #: doc/noosfero/navigation/advanced-search.en.xhtml:36
4652   -#: doc/noosfero/navigation/toc.en.xhtml:6
  4649 +#: doc/noosfero/navigation/toc.en.xhtml:8
4653 4650 msgid ""
4654 4651 "<a href=\"/doc/navigation/searching-enterprises\">Finding enterprises</a>"
4655 4652 msgstr ""
4656   -"<a href=\"/doc/navigation/searching-enterprises\">Encontrando "
4657   -"empreendimentos</a>"
  4653 +"<a href=\"/doc/navigation/searching-enterprises\">Encontrar empreendimentos</"
  4654 +"a>"
4658 4655  
4659 4656 # type: Content of: <ul><li>
4660 4657 #: doc/noosfero/navigation/searching.en.xhtml:30
... ... @@ -4662,13 +4659,13 @@ msgstr &quot;&quot;
4662 4659 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:38
4663 4660 #: doc/noosfero/navigation/searching-communities.en.xhtml:34
4664 4661 #: doc/noosfero/navigation/advanced-search.en.xhtml:37
4665   -#: doc/noosfero/navigation/toc.en.xhtml:5
  4662 +#: doc/noosfero/navigation/toc.en.xhtml:7
4666 4663 msgid ""
4667 4664 "<a href=\"/doc/navigation/searching-products-services\">Finding products and "
4668 4665 "services</a>"
4669 4666 msgstr ""
4670   -"<a href=\"/doc/navigation/searching-products-services\">Encontrando produtos "
4671   -"e serviços</a>"
  4667 +"<a href=\"/doc/navigation/searching-products-services\">Encontrar produtos e "
  4668 +"serviços</a>"
4672 4669  
4673 4670 # type: Content of: <ul><li>
4674 4671 #: doc/noosfero/navigation/searching.en.xhtml:31
... ... @@ -4676,14 +4673,14 @@ msgstr &quot;&quot;
4676 4673 #: doc/noosfero/navigation/searching-products-services.en.xhtml:39
4677 4674 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:39
4678 4675 #: doc/noosfero/navigation/searching-communities.en.xhtml:35
4679   -#: doc/noosfero/navigation/toc.en.xhtml:8
  4676 +#: doc/noosfero/navigation/toc.en.xhtml:5
4680 4677 msgid "<a href=\"/doc/navigation/advanced-search\">Advanced search</a>"
4681 4678 msgstr "<a href=\"/doc/navigation/advanced-search\">Busca avançada</a>"
4682 4679  
4683 4680 # type: Content of: <h1>
4684 4681 #: doc/noosfero/navigation/searching-people.en.xhtml:1
4685 4682 msgid "Finding people"
4686   -msgstr "Encontrando pessoas"
  4683 +msgstr "Encontrar pessoas"
4687 4684  
4688 4685 # type: Content of: <p>
4689 4686 #: doc/noosfero/navigation/searching-people.en.xhtml:3
... ... @@ -4779,7 +4776,7 @@ msgstr &quot;&quot;
4779 4776 #: doc/noosfero/navigation/searching-communities.en.xhtml:31
4780 4777 #: doc/noosfero/navigation/advanced-search.en.xhtml:33
4781 4778 msgid "<a href=\"/doc/navigation/searching\">Searching</a>"
4782   -msgstr "<a href=\"/doc/navigation/searching\">Fazendo busca</a>"
  4779 +msgstr "<a href=\"/doc/navigation/searching\">Busca</a>"
4783 4780  
4784 4781 # type: Content of: <h1>
4785 4782 #: doc/noosfero/navigation/index.en.xhtml:1
... ... @@ -4789,7 +4786,7 @@ msgstr &quot;Navegação&quot;
4789 4786 # type: Content of: <h1>
4790 4787 #: doc/noosfero/navigation/searching-products-services.en.xhtml:1
4791 4788 msgid "Finding products and services"
4792   -msgstr "Encontrando produtos e serviços"
  4789 +msgstr "Encontrar produtos e serviços"
4793 4790  
4794 4791 # type: Content of: <p>
4795 4792 #: doc/noosfero/navigation/searching-products-services.en.xhtml:3
... ... @@ -4853,7 +4850,7 @@ msgstr &quot;&quot;
4853 4850 # type: Content of: <h1>
4854 4851 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:1
4855 4852 msgid "Finding enterprises"
4856   -msgstr "Encontrando empreendimentos"
  4853 +msgstr "Encontrar empreendimentos"
4857 4854  
4858 4855 # type: Content of: <p>
4859 4856 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:3
... ... @@ -4898,7 +4895,7 @@ msgstr &quot;&quot;
4898 4895 # type: Content of: <h1>
4899 4896 #: doc/noosfero/navigation/searching-communities.en.xhtml:1
4900 4897 msgid "Finding communities"
4901   -msgstr "Encontrando comunidades"
  4898 +msgstr "Encontrar comunidades"
4902 4899  
4903 4900 # type: Content of: <p>
4904 4901 #: doc/noosfero/navigation/searching-communities.en.xhtml:3
... ... @@ -5033,118 +5030,116 @@ msgstr &quot;Resultado da busca avançada com exemplo&quot;
5033 5030 # type: Content of: <ul><li>
5034 5031 #: doc/noosfero/navigation/advanced-search.en.xhtml:34
5035 5032 msgid "<a href=\"/doc/navigation/searching-people\">Findind people</a>"
5036   -msgstr "<a href=\"/doc/navigation/searching-people\";>Encontrando pessoas</a>"
  5033 +msgstr "<a href=\"/doc/navigation/searching-people\">Encontrarpessoas</a>"
5037 5034  
5038 5035 # type: Content of: <ul><li>
5039 5036 #: doc/noosfero/cms/toc.en.xhtml:4
5040 5037 msgid ""
5041 5038 "<a href=\"/doc/cms/adding-images-to-gallery\">Adding pictures to gallery</a>"
5042 5039 msgstr ""
5043   -"<a href=\"/doc/cms/adding-images-to-gallery\">Adicionando imagens à galeria</"
5044   -"a>"
  5040 +"<a href=\"/doc/cms/adding-images-to-gallery\">Adicionar imagens à galeria</a>"
5045 5041  
5046 5042 # type: Content of: <ul><li>
5047   -#: doc/noosfero/cms/toc.en.xhtml:5
  5043 +#: doc/noosfero/cms/toc.en.xhtml:7
5048 5044 msgid ""
5049 5045 "<a href=\"/doc/cms/writing-advanced-article\">Writing an advanced article "
5050 5046 "(inserting images, links, videos and audio)</a>"
5051 5047 msgstr ""
5052   -"<a href=\"/doc/cms/writing-advanced-article\">Escrevendo um artigo avançado"
  5048 +"<a href=\"/doc/cms/writing-advanced-article\">Escrever um artigo avançado"
5053 5049 "(inserindo imagens, links, vídeos e áudio)</a>"
5054 5050  
5055 5051 # type: Content of: <ul><li>
5056   -#: doc/noosfero/community/toc.en.xhtml:6
  5052 +#: doc/noosfero/community/toc.en.xhtml:5
5057 5053 msgid ""
5058 5054 "<a href=\"/doc/community/invite-contacts\">Inviting contacts from e-mail</a>"
5059 5055 msgstr ""
5060   -"<a href=\"/doc/community/invite-contacts\">Convidando contatos por e-mail</a>"
  5056 +"<a href=\"/doc/community/invite-contacts\">Convidar contatos por e-mail</a>"
5061 5057  
5062 5058 # type: Content of: <ul><li>
5063   -#: doc/noosfero/community/toc.en.xhtml:7
5064   -msgid "<a href=\"/doc/community/editing-sideboxes\">Editing sideboxes</a>"
  5059 +#: doc/noosfero/community/toc.en.xhtml:6
  5060 +msgid "<a href=\"/doc/community/accepting-members\">Accepting new members</a>"
5065 5061 msgstr ""
5066   -"<a href=\"/doc/community/editing-sideboxes\">Editando blocos laterais</a>"
  5062 +"<a href=\"/doc/community/accepting-members\">Aceitar novos integrantes</a>"
5067 5063  
5068 5064 # type: Content of: <ul><li>
5069   -#: doc/noosfero/community/toc.en.xhtml:8
  5065 +#: doc/noosfero/community/toc.en.xhtml:7
5070 5066 msgid "<a href=\"/doc/community/moderating-articles\">Moderating articles</a>"
5071   -msgstr "<a href=\"/doc/community/moderating-articles\">Moderando artigos</a>"
  5067 +msgstr "<a href=\"/doc/community/moderating-articles\">Moderar artigos</a>"
5072 5068  
5073 5069 # type: Content of: <ul><li>
5074   -#: doc/noosfero/community/toc.en.xhtml:10
5075   -msgid "<a href=\"/doc/community/accepting-members\">Accepting new members</a>"
5076   -msgstr ""
5077   -"<a href=\"/doc/community/accepting-members\">Aceitando novos integrantes</a>"
  5070 +#: doc/noosfero/community/toc.en.xhtml:9
  5071 +msgid "<a href=\"/doc/community/editing-sideboxes\">Editing sideboxes</a>"
  5072 +msgstr "<a href=\"/doc/community/editing-sideboxes\">Editar blocos laterais</a>"
5078 5073  
5079 5074 # type: Content of: <ul><li>
5080   -#: doc/noosfero/user/toc.en.xhtml:3
5081   -msgid "<a href=\"/doc/user/logout\">Leaving the system</a>"
5082   -msgstr "<a href=\"/doc/user/logout\">Saindo do Sistema</a>"
  5075 +#: doc/noosfero/user/toc.en.xhtml:5
  5076 +msgid "<a href=\"/doc/user/editing-person-info\">Editing user settings</a>"
  5077 +msgstr ""
  5078 +"<a href=\"/doc/user/editing-person-info\">Editar informações/configurações "
  5079 +"do usuário</a>"
5083 5080  
5084 5081 # type: Content of: <ul><li>
5085   -#: doc/noosfero/user/toc.en.xhtml:4
5086   -msgid "<a href=\"/doc/user/changing-password\">Changing password</a>"
5087   -msgstr "<a href=\"/doc/user/changing-password\">Alterando a senha</a>"
  5082 +#: doc/noosfero/user/toc.en.xhtml:6
  5083 +msgid "<a href=\"/doc/user/logout\">Leaving the system</a>"
  5084 +msgstr "<a href=\"/doc/user/logout\">Sair do Sistema</a>"
5088 5085  
5089 5086 # type: Content of: <ul><li>
5090   -#: doc/noosfero/user/toc.en.xhtml:6
5091   -msgid "<a href=\"/doc/user/sending-messages\">Sending messages</a>"
5092   -msgstr "<a href=\"/doc/user/sending-messages\">Enviando mensagens</a>"
  5087 +#: doc/noosfero/user/toc.en.xhtml:7
  5088 +msgid "<a href=\"/doc/user/invite-contacts\">Inviting contacts from e-mail</a>"
  5089 +msgstr "<a href=\"/doc/user/invite-contacts\">Convidar contatos por e-mail</a>"
5093 5090  
5094 5091 # type: Content of: <ul><li>
5095   -#: doc/noosfero/user/toc.en.xhtml:8
5096   -msgid "<a href=\"/doc/user/removing-comments\">Removing comments</a>"
5097   -msgstr "<a href=\"/doc/user/removing-comments\">Removendo comentários</a>"
  5092 +#: doc/noosfero/user/toc.en.xhtml:10
  5093 +msgid "<a href=\"/doc/user/commenting\">Commenting articles</a>"
  5094 +msgstr "<a href=\"/doc/user/commenting\">Comentar artigos</a>"
5098 5095  
5099 5096 # type: Content of: <ul><li>
5100 5097 #: doc/noosfero/user/toc.en.xhtml:11
5101   -msgid "<a href=\"/doc/user/invite-contacts\">Inviting contacts from e-mail</a>"
5102   -msgstr ""
5103   -"<a href=\"/doc/user/invite-contacts\">Convidando contatos por e-mail</a>"
  5098 +msgid "<a href=\"/doc/user/removing-comments\">Removing comments</a>"
  5099 +msgstr "<a href=\"/doc/user/removing-comments\">Remover comentários</a>"
5104 5100  
5105 5101 # type: Content of: <ul><li>
5106 5102 #: doc/noosfero/user/toc.en.xhtml:12
5107   -msgid "<a href=\"/doc/user/editing-sideboxes\">Editing sideboxes</a>"
5108   -msgstr "<a href=\"/doc/user/editing-sideboxes\">Editando blocos laterais</a>"
  5103 +msgid "<a href=\"/doc/user/sending-messages\">Sending messages</a>"
  5104 +msgstr "<a href=\"/doc/user/sending-messages\">Enviar mensagens</a>"
5109 5105  
5110 5106 # type: Content of: <ul><li>
5111 5107 #: doc/noosfero/user/toc.en.xhtml:13
5112   -msgid "<a href=\"/doc/user/editing-person-info\">Editing user settings</a>"
5113   -msgstr ""
5114   -"<a href=\"/doc/user/editing-person-info\">Editando informações/configurações "
5115   -"do usuário</a>"
  5108 +msgid "<a href=\"/doc/user/editing-sideboxes\">Editing sideboxes</a>"
  5109 +msgstr "<a href=\"/doc/user/editing-sideboxes\">Editar blocos laterais</a>"
5116 5110  
5117 5111 # type: Content of: <ul><li>
5118 5112 #: doc/noosfero/user/toc.en.xhtml:14
5119   -msgid "<a href=\"/doc/user/commenting\">Commenting articles</a>"
5120   -msgstr "<a href=\"/doc/user/commenting\">Comentando artigos</a>"
  5113 +msgid "<a href=\"/doc/user/changing-password\">Changing password</a>"
  5114 +msgstr "<a href=\"/doc/user/changing-password\">Alterar senha</a>"
5121 5115  
5122 5116 # type: Content of: <ul><li>
5123   -#: doc/noosfero/enterprise/toc.en.xhtml:3
  5117 +#: doc/noosfero/enterprise/toc.en.xhtml:4
5124 5118 msgid ""
5125   -"<a href=\"/doc/enterprise/disabling-enterprise\">Disabling an enterprise</a>"
  5119 +"<a href=\"/doc/enterprise/managing-enterprise-members\">Managing and adding "
  5120 +"members to an enterprise</a>"
5126 5121 msgstr ""
5127   -"<a href=\"/doc/enterprise/disabling-enterprise\">Desabilitando um "
5128   -"empreendimento</a>"
  5122 +"<a href=\"/doc/enterprise/managing-enterprise-members\">Gerenciar e "
  5123 +"adicionar integrantes em um empreendimento</a>"
5129 5124  
5130 5125 # type: Content of: <ul><li>
5131 5126 #: doc/noosfero/enterprise/toc.en.xhtml:6
5132 5127 msgid "<a href=\"/doc/enterprise/editing-sideboxes\">Editing sideboxes</a>"
5133   -msgstr "<a href=\"/doc/enterprise/editing-sideboxes\">Editando blocos laterais</a>"
  5128 +msgstr ""
  5129 +"<a href=\"/doc/enterprise/editing-sideboxes\">Editar blocos laterais</a>"
5134 5130  
5135 5131 # type: Content of: <ul><li>
5136   -#: doc/noosfero/enterprise/toc.en.xhtml:8
  5132 +#: doc/noosfero/enterprise/toc.en.xhtml:9
5137 5133 msgid ""
5138   -"<a href=\"/doc/enterprise/managing-enterprise-members\">Managing and adding "
5139   -"members to an enterprise</a>"
  5134 +"<a href=\"/doc/enterprise/disabling-enterprise\">Disabling an enterprise</a>"
5140 5135 msgstr ""
5141   -"<a href=\"/doc/enterprise/managing-enterprise-members\">Gerenciando e "
5142   -"adicionando integrantes em um empreendimento</a>"
  5136 +"<a href=\"/doc/enterprise/disabling-enterprise\">Desabilitar um "
  5137 +"empreendimento</a>"
5143 5138  
5144 5139 # type: Content of: <ul><li>
5145   -#: doc/noosfero/navigation/toc.en.xhtml:3
  5140 +#: doc/noosfero/navigation/toc.en.xhtml:6
5146 5141 msgid "<a href=\"/doc/navigation/searching\">Searching on the system</a>"
5147   -msgstr "<a href=\"/doc/navigation/searching\">Fazendo buscas no sistema</a>"
  5142 +msgstr "<a href=\"/doc/navigation/searching\">Buscar no sistema</a>"
5148 5143  
5149 5144 # type: Content of: <ul><li>
5150 5145 #: 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;
5172 5167 msgstr "<a href=\"/doc/navigation\">Navegação</a>"
5173 5168  
5174 5169 # type: Content of: <ul><li>
5175   -#, fuzzy
5176   -#~ msgid "<a href=\"/doc/enterprise/editing-sideboxes\"></a>"
5177   -#~ msgstr ""
5178   -#~ "<a href=\"/doc/enterprise/editing-sideboxes\">Editando blocos laterais</a>"
5179   -
5180   -# type: Content of: <ul><li>
5181 5170 #~ msgid "<a href=\"/doc/admin\">Administration</a>"
5182 5171 #~ msgstr "<a href=\"/doc/admin\">Administração</a>"
5183 5172  
5184   -# type: Content of: <ul><li>
5185   -#~ msgid "<a href=\"/doc/user/joining-community\">Joining a community</a>"
5186   -#~ msgstr ""
5187   -#~ "<a href=\"/doc/user/joining-community\">Entrando em uma comunidade</a>"
5188   -
5189 5173 # type: Content of: <h1>
5190 5174 #~ msgid "Administration"
5191 5175 #~ msgstr "Administração"
... ...
public/designs/themes/base/style.css
  Diff comments   View file @1091ed7
... ... @@ -773,7 +773,7 @@ X.sep {
773 773 width: 48%;
774 774 }
775 775  
776   -.controller-search #content .no-boxes h1 {
  776 +#content .no-boxes h1 {
777 777 font-variant: small-caps;
778 778 color: #555753;
779 779 font-size: 18px;
... ...
public/stylesheets/application.css
  Diff comments   View file @1091ed7
... ... @@ -454,8 +454,6 @@ div.pending-tasks {
454 454 #content #not-found,
455 455 #content #access-denied {
456 456 -moz-border-radius: 6px;
457   - margin-left: 20%;
458   - margin-right: 20%;
459 457 }
460 458  
461 459 #content #not-found p,
... ... @@ -1172,6 +1170,10 @@ a.comment-picture {
1172 1170 display: inline;
1173 1171 }
1174 1172  
  1173 +#content #article .article-body img {
  1174 + max-width: 100%;
  1175 +}
  1176 +
1175 1177 /* NOT PUBLISHED BLOG POSTS */
1176 1178  
1177 1179 .blog-post.not-published {
... ... @@ -1403,6 +1405,10 @@ input.disabled {
1403 1405 border: none;
1404 1406 }
1405 1407  
  1408 +.block-title.empty {
  1409 + display: none;
  1410 +}
  1411 +
1406 1412 .invisible-block {
1407 1413 background: url(/images/hachure.png);
1408 1414 opacity: 0.25;
... ... @@ -2998,12 +3004,8 @@ h1#agenda-title {
2998 3004 display: inline;
2999 3005 }
3000 3006  
3001   -.controller-profile .no-boxes {
3002   - margin: 0px 260px 0px 260px;
3003   -}
3004   -
3005   -.controller-profile #content .no-boxes h1 {
3006   - margin: 1px 0px 1px 160px;
  3007 +.no-boxes {
  3008 + margin: 0px 200px 0px 200px;
3007 3009 }
3008 3010  
3009 3011 .controller-profile #content .no-boxes h1,
... ...
public/stylesheets/lightbox.css
  Diff comments   View file @1091ed7
... ... @@ -57,3 +57,7 @@ Modified : February 1, 2006
57 57 width:100%;
58 58 height:100%;
59 59 }
  60 +
  61 +#lightbox select {
  62 + max-width: 100%;
  63 +}
... ...
script/ci-build
  Diff comments   View file @1091ed7
1 1 #!/bin/sh
2 2  
3   -export CUCUMBER_FORMAT=progress
4 3 cp config/database.yml.sqlite3 config/database.yml && /usr/bin/rake db:schema:load && /usr/bin/rake
... ...
test/unit/article_block_test.rb
  Diff comments   View file @1091ed7
... ... @@ -8,12 +8,11 @@ class ArticleBlockTest &lt; Test::Unit::TestCase
8 8  
9 9 should "take article's content" do
10 10 block = ArticleBlock.new
11   - html = mock
12 11 article = mock
13   - article.expects(:to_html).returns(html)
  12 + article.expects(:to_html).returns("Article content")
14 13 block.stubs(:article).returns(article)
15 14  
16   - assert_same html, block.content
  15 + assert_match(/Article content/, block.content)
17 16 end
18 17  
19 18 should 'refer to an article' do
... ... @@ -52,6 +51,7 @@ class ArticleBlockTest &lt; Test::Unit::TestCase
52 51 assert_nil block.article_id
53 52 end
54 53  
  54 +<<<<<<< HEAD
55 55 should "take available articles with a person as the box owner" do
56 56 person = create_user('testuser').person
57 57 person.articles.delete_all
... ... @@ -81,4 +81,24 @@ class ArticleBlockTest &lt; Test::Unit::TestCase
81 81 assert_equal [a],block.available_articles
82 82 end
83 83  
  84 + should "display empty title if title is blank" do
  85 + block = ArticleBlock.new
  86 + article = mock
  87 + article.expects(:to_html).returns("Article content")
  88 + block.expects(:title).returns('')
  89 + block.stubs(:article).returns(article)
  90 +
  91 + assert_equal "<h3 class=\"block-title empty\"></h3>Article content", block.content
  92 + end
  93 +
  94 + should "display title if defined" do
  95 + block = ArticleBlock.new
  96 + article = mock
  97 + article.expects(:to_html).returns("Article content")
  98 + block.expects(:title).returns('Article title')
  99 + block.stubs(:article).returns(article)
  100 +
  101 + assert_equal "<h3 class=\"block-title\">Article title</h3>Article content", block.content
  102 + end
  103 +
84 104 end
... ...
test/unit/blog_helper_test.rb
  Diff comments   View file @1091ed7
... ... @@ -17,6 +17,7 @@ class BlogHelperTest &lt; Test::Unit::TestCase
17 17 attr :blog
18 18  
19 19 def _(s); s; end
  20 + def h(s); s; end
20 21  
21 22 should 'list published posts with class blog-post' do
22 23 blog.children << published_post = TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => true)
... ...
test/unit/doc_topic_test.rb
  Diff comments   View file @1091ed7
1   -require 'test_helper'
  1 +require File.dirname(__FILE__) + '/../test_helper'
2 2  
3 3 class DocTopicTest < ActiveSupport::TestCase
4 4 should 'be a DocItem' do
... ... @@ -25,4 +25,12 @@ class DocTopicTest &lt; ActiveSupport::TestCase
25 25 end
26 26 end
27 27  
  28 + should 'read order from HTML' do
  29 + assert_equal 1, DocTopic.order('<h1 class="order-1">Some topic</h1>')
  30 + end
  31 +
  32 + should 'use 0 as order by default' do
  33 + assert_equal 0, DocTopic.order('<h1>Some topic</h1>')
  34 + end
  35 +
28 36 end
... ...